vue2-client 1.2.28 → 1.2.29

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

@@ -398,10 +398,9 @@
 import XAddForm from '@vue2-client/base-client/components/common/XAddForm/XAddForm'
 import JsonViewer from 'vue-json-viewer'
 import FileSaver from 'file-saver'
-import { queryType } from '@/config/CreateQueryConfig'
+import { queryType } from '@vue2-client/config/CreateQueryConfig'
 import { mapState } from 'vuex'
-import { post } from '@vue2-client/services/api/restTools'
-import { commonApi } from '@vue2-client/services/api/common'
+import { commonApi, post } from '@vue2-client/services/api'
 const DemoJson = [{ value: 'zhejiang', label: 'Zhejiang', children: [{ value: 'hangzhou', label: 'Hangzhou', children: [{ value: 'xihu', label: 'West Lake' }] }] }]
 export default {
   name: 'CreateSimpleFormQuery',

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

@@ -34,8 +34,7 @@
 <script>
 import { mapState } from 'vuex'
 import XAddForm from '@vue2-client/base-client/components/common/XAddForm/XAddForm'
-import { commonApi } from '@vue2-client/services/api/common'
-import { post } from '@vue2-client/services/api/restTools'
+import { commonApi, post } from '@vue2-client/services/api'
 
 export default {
   name: 'FormGroupEdit',

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

@@ -0,0 +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>

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

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

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

@@ -47,7 +47,7 @@
 import XFormItem from '@vue2-client/base-client/components/common/XForm/XFormItem'
 import { formatDate } from '@vue2-client/utils/util'
 import { mapState } from 'vuex'
-import { post } from '@vue2-client/services/api/restTools'
+import { post } from '@vue2-client/services/api'
 
 export default {
     name: 'XAddForm',