@cmstops/pro-compo 3.9.2-alpha.7 → 3.9.2-alpha.9

package/es/hooks/useUpload.d.ts

@@ -7,24 +7,72 @@ export declare type TypeAddMediaParam = {
     directory_id: number;
     size: number;
 };
+declare type WaterMark = {
+    id: string;
+    position: string;
+    url: string;
+    title: string;
+};
+declare type UploadTemplate = {
+    watermark?: {
+        default?: WaterMark;
+        images: WaterMark[];
+    };
+};
 export declare function getSize(value: number): string;
 export declare function addMedia(BASE_API: string, params: TypeAddMediaParam): Promise<import("axios").AxiosResponse<any, any>>;
 export declare function getMediaDetails(BASE_API: string, repoId: number, id: number): Promise<import("axios").AxiosResponse<any, any>>;
 export declare function reTranscodeMedia(BASE_API: string, media_id: number): Promise<import("axios").AxiosResponse<any, any>>;
 declare type UploadOptions = {
-    noAddMedia: boolean;
+    noAddMedia?: boolean;
+};
+declare type UploadFileOptions = {
+    template?: UploadTemplate;
 };
 export default function useUpload(options?: UploadOptions): {
     list: import("vue").Ref<any[], any[]>;
-    uploadFile: (BASE_API: string, file: any, dir: number | undefined, repoId: number, callback?: CallbackFunc | undefined) => void;
+    uploadFile: (BASE_API: string, file: any, dir: number | undefined, repoId: number, callback?: CallbackFunc | undefined, upOptions?: UploadFileOptions | undefined) => void;
     reTranscode: (BASE_API: string, file: any) => Promise<boolean>;
     transcodingFile: (BASE_API: string, file: any, repoId: number) => void;
     recordTaskStatusChange: (file: any, progress: number, isTrans?: boolean | undefined) => void;
     removeRecord: (file: any) => void;
 };
+export declare function getWatermarkTemplate(BASE_API: string): Promise<import("axios").AxiosResponse<any, any>>;
 export declare function useUploadConfig(): {
     config: import("vue").Ref<any, any>;
+    template: import("vue").Ref<{
+        watermark?: {
+            default?: {
+                id: string;
+                position: string;
+                url: string;
+                title: string;
+            } | undefined;
+            images: {
+                id: string;
+                position: string;
+                url: string;
+                title: string;
+            }[];
+        } | undefined;
+    }, UploadTemplate | {
+        watermark?: {
+            default?: {
+                id: string;
+                position: string;
+                url: string;
+                title: string;
+            } | undefined;
+            images: {
+                id: string;
+                position: string;
+                url: string;
+                title: string;
+            }[];
+        } | undefined;
+    }>;
     checkFileSizeOutLimit: (file: File, callback: (msg: string) => void) => boolean;
     initUploadConfig: (BASE_API: string, domainId: number) => Promise<void>;
+    initTemplate: (BASE_API: string) => Promise<void>;
 };
 export {};

package/es/hooks/useUpload.js

@@ -73,7 +73,7 @@ function useUpload(options) {
       list.value = originList;
     }
   };
-  const uploadFile = (BASE_API, file, dir = 0, repoId, callback) => {
+  const uploadFile = (BASE_API, file, dir = 0, repoId, callback, upOptions) => {
     const newFile = {
       id: file.id || generateUUID(),
       sig_id: file.sig_id || generateUUID(),
@@ -93,18 +93,24 @@ function useUpload(options) {
     };
     const uploading = upload.start(progress);
     uploading.then(async (url) => {
+      var _a;
       if (options == null ? void 0 : options.noAddMedia) {
         recordTaskStatusChange({ ...newFile, status: 0, url }, 1);
         callback && callback({ ...newFile, url }, "success");
         return;
       }
+      const params = {};
+      if ((_a = upOptions == null ? void 0 : upOptions.template) == null ? void 0 : _a.watermark) {
+        params.watermark = upOptions.template.watermark.default;
+      }
       const { code, message } = await addMedia(BASE_API, {
         url,
         size: newFile.size,
         directory_id: dir,
         repository_id: repoId,
         catalog: newFile.type,
-        alias: newFile.name
+        alias: newFile.name,
+        ...params
       });
       if (code !== 0) {
         console.log("\u{1F525}\u{1F525}\u{1F525}\u{1F525}\u{1F525} \u4E0A\u4F20\u5931\u8D25\uFF1A", newFile.name, code, message);
@@ -194,9 +200,16 @@ function getConfiguration(BASE_API, params) {
     params
   });
 }
+function getWatermarkTemplate(BASE_API) {
+  return request(BASE_API, {
+    url: `/poplar/v2/material/image/watermark`,
+    method: "get"
+  });
+}
 function useUploadConfig() {
   const { get, set, remove } = useLocalstorage("LOCAL_UPLOAD_CONFIG");
   const config = ref(get() || {});
+  const template = ref({});
   async function initUploadConfig(BASE_API, domainId) {
     if (config.value.size_config_enabled != null)
       return;
@@ -245,11 +258,37 @@ function useUploadConfig() {
     );
     return false;
   }
+  async function initTemplate(BASE_API) {
+    try {
+      const { code, message } = await getWatermarkTemplate(BASE_API);
+      if (code !== 0)
+        return;
+      if (message) {
+        let defaultWaterMark;
+        if (Array.isArray(message.images)) {
+          message.images.forEach((item) => {
+            if (message.default === item.id)
+              defaultWaterMark = item;
+          });
+        }
+        template.value = {
+          watermark: {
+            default: defaultWaterMark,
+            images: message.images
+          }
+        };
+      }
+    } catch (e) {
+      console.error(e);
+    }
+  }
   window.addEventListener("beforeunload", remove, false);
   return {
     config,
+    template,
     checkFileSizeOutLimit,
-    initUploadConfig
+    initUploadConfig,
+    initTemplate
   };
 }
-export { addMedia, useUpload as default, getMediaDetails, getSize, reTranscodeMedia, useUploadConfig };
+export { addMedia, useUpload as default, getMediaDetails, getSize, getWatermarkTemplate, reTranscodeMedia, useUploadConfig };

package/es/selectResourceModal/components/List/ListLocal/index.js

@@ -1,6 +1,6 @@
-import { defineComponent, inject, computed, openBlock, createBlock, withCtx, renderSlot, createElementVNode, createVNode, unref, createElementBlock, toDisplayString, createCommentVNode, Fragment, renderList } from "vue";
+import { defineComponent, inject, computed, onMounted, openBlock, createBlock, withCtx, renderSlot, createElementVNode, createVNode, unref, createElementBlock, toDisplayString, createCommentVNode, Fragment, renderList } from "vue";
 import _sfc_main$2 from "./Upload.js";
-import useUpload from "../../../../hooks/useUpload.js";
+import useUpload, { useUploadConfig } from "../../../../hooks/useUpload.js";
 import _sfc_main$1 from "../ListWraper.js";
 const _hoisted_1 = { class: "list-upload" };
 const _hoisted_2 = { class: "list-content" };
@@ -22,6 +22,7 @@ const _sfc_main = defineComponent({
       var _a;
       return (_a = userInfo == null ? void 0 : userInfo.value) == null ? void 0 : _a.repository_id;
     });
+    const { template, initTemplate } = useUploadConfig();
     const { list, uploadFile, reTranscode, transcodingFile, removeRecord } = useUpload();
     function handleChange(file) {
       if (!baseAPI || !repoId.value)
@@ -31,7 +32,8 @@ const _sfc_main = defineComponent({
         file.file,
         0,
         repoId.value,
-        (media) => transcodingFile(baseAPI, media, repoId.value)
+        (media) => transcodingFile(baseAPI, media, repoId.value),
+        { template: template.value }
       );
     }
     async function handleOptions(e) {
@@ -54,6 +56,9 @@ const _sfc_main = defineComponent({
         removeRecord(e.item);
       }
     }
+    onMounted(() => {
+      initTemplate(baseAPI);
+    });
     return (_ctx, _cache) => {
       return openBlock(), createBlock(_sfc_main$1, null, {
         "footer-extra": withCtx(() => [

package/es/utils/index.js

@@ -137,13 +137,13 @@ async function copyContent(content) {
   }
 }
 function mediaTime(v) {
-  const h = Math.floor(v / (60 * 60));
-  const m = Math.floor((v - h) / 60);
-  const s = Math.floor(v - h * 360 - m * 60);
+  const h = Math.floor(v / 3600);
+  const m = Math.floor(v % 3600 / 60);
+  const s = Math.floor(v % 60);
   let ret = "";
-  ret += `${h < 10 ? `0${h}` : h || "--"}:`;
-  ret += `${m < 10 ? `0${m}` : m || "--"}:`;
-  ret += s < 10 ? `0${s}` : s || "--";
+  ret += `${h < 10 ? `0${h}` : h}:`;
+  ret += `${m < 10 ? `0${m}` : m}:`;
+  ret += s < 10 ? `0${s}` : s;
   return ret;
 }
 export { copyContent, dateYYYYDDMMHHmm, generateUUID, getRealUrl, getThemeColor, mediaTime, noCoverText, replaceSuffix, timeFormat, to, validateForm };

package/lib/hooks/useUpload.js

@@ -75,7 +75,7 @@ function useUpload(options) {
       list.value = originList;
     }
   };
-  const uploadFile = (BASE_API, file, dir = 0, repoId, callback) => {
+  const uploadFile = (BASE_API, file, dir = 0, repoId, callback, upOptions) => {
     const newFile = {
       id: file.id || index.generateUUID(),
       sig_id: file.sig_id || index.generateUUID(),
@@ -95,18 +95,24 @@ function useUpload(options) {
     };
     const uploading = upload.start(progress);
     uploading.then(async (url) => {
+      var _a;
       if (options == null ? void 0 : options.noAddMedia) {
         recordTaskStatusChange({ ...newFile, status: 0, url }, 1);
         callback && callback({ ...newFile, url }, "success");
         return;
       }
+      const params = {};
+      if ((_a = upOptions == null ? void 0 : upOptions.template) == null ? void 0 : _a.watermark) {
+        params.watermark = upOptions.template.watermark.default;
+      }
       const { code, message } = await addMedia(BASE_API, {
         url,
         size: newFile.size,
         directory_id: dir,
         repository_id: repoId,
         catalog: newFile.type,
-        alias: newFile.name
+        alias: newFile.name,
+        ...params
       });
       if (code !== 0) {
         console.log("\u{1F525}\u{1F525}\u{1F525}\u{1F525}\u{1F525} \u4E0A\u4F20\u5931\u8D25\uFF1A", newFile.name, code, message);
@@ -196,9 +202,16 @@ function getConfiguration(BASE_API, params) {
     params
   });
 }
+function getWatermarkTemplate(BASE_API) {
+  return request(BASE_API, {
+    url: `/poplar/v2/material/image/watermark`,
+    method: "get"
+  });
+}
 function useUploadConfig() {
   const { get, set, remove } = useLocalStorage["default"]("LOCAL_UPLOAD_CONFIG");
   const config = vue.ref(get() || {});
+  const template = vue.ref({});
   async function initUploadConfig(BASE_API, domainId) {
     if (config.value.size_config_enabled != null)
       return;
@@ -247,16 +260,43 @@ function useUploadConfig() {
     );
     return false;
   }
+  async function initTemplate(BASE_API) {
+    try {
+      const { code, message } = await getWatermarkTemplate(BASE_API);
+      if (code !== 0)
+        return;
+      if (message) {
+        let defaultWaterMark;
+        if (Array.isArray(message.images)) {
+          message.images.forEach((item) => {
+            if (message.default === item.id)
+              defaultWaterMark = item;
+          });
+        }
+        template.value = {
+          watermark: {
+            default: defaultWaterMark,
+            images: message.images
+          }
+        };
+      }
+    } catch (e) {
+      console.error(e);
+    }
+  }
   window.addEventListener("beforeunload", remove, false);
   return {
     config,
+    template,
     checkFileSizeOutLimit,
-    initUploadConfig
+    initUploadConfig,
+    initTemplate
   };
 }
 exports.addMedia = addMedia;
 exports["default"] = useUpload;
 exports.getMediaDetails = getMediaDetails;
 exports.getSize = getSize;
+exports.getWatermarkTemplate = getWatermarkTemplate;
 exports.reTranscodeMedia = reTranscodeMedia;
 exports.useUploadConfig = useUploadConfig;

package/lib/selectResourceModal/components/List/ListLocal/index.js

@@ -23,6 +23,7 @@ const _sfc_main = vue.defineComponent({
       var _a;
       return (_a = userInfo == null ? void 0 : userInfo.value) == null ? void 0 : _a.repository_id;
     });
+    const { template, initTemplate } = useUpload.useUploadConfig();
     const { list, uploadFile, reTranscode, transcodingFile, removeRecord } = useUpload["default"]();
     function handleChange(file) {
       if (!baseAPI || !repoId.value)
@@ -32,7 +33,8 @@ const _sfc_main = vue.defineComponent({
         file.file,
         0,
         repoId.value,
-        (media) => transcodingFile(baseAPI, media, repoId.value)
+        (media) => transcodingFile(baseAPI, media, repoId.value),
+        { template: template.value }
       );
     }
     async function handleOptions(e) {
@@ -55,6 +57,9 @@ const _sfc_main = vue.defineComponent({
         removeRecord(e.item);
       }
     }
+    vue.onMounted(() => {
+      initTemplate(baseAPI);
+    });
     return (_ctx, _cache) => {
       return vue.openBlock(), vue.createBlock(ListWraper, null, {
         "footer-extra": vue.withCtx(() => [

package/lib/utils/index.js

@@ -144,13 +144,13 @@ async function copyContent(content) {
   }
 }
 function mediaTime(v) {
-  const h = Math.floor(v / (60 * 60));
-  const m = Math.floor((v - h) / 60);
-  const s = Math.floor(v - h * 360 - m * 60);
+  const h = Math.floor(v / 3600);
+  const m = Math.floor(v % 3600 / 60);
+  const s = Math.floor(v % 60);
   let ret = "";
-  ret += `${h < 10 ? `0${h}` : h || "--"}:`;
-  ret += `${m < 10 ? `0${m}` : m || "--"}:`;
-  ret += s < 10 ? `0${s}` : s || "--";
+  ret += `${h < 10 ? `0${h}` : h}:`;
+  ret += `${m < 10 ? `0${m}` : m}:`;
+  ret += s < 10 ? `0${s}` : s;
   return ret;
 }
 exports.copyContent = copyContent;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmstops/pro-compo",
-  "version": "3.9.2-alpha.7",
+  "version": "3.9.2-alpha.9",
   "description": "",
   "keywords": [
     "vue",