vue2-client 1.14.29 → 1.14.31

package/package.json

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

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

@@ -29,7 +29,9 @@
       title="地址选择"
       @ok="selected"
       :zIndex="m_index"
-      :destroyOnClose="true">
+      :destroyOnClose="true"
+      width="70%"
+    >
       <div class="certain-category-search-wrapper">
         <a-auto-complete
           style="right: 0px;width: 90%;z-index:2;margin-top:2%;"
@@ -189,15 +191,92 @@ export default {
         radius: 500 // 范围，默认：500
       })
       this.map.addControl(new (aMap).ToolBar()) // 初始化工具插件
-      // 初始化窗体
-      /* this.infoWindow = new (aMap).InfoWindow({
-        anchor: 'bottom-center',
-        isCustom: false, // 使用自定义窗体
-        autoMove: true,
-        content: '',
-        showShadow: true,
-        offset: new (aMap).Pixel(0, -25)
-      }) */
+
+      // 等待地图加载完成
+      this.map.on('complete', () => {
+        // 获取地图中心点
+        const center = this.map.getCenter()
+
+        // 创建标记对象 - 使用默认样式
+        this.marker = new (aMap).Marker({
+          position: [center.lng, center.lat], // 使用地图中心点作为初始位置
+          map: this.map // 直接在地图创建时添加标记
+        })
+
+        // 获取中心点地址信息
+        this.geocoder.getAddress(center, (status, result) => {
+          if (status === 'complete' && result.info === 'OK') {
+            const addressComponent = result.regeocode.addressComponent
+            this.divisions.province = addressComponent.province
+            this.divisions.city = addressComponent.city
+            this.divisions.district = addressComponent.district
+            this.divisions.township = addressComponent.township
+            this.divisions.towncode = addressComponent.towncode
+            this.divisions.street = addressComponent.street
+
+            // 获取小区信息
+            if (result.regeocode.aois && result.regeocode.aois.length) {
+              this.divisions.area = result.regeocode.aois[0].name
+            } else if (result.regeocode.pois && result.regeocode.pois.length) {
+              this.divisions.area = result.regeocode.pois[0].name
+            }
+
+            this.divisions.str = `${addressComponent.province}${addressComponent.city}${addressComponent.district}${addressComponent.township}`
+
+            if (this.divisions.str && result.regeocode.formattedAddress.startsWith(this.divisions.str)) {
+              this.readOnlyDivisions = true
+            }
+
+            this.addressObj.address = result.regeocode.formattedAddress
+            this.addressObj.lng_lat = `${center.lng},${center.lat}`
+          }
+        })
+      })
+
+      // 添加地图点击事件
+      this.map.on('click', (e) => {
+        const lnglat = e.lnglat
+        this.curPosition = lnglat
+
+        // 更新标记位置
+        this.marker.setPosition([lnglat.lng, lnglat.lat])
+
+        // 将地图中心移动到点击位置
+        this.map.setCenter([lnglat.lng, lnglat.lat])
+
+        // 获取点击位置的地址信息
+        this.geocoder.getAddress(lnglat, (status, result) => {
+          if (status === 'complete' && result.info === 'OK') {
+            const addressComponent = result.regeocode.addressComponent
+            this.divisions.province = addressComponent.province
+            this.divisions.city = addressComponent.city
+            this.divisions.district = addressComponent.district
+            this.divisions.township = addressComponent.township
+            this.divisions.towncode = addressComponent.towncode
+            this.divisions.street = addressComponent.street
+
+            // 获取小区信息
+            if (result.regeocode.aois && result.regeocode.aois.length) {
+              this.divisions.area = result.regeocode.aois[0].name
+            } else if (result.regeocode.pois && result.regeocode.pois.length) {
+              this.divisions.area = result.regeocode.pois[0].name
+            }
+
+            this.divisions.str = `${addressComponent.province}${addressComponent.city}${addressComponent.district}${addressComponent.township}`
+
+            if (this.divisions.str && result.regeocode.formattedAddress.startsWith(this.divisions.str)) {
+              this.readOnlyDivisions = true
+            }
+
+            if (!this.searchFlag) {
+              this.addressObj.address = result.regeocode.formattedAddress
+              this.addressObj.lng_lat = `${lnglat.lng},${lnglat.lat}`
+            } else {
+              this.searchFlag = false
+            }
+          }
+        })
+      })
     },
     onSelect (value) {
       // 选中地址后不触发更新坐标
@@ -214,7 +293,11 @@ export default {
       const label = labelMatch ? labelMatch[1].trim() : null
       this.addressObj.address = this.mergeAddressAndLabel(this.addressObj.address, label)
       this.addressObj.lng_lat = coordinatesMatch ? coordinatesMatch[1] : ''
-      this.map.setCenter(this.addressObj.lng_lat.split(','))
+
+      // 更新地图中心和标记位置
+      const [lng, lat] = this.addressObj.lng_lat.split(',')
+      this.map.setCenter([lng, lat])
+      this.marker.setPosition([lng, lat])
     },
     mergeAddressAndLabel (address, label = '') {
       // 从地址的末尾开始匹配标签的开头部分
@@ -337,53 +420,10 @@ export default {
           GetGDMap(this.gaode_secret_key, this.gaode_key).then(aMap => {
             this.initMap(aMap)
             this.mapAutocomplete = new (aMap).AutoComplete({
-              // city 限定城市，默认全国
               city: '全国',
               dragEnable: true,
               animateEnable: false
             })
-            this.positionPicker = new window.AMapUI.PositionPicker({
-              mode: 'dragMap',
-              map: this.map
-            })
-            this.positionPicker.on('success', (positionResult) => {
-              console.log(positionResult)
-              console.log(positionResult.position)
-              this.curPosition = positionResult.position
-              // 设置 行政区划信息
-              if (positionResult?.regeocode?.addressComponent) {
-                const { addressComponent } = positionResult?.regeocode
-                this.divisions.province = addressComponent.province
-                this.divisions.city = addressComponent.city
-                this.divisions.district = addressComponent.district
-                this.divisions.township = addressComponent.township
-                this.divisions.towncode = addressComponent.towncode
-                this.divisions.street = addressComponent.street
-                // 试着获取小区
-                if (positionResult?.regeocode?.aois && positionResult?.regeocode?.aois.length) {
-                  // 取第一个当做小区
-                  this.divisions.area = positionResult?.regeocode?.aois[0]?.name
-                } else if (positionResult?.regeocode?.pois && positionResult?.regeocode?.pois.length) {
-                  // 取第一个当做小区
-                  this.divisions.area = positionResult?.regeocode?.pois[0]?.name
-                }
-                this.divisions.str =
-                  `${addressComponent.province}${addressComponent.city}${addressComponent.district}${addressComponent.township}`
-              }
-              if (this.divisions.str && positionResult.address.startsWith(this.divisions.str)) {
-                // 如果 省市区信息和获取到的地址的前缀一致 那么省市区前缀禁止修改只能修改后面的 通过 onchange事件拦截
-                this.readOnlyDivisions = true
-              }
-              if (!this.searchFlag) {
-                this.addressObj.address = positionResult.address
-                this.addressObj.lng_lat = `${positionResult.position.lng},${positionResult.position.lat}`
-              } else {
-                this.searchFlag = false
-              }
-            })
-            this.positionPicker.on('fail', function (positionResult) {
-            })
-            this.positionPicker.start()
           })
         })
       }
@@ -396,7 +436,7 @@ export default {
 #addressSearchCombobox_map {
   margin: 1% 0;
   width: 100%;
-  height: 400px;
+  height: 600px;
   text-align: center
 }
 

package/src/base-client/components/common/XTable/XTableWrapper.vue

@@ -10,7 +10,7 @@
     :rowKey="tableContext.rowKey"
     :showSummary="tableContext.showSummary"
     :rowSelection="tableContext.rowSelection"
-    :scroll="{ x: tableContext.scrollXWidth, y: tableContext.scrollYHeight }"
+    :scroll="{ x: tableContext.scrollXWidth, y: tableContext.scrollYHeight } "
     :showPagination="tableContext.showPagination"
     :hidePagination="tableContext.simpleMode"
     :showSelected="!tableContext.simpleMode"

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

@@ -191,7 +191,7 @@ export default {
       getConfigByName(data, 'af-his', res => {
         this.config = res
         console.log(this.config)
-        const parameter = { ...parameterData, ...res.parameter, ...this.parameter }
+        const parameter = { ...res.parameter, ...this.parameter, ...parameterData  }
         runLogic(res.logicName, parameter, 'af-his').then(result => {
           this.data = result
         })
@@ -208,6 +208,14 @@ export default {
         this.getData(newValue, {})
       },
       deep: true
+    },
+    parameter: {
+      handler (newValue, oldValue) {
+        console.log('监听事件触发:', { old: oldValue, new: newValue })
+        // 当 parameter 变化时重新获取数据
+        this.getData(this.queryParamsName, {})
+      },
+      deep: true // 深度监听对象内部变化
     }
   }
 }

package/src/base-client/components/his/XTitle/README.md

@@ -22,7 +22,7 @@ XTitle 是一个多功能的标题组件，可以显示标题文本或按钮，
 
 ### 配置参数格式
 
-XTitle 组件通过一个字符串参数进行配置
+XTitle 组件通过一个字符串参数进行配置 
 
 各部分说明：
 

package/src/utils/request.js

@@ -160,7 +160,8 @@ function loadInterceptors () {
     if (['post'].includes(config.method.toLowerCase()) && v4SessionKey &&
       !config.url.includes('/logic/openapi/') &&
       !config.url.includes('devApi') &&
-      !config.url.includes('auth/login')) {
+      !config.url.includes('auth/login') &&
+      config.url.includes('api/af-')) {
       if (config.data && !(config.data instanceof FormData)) {
         config.data = {
           encrypted: EncryptUtil.AESEncryptCBC(config.data, v4SessionKey)