vue2-client 1.19.88 → 1.19.90

package/package.json

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

package/src/base-client/components/common/AmapMarker/index.js

@@ -1,3 +1,3 @@
-import AmapPointRendering from './AmapPointRendering'
-
-export default AmapPointRendering
+import AmapPointRendering from './AmapPointRendering'
+
+export default AmapPointRendering

package/src/base-client/components/common/XDetailsView/index.js

@@ -1,3 +1,3 @@
-import XDetailsView from './XDetailsView'
-
-export default XDetailsView
+import XDetailsView from './XDetailsView'
+
+export default XDetailsView

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

@@ -401,13 +401,13 @@ export default {
           ['curOrgId', 'curDepId', 'curUserId'].includes(item.queryFormDefault)
         ) {
           if (item.queryFormDefault === 'curOrgId') {
-            formData[item.model] = item.type === 'select' ? this.currUser.orgid : [this.currUser.orgid]
+            formData[item.model] = item.type === 'select' ? this.currUser.orgid : [this.currUser.orgid + '']
           }
           if (item.queryFormDefault === 'curDepId') {
-            formData[item.model] = item.type === 'select' ? this.currUser.depids : [this.currUser.depids]
+            formData[item.model] = item.type === 'select' ? this.currUser.depids : [this.currUser.depids + '']
           }
           if (item.queryFormDefault === 'curUserId') {
-            formData[item.model] = item.type === 'select' ? this.currUser.id : [this.currUser.id]
+            formData[item.model] = item.type === 'select' ? this.currUser.id : [this.currUser.id + '']
           }
         } else {
           formData[item.model] = item.queryFormDefault
@@ -586,7 +586,7 @@ export default {
           } else {
             displayValue = String(currentValue)
           }
-          
+
           labelData[fieldName] = displayValue
           // 添加表单项的中文标签（attr.name）
           if (attr.name) {

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

@@ -913,7 +913,6 @@ export default {
     },
     form: {
       handler(newVal, oldVal) {
-        // 如果是从函数获取 options
         if (
           this.attr.keyName &&
           (this.attr.keyName.toString().indexOf('async ') !== -1 ||
@@ -938,14 +937,24 @@ export default {
           this?.attr?.keyName?.toString()?.startsWith('search@根据表单项[') &&
           this?.attr?.keyName?.toString().endsWith(']联动人员')
         ) {
-          this.debouncedUserLinkFunc()
+          const startIndex = this.attr.keyName.indexOf('[') + 1
+          const endIndex = this.attr.keyName.indexOf(']', startIndex)
+          const fromModel = this.attr.keyName.substring(startIndex, endIndex).replace('.', '_')
+          if (JSON.stringify(newVal[fromModel]) !== JSON.stringify(oldVal[fromModel])) {
+            this.debouncedUserLinkFunc()
+          }
         }
-        // 数据源来自人员联动时更新数据
+        // 数据源来自部门联动时更新数据
         if (
           this?.attr?.keyName?.toString()?.startsWith('search@根据表单项[') &&
           this?.attr?.keyName?.toString().endsWith(']联动部门')
         ) {
-          this.debouncedDepLinkFunc()
+          const startIndex = this.attr.keyName.indexOf('[') + 1
+          const endIndex = this.attr.keyName.indexOf(']', startIndex)
+          const fromModel = this.attr.keyName.substring(startIndex, endIndex).replace('.', '_')
+          if (JSON.stringify(newVal[fromModel]) !== JSON.stringify(oldVal[fromModel])) {
+            this.debouncedDepLinkFunc()
+          }
         }
       },
       deep: true

package/src/base-client/components/common/XFormGroupDetails/index.js

@@ -1,3 +1,3 @@
-import XFormGroupDetails from './XFormGroupDetails'
-
-export default XFormGroupDetails
+import XFormGroupDetails from './XFormGroupDetails'
+
+export default XFormGroupDetails

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

@@ -115,7 +115,7 @@
       </span>
       <span v-else-if="item.slotType === 'action'" :key="'action-' + c_index">
         <template v-if="item.actionArr && item.actionArr.length > 0">
-          <a-dropdown placement="bottomCenter" :getPopupContainer="getPopupContainer">
+          <a-dropdown placement="bottomCenter" :trigger="['click']" :getPopupContainer="getPopupContainer">
             <a class="ant-dropdown-link" @click="e => e.preventDefault()">
               {{ item.scopedSlots?.customRender || item.slotValue }} <a-icon type="down"/>
             </a>
@@ -289,7 +289,7 @@
       </span>
       <span v-else-if="item.slotType === 'action'" :key="'action-' + c_index">
         <template v-if="item.actionArr && item.actionArr.length > 0">
-          <a-dropdown
+          <a-dropdown :trigger="['click']"
             placement="bottomRight"
             overlayClassName="x-table-action-dropdown"
             :getPopupContainer="getPopupContainer"

package/src/router/async/router.map.js

@@ -55,8 +55,8 @@ routerResource.example = {
   // component: () => import('@vue2-client/pages/LayoutTest/index.vue')
   // component: () => import('@vue2-client/base-client/components/common/XDescriptions/demo.vue')
   // component: () => import('@vue2-client/base-client/components/his/HChart/demo.vue'),
-  component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue')
+  // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
+  component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue')
   // component: () => import('@vue2-client/base-client/components/common/AfMap/demo.vue')
   // component: () => import('@vue2-client/base-client/components/common/ImagePreviewModal/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XImagePreview/demo.vue'),

package/vue.config.js

@@ -45,8 +45,7 @@ module.exports = {
         changeOrigin: true
       },
       '/api/af-revenue': {
-        pathRewrite: { '^/api/af-revenue/': '/' },
-        target: 'http://127.0.0.1:9026',
+        target: v3Server,
         changeOrigin: true
       },
       '/revenue-web/api/af-revenue': {