vue2-client 1.19.52 → 1.19.54

package/package.json

@@ -1,113 +1,113 @@
-{
-  "name": "vue2-client",
-  "version": "1.19.52",
-  "private": false,
-  "scripts": {
-    "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",
-    "serve:gaslink": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode gaslink",
-    "serve:revenue": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode revenue",
-    "serve:liuli": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode liuli",
-    "serve:scada": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode scada",
-    "serve:iot": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode iot",
-    "serve:his": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode his",
-    "serve:runtime": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode runtime",
-    "serve:message": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode message",
-    "serve:apply": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode apply",
-    "mac-serve": "vue-cli-service serve --no-eslint --mode his",
-    "build": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
-    "test:unit": "vue-cli-service test:unit",
-    "lint": "vue-cli-service lint",
-    "build:preview": "vue-cli-service build --mode preview",
-    "lint:nofix": "vue-cli-service lint --no-fix",
-    "test": "jest"
-  },
-  "dependencies": {
-    "@afwenming123/vue-easy-tree": "^1.0.1",
-    "@afwenming123/vue-plugin-hiprint": "^0.0.70",
-    "@amap/amap-jsapi-loader": "^1.0.1",
-    "@antv/data-set": "^0.11.8",
-    "@antv/g2plot": "^2.4.31",
-    "@hufe921/canvas-editor": "^0.9.49",
-    "@microsoft/fetch-event-source": "^2.0.1",
-    "@vue/babel-preset-jsx": "^1.4.0",
-    "animate.css": "^4.1.1",
-    "ant-design-vue": "^1.7.8",
-    "axios": "^0.27.2",
-    "clipboard": "^2.0.11",
-    "core-js": "^3.33.0",
-    "crypto-js": "^4.1.1",
-    "date-fns": "^2.29.3",
-    "default-passive-events": "^2.0.0",
-    "dotenv": "^16.3.1",
-    "echarts": "^5.5.0",
-    "enquire.js": "^2.1.6",
-    "file-saver": "^2.0.5",
-    "highlight.js": "^11.7.0",
-    "html2canvas": "^1.4.1",
-    "js-base64": "^3.7.5",
-    "js-cookie": "^2.2.1",
-    "jsencrypt": "^3.3.2",
-    "jspdf": "^2.5.1",
-    "lodash.clonedeep": "^4.5.0",
-    "lodash.debounce": "^4",
-    "lodash.get": "^4.4.2",
-    "marked": "^4",
-    "mockjs": "^1.1.0",
-    "nprogress": "^0.2.0",
-    "qs": "^6.11.2",
-    "regenerator-runtime": "^0.14.0",
-    "splitpanes": "^2.4.1",
-    "videojs-contrib-hls": "^5.15.0",
-    "viser-vue": "^2.4.8",
-    "vue": "^2.7.14",
-    "vue-codemirror": "4.0.6",
-    "vue-color": "2.7.0",
-    "vue-draggable-resizable": "^2.3.0",
-    "vue-i18n": "^8.28.2",
-    "vue-json-viewer": "^2.2.22",
-    "vue-router": "^3.6.5",
-    "vue-video-player": "^5.0.2",
-    "vue-virtual-scroller": "^1.1.2",
-    "vuedraggable": "^2.24.3",
-    "vuex": "^3.6.2",
-    "xlsx": "0.18.5"
-  },
-  "devDependencies": {
-    "@ant-design/colors": "^7.0.0",
-    "@babel/core": "^7.22.20",
-    "@babel/eslint-parser": "^7.22.15",
-    "@babel/preset-env": "^7.22.20",
-    "@vue/cli-plugin-babel": "^5.0.8",
-    "@vue/cli-plugin-eslint": "^5.0.8",
-    "@vue/cli-service": "^5.0.8",
-    "@vue/eslint-config-standard": "^8.0.1",
-    "@vue/test-utils": "^1.3.6",
-    "babel-plugin-transform-remove-console": "^6.9.4",
-    "compression-webpack-plugin": "^10.0.0",
-    "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",
-    "jest": "^29.7.0",
-    "jest-environment-jsdom": "^29.7.0",
-    "jest-transform-stub": "^2.0.0",
-    "less-loader": "^6.2.0",
-    "script-loader": "^0.7.2",
-    "style-resources-loader": "^1.5.0",
-    "vue-cli-plugin-style-resources-loader": "^0.1.5",
-    "vue-jest": "^4.0.1",
-    "vue-template-compiler": "^2.7.14",
-    "webpack": "^5.88.2",
-    "webpack-theme-color-replacer": "^1.4.7",
-    "whatwg-fetch": "^3.6.19"
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not dead",
-    "not ie 11"
-  ]
-}
+{
+  "name": "vue2-client",
+  "version": "1.19.54",
+  "private": false,
+  "scripts": {
+    "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",
+    "serve:gaslink": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode gaslink",
+    "serve:revenue": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode revenue",
+    "serve:liuli": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode liuli",
+    "serve:scada": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode scada",
+    "serve:iot": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode iot",
+    "serve:his": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode his",
+    "serve:runtime": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode runtime",
+    "serve:message": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode message",
+    "serve:apply": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode apply",
+    "mac-serve": "vue-cli-service serve --no-eslint --mode his",
+    "build": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
+    "test:unit": "vue-cli-service test:unit",
+    "lint": "vue-cli-service lint",
+    "build:preview": "vue-cli-service build --mode preview",
+    "lint:nofix": "vue-cli-service lint --no-fix",
+    "test": "jest"
+  },
+  "dependencies": {
+    "@afwenming123/vue-easy-tree": "^1.0.1",
+    "@afwenming123/vue-plugin-hiprint": "^0.0.70",
+    "@amap/amap-jsapi-loader": "^1.0.1",
+    "@antv/data-set": "^0.11.8",
+    "@antv/g2plot": "^2.4.31",
+    "@hufe921/canvas-editor": "^0.9.49",
+    "@microsoft/fetch-event-source": "^2.0.1",
+    "@vue/babel-preset-jsx": "^1.4.0",
+    "animate.css": "^4.1.1",
+    "ant-design-vue": "^1.7.8",
+    "axios": "^0.27.2",
+    "clipboard": "^2.0.11",
+    "core-js": "^3.33.0",
+    "crypto-js": "^4.1.1",
+    "date-fns": "^2.29.3",
+    "default-passive-events": "^2.0.0",
+    "dotenv": "^16.3.1",
+    "echarts": "^5.5.0",
+    "enquire.js": "^2.1.6",
+    "file-saver": "^2.0.5",
+    "highlight.js": "^11.7.0",
+    "html2canvas": "^1.4.1",
+    "js-base64": "^3.7.5",
+    "js-cookie": "^2.2.1",
+    "jsencrypt": "^3.3.2",
+    "jspdf": "^2.5.1",
+    "lodash.clonedeep": "^4.5.0",
+    "lodash.debounce": "^4",
+    "lodash.get": "^4.4.2",
+    "marked": "^4",
+    "mockjs": "^1.1.0",
+    "nprogress": "^0.2.0",
+    "qs": "^6.11.2",
+    "regenerator-runtime": "^0.14.0",
+    "splitpanes": "^2.4.1",
+    "videojs-contrib-hls": "^5.15.0",
+    "viser-vue": "^2.4.8",
+    "vue": "^2.7.14",
+    "vue-codemirror": "4.0.6",
+    "vue-color": "2.7.0",
+    "vue-draggable-resizable": "^2.3.0",
+    "vue-i18n": "^8.28.2",
+    "vue-json-viewer": "^2.2.22",
+    "vue-router": "^3.6.5",
+    "vue-video-player": "^5.0.2",
+    "vue-virtual-scroller": "^1.1.2",
+    "vuedraggable": "^2.24.3",
+    "vuex": "^3.6.2",
+    "xlsx": "0.18.5"
+  },
+  "devDependencies": {
+    "@ant-design/colors": "^7.0.0",
+    "@babel/core": "^7.22.20",
+    "@babel/eslint-parser": "^7.22.15",
+    "@babel/preset-env": "^7.22.20",
+    "@vue/cli-plugin-babel": "^5.0.8",
+    "@vue/cli-plugin-eslint": "^5.0.8",
+    "@vue/cli-service": "^5.0.8",
+    "@vue/eslint-config-standard": "^8.0.1",
+    "@vue/test-utils": "^1.3.6",
+    "babel-plugin-transform-remove-console": "^6.9.4",
+    "compression-webpack-plugin": "^10.0.0",
+    "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",
+    "jest": "^29.7.0",
+    "jest-environment-jsdom": "^29.7.0",
+    "jest-transform-stub": "^2.0.0",
+    "less-loader": "^6.2.0",
+    "script-loader": "^0.7.2",
+    "style-resources-loader": "^1.5.0",
+    "vue-cli-plugin-style-resources-loader": "^0.1.5",
+    "vue-jest": "^4.0.1",
+    "vue-template-compiler": "^2.7.14",
+    "webpack": "^5.88.2",
+    "webpack-theme-color-replacer": "^1.4.7",
+    "whatwg-fetch": "^3.6.19"
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions",
+    "not dead",
+    "not ie 11"
+  ]
+}

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

@@ -174,9 +174,9 @@
           </a-card>
         </a-row>
       </template>
-      <a-row type="flex" :justify="btnPlace" :style="{ paddingLeft: '16px', paddingRight: '16px' }">
+      <a-row type="flex" :justify="btnPlace" v-if="showSubmitBtn" class="form-footer-row" :style="{ paddingLeft: '16px', paddingRight: '16px' }">
         <slot name="footer" :loading="loading">
-          <a-button v-if="showSubmitBtn" :loading="loading" type="primary" @click="onSubmit()">
+          <a-button :loading="loading" type="primary" @click="onSubmit()">
             {{ btnName }}
           </a-button>
         </slot>
@@ -275,7 +275,7 @@ export default {
       // 提交按钮名称
       btnName: '提交',
       // 提交按钮位置 start / center / end
-      btnPlace: 'center',
+      btnPlace: 'end',
       // 子表是否排在前面
       childTablePriority: false,
       // simple-inline布局配置
@@ -555,7 +555,7 @@ export default {
         formItemLayout = {},
         btnName = '提交',
         childTablePriority = false,
-        btnPlace = 'center',
+        btnPlace = 'end',
         simpleInline = null,
         paramLogicName,
         paramLogicNameParam
@@ -1370,4 +1370,17 @@ export default {
     width: 100% !important;
   }
 }
+
+/* 表单底部按钮区域样式 */
+.form-footer-row {
+  margin-top: 16px;
+
+  :deep(.ant-btn) {
+    margin-left: 8px;
+
+    &:first-child {
+      margin-left: 0;
+    }
+  }
+}
 </style>

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

@@ -7,15 +7,16 @@ export default {
   components: { XAddNativeForm },
   data() {
     return {
-      form: {}
+      form: {},
+      formModalVisible: false,
     }
   },
   mounted() {
-    getConfigByNameAsync('CardSellGasForm', 'af-revenue').then(res => {
+    getConfigByNameAsync('addOrEditLimitGasRulesForm', 'af-revenue').then(res => {
       this.$refs.xAddFrom.init(
         Object.assign(res, {
           modifyModelData: {
-            data: {}
+            data: {},
           }
         })
       )
@@ -26,6 +27,17 @@ export default {
       this.form = Object.assign({}, value.realForm)
       this.$refs.xAddFrom.loading = false
     },
+    openPopupForm() {
+      this.formModalVisible = true
+        getConfigByNameAsync('addOrEditLimitGasRulesForm', 'af-revenue').then(res => {
+        this.$nextTick(() => {
+          this.$refs.xAddFormModal.init({
+            businessType: '新增',
+            ...res
+          })
+        })
+      })
+    },
     singLocal() {
       console.log('singLocal')
     }
@@ -35,9 +47,20 @@ export default {
 
 <template>
   <div>
+    <a-button @click="openPopupForm">打开弹窗表单</a-button>
     <a-card :style="{ width: '650px' }">
       <x-add-native-form ref="xAddFrom" @getinfo="aaa" @onSubmit="aaa" @singLocal="singLocal" />
     </a-card>
+        <a-modal
+      v-model="formModalVisible"
+      :dialog-style="{ top: '5rem' }"
+      :z-index="300"
+      width="55vw"
+      :destroyOnClose="true"
+    >
+      <x-add-native-form  ref="xAddFormModal" />
+    </a-modal>
+
     <a-card>
       <pre
         >{{ form ? JSON.stringify(form, null, 2) : '请先点击获取表单数据' }}

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

@@ -1,6 +1,6 @@
 <template>
   <!-- 输入框 -->
-  <x-form-col v-if="attr.type === 'input' && show" :occupyCol="attr.occupyCol" :labelCol="labelCol" :flex="attr.flex">
+  <x-form-col v-if="attr.type === 'input' && show" :occupyCol="attr.occupyCol" :labelCol="labelCol"   :mode="mode" :layout="layout" :attrType="attr.type">
     <a-form-model-item
       v-bind="bindOther"
       :rules="rules"
@@ -86,7 +86,7 @@
     </a-form-model-item>
   </x-form-col>
   <!-- 下拉框 -->
-  <x-form-col v-else-if="attr.type === 'select' && show" :labelCol="labelCol" :flex="attr.flex">
+  <x-form-col v-else-if="attr.type === 'select' && show" :labelCol="labelCol"   :mode="mode" :layout="layout" :attrType="attr.type">
     <a-form-model-item
       v-bind="bindOther"
       :rules="rules"
@@ -194,7 +194,7 @@
     </a-form-model-item>
   </x-form-col>
   <!-- 多选框 -->
-  <x-form-col v-else-if="attr.type === 'checkbox' && show" :labelCol="labelCol" :flex="attr.flex">
+  <x-form-col v-else-if="attr.type === 'checkbox' && show" :labelCol="labelCol"   :mode="mode" :layout="layout" :attrType="attr.type">
     <a-form-model-item
       v-bind="bindOther"
       :rules="rules"
@@ -272,7 +272,7 @@
     </a-form-model-item>
   </x-form-col>
   <!-- 单选框 -->
-  <x-form-col v-else-if="attr.type === 'radio' && show" :labelCol="labelCol" :flex="attr.flex">
+  <x-form-col v-else-if="attr.type === 'radio' && show" :labelCol="labelCol"   :mode="mode" :layout="layout" :attrType="attr.type">
     <a-form-model-item
       v-bind="bindOther"
       :rules="rules"
@@ -334,7 +334,9 @@
       ].includes(attr.type) && show
     "
     :labelCol="labelCol"
-    :flex="attr.flex"
+    :mode="mode"
+    :layout="layout"
+    :attrType="attr.type"
   >
     <a-form-model-item
       v-bind="bindOther"
@@ -357,7 +359,7 @@
     </a-form-model-item>
   </x-form-col>
   <!-- 文本域 -->
-  <x-form-col v-else-if="attr.type === 'textarea' && show" :labelCol="labelCol" :flex="attr.flex">
+  <x-form-col v-else-if="attr.type === 'textarea' && show" :labelCol="labelCol"   :mode="mode" :layout="layout" :attrType="attr.type">
     <!--    :style="layout === 'inline'?{width:'calc(100% - 60px)'}:{}"-->
     <a-form-model-item
       v-bind="bindOther"
@@ -380,7 +382,10 @@
   <x-form-col
     v-else-if="(attr.type === 'file' || attr.type === 'image') && show"
     :labelCol="labelCol"
-    :flex="attr.flex"
+
+    :mode="mode"
+    :layout="layout"
+    :attrType="attr.type"
   >
     <a-form-model-item
       v-bind="bindOther"
@@ -401,7 +406,7 @@
     </a-form-model-item>
   </x-form-col>
   <!-- 省市区选择框 -->
-  <x-form-col v-else-if="attr.type === 'citySelect' && show" :labelCol="labelCol" :flex="attr.flex">
+  <x-form-col v-else-if="attr.type === 'citySelect' && show" :labelCol="labelCol"   :mode="mode" :layout="layout" :attrType="attr.type">
     <a-form-model-item
       v-bind="bindOther"
       :rules="rules"
@@ -424,7 +429,10 @@
     v-else-if="(attr.type === 'addressSearch' || attr.type === 'coordinateSearch') && show"
     :labelCol="labelCol"
     :occupyCol="attr.occupyCol"
-    :flex="attr.flex"
+
+    :mode="mode"
+    :layout="layout"
+    :attrType="attr.type"
   >
     <a-form-model-item
       v-bind="bindOther"
@@ -448,7 +456,7 @@
     </a-form-model-item>
   </x-form-col>
   <!-- 颜色选择器 -->
-  <x-form-col v-else-if="attr.type === 'colorPicker' && show" :labelCol="labelCol" :flex="attr.flex">
+  <x-form-col v-else-if="attr.type === 'colorPicker' && show" :labelCol="labelCol"   :mode="mode" :layout="layout" :attrType="attr.type">
     <a-form-model-item
       v-bind="bindOther"
       :rules="rules"
@@ -460,7 +468,7 @@
     </a-form-model-item>
   </x-form-col>
   <!-- 人员选择框 -->
-  <x-form-col v-else-if="attr.type === 'personSetting' && show" :labelCol="labelCol" :flex="attr.flex">
+  <x-form-col v-else-if="attr.type === 'personSetting' && show" :labelCol="labelCol"   :mode="mode" :layout="layout" :attrType="attr.type">
     <a-form-model-item
       v-bind="bindOther"
       :rules="rules"
@@ -472,7 +480,7 @@
     </a-form-model-item>
   </x-form-col>
   <!-- 树形选择框 -->
-  <x-form-col v-else-if="attr.type === 'treeSelect' && show" :labelCol="labelCol" :flex="attr.flex">
+  <x-form-col v-else-if="attr.type === 'treeSelect' && show" :labelCol="labelCol"  >
     <x-tree-select
       :rules="rules"
       @onChange="handleTreeSelectChange"
@@ -483,7 +491,7 @@
     ></x-tree-select>
   </x-form-col>
   <!-- 列表选择框 -->
-  <x-form-col v-else-if="attr.type === 'listSelect' && show" :labelCol="labelCol" :flex="attr.flex">
+  <x-form-col v-else-if="attr.type === 'listSelect' && show" :labelCol="labelCol"   :mode="mode" :layout="layout" :attrType="attr.type">
     <a-form-model-item
       v-bind="bindOther"
       :rules="rules"
@@ -547,7 +555,7 @@
     </a-form-model-item>
   </x-form-col>
   <!-- 评分框 -->
-  <x-form-col v-else-if="attr.type === 'rate' && show" :labelCol="labelCol" :flex="attr.flex">
+  <x-form-col v-else-if="attr.type === 'rate' && show" :labelCol="labelCol"   :mode="mode" :layout="layout" :attrType="attr.type">
     <a-form-model-item
       v-bind="bindOther"
       :rules="rules"
@@ -570,7 +578,7 @@
     </a-form-model-item>
   </x-form-col>
   <!--  区间选择器  -->
-  <x-form-col v-else-if="attr.type === 'intervalPicker' && show" :labelCol="labelCol" :flex="attr.flex">
+  <x-form-col v-else-if="attr.type === 'intervalPicker' && show" :labelCol="labelCol"   :mode="mode" :layout="layout" :attrType="attr.type">
     <a-form-model-item
       v-bind="bindOther"
       :rules="rules"
@@ -591,7 +599,7 @@
     </a-form-model-item>
   </x-form-col>
   <!--  车牌号选择  -->
-  <x-form-col v-else-if="attr.type === 'licensePlate' && show" :labelCol="labelCol" :flex="attr.flex">
+  <x-form-col v-else-if="attr.type === 'licensePlate' && show" :labelCol="labelCol"   :mode="mode" :layout="layout" :attrType="attr.type">
     <a-form-model-item
       v-bind="bindOther"
       :rules="rules"
@@ -624,11 +632,11 @@
     </a-form-model-item>
   </x-form-col>
   <!-- 录音 -->
-  <x-form-col v-else-if="attr.type === 'recording' && show" :labelCol="labelCol" :flex="attr.flex">
+  <x-form-col v-else-if="attr.type === 'recording' && show" :labelCol="labelCol"  >
     <recording ref="recording" @recordingData="recordingData"></recording>
   </x-form-col>
   <!-- 表格录入 -->
-  <x-form-col v-else-if="attr.type === 'rowEdit' && show" :labelCol="labelCol" :flex="attr.flex">
+  <x-form-col v-else-if="attr.type === 'rowEdit' && show" :labelCol="labelCol"   :mode="mode" :layout="layout" :attrType="attr.type">
     <a-form-model-item
       v-bind="bindOther"
       :rules="rules"
@@ -1288,44 +1296,8 @@ export default {
       }
     },
     init() {
-      if (!this.attr.flex) {
-        if (this.mode === '新增/修改') {
-          if (
-            ['horizontal', 'vertical'].includes(this.layout) ||
-            ['textarea', 'file', 'image'].includes(this.attr.type)
-          ) {
-            // 新增修改表单 horizontal 模式下默认为一行
-            this.attr.flex = {
-              xs: 24,
-              sm: 24,
-              md: 24,
-              lg: 24,
-              xl: 24,
-              xxl: 24,
-              fullWidth: true
-            }
-          } else {
-            // 新增修改表单 vertical 模式下默认为1列
-            this.attr.flex = {
-              xs: 24,
-              sm: 12,
-              md: 8,
-              lg: 8,
-              xl: 6,
-              xxl: 6
-            }
-          }
-        } else {
-          this.attr.flex = {
-            xs: 24,
-            sm: 12,
-            md: 8,
-            lg: 6,
-            xl: 6,
-            xxl: 6
-          }
-        }
-      }
+      // flex赋值逻辑已移至XFormCol组件内部处理
+      // 不再在此处设置attr.flex，由XFormCol根据mode、layout、attrType自动计算
       if (this.attr.keyName && typeof this.attr.keyName === 'string') {
         if (this.attr.keyName.indexOf('logic@') !== -1) {
           const data = Object.assign(this.getExtData(), { serviceName: process.env.VUE_APP_SYSTEM_NAME })

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

@@ -272,34 +272,5 @@ export default {
     max-height: 32px;
     overflow-y: auto;
   }
- // 树节点图标和文字对齐
-  /deep/ .ant-select-tree-treenode {
-    display: flex;
-    align-items: center;
-
-    .ant-select-tree-switcher {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-
-      .ant-select-switcher-icon {
-        display: flex;
-        align-items: center;
-        line-height: 1;
-      }
-    }
-
-    .ant-select-tree-node-content-wrapper {
-      display: flex;
-      align-items: center;
-
-      .ant-select-tree-title {
-        display: flex;
-        align-items: center;
-        line-height: 22px;
-      }
-    }
-  }
-
 }
 </style>