Browse Source

fix: 流程优化

liuc 3 months ago
parent
commit
e148c461f7

+ 10 - 2
src/views/flow/stFormDesign/packages/PopUpQuery/index.vue

@@ -249,8 +249,16 @@ export default {
         this.record.queryMapKeyValData.forEach((item, index) => {
           const keyVal = {}
           keyVal.key = item.queryKey
-          if (item.queryValue.indexOf("{") >= 0) {
-            keyVal.value = this.formData[item.queryValue.substring(1, item.queryValue.length - 1)];
+          if (item.queryValue.indexOf("[") < 0) {
+            if (item.queryValue.indexOf("{") >= 0) {
+              //主表的queryValue,也就是字段都是用{}包裹的,所以会触发在这里,子表的没有被包裹
+              keyVal.value = this.formData[item.queryValue.substring(1, item.queryValue.length - 1)];
+            } else {
+              keyVal.value = this.formData[item.queryValue];
+            }
+            if (!keyVal.value) {
+              keyVal.value = ''
+            }
           } else {
             keyVal.value = item.queryValue
           }

+ 9 - 4
src/views/flow/stFormDesign/packages/PopUpQueryChild/index.vue

@@ -208,10 +208,15 @@ export default {
         this.record.queryMapKeyValData.forEach((item, index) => {
           const keyVal = {}
           keyVal.key = item.queryKey
-          if (item.queryValue.indexOf("{") >= 0) {
-            keyVal.value = this.formData[item.queryValue.substring(1, item.queryValue.length - 1)];
-            if (keyVal.value == undefined) {
-              keyVal.value = this.rowData[item.queryValue.substring(1, item.queryValue.length - 1)]
+          if (item.queryValue.indexOf("[") < 0) {
+            if (item.queryValue.indexOf("{") >= 0) {
+              keyVal.value = this.rowData[item.queryValue.substring(1, item.queryValue.length - 1)];
+            } else {
+              //子表的queryValue,子表的没有被{}包裹,所以会在这里触发,这是在组件PopUpMapping中的queryMapKeyValOpts没有写好的,已经没有写好了,所以就这么地吧,也没啥影响
+              keyVal.value = this.rowData[item.queryValue];
+            }
+            if (!keyVal.value) {
+              keyVal.value = ''
             }
           } else {
             keyVal.value = item.queryValue

+ 0 - 1
src/views/flow/stFormDesign/packages/StFormDesign/module/formItemProperties.vue

@@ -99,7 +99,6 @@
           </a-form-item>
         </a-tooltip>
 
-
         <a-form-item v-if="typeof options.height !== 'undefined'" label='高度'>
           <a-input-number v-model:value='options.height'/>
         </a-form-item>

+ 13 - 3
src/views/flow/stSetting/flowNameSetting.vue

@@ -6,9 +6,19 @@
           <a-alert
               message="示例:【{leaveOfAbsence}-请假审批流程-[SySSequence]-[SySOriginator]】→结果→【张三-请假审批流程-20250101000001-王五】  "
               type="warning"/>
-          <a-alert message="字段:{字段编号}" type="success"/>
-          <a-alert message="流程编号:[SySSequence]" type="success"/>
-          <a-alert message="发起人:[SySOriginator]" type="success"/>
+          <a-row>
+            <a-col :span="4">
+              <a-alert message="字段:{字段编号}" type="success"/>
+            </a-col>
+            <a-col :span="4">
+              <a-alert message="流程编号:[SySSequence]" type="success"/>
+            </a-col>
+            <a-col :span="4">
+              <a-alert message="发起人:[SySOriginator]" type="success"/>
+            </a-col>
+          </a-row>
+
+
         </a-space>
       </a-row>
       <a-row class='curRow'>