Merge remote-tracking branch 'origin/1.2.4' into 1.2.4

# Conflicts:
#	src/utils/request.js

src/components/Generator/index/Home.vue

@@ -14,7 +14,7 @@
               filter=".disabled"
               :sort="false"
               :group="{ name: 'componentsGroup', pull: 'clone', put: false }"
-              @end="onEnd"  :move="onHandleAdd"
+              @end="onEnd" ref="componentsList" @start="onDragStart"
             >
               <div v-for="(element, index) in item.list" :key="index" class="components-item" :class="{ disabled: element.__config__.dragDisabled }" @click="addComponent(element)">
                 <div class="components-body">
@@ -206,7 +206,9 @@ export default {
       ],
       layout: [],
       layouKey: 0,
-      map: []
+      map: [],
+      filterdrawingList:[],
+      onStartDrawingList:[]
     }
   },
   computed: {},
@@ -538,18 +540,21 @@ export default {
       this.activeData = element
       this.activeId = element.__config__.formId
     },
-    onHandleAdd(to){
-      if (to.to.className === 'drawing-board' || to.to.className === 'drag-wrapper') {
-        let fieldsFil = loopSerialNumberList(this.drawingList)
-        const z = fieldsFil.find(i=> i.__config__.jnpfKey && i.__config__.jnpfKey === 'serialNumber')
-        if (z){
-          this.$message.warning('表单中仅可添加一个流水号控件')
-          return false;
-        }
-      }
+    onDragStart(){
+      this.onStartDrawingList = deepClone(this.drawingList)
+      this.filterdrawingList = loopSerialNumberList(this.onStartDrawingList)
     },
     onEnd(obj) {
       if (!tempActiveData) return
+      if (obj?.item?._underlying_vm_?.__config__?.jnpfKey === 'serialNumber'){
+        if (obj.to.className === 'drawing-board' || obj.to.className === 'drag-wrapper') {
+          const z = this.filterdrawingList.find(i=> i.__config__.jnpfKey && i.__config__.jnpfKey === 'serialNumber')
+          if (z){
+            this.$message.warning('表单中仅可添加一个流水号控件')
+            this.drawingList = this.onStartDrawingList
+          }
+        }
+      }
       this.showTip = true
       if (obj.from !== obj.to) {
         this.activeData = tempActiveData

src/views/form/webDesign/customFormEvent.vue

@@ -8,7 +8,6 @@
     width="700px">
     <p slot="title">
       {{ id ? '编辑自定义赋值模式事件' : '新增自定义赋值模式事件' }}
-      <span style="color:#ff0000;font-size:12px;">注：表单赋值当前仅支持更新数据</span>
     </p>
     <div >
       <div style="margin-bottom:5px;">
@@ -39,7 +38,7 @@
             <el-table-column label="表单字段" width="180"  align="center">
               <template slot-scope="scope">
                 <el-select v-model="scope.row.columnId" filterable @change="scope.row.columnName = value.columnList.find(o=> o.propId === $event).prop" placeholder="请选择表单字段" clearable >
-                  <el-option v-for="(item, index) in value.columnList" :label="item.label" :value="item.propId" :key="item.propId"></el-option>
+                  <el-option v-for="(item, index) in value.columnList.filter(o=>o.prop !== value.idKeyName)" :label="item.label" :value="item.propId" :key="item.propId"></el-option>
                 </el-select>
               </template>
             </el-table-column>

src/views/workFlow/workFlowForm/dynamicForm/index.vue

@@ -203,8 +203,8 @@ export default {
               }
               if (editFlg && editFlg === 1){
                 let noShow = false,
-                  isDisabled = true,
-                  isRequired = true
+                  isDisabled = false,
+                  isRequired = false
                 if (this.setting.formOperates && this.setting.formOperates.length) {
                   let arr = this.setting.formOperates.filter((o) => o.id == item.__vModel__) || []
                   if (arr.length) {