vue2-client 1.15.9 → 1.15.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.15.9",
+  "version": "1.15.11",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/base-client/components/common/XDatePicker/index.vue

@@ -195,6 +195,7 @@ export default {
         (attr?.queryType !== 'BETWEEN' || mode !== '查询')) ||
         (['rangePicker'].includes(attr.type) && mode !== '查询')
     "
+    :getCalendarContainer="(triggerNode) => triggerNode.parentNode"
     v-model="localValue"
     :disabled="disabled || readOnly"
     style="width: 100%"
@@ -210,6 +211,7 @@ export default {
       attr.type === 'monthPicker' ||
         (attr.type === 'monthRangePicker' && mode !== '查询')
     "
+    :getCalendarContainer="(triggerNode) => triggerNode.parentNode"
     v-model="localValue"
     :disabled="disabled || readOnly"
     :show-time="true"
@@ -223,6 +225,7 @@ export default {
       attr.type === 'yearPicker' ||
         (attr.type === 'yearRangePicker' && mode !== '查询')
     "
+    :getCalendarContainer="(triggerNode) => triggerNode.parentNode"
     v-model="localValue"
     :disabled="disabled || readOnly"
     format="YYYY"
@@ -247,6 +250,7 @@ export default {
         (attr.type === 'rangePicker' && mode === '查询') ||
         ['yearRangePicker', 'monthRangePicker'].includes(attr.type)
     "
+    :getCalendarContainer="(triggerNode) => triggerNode.parentNode"
     v-model="localValue"
     :disabled="disabled"
     :placeholder="placeholder"

package/src/base-client/components/common/XForm/XFormItem.vue

@@ -103,6 +103,7 @@
         :placeholder="attr.placeholder ? attr.placeholder : '请选择'"
         show-search
         :allowClear="true"
+        :getCalendarContainer="(triggerNode) => triggerNode.parentNode"
       >
         <a-select-option
           v-if="mode === '查询'"
@@ -1319,8 +1320,8 @@ export default {
       this.emitFunc('recordingData', data)
     },
     getPopupContainer (triggerNode) {
-      return document.body
-      // return triggerNode.parentNode
+      // return document.body
+      return triggerNode.parentNode
     },
   }
 }

package/src/base-client/components/common/XForm/XTreeSelect.vue

@@ -17,6 +17,7 @@
         allow-clear
         :showArrow="true"
         class="tree-select"
+        :getPopupContainer="(triggerNode) => triggerNode.parentNode"
         @change="onTreeSelectChange">
       </a-tree-select>
     </a-form-model-item>

package/src/base-client/components/common/XFormTable/demo.vue

@@ -25,7 +25,7 @@ export default {
   data () {
     return {
       // 查询配置文件名
-      queryParamsName: 'ChargeQueryCRUD',
+      queryParamsName: 'ceshiCRUD',
       // 新增表单固定值
       fixedAddForm: {},
       // 是否显示详情抽屉

package/src/base-client/components/common/XTable/XTable.vue

@@ -974,6 +974,8 @@ export default {
               }
             })
           }
+        }).catch(() => {
+          this.$message.error('查询超时！')
         })
       }
 

package/src/pages/WorkflowDetail/WorkFlowDemo.vue

@@ -202,7 +202,7 @@ export default {
     updateFormData (workflowId) {
       runLogic('queryAgreementAmount', { workflowId: workflowId }, 'af-apply').then((res) => {
         console.log('>>>> res==', res)
-        this.$refs.workFlow.$refs.workflowHandle.$refs.xAddForm.form.add_amount = 1200
+        this.$refs.workFlow.$refs.workflowHandle.$refs.xAddForm.setForm({ add_amount: 1200 })
       })
       console.log()
     }

package/src/pages/WorkflowDetail/WorkflowPageDetail/WorkFlowHandle.vue

@@ -105,6 +105,7 @@
                 :help="deadlineHelp"
                 required>
                 <a-date-picker
+                  :getCalendarContainer="(triggerNode) => triggerNode.parentNode"
                   v-model="deadline"
                   value-format="YYYY-MM-DD HH:mm"
                   format="YYYY-MM-DD HH:mm"
@@ -270,9 +271,14 @@ export default {
       if (!this.currentStepId) {
         return false
       }
+
       // 如果当前选中节点不是正在进行的节点，则判断viewers权限
       if (this.activeStepId !== this.currentStepId) {
         const activeStep = this.stepsForChild.find(item => item.id === this.activeStepId)
+        // 历史节点为当前登录人操作则不做查看数据权限校验
+        if (activeStep.handler === this.currUser.name) {
+          return true
+        }
         const viewers = activeStep?.properties?.otherProperty?.viewers ?? []
         if (viewers.length > 0) {
           // 使用some方法判断当前人员是否满足任一条件
@@ -856,10 +862,11 @@ export default {
         // 将回显数据拷贝，避免引用传递
         formCompletedDataPreview = JSON.parse(JSON.stringify(this.formCompletedData))
         // 使用字段定义中内容，将回显数据的列名，替换为定义的中文名
-        const formData = formCompletedDataPreview.data
+        // 调整逻辑：formData中只显示流程配置表单中定义过的显示列，多余冗余的存储列不进行页面展示
+        const formData = {}
         const currentStepDefine = this.stepsDefine.find(item => item.id === stepId)
         const isKeyHandle = currentStepDefine?.properties?.form?.isKeyHandle || false
-        for (const key in formData) {
+        for (const key in formCompletedDataPreview.data) {
           for (let i = 0; i < this.targetStepDefine.length; i++) {
             const stepDefine = this.targetStepDefine[i]
             // 兼容下旧代码，这里是否处理key根据表单配置中的isKeyHandle来决定，也有另一种情况如果处理完的key在表单中已经重复会将未处理的key直接存进去（新增表单的逻辑）
@@ -875,16 +882,19 @@ export default {
                     }
                   }
                 } else {
-                  formData[stepDefine.name] = formData[key]
+                  formData[stepDefine.name] = formCompletedDataPreview.data[key]
                 }
               }
-              if (key !== stepDefine.name) {
-                delete formData[key]
-              }
+              // if (key !== stepDefine.name) {
+              //   delete formData[key]
+              // }
               break
             }
           }
         }
+        if (Object.keys(formData).length > 0) {
+          formCompletedDataPreview.data = formData
+        }
         if (!Object.keys(formCompletedDataPreview.data).length) {
           formCompletedDataPreview.data = null
         }

package/src/pages/WorkflowDetail/WorkflowPageDetail/components/WorkflowPersonSelector.vue

@@ -10,11 +10,12 @@
       >
         <a-select
           :value="getBranchPersonValue(node.stepId)"
+          :getPopupContainer="(triggerNode) => triggerNode.parentNode"
           @change="setBranchPersonValue(node.stepId, $event, node.chargePersonOptions)"
           :placeholder="`请选择${node.stepName}的处理人`"
           :options="node.chargePersonOptions"
           :filter-option="filterOption"
-          style="width: 300px"
+          style="width: 195px"
           show-search
         >
           <a-select-option v-for="option in node.chargePersonOptions" :key="option.value" :value="option.value">
@@ -29,10 +30,12 @@
       <a-select
         v-model="workflowHandleWrap.checkedChargePerson"
         placeholder="请选择或搜索"
+        :getPopupContainer="(triggerNode) => triggerNode.parentNode"
         :options="workflowHandleWrap.chargePersonOptions"
         @change="setBranchPersonValue(workflowHandleWrap.calculatedTargetNode, $event, workflowHandleWrap.chargePersonOptions)"
         :filter-option="filterOption"
-        style="width: 300px"
+        style="width: 195px"
+        show-search
       />
       <!--      <div v-if="workflowHandleWrap.calculatedTargetNode" style="margin-top: 8px; color: #52c41a; font-size: 12px;">-->
       <!--        <a-icon type="check-circle"/>-->

package/vue.config.js

@@ -53,8 +53,7 @@ module.exports = {
         changeOrigin: true
       },
       '/api/af-apply': {
-        pathRewrite: { '^/api/af-apply': '/' },
-        target: 'http://127.0.0.1:9031',
+        target: revenue,
         changeOrigin: true
       },
       '/api/af-scada': {