yuanjia-form-pro-standard 1.1.6-beta9.6 → 1.1.6-beta9.7

package/designer.es.js

@@ -152536,12 +152536,12 @@ var FileSaver_min = { exports: {} };
   });
 })(FileSaver_min);
 var electronicCaseWidget_vue_vue_type_style_index_0_scoped_true_lang = "";
-let pendingOSSRequest$1 = null;
-async function getOSSConfigWithCache$1() {
-  if (pendingOSSRequest$1) {
-    return await pendingOSSRequest$1;
+let pendingOSSRequest = null;
+async function getOSSConfigWithCache() {
+  if (pendingOSSRequest) {
+    return await pendingOSSRequest;
   }
-  pendingOSSRequest$1 = axios$1.post(`https://data.yuanjia101.com/api/SmallTools/PutObjectSignPolicy`).then((res) => {
+  pendingOSSRequest = axios$1.post(`https://data.yuanjia101.com/api/SmallTools/PutObjectSignPolicy`).then((res) => {
     const config2 = {
       key_id: res.data.accessKeyId,
       base64policy: res.data.policy,
@@ -152550,12 +152550,12 @@ async function getOSSConfigWithCache$1() {
     return config2;
   }).catch((error2) => {
     console.error("\u83B7\u53D6 OSS \u914D\u7F6E\u5931\u8D25:", error2);
-    pendingOSSRequest$1 = null;
+    pendingOSSRequest = null;
     throw error2;
   }).finally(() => {
-    pendingOSSRequest$1 = null;
+    pendingOSSRequest = null;
   });
-  return await pendingOSSRequest$1;
+  return await pendingOSSRequest;
 }
 const _sfc_main$50 = {
   name: "electronic-case-widget",
@@ -152931,7 +152931,7 @@ const _sfc_main$50 = {
     async getOSSConfig() {
       var _a2, _b2;
       try {
-        this.ossConfigParams = await getOSSConfigWithCache$1();
+        this.ossConfigParams = await getOSSConfigWithCache();
       } catch (error2) {
         console.error("\u83B7\u53D6 OSS \u914D\u7F6E\u5931\u8D25:", error2);
         (_b2 = (_a2 = this.$message) == null ? void 0 : _a2.error) == null ? void 0 : _b2.call(_a2, "\u83B7\u53D6\u4E0A\u4F20\u914D\u7F6E\u5931\u8D25\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5");
@@ -156884,37 +156884,6 @@ var __glob_0_15$3 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineP
   "default": numberWidget
 }, Symbol.toStringTag, { value: "Module" }));
 var pictureUploadWidget_vue_vue_type_style_index_0_scoped_true_lang = "";
-let pendingOSSRequest = null;
-async function getOSSConfigWithCache() {
-  if (pendingOSSRequest) {
-    return await pendingOSSRequest;
-  }
-  const token = almLocalStorage.getItem("token");
-  const rToken = almLocalStorage.getItem("rToken");
-  const tokenTime = almLocalStorage.getItem("tokenTime");
-  const headers = {};
-  if (token !== null)
-    headers["Authorization"] = "Bearer " + token;
-  if (!tokenTime && rToken) {
-    headers["X-Authorization"] = "Bearer " + rToken;
-  }
-  const url = commonGETApiTranslation("api/SysFile/OssSign");
-  pendingOSSRequest = axios$1.get(url, { headers }).then((res) => {
-    const config2 = {
-      key_id: "LTAIFRkpHKDTK5dv",
-      base64policy: res.data.Data.policy,
-      signature: res.data.Data.signature
-    };
-    return config2;
-  }).catch((error2) => {
-    console.error("\u83B7\u53D6 OSS \u914D\u7F6E\u5931\u8D25:", error2);
-    pendingOSSRequest = null;
-    throw error2;
-  }).finally(() => {
-    pendingOSSRequest = null;
-  });
-  return await pendingOSSRequest;
-}
 const _sfc_main$4W = {
   name: "picture-upload-widget",
   componentName: "FieldWidget",
@@ -156975,6 +156944,7 @@ const _sfc_main$4W = {
       fileList: [],
       fileListBeforeRemove: [],
       uploadBtnHidden: false,
+      uploadingFiles: new Set(),
       previewUrl: "",
       showPreviewDialogFlag: false
     };
@@ -157016,11 +156986,16 @@ const _sfc_main$4W = {
   },
   beforeUnmount() {
     this.unregisterFromRefList();
+    this.uploadingFiles.clear();
   },
   methods: {
     async getOSSConfig() {
       try {
-        this.ossConfigParams = await getOSSConfigWithCache();
+        this.ossConfigParams = {
+          key_id: "LTAIFRkpHKDTK5dv",
+          base64policy: "eyJleHBpcmF0aW9uIjoiMjAyNi0wMS0yMlQwNzo1ODo0My43MDRaIiwiY29uZGl0aW9ucyI6W1siY29udGVudC1sZW5ndGgtcmFuZ2UiLDAsMTA0ODU3NjAwMF1dfQ==",
+          signature: "xA+TgXT5N4gcIE5me9Fcq2mJdXA="
+        };
       } catch (error2) {
         console.error("\u83B7\u53D6 OSS \u914D\u7F6E\u5931\u8D25:", error2);
       }
@@ -157072,8 +157047,16 @@ const _sfc_main$4W = {
       const newFileName = sanitizeFilename(file.name);
       const newFile = new File([file], newFileName, { type: file.type });
       this.uploadData.key = "vform/" + random + newFile.name;
+      if (file.uid) {
+        this.uploadingFiles.add(file.uid);
+      }
       return this.handleOnBeforeUpload(newFile);
     },
+    handlePictureProgress(event, file, fileList) {
+      if (file.uid) {
+        this.uploadingFiles.add(file.uid);
+      }
+    },
     handleOnBeforeUpload(file) {
       if (!!this.field.options.onBeforeUpload) {
         let bfFunc = new Function("file", this.field.options.onBeforeUpload);
@@ -157106,6 +157089,9 @@ const _sfc_main$4W = {
     },
     handlePictureUpload(res, file, fileList) {
       if (file.status === "success") {
+        if (file.uid) {
+          this.uploadingFiles.delete(file.uid);
+        }
         if (fileList.length) {
           fileList.forEach((item) => {
             if (item.raw.name) {
@@ -157149,6 +157135,9 @@ const _sfc_main$4W = {
       this.fileListBeforeRemove = deepClone(fileList);
     },
     handlePictureRemove(file, fileList) {
+      if (file.uid) {
+        this.uploadingFiles.delete(file.uid);
+      }
       this.fileList = deepClone(fileList);
       this.updateFieldModelAndEmitDataChangeForRemove(file, fileList);
       this.uploadBtnHidden = fileList.length >= this.field.options.limit;
@@ -157158,6 +157147,9 @@ const _sfc_main$4W = {
       }
     },
     handleUploadError(err, file, fileList) {
+      if (file.uid) {
+        this.uploadingFiles.delete(file.uid);
+      }
       if (!!this.field.options.onUploadError) {
         let customFn = new Function("error", "file", "fileList", this.field.options.onUploadError);
         customFn.call(this, err, file, fileList);
@@ -157183,16 +157175,7 @@ const _sfc_main$4W = {
       }
       if (this.field.formItemFlag && !this.field.options.hidden && this.isShow) {
         const uploadStatusValidator = (rule, value2, callback) => {
-          const uploadRef = this.$refs.fieldEditor;
-          if (!uploadRef) {
-            callback();
-            return;
-          }
-          const currentFileList = uploadRef.uploadFiles || uploadRef.fileList || this.fileList || [];
-          const hasUploadingFile = currentFileList.some((file) => {
-            const status = file.status;
-            return status && status !== "success" && status !== "fail";
-          });
+          const hasUploadingFile = this.uploadingFiles.size > 0;
           if (hasUploadingFile) {
             callback(new Error(this.field.options.uploadingHint || `[${this.field.options.label || this.field.options.name}]` + this.i18nt("render.hint.fileUploading")));
           } else {
@@ -157252,6 +157235,7 @@ function _sfc_render$4W(_ctx, _cache, $props, $setup, $data, $options) {
         "on-exceed": $options.handlePictureExceed,
         "on-preview": $options.handlePicturePreview,
         "before-upload": $options.beforePictureUpload,
+        "on-progress": $options.handlePictureProgress,
         "on-success": $options.handlePictureUpload,
         "on-error": $options.handleUploadError,
         "before-remove": $options.handleBeforeRemove,
@@ -157283,7 +157267,7 @@ function _sfc_render$4W(_ctx, _cache, $props, $setup, $data, $options) {
           _cache[2] || (_cache[2] = createElementVNode("i", { class: "el-icon-plus avatar-uploader-icon" }, null, -1))
         ]),
         _: 1
-      }, 8, ["disabled", "action", "headers", "data", "with-credentials", "multiple", "file-list", "show-file-list", "class", "limit", "on-exceed", "on-preview", "before-upload", "on-success", "on-error", "before-remove", "on-remove"]),
+      }, 8, ["disabled", "action", "headers", "data", "with-credentials", "multiple", "file-list", "show-file-list", "class", "limit", "on-exceed", "on-preview", "before-upload", "on-progress", "on-success", "on-error", "before-remove", "on-remove"]),
       $data.showPreviewDialogFlag ? withDirectives((openBlock(), createElementBlock("div", _hoisted_5$i, [
         createVNode(_component_el_dialog, {
           title: "",
@@ -157313,7 +157297,7 @@ function _sfc_render$4W(_ctx, _cache, $props, $setup, $data, $options) {
     _: 1
   }, 8, ["designer", "field", "rules", "design-state", "parent-widget", "parent-list", "index-of-parent-list", "sub-form-row-index", "sub-form-col-index", "sub-form-row-id"]);
 }
-var pictureUploadWidget = /* @__PURE__ */ _export_sfc(_sfc_main$4W, [["render", _sfc_render$4W], ["__scopeId", "data-v-4d3c056d"]]);
+var pictureUploadWidget = /* @__PURE__ */ _export_sfc(_sfc_main$4W, [["render", _sfc_render$4W], ["__scopeId", "data-v-66827f61"]]);
 var __glob_0_16$1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   "default": pictureUploadWidget
@@ -241292,13 +241276,13 @@ var Draggable = /* @__PURE__ */ getDefaultExportFromCjs(vuedraggable_umd.exports
 if (typeof window !== "undefined") {
   let loadSvg = function() {
     var body = document.body;
-    var svgDom = document.getElementById("__svg__icons__dom__1769064804868__");
+    var svgDom = document.getElementById("__svg__icons__dom__1769066159830__");
     if (!svgDom) {
       svgDom = document.createElementNS("http://www.w3.org/2000/svg", "svg");
       svgDom.style.position = "absolute";
       svgDom.style.width = "0";
       svgDom.style.height = "0";
-      svgDom.id = "__svg__icons__dom__1769064804868__";
+      svgDom.id = "__svg__icons__dom__1769066159830__";
       svgDom.setAttribute("xmlns", "http://www.w3.org/2000/svg");
       svgDom.setAttribute("xmlns:link", "http://www.w3.org/1999/xlink");
     }