数据引擎修改字段校验逻辑/解决流程定义时,节点处理人回显数据异常问题

zkqy-ui/src/views/system/excuteBtnMange/index.vue

@@ -983,10 +983,10 @@ export default {
       ],
       // 条件参数
       conditionData: [
-        {
-          fieldName: "",
-          fieldValue: "",
-        },
+        // {
+        //   fieldName: "",
+        //   fieldValue: "",
+        // },
       ],
       rootFieldInfo: {
         tableName: "",

zkqy-ui/src/views/system/formGroupMange/index.vue

@@ -238,10 +238,10 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label-width="100px" prop="mainFormItem" label="表单主项:">
+        <el-form-item label-width="100px" prop="mainFormItem" label="表单主键:">
           <el-select
             v-model="groupForm.mainFormItem"
-            placeholder="请选择表单项"
+            placeholder="请选择表单主键"
             clearable
             filterable
           >
@@ -297,11 +297,11 @@
             </el-select>
           </template>
         </el-table-column>
-        <el-table-column prop="formItem" label="表单项">
+        <el-table-column prop="formItem" label="表单主键">
           <template slot-scope="scope">
             <el-select
               v-model="scope.row.formItem"
-              placeholder="请选择表单项"
+              placeholder="请选择表单主键"
               clearable
               filterable
             >
@@ -321,11 +321,11 @@
             </el-select>
           </template>
         </el-table-column>
-        <el-table-column prop="mainFormItem" label="依赖的主表单项">
+        <el-table-column prop="mainFormItem" label="依赖的主表单键">
           <template slot-scope="scope">
             <el-select
               v-model="scope.row.relateMainItem"
-              placeholder="请选择表单项"
+              placeholder="请选择表单主键"
               clearable
               filterable
             >
@@ -345,11 +345,11 @@
             </el-select>
           </template>
         </el-table-column>
-        <!-- <el-table-column prop="mainFormItem" label="依赖的主表单项">
+        <!-- <el-table-column prop="mainFormItem" label="依赖的主表单键">
           <template slot-scope="scope">
             <el-select
               v-model="scope.row.relateMainItem"
-              placeholder="请选择表单项"
+              placeholder="请选择表单键"
               clearable
               filterable
             >
@@ -369,7 +369,7 @@
             </el-select>
           </template>
         </el-table-column> -->
-        <el-table-column prop="isShow" label="是否显示">
+        <el-table-column prop="isShow" label="是否展示">
           <template slot-scope="scope">
             <el-switch
               v-model="scope.row.isShow"
@@ -440,9 +440,9 @@ export default {
         fGName: "", //组名称
         groupDesc: "", //组描述
         mainFormName: "", //主表单
-        mainFormItem: "", //主表单项
+        mainFormItem: "", //主表单主键
         mainFormTable: "", //主表单对应表格
-        mainFormItemOptions: [], //主表单项选项
+        mainFormItemOptions: [], //主表单键选项
         groupKey: "", //组key
         isShow: true,
       },
@@ -450,9 +450,9 @@ export default {
         // {
         //   formKey: "", //从表单
         //   dfTableName: "", //从表名
-        //   formItemList: [], //从表单项列表
-        //   formItem: "", //从表单项
-        //   relateMainItem: "", //依赖的主表单项
+        //   formItemList: [], //从表单键列表
+        //   formItem: "", //从表单键
+        //   relateMainItem: "", //依赖的主表单键
         // },
       ],
       formOptionList: [],
@@ -500,7 +500,7 @@ export default {
           { required: true, message: "请选择主表表单", trigger: "change" },
         ],
         mainFormItem: [
-          { required: true, message: "请选择表单项", trigger: "change" },
+          { required: true, message: "请选择表单主键", trigger: "change" },
         ],
       },
     };
@@ -523,9 +523,9 @@ export default {
         fGName: "", //组名称
         groupDesc: "", //组描述
         mainFormName: "", //主表单
-        mainFormItem: "", //主表单项
+        mainFormItem: "", //主表单键
         mainFormTable: "", //主表单对应表格
-        mainFormItemOptions: [], //主表单项选项
+        mainFormItemOptions: [], //主表单键选项
         groupKey: "", //组key
       });
       this.subFormList = [];
@@ -652,8 +652,8 @@ export default {
         formKey: "", //从表单
         dfTableName: "", //从表名
         formItemList: [], //从表单项列表
-        formItem: "", //从表单项
-        relateMainItem: "", //依赖的主表单项
+        formItem: "", //从表单键
+        relateMainItem: "", //依赖的主表单键
         isShow: true, //是否显示该表单
       });
     },

zkqy-ui/src/views/tool/datasheet/index.vue

@@ -44,6 +44,7 @@
               >
                 <el-input
                   v-model="scope.row.fieldName"
+                  :disabled="scope.$index == 0"
                   @blur="fieldNameChange(scope.row)"
                 ></el-input>
               </el-form-item>
@@ -57,7 +58,7 @@
                 style="margin: 0px; padding: 0px"
               >
                 <el-select
-                  :disabled="!scope.row.fieldName"
+                  :disabled="scope.$index == 0"
                   v-model="scope.row.fieldType"
                   filterable
                   @blur="selectBlur(scope)"
@@ -100,7 +101,7 @@
                 <el-input
                   v-model="scope.row.fieldLength"
                   @blur="fieldLengthChange(scope.$index, scope.row)"
-                  :disabled="changduclick(scope.$index) || !scope.row.fieldName"
+                  :disabled="changduclick(scope.$index) || scope.$index == 0"
                   @input="
                     scope.row.fieldLength = scope.row.fieldLength.replace(
                       /^(0+)|[^\d]+/g,
@@ -115,7 +116,7 @@
           <el-table-column prop="isNull" label="不是null" width="100">
             <template slot-scope="scope">
               <el-checkbox
-                :disabled="!scope.row.fieldName"
+                :disabled="scope.$index == 0"
                 @change="isNullChange(scope.row)"
                 v-model="scope.row.isNull"
               ></el-checkbox>
@@ -125,7 +126,7 @@
           <el-table-column prop="isPrimary" label="主键" width="100">
             <template slot-scope="scope">
               <el-checkbox
-                :disabled="!scope.row.fieldName"
+                :disabled="scope.$index == 0"
                 v-model="scope.row.isPrimary"
                 @change="hanleCheckbox(scope.$index, scope.row)"
               ></el-checkbox>
@@ -135,7 +136,7 @@
           <el-table-column prop="isAuto" label="自增" width="100">
             <template slot-scope="scope">
               <el-checkbox
-                :disabled="!scope.row.fieldName"
+                :disabled="scope.$index == 0"
                 @change="isAutoChange(scope.row)"
                 v-model="scope.row.isAuto"
               ></el-checkbox>
@@ -145,7 +146,7 @@
           <el-table-column prop="fieldDescription" label="字段描述" width="200">
             <template slot-scope="scope">
               <el-input
-                :disabled="!scope.row.fieldName"
+                :disabled="scope.$index == 0"
                 @change="fieldDescriptionChange(scope.row)"
                 v-model="scope.row.fieldDescription"
               ></el-input>
@@ -160,6 +161,7 @@
                 size="mini"
                 type="danger"
                 icon="el-icon-delete"
+                :disabled="scope.$index == 0"
                 @click="handleDeleteExperience(scope.$index, scope.row)"
                 >删除
               </el-button>
@@ -214,11 +216,11 @@ export default {
       experienceData: [
         {
           fieldName: "id",
-          fieldType: "",
+          fieldType: "bigint",
           fieldLength: undefined,
           isNull: true,
           isPrimary: true,
-          fieldDescription: "",
+          fieldDescription: "主键",
           isAuto: true,
         },
       ],
@@ -614,6 +616,7 @@ export default {
     },
     // 下拉选中事件  // 处理选中类型后长度输入框是否禁用
     handleSelected(tem, scope, index, val) {
+      console.log(val);
       if (val) {
         //判断是否是由change事件触发的函数
         this.fieldTypeChange(index, val);
@@ -747,9 +750,19 @@ export default {
         this.$delete(this.tableform, "fieldLength" + delindex);
       }
     },
-
+    // 校验表格数据完整性
+    validateTableData() {
+      return this.experienceData.every((item) => {
+        return item.fieldName && item.fieldType;
+      });
+    },
     //增加经验行
     handleAddExperienceline() {
+      let flag = this.validateTableData();
+      if (!flag) {
+        this.$message.error("请完善表单信息");
+        return;
+      }
       if (this.experienceData == undefined) {
         this.experienceData = new Array();
       }