shijiplus-web-plugin 0.1.37 → 0.1.38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shijiplus-web-plugin",
-  "version": "0.1.37",
+  "version": "0.1.38",
   "files": [
     "src"
   ],

package/src/components/upload-file/upload-file-single.vue

@@ -47,7 +47,7 @@ export default {
       default: ''
     },
     maxSize: {
-      default: 2048
+      default: 1024 * 5
     },
     sizeUnit: {
       default: 1024
@@ -55,7 +55,14 @@ export default {
     sizeUnitStr: {
       default: 'MB'
     },
-    action: ''
+    maxMb: {
+      type: Number,
+      default: 0
+    },
+    action: {
+      type: String,
+      default: ''
+    }
     // imgType: {
     //   type: Number,
     //   default: () => {
@@ -66,7 +73,7 @@ export default {
   data() {
     return {
       fileList: [],
-      fileMaxSize: this.maxSize
+      fileMaxSize: this.maxMb * 1024 || this.maxSize
     }
   },
   watch: {

package/src/components/upload-file/upload-file.vue

@@ -33,7 +33,7 @@
         :on-success="handleSuccess"
         :format="['jpg', 'jpeg', 'png', 'gif']"
         accept="image/*"
-        :headers="headers"
+        :headers="uploadHeaders"
         :max-size="fileMaxSize"
         :on-format-error="handleFormatError"
         :on-exceeded-size="handleMaxSize"
@@ -72,14 +72,7 @@
   </div>
 </template>
 <script>
-import config from '@/config'
-import store from '@/store'
 import Emitter from 'iview/src/mixins/emitter'
-const baseUrl = config.plusApiV5Domain()
-let authHeader = {}
-authHeader[config.tokenHeaderName] = store.state.user.token
-authHeader['token'] = store.state.user.token
-authHeader['app_name'] = 'op'
 export default {
   name: 'upload-file',
   mixins: [Emitter],
@@ -125,12 +118,15 @@ export default {
     },
     action: {
       default: ''
+    },
+    headers: {
+      default() {
+        return {}
+      }
     }
   },
   data() {
     return {
-      headers: authHeader,
-      baseUrl,
       imgName: '',
       visible: false,
       remainderCount: this.maxUploadFiles,
@@ -139,8 +135,21 @@ export default {
     }
   },
   computed: {
+    baseUrl() {
+      return this.$config.uploadDomain()
+    },
     fileMaxSize() {
       return this.maxSize * this.sizeUnit
+    },
+    uploadHeaders() {
+      let authHeader = {}
+      authHeader[this.$config.tokenHeaderName] = this.$store.state.user.token
+      authHeader['token'] = this.$store.state.user.token
+      authHeader['app_name'] = this.$config.appName
+      return {
+        ...authHeader,
+        ...this.headers
+      }
     }
   },
   watch: {
@@ -223,27 +232,12 @@ export default {
         // 对新露的上传接口做兼容， 他用的是其他字段
         res.data.path = res.data.accessURL
       }
-      if (!res.data) {
+      if (!res.data || !res.data.path) {
         console.log(res)
         file.status = 'fail'
         this.$Notice.error({
           title: `上传失败`,
-          desc: res.codex + ':' + res.message
-        })
-        this.uploadList.forEach((item, index) => {
-          if (item.status == 'fail') {
-            this.uploadList.splice(index, 1)
-          }
-        })
-        this.remainderCount++
-        return
-      }
-      if (!res.data.path) {
-        console.log(res)
-        file.status = 'fail'
-        this.$Notice.error({
-          title: `上传失败`,
-          desc: res.message
+          desc: (res.codex || '') + ':' + res.message
         })
         this.uploadList.forEach((item, index) => {
           if (item.status == 'fail') {
@@ -326,7 +320,18 @@ export default {
       }
     }
   },
-  mounted() {}
+  mounted() {},
+  updated() {
+    this.$nextTick(() => {
+      if (!this.$slots.tips) {
+        this.$refs.tipsRef.style.display = 'none'
+      } else if (!this.$slots.tips[0]) {
+        this.$refs.tipsRef.style.display = 'none'
+      } else {
+        this.$refs.tipsRef.style.display = 'block'
+      }
+    })
+  }
 }
 </script>
 <style lang="less" scoped>

package/src/index.js

@@ -5,8 +5,8 @@ import ExtentionPlugin from './extentionPlugin'
 import importDirective from './directive'
 import PlusComp from './components/plus-comp'
 import BeginEndDatePicker from './components/begin-end-date-picker'
-// import UploadFileSingle from './components/upload-file/upload-file-single'
-// import UploadFile from './components/upload-file/upload-file'
+import UploadFileSingle from './components/upload-file/upload-file-single'
+import UploadFile from './components/upload-file/upload-file'
 // import UploadFileInput from './components/upload-file/upload-file-input'
 
 console.log('--------web-tool---index.js----------')
@@ -22,8 +22,8 @@ export default {
   install(vue, opts = {}) {
     vue.use(PlusComp)
     vue.component('BeginEndDatePicker', BeginEndDatePicker)
-    // vue.component('UploadFileSingle', UploadFileSingle)
-    // vue.component('UploadFile', UploadFile)
+    vue.component('UploadFileSingle', UploadFileSingle)
+    vue.component('UploadFile', UploadFile)
     // vue.component('UploadFileInput', UploadFileInput)
     /**
      * 注册指令