Browse Source

fix: 流程样式优化

liuc 3 months ago
parent
commit
f8487b154b

+ 2 - 24
src/views/flow/stFormDesign/packages/StBatch/batch.vue

@@ -16,7 +16,7 @@
       >
         <template #headerCell="{ column }">
           <div>
-            <a-tooltip  placement="topLeft">
+            <a-tooltip placement="topLeft">
               <div>
                        <span
                            v-if="
@@ -46,32 +46,11 @@
           <div v-if="scope.column.dataIndex === 'sequence_index_number'">
             {{ getSerialNumber(scope.index) }}
           </div>
-          <div v-else-if="record.disableCell&&record.disableCell.find((item) =>item.y== scope.column.dataIndex&&item.x==getSerialNumber(scope.index))
-">
-            <StFormModelItem
-                :record="record.list.find((item) => item.model == scope.column.dataIndex)"
-                :config="config"
-                :parentDisabled="true"
-                :index="record.list.findIndex((item) => item.model == scope.column.dataIndex)"
-                :domains="dynamicValidateForm.domains"
-                :dynamicData="dynamicData"
-                :formData="formData"
-                :formConfig="formConfig"
-                :childTableFieldRecord="record.list"
-                :rowIndex="scope.index"
-                v-model:value="scope.record[record.list.find((item) => item.model == scope.column.dataIndex).model]"
-                @input="handleInput"
-                :tableScope="scope"
-                :columns="columns"
-                :pagination="pagination"
-                :currentTableData="currentTableData"
-            />
-          </div>
           <div v-else-if="record.list.find((item) => item.model == scope.column.dataIndex)">
             <StFormModelItem
                 :record="record.list.find((item) => item.model == scope.column.dataIndex)"
                 :config="config"
-                :parentDisabled="disabled"
+                :parentDisabled="record.disableCell && record.disableCell.find((item) => item.y == scope.column.dataIndex && item.x == getSerialNumber(scope.index)) ? true : disabled"
                 :index="record.list.findIndex((item) => item.model == scope.column.dataIndex)"
                 :domains="dynamicValidateForm.domains"
                 :dynamicData="dynamicData"
@@ -87,7 +66,6 @@
                 :currentTableData="currentTableData"
             />
           </div>
-
           <div v-if="scope.column.dataIndex === 'dynamic-opr-button'">
             <a-button v-if="!disabled" type="dashed" @click="removeDomain(scope.record)" danger>
               <template #icon>

+ 1 - 21
src/views/flow/stFormDesign/packages/StBatch/module/StTableCard.vue

@@ -38,29 +38,9 @@
             </template>
             <div class="mobile-tanle-form-item">
               <StFormModelItem
-                  v-if="record.disableCell && record.disableCell.find((item) => item.y == col.dataIndex && item.x == rowIdx + 1)"
                   :record="record.list.find((item) => item.model == col.dataIndex)"
                   :config="config"
-                  :parentDisabled="true"
-                  :index="record.list.findIndex((item) => item.model == col.dataIndex)"
-                  :domains="dynamicValidateForm.domains"
-                  :dynamicData="dynamicData"
-                  :formData="formData"
-                  :formConfig="formConfig"
-                  :childTableFieldRecord="record.list"
-                  :rowIndex="rowIdx"
-                  v-model:value="item[record.list.find((item) => item.model == col.dataIndex).model]"
-                  @input="handleInput"
-                  :columns="columns"
-                  :pagination="pagination"
-                  :currentTableData="currentTableData"
-                  :colIndex="colIdx"
-              />
-              <StFormModelItem
-                  v-else
-                  :record="record.list.find((item) => item.model == col.dataIndex)"
-                  :config="config"
-                  :parentDisabled="disabled"
+                  :parentDisabled="record.disableCell && record.disableCell.find((item) => item.y == col.dataIndex && item.x == rowIdx + 1) ? true : disabled"
                   :index="record.list.findIndex((item) => item.model == col.dataIndex)"
                   :domains="dynamicValidateForm.domains"
                   :dynamicData="dynamicData"

+ 2 - 2
src/views/flow/stFormDesign/packages/StFormDesign/module/jsModal.vue

@@ -764,8 +764,8 @@ const commonMethods = [
   {
     "type": "复杂逻辑",
     "field": "子表单元格不可编辑",
-    "fieldCode": "        const childModel = this.getFieldByModel('test_flow2_child')\n" +
-        "        childModel.disableCell=[{\"x\":1,\"y\":\"sub_table_name\"}]//隐藏第一行,列名是sub_table_name",
+    "fieldCode": "  const childModel = this.getFieldByModel('子表code')\n" +
+        "  childModel.disableCell=[{\"x\":1,\"y\":\"子表字段code\"}]//设置第一行列名是sub_table_name的单元格不可编辑",
     "children": null
   },
   {