vue2-client 1.18.53 → 1.18.55

package/package.json

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

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

@@ -516,6 +516,23 @@ export default {
     },
     setForm(obj) {
       this.form = Object.assign(this.form, obj)
+    },
+    /**
+     * 主动触发表单提交
+     * 用于 queryTable 等场景，确保走相同的数据处理流程
+     * @param {Object} conditionParams - 额外的查询条件参数
+     */
+    submitForm(conditionParams = {}) {
+      // 备份一下 form 这个函数传递的 condition 仅临时用一下
+      // 如果要实质修改 form 从其他地方赋值
+      const _from = JSON.parse(JSON.stringify(this.form))
+      // 将外部参数合并到表单中
+      if (Object.keys(conditionParams).length > 0) {
+        this.form = Object.assign({}, this.form, conditionParams)
+      }
+      // 调用现有的 onSubmit 方法，触发 emit
+      this.onSubmit()
+      this.form = _from
     }
   },
   mounted() {

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

@@ -1032,7 +1032,10 @@ export default {
       if (this.tableShowMode === 'popup') {
         this.formQueryLoading = true
       }
-      this.$refs.xTable.queryTable(conditionParams)
+      // 调用 XForm 的 submitForm 方法
+      // 这会触发 emit 'onSubmit'，然后走现有的 onSearchSubmit 逻辑
+      // 最终通过 setQueryForm → refresh → loadData 进行数据处理
+      this.$refs.xForm.submitForm(conditionParams)
     },
     /**
      * 向外暴露 resetForm 函数

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

@@ -1,5 +1,8 @@
 <template>
   <a-card :bordered="false">
+    <div style="margin-bottom: 16px">
+      <a-button type="primary" @click="handleCustomQuery">查询 XianFeng 数据</a-button>
+    </div>
     <x-form-table
       title="示例表单"
       :queryParamsName="queryParamsName"
@@ -14,10 +17,9 @@
       :defaultQueryForm="{
         s_f_user_name: '张三'
       }"
-      serviceName="af-system"
+      serviceName="af-revenue"
       ref="xFormTable"
     ></x-form-table>
-    <div style="height: 100px; width: 100%; background-color: #f0f2f5"></div>
   </a-card>
 </template>
 
@@ -32,7 +34,7 @@ export default {
   data() {
     return {
       // 查询配置文件名
-      queryParamsName: 'ceshiCRUD',
+      queryParamsName: 'ChargeCenterQueryUserCRUD',
       // 查询配置左侧tree
       xTreeConfigName: 'addressType',
       // 新增表单固定值
@@ -51,7 +53,12 @@ export default {
   },
 
   methods: {
-    // ========== 原有方法 ==========
+    handleCustomQuery() {
+      this.$refs.xFormTable.queryTable({
+        uf_f_alias: 'XianFeng',
+        uf_f_card_id: '10500030'
+      })
+    },
     rowDblClick(record) {
       console.log('rowDblClick', record)
     },

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

@@ -1220,18 +1220,6 @@ export default {
       // 如果要实质修改 form 需要在 x-form 中赋值
       const _from = JSON.parse(JSON.stringify(this.form))
       this.form = Object.assign(_from, conditionParams)
-      for (const key of Object.keys(this.form)) {
-        if (this.form[key] === null || this.form[key] === '') {
-          this.form[key] = undefined
-        }
-        // 树形选择框重置后会重置为[undefined],查询时为[null]
-        if (
-          Array.isArray(this.form[key]) &&
-          (this.form[key].length === 0 || this.form[key][0] === null || this.form[key][0] === undefined)
-        ) {
-          this.form[key] = undefined
-        }
-      }
       await this.refresh(true)
       this.form = _from
     },

package/src/components/xScrollBox/index.vue

@@ -5,21 +5,32 @@
 </template>
 
 <script>
+import { isMicroAppEnv } from '@vue2-client/utils/microAppUtils'
+
 export default {
   name: 'XScrollBox',
-  data () {
+  data() {
     return {
       scrollBoxRef: null
     }
   },
   computed: {
     // 判断当前是否为 blank 模式
-    isBlankMode () {
+    isBlankMode() {
       return process.env.VUE_APP_SINGLE_PAPER === 'TRUE'
     },
-    computedStyle () {
+    computedStyle() {
       if (this.isBlankMode) {
-        // blank 模式下使用 100%
+        // blank 模式下，如果是微应用环境，使用父级 CSS 变量
+        if (isMicroAppEnv()) {
+          return {
+            height: 'var(--parent-scroll-height, 100%)',
+            maxHeight: 'var(--parent-scroll-height, 100%)',
+            minHeight: 'var(--parent-scroll-height, 100%)',
+            overflow: 'auto'
+          }
+        }
+        // 非微应用环境使用 100%
         return {
           height: '100%',
           maxHeight: '100%',
@@ -36,7 +47,7 @@ export default {
       }
     }
   },
-  mounted () {
+  mounted() {
     // 获取滚动容器引用
     this.scrollBoxRef = this.$el
   },
@@ -45,7 +56,7 @@ export default {
      * 滚动到顶部
      * @param {boolean} smooth - 是否平滑滚动，默认 true
      */
-    scrollToTop (smooth = true) {
+    scrollToTop(smooth = true) {
       if (this.scrollBoxRef) {
         this.scrollBoxRef.scrollTo({
           top: 0,
@@ -61,7 +72,7 @@ export default {
      * @param {number} left - 水平位置，默认 0
      * @param {boolean} smooth - 是否平滑滚动，默认 true
      */
-    scrollTo (top, left = 0, smooth = true) {
+    scrollTo(top, left = 0, smooth = true) {
       if (this.scrollBoxRef) {
         this.scrollBoxRef.scrollTo({
           top,
@@ -75,7 +86,7 @@ export default {
      * 获取当前滚动位置
      * @returns {Object} - { scrollTop, scrollLeft }
      */
-    getScrollPosition () {
+    getScrollPosition() {
       if (this.scrollBoxRef) {
         return {
           scrollTop: this.scrollBoxRef.scrollTop,

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

@@ -55,13 +55,13 @@ routerResource.example = {
   // 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/base-client/components/common/XFormTable/demo.vue')
   // component: () => import('@vue2-client/base-client/components/common/ImagePreviewModal/demo.vue'),
   // component: () => import('@vue2-client/components/xScrollBox/example.vue'),
   // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
   // component: () => import('@vue2-client/pages/addressSelect/addressDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XDescriptions/demo.vue'),
-  component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue')
+  // component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue')
   // component: () => import('@vue2-client/base-client/components/common/XFormGroup/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XReport/XReportDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo.vue'),