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

package/es/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;
+      }
     }
   }
 
@@ -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/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/index.css

@@ -4534,6 +4534,7 @@
 }
 .resource-list-footer {
   display: flex;
+  flex-wrap: wrap;
   justify-content: space-between;
   padding-bottom: 20px;
 }
@@ -4543,6 +4544,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 +4602,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 +4624,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;

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

@@ -7,25 +7,42 @@ var useAttachement = require("../../../../hooks/useAttachement.js");
 var typeMap = require("../../../../utils/typeMap.js");
 var selectionApis = require("../../../scripts/selectionApis.js");
 var resource = require("../../../../utils/resource.js");
+var useResponsiveFilter = require("../../../hooks/useResponsiveFilter.js");
 const _hoisted_1 = { class: "list-filter-wrapper" };
 const _hoisted_2 = { class: "list-filter" };
-const _hoisted_3 = { class: "filter-list" };
-const _hoisted_4 = { style: { "width": "200px" } };
+const _hoisted_3 = { class: "more-btn" };
+const _hoisted_4 = { class: "right-prefix" };
 const _hoisted_5 = {
   class: "filter-item",
-  style: { "width": "170px" }
+  style: { "width": "200px" }
+};
+const _hoisted_6 = {
+  class: "filter-item",
+  style: { "width": "180px" }
 };
-const _hoisted_6 = { class: "filter-item" };
 const _hoisted_7 = {
+  class: "filter-item",
+  style: { "width": "170px" }
+};
+const _hoisted_8 = {
+  class: "filter-item",
+  style: { "width": "240px" }
+};
+const _hoisted_9 = {
+  class: "filter-item",
+  style: { "width": "240px" }
+};
+const _hoisted_10 = {
   key: 0,
   class: "filter-item"
 };
-const _hoisted_8 = { class: "filter-extra" };
-const _hoisted_9 = {
+const _hoisted_11 = { class: "filter-extra" };
+const _hoisted_12 = { class: "filter-item" };
+const _hoisted_13 = {
   key: 0,
   class: "list-filter-tags"
 };
-const _hoisted_10 = ["onClick"];
+const _hoisted_14 = ["onClick"];
 const _sfc_main = vue.defineComponent({
   __name: "Filter",
   props: {
@@ -39,6 +56,16 @@ const _sfc_main = vue.defineComponent({
     const baseAPI = vue.inject("baseAPI");
     const filterOptions = vue.inject("filterOptions");
     const domainId = vue.computed(() => userInfo == null ? void 0 : userInfo.value.domain_id);
+    const filterItemsRef = vue.ref();
+    const {
+      moreBtnRef,
+      popperPanelRef,
+      hiddenElementList,
+      visible,
+      show,
+      hide,
+      refreshLayout
+    } = useResponsiveFilter.useResponsiveFilter(filterItemsRef);
     const { options, loading, load, loadMore, handleSearch } = useSelection({
       labelStr: "alias",
       valueStr: "id",
@@ -117,82 +144,123 @@ const _sfc_main = vue.defineComponent({
           filter.value.keyword = val;
           filter.value.precise_keyword = "";
         }
+        filter.value.sf = "";
       }
     });
-    vue.watch(
-      () => searchType.value,
-      () => {
-        searchInput.value = filter.value.keyword || filter.value.precise_keyword;
-      }
-    );
     const isEmpty = vue.computed(() => {
-      return Object.keys(filter.value).every((key) => {
+      return Object.keys(originFilter).every((key) => {
+        if (key === "catalog") {
+          const currentCatalog = filter.value[key] || [];
+          const originCatalog = originFilter[key] || [];
+          return currentCatalog.length === originCatalog.length && currentCatalog.every((v) => originCatalog.includes(v));
+        }
         return filter.value[key] === originFilter[key];
       });
     });
     vue.watch(
       () => filter.value,
-      () => {
-        const result = { ...filter.value };
+      (val) => {
+        const result = { ...val };
         Object.keys(result).forEach((key) => {
           if (props.disableUploadBy && key === "upload_by")
             delete result[key];
-          if (!result[key])
-            delete result[key];
+          if (result[key] === "" || result[key] === null || result[key] === void 0) {
+            if (key !== "catalog") {
+              delete result[key];
+            }
+          }
         });
-        if (!result.catalog)
-          result.catalog = "image,video,audio";
-        else
-          result.catalog = result.catalog.join(",");
-        emits("change", result);
-      },
-      { deep: true, immediate: true }
-    );
-    vue.watch(
-      () => filterOptions == null ? void 0 : filterOptions.value,
-      () => {
-        var _a;
-        if ((_a = filterOptions == null ? void 0 : filterOptions.value) == null ? void 0 : _a.mediaType) {
-          filter.value.catalog = filterOptions == null ? void 0 : filterOptions.value.mediaType.split(",");
-          if (filterOptions == null ? void 0 : filterOptions.value.mediaTypeStrict) {
-            originFilter.catalog = filterOptions == null ? void 0 : filterOptions.value.mediaType.split(",");
+        if (result.catalog && Array.isArray(result.catalog)) {
+          if (result.catalog.length > 0) {
+            result.catalog = result.catalog.join(",");
+          } else {
+            delete result.catalog;
           }
         }
+        emits("change", result);
+        refreshLayout();
       },
-      { immediate: true, deep: true }
+      { deep: true, immediate: true }
     );
     vue.onMounted(() => {
+      var _a;
       load();
+      if ((_a = filterOptions == null ? void 0 : filterOptions.value) == null ? void 0 : _a.mediaType) {
+        const initialCatalog = filterOptions.value.mediaType.split(",");
+        filter.value.catalog = initialCatalog;
+        if (filterOptions.value.mediaTypeStrict) {
+          originFilter.catalog = initialCatalog;
+        }
+      }
     });
     __expose({
-      resetFilter: handleReset
+      filter,
+      handleReset
     });
     return (_ctx, _cache) => {
       var _a;
       return vue.openBlock(), vue.createElementBlock("div", _hoisted_1, [
+        vue.createCommentVNode(" Use filterItemsRef's parentElement as the container for boundary checks "),
         vue.createElementVNode("div", _hoisted_2, [
-          vue.createElementVNode("div", _hoisted_3, [
+          vue.createCommentVNode(" Filter Items Container "),
+          vue.createElementVNode("div", {
+            id: "resource-filter-pannel",
+            ref_key: "filterItemsRef",
+            ref: filterItemsRef,
+            class: "filter-list"
+          }, [
+            vue.createCommentVNode(" More Filters Button and Popper Panel "),
+            vue.createElementVNode("div", _hoisted_3, [
+              vue.createElementVNode("div", {
+                ref_key: "moreBtnRef",
+                ref: moreBtnRef
+              }, [
+                vue.withDirectives(vue.createVNode(vue.unref(webVue.Button), {
+                  style: { marginRight: "10px" },
+                  onClick: _cache[0] || (_cache[0] = vue.withModifiers(() => vue.unref(visible) ? vue.unref(hide)() : vue.unref(show)(), ["stop"]))
+                }, {
+                  default: vue.withCtx(() => [
+                    vue.createElementVNode("span", _hoisted_4, [
+                      _cache[10] || (_cache[10] = vue.createTextVNode(" \u66F4\u591A\u7B5B\u9009 ")),
+                      vue.createVNode(vue.unref(icon.IconCaretDown))
+                    ])
+                  ]),
+                  _: 1
+                }, 512), [
+                  [vue.vShow, vue.unref(hiddenElementList).length]
+                ])
+              ], 512),
+              vue.withDirectives(vue.createElementVNode("div", {
+                ref_key: "popperPanelRef",
+                ref: popperPanelRef,
+                class: "filter-pannel",
+                onClick: _cache[1] || (_cache[1] = vue.withModifiers(() => {
+                }, ["stop"]))
+              }, null, 512), [
+                [vue.vShow, vue.unref(visible)]
+              ])
+            ]),
             vue.createCommentVNode(" \u5173\u952E\u8BCD "),
-            vue.createElementVNode("div", _hoisted_4, [
+            vue.createElementVNode("div", _hoisted_5, [
               vue.createVNode(vue.unref(webVue.Input), {
                 modelValue: searchInput.value,
-                "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => searchInput.value = $event),
+                "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => searchInput.value = $event),
                 "allow-clear": "",
                 placeholder: "\u8BF7\u8F93\u5165\u5173\u952E\u8BCD"
               }, {
                 prepend: vue.withCtx(() => [
                   vue.createVNode(vue.unref(webVue.Dropdown), {
-                    onSelect: _cache[0] || (_cache[0] = (e) => searchType.value = e)
+                    onSelect: _cache[2] || (_cache[2] = (e) => searchType.value = e)
                   }, {
                     content: vue.withCtx(() => [
                       vue.createVNode(vue.unref(webVue.Doption), { value: 0 }, {
-                        default: vue.withCtx(() => _cache[8] || (_cache[8] = [
+                        default: vue.withCtx(() => _cache[11] || (_cache[11] = [
                           vue.createTextVNode("\u7CBE\u51C6\u641C")
                         ])),
                         _: 1
                       }),
                       vue.createVNode(vue.unref(webVue.Doption), { value: 1 }, {
-                        default: vue.withCtx(() => _cache[9] || (_cache[9] = [
+                        default: vue.withCtx(() => _cache[12] || (_cache[12] = [
                           vue.createTextVNode("\u6A21\u7CCA\u641C")
                         ])),
                         _: 1
@@ -213,24 +281,27 @@ const _sfc_main = vue.defineComponent({
               }, 8, ["modelValue"])
             ]),
             vue.createCommentVNode(" \u76EE\u5F55 "),
-            vue.createVNode(vue.unref(webVue.TreeSelect), {
-              modelValue: filter.value.directory_id,
-              "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => filter.value.directory_id = $event),
-              data: vue.unref(tree),
-              placeholder: "\u8BF7\u9009\u62E9\u76EE\u5F55",
-              style: { "width": "120px" },
-              "field-names": {
-                title: "alias",
-                key: "id"
-              },
-              "allow-clear": ""
-            }, null, 8, ["modelValue", "data"]),
+            vue.createElementVNode("div", _hoisted_6, [
+              vue.createVNode(vue.unref(webVue.TreeSelect), {
+                modelValue: filter.value.directory_id,
+                "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => filter.value.directory_id = $event),
+                data: vue.unref(tree),
+                "popup-container": "#resource-filter-pannel",
+                placeholder: "\u8BF7\u9009\u62E9\u76EE\u5F55",
+                "field-names": {
+                  title: "alias",
+                  key: "id"
+                },
+                "allow-clear": ""
+              }, null, 8, ["modelValue", "data"])
+            ]),
             vue.createCommentVNode(" \u7D20\u6750\u7C7B\u578B "),
-            vue.createElementVNode("div", _hoisted_5, [
+            vue.createElementVNode("div", _hoisted_7, [
               vue.createVNode(vue.unref(webVue.Select), {
                 modelValue: filter.value.catalog,
-                "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => filter.value.catalog = $event),
+                "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => filter.value.catalog = $event),
                 disabled: (_a = vue.unref(filterOptions)) == null ? void 0 : _a.mediaTypeStrict,
+                "popup-container": "#resource-filter-pannel",
                 "allow-clear": "",
                 placeholder: "\u7C7B\u578B",
                 multiple: "",
@@ -249,19 +320,22 @@ const _sfc_main = vue.defineComponent({
               }, 8, ["modelValue", "disabled"])
             ]),
             vue.createCommentVNode(" \u65F6\u95F4\u8303\u56F4 "),
-            vue.createVNode(vue.unref(webVue.RangePicker), {
-              modelValue: rangeTime.value,
-              "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => rangeTime.value = $event),
-              "allow-clear": "",
-              style: { "width": "240px" }
-            }, null, 8, ["modelValue"]),
+            vue.createElementVNode("div", _hoisted_8, [
+              vue.createVNode(vue.unref(webVue.RangePicker), {
+                modelValue: rangeTime.value,
+                "onUpdate:modelValue": _cache[6] || (_cache[6] = ($event) => rangeTime.value = $event),
+                "allow-clear": "",
+                "popup-container": "#resource-filter-pannel"
+              }, null, 8, ["modelValue"])
+            ]),
             vue.createCommentVNode(" \u7D20\u6750\u4E0A\u4F20\u6765\u6E90 "),
-            vue.createElementVNode("div", _hoisted_6, [
+            vue.createElementVNode("div", _hoisted_9, [
               vue.createVNode(vue.unref(webVue.Select), {
                 modelValue: filter.value.source,
-                "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => filter.value.source = $event),
+                "onUpdate:modelValue": _cache[7] || (_cache[7] = ($event) => filter.value.source = $event),
                 "allow-clear": "",
-                placeholder: "\u6765\u6E90"
+                placeholder: "\u6765\u6E90",
+                "popup-container": "#resource-filter-pannel"
               }, {
                 default: vue.withCtx(() => [
                   (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(vue.unref(resourceSource), (item) => {
@@ -276,14 +350,15 @@ const _sfc_main = vue.defineComponent({
               }, 8, ["modelValue"])
             ]),
             vue.createCommentVNode(" \u7D20\u6750\u4E0A\u4F20\u4EBA "),
-            !_ctx.disableUploadBy ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_7, [
+            !_ctx.disableUploadBy ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_10, [
               vue.createVNode(vue.unref(webVue.Select), {
                 modelValue: filter.value.upload_by,
-                "onUpdate:modelValue": _cache[6] || (_cache[6] = ($event) => filter.value.upload_by = $event),
+                "onUpdate:modelValue": _cache[8] || (_cache[8] = ($event) => filter.value.upload_by = $event),
                 "allow-clear": "",
                 placeholder: "\u4E0A\u4F20\u4EBA",
                 loading: vue.unref(loading),
                 "allow-search": "",
+                "popup-container": "#resource-filter-pannel",
                 onSearch: vue.unref(handleSearch),
                 onDropdownReachBottom: vue.unref(loadMore)
               }, {
@@ -298,40 +373,44 @@ const _sfc_main = vue.defineComponent({
                 ]),
                 _: 1
               }, 8, ["modelValue", "loading", "onSearch", "onDropdownReachBottom"])
-            ])) : vue.createCommentVNode("v-if", true),
-            !isEmpty.value ? (vue.openBlock(), vue.createBlock(vue.unref(webVue.Button), {
-              key: 1,
-              type: "text",
-              onClick: handleReset
-            }, {
-              default: vue.withCtx(() => _cache[10] || (_cache[10] = [
-                vue.createTextVNode(" \u91CD\u7F6E ")
-              ])),
-              _: 1
-            })) : vue.createCommentVNode("v-if", true)
-          ]),
-          vue.createElementVNode("div", _hoisted_8, [
+            ])) : vue.createCommentVNode("v-if", true)
+          ], 512),
+          vue.createElementVNode("div", _hoisted_11, [
+            vue.createCommentVNode(" \u91CD\u7F6E\u6309\u94AE - Wrap in filter-item to be managed by the hook "),
+            vue.withDirectives(vue.createElementVNode("div", _hoisted_12, [
+              vue.createVNode(vue.unref(webVue.Button), {
+                type: "text",
+                onClick: handleReset
+              }, {
+                default: vue.withCtx(() => _cache[13] || (_cache[13] = [
+                  vue.createTextVNode(" \u91CD\u7F6E ")
+                ])),
+                _: 1
+              })
+            ], 512), [
+              [vue.vShow, !isEmpty.value]
+            ]),
             vue.createVNode(vue.unref(webVue.Button), {
               type: "primary",
-              onClick: _cache[7] || (_cache[7] = ($event) => emits("upload"))
+              onClick: _cache[9] || (_cache[9] = ($event) => emits("upload"))
             }, {
               icon: vue.withCtx(() => [
                 vue.createVNode(vue.unref(icon.IconUpload))
               ]),
               default: vue.withCtx(() => [
-                _cache[11] || (_cache[11] = vue.createTextVNode(" \u4E0A\u4F20 "))
+                _cache[14] || (_cache[14] = vue.createTextVNode(" \u4E0A\u4F20 "))
               ]),
               _: 1
             })
           ])
         ]),
-        searchInput.value ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_9, [
+        searchInput.value ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_13, [
           (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(vue.unref(resource.keywordsSelection), (item) => {
             return vue.openBlock(), vue.createElementBlock("div", {
               key: item.value,
               class: vue.normalizeClass(["list-filter-tag", { active: filter.value.sf === item.value }]),
               onClick: ($event) => filter.value.sf = item.value
-            }, vue.toDisplayString(item.name), 11, _hoisted_10);
+            }, vue.toDisplayString(item.name), 11, _hoisted_14);
           }), 128))
         ])) : vue.createCommentVNode("v-if", true)
       ]);