vue2-client 1.6.27 → 1.6.29

package/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
+**1.6.28 -2023-04-19 @江超**
+- 修复下拉框搜索异常问题
+- 依赖更新
+
+**1.6.28 - 1.6.29 -2023-04-21 @江超**
+- 修改文件上传组件的超时时间
+
 **1.6.26 - 1.6.27 -2023-04-16 @江超**
 - 修复单页面iframe对http前缀的兼容处理
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.6.27",
+  "version": "1.6.29",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -12,10 +12,10 @@
   },
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
-    "@antv/g2plot": "^2.4.25",
+    "@antv/g2plot": "^2.4.29",
     "lodash.get": "^4.4.2",
-    "js-base64": "^3.7.2",
-    "jsencrypt": "^3.2.1",
+    "js-base64": "^3.7.5",
+    "jsencrypt": "^3.3.2",
     "vue-json-viewer": "^2.2.22",
     "xlsx": "0.18.5",
     "file-saver": "^2.0.5",
@@ -25,37 +25,37 @@
     "ant-design-vue": "^1.7.8",
     "axios": "^0.27.2",
     "clipboard": "^2.0.11",
-    "core-js": "^3.23.5",
-    "date-fns": "^2.28.0",
+    "core-js": "^3.30.1",
+    "date-fns": "^2.29.3",
     "default-passive-events": "^2.0.0",
     "enquire.js": "^2.1.6",
-    "highlight.js": "^10.7.3",
+    "highlight.js": "^11.7.0",
     "js-cookie": "^2.2.1",
     "mockjs": "^1.1.0",
     "nprogress": "^0.2.0",
     "viser-vue": "^2.4.8",
     "vue": "2.6.14",
-    "vue-i18n": "^8.27.2",
-    "vue-router": "^3.5.4",
+    "vue-i18n": "^8.28.2",
+    "vue-router": "^3.6.5",
     "vuedraggable": "^2.24.3",
     "vuex": "^3.6.2",
-    "vue-video-player": "5.0.2",
-    "videojs-contrib-hls": "5.14.1"
+    "vue-video-player": "^5.0.2",
+    "videojs-contrib-hls": "^5.15.0"
   },
   "devDependencies": {
     "script-loader": "^0.7.2",
-    "@ant-design/colors": "^6.0.0",
-    "@babel/core": "^7.18.10",
+    "@ant-design/colors": "^7.0.0",
+    "@babel/core": "^7.21.4",
     "@vue/cli-plugin-babel": "^4.5.19",
     "@vue/cli-plugin-eslint": "^4.5.19",
     "@vue/cli-service": "^4.5.19",
     "@vue/eslint-config-standard": "^4.0.0",
-    "@vuepress/plugin-back-to-top": "^1.9.7",
+    "@vuepress/plugin-back-to-top": "^1.9.9",
     "babel-eslint": "^10.1.0",
     "babel-plugin-transform-remove-console": "^6.9.4",
     "babel-polyfill": "^6.26.0",
     "compression-webpack-plugin": "^4.0.1",
-    "deepmerge": "^4.2.2",
+    "deepmerge": "^4.3.1",
     "eslint": "^6.8.0",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-node": "^11.1.0",
@@ -67,9 +67,9 @@
     "style-resources-loader": "^1.5.0",
     "vue-cli-plugin-style-resources-loader": "^0.1.5",
     "vue-template-compiler": "2.6.14",
-    "vuepress": "^1.9.7",
+    "vuepress": "^1.9.9",
     "webpack": "^4.46.0",
-    "webpack-theme-color-replacer": "1.4.1",
+    "webpack-theme-color-replacer": "^1.4.7",
     "whatwg-fetch": "^3.6.2"
   },
   "browserslist": [

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

@@ -1,168 +1,168 @@
-<template>
-  <div>
-    <a-upload-dragger
-      v-if="model.type === 'file'"
-      :accept="model.accept.join('')"
-      :customRequest="uploadFiles"
-      :file-list="uploadedFileList"
-      :multiple="true"
-      :remove="deleteFileItem"
-      name="file">
-      <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'"
-      :accept="model.accept.join('')"
-      :customRequest="uploadFiles"
-      :file-list="uploadedFileList"
-      :remove="deleteFileItem"
-      list-type="picture-card">
-      <a-icon type="plus"/>
-      <div class="ant-upload-text">
-        Upload
-      </div>
-    </a-upload>
-  </div>
-</template>
-
-<script>
-
-import { post } from '@vue2-client/services/api'
-import { mapState } from 'vuex'
-import { upload } from '@vue2-client/services/api/common'
-
-export default {
-  name: 'uploads',
-  data () {
-    return {
-      uploadedFileList: [],
-    }
-  },
-  props: {
-    // 表单属性
-    model: {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    },
-    files: {
-      type: Array,
-      default: () => {
-        return []
-      }
-    },
-    images: {
-      type: Array,
-      default: () => {
-        return []
-      }
-    },
-    serviceName: {
-      type: String,
-      default: 'af-system'
-    }
-  },
-  computed: {
-    ...mapState('account', { currUser: 'user' })
-  },
-  created () {
-    const list = this.model.type === 'file' ? [...this.files] : [...this.images]
-    if (this.model.useType) {
-      this.uploadedFileList = list.filter(item => item.f_use_type === this.model.useType)
-    } else {
-      this.uploadedFileList = list
-    }
-    this.$emit('setFiles', this.uploadedFileList.filter(item => item.status === 'done').map(item => item.id))
-  },
-  methods: {
-    uploadFiles (info) {
-      if (this.uploadedFileList.length >= this.model.acceptCount) {
-        this.$message.error(`当前表单限制仅可上传 ${this.model.acceptCount} 个文件`)
-        return
-      }
-      // 初始化文件信息
-      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 ?? 'server')
-      if (this.model.pathKey) {
-        formData.append('pathKey', this.model.pathKey ?? 'Default')
-      }
-      // formData.append('stockAlias', this.model.stockAlias)
-      formData.append('formType', this.model.type)
-      formData.append('useType', this.model.useType ?? 'Default')
-      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 ? this.currUser.username : '')
-
-      // const url = '/api/af-system/resource'
-      // if (process.env.NODE_ENV === 'production') {
-      //   url = `/${this.model.stockAlias}/af-system/resource`
-      // }
-      upload(formData, this.serviceName, { headers, timeout: 60 * 1000 }).then(res => {
-        // 根据服务端返回的结果判断成功与否，设置文件条目的状态
-        if (res.success) {
-          fileInfo.status = 'done'
-          let dataObj
-          if (typeof res.data === 'string') {
-            dataObj = JSON.parse(res.data)
-          } else {
-            dataObj = res.data
-          }
-          fileInfo.response = dataObj
-          fileInfo.id = dataObj.id
-          fileInfo.url = dataObj.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('上传失败！')
-        }
-      }).catch((e) => {
-        fileInfo.status = 'error'
-        fileInfo.response = e
-        this.$message.error(`请求失败！${e}`)
-      })
-    },
-    // 删除文件
-    deleteFileItem (file) {
-      if (file.id) {
-        post('/api/' + this.serviceName + '/entity/t_files', { id: file.id, f_state: '删除' }).then(res => {
-        }).catch(e => { })
-      }
-      // 找到当前文件所在列表的索引
-      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>
+<template>
+  <div>
+    <a-upload-dragger
+      v-if="model.type === 'file'"
+      :accept="model.accept.join('')"
+      :customRequest="uploadFiles"
+      :file-list="uploadedFileList"
+      :multiple="true"
+      :remove="deleteFileItem"
+      name="file">
+      <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'"
+      :accept="model.accept.join('')"
+      :customRequest="uploadFiles"
+      :file-list="uploadedFileList"
+      :remove="deleteFileItem"
+      list-type="picture-card">
+      <a-icon type="plus"/>
+      <div class="ant-upload-text">
+        Upload
+      </div>
+    </a-upload>
+  </div>
+</template>
+
+<script>
+
+import { post } from '@vue2-client/services/api'
+import { mapState } from 'vuex'
+import { upload } from '@vue2-client/services/api/common'
+
+export default {
+  name: 'uploads',
+  data () {
+    return {
+      uploadedFileList: [],
+    }
+  },
+  props: {
+    // 表单属性
+    model: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    },
+    files: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    images: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    serviceName: {
+      type: String,
+      default: 'af-system'
+    }
+  },
+  computed: {
+    ...mapState('account', { currUser: 'user' })
+  },
+  created () {
+    const list = this.model.type === 'file' ? [...this.files] : [...this.images]
+    if (this.model.useType) {
+      this.uploadedFileList = list.filter(item => item.f_use_type === this.model.useType)
+    } else {
+      this.uploadedFileList = list
+    }
+    this.$emit('setFiles', this.uploadedFileList.filter(item => item.status === 'done').map(item => item.id))
+  },
+  methods: {
+    uploadFiles (info) {
+      if (this.uploadedFileList.length >= this.model.acceptCount) {
+        this.$message.error(`当前表单限制仅可上传 ${this.model.acceptCount} 个文件`)
+        return
+      }
+      // 初始化文件信息
+      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 ?? 'server')
+      if (this.model.pathKey) {
+        formData.append('pathKey', this.model.pathKey ?? 'Default')
+      }
+      // formData.append('stockAlias', this.model.stockAlias)
+      formData.append('formType', this.model.type)
+      formData.append('useType', this.model.useType ?? 'Default')
+      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 ? this.currUser.username : '')
+
+      // const url = '/api/af-system/resource'
+      // if (process.env.NODE_ENV === 'production') {
+      //   url = `/${this.model.stockAlias}/af-system/resource`
+      // }
+      upload(formData, this.serviceName, { headers, timeout: 600 * 1000 }).then(res => {
+        // 根据服务端返回的结果判断成功与否，设置文件条目的状态
+        if (res.success) {
+          fileInfo.status = 'done'
+          let dataObj
+          if (typeof res.data === 'string') {
+            dataObj = JSON.parse(res.data)
+          } else {
+            dataObj = res.data
+          }
+          fileInfo.response = dataObj
+          fileInfo.id = dataObj.id
+          fileInfo.url = dataObj.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('上传失败！')
+        }
+      }).catch((e) => {
+        fileInfo.status = 'error'
+        fileInfo.response = e
+        this.$message.error(`请求失败！${e}`)
+      })
+    },
+    // 删除文件
+    deleteFileItem (file) {
+      if (file.id) {
+        post('/api/' + this.serviceName + '/entity/t_files', { id: file.id, f_state: '删除' }).then(res => {
+        }).catch(e => { })
+      }
+      // 找到当前文件所在列表的索引
+      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>