@cmstops/pro-compo 3.9.1-rc.1 → 3.9.1-rc.11

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

@@ -4,7 +4,6 @@ var webVue = require("@arco-design/web-vue");
 var ListWraper = require("../ListWraper.js");
 var useAttachement = require("../../../../hooks/useAttachement.js");
 var Filter = require("./Filter.js");
-const _hoisted_1 = { class: "list-item-grid" };
 const _sfc_main = vue.defineComponent({
   __name: "index",
   props: {
@@ -28,6 +27,18 @@ const _sfc_main = vue.defineComponent({
       changeKey
     } = useAttachement["default"]({ key: props.activeKey, BASE_API });
     vue.watch(() => props.activeKey, changeKey);
+    const listWrapper = vue.ref(null);
+    const smallScreen = vue.ref(false);
+    vue.watch(
+      () => {
+        var _a;
+        return (_a = listWrapper.value) == null ? void 0 : _a.offsetWidth;
+      },
+      (val) => {
+        smallScreen.value = !!(val && val < 600);
+      },
+      { immediate: true }
+    );
     vue.onMounted(() => {
       loadData();
     });
@@ -41,9 +52,10 @@ const _sfc_main = vue.defineComponent({
         ]),
         header: vue.withCtx(() => [
           vue.createVNode(Filter, {
+            smallScreen: smallScreen.value,
             onChange: vue.unref(changeFilter),
             onUpload: _cache[0] || (_cache[0] = ($event) => emits("change-tab", "local"))
-          }, null, 8, ["onChange"])
+          }, null, 8, ["smallScreen", "onChange"])
         ]),
         footer: vue.withCtx(() => [
           vue.createVNode(vue.unref(webVue.Pagination), {
@@ -52,22 +64,26 @@ const _sfc_main = vue.defineComponent({
             total: vue.unref(total),
             "page-size": vue.unref(limit),
             "show-total": "",
-            "show-page-size": "",
+            "show-page-size": !smallScreen.value,
             "base-size": 3,
             "buffer-size": 1,
             onChange: _cache[2] || (_cache[2] = (e) => vue.unref(changePage)((e - 1) * vue.unref(limit))),
             onPageSizeChange: vue.unref(changeSize)
-          }, null, 8, ["current", "total", "page-size", "onPageSizeChange"])
+          }, null, 8, ["current", "total", "page-size", "show-page-size", "onPageSizeChange"])
         ]),
         default: vue.withCtx(() => [
-          vue.createElementVNode("div", _hoisted_1, [
+          vue.createElementVNode("div", {
+            ref_key: "listWrapper",
+            ref: listWrapper,
+            class: "list-item-grid"
+          }, [
             (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(vue.unref(list), (item) => {
               return vue.renderSlot(_ctx.$slots, "item", {
                 key: item.id,
                 item
               });
             }), 128))
-          ])
+          ], 512)
         ]),
         _: 3
       }, 8, ["loading", "is-empty"]);

package/lib/selectResourceModal/hooks/useResponsiveFilter.js

@@ -0,0 +1,144 @@
+"use strict";
+Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
+var vue = require("vue");
+var usePopper = require("../../hooks/usePopper.js");
+const getRect = (el) => {
+  if (!el || typeof el.getClientRects !== "function")
+    return { right: 0, width: 0 };
+  const rects = el.getClientRects();
+  if (rects.length === 0)
+    return { right: 0, width: 0 };
+  const rect = rects[0];
+  return {
+    right: rect.right,
+    width: rect.width
+  };
+};
+function useResponsiveFilter(filterItemsRef) {
+  const moreBtnRef = vue.ref();
+  const popperPanelRef = vue.ref();
+  const { initPopper, show, visible, hide } = usePopper(
+    popperPanelRef,
+    moreBtnRef
+  );
+  const windowWidth = vue.ref(0);
+  const filterContainerRightBoundary = vue.ref(0);
+  const hiddenElementList = vue.ref([]);
+  const initWidths = () => {
+    var _a, _b;
+    windowWidth.value = ((_a = document.body) == null ? void 0 : _a.clientWidth) || 0;
+    const containerElement = (_b = filterItemsRef.value) == null ? void 0 : _b.parentElement;
+    if (containerElement) {
+      filterContainerRightBoundary.value = getRect(containerElement).right;
+    }
+  };
+  const initResizeListener = () => {
+    window.addEventListener("resize", refreshLayout);
+  };
+  const removeResizeListener = () => {
+    window.removeEventListener("resize", refreshLayout);
+  };
+  const hideElement = (el) => {
+    var _a, _b, _c;
+    const { width } = getRect(el);
+    if (width > 0 && ((_a = filterItemsRef.value) == null ? void 0 : _a.contains(el))) {
+      hiddenElementList.value.push({ width, el });
+      (_b = filterItemsRef.value) == null ? void 0 : _b.removeChild(el);
+      (_c = popperPanelRef.value) == null ? void 0 : _c.insertBefore(el, popperPanelRef.value.firstChild);
+    }
+  };
+  const showElement = () => {
+    var _a, _b;
+    if (!hiddenElementList.value.length || !filterItemsRef.value)
+      return;
+    const popEl = hiddenElementList.value.pop();
+    if (!popEl)
+      return;
+    const { el } = popEl;
+    (_a = popperPanelRef.value) == null ? void 0 : _a.removeChild(el);
+    (_b = filterItemsRef.value) == null ? void 0 : _b.appendChild(el);
+  };
+  const checkOverflow = () => {
+    if (!filterItemsRef.value)
+      return -1;
+    const containerRight = filterContainerRightBoundary.value;
+    const children = filterItemsRef.value.children;
+    let currentRightmostBoundary = getRect(filterItemsRef.value).right - getRect(filterItemsRef.value).width;
+    for (let i = children.length - 1; i >= 0; i--) {
+      const item = children[i];
+      if (!item || !item.classList || !item.classList.contains("filter-item"))
+        continue;
+      const itemRect = getRect(item);
+      if (itemRect.right > containerRight - 400) {
+        hideElement(item);
+      } else {
+        currentRightmostBoundary = Math.max(
+          currentRightmostBoundary,
+          itemRect.right
+        );
+      }
+    }
+    return currentRightmostBoundary;
+  };
+  const refreshLayout = async () => {
+    await vue.nextTick();
+    initWidths();
+    if (!filterItemsRef.value || !popperPanelRef.value)
+      return;
+    const containerRight = filterContainerRightBoundary.value;
+    let lastVisibleItemRight = checkOverflow();
+    if (lastVisibleItemRight === -1 && filterItemsRef.value.children.length > 0) {
+      lastVisibleItemRight = getRect(filterItemsRef.value).left;
+    } else if (filterItemsRef.value.children.length === 0) {
+      lastVisibleItemRight = getRect(filterItemsRef.value).left;
+    }
+    await vue.nextTick();
+    let availableSpace = containerRight - lastVisibleItemRight;
+    while (hiddenElementList.value.length > 0) {
+      const nextHiddenItem = hiddenElementList.value[hiddenElementList.value.length - 1];
+      const nextHiddenItemWidth = nextHiddenItem.width;
+      if (availableSpace > nextHiddenItemWidth + 10) {
+        showElement();
+        await vue.nextTick();
+        const visibleElements = Array.from(
+          filterItemsRef.value.children
+        );
+        if (visibleElements.length > 0) {
+          lastVisibleItemRight = visibleElements.reduce((maxRight, el) => {
+            var _a;
+            if ((_a = el.classList) == null ? void 0 : _a.contains("filter-item")) {
+              return Math.max(maxRight, getRect(el).right);
+            }
+            return maxRight;
+          }, getRect(filterItemsRef.value).left);
+        } else {
+          lastVisibleItemRight = getRect(filterItemsRef.value).left;
+        }
+        availableSpace = containerRight - lastVisibleItemRight;
+      } else {
+        break;
+      }
+    }
+  };
+  vue.onMounted(async () => {
+    initResizeListener();
+    initPopper("bottom-start", [0, 40]);
+    await vue.nextTick();
+    initWidths();
+    await vue.nextTick();
+    refreshLayout();
+  });
+  vue.onUnmounted(() => {
+    removeResizeListener();
+  });
+  return {
+    moreBtnRef,
+    popperPanelRef,
+    hiddenElementList,
+    visible,
+    show,
+    hide,
+    refreshLayout
+  };
+}
+exports.useResponsiveFilter = useResponsiveFilter;

package/lib/selectResourceModal/scripts/useCompoLf.js

@@ -8,7 +8,7 @@ function useCompoentLifycycle(props, emits, handler) {
       return {
         class: "resource-select-drawer",
         header: false,
-        width: "1024px",
+        width: "85vw",
         footer: false,
         unmountOnClose: true
       };

package/lib/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;
@@ -197,7 +203,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;
@@ -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;
@@ -284,6 +316,10 @@
   height: 16px;
   background-color: #4886ff;
 }
+.resource-select-wrap {
+  width: 100%;
+  height: 100%;
+}
 .resource-select-modal-body {
   height: 80vh;
   padding: 0;
@@ -312,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/lib/selectResourceModal/style/index.less

@@ -2,6 +2,11 @@
 @import './listCardWrapper.less';
 @import './list.less';
 
+.resource-select-wrap {
+  width: 100%;
+  height: 100%;
+}
+
 .resource-select-modal-body {
   height: 80vh;
   padding: 0;
@@ -38,4 +43,13 @@
       display: none !important;
     }
   }
+
+  // 内容区域样式
+  .resource-list-content {
+    .resource-list-content-empty {
+      box-sizing: border-box;
+      width: 100%;
+      height: 100%;
+    }
+  }
 }

package/lib/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;
+      }
     }
   }
 
@@ -47,7 +54,7 @@
   .list-item-grid {
     display: grid;
     grid-gap: 20px;
-    grid-template-columns: repeat(5, 1fr);
+    grid-template-columns: repeat(auto-fill, minmax(150px, 1fr));
   }
 }
 
@@ -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/lib/selectThumb/component.js

@@ -352,9 +352,11 @@ const _sfc_main = vue.defineComponent({
       if (!props.dataValue)
         return;
       if (styleData.value.model === oldData.value.model) {
-        styleData.value.data = oldData.value.data;
-        styleData.value.cover_theme_color = oldData.value.cover_theme_color;
-        styleData.value.cover_colorList = oldData.value.cover_colorList;
+        vue.nextTick(() => {
+          styleData.value.data = oldData.value.data;
+          styleData.value.cover_theme_color = oldData.value.cover_theme_color;
+          styleData.value.cover_colorList = oldData.value.cover_colorList;
+        });
       } else {
         styleData.value.data = [];
       }
@@ -410,21 +412,8 @@ const _sfc_main = vue.defineComponent({
       callback(styleData2);
     };
     vue.onMounted(() => {
-      if (!styleData.value.cover_url) {
-        setTimeout(() => {
-          styleData.value.cover_url = styleData.value.data[0].url;
-          const getColors = index.getThemeColor(BASE_API, styleData.value.data[0].url);
-          getColors.then((themes) => {
-            styleData.value.cover_colorList = JSON.parse(JSON.stringify(themes));
-            styleData.value.cover_theme_color = `rgb(${themes[1]})`;
-            oldData.value = JSON.parse(JSON.stringify(styleData.value));
-            callback(styleData.value);
-          }).catch((e) => {
-            styleData.value.banner_theme_color = `rgb(255, 255, 255)`;
-            callback(styleData.value);
-          });
-        }, 700);
-      }
+      if (!styleData.value.cover_url)
+        ;
     });
     return (_ctx, _cache) => {
       var _a, _b, _c, _d, _e, _f;
@@ -517,15 +506,15 @@ const _sfc_main = vue.defineComponent({
                   }), 128))
                 ]),
                 _: 1
-              }, 8, ["modelValue"])
-            ], 64)) : vue.createCommentVNode("v-if", true),
-            hasCover.value ? (vue.openBlock(), vue.createBlock(colorPalette, {
-              key: 3,
-              "style-data": styleData.value,
-              model: "cover",
-              style: { "margin-top": "10px" },
-              onChange: colorChange
-            }, null, 8, ["style-data"])) : vue.createCommentVNode("v-if", true)
+              }, 8, ["modelValue"]),
+              hasCover.value ? (vue.openBlock(), vue.createBlock(colorPalette, {
+                key: 0,
+                "style-data": styleData.value,
+                model: "cover",
+                style: { "margin-top": "10px" },
+                onChange: colorChange
+              }, null, 8, ["style-data"])) : vue.createCommentVNode("v-if", true)
+            ], 64)) : vue.createCommentVNode("v-if", true)
           ])
         ], 2),
         _ctx.mode === "doc" ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 0 }, [

package/lib/typeIcons/component.js

@@ -36,7 +36,7 @@ const _sfc_main = vue.defineComponent({
           vue.createVNode(vue.unref(vueCmstopIcons.IconYinpinji), { style: { "color": "#1fb7c2" } })
         ], 2112)) : props.doc && props.type === "video_album" ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 7 }, [
           vue.createCommentVNode(" \u89C6\u9891\u96C6 "),
-          vue.createVNode(vue.unref(vueCmstopIcons.IconShipinji))
+          vue.createVNode(vue.unref(vueCmstopIcons.IconShipinji), { style: { "color": "#f05050" } })
         ], 2112)) : props.doc && props.type === "mini_program" ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 8 }, [
           vue.createCommentVNode(" \u89C6\u9891\u96C6 "),
           vue.createVNode(vue.unref(vueCmstopIcons.IconMiniprogram))

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.1-rc.1",
+  "version": "3.9.1-rc.11",
   "description": "",
   "keywords": [
     "vue",