@cmstops/pro-compo 3.9.2-alpha.0 → 3.9.2-alpha.10

package/es/selectResourceModal/style/index.css

@@ -172,11 +172,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;
 }
@@ -186,6 +188,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;
@@ -240,7 +246,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 {
@@ -261,16 +268,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;
@@ -316,3 +348,8 @@
 .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%;
+}

package/es/selectResourceModal/style/index.less

@@ -43,4 +43,13 @@
       display: none !important;
     }
   }
+
+  // 内容区域样式
+  .resource-list-content {
+    .resource-list-content-empty {
+      box-sizing: border-box;
+      width: 100%;
+      height: 100%;
+    }
+  }
 }

package/es/selectResourceModal/style/list.less

@@ -14,12 +14,14 @@
 
   &-footer,
   &-header,
+  &-content .resource-list-content-empty,
   &-content .arco-scrollbar-container {
     padding: 0 40px;
   }
 
   &-footer {
     display: flex;
+    flex-wrap: wrap;
     justify-content: space-between;
     padding-bottom: 20px;
 
@@ -29,6 +31,11 @@
       gap: 10px;
       align-items: center;
       justify-content: flex-end;
+      margin-top: 10px;
+
+      .list-selected-wrapper {
+        font-size: 12px;
+      }
     }
   }
 
@@ -108,7 +115,8 @@
 .resource-list .list-filter-wrapper {
   .list-filter-tags {
     display: flex;
-    justify-content: space-between;
+    flex-wrap: wrap;
+    gap: 10px;
     margin-top: 10px;
 
     .list-filter-tag {
@@ -133,18 +141,46 @@
     justify-content: space-between;
 
     .filter-list {
+      position: relative; /** 给 popup 一个参考 */
       display: flex;
-      flex-wrap: wrap;
-      gap: 10px;
 
       .filter-item {
         width: 100px;
+        margin-right: 10px;
+      }
+
+      .arco-trigger-popup {
+        z-index: 100000 !important;
       }
     }
 
     .arco-input-prepend {
       padding: 0;
     }
+
+    .more-btn {
+      position: relative; /** 给 poperjs 一个参考 */
+
+      .filter-pannel {
+        inset: 40px auto auto auto !important;
+      }
+    }
+  }
+
+  .filter-extra {
+    display: flex;
+    gap: 10px;
+  }
+
+  .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);
   }
 }
 

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/baseFilter/component.js

@@ -38,9 +38,11 @@ const _sfc_main = vue.defineComponent({
       });
       return _columns;
     });
-    const getOptions = (item) => {
-      return item.options ? item.options : [];
-    };
+    const getOptions = vue.computed(() => {
+      return (item) => {
+        return item.options ? item.options : [];
+      };
+    });
     const hasValue = vue.computed(() => {
       return (key) => {
         var _a, _b;
@@ -77,7 +79,10 @@ const _sfc_main = vue.defineComponent({
           _form[column.range] = rangeTemp[column.range];
         } else if (column.component === "select") {
           _form[column.key] = column.defaultValue || null;
-        } else {
+        } else if (column.component === "input-group") {
+          _form[column.selectKey] = column.selectDefaultValue || "";
+          _form[column.inputKey] = column.inputDefaultValue || "";
+        } else if (column.component) {
           _form[column.key] = column.defaultValue || "";
         }
       });
@@ -179,17 +184,48 @@ const _sfc_main = vue.defineComponent({
                 active: hasValue.value(item.key)
               }, {
                 default: vue.withCtx(() => [
-                  item.component === "input" ? (vue.openBlock(), vue.createBlock(vue.unref(webVue.InputSearch), {
-                    key: 0,
+                  item.slot ? vue.renderSlot(_ctx.$slots, item.slot, { key: 0 }) : item.component === "input-group" ? (vue.openBlock(), vue.createBlock(vue.unref(webVue.InputGroup), { key: 1 }, {
+                    default: vue.withCtx(() => [
+                      vue.createVNode(vue.unref(webVue.Select), {
+                        modelValue: form.value[item.selectKey],
+                        "onUpdate:modelValue": ($event) => form.value[item.selectKey] = $event,
+                        "default-active-first-option": "",
+                        style: { "width": "100px" }
+                      }, {
+                        default: vue.withCtx(() => [
+                          (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(item.selectOptions, (option, idx) => {
+                            return vue.openBlock(), vue.createBlock(vue.unref(webVue.Option), {
+                              key: idx,
+                              value: option.value
+                            }, {
+                              default: vue.withCtx(() => [
+                                vue.createTextVNode(vue.toDisplayString(option.label), 1)
+                              ]),
+                              _: 2
+                            }, 1032, ["value"]);
+                          }), 128))
+                        ]),
+                        _: 2
+                      }, 1032, ["modelValue", "onUpdate:modelValue"]),
+                      vue.createVNode(vue.unref(webVue.Input), {
+                        modelValue: form.value[item.inputKey],
+                        "onUpdate:modelValue": ($event) => form.value[item.inputKey] = $event,
+                        placeholder: item.placeholder ? item.placeholder : `\u8BF7\u8F93\u5165${item.inputLabel}`,
+                        style: { "width": "180px" }
+                      }, null, 8, ["modelValue", "onUpdate:modelValue", "placeholder"])
+                    ]),
+                    _: 2
+                  }, 1024)) : item.component === "input" ? (vue.openBlock(), vue.createBlock(vue.unref(webVue.InputSearch), {
+                    key: 2,
                     modelValue: form.value[item.key],
                     "onUpdate:modelValue": ($event) => form.value[item.key] = $event,
                     style: vue.normalizeStyle({ width: styleWidth(columnsMap.value[item.key]) }),
                     "allow-clear": "",
                     size: "medium",
-                    placeholder: `\u8BF7\u8F93\u5165${item.label}`
+                    placeholder: item.placeholder ? item.placeholder : `\u8BF7\u8F93\u5165${item.label}`
                   }, null, 8, ["modelValue", "onUpdate:modelValue", "style", "placeholder"])) : vue.createCommentVNode("v-if", true),
                   item.component === "select" ? (vue.openBlock(), vue.createBlock(vue.unref(webVue.Select), {
-                    key: 1,
+                    key: 3,
                     modelValue: form.value[item.key],
                     "onUpdate:modelValue": ($event) => form.value[item.key] = $event,
                     "popup-container": "#base-filter-popup-container",
@@ -197,13 +233,13 @@ const _sfc_main = vue.defineComponent({
                     "allow-search": item.allowSearch,
                     "default-active-first-option": false,
                     style: vue.normalizeStyle({ width: styleWidth(columnsMap.value[item.key]) }),
-                    placeholder: `\u8BF7\u9009\u62E9${item.label}`,
+                    placeholder: item.placeholder ? item.placeholder : `\u8BF7\u9009\u62E9${item.label}`,
                     onSearch: ($event) => handleSelectSearch($event, item),
                     onPopupVisibleChange: ($event) => handleSelectPopupChange($event, item),
                     onChange: ($event) => handleSelectChange($event, item)
                   }, {
                     default: vue.withCtx(() => [
-                      (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(getOptions(item), (opt) => {
+                      (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(getOptions.value(item), (opt) => {
                         return vue.openBlock(), vue.createBlock(vue.unref(webVue.Option), {
                           key: opt.value,
                           label: opt.label,
@@ -214,7 +250,7 @@ const _sfc_main = vue.defineComponent({
                     _: 2
                   }, 1032, ["modelValue", "onUpdate:modelValue", "allow-search", "style", "placeholder", "onSearch", "onPopupVisibleChange", "onChange"])) : vue.createCommentVNode("v-if", true),
                   item.component === "range-picker" ? (vue.openBlock(), vue.createBlock(vue.unref(webVue.RangePicker), {
-                    key: 2,
+                    key: 4,
                     modelValue: form.value[item.key].range,
                     "onUpdate:modelValue": ($event) => form.value[item.key].range = $event,
                     style: vue.normalizeStyle({ width: styleWidth(form.value[item.key]) }),
@@ -225,7 +261,28 @@ const _sfc_main = vue.defineComponent({
                     "popup-container": "#base-filter-popup-container",
                     onClick: _cache[1] || (_cache[1] = vue.withModifiers(() => {
                     }, ["stop"]))
-                  }, null, 8, ["modelValue", "onUpdate:modelValue", "style"])) : vue.createCommentVNode("v-if", true)
+                  }, null, 8, ["modelValue", "onUpdate:modelValue", "style"])) : vue.createCommentVNode("v-if", true),
+                  item.component === "radio" ? (vue.openBlock(), vue.createBlock(vue.unref(webVue.RadioGroup), {
+                    key: 5,
+                    modelValue: form.value[item.key],
+                    "onUpdate:modelValue": ($event) => form.value[item.key] = $event,
+                    type: "button"
+                  }, {
+                    default: vue.withCtx(() => [
+                      (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(item.options || [], (option, idx) => {
+                        return vue.openBlock(), vue.createBlock(vue.unref(webVue.Radio), {
+                          key: idx,
+                          value: option.value
+                        }, {
+                          default: vue.withCtx(() => [
+                            vue.createTextVNode(vue.toDisplayString(option.label), 1)
+                          ]),
+                          _: 2
+                        }, 1032, ["value"]);
+                      }), 128))
+                    ]),
+                    _: 2
+                  }, 1032, ["modelValue", "onUpdate:modelValue"])) : vue.createCommentVNode("v-if", true)
                 ]),
                 _: 2
               }, 1032, ["active"]);

package/lib/contentDetailList/component.js

@@ -109,6 +109,12 @@ const _sfc_main = vue.defineComponent({
                     onCellMouseEnter: tableCellMouseEnter,
                     onCellMouseLeave: tableCellMouseLeave
                   }, {
+                    "after-index": vue.withCtx(() => [
+                      vue.renderSlot(_ctx.$slots, "after-index", {
+                        row: element,
+                        index: index$4
+                      })
+                    ]),
                     batch: vue.withCtx(() => [
                       vue.renderSlot(_ctx.$slots, "batch", {
                         row: element,
@@ -133,6 +139,12 @@ const _sfc_main = vue.defineComponent({
                     onCellMouseEnter: tableCellMouseEnter,
                     onCellMouseLeave: tableCellMouseLeave
                   }, {
+                    "after-index": vue.withCtx(() => [
+                      vue.renderSlot(_ctx.$slots, "after-index", {
+                        row: element,
+                        index: index$4
+                      })
+                    ]),
                     tip: vue.withCtx(() => [
                       vue.renderSlot(_ctx.$slots, "tip", {
                         row: element,
@@ -229,6 +241,12 @@ const _sfc_main = vue.defineComponent({
                   onCellMouseEnter: tableCellMouseEnter,
                   onCellMouseLeave: tableCellMouseLeave
                 }, {
+                  "after-index": vue.withCtx(() => [
+                    vue.renderSlot(_ctx.$slots, "after-index", {
+                      row: item,
+                      index: index$4
+                    })
+                  ]),
                   batch: vue.withCtx(() => [
                     vue.renderSlot(_ctx.$slots, "batch", {
                       row: item,
@@ -253,6 +271,12 @@ const _sfc_main = vue.defineComponent({
                   onCellMouseEnter: tableCellMouseEnter,
                   onCellMouseLeave: tableCellMouseLeave
                 }, {
+                  "after-index": vue.withCtx(() => [
+                    vue.renderSlot(_ctx.$slots, "after-index", {
+                      row: item,
+                      index: index$4
+                    })
+                  ]),
                   tip: vue.withCtx(() => [
                     vue.renderSlot(_ctx.$slots, "tip", {
                       row: item,

package/lib/contentDetailList/components/Content/index.js

@@ -143,7 +143,8 @@ const _sfc_main = vue.defineComponent({
             })
           ]),
           index: vue.withCtx(() => [
-            vue.createElementVNode("span", _hoisted_1, vue.toDisplayString(_ctx.index + 1), 1)
+            vue.createElementVNode("span", _hoisted_1, vue.toDisplayString(_ctx.index + 1), 1),
+            vue.renderSlot(_ctx.$slots, "after-index")
           ]),
           tip: vue.withCtx(() => [
             vue.createCommentVNode(" \u5148\u6DFB\u52A0\u6587\u4EF6\u8D44\u6E90\uFF0C\u672A\u53D1\u5E03 "),

package/lib/contentDetailList/components/Doc/index.js

@@ -38,6 +38,12 @@ const _sfc_main = vue.defineComponent({
             index: _ctx.index
           })
         ]),
+        "after-index": vue.withCtx(() => [
+          vue.renderSlot(_ctx.$slots, "after-index", {
+            row: _ctx.element,
+            index: _ctx.index
+          })
+        ]),
         batch: vue.withCtx(() => [
           vue.renderSlot(_ctx.$slots, "batch", {
             row: _ctx.item,

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;
@@ -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;
@@ -4673,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;

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