vue2-client 1.19.19 → 1.19.21

package/package.json

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

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

@@ -260,6 +260,8 @@ export default {
       rules: {},
       // 调用logic获取数据源的追加参数
       getDataParams: {},
+      // 外部数据（通过 XFormGroup 或直接传入）
+      externalData: {},
       // 动态简易表单集合
       simpleFormJsonData: {},
       // 待修改的数据集
@@ -454,7 +456,9 @@ export default {
       setRequired: this.setRequired,
       getSelf: () => this,
       // 传递 formGroupContext 给子组件
-      formGroupContext: this.formGroupContext
+      formGroupContext: this.formGroupContext,
+      // 传递外部数据给子组件
+      _getExternalData: this.getExternalData
     }
   },
   watch: {
@@ -543,6 +547,7 @@ export default {
         title,
         fixedAddForm = {},
         getDataParams = {},
+        externalData = {},
         simpleFormJsonData = {},
         env = 'prod',
         layout,
@@ -583,6 +588,7 @@ export default {
       this.businessType = businessType
       this.title = title
       this.getDataParams = getDataParams
+      this.externalData = externalData
       this.simpleFormJsonData = simpleFormJsonData
       this.env = env
       this.btnName = btnName
@@ -638,6 +644,9 @@ export default {
       }
       this.loaded = true
     },
+    getExternalData() {
+      return this.externalData
+    },
     scrollToGroup(index) {
       const groupElement = this.$refs[`group-title-${index}`][0]
       if (groupElement) {

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

@@ -983,9 +983,20 @@ export default {
     // 表单组上下文（通过注入传递）
     formGroupContext: {
       default: null
+    },
+    // 外部数据（通过 XAddNativeForm 的 provide 传递）
+    _getExternalData: {
+      default: () => ({})
     }
   },
   methods: {
+    /**
+     * 获取外部数据
+     * @returns {Object} 外部扩展数据对象 比如收费表单中俄的 用户信息要参与表单判断
+     */
+    getExternalData() {
+      return this._getExternalData() || {}
+    },
     // 处理 queryParams 结果并更新 rowChooseFixedQueryValue
     handleQueryParamsResult(obj) {
       let configName = ''

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

@@ -77,7 +77,8 @@ export default {
       env: 'dev',
       spinning: true,
       loadingErr: false,
-      activeTab: 0
+      activeTab: 0,
+      externalData: {}
     }
   },
   mounted() {},
@@ -117,10 +118,12 @@ export default {
       env = 'prod',
       showLeftTab = false,
       businessType = '新增',
-      formShow = {}
+      formShow = {},
+      externalData = {}
     }) {
       Object.assign(this, { groups, modifyModelData, serviceName, env, showLeftTab, businessType })
       this.formShow = { ...formShow }
+      this.externalData = externalData
       this.initView()
       this.$nextTick(() => {
         const formGroupContext = this.$refs.formGroupContext?.$el
@@ -206,6 +209,7 @@ export default {
         businessType: this.businessType,
         env: this.env,
         groupName: res.groupName,
+        externalData: this.externalData,
         ...res
       }
       params.showSubmitBtn = false
@@ -316,7 +320,6 @@ export default {
       }
       // 更新 allFormData
       this.$set(this.allFormData, groupName, formData)
-      console.warn('handleFormDataChange allFormData', this.allFormData)
       // 触发其他表单的刷新
       this.$nextTick(() => {
         this.groups.forEach((item, index) => {

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

@@ -14,7 +14,11 @@ export default {
     getConfigByNameAsync('changeMeterFormGroup', 'af-revenue').then(res => {
       this.$refs.xFormGroupDemo.init({
         ...res,
-        serviceName: 'af-revenue'
+        serviceName: 'af-revenue',
+        externalData: {
+          a:1,
+          v:2
+        }
       })
     })
   },

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

@@ -15,7 +15,7 @@
       @rowDblClick="rowDblClick"
       :defaultPageSize="5"
       :defaultQueryForm="{
-        s_f_user_name: '张三'
+        s_id: '21985716'
       }"
       serviceName="af-revenue"
       ref="xFormTable"
@@ -34,7 +34,7 @@ export default {
   data() {
     return {
       // 查询配置文件名
-      queryParamsName: 'ChargeCenterQueryUserCRUD',
+      queryParamsName: 'ceshiCRUD',
       // 查询配置左侧tree
       xTreeConfigName: 'addressType',
       // 新增表单固定值

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

@@ -276,9 +276,9 @@
             :getPopupContainer="getPopupContainer"
             :overlayStyle="{
               whiteSpace: 'nowrap',
-              maxWidth: '250px',
-              overflow: 'hidden',
-              textOverflow: 'ellipsis'
+              maxHeight: '300px',
+              overflowY: 'auto',
+              zIndex: 99999
             }"
           >
             <a class="ant-dropdown-link" @click="e => e.preventDefault()">
@@ -532,19 +532,7 @@ export default {
   inject: ['tableContext'],
   methods: {
     getPopupContainer (triggerNode) {
-      // 限制最多向上查找5层
-      let parent = triggerNode.parentNode
-      let depth = 0
-      const maxDepth = 10
-
-      while (parent && parent !== document.body && depth < maxDepth) {
-        if (parent.tagName === 'TBODY') {
-          return parent
-        }
-        parent = parent.parentNode
-        depth++
-      }
-      // 如果5层内没找到，回退到body
+      // 始终将弹窗渲染到body中，确保层级不受容器限制
       return document.body
     },
     handleRowClick (record) {
@@ -740,6 +728,7 @@ export default {
   border: 1px solid #e8e8e8;
   border-radius: 4px;
   box-shadow: 0 6px 16px rgba(0, 0, 0, 0.12);
+  z-index: 9999;
 }
 
 /* vue-draggable-resizable 拖动手柄样式 */