vue2-client 1.18.41 → 1.18.45

package/.eslintrc.js

@@ -3,12 +3,10 @@ module.exports = {
   env: {
     node: true
   },
-  extends: [
-    'plugin:vue/essential',
-    'plugin:vue/strongly-recommended',
-    '@vue/standard'
-  ],
+  // prettier 放最后，自动关闭所有与 Prettier 冲突的格式规则
+  extends: ['plugin:vue/essential', 'plugin:vue/strongly-recommended', '@vue/standard', 'prettier'],
   rules: {
+    camelcase: 'off',
     'comma-dangle': 'off',
     'no-console': 'off',
     'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
@@ -21,7 +19,7 @@ module.exports = {
           max: 5
         },
         multiline: {
-          max: 1,
+          max: 1
         }
       }
     ],
@@ -37,10 +35,7 @@ module.exports = {
     'vue/no-parsing-error': 0,
     'vue/name-property-casing': 0,
     'vue/multi-word-component-names': 0,
-    'vue/require-valid-default-prop': 0,
-    'no-template-curly-in-string': 0,
     'vue/no-mutating-props': 0,
-    'no-useless-escape': 0,
     'no-tabs': 0,
     'multiline-ternary': 0,
     'object-shorthand': 0,
@@ -71,17 +66,16 @@ module.exports = {
     // 必须使用全等: false
     eqeqeq: 0,
     // 可以使用!! 双重否定
-    'no-extra-boolean-cast': 'off'
+    'no-extra-boolean-cast': 'off',
+    // 关闭函数名后空格检查，跟随 Prettier 默认风格 function foo()
+    'space-before-function-paren': 'off'
   },
   parserOptions: {
     parser: '@babel/eslint-parser'
   },
   overrides: [
     {
-      files: [
-        '**/__tests__/*.{j,t}s?(x)',
-        '**/tests/unit/**/*.spec.{j,t}s?(x)'
-      ],
+      files: ['**/__tests__/*.{j,t}s?(x)', '**/tests/unit/**/*.spec.{j,t}s?(x)'],
       env: {
         jest: true
       }

package/.prettierignore

@@ -0,0 +1,6 @@
+dist
+node_modules
+*.md
+*.yml
+*.yaml
+public

package/.prettierrc

@@ -0,0 +1,13 @@
+{
+  "semi": false,
+  "singleQuote": true,
+  "tabWidth": 2,
+  "useTabs": false,
+  "trailingComma": "none",
+  "printWidth": 120,
+  "bracketSpacing": true,
+  "arrowParens": "avoid",
+  "endOfLine": "lf",
+  "htmlWhitespaceSensitivity": "ignore",
+  "vueIndentScriptAndStyle": false
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.18.41",
+  "version": "1.18.45",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",
@@ -87,6 +87,7 @@
     "css-minimizer-webpack-plugin": "^5.0.1",
     "deepmerge": "^4.3.1",
     "eslint": "^8.51.0",
+    "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-vue": "^9.17.0",
     "fast-deep-equal": "^3.1.3",
     "ignore-loader": "^0.1.2",

package/src/base-client/components/common/HIS/HForm/HForm.vue

@@ -27,6 +27,7 @@ const wrapperClassObject = computed(() => {
     'padding-50',
     'label-text-horizontal',
     'label-text-justify',
+    'simple-inline',
     'label-justify',
     'charge-form'
   ]
@@ -132,6 +133,15 @@ defineExpose({
     }
   }
 
+  &.h-form-simple-inline {
+    :deep(.ant-form-item-label){
+      display: none !important;
+    }
+    :deep(.ant-form-item-control-wrapper){
+      width: 100%;
+    }
+  }
+
   &.h-form-padding-50 {
     // ant-row-flex 样式
     :deep(.ant-row-flex) {

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

@@ -4,12 +4,8 @@
     <template v-if="tabMode === 'left'">
       <a-col :span="4" v-if="realData.length">
         <a-tabs tab-position="left" v-model="activeTab" @change="scrollToGroup">
-          <template v-for="(item,index) in realData">
-            <a-tab-pane
-              :tab="item.title"
-              :key="index"
-              v-if="item.title">
-            </a-tab-pane>
+          <template v-for="(item, index) in realData">
+            <a-tab-pane :tab="item.title" :key="index" v-if="item.title"></a-tab-pane>
           </template>
         </a-tabs>
       </a-col>
@@ -18,45 +14,40 @@
           class="descriptions-item"
           :ref="`descriptions-item-${realDataIndex}`"
           :key="realDataIndex"
-          v-for="(realDataItem, realDataIndex) in realData">
+          v-for="(realDataItem, realDataIndex) in realData"
+        >
           <!-- 渲染所有分组内容 -->
           <template v-if="!loadError">
             <!-- 带有子的详情 -->
-            <template
-              v-if="realDataItem.title && groups[realDataIndex]?.type ==='array'"
-            >
+            <template v-if="realDataItem.title && groups[realDataIndex]?.type === 'array'">
               <div class="ant-descriptions-title">{{ realDataItem.title }}</div>
               <div class="descriptions-array-item">
                 <a-descriptions
-                  v-for="(arrayItem,arrayIndex) in realDataItem.column"
+                  v-for="(arrayItem, arrayIndex) in realDataItem.column"
                   :column="isMobile ? 1 : column"
                   size="small"
                   :key="arrayIndex"
-                  :title="arrayItem.title">
+                  :title="arrayItem.title"
+                >
                   <template v-for="(item, index) in arrayItem.column">
                     <!-- 大多数情况 循环下 空值省略不展示，todo 后期可能加配置处理 -->
-                    <a-descriptions-item
-                      :key="index"
-                      v-if="item.value"
-                      :label="item.key">
+                    <a-descriptions-item :key="index" v-if="item.value" :label="item.key">
                       {{ formatText(item.value) }}
                     </a-descriptions-item>
                   </template>
                 </a-descriptions>
               </div>
             </template>
-            <a-descriptions
-              v-else-if="realDataItem.title"
-              :column="isMobile ? 1 : column"
-              :title="realDataItem.title">
+            <a-descriptions v-else-if="realDataItem.title" :column="isMobile ? 1 : column" :title="realDataItem.title">
               <a-descriptions-item
                 v-for="(item, index) in realDataItem.column"
                 :key="index"
                 :span="item.span || 1"
-                v-if="shouldShowField(item, data)">
+                v-if="shouldShowField(item, data)"
+              >
                 <template #label>
                   {{ item.key }}
-                  <span v-if="isFieldRequired(item, data)" style="color: red;"> *</span>
+                  <span v-if="isFieldRequired(item, data)" style="color: red">*</span>
                 </template>
                 <span :style="getFieldStyle(item, data)">{{ formatFieldValue(item.value, item, data) || '--' }}</span>
               </a-descriptions-item>
@@ -70,27 +61,23 @@
     <template v-else-if="tabMode === 'top'">
       <a-col :span="24" v-if="realData.length">
         <a-tabs v-model="activeTab" size="small" :tabBarStyle="{ margin: 0, padding: '0 8px' }">
-          <a-tab-pane v-for="(item,index) in realData" :key="index" :tab="item.title">
+          <a-tab-pane v-for="(item, index) in realData" :key="index" :tab="item.title">
             <div class="tab-content-scroll">
               <!-- 只渲染当前激活的分组内容 -->
               <template v-if="!loadError && realData[activeTab]">
                 <!-- 带有子的详情 -->
-                <template
-                  v-if="realData[activeTab].title && groups[activeTab]?.type ==='array'"
-                >
+                <template v-if="realData[activeTab].title && groups[activeTab]?.type === 'array'">
                   <div class="ant-descriptions-title" v-if="tabMode !== 'top'">{{ realData[activeTab].title }}</div>
                   <div class="descriptions-array-item">
                     <a-descriptions
-                      v-for="(arrayItem,arrayIndex) in realData[activeTab].column"
+                      v-for="(arrayItem, arrayIndex) in realData[activeTab].column"
                       :column="isMobile ? 1 : column"
                       size="small"
                       :key="arrayIndex"
-                      :title="arrayItem.title">
+                      :title="arrayItem.title"
+                    >
                       <template v-for="(fieldItem, fieldIndex) in arrayItem.column">
-                        <a-descriptions-item
-                          :key="fieldIndex"
-                          v-if="fieldItem.value"
-                          :label="fieldItem.key">
+                        <a-descriptions-item :key="fieldIndex" v-if="fieldItem.value" :label="fieldItem.key">
                           {{ formatText(fieldItem.value) }}
                         </a-descriptions-item>
                       </template>
@@ -100,17 +87,21 @@
                 <a-descriptions
                   v-else-if="realData[activeTab].title"
                   :column="isMobile ? 1 : column"
-                  :title="tabMode === 'top' ? undefined : realData[activeTab].title">
+                  :title="tabMode === 'top' ? undefined : realData[activeTab].title"
+                >
                   <a-descriptions-item
                     v-for="(fieldItem, fieldIndex) in realData[activeTab].column"
                     :key="fieldIndex"
                     :span="fieldItem.span || 1"
-                    v-if="shouldShowField(fieldItem, data)">
+                    v-if="shouldShowField(fieldItem, data)"
+                  >
                     <template #label>
                       {{ fieldItem.key }}
-                      <span v-if="isFieldRequired(fieldItem, data)" style="color: red;"> *</span>
+                      <span v-if="isFieldRequired(fieldItem, data)" style="color: red">*</span>
                     </template>
-                    <span :style="getFieldStyle(fieldItem, fieldItem.value, data)">{{ formatFieldValue(fieldItem.value, fieldItem, data) || '--' }}</span>
+                    <span :style="getFieldStyle(fieldItem, fieldItem.value, data)">
+                      {{ formatFieldValue(fieldItem.value, fieldItem, data) || '--' }}
+                    </span>
                   </a-descriptions-item>
                 </a-descriptions>
               </template>
@@ -123,49 +114,42 @@
     <!-- none 模式：无 tab，直接展示所有内容 -->
     <template v-else>
       <a-col :span="24" class="descriptionsGroupContext">
-        <div
-          class="descriptions-item"
-          :key="realDataIndex"
-          v-for="(realDataItem, realDataIndex) in realData">
+        <div class="descriptions-item" :key="realDataIndex" v-for="(realDataItem, realDataIndex) in realData">
           <!-- 渲染所有分组内容 -->
           <template v-if="!loadError">
             <!-- 带有子的详情 -->
-            <template
-              v-if="realDataItem.title && groups[realDataIndex]?.type ==='array'"
-            >
+            <template v-if="realDataItem.title && groups[realDataIndex]?.type === 'array'">
               <div class="ant-descriptions-title">{{ realDataItem.title }}</div>
               <div class="descriptions-array-item">
                 <a-descriptions
-                  v-for="(arrayItem,arrayIndex) in realDataItem.column"
+                  v-for="(arrayItem, arrayIndex) in realDataItem.column"
                   :column="isMobile ? 1 : column"
                   size="small"
                   :key="arrayIndex"
-                  :title="arrayItem.title">
+                  :title="arrayItem.title"
+                >
                   <template v-for="(item, index) in arrayItem.column">
-                    <a-descriptions-item
-                      :key="index"
-                      v-if="item.value"
-                      :label="item.key">
+                    <a-descriptions-item :key="index" v-if="item.value" :label="item.key">
                       {{ formatText(item.value) }}
                     </a-descriptions-item>
                   </template>
                 </a-descriptions>
               </div>
             </template>
-            <a-descriptions
-              v-else-if="realDataItem.title"
-              :column="isMobile ? 1 : column"
-              :title="realDataItem.title">
+            <a-descriptions v-else-if="realDataItem.title" :column="isMobile ? 1 : column" :title="realDataItem.title">
               <a-descriptions-item
                 v-for="(item, index) in realDataItem.column"
                 :key="index"
                 :span="item.span || 1"
-                v-if="shouldShowField(item, data)">
+                v-if="shouldShowField(item, data)"
+              >
                 <template #label>
                   {{ item.key }}
-                  <span v-if="isFieldRequired(item, data)" style="color: red;"> *</span>
+                  <span v-if="isFieldRequired(item, data)" style="color: red">*</span>
                 </template>
-                <span :style="getFieldStyle(item, item.value, data)">{{ formatFieldValue(item.value, item, data) || '--' }}</span>
+                <span :style="getFieldStyle(item, item.value, data)">
+                  {{ formatFieldValue(item.value, item, data) || '--' }}
+                </span>
               </a-descriptions-item>
             </a-descriptions>
           </template>
@@ -175,7 +159,6 @@
   </a-row>
 </template>
 <script>
-
 import { mapState } from 'vuex'
 import { getRealKeyData } from '@vue2-client/utils/formatter'
 import { getConfigByName } from '@vue2-client/services/api/common'
@@ -203,20 +186,19 @@ export default {
     serviceName: {
       type: String,
       default: process.env.VUE_APP_SYSTEM_NAME
-    },
-      },
-  mounted () {
+    }
   },
-  beforeDestroy () {
+  mounted() {},
+  beforeDestroy() {
     const formGroupContext = this.$refs.formGroupContext?.$el
     if (formGroupContext && formGroupContext.removeEventListener) {
       formGroupContext.removeEventListener('scroll', this.onScroll)
     }
   },
-  created () {
+  created() {
     this.initConfig()
   },
-  data () {
+  data() {
     return {
       // 加载状态
       loading: false,
@@ -228,14 +210,14 @@ export default {
       // 从配置中获取的值
       column: 3, // 默认值
       getRealData: false, // 默认值
-      tabMode: 'left', // 默认值
+      tabMode: 'left' // 默认值
     }
   },
   computed: {
     ...mapState('setting', { isMobile: 'isMobile' })
   },
   methods: {
-    initConfig () {
+    initConfig() {
       this.loading = true
       if (this.configName) {
         this.getConfig()
@@ -253,14 +235,14 @@ export default {
         this.loadError = true
       }
     },
-    scrollToGroup (index) {
+    scrollToGroup(index) {
       const groupElement = this.$refs[`descriptions-item-${index}`][0]
       if (groupElement) {
         groupElement.scrollIntoView({ behavior: 'smooth' })
       }
     },
-    getConfig () {
-      getConfigByName(this.configName, this.serviceName, (res) => {
+    getConfig() {
+      getConfigByName(this.configName, this.serviceName, res => {
         if (res.groups) {
           // 从配置中获取 column、getRealData 和 tabMode
           this.column = res.column !== undefined ? res.column : 3
@@ -270,34 +252,38 @@ export default {
           // 解析分组配置
           const groups = this.parseGroupsConfig(res.groups)
           this.groups = groups
-          this.realData = groups.map(group => {
-            const dataItem = { title: group.name }
+          this.realData = groups
+            .map(group => {
+              const dataItem = { title: group.name }
 
-            if (group.type === 'array') {
-              // 处理数组类型数据
-              const arrayData = this.data[group.key] || []
-              dataItem.column = arrayData.map((item, index) => ({
-                title: `${group.name} ${index + 1}`,
-                column: group.fields.map(field => ({
+              if (group.type === 'array') {
+                // 处理数组类型数据
+                const arrayData = this.data[group.key] || []
+                dataItem.column = arrayData
+                  .map((item, index) => ({
+                    title: `${group.name} ${index + 1}`,
+                    column: group.fields.map(field => ({
+                      key: field.name,
+                      value: item[field.key]
+                    }))
+                  }))
+                  .filter(Boolean)
+              } else {
+                dataItem.column = group.fields.map(field => ({
                   key: field.name,
-                  value: item[field.key]
+                  value: this.getRealKeyData(this.data, field.key),
+                  span: field.span,
+                  // 存储字段函数配置
+                  showIf: field.showIf,
+                  styleFunc: field.styleFunc,
+                  formatFunc: field.formatFunc,
+                  requireFunc: field.requireFunc
                 }))
-              })).filter(Boolean)
-            } else {
-              dataItem.column = group.fields.map(field => ({
-                key: field.name,
-                value: this.getRealKeyData(this.data, field.key),
-                span: field.span,
-                // 存储字段函数配置
-                showIf: field.showIf,
-                styleFunc: field.styleFunc,
-                formatFunc: field.formatFunc,
-                requireFunc: field.requireFunc
-              }))
-            }
+              }
 
-            return dataItem.column.length > 0 ? dataItem : null
-          }).filter(Boolean)
+              return dataItem.column.length > 0 ? dataItem : null
+            })
+            .filter(Boolean)
         }
       })
     },
@@ -357,7 +343,7 @@ export default {
      *   ]
      * }]
      */
-    parseGroupsConfig (groupsConfig) {
+    parseGroupsConfig(groupsConfig) {
       // 如果已经是数组格式，直接返回
       if (Array.isArray(groupsConfig)) {
         return groupsConfig
@@ -394,11 +380,11 @@ export default {
       })
     },
     // 文字格式化
-    formatText (value) {
+    formatText(value) {
       return value ?? '--'
     },
     // 执行字段展示函数
-    shouldShowField (field, data) {
+    shouldShowField(field, data) {
       if (!field.showIf) return true
       try {
         return executeStrFunctionByContext(this, field.showIf, [data, field.key])
@@ -408,7 +394,7 @@ export default {
       }
     },
     // 获取字段样式
-    getFieldStyle (field, data) {
+    getFieldStyle(field, data) {
       if (!field.styleFunc) return {}
       try {
         return executeStrFunctionByContext(this, field.styleFunc, [data, field.key])
@@ -418,7 +404,7 @@ export default {
       }
     },
     // 格式化字段值
-    formatFieldValue (value, field, data) {
+    formatFieldValue(value, field, data) {
       if (!field.formatFunc) return value
       try {
         return executeStrFunctionByContext(this, field.formatFunc, [data, field.key])
@@ -428,7 +414,7 @@ export default {
       }
     },
     // 判断字段是否必填（显示红色星号）
-    isFieldRequired (field, data) {
+    isFieldRequired(field, data) {
       if (!field.requireFunc) return false
       try {
         return executeStrFunctionByContext(this, field.requireFunc, [data, field.key])
@@ -437,14 +423,14 @@ export default {
         return false
       }
     },
-    getRealKeyData (data, key) {
+    getRealKeyData(data, key) {
       if (this.getRealData) {
         return getRealKeyData(data)[key] || ''
       } else {
         return this.data[key] || ''
       }
     },
-    onScroll () {
+    onScroll() {
       // 只在 left 模式启用滚动联动
       if (this.tabMode !== 'left') return
 
@@ -466,17 +452,17 @@ export default {
   },
   watch: {
     content: {
-      handler () {
+      handler() {
         this.initConfig()
       }
     },
     configName: {
-      handler () {
+      handler() {
         this.initConfig()
       }
     },
     serviceName: {
-      handler () {
+      handler() {
         this.initConfig()
       }
     }
@@ -502,6 +488,16 @@ export default {
     font-weight: 400;
   }
 
+  // 移除最后一行的 padding-bottom
+  :deep(.ant-descriptions-view) {
+    .ant-descriptions-row:last-child {
+      > th,
+      > td {
+        padding-bottom: 0;
+      }
+    }
+  }
+
   .descriptions-item {
     margin-bottom: 8px;
   }

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

@@ -1,14 +1,6 @@
 <template>
-  <splitpanes
-    class="default-theme"
-    :horizontal="false"
-    @resized="storePaneSize"
-  >
-    <pane
-      :size="treeSize"
-      :min-size="15"
-      :max-size="40"
-      v-if="xTreeConfigName">
+  <splitpanes class="default-theme" :horizontal="false" @resized="storePaneSize">
+    <pane :size="treeSize" :min-size="15" :max-size="40" v-if="xTreeConfigName">
       <x-tree-pro
         :config-name="xTreeConfigName"
         :env="env"
@@ -18,10 +10,8 @@
         ref="xtree"
       ></x-tree-pro>
     </pane>
-    <pane
-      :size="100 - treeSize"
-    >
-      <a-skeleton :loading="loading" :paragraph="{ rows: 4 }"/>
+    <pane :size="100 - treeSize">
+      <a-skeleton :loading="loading" :paragraph="{ rows: 4 }" />
       <a-row style="height: 12px" v-if="xTreeConfigName"></a-row>
       <div v-show="!loading">
         <template v-if="!loadError">
@@ -31,29 +21,27 @@
             @x-form-item-emit-func="emitFunc"
             @afterSubmit="onAddOrEditSubmitAfterSubmit"
           >
-            <template slot="groupFormItems" slot-scope="{form, model, rules, modifyModelData}">
+            <template slot="groupFormItems" slot-scope="{ form, model, rules, modifyModelData }">
               <slot
                 name="groupFormItems"
                 :form="form"
                 :model="model"
                 :rules="rules"
-                :modifyModelData="modifyModelData"></slot>
+                :modifyModelData="modifyModelData"
+              ></slot>
             </template>
           </x-add-form>
-          <x-add-report
-            v-if="moveType"
-            ref="xAddReport"
-          >
-          </x-add-report>
+          <x-add-report v-if="moveType" ref="xAddReport"></x-add-report>
           <div v-if="crudTitle" class="crud_title">
             {{ crudTitle }}
           </div>
-          <a-spin :spinning="tableShowMode === 'popup' && formQueryLoading" tip="正在查询..." >
+          <a-spin :spinning="tableShowMode === 'popup' && formQueryLoading" tip="正在查询...">
             <x-form
               ref="xForm"
               @x-form-item-emit-func="emitFunc"
               @toggleAdvanced="toggleAdvanced"
-              @onSubmit="onSearchSubmit">
+              @onSubmit="onSearchSubmit"
+            >
               <slot name="formBtnExpand"></slot>
             </x-form>
           </a-spin>
@@ -92,23 +80,24 @@
             @rowClick="handleRowClick"
             @rowDblClick="handleRowDblClick"
             @beforeDataChange="beforeDataChange"
-            @expand="onExpand">
-            <template slot="leftButton" slot-scope="{selectedRowKeys, selectedRows}">
+            @expand="onExpand"
+          >
+            <template slot="leftButton" slot-scope="{ selectedRowKeys, selectedRows }">
               <slot name="leftButton" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
             </template>
-            <template slot="button" slot-scope="{selectedRowKeys, selectedRows}">
+            <template slot="button" slot-scope="{ selectedRowKeys, selectedRows }">
               <slot name="button" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
             </template>
-            <template slot="rightBtnExpand" slot-scope="{selectedRowKeys, selectedRows}">
+            <template slot="rightBtnExpand" slot-scope="{ selectedRowKeys, selectedRows }">
               <slot name="rightBtnExpand" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
               <a-tooltip title="收起查询条件" placement="bottom">
                 <a-button @click="toggleIsFormShow">
-                  <a-icon :style="iconStyle" :type="toggleIsFormIcon"/>
+                  <a-icon :style="iconStyle" :type="toggleIsFormIcon" />
                 </a-button>
               </a-tooltip>
             </template>
             <!-- 底部插槽 -->
-            <template slot="footer" slot-scope="{selectedRowKeys, selectedRows}">
+            <template slot="footer" slot-scope="{ selectedRowKeys, selectedRows }">
               <slot name="footer" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
             </template>
             <!--      excel导入说明插槽      -->
@@ -163,23 +152,24 @@
               @rowClick="handleRowClick"
               @rowDblClick="handleRowDblClick"
               @beforeDataChange="beforeDataChange"
-              @expand="onExpand">
-              <template slot="leftButton" slot-scope="{selectedRowKeys, selectedRows}">
+              @expand="onExpand"
+            >
+              <template slot="leftButton" slot-scope="{ selectedRowKeys, selectedRows }">
                 <slot name="leftButton" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
               </template>
-              <template slot="button" slot-scope="{selectedRowKeys, selectedRows}">
+              <template slot="button" slot-scope="{ selectedRowKeys, selectedRows }">
                 <slot name="button" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
               </template>
-              <template slot="rightBtnExpand" slot-scope="{selectedRowKeys, selectedRows}">
+              <template slot="rightBtnExpand" slot-scope="{ selectedRowKeys, selectedRows }">
                 <slot name="rightBtnExpand" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
                 <a-tooltip title="关闭弹窗" placement="bottom">
                   <a-button @click="closeTableModal">
-                    <a-icon :style="iconStyle" type="close"/>
+                    <a-icon :style="iconStyle" type="close" />
                   </a-button>
                 </a-tooltip>
               </template>
               <!-- 底部插槽 -->
-              <template slot="footer" slot-scope="{selectedRowKeys, selectedRows}">
+              <template slot="footer" slot-scope="{ selectedRowKeys, selectedRows }">
                 <slot name="footer" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
               </template>
               <!--      excel导入说明插槽      -->
@@ -197,12 +187,12 @@
         </template>
         <template v-else>
           <a-empty>
-            <span slot="description"> 页面配置不存在，请联系系统管理员</span>
+            <span slot="description">页面配置不存在，请联系系统管理员</span>
           </a-empty>
         </template>
       </div>
     </pane>
-    <UserInfoDetailManage ref="userInfo" @close="refresh(false)"/>
+    <UserInfoDetailManage ref="userInfo" @close="refresh(false)" />
   </splitpanes>
 </template>
 <script>
@@ -217,7 +207,9 @@ import 'splitpanes/dist/splitpanes.css'
 import {
   getConfigByName,
   getConfigByLogic,
-  parseConfig, runLogic, getConfigByNameAsync,
+  parseConfig,
+  runLogic,
+  getConfigByNameAsync
 } from '@vue2-client/services/api/common'
 import { mapState } from 'vuex'
 import XTreePro from '@vue2-client/base-client/components/common/XTree/XTreePro.vue'
@@ -251,43 +243,43 @@ export default {
       default: () => () => {
         console.warn('getSelectedId is not provided.')
         return null
-      },
+      }
     },
     setGlobalData: {
       default: () => () => {
         console.warn('setGlobalData is not provided.')
         return null
-      },
+      }
     },
     getGlobalData: {
       default: () => () => {
         console.warn('getGlobalData is not provided.')
         return null
-      },
+      }
     },
     getSelectedData: {
       default: () => () => {
         console.warn('getSelectedData is not provided.')
         return null
-      },
+      }
     },
     getMixinData: {
       default: () => () => {
         console.warn('getMixinData is not provided.')
         return {}
-      },
+      }
     },
     getOutEnv: {
       default: () => () => {
         console.warn('getOutEnv is not provided.')
         return {}
-      },
+      }
     },
     currUser: {
       default: () => {
         console.warn('currUser is not provided.')
         return { id: null, name: 'Guest' }
-      },
+      }
     },
 
     /**
@@ -383,8 +375,7 @@ export default {
     // 执行logic传递的参数
     logicParam: {
       type: Object,
-      default: () => {
-      }
+      default: () => {}
     },
     // 固定新增表单
     fixedAddForm: {
@@ -471,7 +462,7 @@ export default {
     },
     reportQueryName: {
       type: String,
-      default: undefined,
+      default: undefined
     },
     // 是否自定义删除按钮的功能
     customDelete: {
@@ -531,7 +522,7 @@ export default {
     defaultPageSize: {
       type: Number,
       default: 10
-    },
+    }
   },
   watch: {
     logicParam: {
@@ -642,14 +633,19 @@ export default {
     },
 
     getConfig () {
-      getConfigByName(this.queryParamsName, this.serviceName, (res) => {
-        if (!res) {
-          this.loading = false
-          this.loadError = true
-          return
-        }
-        this.updateComponents(res)
-      }, this.env === 'dev')
+      getConfigByName(
+        this.queryParamsName,
+        this.serviceName,
+        res => {
+          if (!res) {
+            this.loading = false
+            this.loadError = true
+            return
+          }
+          this.updateComponents(res)
+        },
+        this.env === 'dev'
+      )
     },
     getConfigBySource () {
       parseConfig(this.queryParamsJson, 'CRUD_FORM', this.serviceName, this.env === 'dev').then(res => {
@@ -662,14 +658,20 @@ export default {
       })
     },
     getColumnJsonByLogic () {
-      getConfigByLogic(this.logicName, this.logicParam, this.serviceName, (res) => {
-        if (!res) {
-          this.loading = false
-          this.loadError = true
-          return
-        }
-        this.updateComponents(res, true)
-      }, this.env === 'dev')
+      getConfigByLogic(
+        this.logicName,
+        this.logicParam,
+        this.serviceName,
+        res => {
+          if (!res) {
+            this.loading = false
+            this.loadError = true
+            return
+          }
+          this.updateComponents(res, true)
+        },
+        this.env === 'dev'
+      )
     },
 
     /**
@@ -683,9 +685,10 @@ export default {
       this.tableShowMode = res.tableShowMode || 'default'
 
       // 弹框模式下，xTable 可能还未渲染，需要特殊处理
-      const hasRequiredRefs = this.tableShowMode === 'popup'
-        ? (this.$refs.xForm && this.$refs.xAddForm)
-        : (this.$refs.xTable && this.$refs.xForm && this.$refs.xAddForm)
+      const hasRequiredRefs =
+        this.tableShowMode === 'popup'
+          ? this.$refs.xForm && this.$refs.xAddForm
+          : this.$refs.xTable && this.$refs.xForm && this.$refs.xAddForm
 
       if (hasRequiredRefs) {
         // 设置添加按钮对应的配置名
@@ -724,7 +727,11 @@ export default {
               ...res
             })
             if (this.realQueryConfig?.funcData?.pageMounted) {
-              executeStrFunctionByContext(this, this.realQueryConfig.funcData.pageMounted, [util, runLogic, getConfigByNameAsync])
+              executeStrFunctionByContext(this, this.realQueryConfig.funcData.pageMounted, [
+                util,
+                runLogic,
+                getConfigByNameAsync
+              ])
             }
             this.$emit('afterTableInit')
           }
@@ -895,14 +902,12 @@ export default {
      */
     move () {
       this.moveType = true
-      this.$nextTick(
-        () => {
-          this.$refs.xAddReport.init({
-            configName: this.moveconfig,
-            selectedId: this.fixedAddForm.selected_id
-          })
-        }
-      )
+      this.$nextTick(() => {
+        this.$refs.xAddReport.init({
+          configName: this.moveconfig,
+          selectedId: this.fixedAddForm.selected_id
+        })
+      })
     },
     /**
      * 修改按钮事件
@@ -976,7 +981,8 @@ export default {
      * 查询表单部分显示/隐藏切换
      */
     toggleIsFormShow () {
-      this.toggleIsFormIcon = this.toggleIsFormIcon === 'vertical-align-top' ? 'vertical-align-bottom' : 'vertical-align-top'
+      this.toggleIsFormIcon =
+        this.toggleIsFormIcon === 'vertical-align-top' ? 'vertical-align-bottom' : 'vertical-align-top'
       this.$refs.xForm.toggleVisible()
       // 只有在非弹出模式下才需要调整表格滚动高度
       if (this.tableShowMode !== 'popup') {
@@ -1250,13 +1256,14 @@ export default {
   }
 
   // 默认选中状态（没有特殊行样式时）
-  .ant-table-row-selected:not(.ant-table-row-success):not(.ant-table-row-warning):not(.ant-table-row-error):not(.ant-table-row-magic) {
+  .ant-table-row-selected:not(.ant-table-row-success):not(.ant-table-row-warning):not(.ant-table-row-error):not(
+      .ant-table-row-magic
+    ) {
     background-color: rgba(24, 144, 255, 0.1);
   }
 }
 </style>
 <style>
-
 .splitpanes.default-theme .splitpanes__splitter {
   border: 0;
   width: 1rem;
@@ -1285,5 +1292,4 @@ export default {
   font-size: 12px;
   line-height: 1.5;
 }
-
 </style>

package/src/composables/index.js

@@ -3,4 +3,4 @@
  * 提供 Composition API 风格的可复用逻辑
  */
 
-export { usePost, createPost, useRunLogic, createRunLogic } from './usePost'
+export { usePost, useRunLogic } from './usePost'

package/src/store/modules/account.js

@@ -77,17 +77,20 @@ export default {
   },
   mutations: {
     setUser (state, user) {
+      const operInfo = {
+        f_operator: user?.name,
+        f_operatorid: user?.id,
+        f_orgid: user?.orgid,
+        f_orgname: user?.orgs,
+        f_depid: user?.depids,
+        f_depname: user?.deps,
+        f_zoneid: user?.zoneid,
+        f_zones: user?.zones
+      }
+      // 使用时请使用 operInfo, operaInfo后续可能移除
       state.user = Object.assign(user, {
-        operaInfo: {
-          f_operator: user?.name,
-          f_operatorid: user?.id,
-          f_orgid: user?.orgid,
-          f_orgname: user?.orgs,
-          f_depid: user?.depids,
-          f_depname: user?.deps,
-          f_zoneid: user?.zoneid,
-          f_zones: user?.zones
-        }
+        operaInfo: operInfo,
+        operInfo
       })
       // 组织组织机构信息
       localStorage.setItem(process.env.VUE_APP_USER_KEY, JSON.stringify(user))