vue2-client 1.16.3 → 1.16.5

package/.claude/settings.local.json

@@ -1,14 +1,16 @@
-{
-  "permissions": {
-    "allow": [
-      "WebSearch",
-      "WebFetch(domain:context7.com)",
-      "Bash(npm run lint)",
-      "mcp__context7__resolve-library-id",
-      "mcp__context7__get-library-docs"
-    ],
-    "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:*)"
+    ],
+    "deny": [],
+    "ask": [],
+    "defaultMode": "acceptEdits"
+  }
+}

package/.env.revenue

@@ -1,4 +1,4 @@
-VUE_APP_PUBLIC_PATH=/revenue-web
+VUE_APP_PUBLIC_PATH=/
 VUE_APP_NAME=Admin
 VUE_APP_ROUTES_KEY=admin.routes
 VUE_APP_PERMISSIONS_KEY=admin.permissions
@@ -16,4 +16,3 @@ VUE_APP_WEB_CONFIG_KEY=admin.webconfig
 VUE_APP_API_BASE_URL=http://123.60.214.109:8405
 VUE_APP_SYSTEM_NAME=af-revenue
 VUE_APP_LOGIN_VERSION=V4
-VUE_APP_SINGLE_PAPER=TRUE

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.16.3",
+  "version": "1.16.5",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",
@@ -56,6 +56,7 @@
     "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",

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

@@ -117,7 +117,7 @@ export default {
       // 生成地址串中省市区街道信息禁止修改
       readOnlyDivisions: false,
       // cur 位置
-      curPosition: [108.878703, 34.223701],
+      curPosition: null,
       searchFlag: false,
     }
   },
@@ -153,6 +153,13 @@ export default {
         return { address: 'address', coords: 'coords' }
       }
     },
+    // 地图渲染初始值
+    address: {
+      type: Object,
+      default: () => {
+        return { }
+      }
+    },
     readOnly: {
       type: Boolean,
       default: false
@@ -182,8 +189,10 @@ export default {
       }, 200)()
     },
     initMap (aMap) {
+      const center = (this.address?.coords || '108.878703, 34.223701').split(',')
       this.map = new (aMap).Map('addressSearchCombobox_map', { // 设置地图容器id
         resizeEnable: true, // 是否监控地图容器尺寸变化
+        center: center, // 设置初始中心
         zoom: 10, // 初始化地图层级
       })
       this.geocoder = new (aMap).Geocoder({
@@ -438,18 +447,6 @@ export default {
         })
       }
     },
-    attr: {
-      handler (newValue) {
-        console.log('监听事件触发:', { new: newValue })
-        if (newValue.type === 'coordinateSearch') {
-          this.addressInput = newValue.formDefault_lng_lat
-        } else if (newValue.type === 'addressSearch') {
-          this.addressInput = newValue.formDefault
-        }
-      },
-      deep: true, // 深度监听对象内部变化
-      immediate: true
-    }
   }
 }
 </script>

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

@@ -35,11 +35,12 @@ defineExpose({
 </script>
 
 <template>
-  <div class="h-tab-wrapper"
-       :class="{ 'h-tab-has-top-margin': hasTopMargin,
-                                        'h-tab-style7': useStyle7,
-                                        'h-tab-cycle': useStyle7 && useCycle,
-                                         'h-tab-style8': useStyle8}">
+  <div
+    class="h-tab-wrapper"
+    :class="{ 'h-tab-has-top-margin': hasTopMargin,
+              'h-tab-style7': useStyle7,
+              'h-tab-cycle': useStyle7 && useCycle,
+              'h-tab-style8': useStyle8}">
     <x-tab
       ref="xTabRef"
       v-bind="$attrs"

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

@@ -583,6 +583,9 @@ export default {
           if (item.formDefault === 'curUserId') {
             formData[item.model] = item.type === 'select' ? this.currUser.id : [this.currUser.id]
           }
+        } else if (['addressSearch'].includes(item.type)) {
+          formData[item.model] = item.formDefault
+          formData[`${item.model}_lng_lat`] = item.formDefault_lng_lat
         } else {
           formData[item.model] = item.formDefault
         }

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

@@ -463,7 +463,8 @@
         :emitFunc="emitFunc"
         :attr="attr"
         :read-only="readOnly"
-        v-model="searchResult"
+        :searchResult="form[attr.model]"
+        :address="{ address: form[attr.model], coords: form[`${attr.model}_lng_lat`] }"
         :resultKeys="{ address: attr.model, coords: `${attr.model}_lng_lat` }"
         ref="addressSearchCombobox"
         searchResultType="Object"

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

@@ -1,14 +1,14 @@
 <template>
-  <a-row type="flex" :gutter="{ xs: 8, sm: 10, md: 12, lg: 16 }">
-    <a-col
-      :xs="14"
-      :sm="14"
-      :md="12"
-      :lg="9"
-      :xl="6"
-      :xxl="5"
-      v-if="xTreeConfigName"
-      :style="{ maxWidth: '400px'}">
+  <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"
@@ -17,14 +17,10 @@
         @treeOnChecked="treeOnChecked"
         ref="xtree"
       ></x-tree-pro>
-    </a-col>
-    <a-col
-      :xs="xTreeConfigName ? 10 : 24"
-      :sm="xTreeConfigName ? 10 : 24"
-      :md="xTreeConfigName ? 12 : 24"
-      :lg="xTreeConfigName ? 15 : 24"
-      :xl="xTreeConfigName ? 18 : 24"
-      :xxl="xTreeConfigName ? 19 : 24">
+    </pane>
+    <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">
@@ -118,9 +114,9 @@
           </a-empty>
         </template>
       </div>
-    </a-col>
+    </pane>
     <UserInfoDetailManage ref="userInfo" @close="refresh(false)"/>
-  </a-row>
+  </splitpanes>
 </template>
 <script>
 import XForm from '@vue2-client/base-client/components/common/XForm'
@@ -129,6 +125,8 @@ import XAddReport from '@vue2-client/base-client/components/common/XAddReport'
 import XTable from '@vue2-client/base-client/components/common/XTable'
 import XTree from '@vue2-client/base-client/components/common/XTree'
 import XImportExcel from '@vue2-client/base-client/components/common/XImportExcel'
+import { Splitpanes, Pane } from 'splitpanes'
+import 'splitpanes/dist/splitpanes.css'
 import {
   getConfigByName,
   getConfigByLogic,
@@ -151,7 +149,9 @@ export default {
     XTree,
     XAddForm,
     XAddReport,
-    XImportExcel
+    XImportExcel,
+    Splitpanes,
+    Pane
   },
   provide () {
     return {
@@ -239,7 +239,8 @@ export default {
       table_selectedRows: [],
       // 数据只有一页时是否展示分页，true：展示，auto：隐藏
       showPagination: true,
-      isMounted: false
+      isMounted: false,
+      treeSize: localStorage.getItem('CURD::' + this.xTreeConfigName + '::TreeSize') ?? 25
     }
   },
   computed: {
@@ -439,6 +440,9 @@ export default {
     getRealKeyData,
     getConfigByNameAsync,
     getConfigByName,
+    storePaneSize (treeSize) {
+      localStorage.setItem('CURD::' + this.xTreeConfigName + '::TreeSize', treeSize[0].size)
+    },
     customEvent (func, data) {
       this.$emit(func, data)
     },
@@ -456,14 +460,14 @@ export default {
 
       // 遍历 rows 的每一项，提取符合条件的数据
       rows.forEach(row => {
-          const itemResult = {}
-          Object.keys(row).forEach(key => {
-              if (key.startsWith(prefix)) {
-                  const newKey = key.slice(prefix.length) // 去掉前缀
-                  itemResult[newKey] = row[key] // 添加到结果对象中
-              }
-          })
-          result.push(itemResult) // 将处理后的项添加到结果数组中
+        const itemResult = {}
+        Object.keys(row).forEach(key => {
+          if (key.startsWith(prefix)) {
+            const newKey = key.slice(prefix.length) // 去掉前缀
+            itemResult[newKey] = row[key] // 添加到结果对象中
+          }
+        })
+        result.push(itemResult) // 将处理后的项添加到结果数组中
       })
 
       return result // 返回去掉前缀后的对象数组
@@ -471,17 +475,17 @@ export default {
 
     // 给数据区域添加主表数据，给的数据没有主表别名，放着时添加主表别名
     pushPrimaryData (rows) {
-        const alias = this.realQueryConfig.tableAliasName // 获取主表的别名
-        const prefix = `${alias}_` // 构建前缀
-        const result = rows.map(row => {
-            const itemResult = {}
-            Object.keys(row).forEach(key => {
-                itemResult[prefix + key] = row[key] // 复制原始数据
-            })
-            return itemResult // 返回添加了主表别名的数据
+      const alias = this.realQueryConfig.tableAliasName // 获取主表的别名
+      const prefix = `${alias}_` // 构建前缀
+      const result = rows.map(row => {
+        const itemResult = {}
+        Object.keys(row).forEach(key => {
+          itemResult[prefix + key] = row[key] // 复制原始数据
         })
-        // 把结果添加到数据区
-        this.getTableData().push(...result)
+        return itemResult // 返回添加了主表别名的数据
+      })
+      // 把结果添加到数据区
+      this.getTableData().push(...result)
     },
 
     // 设置固定查询条件，主表别名自动带
@@ -852,7 +856,7 @@ export default {
      * 设置表格数据
      */
     setTableData (data) {
-     this.$refs.xTable.setTableData(data)
+      this.$refs.xTable.setTableData(data)
     },
     /**
      * 表单本地提交
@@ -943,3 +947,27 @@ export default {
   margin-bottom: 12px;
 }
 </style>
+<style>
+
+.splitpanes.default-theme .splitpanes__splitter {
+  border: 0;
+  width: 1rem;
+  position: relative;
+
+  &:before {
+    content: '';
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%);
+    width: 2px;
+    height: 30px;
+    border-radius: 1px;
+  }
+}
+
+.splitpanes.default-theme .splitpanes__pane {
+  overflow: visible;
+  background-color: transparent;
+}
+</style>

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

@@ -4,11 +4,12 @@
       title="示例表单"
       :queryParamsName="queryParamsName"
       :fixedAddForm="fixedAddForm"
+      :x-tree-config-name="xTreeConfigName"
       :externalSelectedRowKeys="selectedKeys"
       @action="action"
       @selectRow="selectRow"
       @columnClick="columnClick"
-      serviceName="af-system"
+      serviceName="af-revenue"
       ref="xFormTable">
     </x-form-table>
   </a-card>
@@ -26,7 +27,9 @@ export default {
   data () {
     return {
       // 查询配置文件名
-      queryParamsName: 'ceshiCRUD',
+      queryParamsName: 'address_management',
+      // 查询配置左侧tree
+      xTreeConfigName: 'addressType',
       // 新增表单固定值
       fixedAddForm: {},
       // 是否显示详情抽屉

package/src/base-client/components/common/XTree/XTreePro.vue

@@ -221,7 +221,7 @@ export default {
       this.expandedKeys = this.expandedKeys.filter(item => item !== node[this.replaceFields.key])
     },
     highlightKeyword (label, keyword) {
-      const maxLen = this.config.deepNodeMaxWidth
+      const maxLen = 12
 
       if (!keyword) {
         return maxLen && label.length > maxLen ? label.substring(0, maxLen) + '...' : label

package/src/base-client/components/his/XHisEditor/XHisEditor.vue

@@ -14,9 +14,9 @@
               >
                 <a-select-option v-for="item of resListCp" :key="item.value" :value="item.value">{{ item.label }}</a-select-option>
               </a-select>
-<!--              <template v-if="this.modeType !== 'readonly' && this.resId !== -1">-->
-<!--                <a-button icon="plus" @click="addRes"/>-->
-<!--              </template>-->
+              <!--              <template v-if="this.modeType !== 'readonly' && this.resId !== -1">-->
+              <!--                <a-button icon="plus" @click="addRes"/>-->
+              <!--              </template>-->
             </template>
             <a-radio-group
               v-show="showModeChoose"
@@ -32,15 +32,15 @@
         <a-col class="editor-action">
           <a-space>
             <template v-if="this.modeType !== 'readonly'">
-<!--              <a-button-->
-<!--                type="primary"-->
-<!--                v-if = "userTemplateVisible"-->
-<!--                @click="useTemplateData"-->
-<!--              >-->
-<!--                使用-->
-<!--              </a-button>-->
+              <!--              <a-button-->
+              <!--                type="primary"-->
+              <!--                v-if = "userTemplateVisible"-->
+              <!--                @click="useTemplateData"-->
+              <!--              >-->
+              <!--                使用-->
+              <!--              </a-button>-->
               <a-button type="primary" @click="Recording" v-if="canRecord" v-model="recording">
-                {{recording? '停止' : '录音'}}
+                {{ recording? '停止' : '录音' }}
               </a-button>
               <a-button type="primary" @click="openRenameModal" v-if="this.resId !== -1">
                 重命名
@@ -78,7 +78,7 @@
               <a-modal
                 title="保存"
                 :visible="saveVisible"
-                :confirm-loading = "false"
+                :confirm-loading="false"
                 @ok="handleSaveConfirm"
                 @cancel="saveVisible = false"
               >

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

@@ -88,6 +88,7 @@ routerResource.XReportView = () => import('@vue2-client/pages/XReportView')
 routerResource.XReportGrid = () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo')
 
 routerResource.XTab = () => import('@vue2-client/base-client/components/common/XTab/XTabDemo')
+routerResource.addressManage = () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue')
 
 // 基础路由组件注册
 const routerMap = {

package/vue.config.js

@@ -11,11 +11,11 @@ const productionGzipExtensions = ['js', 'css']
 const isProd = process.env.NODE_ENV === 'production'
 
 // v4 产品演示
-const v3Server = 'http://aote-office.8866.org:31567'
+const v3Server = 'http://123.180.154.5:31467'
 // const gateway = 'http://192.168.50.67:31467'
 // const testUpload = 'http://123.60.214.109:8406'
 const OSSServerDev = 'http://192.168.50.67:30351'
-const revenue = 'http://aote-office.8866.org:31567'
+const revenue = 'http://123.180.154.5:31467'
 // const revenue = 'http://127.0.0.1:31467'
 // const OSSServerProd = 'http://192.168.50.67:31351'
 // const testUploadLocal = 'http://127.0.0.1:9001'