vue2-client 1.15.116 → 1.15.118

package/package.json

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

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

@@ -8,55 +8,9 @@ export default {
     return {
       visible: false,
       userinfo: {
-        f_userinfo_code: '11058432',
-        f_user_name: '李四',
-        f_userinfo_id: 88025,
-        f_used_name: null,
-        f_user_phone: '13201496890',
-        f_user_state: '正常',
-        f_idnumber: null,
-        f_house_type: '楼房',
-        f_people_num: 0,
-        f_user_level: null,
-        f_book_no: null,
-        f_address: null,
-        f_meter_type: null,
-        f_meter_brand: null,
-        f_meter_style: null,
-        f_metertitles: null,
-        f_aroundmeter: null,
-        f_initial_base: null,
-        f_bqf_type: null,
-        f_gas_person: null,
-        f_use_limit: null,
-        f_gas_date: null,
-        f_position: null,
-        f_install_person: null,
-        f_inputtor: null,
-        f_book_name: null,
-        f_adjustable_name: null,
-        f_price_name: null,
-        f_price_type: null,
-        f_user_type: null,
-        f_gasproperties: null,
-        f_comments: null,
-        f_price_detail: null,
-        f_taxpayer_id: '123',
-        f_paper_name: '123',
-        f_address_phone: '111',
-        f_paper_account: '111',
-        f_rent_name: null,
-        f_zuhu_phone: null,
-        f_meternumber: null,
-        devices: [
-          {
-            f_devices_type: '灶具',
-            f_devices_no: null,
-            f_brand: null,
-            f_devices_model: '123',
-            f_devices_num: null
-          }
-        ]
+        f_userinfo_code: '143400000003',
+        f_gasbrand: '测试表品牌',
+        f_address: '11'
       }
     }
   },
@@ -87,7 +41,7 @@ export default {
       :visible="visible"
       @close="()=>{visible = false}"
     >
-      <x-descriptions-group config-name="用户详情描述列表" :showLeftTab="true" :data="userinfo" service-name="af-system"/>
+      <x-descriptions-group config-name="测试Config" :showLeftTab="true" :data="userinfo" service-name="af-system"/>
     </a-drawer>
   </div>
 </template>

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

@@ -887,7 +887,7 @@ export default {
     if (this.attr.showQueryFormItemFunc) {
       this.debouncedShowQueryFormItemFunc = debounce(this.showQueryFormItemFunc, 100)
       // 执行一次
-      this.showFormItemFunc()
+      this.showQueryFormItemFunc()
     }
     // 人员联动框增加监听
     if (this?.attr?.keyName?.toString()?.startsWith('search@根据表单项[') && this?.attr?.keyName?.toString().endsWith(']联动人员')) {
@@ -906,7 +906,12 @@ export default {
     queryParamsName () {
       if (this.attr.keyName.startsWith('function')) {
         // 调用异步函数获取内容
-        return executeStrFunctionByContext(this, this.attr.keyName, [this.form, runLogic, this.mode, getConfigByNameAsync])
+        const obj = executeStrFunctionByContext(this, this.attr.keyName, [this.form, runLogic, this.mode, getConfigByNameAsync])
+        // 处理同步返回值
+        return this.handleQueryParamsResult(obj)
+      } else if (this.attr.keyName.startsWith('async ')) {
+        console.warn('此处不支持异步操作')
+        return ''
       } else {
         // 按现有方式处理
         return this.attr.keyName.split('@')[this.attr.keyName.split('@').length - 1]
@@ -998,6 +1003,24 @@ export default {
     }
   },
   methods: {
+    // 处理 queryParams 结果并更新 rowChooseFixedQueryValue
+    handleQueryParamsResult (obj) {
+      let configName = ''
+      if (obj && typeof obj === 'object') {
+        // obj 是一个对象，并且不是数组
+        if (Object.prototype.hasOwnProperty.call(obj, 'configName')) {
+          configName = obj?.configName
+        }
+        if (Object.prototype.hasOwnProperty.call(obj, 'fixedQueryForm')) {
+          if (obj?.fixedQueryForm && typeof obj?.fixedQueryForm === 'object') {
+            this.rowChooseFixedQueryValue = Object.assign({}, this.rowChooseFixedQueryValue, obj.fixedQueryForm)
+          }
+        }
+      } else if (obj && typeof obj === 'string') {
+        configName = obj
+      }
+      return configName
+    },
     // 根据selectValueType预处理options数据
     processOptionsForValueType (options) {
       return this.selectValueTypeHandler.processOptions(options, this.attr.selectValueType)

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

@@ -8,7 +8,7 @@
       @action="action"
       @selectRow="selectRow"
       @columnClick="columnClick"
-      serviceName="af-revenue"
+      serviceName="af-system"
       ref="xFormTable">
     </x-form-table>
   </a-card>
@@ -26,7 +26,7 @@ export default {
   data () {
     return {
       // 查询配置文件名
-      queryParamsName: 'UserFilesListCRUD',
+      queryParamsName: 'ceshiCRUD',
       // 新增表单固定值
       fixedAddForm: {},
       // 是否显示详情抽屉

package/src/pages/login/Login.vue

@@ -198,7 +198,6 @@ export default {
         address: '西安市',
         position: positions[0]
       }, result)
-      console.warn(JSON.stringify(user))
       this.setUser(user)
       this.setPermissions(Vue.$login.r || [])
       this.setRoles(result.rolestr?.split(',') || [])

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

@@ -56,11 +56,11 @@ path: 'example',
   // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo2.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/XDescriptions/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/XFormTable/demo.vue'),
+  component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XDatePicker/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XTab/XTabDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XRate/demo.vue'),

package/src/router/guards.js

@@ -176,7 +176,7 @@ const loginGuard = (to, form, next, options) => {
     }
     next()
   } else {
-    const { store, message } = options
+    const { message } = options
     if (
       (!loginIgnore.includes(to) || to.name === '404') &&
       !checkAuthorization()
@@ -184,15 +184,15 @@ const loginGuard = (to, form, next, options) => {
       message.warning('登录已失效，请重新登录')
       next({ path: '/login' })
     } else {
-      const roles = store.getters['account/roles']
-      if (roles.length === 0 && !loginIgnore.includes(to)) {
-        message.warning('登录已失效，请重新登录')
-        logout().finally((res) => {
-          next({ path: '/login' })
-        })
-      } else {
+      // const roles = store.getters['account/roles']
+      // if (roles.length === 0 && !loginIgnore.includes(to)) {
+      //   message.warning('登录已失效，请重新登录')
+      //   logout().finally((res) => {
+      //     next({ path: '/login' })
+      //   })
+      // } else {
         next()
-      }
+      // }
     }
   }
 }