@cmstops/pro-compo 0.3.43 → 0.3.45

package/es/selectResourceModal/scripts/useResourceSelect.js

@@ -0,0 +1,25 @@
+import { ref, computed } from "vue";
+function useResourceSelect(props) {
+  const selected = ref([]);
+  const selectedKeys = computed(() => selected.value.map((item) => item.id));
+  const disableSelect = computed(() => props.maxcount && selected.value.length >= props.maxcount);
+  function handleSelect(params) {
+    const { id } = params;
+    const index = selected.value.findIndex((item) => item.id === id);
+    if (index > -1)
+      selected.value.splice(index, 1);
+    else
+      selected.value.push(params);
+  }
+  function handleClear() {
+    selected.value = [];
+  }
+  return {
+    selected,
+    selectedKeys,
+    disableSelect,
+    handleSelect,
+    handleClear
+  };
+}
+export { useResourceSelect };

package/es/selectResourceModal/style/index.css

@@ -71,10 +71,18 @@
   overflow: hidden;
 }
 .list-panel-wrapper .list-selected-record .list-selected-item .item-thumb {
+  position: relative;
   width: 50px;
   height: 38px;
   overflow: hidden;
 }
+.list-panel-wrapper .list-selected-record .list-selected-item .item-thumb .item-tag {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  color: white;
+  transform: translate(-50%, -50%);
+}
 .list-panel-wrapper .list-selected-record .list-selected-item .item-alias {
   flex: 1;
   overflow: hidden;
@@ -104,13 +112,31 @@
 .card-wrapper-image {
   position: relative;
   overflow: hidden;
-  cursor: pointer;
 }
 .card-wrapper-image .card-wrapper {
   position: relative;
   overflow: hidden;
+  border-radius: 2px;
+  transition: all 0.3s ease-in-out;
   aspect-ratio: 4 / 3;
 }
+.card-wrapper-image .card-wrapper.disable:not(.active) {
+  opacity: 0.4;
+}
+.card-wrapper-image .card-wrapper .mask {
+  position: absolute;
+  top: 0;
+  z-index: 9;
+  display: none;
+  width: 100%;
+  height: 100%;
+  font-size: 18px;
+  background: rgba(0, 0, 0, 0.3);
+  cursor: pointer;
+}
+.card-wrapper-image .card-wrapper.active .mask {
+  display: block;
+}
 .card-wrapper-image .card-alias {
   width: 100%;
   margin-top: 6px;
@@ -120,6 +146,8 @@
   line-height: 22px;
   white-space: nowrap;
   text-overflow: ellipsis;
+  user-select: none;
+  -webkit-user-drag: none;
 }
 .card-wrapper-image:hover .check-box-wrapper .check-box,
 .card-wrapper-image .check-box-wrapper .check-box.active {
@@ -129,6 +157,7 @@
   position: absolute;
   top: 8px;
   left: 8px;
+  z-index: 10;
   cursor: pointer;
 }
 .card-wrapper-image .check-box-wrapper .check-box {

package/es/selectResourceModal/style/listCardWrapper.less

@@ -1,13 +1,34 @@
 .card-wrapper-image {
   position: relative;
   overflow: hidden;
-  cursor: pointer;
 
   .card-wrapper {
     position: relative;
     overflow: hidden;
+    border-radius: 2px;
+    transition: all 0.3s ease-in-out;
     // 宽高：43
     aspect-ratio: 4 / 3;
+
+    &.disable:not(.active) {
+      opacity: 0.4;
+    }
+
+    .mask {
+      position: absolute;
+      top: 0;
+      z-index: 9;
+      display: none;
+      width: 100%;
+      height: 100%;
+      font-size: 18px;
+      background: rgba(0, 0, 0, 0.3);
+      cursor: pointer;
+    }
+
+    &.active .mask {
+      display: block;
+    }
   }
 
   .card-alias {
@@ -19,6 +40,8 @@
     line-height: 22px;
     white-space: nowrap;
     text-overflow: ellipsis;
+    user-select: none;
+    -webkit-user-drag: none;
   }
 
   &:hover .check-box-wrapper .check-box,
@@ -30,6 +53,7 @@
     position: absolute;
     top: 8px;
     left: 8px;
+    z-index: 10;
     cursor: pointer;
 
     .check-box {

package/es/selectResourceModal/style/listSelected.less

@@ -59,9 +59,18 @@
       overflow: hidden;
 
       .item-thumb {
+        position: relative;
         width: 50px;
         height: 38px;
         overflow: hidden;
+
+        .item-tag {
+          position: absolute;
+          top: 50%;
+          left: 50%;
+          color: white;
+          transform: translate(-50%, -50%);
+        }
       }
 
       .item-alias {

package/es/thumbCard/component.js

@@ -1,6 +1,6 @@
-import { defineComponent, computed, openBlock, createElementBlock, normalizeClass, normalizeStyle, createVNode, unref, Fragment, createCommentVNode, withCtx, createTextVNode, createElementVNode, createBlock, mergeProps, renderList, withModifiers, toDisplayString } from "vue";
+import { defineComponent, computed, openBlock, createElementBlock, normalizeClass, normalizeStyle, createVNode, unref, createCommentVNode, Fragment, withCtx, createTextVNode, createElementVNode, createBlock, mergeProps, renderList, withModifiers, toDisplayString } from "vue";
 import { IconPlus } from "@arco-design/web-vue/es/icon";
-import { IconResource, IconComputer } from "@arco-iconbox/vue-cmstop-icons";
+import { IconResource, IconComputer, IconVideoTag, IconAudioTag } from "@arco-iconbox/vue-cmstop-icons";
 import { Progress, Dropdown, Doption, Image } from "@arco-design/web-vue";
 import magic from "./assets/magic.js";
 import { DEFAULT_BASE_API } from "../config.js";
@@ -9,9 +9,13 @@ const _hoisted_1 = {
   key: 0,
   class: "thumb-upload-loading"
 };
-const _hoisted_2 = { class: "thumb-handler-list" };
-const _hoisted_3 = ["onClick"];
-const _hoisted_4 = {
+const _hoisted_2 = {
+  key: 0,
+  class: "thumb-upload-text"
+};
+const _hoisted_3 = { class: "thumb-handler-list" };
+const _hoisted_4 = ["onClick"];
+const _hoisted_5 = {
   key: 3,
   class: "thumb-select-tag"
 };
@@ -39,7 +43,7 @@ const _sfc_main = defineComponent({
       var _a;
       return ((_a = props.meta) == null ? void 0 : _a.progress) != null;
     });
-    const thumb = computed(() => {
+    const realThumb = computed(() => {
       if (["image", "video"].includes(props.catalog || "")) {
         return props.thumb || props.url || "";
       }
@@ -75,7 +79,7 @@ const _sfc_main = defineComponent({
       emits("edit", { key });
     }
     return (_ctx, _cache) => {
-      var _a, _b;
+      var _a, _b, _c;
       return openBlock(), createElementBlock("div", {
         class: normalizeClass(["thumb-select-wrapper", classList.value]),
         style: normalizeStyle(styleObject.value)
@@ -83,8 +87,9 @@ const _sfc_main = defineComponent({
         isUploading.value ? (openBlock(), createElementBlock("div", _hoisted_1, [
           createVNode(unref(Progress), {
             type: "circle",
-            percent: ((_a = _ctx.meta) == null ? void 0 : _a.progress) / 10
-          }, null, 8, ["percent"])
+            percent: (_a = _ctx.meta) == null ? void 0 : _a.progress
+          }, null, 8, ["percent"]),
+          ((_b = _ctx.meta) == null ? void 0 : _b.isTrans) ? (openBlock(), createElementBlock("div", _hoisted_2, "\u8F6C\u7801\u4E2D...")) : createCommentVNode("v-if", true)
         ])) : _ctx.isEdit && !_ctx.url ? (openBlock(), createElementBlock(Fragment, { key: 1 }, [
           createCommentVNode(" \u7F16\u8F91\u6A21\u5F0F\u4E0B\u53EF\u4F7F\u7528\u60AC\u6D6E\u6846\u5FEB\u901F\u63D2\u5165\u7D20\u6750 "),
           createVNode(unref(Dropdown), {
@@ -123,20 +128,23 @@ const _sfc_main = defineComponent({
           _ctx.catalog ? (openBlock(), createBlock(unref(Image), mergeProps({
             key: 0,
             class: "thumb-image",
-            src: thumb.value
+            src: realThumb.value
           }, aImageAttr.value), null, 16, ["src"])) : createCommentVNode("v-if", true),
           createCommentVNode(" \u5C55\u793A\u6A21\u5F0F "),
-          createElementVNode("div", _hoisted_2, [
+          createElementVNode("div", _hoisted_3, [
             (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.handlersKey, (item) => {
               return openBlock(), createElementBlock("div", {
                 key: item.key,
                 class: "handler-item",
                 onClick: withModifiers(() => handleOption(item.key), ["stop"])
-              }, toDisplayString(item.label), 9, _hoisted_3);
+              }, toDisplayString(item.label), 9, _hoisted_4);
             }), 128))
           ])
         ], 64)) : createCommentVNode("v-if", true),
-        ["video", "audio"].includes(_ctx.catalog) && _ctx.meta ? (openBlock(), createElementBlock("div", _hoisted_4, toDisplayString(unref(mediaTime)((_b = _ctx.meta) == null ? void 0 : _b.length)), 1)) : createCommentVNode("v-if", true)
+        ["video", "audio"].includes(_ctx.catalog) && _ctx.meta ? (openBlock(), createElementBlock("div", _hoisted_5, [
+          _ctx.catalog === "video" ? (openBlock(), createBlock(unref(IconVideoTag), { key: 0 })) : (openBlock(), createBlock(unref(IconAudioTag), { key: 1 })),
+          createTextVNode(" " + toDisplayString(unref(mediaTime)((_c = _ctx.meta) == null ? void 0 : _c.length)), 1)
+        ])) : createCommentVNode("v-if", true)
       ], 6);
     };
   }

package/es/thumbCard/style/index.css

@@ -11,6 +11,7 @@
 }
 .thumb-select-wrapper .thumb-upload-loading {
   display: flex;
+  flex-direction: column;
   align-items: center;
   justify-content: center;
   width: 100%;
@@ -29,6 +30,8 @@
 .thumb-select-wrapper .thumb-image img {
   width: 100%;
   height: 100%;
+  user-select: none;
+  -webkit-user-drag: none;
 }
 .thumb-select-wrapper .thumb-handler-list {
   position: absolute;
@@ -68,9 +71,13 @@
   position: absolute;
   right: 5px;
   bottom: 5px;
-  padding: 2px 10px;
+  display: flex;
+  gap: 2px;
+  align-items: center;
+  padding: 2px 5px;
   color: #fff;
   font-size: 12px;
+  line-height: 14px;
   background-color: rgba(0, 0, 0, 0.5);
   border-radius: 16px;
   opacity: 1;

package/es/thumbCard/style/index.less

@@ -13,6 +13,7 @@
   // loading 模式
   .thumb-upload-loading {
     display: flex;
+    flex-direction: column;
     align-items: center;
     justify-content: center;
     width: 100%;
@@ -37,6 +38,8 @@
     img {
       width: 100%;
       height: 100%;
+      user-select: none;
+      -webkit-user-drag: none;
     }
   }
 
@@ -89,9 +92,13 @@
     position: absolute;
     right: 5px;
     bottom: 5px;
-    padding: 2px 10px;
+    display: flex;
+    gap: 2px;
+    align-items: center;
+    padding: 2px 5px;
     color: #fff;
     font-size: 12px;
+    line-height: 14px;
     background-color: rgba(0, 0, 0, 0.5);
     border-radius: 16px;
     opacity: 1;

package/es/utils/transcodeMedia.d.ts

@@ -0,0 +1,13 @@
+export declare function getTranscodingProgress(BASE_API: string, id: number): import("axios").AxiosPromise<any>;
+/**
+ * 转码逻辑
+ * @description 转码逻辑抽离，后期所有涉及到转码的地方都可用该方法
+ */
+export declare class TranscodingTask {
+    file: any;
+    pollCount: number;
+    taskInterval: any;
+    constructor(file: any);
+    start(BASE_API: string, callback: (progress: number) => any): Promise<unknown>;
+    abort(): void;
+}

package/es/utils/transcodeMedia.js

@@ -0,0 +1,46 @@
+import request from "./request.js";
+function getTranscodingProgress(BASE_API, id) {
+  return request(BASE_API, {
+    url: `/poplar/v2/transcoding/progress?id=${id}`,
+    method: "get"
+  });
+}
+class TranscodingTask {
+  constructor(file) {
+    this.file = file;
+    this.pollCount = 0;
+  }
+  start(BASE_API, callback) {
+    if (!this.file.id)
+      return Promise.reject(new Error("file error"));
+    return new Promise((resolve, reject) => {
+      const handleTranscoding = async () => {
+        const { code, message } = await getTranscodingProgress(
+          BASE_API,
+          this.file.id
+        );
+        if (code !== 0)
+          reject(new Error(message));
+        if (message.state === 1) {
+          callback(message.progress);
+          if (message.progress === 1 && ++this.pollCount === 3) {
+            this.abort();
+            resolve(false);
+          }
+        } else if (message.state === 2) {
+          this.abort();
+          resolve(false);
+        } else if (message.state === 3) {
+          this.abort();
+          resolve(true);
+        }
+      };
+      this.taskInterval = setInterval(handleTranscoding, 5e3);
+    });
+  }
+  abort() {
+    clearInterval(this.taskInterval);
+    this.taskInterval = null;
+  }
+}
+export { TranscodingTask, getTranscodingProgress };

package/lib/hooks/useLocalStorage.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
+const LOCALSTORAGE_KEYS = {
+  LOCAL_RESOURCES: "cmstop-local-resources"
+};
+function useLocalstorage(key) {
+  function get() {
+    const ret = localStorage.getItem(LOCALSTORAGE_KEYS[key]);
+    try {
+      if (typeof ret !== "string")
+        return ret;
+      return JSON.parse(ret);
+    } catch (e) {
+      return ret;
+    }
+  }
+  function set(value) {
+    if (typeof value === "object") {
+      localStorage.setItem(LOCALSTORAGE_KEYS[key], JSON.stringify(value));
+    } else {
+      localStorage.setItem(LOCALSTORAGE_KEYS[key], value);
+    }
+  }
+  function remove() {
+    localStorage.removeItem(LOCALSTORAGE_KEYS[key]);
+  }
+  return {
+    get,
+    set,
+    remove
+  };
+}
+exports.LOCALSTORAGE_KEYS = LOCALSTORAGE_KEYS;
+exports["default"] = useLocalstorage;

package/lib/hooks/useUpload.js

@@ -4,6 +4,8 @@ var vue = require("vue");
 var index = require("../utils/index.js");
 var tusUpload = require("../utils/tusUpload.js");
 var request = require("../utils/request.js");
+var transcodeMedia = require("../utils/transcodeMedia.js");
+var useLocalStorage = require("./useLocalStorage.js");
 function addMedia(BASE_API, params) {
   return request(BASE_API, {
     url: "/poplar/v2/media/add",
@@ -12,7 +14,8 @@ function addMedia(BASE_API, params) {
   });
 }
 function useUpload() {
-  const list = vue.ref([]);
+  const { get, set, remove } = useLocalStorage["default"]("LOCAL_RESOURCES");
+  const list = vue.ref(get() || []);
   function uploadSuccess(file) {
     const originList = list.value;
     const taskIndex = originList.findIndex(
@@ -23,13 +26,15 @@ function useUpload() {
       list.value = originList;
     }
   }
-  function recordTaskStatusChange(file, progress) {
+  function recordTaskStatusChange(file, progress, isTrans) {
     const originList = list.value;
     const taskIndex = originList.findIndex((task) => task.id === file.id);
     if (taskIndex !== -1) {
-      progress !== -1 && (originList[taskIndex].progress = progress);
+      progress !== -1 && (originList[taskIndex].progress = Math.round(progress));
       file.status != null && (originList[taskIndex].status = file.status);
       file.msg != null && (originList[taskIndex].msg = file.msg);
+      if (isTrans)
+        originList[taskIndex].isTrans = true;
       originList[taskIndex].url = file.url;
     } else {
       file.created_at = new Date().getTime();
@@ -66,24 +71,56 @@ function useUpload() {
       });
       if (code !== 0) {
         console.log("\u{1F525}\u{1F525}\u{1F525}\u{1F525}\u{1F525} \u4E0A\u4F20\u5931\u8D25\uFF1A", newFile.name, code, message);
-        recordTaskStatusChange({ ...newFile, status: 2, msg: "\u6DFB\u52A0\u5230\u7D20\u6750\u5E93\u5931\u8D25" }, -1);
+        recordTaskStatusChange({ ...newFile, status: 2, msg: "\u4E0A\u4F20\u5931\u8D25" }, -1);
         return;
       }
-      console.log("\u{1F680}\u{1F680}\u{1F680}\u{1F680}\u{1F680}\u{1F680} \u4E0A\u4F20\u6210\u529F\uFF1A", url);
-      recordTaskStatusChange({ ...newFile, url: message.url, status: 0 }, 1);
-      setTimeout(() => {
-        uploadSuccess({ ...message, sig_id: newFile.sig_id });
-      }, 200);
+      console.log("\u{1F680}\u{1F680}\u{1F680}\u{1F680}\u{1F680}\u{1F680} \u4E0A\u4F20\u6210\u529F\uFF1A", url, message);
+      if (!["video", "audio"].includes(message.catalog)) {
+        recordTaskStatusChange({ ...newFile, url: message.url, status: 0 }, 1);
+        setTimeout(() => uploadSuccess({ ...message, sig_id: newFile.sig_id }), 200);
+      } else {
+        recordTaskStatusChange(newFile, 0);
+      }
       callback && callback({ ...message, sig_id: newFile.sig_id }, "success");
     }).catch((e) => {
       console.log("\u{1F525}\u{1F525}\u{1F525}\u{1F525}\u{1F525} \u4E0A\u4F20\u5931\u8D25\uFF1A", e);
-      recordTaskStatusChange({ ...newFile, status: 2, msg: "\u4E0A\u4F20\u4E2D\u65AD" }, -1);
+      recordTaskStatusChange({ ...newFile, status: 2, msg: "\u5931\u8D25" }, -1);
       callback && callback(newFile, "fail");
     });
   };
+  const transcodingFile = (BASE_API, file) => {
+    if (!["video", "audio"].includes(file.catalog))
+      return;
+    const task = new transcodeMedia.TranscodingTask(file);
+    const idx = list.value.findIndex(
+      (item2) => item2.sig_id === file.sig_id
+    );
+    if (idx === -1)
+      return;
+    const item = list.value[idx];
+    recordTaskStatusChange(item, 0, true);
+    const progress = (progress2) => recordTaskStatusChange(item, progress2);
+    const transing = task.start(BASE_API, progress);
+    transing.then((res) => {
+      if (res) {
+        console.log("\u{1F680}\u{1F680}\u{1F680}\u{1F680}\u{1F680}\u{1F680} \u8F6C\u7801\u6210\u529F");
+        recordTaskStatusChange({ ...item, status: 0 }, 1);
+        setTimeout(() => uploadSuccess(file), 200);
+      } else {
+        console.log("\u{1F525}\u{1F525}\u{1F525}\u{1F525}\u{1F525} \u8F6C\u7801\u5931\u8D25\uFF1A", item);
+        recordTaskStatusChange({ ...item, status: 2, msg: "\u8F6C\u7801\u5931\u8D25" }, -1);
+      }
+    }).catch((e) => {
+      console.log("\u{1F525}\u{1F525}\u{1F525}\u{1F525}\u{1F525} \u8F6C\u7801\u5931\u8D25", e);
+      recordTaskStatusChange({ ...item, status: 2, msg: "\u8F6C\u7801\u5931\u8D25" }, -1);
+    });
+  };
+  vue.watch(() => list.value, set, { deep: true });
+  window.onbeforeunload = remove;
   return {
     list,
     uploadFile,
+    transcodingFile,
     recordTaskStatusChange
   };
 }

package/lib/index.css

@@ -4256,6 +4256,7 @@
 }
 .thumb-select-wrapper .thumb-upload-loading {
   display: flex;
+  flex-direction: column;
   align-items: center;
   justify-content: center;
   width: 100%;
@@ -4274,6 +4275,8 @@
 .thumb-select-wrapper .thumb-image img {
   width: 100%;
   height: 100%;
+  user-select: none;
+  -webkit-user-drag: none;
 }
 .thumb-select-wrapper .thumb-handler-list {
   position: absolute;
@@ -4313,9 +4316,13 @@
   position: absolute;
   right: 5px;
   bottom: 5px;
-  padding: 2px 10px;
+  display: flex;
+  gap: 2px;
+  align-items: center;
+  padding: 2px 5px;
   color: #fff;
   font-size: 12px;
+  line-height: 14px;
   background-color: rgba(0, 0, 0, 0.5);
   border-radius: 16px;
   opacity: 1;
@@ -4400,10 +4407,18 @@
   overflow: hidden;
 }
 .list-panel-wrapper .list-selected-record .list-selected-item .item-thumb {
+  position: relative;
   width: 50px;
   height: 38px;
   overflow: hidden;
 }
+.list-panel-wrapper .list-selected-record .list-selected-item .item-thumb .item-tag {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  color: white;
+  transform: translate(-50%, -50%);
+}
 .list-panel-wrapper .list-selected-record .list-selected-item .item-alias {
   flex: 1;
   overflow: hidden;
@@ -4433,13 +4448,31 @@
 .card-wrapper-image {
   position: relative;
   overflow: hidden;
-  cursor: pointer;
 }
 .card-wrapper-image .card-wrapper {
   position: relative;
   overflow: hidden;
+  border-radius: 2px;
+  transition: all 0.3s ease-in-out;
   aspect-ratio: 4 / 3;
 }
+.card-wrapper-image .card-wrapper.disable:not(.active) {
+  opacity: 0.4;
+}
+.card-wrapper-image .card-wrapper .mask {
+  position: absolute;
+  top: 0;
+  z-index: 9;
+  display: none;
+  width: 100%;
+  height: 100%;
+  font-size: 18px;
+  background: rgba(0, 0, 0, 0.3);
+  cursor: pointer;
+}
+.card-wrapper-image .card-wrapper.active .mask {
+  display: block;
+}
 .card-wrapper-image .card-alias {
   width: 100%;
   margin-top: 6px;
@@ -4449,6 +4482,8 @@
   line-height: 22px;
   white-space: nowrap;
   text-overflow: ellipsis;
+  user-select: none;
+  -webkit-user-drag: none;
 }
 .card-wrapper-image:hover .check-box-wrapper .check-box,
 .card-wrapper-image .check-box-wrapper .check-box.active {
@@ -4458,6 +4493,7 @@
   position: absolute;
   top: 8px;
   left: 8px;
+  z-index: 10;
   cursor: pointer;
 }
 .card-wrapper-image .check-box-wrapper .check-box {