@cmstops/pro-compo 3.0.0-rc.0 → 3.0.0-stable.1

package/lib/hooks/usePopper.js

@@ -9,16 +9,16 @@ function usePopper(pannel, triggerEl) {
   };
   const show = () => {
     visible.value = true;
-    window.onclick = (e) => {
+    window.onclick = () => {
       hide();
       visible.value = false;
       window.onclick = null;
     };
   };
-  const initPopper = (placement = "bottom-start") => {
+  const initPopper = (placement = "bottom-start", of) => {
     if (!pannel.value || !triggerEl.value)
       return;
-    const offset = [0, 10];
+    const offset = of != null ? of : [0, 10];
     if (window.__POWERED_BY_WUJIE__) {
       offset[1] = -54;
     }

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/index.css

@@ -4529,11 +4529,13 @@
 }
 .resource-list-footer,
 .resource-list-header,
+.resource-list-content .resource-list-content-empty,
 .resource-list-content .arco-scrollbar-container {
   padding: 0 40px;
 }
 .resource-list-footer {
   display: flex;
+  flex-wrap: wrap;
   justify-content: space-between;
   padding-bottom: 20px;
 }
@@ -4543,6 +4545,10 @@
   gap: 10px;
   align-items: center;
   justify-content: flex-end;
+  margin-top: 10px;
+}
+.resource-list-footer .footer-right .list-selected-wrapper {
+  font-size: 12px;
 }
 .resource-list-content-loading {
   display: flex;
@@ -4554,7 +4560,7 @@
 .resource-list .list-item-grid {
   display: grid;
   grid-gap: 20px;
-  grid-template-columns: repeat(5, 1fr);
+  grid-template-columns: repeat(auto-fill, minmax(150px, 1fr));
 }
 .resource-list .list-content {
   margin-top: 30px;
@@ -4597,7 +4603,8 @@
 }
 .resource-list .list-filter-wrapper .list-filter-tags {
   display: flex;
-  justify-content: space-between;
+  flex-wrap: wrap;
+  gap: 10px;
   margin-top: 10px;
 }
 .resource-list .list-filter-wrapper .list-filter-tags .list-filter-tag {
@@ -4618,16 +4625,41 @@
   justify-content: space-between;
 }
 .resource-list .list-filter-wrapper .list-filter .filter-list {
+  position: relative;
+  /** 给 popup 一个参考 */
   display: flex;
-  flex-wrap: wrap;
-  gap: 10px;
 }
 .resource-list .list-filter-wrapper .list-filter .filter-list .filter-item {
   width: 100px;
+  margin-right: 10px;
+}
+.resource-list .list-filter-wrapper .list-filter .filter-list .arco-trigger-popup {
+  z-index: 100000 !important;
 }
 .resource-list .list-filter-wrapper .list-filter .arco-input-prepend {
   padding: 0;
 }
+.resource-list .list-filter-wrapper .list-filter .more-btn {
+  position: relative;
+  /** 给 poperjs 一个参考 */
+}
+.resource-list .list-filter-wrapper .list-filter .more-btn .filter-pannel {
+  inset: 40px auto auto auto !important;
+}
+.resource-list .list-filter-wrapper .filter-extra {
+  display: flex;
+  gap: 10px;
+}
+.resource-list .list-filter-wrapper .filter-pannel {
+  z-index: 100000;
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+  padding: 10px;
+  background-color: #fff;
+  border-radius: 4px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
+}
 .resource-list .title {
   display: flex;
   gap: 8px;
@@ -4641,6 +4673,10 @@
   height: 16px;
   background-color: #4886ff;
 }
+.resource-select-wrap {
+  width: 100%;
+  height: 100%;
+}
 .resource-select-modal-body {
   height: 80vh;
   padding: 0;
@@ -4669,6 +4705,11 @@
 .resource-select-container .resource-select-header .arco-tabs-content {
   display: none !important;
 }
+.resource-select-container .resource-list-content .resource-list-content-empty {
+  box-sizing: border-box;
+  width: 100%;
+  height: 100%;
+}
 .iframe-container {
   position: relative;
   height: 95vh;
@@ -4925,6 +4966,10 @@
 .doc-history-drawer .arco-drawer-footer {
   text-align: left;
 }
+.doc-history-modal-wrap {
+  height: 70vh;
+  padding: 0;
+}
 .video-thumb {
   display: flex;
   flex-direction: column;

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(() => [