cloud-web-corejs 1.0.54-dev.396 → 1.0.54-dev.397

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.396",
+  "version": "1.0.54-dev.397",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/components/VabUpload/mixins.js

@@ -3,6 +3,7 @@ let tmixins, tViewMixins, pmixins;
 import axios from 'axios';
 import SparkMD5 from "spark-md5";
 import settingConfig from "@/settings.js";
+import {openObsUploadDialog} from "@/components/obsUpload/index.js"
 
 let imFun = {
   axios,
@@ -248,6 +249,12 @@ tmixins = {
       });
     },
     handleShow(option) {
+      if(option.model === "obs"){
+        openObsUploadDialog({
+          ...option,
+        })
+        return
+      }
       this.title = this.$t2('上传', 'components.VabUpload.title');
       // this.data = data;
       this.option = option;
@@ -1050,7 +1057,9 @@ tViewMixins = {
       showPropertiesDialog: false,
       editAttachment: null,
       showViewer: false,
-      chooseIndex: 0
+      chooseIndex: 0,
+      fileServerInfo: {},
+      model: null
     };
   },
   computed: {
@@ -1103,9 +1112,44 @@ tViewMixins = {
     }
   },
   created() {
+    this.initFileServerInfo();
     this.initFile();
   },
   methods: {
+    openUploadDialog(){
+      this.$baseUpload.open({
+        ...this.fileServerInfo,
+        ...this._props,
+        ...this.$attrs,
+        limit: this.limit,
+        multi: this.multi,
+        accept: this.accept ? this.accept : 'file',
+        auto: this.auto,
+        size: this.fileMaxSize,
+        chunkSize: this.chunkSize,
+        callback: this.fileConfirm,
+        pickPrivateProfile:this.pickPrivateProfile,
+        confirmUpload: this.confirmUpload,
+        otherParams: this.$attrs,
+      })
+    },
+    initFileServerInfo(){
+      if(this.$attrs.model && this.$attrs.fileServerInfo){
+        this.model = this.$attrs.model;
+        this.fileServerInfo = this.$attrs.fileServerInfo;
+      }else{
+        getFileServerInfo(this, (res) => {
+          if (res) {
+            let fileServerInfo = res;
+            this.model = fileServerInfo.model
+            this.fileServerInfo = fileServerInfo;
+          }else{
+            this.model = null;
+            this.fileServerInfo = null;
+          }
+        })
+      }
+    },
     initFile() {
       if (this.file) {
         let typeStr = Object.prototype.toString.call(this.file);
@@ -1246,16 +1290,22 @@ tViewMixins = {
       this.showViewer = false
     },
     hasPreview(attachment) {
+      let showImagePreview = this.getShowImagePreview();
       let typeStr = Object.prototype.toString.call(attachment);
       let url = typeStr == '[object Object]' ? (attachment.domain + attachment.url) : attachment;
-      return this.$commonFileUtil.isPictureFile(url) || this.$commonFileUtil.isPreviewFile(url);
+      if(showImagePreview){
+        return this.$commonFileUtil.isPictureFile(url) || this.$commonFileUtil.isPreviewFile(url);
+      }else{
+        return this.$commonFileUtil.isPictureFile(url)
+      }
     },
     openPreview(attachment, index) {
+      let showImagePreview = this.getShowImagePreview();
       let typeStr = Object.prototype.toString.call(attachment);
       let url = typeStr == '[object Object]' ? (attachment.domain + attachment.url) : attachment;
       if (this.$commonFileUtil.isPictureFile(url)) {
         this.openImagePreView(index);
-      } else if (this.$commonFileUtil.isPreviewFile(url)) {
+      } else if (showImagePreview && this.$commonFileUtil.isPreviewFile(url)) {
         this.$openFilePreview(url)
       }
     },
@@ -1275,15 +1325,19 @@ tViewMixins = {
       }
       return name;
     },
+    getShowImagePreview() {
+      return !this.model;
+    },
     getShowUrl(attachment, field) {
       let showUrl = null;
+      let showImagePreview = this.getShowImagePreview();
       let typeStr = Object.prototype.toString.call(attachment);
       if (typeStr == '[object Object]') {
         let showField = field ? field : 'medium';
         let fullUrl = attachment.domain + (attachment[showField] ? attachment[showField] : attachment.url);
-        showUrl = this.$commonFileUtil.getShowUrl(fullUrl)
+        showUrl = this.$commonFileUtil.getShowUrl(fullUrl, showImagePreview)
       } else {
-        showUrl = this.$commonFileUtil.getShowUrl(attachment)
+        showUrl = this.$commonFileUtil.getShowUrl(attachment, showImagePreview)
       }
       return showUrl;
     },
@@ -1454,6 +1508,27 @@ pmixins = {
   }
 };
 
+function getFileServerInfo(that, callback){
+    that.$http({
+      url: USER_PREFIX + "/logic_param/getFileServerInfo",
+      method: "post",
+      data: {},
+      failMsg: false,
+      errorMsg: false,
+      modal: false,
+      success: (res) => {
+        if(res.objx){
+          callback && callback(res.objx);
+        }else{
+          callback && callback();
+        }
+      },
+      error: (err) => {
+        callback && callback();
+      }
+    })
+}
+
 function formatFileSize(fileSize) {
   fileSize = fileSize || 0;
   if (fileSize < 1024) {

package/src/components/VabUpload/view.vue

@@ -150,22 +150,7 @@
           v-if="showUploadBtn"
           @keyup.prevent
           @keydown.enter.prevent
-          @click="
-            $baseUpload.open({
-              ..._props,
-              ...$attrs,
-              limit: limit,
-              multi: multi,
-              accept: accept ? accept : 'file',
-              auto: auto,
-              size: fileMaxSize,
-              chunkSize: chunkSize,
-              callback: fileConfirm,
-              pickPrivateProfile: pickPrivateProfile,
-              confirmUpload: confirmUpload,
-              otherParams: $attrs,
-            })
-          "
+          @click="openUploadDialog()"
         >
           <i class="el-icon-plus avatar-uploader-icon"></i>
         </button>