@cmstops/pro-compo 3.9.1-rc.0 → 3.9.1-rc.10

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

@@ -1,41 +1,55 @@
-@import './listSelected.less';
-@import './listCardWrapper.less';
-@import './list.less';
-
-.resource-select-modal-body {
-  height: 80vh;
-  padding: 0;
-}
-
-.resource-select-main {
-  height: 100%;
-}
-
-.resource-select-drawer {
-  .arco-drawer-body {
-    box-sizing: border-box;
-    padding: 0;
-    overflow: hidden;
-  }
-}
-
-.resource-select-container {
-  display: flex;
-  flex-direction: column;
-  gap: 10px;
-  box-sizing: border-box;
-  height: 100%;
-
-  // 头部 tab 样式
-  .resource-select-header {
-    padding: 10px 24px 0 24px;
-
-    .arco-tabs-nav::before {
-      display: none;
-    }
-
-    .arco-tabs-content {
-      display: none !important;
-    }
-  }
-}
+@import './listSelected.less';
+@import './listCardWrapper.less';
+@import './list.less';
+
+.resource-select-wrap {
+  width: 100%;
+  height: 100%;
+}
+
+.resource-select-modal-body {
+  height: 80vh;
+  padding: 0;
+}
+
+.resource-select-main {
+  height: 100%;
+}
+
+.resource-select-drawer {
+  .arco-drawer-body {
+    box-sizing: border-box;
+    padding: 0;
+    overflow: hidden;
+  }
+}
+
+.resource-select-container {
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+  box-sizing: border-box;
+  height: 100%;
+
+  // 头部 tab 样式
+  .resource-select-header {
+    padding: 10px 24px 0 24px;
+
+    .arco-tabs-nav::before {
+      display: none;
+    }
+
+    .arco-tabs-content {
+      display: none !important;
+    }
+  }
+
+  // 内容区域样式
+  .resource-list-content {
+    .resource-list-content-empty {
+      box-sizing: border-box;
+      width: 100%;
+      height: 100%;
+    }
+  }
+}

package/lib/selectResourceModal/style/list.less

@@ -1,167 +1,203 @@
-// 基础列表 layout 样式
-.resource-list {
-  display: flex;
-  flex: 1;
-  flex-direction: column;
-  gap: 10px;
-  overflow: hidden;
-
-  // 整体布局结构
-  &-content {
-    flex: 1;
-    overflow: hidden;
-  }
-
-  &-footer,
-  &-header,
-  &-content .arco-scrollbar-container {
-    padding: 0 40px;
-  }
-
-  &-footer {
-    display: flex;
-    justify-content: space-between;
-    padding-bottom: 20px;
-
-    .footer-right {
-      display: flex;
-      flex: 1;
-      gap: 10px;
-      align-items: center;
-      justify-content: flex-end;
-    }
-  }
-
-  // 处理空数据 & 加载中样式
-  &-content {
-    &-loading {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      width: 100%;
-      height: 100%;
-    }
-  }
-
-  // 所有的卡片 grid 布局
-  .list-item-grid {
-    display: grid;
-    grid-gap: 20px;
-    grid-template-columns: repeat(5, 1fr);
-  }
-}
-
-// 衍生列表一：本地上传页面样式
-.resource-list {
-  .list-content {
-    margin-top: 30px;
-
-    .list-tips {
-      margin-bottom: 16px;
-      color: #3d3d3d;
-    }
-  }
-
-  .upload-wrapper {
-    display: flex;
-    flex-direction: column;
-
-    .upload-buttons {
-      display: flex;
-      gap: 20px;
-      justify-content: center;
-      margin: 20px 0;
-    }
-
-    .upload-dragger {
-      width: calc(100% - 2px);
-    }
-  }
-}
-
-// 衍生列表二：内置素材
-.resource-list {
-  .scen-module {
-    margin-bottom: 20px;
-  }
-
-  .item-load-more {
-    display: flex;
-    flex-direction: column;
-    gap: 10px;
-    align-items: center;
-    justify-content: center;
-    width: 100%;
-    overflow: hidden;
-    color: #9a9a9a;
-    font-size: 12px;
-    cursor: pointer;
-    aspect-ratio: 4 / 3;
-
-    img {
-      height: calc(100% - 40px);
-    }
-  }
-}
-
-// 列表筛选样式
-.resource-list .list-filter-wrapper {
-  .list-filter-tags {
-    display: flex;
-    justify-content: space-between;
-    margin-top: 10px;
-
-    .list-filter-tag {
-      padding: 5px 16px;
-      border-radius: 15px;
-      cursor: pointer;
-
-      &:hover {
-        background-color: var(--color-fill-3);
-      }
-
-      &.active {
-        color: rgb(var(--primary-6));
-        font-weight: bold;
-        background: var(--color-fill-2);
-      }
-    }
-  }
-
-  .list-filter {
-    display: flex;
-    justify-content: space-between;
-
-    .filter-list {
-      display: flex;
-      flex-wrap: wrap;
-      gap: 10px;
-
-      .filter-item {
-        width: 100px;
-      }
-    }
-
-    .arco-input-prepend {
-      padding: 0;
-    }
-  }
-}
-
-// 二级列表的标题样式
-.resource-list {
-  .title {
-    display: flex;
-    gap: 8px;
-    align-items: center;
-    margin-bottom: 20px;
-    font-weight: bold;
-    font-size: 16px;
-
-    .line {
-      width: 3px;
-      height: 16px;
-      background-color: #4886ff;
-    }
-  }
-}
+// 基础列表 layout 样式
+.resource-list {
+  display: flex;
+  flex: 1;
+  flex-direction: column;
+  gap: 10px;
+  overflow: hidden;
+
+  // 整体布局结构
+  &-content {
+    flex: 1;
+    overflow: hidden;
+  }
+
+  &-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;
+
+    .footer-right {
+      display: flex;
+      flex: 1;
+      gap: 10px;
+      align-items: center;
+      justify-content: flex-end;
+      margin-top: 10px;
+
+      .list-selected-wrapper {
+        font-size: 12px;
+      }
+    }
+  }
+
+  // 处理空数据 & 加载中样式
+  &-content {
+    &-loading {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: 100%;
+      height: 100%;
+    }
+  }
+
+  // 所有的卡片 grid 布局
+  .list-item-grid {
+    display: grid;
+    grid-gap: 20px;
+    grid-template-columns: repeat(auto-fill, minmax(150px, 1fr));
+  }
+}
+
+// 衍生列表一：本地上传页面样式
+.resource-list {
+  .list-content {
+    margin-top: 30px;
+
+    .list-tips {
+      margin-bottom: 16px;
+      color: #3d3d3d;
+    }
+  }
+
+  .upload-wrapper {
+    display: flex;
+    flex-direction: column;
+
+    .upload-buttons {
+      display: flex;
+      gap: 20px;
+      justify-content: center;
+      margin: 20px 0;
+    }
+
+    .upload-dragger {
+      width: calc(100% - 2px);
+    }
+  }
+}
+
+// 衍生列表二：内置素材
+.resource-list {
+  .scen-module {
+    margin-bottom: 20px;
+  }
+
+  .item-load-more {
+    display: flex;
+    flex-direction: column;
+    gap: 10px;
+    align-items: center;
+    justify-content: center;
+    width: 100%;
+    overflow: hidden;
+    color: #9a9a9a;
+    font-size: 12px;
+    cursor: pointer;
+    aspect-ratio: 4 / 3;
+
+    img {
+      height: calc(100% - 40px);
+    }
+  }
+}
+
+// 列表筛选样式
+.resource-list .list-filter-wrapper {
+  .list-filter-tags {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 10px;
+    margin-top: 10px;
+
+    .list-filter-tag {
+      padding: 5px 16px;
+      border-radius: 15px;
+      cursor: pointer;
+
+      &:hover {
+        background-color: var(--color-fill-3);
+      }
+
+      &.active {
+        color: rgb(var(--primary-6));
+        font-weight: bold;
+        background: var(--color-fill-2);
+      }
+    }
+  }
+
+  .list-filter {
+    display: flex;
+    justify-content: space-between;
+
+    .filter-list {
+      position: relative; /** 给 popup 一个参考 */
+      display: flex;
+
+      .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);
+  }
+}
+
+// 二级列表的标题样式
+.resource-list {
+  .title {
+    display: flex;
+    gap: 8px;
+    align-items: center;
+    margin-bottom: 20px;
+    font-weight: bold;
+    font-size: 16px;
+
+    .line {
+      width: 3px;
+      height: 16px;
+      background-color: #4886ff;
+    }
+  }
+}

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

@@ -141,7 +141,8 @@ const _sfc_main = vue.defineComponent({
                     default: vue.withCtx(() => _cache[2] || (_cache[2] = [
                       vue.createTextVNode("\u9000\u51FA")
                     ])),
-                    _: 1
+                    _: 1,
+                    __: [2]
                   })
                 ])
               ])

package/lib/userDirector/component.js

@@ -229,7 +229,8 @@ const _sfc_main = vue.defineComponent({
                   default: vue.withCtx(() => _cache[0] || (_cache[0] = [
                     vue.createTextVNode("\u5168\u90E8\u6E05\u9664")
                   ])),
-                  _: 1
+                  _: 1,
+                  __: [0]
                 })
               ]),
               vue.createVNode(vue.unref(webVue.Scrollbar), {