vue2-client 1.2.29 → 1.2.32-test

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/Upload/Upload.vue

@@ -0,0 +1,119 @@
+<template>
+  <div>
+    <a-upload-dragger
+      v-if="model.type === 'file'"
+      name="file"
+      :multiple="true"
+      :remove="deleteFileItem"
+      :customRequest="uploadFiles"
+      :file-list="uploadedFileList">
+      <p class="ant-upload-drag-icon">
+        <a-icon type="inbox"/>
+      </p>
+      <p class="ant-upload-text">
+        点击或拖动文件到该区域上传
+      </p>
+      <p class="ant-upload-hint">
+        支持单个或多个文件
+      </p>
+    </a-upload-dragger>
+    <a-upload
+      v-if=" model.type === 'image'"
+      list-type="picture-card"
+      :customRequest="uploadFiles"
+      :remove="deleteFileItem"
+      :file-list="uploadedFileList">
+      <a-icon type="plus"/>
+      <div class="ant-upload-text">
+        Upload
+      </div>
+    </a-upload>
+  </div>
+</template>
+
+<script>
+
+import { post } from '@/services/api'
+import { mapState } from 'vuex'
+
+export default {
+  name: 'uploads',
+  data () {
+    return {
+      uploadedFileList: [],
+    }
+  },
+  props: {
+    // 表单属性
+    model: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    }
+  },
+  computed: {
+    ...mapState('account', { currUser: 'user' })
+  },
+  methods: {
+    async uploadFiles (info) {
+      // 初始化文件信息
+      const fileInfo = {
+        uid: info.file.uid,
+        name: info.file.name,
+        status: 'uploading',
+        response: '',
+        url: '',
+      }
+      // 放入上传列表中，以便于显示上传进度
+      this.uploadedFileList.push(fileInfo)
+      // 组装上传数据
+      const headers = {
+        'Content-Type': 'multipart/form-data',
+      }
+      const formData = new FormData()
+      formData.append('avatar', info.file)
+      formData.append('resUploadMode', this.model.resUploadMode)
+      if (this.model.pathKey) {
+        formData.append('pathKey', this.model.pathKey)
+      }
+      formData.append('stockAlias', this.model.stockAlias)
+      formData.append('resUploadStock', this.model.resUploadStock)
+      formData.append('filename', info.file.name)
+      formData.append('filesize', (info.file.size / 1024 / 1024).toFixed(4))
+      formData.append('f_operator', this.currUser.username)
+
+      let url = '/webmeteruploadapi/upload'
+      if (process.env.NODE_ENV === 'production') {
+        url = `/${this.model.stockAlias}/webmeteruploadapi/upload`
+      }
+      const res = await post(url, formData, { headers })
+      // 根据服务端返回的结果判断成功与否，设置文件条目的状态
+      if (res.success) {
+        fileInfo.status = 'done'
+        fileInfo.response = JSON.parse(res.data)
+        fileInfo.id = JSON.parse(res.data).id
+        fileInfo.url = JSON.parse(res.data).f_downloadpath
+        this.$emit('setFiles', this.uploadedFileList.filter(item => item.status === 'done').map(item => item.id))
+        this.$message.success('上传成功！')
+      } else {
+        fileInfo.status = 'error'
+        fileInfo.response = res.data
+        this.$message.error('上传失败！')
+      }
+    },
+    // 删除文件
+    deleteFileItem (file) {
+      // 找到当前文件所在列表的索引
+      const index = this.uploadedFileList.indexOf(file)
+      // 从列表中移除该文件
+      this.uploadedFileList.splice(index, 1)
+      this.$emit('setFiles', this.uploadedFileList.filter(item => item.status === 'done').map(item => item.id))
+      return true
+    }
+  }
+}
+</script>
+<style lang="less" scoped>
+
+</style>

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

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