vue2-client 1.2.81 → 1.2.84

package/src/base-client/components/common/ScrollList/SrcollList.vue

@@ -1,113 +1,113 @@
-<template>
-  <a-list
-    :data-source="model.rows"
-    :bordered="bordered"
-    v-infinite-scroll="handleInfiniteOnLoad"
-    class="srcoll-list-infinite-container"
-    :infinite-scroll-disabled="busy"
-    :infinite-scroll-distance="distance"
-  >
-    <a-list-item slot="renderItem" class="srcoll_list_li" slot-scope="item,index" @click="selectItem(index,item)">
-      <slot :item="item" :index="index" >
-      </slot>
-    </a-list-item>
-    <div v-if="loading && !busy" class="srcoll-list-loading-container">
-      <a-spin />
-    </div>
-  </a-list>
-</template>
-
-<script>
-  import infiniteScroll from 'vue-infinite-scroll'
-  import { post } from '@vue2-client/services/api/restTools'
-
-  export default {
-    name: 'SrcollList1',
-    directives: { infiniteScroll },
-    props: {
-      'busy': { // 是否执行回调
-        type: Boolean,
-        default: false
-      },
-      'distance': { // 距底部多少像素触发回调
-        type: Number,
-        default: 1
-      },
-      'bordered': { // 是否显示列表边框
-        type: Boolean,
-        default: true
-      },
-      'model': {
-        type: Object,
-        default: () => {
-          return {}
-        }
-      }
-    },
-    data () {
-      return {
-        selectRow: {},
-        loading: false
-      }
-    },
-    mounted () {
-    },
-    methods: {
-      selectItem (index, item) {
-        this.$emit('selectItem', index, item)
-      },
-      handleInfiniteOnLoad () {
-        this.loading = true
-        if (this.model.pageNo < this.model.totalPage || this.model.pageNo == 0) {
-          this.model.pageNo = this.model.pageNo + 1
-          post(this.model.url, { data: this.model }).then((res) => {
-            this.model.rows = this.model.rows.concat(res.data).map((item, index) => ({ ...item, index }))
-            this.loading = false
-            this.model.totalPage = res.totalPage
-            this.model.totalCount = res.totalCount
-          })
-        } else {
-          this.loading = false
-        }
-      },
-      search () {
-        this.model.pageNo = 0
-        this.model.rows = []
-        this.handleInfiniteOnLoad()
-      }
-    }
-  }
-</script>
-
-<style scoped>
-  .srcoll-list-infinite-container {
-    border-radius: 4px;
-    height: 100%;
-    overflow-y: scroll;
-  }
-  /*滚动条样式*/
-  .srcoll-list-infinite-container::-webkit-scrollbar {
-    width: 4px;
-    /*height: 4px;*/
-  }
-  .srcoll-list-infinite-container::-webkit-scrollbar-thumb {
-    border-radius: 10px;
-    -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
-    background: rgba(0,0,0,0.2);
-  }
-  .srcoll-list-infinite-container::-webkit-scrollbar-track {
-    -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
-    border-radius: 0;
-    background: rgba(0,0,0,0.1);
-
-  }
-  .srcoll-list-loading-container {
-    position: absolute;
-    bottom: 10%;
-    width: 100%;
-    text-align: center;
-  }
-  .srcoll_list_li:hover{
-    background-color: rgb(203,234,241);
-  }
-</style>
+<template>
+  <a-list
+    :data-source="model.rows"
+    :bordered="bordered"
+    v-infinite-scroll="handleInfiniteOnLoad"
+    class="srcoll-list-infinite-container"
+    :infinite-scroll-disabled="busy"
+    :infinite-scroll-distance="distance"
+  >
+    <a-list-item slot="renderItem" class="srcoll_list_li" slot-scope="item,index" @click="selectItem(index,item)">
+      <slot :item="item" :index="index" >
+      </slot>
+    </a-list-item>
+    <div v-if="loading && !busy" class="srcoll-list-loading-container">
+      <a-spin />
+    </div>
+  </a-list>
+</template>
+
+<script>
+  import infiniteScroll from 'vue-infinite-scroll'
+  import { post } from '@vue2-client/services/api/restTools'
+
+  export default {
+    name: 'SrcollList1',
+    directives: { infiniteScroll },
+    props: {
+      'busy': { // 是否执行回调
+        type: Boolean,
+        default: false
+      },
+      'distance': { // 距底部多少像素触发回调
+        type: Number,
+        default: 1
+      },
+      'bordered': { // 是否显示列表边框
+        type: Boolean,
+        default: true
+      },
+      'model': {
+        type: Object,
+        default: () => {
+          return {}
+        }
+      }
+    },
+    data () {
+      return {
+        selectRow: {},
+        loading: false
+      }
+    },
+    mounted () {
+    },
+    methods: {
+      selectItem (index, item) {
+        this.$emit('selectItem', index, item)
+      },
+      handleInfiniteOnLoad () {
+        this.loading = true
+        if (this.model.pageNo < this.model.totalPage || this.model.pageNo == 0) {
+          this.model.pageNo = this.model.pageNo + 1
+          post(this.model.url, { data: this.model }).then((res) => {
+            this.model.rows = this.model.rows.concat(res.data).map((item, index) => ({ ...item, index }))
+            this.loading = false
+            this.model.totalPage = res.totalPage
+            this.model.totalCount = res.totalCount
+          })
+        } else {
+          this.loading = false
+        }
+      },
+      search () {
+        this.model.pageNo = 0
+        this.model.rows = []
+        this.handleInfiniteOnLoad()
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .srcoll-list-infinite-container {
+    border-radius: 4px;
+    height: 100%;
+    overflow-y: scroll;
+  }
+  /*滚动条样式*/
+  .srcoll-list-infinite-container::-webkit-scrollbar {
+    width: 4px;
+    /*height: 4px;*/
+  }
+  .srcoll-list-infinite-container::-webkit-scrollbar-thumb {
+    border-radius: 10px;
+    -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
+    background: rgba(0,0,0,0.2);
+  }
+  .srcoll-list-infinite-container::-webkit-scrollbar-track {
+    -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
+    border-radius: 0;
+    background: rgba(0,0,0,0.1);
+
+  }
+  .srcoll-list-loading-container {
+    position: absolute;
+    bottom: 10%;
+    width: 100%;
+    text-align: center;
+  }
+  .srcoll_list_li:hover{
+    background-color: rgb(203,234,241);
+  }
+</style>

package/src/base-client/components/common/ScrollList/index.js

@@ -1,3 +1,3 @@
-import SrcollList from './SrcollList'
-
-export default SrcollList
+import SrcollList from './SrcollList'
+
+export default SrcollList

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

@@ -217,7 +217,7 @@
         v-model="searchResult"
         searchResultType="Object"
         @onSelect="form=Object.assign(form,JSON.parse(searchResult))"
-        :resultKeys="{ address: attr.model, coords: `${attr.model}_coords` }"
+        :resultKeys="{ address: attr.model, coords: `${attr.model}_lng_lat` }"
       ></address-search-combobox>
     </a-form-model-item>
   </x-form-col>