@ibiz-template/vue3-components 0.7.41-alpha.16 → 0.7.41-alpha.18

package/lib/editor/upload/upload-editor.controller.cjs

@@ -40,6 +40,10 @@ class UploadEditorController extends runtime.EditorController {
      * 下载参数
      */
     __publicField(this, "exportParams");
+    /**
+     * 上传文件信息的映射规则字符串，格式为"源键:目标键;源键2:目标键2"
+     */
+    __publicField(this, "infoMap", "");
     /**
      * 自适应预览
      * 只读状态下且配置了编辑器参数autoPreview ，加载完图片后自动调整大小达到预览态，且禁用图片hover工具栏
@@ -48,10 +52,44 @@ class UploadEditorController extends runtime.EditorController {
      * @memberof UploadEditorController
      */
     __publicField(this, "autoPreview", false);
+    /**
+     * 根据配置的映射关系转换对象属性
+     * 将源对象的指定属性，按照映射规则映射到新对象的目标属性
+     *
+     * @param {IData} [_data={}] - 源数据对象，包含需要被映射的原始属性
+     * @param {string} [infoMap=''] - 映射规则字符串，格式为"源键:目标键;源键2:目标键2"
+     * @param {boolean} [isEmit=false] - 是否为抛值时处理，抛值时将源键替换为目标键
+     * @returns {IData} 转换后的新对象，仅包含映射规则中定义的属性
+     *
+     * @example
+     * // isEmit=false
+     * // 源对象：{ filesize:'10000', fileext:'.gif', folder:'file' };
+     * // 映射规则：'filesize:size;fileext:ext;folder:folder';
+     * // 转换结果: { size:'10000', ext:'.gif', folder:'file' }
+     *
+     * // isEmit=true
+     * // 源对象：{ filesize:'10000', fileext:'.gif', folder:'file' };
+     * // 映射规则：'filesize:size;fileext:ext;folder:folder';
+     * // 转换结果: { size:undefined, ext:undefined, folder:'file' }
+     */
+    __publicField(this, "transformInfoMap", (_data = {}, infoMap = "", isEmit = false) => {
+      const result = {};
+      const mappings = infoMap.split(";");
+      mappings.forEach((mapping) => {
+        let [sourceKey, targetKey] = mapping.split(":");
+        if (isEmit)
+          sourceKey = targetKey;
+        if (sourceKey && targetKey) {
+          Object.assign(result, { [targetKey]: _data[sourceKey] });
+        }
+      });
+      return result;
+    });
   }
   async onInit() {
     var _a;
     await super.onInit();
+    this.infoMap = ibiz.config.uploadEditor.infoMap;
     if ((_a = this.model.editorType) == null ? void 0 : _a.includes("PICTURE")) {
       this.accept = "image/*";
     }
@@ -76,7 +114,8 @@ class UploadEditorController extends runtime.EditorController {
         isdrag,
         uploadparams,
         exportparams,
-        autopreview
+        autopreview,
+        infomap
       } = this.editorParams;
       if (isDrag) {
         this.isDrag = Boolean(isDrag);
@@ -99,6 +138,9 @@ class UploadEditorController extends runtime.EditorController {
       if (size) {
         this.size = Number(size);
       }
+      if (infomap) {
+        this.infoMap = infomap;
+      }
       if (uploadParams) {
         try {
           this.uploadParams = JSON.parse(uploadParams);

package/lib/editor/upload/use/use-iview-upload.cjs

@@ -9,7 +9,6 @@ function useIViewUpload(props, valueChange, c) {
   const uploadHeaders = ibiz.util.file.getUploadHeaders();
   const headers = vue.ref({ ...uploadHeaders });
   const uploadUrl = vue.ref("");
-  const downloadUrl = vue.ref("");
   const uploadCache = {
     count: 0,
     cacheFiles: []
@@ -23,6 +22,22 @@ function useIViewUpload(props, valueChange, c) {
     },
     { immediate: true }
   );
+  const getDownloadUrl = (data, file) => {
+    const editorParams = { ...c.editorParams };
+    if (editorParams.exportparams) {
+      editorParams.exportParams = JSON.parse(editorParams.exportparams);
+    }
+    if (file && file.folder) {
+      editorParams.osscat = file.folder;
+    }
+    const urls = ibiz.util.file.calcFileUpDownUrl(
+      c.context,
+      c.params,
+      data,
+      editorParams
+    );
+    return urls.downloadUrl;
+  };
   vue.watch(
     () => props.data,
     (newVal) => {
@@ -31,9 +46,6 @@ function useIViewUpload(props, valueChange, c) {
         if (editorParams.uploadparams) {
           editorParams.uploadParams = JSON.parse(editorParams.uploadparams);
         }
-        if (editorParams.exportparams) {
-          editorParams.exportParams = JSON.parse(editorParams.exportparams);
-        }
         const urls = ibiz.util.file.calcFileUpDownUrl(
           c.context,
           c.params,
@@ -41,7 +53,6 @@ function useIViewUpload(props, valueChange, c) {
           editorParams
         );
         uploadUrl.value = urls.uploadUrl;
-        downloadUrl.value = urls.downloadUrl;
       }
     },
     { immediate: true, deep: true }
@@ -86,24 +97,23 @@ function useIViewUpload(props, valueChange, c) {
   vue.watch(
     files,
     (newVal) => {
-      if ((newVal == null ? void 0 : newVal.length) && downloadUrl.value) {
+      if (newVal == null ? void 0 : newVal.length) {
         newVal.forEach((file) => {
-          file.url = file.url || downloadUrl.value.replace("%fileId%", file.id);
-          if (file.name.split(".").pop() === "svg") {
-            calcSvgPreview(file);
-          }
-        });
-      }
-    },
-    { immediate: true }
-  );
-  vue.watch(
-    downloadUrl,
-    (newVal) => {
-      if (newVal && files.value.length) {
-        files.value.forEach((file) => {
-          file.url = downloadUrl.value.replace("%fileId%", file.id);
-          if (file.name.split(".").pop() === "svg") {
+          const downloadUrl = getDownloadUrl(props.data, file);
+          file.url = file.url || downloadUrl.replace("%fileId%", file.id);
+          if (ibiz.config.common.enableDownloadTicket) {
+            ibiz.util.file.getDownloadTicket(c.context, { fileId: file.id }).then((downloadTicket) => {
+              if (downloadTicket && downloadTicket.ticket) {
+                file.url = downloadUrl.replace(
+                  "%fileId%",
+                  downloadTicket.ticket
+                );
+                if (file.name.split(".").pop() === "svg") {
+                  calcSvgPreview(file);
+                }
+              }
+            });
+          } else if (file.name.split(".").pop() === "svg") {
             calcSvgPreview(file);
           }
         });
@@ -113,7 +123,14 @@ function useIViewUpload(props, valueChange, c) {
   );
   const emitValue = () => {
     const _files = [...files.value, ...uploadCache.cacheFiles];
-    const value = _files.length > 0 ? JSON.stringify(_files.map((file) => ({ name: file.name, id: file.id }))) : null;
+    const value = _files.length > 0 ? JSON.stringify(
+      _files.map((file) => ({
+        name: file.name,
+        id: file.id,
+        folder: file.folder,
+        ...c.transformInfoMap(file, c.infoMap, true)
+      }))
+    ) : null;
     uploadCache.cacheFiles = [];
     valueChange(value);
   };
@@ -136,9 +153,14 @@ function useIViewUpload(props, valueChange, c) {
     if (!response) {
       return;
     }
+    if (ibiz.config.common.enableDownloadTicket) {
+      ibiz.util.file.setDownloadTicket(response.id, response.ticket);
+    }
     uploadCache.cacheFiles.push({
       name: response.filename,
-      id: response.fileid
+      id: response.fileid,
+      folder: response.folder,
+      ...c.transformInfoMap(response, c.infoMap)
     });
     if (response.name.split(".").pop() === "svg") {
       const blob = svgBlob.get(response.name);
@@ -170,15 +192,25 @@ function useIViewUpload(props, valueChange, c) {
     emitValue();
   };
   const onDownload = (file) => {
-    const url = file.url || downloadUrl.value.replace("%fileId%", file.id);
-    ibiz.util.file.fileDownload(url, file.name);
+    const downloadUrl = getDownloadUrl(props.data, file);
+    const url = file.url || downloadUrl.replace("%fileId%", file.id);
+    const editorParams = { ...c.editorParams };
+    if (editorParams.exportparams) {
+      editorParams.exportParams = JSON.parse(editorParams.exportparams);
+    }
+    ibiz.util.file.fileDownload(url, file.name, {
+      context: c.context,
+      params: c.params,
+      data: props.data,
+      file: { fileId: file.id, ...file },
+      extraParams: editorParams
+    });
   };
   const limit = vue.computed(() => {
     return c.multiple ? 9999 : 1;
   });
   return {
     uploadUrl,
-    downloadUrl,
     headers,
     files,
     limit,

package/lib/locale/en/index.cjs

@@ -317,7 +317,8 @@ var index = {
         tip: "All Day",
         today: "Today",
         tomorrow: "To Morrow",
-        nextweek: "Next Week"
+        nextweek: "Next Week",
+        selectdate: "Select Date"
       },
       calendarmonth: {
         lastmonth: "Last Month",
@@ -355,7 +356,9 @@ var index = {
           friday: "Fri",
           saturday: "Sat",
           sunday: "Sun"
-        }
+        },
+        selectWeekRange: "Select week range",
+        weekFormat: "ww [Week] of YYYY"
       }
     },
     chart: {

package/lib/locale/zh-CN/index.cjs

@@ -318,7 +318,8 @@ var index = {
         },
         tip: "\u5168\u5929",
         tomorrow: "\u660E\u5929",
-        nextweek: "\u4E0B\u5468"
+        nextweek: "\u4E0B\u5468",
+        selectdate: "\u9009\u62E9\u65E5\u671F"
       },
       calendarmonth: {
         weeks: {
@@ -351,7 +352,9 @@ var index = {
           friday: "\u5468\u4E94",
           saturday: "\u5468\u516D",
           sunday: "\u5468\u65E5"
-        }
+        },
+        selectWeekRange: "\u9009\u62E9\u5468\u8303\u56F4",
+        weekFormat: "YYYY\u5E74\u7B2Cww\u5468"
       }
     },
     chart: {