@cmstops/pro-compo 3.9.2-alpha.2 → 3.9.2-alpha.4

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

@@ -1,6 +1,6 @@
 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, IconUpload } from "@arco-design/web-vue/es/icon";
+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";
@@ -50,6 +50,7 @@ const _sfc_main = defineComponent({
   },
   emits: ["upload", "change"],
   setup(__props, { expose: __expose, emit: __emit }) {
+    var _a, _b, _c;
     const props = __props;
     const emits = __emit;
     const userInfo = inject("userInfo");
@@ -63,8 +64,7 @@ const _sfc_main = defineComponent({
       hiddenElementList,
       visible,
       show,
-      hide,
-      refreshLayout
+      hide
     } = useResponsiveFilter(filterItemsRef);
     const { options, loading, load, loadMore, handleSearch } = useSelection({
       labelStr: "alias",
@@ -99,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));
     };
@@ -182,22 +192,14 @@ const _sfc_main = defineComponent({
       { deep: true, immediate: true }
     );
     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({
       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, [
@@ -291,7 +293,8 @@ const _sfc_main = defineComponent({
                   title: "alias",
                   key: "id"
                 },
-                "allow-clear": ""
+                "allow-clear": "",
+                "allow-search": ""
               }, null, 8, ["modelValue", "data"])
             ]),
             createCommentVNode(" \u7D20\u6750\u7C7B\u578B "),
@@ -299,7 +302,7 @@ const _sfc_main = defineComponent({
               createVNode(unref(Select), {
                 modelValue: filter.value.catalog,
                 "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => filter.value.catalog = $event),
-                disabled: (_a = unref(filterOptions)) == null ? void 0 : _a.mediaTypeStrict,
+                disabled: (_a2 = unref(filterOptions)) == null ? void 0 : _a2.mediaTypeStrict,
                 "popup-container": "#resource-filter-pannel",
                 "allow-clear": "",
                 placeholder: "\u7C7B\u578B",
@@ -377,7 +380,17 @@ const _sfc_main = defineComponent({
           createElementVNode("div", _hoisted_11, [
             createCommentVNode(" \u91CD\u7F6E\u6309\u94AE - Wrap in filter-item to be managed by the hook "),
             withDirectives(createElementVNode("div", _hoisted_12, [
-              createVNode(unref(Button), {
+              _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
               }, {
@@ -385,7 +398,7 @@ const _sfc_main = defineComponent({
                   createTextVNode(" \u91CD\u7F6E ")
                 ])),
                 _: 1
-              })
+              }))
             ], 512), [
               [vShow, !isEmpty.value]
             ]),

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

@@ -34,7 +34,6 @@ const _sfc_main = defineComponent({
         return (_a = listWrapper.value) == null ? void 0 : _a.offsetWidth;
       },
       (val) => {
-        console.log(val);
         smallScreen.value = !!(val && val < 600);
       },
       { immediate: true }

package/es/selectResourceModal/hooks/useResponsiveFilter.js

@@ -67,7 +67,7 @@ function useResponsiveFilter(filterItemsRef) {
       if (!item || !item.classList || !item.classList.contains("filter-item"))
         continue;
       const itemRect = getRect(item);
-      if (itemRect.right > containerRight - 300) {
+      if (itemRect.right > containerRight - 400) {
         hideElement(item);
       } else {
         currentRightmostBoundary = Math.max(

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

@@ -51,6 +51,7 @@ const _sfc_main = vue.defineComponent({
   },
   emits: ["upload", "change"],
   setup(__props, { expose: __expose, emit: __emit }) {
+    var _a, _b, _c;
     const props = __props;
     const emits = __emit;
     const userInfo = vue.inject("userInfo");
@@ -64,8 +65,7 @@ const _sfc_main = vue.defineComponent({
       hiddenElementList,
       visible,
       show,
-      hide,
-      refreshLayout
+      hide
     } = useResponsiveFilter.useResponsiveFilter(filterItemsRef);
     const { options, loading, load, loadMore, handleSearch } = useSelection({
       labelStr: "alias",
@@ -100,7 +100,17 @@ const _sfc_main = vue.defineComponent({
       sf: "",
       directory_id: void 0
     };
-    const filter = vue.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 = vue.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));
     };
@@ -183,22 +193,14 @@ const _sfc_main = vue.defineComponent({
       { 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({
       filter,
       handleReset
     });
     return (_ctx, _cache) => {
-      var _a;
+      var _a2;
       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, [
@@ -292,7 +294,8 @@ const _sfc_main = vue.defineComponent({
                   title: "alias",
                   key: "id"
                 },
-                "allow-clear": ""
+                "allow-clear": "",
+                "allow-search": ""
               }, null, 8, ["modelValue", "data"])
             ]),
             vue.createCommentVNode(" \u7D20\u6750\u7C7B\u578B "),
@@ -300,7 +303,7 @@ const _sfc_main = vue.defineComponent({
               vue.createVNode(vue.unref(webVue.Select), {
                 modelValue: filter.value.catalog,
                 "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => filter.value.catalog = $event),
-                disabled: (_a = vue.unref(filterOptions)) == null ? void 0 : _a.mediaTypeStrict,
+                disabled: (_a2 = vue.unref(filterOptions)) == null ? void 0 : _a2.mediaTypeStrict,
                 "popup-container": "#resource-filter-pannel",
                 "allow-clear": "",
                 placeholder: "\u7C7B\u578B",
@@ -378,7 +381,17 @@ const _sfc_main = vue.defineComponent({
           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), {
+              _ctx.smallScreen ? (vue.openBlock(), vue.createBlock(vue.unref(webVue.Button), {
+                key: 0,
+                type: "text",
+                onClick: handleReset
+              }, {
+                icon: vue.withCtx(() => [
+                  vue.createVNode(vue.unref(icon.IconRefresh))
+                ]),
+                _: 1
+              })) : (vue.openBlock(), vue.createBlock(vue.unref(webVue.Button), {
+                key: 1,
                 type: "text",
                 onClick: handleReset
               }, {
@@ -386,7 +399,7 @@ const _sfc_main = vue.defineComponent({
                   vue.createTextVNode(" \u91CD\u7F6E ")
                 ])),
                 _: 1
-              })
+              }))
             ], 512), [
               [vue.vShow, !isEmpty.value]
             ]),

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

@@ -35,7 +35,6 @@ const _sfc_main = vue.defineComponent({
         return (_a = listWrapper.value) == null ? void 0 : _a.offsetWidth;
       },
       (val) => {
-        console.log(val);
         smallScreen.value = !!(val && val < 600);
       },
       { immediate: true }

package/lib/selectResourceModal/hooks/useResponsiveFilter.js

@@ -69,7 +69,7 @@ function useResponsiveFilter(filterItemsRef) {
       if (!item || !item.classList || !item.classList.contains("filter-item"))
         continue;
       const itemRect = getRect(item);
-      if (itemRect.right > containerRight - 300) {
+      if (itemRect.right > containerRight - 400) {
         hideElement(item);
       } else {
         currentRightmostBoundary = Math.max(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmstops/pro-compo",
-  "version": "3.9.2-alpha.2",
+  "version": "3.9.2-alpha.4",
   "description": "",
   "keywords": [
     "vue",