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

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

@@ -1,43 +1,71 @@
-import { defineComponent, inject, computed, ref, watch, onMounted, openBlock, createElementBlock, createElementVNode, createCommentVNode, createVNode, unref, withCtx, createTextVNode, toDisplayString, Fragment, renderList, createBlock, normalizeClass } from "vue";
-import { Input, Dropdown, Doption, Button, Select, Option, TreeSelect, RangePicker } from "@arco-design/web-vue";
-import { IconUpload } from "@arco-design/web-vue/es/icon";
+import { defineComponent, inject, computed, ref, watch, onMounted, openBlock, createElementBlock, createCommentVNode, createElementVNode, withDirectives, createVNode, unref, withModifiers, withCtx, createTextVNode, vShow, toDisplayString, Fragment, renderList, createBlock, normalizeClass } from "vue";
+import { Button, Input, Dropdown, Doption, TreeSelect, Select, Option, RangePicker } from "@arco-design/web-vue";
+import { IconCaretDown, IconRefresh, IconUpload } from "@arco-design/web-vue/es/icon";
 import useSelection from "../../../../hooks/useSelection.js";
 import { useDirectory } from "../../../../hooks/useAttachement.js";
 import { RESOURCE_SOURCE_OPTIONS, RESOURCE_CATALOG_OPTIONS } from "../../../../utils/typeMap.js";
 import { getAccountList } from "../../../scripts/selectionApis.js";
 import { keywordsSelection } from "../../../../utils/resource.js";
+import { useResponsiveFilter } from "../../../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": "200px" }
 };
-const _hoisted_6 = { class: "filter-item" };
+const _hoisted_6 = {
+  class: "filter-item",
+  style: { "width": "180px" }
+};
 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 = defineComponent({
   __name: "Filter",
   props: {
+    smallScreen: { type: Boolean },
     disableUploadBy: { type: Boolean }
   },
   emits: ["upload", "change"],
   setup(__props, { expose: __expose, emit: __emit }) {
+    var _a, _b, _c;
     const props = __props;
     const emits = __emit;
     const userInfo = inject("userInfo");
     const baseAPI = inject("baseAPI");
     const filterOptions = inject("filterOptions");
     const domainId = computed(() => userInfo == null ? void 0 : userInfo.value.domain_id);
+    const filterItemsRef = ref();
+    const {
+      moreBtnRef,
+      popperPanelRef,
+      hiddenElementList,
+      visible,
+      show,
+      hide
+    } = useResponsiveFilter(filterItemsRef);
     const { options, loading, load, loadMore, handleSearch } = useSelection({
       labelStr: "alias",
       valueStr: "id",
@@ -57,7 +85,7 @@ const _sfc_main = defineComponent({
     });
     const resourceSource = RESOURCE_SOURCE_OPTIONS;
     const resourceCatalog = RESOURCE_CATALOG_OPTIONS;
-    const { tree, loadMore: loadDirMore } = useDirectory({
+    const { tree } = useDirectory({
       BASE_API: baseAPI
     });
     const originFilter = {
@@ -71,7 +99,17 @@ const _sfc_main = defineComponent({
       sf: "",
       directory_id: void 0
     };
-    const filter = ref(JSON.parse(JSON.stringify(originFilter)));
+    if ((_a = filterOptions == null ? void 0 : filterOptions.value) == null ? void 0 : _a.mediaTypeStrict) {
+      originFilter.catalog = filterOptions.value.mediaType.split(",");
+    }
+    const filter = ref(
+      JSON.parse(
+        JSON.stringify({
+          ...originFilter,
+          catalog: ((_c = (_b = filterOptions == null ? void 0 : filterOptions.value) == null ? void 0 : _b.mediaType) == null ? void 0 : _c.split(",")) || []
+        })
+      )
+    );
     const handleReset = () => {
       filter.value = JSON.parse(JSON.stringify(originFilter));
     };
@@ -116,85 +154,119 @@ const _sfc_main = defineComponent({
           filter.value.keyword = val;
           filter.value.precise_keyword = "";
         }
+        filter.value.sf = "";
       }
     });
-    watch(
-      () => searchType.value,
-      () => {
-        searchInput.value = filter.value.keyword || filter.value.precise_keyword;
-      }
-    );
     const isEmpty = 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];
       });
     });
     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 }
-    );
-    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);
       },
-      { immediate: true, deep: true }
+      { deep: true, immediate: true }
     );
     onMounted(() => {
       load();
     });
     __expose({
-      resetFilter: handleReset
+      filter,
+      handleReset
     });
     return (_ctx, _cache) => {
-      var _a;
+      var _a2;
       return openBlock(), createElementBlock("div", _hoisted_1, [
+        createCommentVNode(" Use filterItemsRef's parentElement as the container for boundary checks "),
         createElementVNode("div", _hoisted_2, [
-          createElementVNode("div", _hoisted_3, [
+          createCommentVNode(" Filter Items Container "),
+          createElementVNode("div", {
+            id: "resource-filter-pannel",
+            ref_key: "filterItemsRef",
+            ref: filterItemsRef,
+            class: "filter-list"
+          }, [
+            createCommentVNode(" More Filters Button and Popper Panel "),
+            createElementVNode("div", _hoisted_3, [
+              createElementVNode("div", {
+                ref_key: "moreBtnRef",
+                ref: moreBtnRef
+              }, [
+                withDirectives(createVNode(unref(Button), {
+                  style: { marginRight: "10px" },
+                  onClick: _cache[0] || (_cache[0] = withModifiers(() => unref(visible) ? unref(hide)() : unref(show)(), ["stop"]))
+                }, {
+                  default: withCtx(() => [
+                    createElementVNode("span", _hoisted_4, [
+                      _cache[11] || (_cache[11] = createTextVNode(" \u66F4\u591A ")),
+                      createVNode(unref(IconCaretDown))
+                    ])
+                  ]),
+                  _: 1
+                }, 512), [
+                  [vShow, unref(hiddenElementList).length]
+                ])
+              ], 512),
+              withDirectives(createElementVNode("div", {
+                ref_key: "popperPanelRef",
+                ref: popperPanelRef,
+                class: "filter-pannel",
+                onClick: _cache[1] || (_cache[1] = withModifiers(() => {
+                }, ["stop"]))
+              }, null, 512), [
+                [vShow, unref(visible)]
+              ])
+            ]),
             createCommentVNode(" \u5173\u952E\u8BCD "),
-            createElementVNode("div", _hoisted_4, [
+            createElementVNode("div", _hoisted_5, [
               createVNode(unref(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: withCtx(() => [
                   createVNode(unref(Dropdown), {
-                    onSelect: _cache[0] || (_cache[0] = (e) => searchType.value = e)
+                    onSelect: _cache[2] || (_cache[2] = (e) => searchType.value = e)
                   }, {
                     content: withCtx(() => [
                       createVNode(unref(Doption), { value: 0 }, {
-                        default: withCtx(() => _cache[8] || (_cache[8] = [
+                        default: withCtx(() => _cache[12] || (_cache[12] = [
                           createTextVNode("\u7CBE\u51C6\u641C")
                         ])),
-                        _: 1
+                        _: 1,
+                        __: [12]
                       }),
                       createVNode(unref(Doption), { value: 1 }, {
-                        default: withCtx(() => _cache[9] || (_cache[9] = [
+                        default: withCtx(() => _cache[13] || (_cache[13] = [
                           createTextVNode("\u6A21\u7CCA\u641C")
                         ])),
-                        _: 1
+                        _: 1,
+                        __: [13]
                       })
                     ]),
                     default: withCtx(() => [
@@ -211,15 +283,39 @@ const _sfc_main = defineComponent({
                 _: 1
               }, 8, ["modelValue"])
             ]),
+            createCommentVNode(" \u76EE\u5F55 "),
+            createElementVNode("div", _hoisted_6, [
+              createVNode(unref(TreeSelect), {
+                modelValue: filter.value.directory_id,
+                "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => filter.value.directory_id = $event),
+                data: unref(tree),
+                "popup-container": "#resource-filter-pannel",
+                placeholder: "\u8BF7\u9009\u62E9\u76EE\u5F55",
+                "field-names": {
+                  title: "alias",
+                  key: "id"
+                },
+                "allow-clear": "",
+                "allow-search": "",
+                "filter-tree-node": (searchValue, nodeData) => {
+                  console.log(nodeData);
+                  if (!nodeData.alias)
+                    return false;
+                  return nodeData.alias.toLowerCase().indexOf(searchValue.toLowerCase()) > -1;
+                }
+              }, null, 8, ["modelValue", "data", "filter-tree-node"])
+            ]),
             createCommentVNode(" \u7D20\u6750\u7C7B\u578B "),
-            createElementVNode("div", _hoisted_5, [
+            createElementVNode("div", _hoisted_7, [
               createVNode(unref(Select), {
                 modelValue: filter.value.catalog,
-                "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => filter.value.catalog = $event),
-                disabled: (_a = unref(filterOptions)) == null ? void 0 : _a.mediaTypeStrict,
+                "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => filter.value.catalog = $event),
+                disabled: (_a2 = unref(filterOptions)) == null ? void 0 : _a2.mediaTypeStrict,
+                "popup-container": "#resource-filter-pannel",
                 "allow-clear": "",
                 placeholder: "\u7C7B\u578B",
-                multiple: ""
+                multiple: "",
+                "max-tag-count": 1
               }, {
                 default: withCtx(() => [
                   (openBlock(true), createElementBlock(Fragment, null, renderList(unref(resourceCatalog), (item) => {
@@ -233,30 +329,23 @@ const _sfc_main = defineComponent({
                 _: 1
               }, 8, ["modelValue", "disabled"])
             ]),
-            createCommentVNode(" \u76EE\u5F55 "),
-            createVNode(unref(TreeSelect), {
-              modelValue: filter.value.directory_id,
-              "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => filter.value.directory_id = $event),
-              data: unref(tree),
-              "load-more": unref(loadDirMore),
-              placeholder: "\u8BF7\u9009\u62E9\u76EE\u5F55",
-              style: { "width": "180px" },
-              "allow-clear": ""
-            }, null, 8, ["modelValue", "data", "load-more"]),
             createCommentVNode(" \u65F6\u95F4\u8303\u56F4 "),
-            createVNode(unref(RangePicker), {
-              modelValue: rangeTime.value,
-              "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => rangeTime.value = $event),
-              "allow-clear": "",
-              style: { "width": "240px" }
-            }, null, 8, ["modelValue"]),
+            createElementVNode("div", _hoisted_8, [
+              createVNode(unref(RangePicker), {
+                modelValue: rangeTime.value,
+                "onUpdate:modelValue": _cache[6] || (_cache[6] = ($event) => rangeTime.value = $event),
+                "allow-clear": "",
+                "popup-container": "#resource-filter-pannel"
+              }, null, 8, ["modelValue"])
+            ]),
             createCommentVNode(" \u7D20\u6750\u4E0A\u4F20\u6765\u6E90 "),
-            createElementVNode("div", _hoisted_6, [
+            createElementVNode("div", _hoisted_9, [
               createVNode(unref(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: withCtx(() => [
                   (openBlock(true), createElementBlock(Fragment, null, renderList(unref(resourceSource), (item) => {
@@ -271,14 +360,15 @@ const _sfc_main = defineComponent({
               }, 8, ["modelValue"])
             ]),
             createCommentVNode(" \u7D20\u6750\u4E0A\u4F20\u4EBA "),
-            !_ctx.disableUploadBy ? (openBlock(), createElementBlock("div", _hoisted_7, [
+            !_ctx.disableUploadBy ? (openBlock(), createElementBlock("div", _hoisted_10, [
               createVNode(unref(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: unref(loading),
                 "allow-search": "",
+                "popup-container": "#resource-filter-pannel",
                 onSearch: unref(handleSearch),
                 onDropdownReachBottom: unref(loadMore)
               }, {
@@ -293,40 +383,66 @@ const _sfc_main = defineComponent({
                 ]),
                 _: 1
               }, 8, ["modelValue", "loading", "onSearch", "onDropdownReachBottom"])
-            ])) : createCommentVNode("v-if", true),
-            !isEmpty.value ? (openBlock(), createBlock(unref(Button), {
-              key: 1,
-              type: "text",
-              onClick: handleReset
+            ])) : createCommentVNode("v-if", true)
+          ], 512),
+          createElementVNode("div", _hoisted_11, [
+            createCommentVNode(" \u91CD\u7F6E\u6309\u94AE - Wrap in filter-item to be managed by the hook "),
+            withDirectives(createElementVNode("div", _hoisted_12, [
+              _ctx.smallScreen ? (openBlock(), createBlock(unref(Button), {
+                key: 0,
+                type: "text",
+                onClick: handleReset
+              }, {
+                icon: withCtx(() => [
+                  createVNode(unref(IconRefresh))
+                ]),
+                _: 1
+              })) : (openBlock(), createBlock(unref(Button), {
+                key: 1,
+                type: "text",
+                onClick: handleReset
+              }, {
+                default: withCtx(() => _cache[14] || (_cache[14] = [
+                  createTextVNode(" \u91CD\u7F6E ")
+                ])),
+                _: 1,
+                __: [14]
+              }))
+            ], 512), [
+              [vShow, !isEmpty.value]
+            ]),
+            _ctx.smallScreen ? (openBlock(), createBlock(unref(Button), {
+              key: 0,
+              type: "primary",
+              onClick: _cache[9] || (_cache[9] = ($event) => emits("upload"))
             }, {
-              default: withCtx(() => _cache[10] || (_cache[10] = [
-                createTextVNode(" \u91CD\u7F6E ")
-              ])),
+              icon: withCtx(() => [
+                createVNode(unref(IconUpload))
+              ]),
               _: 1
-            })) : createCommentVNode("v-if", true)
-          ]),
-          createElementVNode("div", _hoisted_8, [
-            createVNode(unref(Button), {
+            })) : (openBlock(), createBlock(unref(Button), {
+              key: 1,
               type: "primary",
-              onClick: _cache[7] || (_cache[7] = ($event) => emits("upload"))
+              onClick: _cache[10] || (_cache[10] = ($event) => emits("upload"))
             }, {
               icon: withCtx(() => [
                 createVNode(unref(IconUpload))
               ]),
               default: withCtx(() => [
-                _cache[11] || (_cache[11] = createTextVNode(" \u4E0A\u4F20 "))
+                _cache[15] || (_cache[15] = createTextVNode(" \u4E0A\u4F20 "))
               ]),
-              _: 1
-            })
+              _: 1,
+              __: [15]
+            }))
           ])
         ]),
-        searchInput.value ? (openBlock(), createElementBlock("div", _hoisted_9, [
+        searchInput.value ? (openBlock(), createElementBlock("div", _hoisted_13, [
           (openBlock(true), createElementBlock(Fragment, null, renderList(unref(keywordsSelection), (item) => {
             return openBlock(), createElementBlock("div", {
               key: item.value,
               class: normalizeClass(["list-filter-tag", { active: filter.value.sf === item.value }]),
               onClick: ($event) => filter.value.sf = item.value
-            }, toDisplayString(item.name), 11, _hoisted_10);
+            }, toDisplayString(item.name), 11, _hoisted_14);
           }), 128))
         ])) : createCommentVNode("v-if", true)
       ]);

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

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

package/es/selectResourceModal/components/List/ListSystem/Filter.js

@@ -130,7 +130,8 @@ const _sfc_main = defineComponent({
               default: withCtx(() => _cache[3] || (_cache[3] = [
                 createTextVNode(" \u91CD\u7F6E ")
               ])),
-              _: 1
+              _: 1,
+              __: [3]
             })) : createCommentVNode("v-if", true)
           ])
         ])