vue2-client 1.18.49 → 1.18.51

package/.claude/settings.local.json

@@ -1,21 +1,28 @@
-{
-  "permissions": {
-    "allow": [
-      "WebSearch",
-      "WebFetch(domain:context7.com)",
-      "Bash(npm run lint)",
-      "mcp__context7__resolve-library-id",
-      "mcp__context7__get-library-docs",
-      "WebFetch(domain:github.com)",
-      "Bash(npm run serve:*)",
-      "mcp__serena__get_current_config",
-      "mcp__serena__activate_project",
-      "mcp__serena__get_symbols_overview",
-      "mcp__serena__list_dir",
-      "mcp__serena__find_file"
-    ],
-    "deny": [],
-    "ask": [],
-    "defaultMode": "acceptEdits"
-  }
-}
+{
+  "permissions": {
+    "allow": [
+      "WebSearch",
+      "WebFetch(domain:context7.com)",
+      "Bash(npm run lint)",
+      "mcp__context7__resolve-library-id",
+      "mcp__context7__get-library-docs",
+      "WebFetch(domain:github.com)",
+      "Bash(npm run serve:*)",
+      "mcp__serena__get_current_config",
+      "mcp__serena__activate_project",
+      "mcp__serena__get_symbols_overview",
+      "mcp__serena__list_dir",
+      "mcp__serena__find_file",
+      "mcp__serena__list_memories",
+      "mcp__serena__check_onboarding_performed",
+      "mcp__serena__read_memory",
+      "mcp__serena__think_about_collected_information",
+      "mcp__sequential-thinking__sequentialthinking",
+      "Bash(npm run lint:*)",
+      "mcp__serena__find_symbol"
+    ],
+    "deny": [],
+    "ask": [],
+    "defaultMode": "acceptEdits"
+  }
+}

package/package.json

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

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

@@ -5,26 +5,28 @@ import { getConfigByNameAsync } from '@vue2-client/services/api/common'
 export default {
   name: 'Demo',
   components: { XAddNativeForm },
-  data () {
+  data() {
     return {
-        form: {}
+      form: {}
     }
   },
-  mounted () {
-    getConfigByNameAsync('formtestForm', 'af-system').then(res => {
-      this.$refs.xAddFrom.init(Object.assign(res, {
-        modifyModelData: {
-          data: {}
-        }
-      }))
+  mounted() {
+    getConfigByNameAsync('CardSellGasForm', 'af-revenue').then(res => {
+      this.$refs.xAddFrom.init(
+        Object.assign(res, {
+          modifyModelData: {
+            data: {}
+          }
+        })
+      )
     })
   },
   methods: {
-    aaa (value) {
+    aaa(value) {
       this.form = Object.assign({}, value.realForm)
       this.$refs.xAddFrom.loading = false
     },
-    singLocal () {
+    singLocal() {
       console.log('singLocal')
     }
   }
@@ -33,22 +35,16 @@ export default {
 
 <template>
   <div>
-    <a-card :style="{ width: '500px' }">
-      <x-add-native-form
-        ref="xAddFrom"
-        @getinfo="aaa"
-        @onSubmit="aaa"
-        @singLocal="singLocal"
-      />
+    <a-card :style="{ width: '650px' }">
+      <x-add-native-form ref="xAddFrom" @getinfo="aaa" @onSubmit="aaa" @singLocal="singLocal" />
     </a-card>
     <a-card>
-      <pre>{{
-        form ? JSON.stringify(form, null, 2) : '请先点击获取表单数据' }}
-    </pre>
+      <pre
+        >{{ form ? JSON.stringify(form, null, 2) : '请先点击获取表单数据' }}
+    </pre
+      >
     </a-card>
   </div>
 </template>
 
-<style scoped lang="less">
-
-</style>
+<style scoped lang="less"></style>

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

@@ -1,12 +1,7 @@
 <template>
-  <div :style="{marginBottom: !visible ? '12px':''}">
+  <div :style="{ marginBottom: !visible ? '12px' : '' }">
     <div v-if="visible && realJsonData.length > 0" class="table-page-search-wrapper">
-      <a-form-model
-        v-if="loaded"
-        ref="form"
-        :model="form"
-        :rules="rules"
-        layout="inline">
+      <a-form-model v-if="loaded" ref="form" :model="form" :rules="rules" layout="inline">
         <a-row :gutter="24" type="flex">
           <x-form-item
             v-for="item in visibleItems"
@@ -38,25 +33,25 @@
           <a-col style="margin-left: auto">
             <span
               :style="advanced ? { float: 'right', overflow: 'hidden' } : {}"
-              class="table-page-search-submitButtons">
+              class="table-page-search-submitButtons"
+            >
               <template v-if="hiddenItems.length > 0">
                 <a @click="toggleAdvanced">
-                  <span v-if="!advanced" style="display: inline-flex; align-items: center;">
-                    <a-icon type="eye" :style="iconStyle" class="form-expand-icon"></a-icon>&nbsp;更多条件
+                  <span v-if="!advanced" style="display: inline-flex; align-items: center">
+                    <a-icon type="eye" :style="iconStyle" class="form-expand-icon"></a-icon>
+                    &nbsp;更多条件
                   </span>
-                  <span v-else style="display: inline-flex; align-items: center;">
-                    <a-icon type="eye-invisible" :style="iconStyle" class="form-expand-icon rotated"></a-icon>&nbsp;收起更多
+                  <span v-else style="display: inline-flex; align-items: center">
+                    <a-icon type="eye-invisible" :style="iconStyle" class="form-expand-icon rotated"></a-icon>
+                    &nbsp;收起更多
                   </span>
                 </a>
-                <a-divider type="vertical"/>
+                <a-divider type="vertical" />
               </template>
               <a-space>
-                <a-button
-                  v-if="!simpleMode"
-                  htmlType="submit"
-                  type="primary"
-                  @click="onSubmit">
-                  <a-icon :style="iconStyle" type="search"></a-icon>查询
+                <a-button v-if="!simpleMode" htmlType="submit" type="primary" @click="onSubmit">
+                  <a-icon :style="iconStyle" type="search"></a-icon>
+                  查询
                 </a-button>
                 <a-button v-if="!simpleMode" @click="resetForm">重置</a-button>
                 <slot></slot>
@@ -84,7 +79,7 @@ export default {
     XFormItem
   },
   mixins: [formValidationMixin],
-  data () {
+  data() {
     return {
       // 内容加载是否完成
       loaded: false,
@@ -124,21 +119,28 @@ export default {
     ...mapState('account', { currUser: 'user' }),
     // 过滤掉仅用于新增/修改场景的表单项
     realJsonData: function () {
-      return this.formItems.filter(item => (!item.isOnlyAddOrEdit && item.type !== 'group') || (item.type === 'group' && item.groupItems.some(groupItem => !groupItem.isOnlyAddOrEdit)))
+      return this.formItems.filter(
+        item =>
+          (!item.isOnlyAddOrEdit && item.type !== 'group') ||
+          (item.type === 'group' && item.groupItems.some(groupItem => !groupItem.isOnlyAddOrEdit))
+      )
     },
     // 过滤出用于新增/修改场景的表单项
     groupJsonData: function () {
-      return this.formItems.filter((item) => {
-        return item.type === 'group'
-      }).map((item) => {
-          item.groupItems = item.groupItems.filter(item => !item.isOnlyAddOrEdit).map((groupItem) => {
-            // 只保留第一个下划线后面的内容
-            // groupItem.model = groupItem.model.substring(groupItem.model.indexOf('_') + 1)
-            return groupItem
-          })
+      return this.formItems
+        .filter(item => {
+          return item.type === 'group'
+        })
+        .map(item => {
+          item.groupItems = item.groupItems
+            .filter(item => !item.isOnlyAddOrEdit)
+            .map(groupItem => {
+              // 只保留第一个下划线后面的内容
+              // groupItem.model = groupItem.model.substring(groupItem.model.indexOf('_') + 1)
+              return groupItem
+            })
           return item
-        }
-      )
+        })
     },
     // 合并所有来源的表单项
     allFormItems: function () {
@@ -170,20 +172,22 @@ export default {
         ...item,
         _originalIndex: this.visibleItemCount + index
       }))
-    },
+    }
   },
-  provide () {
+  provide() {
     return {
       XFormContext: this,
       // 移除必填项
       removeRequired: this.removeRequired,
       // 设置必填项
       setRequired: this.setRequired,
+      // 全局 label 宽度，确保所有表单项的 label 宽度一致
+      globalLabelWidth: this.globalLabelWidth
     }
   },
   methods: {
     // 根据flex值计算可见表单项数量
-    updateVisibleItemCount (flex) {
+    updateVisibleItemCount(flex) {
       // flex值与显示数量的映射关系
       const flexToCountMap = {
         24: 2, // 小屏：1个/行，显示2个（2行）
@@ -201,7 +205,7 @@ export default {
     },
 
     // 递归查找第一个XFormCol实例
-    findFirstXFormCol (components = this.$children) {
+    findFirstXFormCol(components = this.$children) {
       for (const component of components) {
         if (component.$options.name === 'XFormCol') {
           return component
@@ -214,7 +218,7 @@ export default {
     },
 
     // 设置flex监听
-    setupFlexWatcher () {
+    setupFlexWatcher() {
       this.$nextTick(() => {
         const firstXFormCol = this.findFirstXFormCol()
         if (firstXFormCol) {
@@ -224,7 +228,7 @@ export default {
           // 设置监听
           this._flexWatcher = this.$watch(
             () => firstXFormCol.computedFlex,
-            (newFlex) => {
+            newFlex => {
               this.updateVisibleItemCount(newFlex)
             }
           )
@@ -235,10 +239,16 @@ export default {
       })
     },
 
-    init (params) {
+    init(params) {
       const {
-        formItems, serviceName, getDataParams = {}, env = 'prod', simpleMode = false, funcData = {},
-        queryParamsName = 'localConfig', defaultQueryForm = {}
+        formItems,
+        serviceName,
+        getDataParams = {},
+        env = 'prod',
+        simpleMode = false,
+        funcData = {},
+        queryParamsName = 'localConfig',
+        defaultQueryForm = {}
       } = params
       this.mountedCount = 0
       this.queryParamsName = queryParamsName
@@ -276,9 +286,11 @@ export default {
           if (!funcData.queryFormInit.startsWith('async')) {
             funcData.queryFormInit = `async ${funcData.queryFormInit}`
           }
-          executeStrFunctionByContext(this, funcData.queryFormInit, [util, runLogic, getConfigByNameAsync]).then(res => {
-            this.form = Object.assign({}, this.form, res)
-          })
+          executeStrFunctionByContext(this, funcData.queryFormInit, [util, runLogic, getConfigByNameAsync]).then(
+            res => {
+              this.form = Object.assign({}, this.form, res)
+            }
+          )
         }
       } catch (e) {
         console.error('queryFormInit error', e)
@@ -286,7 +298,7 @@ export default {
       this.getDataParams = getDataParams
       this.loaded = true
     },
-    onItemMounted (_h) {
+    onItemMounted(_h) {
       this.mountedCount += 1
       if (this.mountedCount === this.allFormItems.length) {
         // 所有 x-from-item 挂载完成，触发父组件中的 xTable.init
@@ -294,7 +306,7 @@ export default {
       }
     },
     // 时间组件赋默认值
-    getDateRange ({ type, queryFormDefault: defaultValue, queryType, queryValueFormat: defaultFormat, name }) {
+    getDateRange({ type, queryFormDefault: defaultValue, queryType, queryValueFormat: defaultFormat, name }) {
       const formatMap = {
         yearPicker: 'YYYY',
         yearRangePicker: 'YYYY',
@@ -303,7 +315,7 @@ export default {
         datePicker: 'YYYY-MM-DD',
         rangePicker: 'YYYY-MM-DD HH:mm:ss',
         timePicker: 'HH:mm:ss',
-        timeRangePicker: 'HH:mm:ss',
+        timeRangePicker: 'HH:mm:ss'
       }
       let format = formatMap[type]
 
@@ -347,12 +359,26 @@ export default {
       }
       return [start, end]
     },
-    setFormProps (formData, item) {
+    setFormProps(formData, item) {
       formData[item.model] = undefined
       if (item.queryFormDefault) {
-        if (['datePicker', 'rangePicker', 'yearPicker', 'monthPicker', 'yearRangePicker', 'monthRangePicker', 'timePicker', 'timeRangePicker'].includes(item.type)) {
+        if (
+          [
+            'datePicker',
+            'rangePicker',
+            'yearPicker',
+            'monthPicker',
+            'yearRangePicker',
+            'monthRangePicker',
+            'timePicker',
+            'timeRangePicker'
+          ].includes(item.type)
+        ) {
           formData[item.model] = this.getDateRange(item)
-        } else if (['treeSelect', 'select', 'checkbox'].includes(item.type) && ['curOrgId', 'curDepId', 'curUserId'].includes(item.queryFormDefault)) {
+        } else if (
+          ['treeSelect', 'select', 'checkbox'].includes(item.type) &&
+          ['curOrgId', 'curDepId', 'curUserId'].includes(item.queryFormDefault)
+        ) {
           if (item.queryFormDefault === 'curOrgId') {
             formData[item.model] = item.type === 'select' ? this.currUser.orgid : [this.currUser.orgid]
           }
@@ -369,7 +395,11 @@ export default {
           this.defaultMap[item.model] = formData[item.model]
         }
       } else {
-        if (['datePicker', 'rangePicker', 'yearPicker', 'monthPicker', 'yearRangePicker', 'monthRangePicker'].includes(item.type)) {
+        if (
+          ['datePicker', 'rangePicker', 'yearPicker', 'monthPicker', 'yearRangePicker', 'monthRangePicker'].includes(
+            item.type
+          )
+        ) {
           if (item.queryType === 'BETWEEN') {
             formData[item.model] = []
           }
@@ -377,7 +407,9 @@ export default {
       }
       if (item.rule) {
         this.rules[item.model] = []
-        const required = item.rule.queryRequired ? item.rule.queryRequired === true || item.rule.queryRequired === 'true' : false
+        const required = item.rule.queryRequired
+          ? item.rule.queryRequired === true || item.rule.queryRequired === 'true'
+          : false
         let trigger
         let message
         if (required) {
@@ -422,36 +454,48 @@ export default {
         }
       }
     },
-    customJsValidate (rule, value, callback, item) {
+    customJsValidate(rule, value, callback, item) {
       if (item.rule.customQueryValidatorFunc) {
-        executeStrFunctionByContext(this, item.rule.customQueryValidatorFunc, [rule, value, callback, this.form, item, util, runLogic, getConfigByNameAsync])
+        executeStrFunctionByContext(this, item.rule.customQueryValidatorFunc, [
+          rule,
+          value,
+          callback,
+          this.form,
+          item,
+          util,
+          runLogic,
+          getConfigByNameAsync
+        ])
       } else {
         callback()
       }
     },
-    toggleAdvanced () {
+    toggleAdvanced() {
       this.advanced = !this.advanced
       this.$emit('toggleAdvanced')
     },
-    toggleVisible () {
+    toggleVisible() {
       this.visible = !this.visible
       return this.visible
     },
-    resetForm () {
+    resetForm() {
       this.$refs.form.resetFields()
     },
-    emitFunc (func, data, value) {
+    emitFunc(func, data, value) {
       this.$emit(func, data, value)
       this.$emit('x-form-item-emit-func', func, data, value)
     },
-    onSubmit () {
+    onSubmit() {
       this.$refs.form.validate(valid => {
         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)) {
+          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
           }
           // 如果 form 中没有值，但是有默认值
@@ -467,23 +511,36 @@ export default {
         this.$emit('onSubmit', data)
       })
     },
-    exports () {
+    exports() {
       this.$emit('exports', this.form)
     },
-    setForm (obj) {
+    setForm(obj) {
       this.form = Object.assign(this.form, obj)
     },
+    /**
+     * 主动触发表单提交
+     * 用于 queryTable 等场景，确保走相同的数据处理流程
+     * @param {Object} conditionParams - 额外的查询条件参数
+     */
+    submitForm(conditionParams = {}) {
+      // 将外部参数合并到表单中
+      if (Object.keys(conditionParams).length > 0) {
+        this.form = Object.assign({}, this.form, conditionParams)
+      }
+      // 调用现有的 onSubmit 方法，触发 emit
+      this.onSubmit()
+    }
   },
-  mounted () {
+  mounted() {
     console.log('XForm mounted, setting up flex watcher')
     this.setupFlexWatcher()
   },
-  beforeDestroy () {
+  beforeDestroy() {
     // 清理watcher
     if (this._flexWatcher) {
       this._flexWatcher()
     }
-  },
+  }
 }
 </script>
 <style lang="less" scoped>

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

@@ -1,9 +1,6 @@
 <template>
   <a-col :style="computedStyles">
-    <div
-      class="x-form-col-wrapper"
-      :style="computedWrapperStyles"
-    >
+    <div class="x-form-col-wrapper" :style="computedWrapperStyles">
       <slot></slot>
     </div>
   </a-col>
@@ -15,7 +12,7 @@ const BREAKPOINTS = {
   sm: 768,
   md: 992,
   lg: 1200,
-  xl: 1600,
+  xl: 1600
 }
 
 const defaultFlex = {
@@ -24,10 +21,10 @@ const defaultFlex = {
   md: 8, // 中屏(768px-992px)：3个/行
   lg: 6, // 大屏(992px-1200px)：4个/行
   xl: 6, // 超大屏(1200px-1600px)：4个/行
-  xxl: 4, // 超超大屏(>1600px)：4个/行
+  xxl: 4 // 超超大屏(>1600px)：4个/行
 }
 
-function debounce (fn, delay) {
+function debounce(fn, delay) {
   let timeout = null
   return function (...args) {
     if (timeout) clearTimeout(timeout)
@@ -42,64 +39,73 @@ export default {
   props: {
     flex: {
       type: Object,
-      default: () => defaultFlex,
+      default: () => defaultFlex
     },
     occupyCol: {
       type: Number,
-      default: 1,
+      default: 1
     },
     layout: {
       type: String,
-      default: 'horizontal',
+      default: 'horizontal'
     },
     labelCol: {
       type: Object,
-      default: () => { return { span: 8 } }
+      default: () => {
+        return { span: 8 }
+      }
     }
   },
   computed: {
-    computedFlex () {
+    computedFlex() {
       const parentWidth = this.parentWidth
       return this.getFlex(parentWidth, this.flex)
     },
-    computedWrapperStyles () {
-      const realFlex = this.flex.fullWidth ? this.getFlex(this.parentWidth) : this.computedFlex
-      // 1. 计算列数
-      const columnsCount = 24 / realFlex
-      // 2. 计算基准列宽
-      const baseColumnWidth = (this.parentWidth / columnsCount) - ((columnsCount - 1) * 16)
-      // 3. 计算label宽度
-      const labelWidth = Math.max(baseColumnWidth / (24 / this.labelCol.span), 80)
-      // 计算左右偏移量
+    computedWrapperStyles() {
+      // 1. 强制使用默认flex配置计算label宽度（确保所有字段label宽度统一）
+      const singleFlex = this.getFlex(this.parentWidth, defaultFlex)
+
+      // 2. 计算单列（occupyCol=1）的列数
+      const columnsCount = 24 / singleFlex
+
+      // 3. 计算单列的基准列宽（所有表单项统一使用此宽度计算label）
+      const baseColumnWidth = this.parentWidth / columnsCount - (columnsCount - 1) * 16
+
+      // 4. 计算label宽度（统一基于单列宽度，不考虑occupyCol）
+      const labelWidth = Math.max(baseColumnWidth * (this.labelCol.span / 24), 80)
+
+      // 5. 计算偏移量
       const offset = this.labelCol.offset ? (this.labelCol.offset / 24) * 100 : 0
+
       if (this.layout === 'vertical') {
         return {
           '--form-label-width': '',
-          '--form-offset': '',
+          '--form-offset': ''
         }
       }
+
       return {
         '--form-label-width': `${labelWidth}px`,
-        '--form-offset': `${offset}%`,
+        '--form-offset': `${offset}%`
       }
     },
-    computedStyles () {
+    computedStyles() {
       const realFlex = Math.min(this.computedFlex * this.occupyCol, 24)
       const flexValue = (realFlex / 24) * 100
 
       return {
         flex: `0 0 ${flexValue}%`,
-        maxWidth: `${flexValue}%`,
+        maxWidth: `${flexValue}%`
       }
-    },
+    }
   },
-  data () {
+  data() {
     return {
-      parentWidth: 0,
+      parentWidth: 0
     }
   },
   methods: {
-    getFlex (parentWidth, flex = defaultFlex) {
+    getFlex(parentWidth, flex = defaultFlex) {
       if (parentWidth === 0) {
         return flex.md
       }
@@ -109,18 +115,18 @@ export default {
       if (parentWidth < BREAKPOINTS.lg) return flex.lg
       if (parentWidth < BREAKPOINTS.xl) return flex.xl
       return flex.xxl
-    },
+    }
   },
-  mounted () {
+  mounted() {
     // 根据父容器宽度响应式
     this.$nextTick(() => {
       const container = this.$el.parentNode
       this.parentWidth = container.offsetWidth
-      const updateWidth = debounce((width) => {
+      const updateWidth = debounce(width => {
         this.parentWidth = width
       }, 100)
 
-      this.resizeObserver = new ResizeObserver((entries) => {
+      this.resizeObserver = new ResizeObserver(entries => {
         for (const entry of entries) {
           updateWidth(entry.contentRect.width)
         }
@@ -128,11 +134,11 @@ export default {
       this.resizeObserver.observe(container)
     })
   },
-  beforeUnmount () {
+  beforeUnmount() {
     if (this.resizeObserver) {
       this.resizeObserver.disconnect()
     }
-  },
+  }
 }
 </script>
 
@@ -140,7 +146,8 @@ export default {
 .x-form-col-wrapper {
   :deep(.ant-form-item) {
     .ant-form-item-label {
-      max-width: var(--form-label-width);
+      width: var(--form-label-width);
+      min-width: var(--form-label-width);
     }
     .ant-form-item-control-wrapper {
       width: calc(100% - var(--form-label-width) - var(--form-offset) - var(--form-offset));

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/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'),

package/vue.config.js

@@ -62,11 +62,6 @@ module.exports = {
         target: 'http://127.0.0.1:9012',
         changeOrigin: true
       },
-      '/api/af-revenue/': {
-        pathRewrite: { '^/api/af-revenue/': '/' },
-        target: 'http://127.0.0.1:9026',
-        changeOrigin: true
-      },
       // '/api/af-system/resource': {
       //   pathRewrite: { '^/api/af-system': '/' },
       //   target: testUpload,
@@ -132,7 +127,7 @@ module.exports = {
         target: OSSServerDev,
         pathRewrite: { '^/oss': '/' },
         changeOrigin: true
-      },
+      }
     },
     client: {
       overlay: false
@@ -147,19 +142,17 @@ module.exports = {
   configureWebpack: config => {
     config.devtool = 'inline-source-map'
     // 忽略.md文件
-    config.module.rules.push(
-      {
-        test: /\.md$/,
-        exclude: /node_modules/,
-        use: 'ignore-loader'
-      }
-    )
+    config.module.rules.push({
+      test: /\.md$/,
+      exclude: /node_modules/,
+      use: 'ignore-loader'
+    })
     config.context = path.resolve(__dirname, './')
     config.resolve = {
       extensions: ['.js', '.vue', '.json'],
       alias: {
         '@vue2-client': path.resolve('src'),
-        '@': path.resolve('src'),
+        '@': path.resolve('src')
       }
     }
     config.entry.app = ['core-js/stable', 'regenerator-runtime/runtime', 'whatwg-fetch', './src/main.js']
@@ -177,23 +170,26 @@ module.exports = {
       )
     }
     // Ignore all locale files of moment.js
-    config.plugins.push(new webpack.IgnorePlugin({
-      resourceRegExp: /^\.\/locale$/,
-      contextRegExp: /moment$/
-    }))
-
     config.plugins.push(
+      new webpack.IgnorePlugin({
+        resourceRegExp: /^\.\/locale$/,
+        contextRegExp: /moment$/
+      })
     )
 
+    config.plugins.push()
+
     // 生产环境下将资源压缩成gzip格式
     if (isProd) {
       // add `CompressionWebpack` plugin to webpack plugins
-      config.plugins.push(new CompressionWebpackPlugin({
-        algorithm: 'gzip',
-        test: new RegExp('\\.(' + productionGzipExtensions.join('|') + ')$'),
-        threshold: 10240,
-        minRatio: 0.8
-      }))
+      config.plugins.push(
+        new CompressionWebpackPlugin({
+          algorithm: 'gzip',
+          test: new RegExp('\\.(' + productionGzipExtensions.join('|') + ')$'),
+          threshold: 10240,
+          minRatio: 0.8
+        })
+      )
     }
     // if prod, add externals
     // if (isProd) {
@@ -203,31 +199,33 @@ module.exports = {
   chainWebpack: config => {
     // 生产环境下关闭css压缩的 colormin 项，因为此项优化与主题色替换功能冲突
     if (isProd) {
-      config.optimization.minimizer('css').use(CssMinimizerPlugin, [{
-        minimizerOptions: {
-          preset: [
-            'default',
-            {
-              discardComments: { removeAll: true },
-              colormin: false,
-            }
-          ],
-          ignoreOrder: true
+      config.optimization.minimizer('css').use(CssMinimizerPlugin, [
+        {
+          minimizerOptions: {
+            preset: [
+              'default',
+              {
+                discardComments: { removeAll: true },
+                colormin: false
+              }
+            ],
+            ignoreOrder: true
+          }
         }
-      }])
+      ])
     }
     config.resolve.alias.set('@vue2-client', path.resolve(__dirname, 'src'))
   },
   css: {
     extract: !isProd
       ? {
-        filename: 'css/[name].css',
-        chunkFilename: 'css/[name].css',
-        ignoreOrder: true
-      }
+          filename: 'css/[name].css',
+          chunkFilename: 'css/[name].css',
+          ignoreOrder: true
+        }
       : {
-        ignoreOrder: true
-      },
+          ignoreOrder: true
+        },
     loaderOptions: {
       less: {
         lessOptions: {