vue2-client 1.8.233 → 1.8.234

package/package.json

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

@@ -1,8 +1,29 @@
 <template>
   <div id="addressSearchCombobox">
     <div>
-      <a-input style="width: 88%" v-model="addressInput" @change="change"/>
-      <a-button style="width: 10%;padding: 0px" type="link" @click="visible=true"><img style="width: 100%" src="@vue2-client/assets/img/location.png"/></a-button>
+      <a-input-group
+        style="display: flex; width: 100%;"
+        compact>
+        <a-input
+          v-model="addressInput"
+          :read-only="readOnly"
+          style="flex: 1; width: auto; min-width: 0;"
+          placeholder="请选择地址信息"/>
+        <a-button
+          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 }}
+        </a-button>
+        <!--    默认展示该图标 如果配置了按钮插槽展示  primary 央视 -->
+        <a-button
+          style="width: 2rem; flex-shrink: 0;"
+          :type="attr.inputOnAfterName ? 'primary' :''"
+          icon="environment"
+          @click="visible=true">
+        </a-button>
+      </a-input-group>
     </div>
     <a-modal :visible="visible" title="地址选择" @ok="selected" @cancel="visible=false" :zIndex="m_index">
       <div id="addressSearchCombobox_map">
@@ -17,15 +38,17 @@
             @search="fetchFunction"
             @select="onSelect"
           >
-            <a-spin v-if="searching" slot="notFoundContent" size="small" />
+            <a-spin v-if="searching" slot="notFoundContent" size="small"/>
             <template slot="dataSource">
               <a-select-opt-group v-for="group in option" :key="group.title">
                 <span
                   slot="label">
-                  <a-icon type="bank" /> {{ group.title }}
+                  <a-icon type="bank"/> {{ group.title }}
                 </span>
                 <a-select-option v-for="address in group.children" :key="address.label + ' <' + address.value + '>'">
-                  <p class="addressName"><a-icon type="environment" /><span v-html="highLight(address.label, address.word)"></span></p>
+                  <p class="addressName">
+                    <a-icon type="environment"/>
+                    <span v-html="highLight(address.label, address.word)"></span></p>
                   <p v-if="address.address !== '[]'" class="addressRemark">
                     {{ address.address }}
                   </p>
@@ -86,6 +109,16 @@ export default {
     ...mapState('setting', ['isMobile', 'gaode_key', 'gaode_secret_key'])
   },
   props: {
+    attr: {
+      type: Object,
+      default: () => {
+      }
+    },
+    emitFunc: {
+      type: Function,
+      default: () => {
+      }
+    },
     searchResult: {
       type: String,
       default: undefined
@@ -100,8 +133,14 @@ export default {
     // Object 返回格式时 可以自定义key
     resultKeys: {
       type: Object,
-      default: () => { return { address: 'address', coords: 'coords' } }
-    }
+      default: () => {
+        return { address: 'address', coords: 'coords' }
+      }
+    },
+    readOnly: {
+      type: Boolean,
+      default: false
+    },
   },
   created () {
   },
@@ -230,8 +269,6 @@ export default {
             dragEnable: true,
             animateEnable: false
           })
-          console.log(aMap)
-          console.log(window)
           this.positionPicker = new window.AMapUI.PositionPicker({
             mode: 'dragMap',
             map: this.map
@@ -252,18 +289,19 @@ export default {
 }
 </script>
 <style>
-.asc_descriptions .ant-descriptions-item-content{
+.asc_descriptions .ant-descriptions-item-content {
   width: 80%;
 }
 </style>
 <style lang="less">
-#addressSearchCombobox_map{
-  margin:1% 0;
-  width:100%;
-  height:400px;
-  text-align:center
+#addressSearchCombobox_map {
+  margin: 1% 0;
+  width: 100%;
+  height: 400px;
+  text-align: center
 }
-#addressSearchCombobox{
+
+#addressSearchCombobox {
 
   .certain-category-search-dropdown .ant-select-dropdown-menu-item-group-title {
     color: #666;
@@ -287,15 +325,18 @@ export default {
   .certain-category-search-dropdown .ant-select-dropdown-menu {
     max-height: 300px;
   }
+
   .certain-category-search-wrapper .certain-search-item-count {
     position: absolute;
     color: #999;
     right: 16px;
   }
+
   .certain-category-search-wrapper .certain-category-search.ant-select-focused,
   .certain-category-icon {
     color: #108ee9;
   }
+
   .certain-category-search-wrapper .certain-category-icon {
     color: #6e6e6e;
     transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);

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

@@ -380,12 +380,21 @@
   <x-form-col
     v-else-if="attr.type === 'addressSearch'"
     :flex="attr.flex">
-    <a-form-model-item :ref="attr.model" :label="attr.name" :prop="attr.prop ? attr.prop : attr.model">
+    <a-form-model-item
+      :ref="attr.model"
+      :label="attr.name"
+      :prop="attr.prop ? attr.prop : attr.model"
+      :labelCol="layout === 'inline' && attr.occupyCol ? labelAndWrapperCol[attr.occupyCol].labelCol:undefined"
+      :wrapperCol="layout === 'inline'&& attr.occupyCol ? labelAndWrapperCol[attr.occupyCol].wrapperCol:undefined"
+      :style="layout === 'inline'&& attr.occupyCol && attr.occupyCol > 1? {width:`calc(100% - ${attr.occupyCol * 1.533}rem)`}:{}">
       <address-search-combobox
+        :emitFunc="emitFunc"
+        :attr="attr"
+        :read-only="readOnly"
         v-model="searchResult"
         :resultKeys="{ address: attr.model, coords: `${attr.model}_lng_lat` }"
         searchResultType="Object"
-        @onSelect="form=Object.assign(form,JSON.parse(searchResult))"
+        @onSelect="addressSearchComboboxSelect"
       ></address-search-combobox>
     </a-form-model-item>
   </x-form-col>
@@ -596,7 +605,7 @@ export default {
             xxl: 24
           }
         } else {
-          if (this.attr.type === 'input' && this.attr.occupyCol) {
+          if (['input', 'addressSearch'] && this.attr.occupyCol) {
             // 如果是 input 看是否配置了 占用列配置
             this.attr.flex = {
               xs: 8 * this.attr.occupyCol,
@@ -637,6 +646,13 @@ export default {
         this.initRadioValue()
       }
     },
+    addressSearchComboboxSelect () {
+      this.form = Object.assign(this.form, JSON.parse(this.searchResult))
+      this.emitFunc('addressSearchComboboxSelect', {
+        key: this.attr.model,
+        value: this.searchResult
+      })
+    },
     getDataCallback (res) {
       this.option = res
       if (this.attr.type === 'treeSelect') {