@cmstops/pro-compo 3.9.2-alpha.3 → 3.9.2-alpha.5

package/es/baseFilter/component.js

@@ -1,5 +1,5 @@
-import { defineComponent, ref, computed, watch, nextTick, toRaw, openBlock, createElementBlock, Fragment, createElementVNode, withModifiers, createVNode, withCtx, renderList, createBlock, unref, normalizeStyle, createCommentVNode, renderSlot } from "vue";
-import { InputSearch, Select, Option, RangePicker } from "@arco-design/web-vue";
+import { defineComponent, ref, computed, watch, nextTick, toRaw, openBlock, createElementBlock, Fragment, createElementVNode, withModifiers, createVNode, withCtx, renderList, createBlock, renderSlot, unref, normalizeStyle, createCommentVNode, createTextVNode, toDisplayString } from "vue";
+import { InputSearch, Select, Option, RangePicker, RadioGroup, Radio } from "@arco-design/web-vue";
 import _sfc_main$2 from "./components/filterItem.js";
 import _sfc_main$1 from "./components/FilterGroup.js";
 const _sfc_main = defineComponent({
@@ -37,9 +37,11 @@ const _sfc_main = defineComponent({
       });
       return _columns;
     });
-    const getOptions = (item) => {
-      return item.options ? item.options : [];
-    };
+    const getOptions = computed(() => {
+      return (item) => {
+        return item.options ? item.options : [];
+      };
+    });
     const hasValue = computed(() => {
       return (key) => {
         var _a, _b;
@@ -178,17 +180,17 @@ const _sfc_main = defineComponent({
                 active: hasValue.value(item.key)
               }, {
                 default: withCtx(() => [
-                  item.component === "input" ? (openBlock(), createBlock(unref(InputSearch), {
-                    key: 0,
+                  item.slot ? renderSlot(_ctx.$slots, item.slot, { key: 0 }) : item.component === "input" ? (openBlock(), createBlock(unref(InputSearch), {
+                    key: 1,
                     modelValue: form.value[item.key],
                     "onUpdate:modelValue": ($event) => form.value[item.key] = $event,
                     style: normalizeStyle({ width: styleWidth(columnsMap.value[item.key]) }),
                     "allow-clear": "",
                     size: "medium",
-                    placeholder: `\u8BF7\u8F93\u5165${item.label}`
+                    placeholder: item.placeholder ? item.placeholder : `\u8BF7\u8F93\u5165${item.label}`
                   }, null, 8, ["modelValue", "onUpdate:modelValue", "style", "placeholder"])) : createCommentVNode("v-if", true),
                   item.component === "select" ? (openBlock(), createBlock(unref(Select), {
-                    key: 1,
+                    key: 2,
                     modelValue: form.value[item.key],
                     "onUpdate:modelValue": ($event) => form.value[item.key] = $event,
                     "popup-container": "#base-filter-popup-container",
@@ -196,13 +198,13 @@ const _sfc_main = defineComponent({
                     "allow-search": item.allowSearch,
                     "default-active-first-option": false,
                     style: normalizeStyle({ width: styleWidth(columnsMap.value[item.key]) }),
-                    placeholder: `\u8BF7\u9009\u62E9${item.label}`,
+                    placeholder: item.placeholder ? item.placeholder : `\u8BF7\u9009\u62E9${item.label}`,
                     onSearch: ($event) => handleSelectSearch($event, item),
                     onPopupVisibleChange: ($event) => handleSelectPopupChange($event, item),
                     onChange: ($event) => handleSelectChange($event, item)
                   }, {
                     default: withCtx(() => [
-                      (openBlock(true), createElementBlock(Fragment, null, renderList(getOptions(item), (opt) => {
+                      (openBlock(true), createElementBlock(Fragment, null, renderList(getOptions.value(item), (opt) => {
                         return openBlock(), createBlock(unref(Option), {
                           key: opt.value,
                           label: opt.label,
@@ -213,7 +215,7 @@ const _sfc_main = defineComponent({
                     _: 2
                   }, 1032, ["modelValue", "onUpdate:modelValue", "allow-search", "style", "placeholder", "onSearch", "onPopupVisibleChange", "onChange"])) : createCommentVNode("v-if", true),
                   item.component === "range-picker" ? (openBlock(), createBlock(unref(RangePicker), {
-                    key: 2,
+                    key: 3,
                     modelValue: form.value[item.key].range,
                     "onUpdate:modelValue": ($event) => form.value[item.key].range = $event,
                     style: normalizeStyle({ width: styleWidth(form.value[item.key]) }),
@@ -224,7 +226,28 @@ const _sfc_main = defineComponent({
                     "popup-container": "#base-filter-popup-container",
                     onClick: _cache[1] || (_cache[1] = withModifiers(() => {
                     }, ["stop"]))
-                  }, null, 8, ["modelValue", "onUpdate:modelValue", "style"])) : createCommentVNode("v-if", true)
+                  }, null, 8, ["modelValue", "onUpdate:modelValue", "style"])) : createCommentVNode("v-if", true),
+                  item.component === "radio" ? (openBlock(), createBlock(unref(RadioGroup), {
+                    key: 4,
+                    modelValue: form.value[item.key],
+                    "onUpdate:modelValue": ($event) => form.value[item.key] = $event,
+                    type: "button"
+                  }, {
+                    default: withCtx(() => [
+                      (openBlock(true), createElementBlock(Fragment, null, renderList(item.options || [], (option, idx) => {
+                        return openBlock(), createBlock(unref(Radio), {
+                          key: idx,
+                          value: option.value
+                        }, {
+                          default: withCtx(() => [
+                            createTextVNode(toDisplayString(option.label), 1)
+                          ]),
+                          _: 2
+                        }, 1032, ["value"]);
+                      }), 128))
+                    ]),
+                    _: 2
+                  }, 1032, ["modelValue", "onUpdate:modelValue"])) : createCommentVNode("v-if", true)
                 ]),
                 _: 2
               }, 1032, ["active"]);

package/es/selectResourceModal/components/List/ListNormal/Filter.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",

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

@@ -38,9 +38,11 @@ const _sfc_main = vue.defineComponent({
       });
       return _columns;
     });
-    const getOptions = (item) => {
-      return item.options ? item.options : [];
-    };
+    const getOptions = vue.computed(() => {
+      return (item) => {
+        return item.options ? item.options : [];
+      };
+    });
     const hasValue = vue.computed(() => {
       return (key) => {
         var _a, _b;
@@ -179,17 +181,17 @@ const _sfc_main = vue.defineComponent({
                 active: hasValue.value(item.key)
               }, {
                 default: vue.withCtx(() => [
-                  item.component === "input" ? (vue.openBlock(), vue.createBlock(vue.unref(webVue.InputSearch), {
-                    key: 0,
+                  item.slot ? vue.renderSlot(_ctx.$slots, item.slot, { key: 0 }) : item.component === "input" ? (vue.openBlock(), vue.createBlock(vue.unref(webVue.InputSearch), {
+                    key: 1,
                     modelValue: form.value[item.key],
                     "onUpdate:modelValue": ($event) => form.value[item.key] = $event,
                     style: vue.normalizeStyle({ width: styleWidth(columnsMap.value[item.key]) }),
                     "allow-clear": "",
                     size: "medium",
-                    placeholder: `\u8BF7\u8F93\u5165${item.label}`
+                    placeholder: item.placeholder ? item.placeholder : `\u8BF7\u8F93\u5165${item.label}`
                   }, null, 8, ["modelValue", "onUpdate:modelValue", "style", "placeholder"])) : vue.createCommentVNode("v-if", true),
                   item.component === "select" ? (vue.openBlock(), vue.createBlock(vue.unref(webVue.Select), {
-                    key: 1,
+                    key: 2,
                     modelValue: form.value[item.key],
                     "onUpdate:modelValue": ($event) => form.value[item.key] = $event,
                     "popup-container": "#base-filter-popup-container",
@@ -197,13 +199,13 @@ const _sfc_main = vue.defineComponent({
                     "allow-search": item.allowSearch,
                     "default-active-first-option": false,
                     style: vue.normalizeStyle({ width: styleWidth(columnsMap.value[item.key]) }),
-                    placeholder: `\u8BF7\u9009\u62E9${item.label}`,
+                    placeholder: item.placeholder ? item.placeholder : `\u8BF7\u9009\u62E9${item.label}`,
                     onSearch: ($event) => handleSelectSearch($event, item),
                     onPopupVisibleChange: ($event) => handleSelectPopupChange($event, item),
                     onChange: ($event) => handleSelectChange($event, item)
                   }, {
                     default: vue.withCtx(() => [
-                      (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(getOptions(item), (opt) => {
+                      (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(getOptions.value(item), (opt) => {
                         return vue.openBlock(), vue.createBlock(vue.unref(webVue.Option), {
                           key: opt.value,
                           label: opt.label,
@@ -214,7 +216,7 @@ const _sfc_main = vue.defineComponent({
                     _: 2
                   }, 1032, ["modelValue", "onUpdate:modelValue", "allow-search", "style", "placeholder", "onSearch", "onPopupVisibleChange", "onChange"])) : vue.createCommentVNode("v-if", true),
                   item.component === "range-picker" ? (vue.openBlock(), vue.createBlock(vue.unref(webVue.RangePicker), {
-                    key: 2,
+                    key: 3,
                     modelValue: form.value[item.key].range,
                     "onUpdate:modelValue": ($event) => form.value[item.key].range = $event,
                     style: vue.normalizeStyle({ width: styleWidth(form.value[item.key]) }),
@@ -225,7 +227,28 @@ const _sfc_main = vue.defineComponent({
                     "popup-container": "#base-filter-popup-container",
                     onClick: _cache[1] || (_cache[1] = vue.withModifiers(() => {
                     }, ["stop"]))
-                  }, null, 8, ["modelValue", "onUpdate:modelValue", "style"])) : vue.createCommentVNode("v-if", true)
+                  }, null, 8, ["modelValue", "onUpdate:modelValue", "style"])) : vue.createCommentVNode("v-if", true),
+                  item.component === "radio" ? (vue.openBlock(), vue.createBlock(vue.unref(webVue.RadioGroup), {
+                    key: 4,
+                    modelValue: form.value[item.key],
+                    "onUpdate:modelValue": ($event) => form.value[item.key] = $event,
+                    type: "button"
+                  }, {
+                    default: vue.withCtx(() => [
+                      (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(item.options || [], (option, idx) => {
+                        return vue.openBlock(), vue.createBlock(vue.unref(webVue.Radio), {
+                          key: idx,
+                          value: option.value
+                        }, {
+                          default: vue.withCtx(() => [
+                            vue.createTextVNode(vue.toDisplayString(option.label), 1)
+                          ]),
+                          _: 2
+                        }, 1032, ["value"]);
+                      }), 128))
+                    ]),
+                    _: 2
+                  }, 1032, ["modelValue", "onUpdate:modelValue"])) : vue.createCommentVNode("v-if", true)
                 ]),
                 _: 2
               }, 1032, ["active"]);

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",

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.3",
+  "version": "3.9.2-alpha.5",
   "description": "",
   "keywords": [
     "vue",