@cmstops/pro-compo 0.3.100 → 3.9.0-beta.1

package/lib/selectResourceModal/style/index.css

@@ -177,6 +177,7 @@
 }
 .resource-list-footer {
   display: flex;
+  flex-wrap: wrap;
   justify-content: space-between;
   padding-bottom: 20px;
 }
@@ -186,6 +187,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 +202,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 +245,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 +267,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 +315,10 @@
   height: 16px;
   background-color: #4886ff;
 }
+.resource-select-wrap {
+  width: 100%;
+  height: 100%;
+}
 .resource-select-modal-body {
   height: 80vh;
   padding: 0;

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;

package/lib/selectResourceModal/style/list.less

@@ -20,6 +20,7 @@
 
   &-footer {
     display: flex;
+    flex-wrap: wrap;
     justify-content: space-between;
     padding-bottom: 20px;
 
@@ -29,6 +30,11 @@
       gap: 10px;
       align-items: center;
       justify-content: flex-end;
+      margin-top: 10px;
+
+      .list-selected-wrapper {
+        font-size: 12px;
+      }
     }
   }
 
@@ -47,7 +53,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 +114,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 +140,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

@@ -235,7 +235,6 @@ const _sfc_main = vue.defineComponent({
       thumbOptionIndex.value = index2;
     };
     const openDialogMediaSelection = (type, index2) => {
-      console.log(type, index2, "dkdk");
       thumbBannerModel.value = type || "thumb";
       thumbOptionIndex.value = index2 || 0;
       dialogMediaSelectionShow.value = true;
@@ -272,6 +271,16 @@ const _sfc_main = vue.defineComponent({
           temp = [{ url: data[0].url, thumb: data[0].url }];
         }
         styleData.value.data = temp;
+        styleData.value.cover_url = data[0].url;
+        const getColors = index.getThemeColor(BASE_API, data[0].url);
+        getColors.then((themes) => {
+          styleData.value.cover_colorList = JSON.parse(JSON.stringify(themes));
+          styleData.value.cover_theme_color = `rgb(${themes[1]})`;
+          callback(styleData.value);
+        }).catch((e) => {
+          styleData.value.banner_theme_color = `rgb(255, 255, 255)`;
+          callback(styleData.value);
+        });
       } else if (thumbBannerModel.value === "banner") {
         styleData.value.banner_url = data[0].url;
         const getColors = index.getThemeColor(BASE_API, data[0].url);
@@ -339,10 +348,13 @@ const _sfc_main = vue.defineComponent({
       });
     };
     const modelChange = () => {
+      styleData.value.cover_theme_color = "";
       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;
       } else {
         styleData.value.data = [];
       }
@@ -355,6 +367,15 @@ const _sfc_main = vue.defineComponent({
       },
       set(value) {
         styleData.value.banner_url = value.url;
+        styleData.value.cover_colorList = styleData.value.banner_colorList;
+      }
+    });
+    const cover = vue.computed({
+      get() {
+        const { cover_theme_color } = styleData.value;
+        return cover_theme_color;
+      },
+      set() {
       }
     });
     const hasBanner = vue.computed({
@@ -367,6 +388,15 @@ const _sfc_main = vue.defineComponent({
         callback(styleData.value);
       }
     });
+    const hasCover = vue.computed({
+      get() {
+        return !!cover.value;
+      },
+      set(value) {
+        styleData.value.cover = value;
+        callback(styleData.value);
+      }
+    });
     const pcBanner = vue.computed({
       get() {
         const { pc_banner_url_info, pc_banner_url } = styleData.value;
@@ -379,6 +409,23 @@ const _sfc_main = vue.defineComponent({
     const colorChange = (styleData2) => {
       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);
+      }
+    });
     return (_ctx, _cache) => {
       var _a, _b, _c, _d, _e, _f;
       return vue.openBlock(), vue.createElementBlock("div", {
@@ -471,7 +518,14 @@ const _sfc_main = vue.defineComponent({
                 ]),
                 _: 1
               }, 8, ["modelValue"])
-            ], 64)) : vue.createCommentVNode("v-if", true)
+            ], 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)
           ])
         ], 2),
         _ctx.mode === "doc" ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 0 }, [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmstops/pro-compo",
-  "version": "0.3.100",
+  "version": "3.9.0-beta.1",
   "description": "",
   "keywords": [
     "vue",