cloud-web-corejs 1.1.0-dev.6 → 1.1.0-dev.61

package/src/components/Tinymce/mce-chrome.scss

@@ -0,0 +1,150 @@
+// TinyMCE dialog chrome extracted from the app stylesheet.
+@import "~@base/styles/variables.scss";
+
+.mce-container,
+.mce-container *,
+.mce-widget,
+.mce-widget *,
+.mce-reset {
+  font-size: $fontSizeBase !important;
+}
+.mce-window.mce-container {
+  border: none;
+  border-radius: 8px;
+  box-shadow: 0 0 24px rgba(0, 0, 0, 0.22);
+  font-size: $fontSizeBase;
+  .mce-window-head {
+    border: none;
+    .mce-title {
+      font-size: 13px !important;
+      font-weight: 400;
+    }
+    .mce-close i {
+      color: #464646;
+      font-family: "element-icons" !important;
+      font-size: 20px !important;
+      margin-right: 10px;
+      &::before {
+        content: "";
+      }
+    }
+  }
+  .mce-window-body {
+    background-color: #f1f5fb;
+    padding: 8px;
+    tap-highlight-color: transparent;
+    -webkit-tap-highlight-color: transparent;
+    -ms-tap-highlight-color: transparent;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    -ms-box-sizing: border-box;
+    box-sizing: border-box;
+    > .mce-container {
+      background-color: #fff;
+      position: relative;
+      height: 100% !important;
+      width: 100% !important;
+      overflow: hidden;
+      .mce-container-body {
+        margin-top: -4px;
+        .mce-container {
+          font-size: $fontSizeBase;
+        }
+        .mce-combobox input,
+        .mce-textbox,
+        .mce-btn {
+          border-radius: 2px;
+          border-color: #e8e8e8;
+          margin-left: -10px;
+        }
+        .mce-checkbox {
+          margin-left: -10px;
+          .mce-i-checkbox {
+            border-color: $borderColor;
+            border-radius: 2px;
+            text-align: center;
+          }
+        }
+        .mce-textbox.mce-multiline {
+          margin-top: -5px;
+        }
+        &.mce-abs-layout {
+          overflow: visible;
+        }
+      }
+      &.mce-panel {
+        .mce-tabs {
+          border-bottom-color: $borderColor;
+          .mce-tab {
+            border-color: $borderColor;
+            line-height: 15px;
+            &.mce-active {
+              color: $baseColor;
+              text-shadow: none;
+              background: #f1f5fb;
+            }
+          }
+        }
+        .mce-container-body {
+          margin-top: 0;
+          .mce-checkbox,
+          .mce-combobox input,
+          .mce-textbox,
+          .mce-btn {
+            margin-left: 0;
+          }
+        }
+      }
+    }
+  }
+  .mce-foot {
+    border-top: none;
+    background: none;
+    .mce-container-body {
+      padding: 0 14px 0 12px;
+      width: 100% !important;
+      tap-highlight-color: transparent;
+      -webkit-tap-highlight-color: transparent;
+      -ms-tap-highlight-color: transparent;
+      -webkit-box-sizing: border-box;
+      -moz-box-sizing: border-box;
+      -ms-box-sizing: border-box;
+      box-sizing: border-box;
+      .mce-btn {
+        width: 94px !important;
+        height: 26px !important;
+        border-radius: 2px;
+        border-color: $baseColor;
+        margin-left: 9px;
+        position: relative !important;
+        left: inherit !important;
+        &.mce-primary {
+          background-color: $baseColor;
+          color: #fff;
+          button {
+            color: #fff;
+            .mce-txt:before {
+              content: "";
+            }
+          }
+        }
+        &.mce-disabled {
+          border-color: transparentize($baseColor, 0.6);
+        }
+        button {
+          font-size: $fontSizeBase;
+          line-height: 18px;
+          color: $baseColor;
+          .mce-txt:before {
+            content: "";
+            font-family: "element-icons";
+            margin-right: 4px;
+          }
+        }
+      }
+      .mce-abs-end + .mce-btn {
+        margin-left: 0;
+      }
+    }
+  }
+}

package/src/components/VabUpload/image-viewer.vue

@@ -58,9 +58,7 @@
 import { on, off } from 'element-ui/src/utils/dom';
 import { rafThrottle, isFirefox } from 'element-ui/src/utils/util';
 import { PopupManager } from 'element-ui/src/utils/popup';
-import Swiper from 'swiper';
-import 'swiper/dist/css/swiper.min.css';
-import 'swiper/dist/js/swiper.min';
+import { loadSwiper } from '@base/utils/swiperLoader';
 const Mode = {
   CONTAIN: {
     name: 'contain',
@@ -293,15 +291,17 @@ export default {
       this.mode = Mode[modeNames[nextIndex]];
       this.reset();
     },
-    prev() {
-      if (this.isFirst && !this.infinite) return;
+    prev() {
+      if (this.isFirst && !this.infinite) return;
+      if (!this.swiper) return;
       const len = this.urlArr.length;
       this.index = (this.index - 1 + len) % len;
       this.swiper.slideTo(this.index, 100);
       this.swiperIndex = this.index;
     },
-    next() {
-      if (this.isLast && !this.infinite) return;
+    next() {
+      if (this.isLast && !this.infinite) return;
+      if (!this.swiper) return;
       const len = this.urlArr.length;
       this.index = (this.index + 1) % len;
       this.swiper.slideTo(this.index, 100);
@@ -346,7 +346,7 @@ export default {
       return this.getHandleImage(imgDTO, 2);
     });
   },
-  mounted() {
+  async mounted() {
     this.deviceSupportInstall();
     if (this.appendToBody) {
       document.body.appendChild(this.$el);
@@ -355,8 +355,16 @@ export default {
     // focus wrapper so arrow key can't cause inner scroll behavior underneath
     this.$refs['el-image-viewer__wrapper'].focus();
 
-    let that = this;
-    let ff = this.urlArr2;
+    let that = this;
+    let ff = this.urlArr2;
+    let Swiper;
+    try {
+      Swiper = await loadSwiper();
+    } catch (error) {
+      this.$message.error('图片预览组件加载失败，请关闭后重试');
+      return;
+    }
+    if (this._isDestroyed) return;
     setTimeout(function() {
       that.swiper = new Swiper('.small-slide', {
         slidesPerView: 'auto',

package/src/components/VabUpload/index.js

@@ -3,6 +3,7 @@ import vue from "vue";
 import objView from './index.vue';
 import {openObsUploadDialog} from "@base/components/obsUpload/index.js"
 import fileLibraryDialog from './fileLibraryDialog.vue'
+import { loadIsPartUpload } from "./partUploadConfig.js";
 
 let configUtil = {
   vue,
@@ -16,6 +17,10 @@ const initInstance = (containter) => {
   let currentInstance = new objInstance({i18n: window.$vueRoot._i18n});
   let dom = currentInstance.$mount().$el;
   containter.appendChild(dom);
+  currentInstance.$destroyOnDialogClose = () => {
+    if (!currentInstance._isDestroyed) currentInstance.$destroy();
+    if (dom.parentNode) dom.parentNode.removeChild(dom);
+  };
   return currentInstance;
 };
 const initFileLibraryDialogInstance = (containter, options = {}) => {
@@ -37,10 +42,12 @@ function toDo(options) {
   if(model==="obs"){
     return openObsUploadDialog(options);
   }else{
-    let containter = document.body;
-    let currentInstance = initInstance(containter);
-    Object.assign(currentInstance, options);
-    return currentInstance.handleShow(options);
+    return loadIsPartUpload().then(() => {
+      let containter = document.body;
+      let currentInstance = initInstance(containter);
+      Object.assign(currentInstance, options);
+      return currentInstance.handleShow(options);
+    });
   }
 
 };

package/src/components/VabUpload/index.vue

@@ -28,7 +28,7 @@
           </div>
           <ul class="el-upload-list el-upload-list--picture">
             <div class="nodata" v-if="pasteList.length == 0">
-              <img :src="$assetUrl(require('@/resources/images/nodata2.png'))" />
+              <img :src="$assetUrl(require('@base/core-resources/images/nodata2.png'))" />
             </div>
             <li v-for="(pasteFile,index) in pasteList" :key="index" class="el-upload-list__item is-success">
               <div>

package/src/components/VabUpload/mixins/fileLibraryDialog.js

@@ -946,6 +946,7 @@ modules = {
           a.download = fileName;
           a.href = blobUrl;
           a.click();
+          setTimeout(() => window.URL.revokeObjectURL(blobUrl), 0);
         },
       });
     },
@@ -968,6 +969,7 @@ modules = {
           a.download = row.fileName;
           a.href = blobUrl;
           a.click();
+          setTimeout(() => window.URL.revokeObjectURL(blobUrl), 0);
         },
       });
     },

package/src/components/VabUpload/mixins.js

@@ -3,11 +3,15 @@ let tmixins, tViewMixins, pmixins;
 import axios from "axios";
 import SparkMD5 from "spark-md5";
 import settingConfig from "@/settings.js";
-import {
-  registerPreviewInstance,
-  unregisterPreviewInstance,
-  collectPreviewList,
-} from "./previewGroup.js";
+import {
+  registerPreviewInstance,
+  unregisterPreviewInstance,
+  collectPreviewList,
+} from "./previewGroup.js";
+import {
+  pickExplicitIsPartUpload,
+  resolveIsPartUpload,
+} from "./partUploadConfig.js";
 
 let imFun = {
   axios,
@@ -68,11 +72,9 @@ tmixins = {
       type: Number,
       default: 5, //5MB
     },
-    isPartUpload: {
-      type: Boolean,
-      default: () => {
-        return settingConfig.isPartUpload ?? true;
-      },
+    isPartUpload: {
+      type: Boolean,
+      default: undefined,
     },
     autoConfirmAfterUpload: {
       type: Boolean,
@@ -125,8 +127,9 @@ tmixins = {
       uploadUrl: null,
     };
   },
-  beforeDestroy() {
-    this.removePasteEvent();
+  beforeDestroy() {
+    this.removePasteEvent();
+    this.revokeUploadObjectUrls();
   },
   filters: {
     btnText(btn) {
@@ -420,8 +423,8 @@ tmixins = {
     blurPasteEvent() {
       this.pasteAreaStatus = false;
     },
-    handleClose() {
-      let target = this.$refs.upload;
+    handleClose() {
+      let target = this.$refs.upload;
       (target.uploadFiles || []).forEach((uploadFile) => {
         if (uploadFile.status == "uploading" || uploadFile.status == "ready") {
           uploadFile.raw.abort &&
@@ -429,10 +432,15 @@ tmixins = {
               this.$t2("取消上传", "components.VabUpload.cancelUpload")
             );
         }
-      });
-      this.picture = "picture";
-      this.clearFileInfo();
-      this.dialogFormVisible = false;
+      });
+      this.revokeUploadObjectUrls();
+      this.pasteList = [];
+      this.removePasteEvent();
+      this.picture = "picture";
+      this.clearFileInfo();
+      this.dialogFormVisible = false;
+      const destroyRoot = this.$destroyOnDialogClose;
+      if (destroyRoot) this.$nextTick(destroyRoot);
     },
     clearFileInfo() {
       this.fileList = [];
@@ -708,7 +716,11 @@ tmixins = {
       if (!target) return;
       let fileObj = target.getFile(file);
       if (fileObj.status != "preUpload") return;
-      if (!this.isPartUpload) {
+      if (
+        !resolveIsPartUpload(
+          pickExplicitIsPartUpload(this.option, this.isPartUpload)
+        )
+      ) {
         this.uploadSectionFile(fileObj.param);
         return;
       }
@@ -744,10 +756,9 @@ tmixins = {
 
         suffix = nameSplit && nameSplit.length > 1 ? nameSplit[1] : "";
 
-        let checkUrl = this.uploadUrl.replace(
-          "/docfile/upload",
-          "/docfile/check"
-        );
+        let checkUrl = this.uploadUrl
+          .replace("/docfile/upload", "/docfile/check")
+          .replace("/bdfile/upload", "/bdfile/check");
         let checkData = {
           name: file.name,
           md5: hash,
@@ -911,10 +922,9 @@ tmixins = {
       let mergeData = param.mergeData;
       let chunkParam = param.chunkParam;
       let fullFile = chunkParam.fullFile;
-      let mergeUrl = this.uploadUrl.replace(
-        "/docfile/upload",
-        "/docfile/merge"
-      );
+      let mergeUrl = this.uploadUrl
+        .replace("/docfile/upload", "/docfile/merge")
+        .replace("/bdfile/upload", "/bdfile/merge");
       let target = this.$refs.upload;
       this.$http({
         url: mergeUrl,
@@ -984,15 +994,33 @@ tmixins = {
       }
     },
     //end
-    getShowImage(file, fileName) {
+    getShowImage(file, fileName) {
       fileName = fileName || file.name;
       if (this.$commonFileUtil.isPictureFile(fileName)) {
         return file.showUrl || file.url;
       } else {
         return this.$commonFileUtil.getFileIconRequire(fileName);
       }
-    },
-    removeFile(sfile) {
+    },
+    revokeUploadObjectUrl(url) {
+      if (typeof url === "string" && url.startsWith("blob:")) {
+        URL.revokeObjectURL(url);
+      }
+    },
+    revokeUploadObjectUrls() {
+      const files = [
+        ...(this.fileList || []),
+        ...(this.pasteList || []),
+        ...(this.$refs.upload?.uploadFiles || []),
+      ];
+      const urls = new Set();
+      files.forEach((file) => {
+        if (file?.showUrl) urls.add(file.showUrl);
+        if (file?.url) urls.add(file.url);
+      });
+      urls.forEach((url) => this.revokeUploadObjectUrl(url));
+    },
+    removeFile(sfile) {
       var target = this.$refs.upload;
       var index;
       var fileList = target.uploadFiles;
@@ -1012,7 +1040,8 @@ tmixins = {
         }
       }
 
-      target.uploadFiles.splice(index, 1);
+      this.revokeUploadObjectUrl(sfile?.showUrl || sfile?.url);
+      target.uploadFiles.splice(index, 1);
       this.handleChange(sfile, target.uploadFiles);
     },
     submitImage() {
@@ -1304,8 +1333,10 @@ tmixins = {
       }
       this.appendPasteFiles(files);
     },
-    deletePasteFile(index) {
-      this.pasteList.splice(index, 1);
+    deletePasteFile(index) {
+      const file = this.pasteList[index];
+      this.revokeUploadObjectUrl(file?.showUrl || file?.url);
+      this.pasteList.splice(index, 1);
     },
     confirmPasteFile() {
       let target = this.$refs.upload;
@@ -1317,7 +1348,10 @@ tmixins = {
         fileRaw.fileName = name;
         return fileRaw;
       });
-      innerTarget.uploadFiles(files);
+      innerTarget.uploadFiles(files);
+      this.pasteList.forEach((file) =>
+        this.revokeUploadObjectUrl(file?.showUrl || file?.url)
+      );
       this.$nextTick(() => {
         target.uploadFiles.forEach((uploadFile) => {
           let fileRaw = uploadFile.raw;
@@ -1327,7 +1361,7 @@ tmixins = {
           }
         });
       });
-      this.pasteList = [];
+      this.pasteList = [];
     },
     changeFileName(file) {
       if (file.fileSuffix) {
@@ -1431,11 +1465,9 @@ tViewMixins = {
       type: Number,
       default: 5, //5MB
     },
-    isPartUpload: {
-      type: Boolean,
-      default: () => {
-        return settingConfig.isPartUpload ?? true;
-      },
+    isPartUpload: {
+      type: Boolean,
+      default: undefined,
     },
     autoConfirmAfterPasteUpload: {
       type: Boolean,

package/src/components/VabUpload/partUploadConfig.js

@@ -0,0 +1,95 @@
+import { getLogicParamValue } from "@base/api/user";
+import settingConfig from "@/settings.js";
+
+export const PART_UPLOAD_PARAM_CODE = "isPartUpload";
+
+let cachedCompanyCode = null;
+let cachedValue;
+let cacheReady = false;
+let inflight = null;
+let requestId = 0;
+
+function getCurrentCompanyCode() {
+  return window.$vueRoot?.$store?.getters?.companyCode ?? "";
+}
+
+export function parseIsPartUpload(rawValue) {
+  if (typeof rawValue === "boolean") return rawValue;
+  if (rawValue == null) return undefined;
+  const value = String(rawValue).trim().toLowerCase();
+  if (value === "true" || value === "1") return true;
+  if (value === "false" || value === "0") return false;
+  return undefined;
+}
+
+function readLogicParam() {
+  return getLogicParamValue({
+    data: { paramCode: PART_UPLOAD_PARAM_CODE },
+    modal: false,
+    failMsg: false,
+    errorMsg: false,
+  })
+    .then((res) => (res && res.type === "success" ? res.objx : ""))
+    .catch(() => "");
+}
+
+// 同公司复用查询结果；切换公司后首次打开上传弹窗时重新获取。
+export function loadIsPartUpload() {
+  const companyCode = getCurrentCompanyCode();
+  if (cacheReady && cachedCompanyCode === companyCode) {
+    return Promise.resolve(cachedValue);
+  }
+  if (inflight && cachedCompanyCode === companyCode) {
+    return inflight;
+  }
+
+  const id = ++requestId;
+  cachedCompanyCode = companyCode;
+  cacheReady = false;
+  inflight = readLogicParam()
+    .then((raw) => {
+      if (id !== requestId) return loadIsPartUpload();
+      cachedValue = parseIsPartUpload(raw);
+      cacheReady = true;
+      inflight = null;
+      return cachedValue;
+    })
+    .catch(() => {
+      if (id !== requestId) return loadIsPartUpload();
+      cachedValue = undefined;
+      cacheReady = true;
+      inflight = null;
+      return cachedValue;
+    });
+  return inflight;
+}
+
+export function getCachedIsPartUpload() {
+  const companyCode = getCurrentCompanyCode();
+  if (cacheReady && cachedCompanyCode === companyCode) {
+    return cachedValue;
+  }
+  return undefined;
+}
+
+export function pickExplicitIsPartUpload(option, instanceValue) {
+  if (option && typeof option.isPartUpload === "boolean") {
+    return option.isPartUpload;
+  }
+  if (typeof instanceValue === "boolean") {
+    return instanceValue;
+  }
+  return undefined;
+}
+
+// 显式传入 > 已缓存逻辑参数 > settings.js > 默认分片。
+export function resolveIsPartUpload(explicitValue) {
+  if (typeof explicitValue === "boolean") return explicitValue;
+
+  const cached = getCachedIsPartUpload();
+  if (typeof cached === "boolean") return cached;
+  if (typeof settingConfig.isPartUpload === "boolean") {
+    return settingConfig.isPartUpload;
+  }
+  return true;
+}

package/src/components/VabUpload/privateProfileDialogMixins.js

@@ -908,6 +908,7 @@ modules = {
           a.download = fileName;
           a.href = blobUrl;
           a.click();
+          setTimeout(() => window.URL.revokeObjectURL(blobUrl), 0);
         },
       });
     },
@@ -930,6 +931,7 @@ modules = {
           a.download = row.fileName;
           a.href = blobUrl;
           a.click();
+          setTimeout(() => window.URL.revokeObjectURL(blobUrl), 0);
         },
       });
     },