vue2-client 1.8.234 → 1.8.236

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.8.234",
+  "version": "1.8.236",
   "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

@@ -7,19 +7,20 @@
         <a-input
           v-model="addressInput"
           :read-only="readOnly"
+          @change="change"
           style="flex: 1; width: auto; min-width: 0;"
           placeholder="请选择地址信息"/>
         <a-button
-          v-if="attr.inputOnAfterName && attr.inputOnAfterFunc"
+          v-if="attr?.inputOnAfterName && attr?.inputOnAfterFunc"
           style="flex: 1; width: auto; min-width: 4rem;max-width: 6rem"
           type="primary"
-          @click="emitFunc(attr.inputOnAfterFunc,addressInput)">
-          {{ attr.inputOnAfterName }}
+          @click="emitFunc(attr?.inputOnAfterFunc,addressInput)">
+          {{ attr?.inputOnAfterName }}
         </a-button>
         <!--    默认展示该图标 如果配置了按钮插槽展示  primary 央视 -->
         <a-button
           style="width: 2rem; flex-shrink: 0;"
-          :type="attr.inputOnAfterName ? 'primary' :''"
+          :type="attr?.inputOnAfterName ? 'primary' :''"
           icon="environment"
           @click="visible=true">
         </a-button>
@@ -102,7 +103,11 @@ export default {
       map: null,
       m_index: 1002,
       positionPicker: null,
-      addressInput: this.searchResult
+      addressInput: this.searchResult,
+      // 选择地址返回的行政区域
+      divisions: {},
+      // 生成地址串中省市区街道信息禁止修改
+      readOnlyDivisions: false
     }
   },
   computed: {
@@ -141,6 +146,11 @@ export default {
       type: Boolean,
       default: false
     },
+    // 省市区是否可以修改
+    divisionsChange: {
+      type: Boolean,
+      default: false
+    },
   },
   created () {
   },
@@ -148,6 +158,14 @@ export default {
   },
   methods: {
     change (value) {
+      if (this.readOnlyDivisions && !this.divisionsChange) {
+        // 如果省市区街道信息禁止修改
+        if (this.divisions.str && !this.addressInput.startsWith(this.divisions.str)) {
+          this.addressInput = this.addressObj.address
+          this.$message.info('省市区街道信息请从选择新地址以变更')
+          return
+        }
+      }
       this.$emit('update:searchResult', this.addressInput)
     },
     initMap (aMap) {
@@ -190,7 +208,7 @@ export default {
       this.addressInput = this.addressObj.address
       console.log(' result--- ', result)
       this.visible = false
-      this.$emit('onSelect', JSON.stringify(result))
+      this.$emit('onSelect', Object.assign({}, result, { divisions: this.divisions }))
       // this.$emit('onClick', result || value)
     },
     // 懒加载检索方法
@@ -276,6 +294,22 @@ export default {
           this.positionPicker.on('success', (positionResult) => {
             console.log(positionResult)
             console.log(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
+              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
+            }
             this.addressObj.address = positionResult.address
             this.addressObj.lng_lat = `${positionResult.position.lng},${positionResult.position.lat}`
           })

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

@@ -0,0 +1,35 @@
+<script>
+
+import AddressSearchCombobox from '@vue2-client/base-client/components/common/AddressSearchCombobox/index'
+
+export default {
+  name: 'Demo',
+  components: { AddressSearchCombobox },
+  data () {
+    return {
+      visible: false,
+      searchResult: {}
+    }
+  },
+  methods: {
+    addressSearchComboboxSelect (res) {
+      console.log('===', res)
+    }
+  }
+}
+</script>
+
+<template>
+  <div>
+    <address-search-combobox
+      v-model="searchResult"
+      :resultKeys="{ address: 'f_address', coords: `f_address_lng_lat` }"
+      searchResultType="Object"
+      @onSelect="addressSearchComboboxSelect"
+    ></address-search-combobox>
+  </div>
+</template>
+
+<style scoped lang="less">
+
+</style>

package/src/config/default/setting.config.js

@@ -49,5 +49,7 @@ module.exports = {
   // 自定义组件集合 格式为组件名: 组件路径（不需要带@/）
   customizeComponent: {},
   // 自定义默认头像路径
-  defaultAvatarUrl: 'https://gw.alipayobjects.com/zos/rmsportal/jZUIxmJycoymBprLOUbT.png'
+  defaultAvatarUrl: 'https://gw.alipayobjects.com/zos/rmsportal/jZUIxmJycoymBprLOUbT.png',
+  gaode_key: 'a37ffa0cad038bef7242cdff7084cd36',
+  gaode_secret_key: 'da72499e61d9299f447bb5b2af9f9e6c',
 }

package/src/pages/Example/index.vue

@@ -8,7 +8,8 @@
 <script>
 import XReport from '@vue2-client/base-client/components/common/XReport'
 // import Demo from '@vue2-client/base-client/components/common/XFormGroup/demo.vue'
-import Demo from '@vue2-client/base-client/components/common/XDescriptions/demo.vue'
+// import Demo from '@vue2-client/base-client/components/common/XDescriptions/demo.vue'
+import Demo from '@vue2-client/base-client/components/common/AddressSearchCombobox/demo.vue'
 
 export default {
   name: 'Example',

package/vue.config.js

@@ -99,7 +99,6 @@ module.exports = {
       extensions: ['.js', '.vue', '.json'],
       alias: {
         '@vue2-client': path.resolve('src'),
-        '@': path.resolve('src')
       }
     }
     config.entry.app = ['core-js/stable', 'regenerator-runtime/runtime', 'whatwg-fetch', './src/main.js']