yc-pro-components 0.0.56 → 0.0.58

package/es/components/yc-plus-page/src/header-filter-cell.vue2.mjs

@@ -1,15 +1,17 @@
-import { defineComponent, computed, reactive, ref, watch, onMounted, onBeforeUnmount, openBlock, createElementBlock, withModifiers, createCommentVNode, createElementVNode, normalizeClass, createBlock, resolveDynamicComponent, Fragment, unref, withCtx, toDisplayString, createTextVNode, mergeProps, createVNode, normalizeStyle, renderList, h } from 'vue';
-import { ElTooltip, ElIcon, ElPopover, ElButton, ElTimePicker, ElTimeSelect, ElDatePicker, ElInput } from 'element-plus';
+import { defineComponent, computed, reactive, ref, watch, onMounted, onBeforeUnmount, openBlock, createElementBlock, withModifiers, createCommentVNode, createElementVNode, normalizeClass, normalizeStyle, createBlock, resolveDynamicComponent, Fragment, unref, withCtx, toDisplayString, createTextVNode, mergeProps, createVNode, renderList, h } from 'vue';
+import { ElTooltip, ElIcon, ElPopover, ElButton, ElInput } from 'element-plus';
 import { QuestionFilled, CaretTop, CaretBottom } from '@element-plus/icons-vue';
 import { NO_VALUE_OPERATORS } from './constants.mjs';
 import { getTooltip } from '../../utils/index.mjs';
 import YcSvgIcon from '../../yc-svg-icon/src/index.vue.mjs';
+import { useGetOptions } from '../../../hooks/useGetOptions.mjs';
+import { isRangeType, FILTER_INNER_DROPDOWN_CLASS, resolveFilterOptions, FILTER_FIELD_STYLE } from './filter-utils.mjs';
+import { resolveInteractionType, FILTER_COMPONENT_STRATEGIES } from './filter-strategies.mjs';
 import { useYcCdnUrl } from '../../yc-config-provider/src/useYcConfig.mjs';
 
 const _hoisted_1 = { class: "yc-header-filter-cell__label-text" };
 const _hoisted_2 = { class: "yc-header-filter-cell__label-text" };
-const _hoisted_3 = { style: { cursor: "pointer", display: "inline-flex", alignItems: "center" } };
-const _hoisted_4 = {
+const _hoisted_3 = {
   class: "yc-header-filter-cell__content",
   style: {
     display: "flex",
@@ -19,17 +21,19 @@ const _hoisted_4 = {
     gap: "4px"
   }
 };
-const _hoisted_5 = { class: "yc-header-filter-cell__operators" };
-const _hoisted_6 = ["onClick"];
-const _hoisted_7 = { key: 0 };
-const _hoisted_8 = {
+const _hoisted_4 = {
   class: "yc-header-filter-cell__actions",
   style: {
     display: "flex",
-    justifyContent: "space-between",
-    marginTop: "4px"
+    justifyContent: "flex-end"
   }
 };
+const _hoisted_5 = {
+  key: 0,
+  class: "yc-header-filter-cell__operators"
+};
+const _hoisted_6 = ["onClick"];
+const _hoisted_7 = { key: 0 };
 var _sfc_main = /* @__PURE__ */ defineComponent({
   ...{
     name: "YcTableHeaderFilterCell"
@@ -42,6 +46,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     filters: { default: () => [] },
     orderBy: { default: () => [] },
     disableFilter: { type: Boolean, default: false },
+    hideSort: { type: Boolean, default: false },
+    fieldConfig: {},
     referenceRenderer: { type: Function, default: void 0 }
   },
   emits: ["confirm", "reset", "sortChange"],
@@ -73,6 +79,12 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       var _a;
       return String(((_a = props.column) == null ? void 0 : _a.prop) || "");
     });
+    const getHeaderFilterObject = () => {
+      var _a;
+      const hf = (_a = props.column) == null ? void 0 : _a.headerFilter;
+      if (hf && typeof hf === "object") return hf;
+      return {};
+    };
     const isActive = computed(() => {
       var _a, _b;
       const field = fieldRef.value;
@@ -90,35 +102,48 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         return (_a = props.orderBy) == null ? void 0 : _a.some((i) => i.field === fieldRef.value && i.direction === "desc");
       }
     );
-    const onDocPointerOrClick = (e) => {
+    const onDocPointerDown = (e) => {
+      var _a;
       if (!popVisible.value) return;
       const target = e.target;
-      const wrapper = wrapperElRef.value;
-      if (target && ((wrapper == null ? void 0 : wrapper.contains(target)) || target.closest(".yc-header-filter-pop"))) return;
+      if (!target) return;
+      if ((_a = wrapperElRef.value) == null ? void 0 : _a.contains(target)) return;
+      if (target.closest(".yc-header-filter-pop")) return;
+      const popoverTrigger = target.closest("[aria-describedby]");
+      if (popoverTrigger) return;
+      if (target.closest(`.${FILTER_INNER_DROPDOWN_CLASS}`)) return;
       popVisible.value = false;
     };
     onMounted(() => {
-      window.addEventListener("pointerdown", onDocPointerOrClick, true);
-      window.addEventListener("click", onDocPointerOrClick, true);
+      window.addEventListener("pointerdown", onDocPointerDown, true);
     });
     onBeforeUnmount(() => {
-      window.removeEventListener("pointerdown", onDocPointerOrClick, true);
-      window.removeEventListener("click", onDocPointerOrClick, true);
+      window.removeEventListener("pointerdown", onDocPointerDown, true);
     });
     const handleSelect = (op) => {
       state.selectedOp = op.code;
     };
     const handleReset = () => {
       state.inputVal = "";
-      emit("reset", { column: props.column, op: state.selectedOp });
+      const payload = { column: props.column, op: state.selectedOp };
+      const customConfig = getHeaderFilterObject();
+      if (customConfig.onReset) {
+        customConfig.onReset(payload);
+      }
+      emit("reset", payload);
       popVisible.value = false;
     };
     const handleConfirm = () => {
-      emit("confirm", {
+      const payload = {
         column: props.column,
         op: state.selectedOp,
         value: state.inputVal
-      });
+      };
+      const customConfig = getHeaderFilterObject();
+      if (customConfig.onConfirm) {
+        customConfig.onConfirm(payload);
+      }
+      emit("confirm", payload);
       popVisible.value = false;
     };
     const cycleSort = () => {
@@ -150,51 +175,95 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       var _a;
       return (_a = props.column) == null ? void 0 : _a.tooltip;
     });
-    const renderValueField = () => {
-      var _a, _b, _c, _d, _e;
-      if (!needValueInput.value) return null;
+    const optionsSourceProps = computed(() => {
+      const config = getHeaderFilterObject();
+      const col = props.column;
+      return {
+        options: config.options !== void 0 ? config.options : col.options,
+        autoDict: col.autoDict,
+        optionsMap: col.optionsMap,
+        prop: col.prop,
+        valueType: col.valueType
+      };
+    });
+    const { customOptions: resolvedOptions } = useGetOptions(optionsSourceProps);
+    const fieldPropsForFilter = computed(
+      () => {
+        var _a;
+        return ((_a = props.column) == null ? void 0 : _a.fieldProps) || {};
+      }
+    );
+    const resolvedInteractionType = computed(() => {
+      var _a;
+      const customConfig = getHeaderFilterObject();
       const vt = String(((_a = props.column) == null ? void 0 : _a.valueType) || "").toLowerCase();
-      const fp = ((_b = props.column) == null ? void 0 : _b.fieldProps) || {};
-      if (vt === "time-picker") {
-        return h(ElTimePicker, {
-          ...fp,
-          format: (_c = fp == null ? void 0 : fp.format) != null ? _c : "HH:mm:ss",
-          valueFormat: (_d = fp == null ? void 0 : fp.valueFormat) != null ? _d : "HH:mm:ss",
-          modelValue: state.inputVal,
-          "onUpdate:modelValue": (v) => state.inputVal = String(v != null ? v : ""),
-          style: "margin-top: 4px; width: 100%"
-        });
+      return resolveInteractionType(customConfig.type, props.fieldConfig, vt);
+    });
+    const hideOperatorList = computed(() => {
+      var _a;
+      const t = resolvedInteractionType.value;
+      const customConfig = getHeaderFilterObject();
+      const mult = (_a = customConfig.props) == null ? void 0 : _a.multiple;
+      if (t === "checkbox") return true;
+      if (t === "date-picker") return true;
+      if (t === "select" && mult) return true;
+      if (t === "tree-select" && mult) return true;
+      return false;
+    });
+    const popoverWidth = computed(() => hideOperatorList.value ? 320 : 220);
+    watch(popVisible, (visible) => {
+      var _a, _b;
+      if (!visible) return;
+      const t = resolvedInteractionType.value;
+      const customConfig = getHeaderFilterObject();
+      const fp = {
+        ...fieldPropsForFilter.value,
+        ...customConfig.props || {}
+      };
+      if (t === "date-picker" && isRangeType(fp.type)) {
+        if (state.selectedOp !== "between") state.selectedOp = "between";
+        if (!state.inputVal) {
+          const now = /* @__PURE__ */ new Date();
+          const y = now.getFullYear();
+          const m = String(now.getMonth() + 1).padStart(2, "0");
+          state.inputVal = `${y}-${m},${y}-${m}`;
+        }
+      } else if (t === "checkbox" || t === "select" && ((_a = customConfig.props) == null ? void 0 : _a.multiple) || t === "tree-select" && ((_b = customConfig.props) == null ? void 0 : _b.multiple)) {
+        if (state.selectedOp !== "in") state.selectedOp = "in";
       }
-      if (vt === "time-select") {
-        return h(ElTimeSelect, {
-          ...fp,
-          modelValue: state.inputVal,
-          "onUpdate:modelValue": (v) => {
-            const raw = String(v != null ? v : "");
-            const nv = raw && /^\d{2}:\d{2}$/.test(raw) ? `${raw}:00` : raw;
-            state.inputVal = nv;
-          },
-          style: "margin-top: 4px; width: 100%"
+    });
+    const renderValueField = () => {
+      var _a;
+      if (!needValueInput.value) return null;
+      const customConfig = getHeaderFilterObject();
+      const customProps = customConfig.props || {};
+      if (customConfig.renderField && typeof customConfig.renderField === "function") {
+        return customConfig.renderField(state.inputVal, (v) => {
+          state.inputVal = Array.isArray(v) ? v.join(",") : String(v != null ? v : "");
         });
       }
-      if (vt === "date-picker") {
-        return h(ElDatePicker, {
-          ...fp,
-          valueFormat: (_e = fp == null ? void 0 : fp.valueFormat) != null ? _e : "YYYY-MM-DD HH:mm:ss",
-          modelValue: state.inputVal,
-          "onUpdate:modelValue": (v) => {
-            const nv = Array.isArray(v) ? v.join(",") : String(v != null ? v : "");
-            state.inputVal = nv;
-          },
-          style: "margin-top: 4px; width: 100%"
+      const interactionType = resolvedInteractionType.value;
+      const fp = {
+        ...((_a = props.column) == null ? void 0 : _a.fieldProps) || {},
+        ...customProps
+      };
+      const strategy = interactionType ? FILTER_COMPONENT_STRATEGIES[interactionType] : void 0;
+      if (strategy) {
+        const finalOptions = resolveFilterOptions(resolvedOptions.value, customConfig.options);
+        return strategy.render({
+          fp,
+          inputVal: state.inputVal,
+          setInputVal: (v) => state.inputVal = v,
+          options: finalOptions
         });
       }
       return h(ElInput, {
+        ...fp,
         modelValue: state.inputVal,
         "onUpdate:modelValue": (v) => state.inputVal = v,
-        placeholder: "",
+        placeholder: fp.placeholder || "\u8BF7\u8F93\u5165",
         maxlength: 50,
-        style: "margin-top: 4px; width: 100%"
+        style: FILTER_FIELD_STYLE
       });
     };
     return (_ctx, _cache) => {
@@ -210,9 +279,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
             gap: "4px",
             cursor: "default"
           },
-          onMousedown: _cache[1] || (_cache[1] = withModifiers(() => {
+          onMousedown: _cache[2] || (_cache[2] = withModifiers(() => {
           }, ["stop"])),
-          onClick: _cache[2] || (_cache[2] = withModifiers(() => {
+          onClick: _cache[3] || (_cache[3] = withModifiers(() => {
           }, ["stop"]))
         },
         [
@@ -223,13 +292,13 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
             {
               class: normalizeClass(["yc-header-filter-cell__label", {
                 "yc-header-filter-cell__label--ellipsis": shouldShowEllipsis.value,
-                "yc-header-filter-cell__label--active": isAscActive.value || isDescActive.value || isActive.value
+                "yc-header-filter-cell__label--active": !_ctx.hideSort && (isAscActive.value || isDescActive.value) || isActive.value
               }]),
-              style: {
+              style: normalizeStyle({
                 userSelect: "none",
-                cursor: "pointer"
-              },
-              onClick: withModifiers(cycleSort, ["stop"])
+                cursor: _ctx.hideSort ? "default" : "pointer"
+              }),
+              onClick: _cache[0] || (_cache[0] = withModifiers(($event) => !_ctx.hideSort && cycleSort(), ["stop"]))
             },
             [
               _ctx.referenceRenderer ? (openBlock(), createBlock(resolveDynamicComponent(_ctx.referenceRenderer), { key: 0 })) : (openBlock(), createElementBlock(
@@ -288,8 +357,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
                 /* STABLE_FRAGMENT */
               ))
             ],
-            2
-            /* CLASS */
+            6
+            /* CLASS, STYLE */
           ),
           createCommentVNode(" tooltip \u56FE\u6807\uFF08\u95EE\u53F7\uFF09- \u4EC5\u5728\u672A\u4F7F\u7528\u81EA\u5B9A\u4E49\u6E32\u67D3\u65F6\u663E\u793A "),
           columnTooltip.value && !_ctx.referenceRenderer ? (openBlock(), createBlock(
@@ -318,8 +387,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
             16
             /* FULL_PROPS */
           )) : createCommentVNode("v-if", true),
-          createCommentVNode(" \u6392\u5E8F\u56FE\u6807 "),
-          createElementVNode("span", {
+          createCommentVNode(" \u6392\u5E8F\u56FE\u6807\uFF0C\u5F53 hideSort \u4E3A true \u65F6\u9690\u85CF "),
+          !_ctx.hideSort ? (openBlock(), createElementBlock("span", {
+            key: 1,
             class: "yc-header-filter-cell__sort",
             style: {
               display: "inline-flex",
@@ -352,20 +422,22 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
               _: 1
               /* STABLE */
             }, 8, ["style"])
-          ]),
+          ])) : createCommentVNode("v-if", true),
           createCommentVNode(" \u7B5B\u9009\u56FE\u6807\u548C\u5F39\u7A97 "),
           !_ctx.disableFilter ? (openBlock(), createBlock(unref(ElPopover), {
-            key: 1,
+            key: 2,
+            visible: popVisible.value,
             trigger: "click",
             placement: "bottom-start",
-            width: 220,
-            visible: popVisible.value,
-            "onUpdate:visible": _cache[0] || (_cache[0] = ($event) => popVisible.value = $event),
+            width: popoverWidth.value,
             "popper-class": "yc-header-filter-pop",
             "popper-style": { zIndex: 4e3 }
           }, {
             reference: withCtx(() => [
-              createElementVNode("span", _hoisted_3, [
+              createElementVNode("span", {
+                style: { cursor: "pointer", display: "inline-flex", alignItems: "center" },
+                onClick: _cache[1] || (_cache[1] = withModifiers(($event) => popVisible.value = !popVisible.value, ["stop"]))
+              }, [
                 createVNode(unref(YcSvgIcon), {
                   src: filterIconUrl.value,
                   size: 14,
@@ -375,9 +447,29 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
               ])
             ]),
             default: withCtx(() => [
-              createElementVNode("div", _hoisted_4, [
-                createCommentVNode(" \u64CD\u4F5C\u7B26\u5217\u8868 "),
-                createElementVNode("div", _hoisted_5, [
+              createElementVNode("div", _hoisted_3, [
+                createCommentVNode(" \u64CD\u4F5C\u6309\u94AE\uFF08\u7F6E\u9876\u53F3\u4FA7\uFF0C\u907F\u514D\u4E0B\u62C9\u9009\u62E9\u5668\u906E\u6321\uFF09 "),
+                createElementVNode("div", _hoisted_4, [
+                  createVNode(unref(ElButton), { onClick: handleReset }, {
+                    default: withCtx(() => [
+                      createTextVNode("\u91CD\u7F6E")
+                    ]),
+                    _: 1
+                    /* STABLE */
+                  }),
+                  createVNode(unref(ElButton), {
+                    type: "primary",
+                    onClick: handleConfirm
+                  }, {
+                    default: withCtx(() => [
+                      createTextVNode("\u786E\u5B9A")
+                    ]),
+                    _: 1
+                    /* STABLE */
+                  })
+                ]),
+                createCommentVNode(" \u64CD\u4F5C\u7B26\u5217\u8868\uFF08\u591A\u9009/\u65E5\u671F\u533A\u95F4\u7B49\u7531 hideOperatorList \u9690\u85CF\uFF0C\u9ED8\u8BA4 in / between\uFF09 "),
+                !hideOperatorList.value ? (openBlock(), createElementBlock("div", _hoisted_5, [
                   (openBlock(true), createElementBlock(
                     Fragment,
                     null,
@@ -410,34 +502,14 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
                     128
                     /* KEYED_FRAGMENT */
                   ))
-                ]),
+                ])) : createCommentVNode("v-if", true),
                 createCommentVNode(" \u503C\u8F93\u5165 "),
-                needValueInput.value ? (openBlock(), createBlock(resolveDynamicComponent(renderValueField), { key: 0 })) : createCommentVNode("v-if", true),
-                createCommentVNode(" \u64CD\u4F5C\u6309\u94AE "),
-                createElementVNode("div", _hoisted_8, [
-                  createVNode(unref(ElButton), { onClick: handleReset }, {
-                    default: withCtx(() => [
-                      createTextVNode("\u91CD\u7F6E")
-                    ]),
-                    _: 1
-                    /* STABLE */
-                  }),
-                  createVNode(unref(ElButton), {
-                    type: "primary",
-                    onClick: handleConfirm
-                  }, {
-                    default: withCtx(() => [
-                      createTextVNode("\u786E\u5B9A")
-                    ]),
-                    _: 1
-                    /* STABLE */
-                  })
-                ])
+                needValueInput.value ? (openBlock(), createBlock(resolveDynamicComponent(renderValueField), { key: 1 })) : createCommentVNode("v-if", true)
               ])
             ]),
             _: 1
             /* STABLE */
-          }, 8, ["visible"])) : createCommentVNode("v-if", true)
+          }, 8, ["visible", "width"])) : createCommentVNode("v-if", true)
         ],
         544
         /* NEED_HYDRATION, NEED_PATCH */

package/es/components/yc-plus-page/src/index.vue.d.ts

@@ -2,7 +2,8 @@ import { Options } from 'sortablejs';
 import { LooseRequired } from '@vue/shared';
 import { Arrayable, EpPropMergeType } from 'element-plus/es/utils';
 import { TableProps, CardProps, RowProps, ColProps, FormItemRule, FormInstance, ElTooltipProps, FormItemProps, ProgressFn, CascaderNode, PopperEffect, InputAutoSize, AutocompleteProps, CheckboxGroupProps, ColorPickerProps, DatePickerProps, InputProps, InputNumberProps, RadioGroupProps, RateProps, SelectProps, SliderProps, SwitchProps, TimePickerDefaultProps, TimeSelectProps, TextProps, ImageProps, LinkProps, TagProps, ProgressProps, TableColumnCtx, TableInstance, TableV2Instance } from 'element-plus';
-import { PlusFormSelfProps, ElementPlusFormProps, RecordType, PlusTableSelfProps, PlusPaginationProps, Mutable, PlusFormGroupRow, PlusFormItemProps, PlusRadioProps, PlusDatePickerProps, PlusInputTagProps, TableValueType, ActionBarProps, ColumnSetting, ButtonsCallBackParams, FormChangeCallBackParams, FilterTableHeaderEventType, TableFormRefRow, VirtualTableColumn } from 'packages/yc-components';
+import { RecordType, Mutable, TableValueType } from 'yc-pro-components';
+import { PlusFormSelfProps, ElementPlusFormProps, PlusTableSelfProps, PlusPaginationProps, PlusFormGroupRow, PlusFormItemProps, PlusRadioProps, PlusDatePickerProps, PlusInputTagProps, ActionBarProps, ColumnSetting, ButtonsCallBackParams, FormChangeCallBackParams, FilterTableHeaderEventType, TableFormRefRow, VirtualTableColumn } from 'packages/yc-components';
 import { RequestResponse, HeaderFilterConfig, HeaderFilterPayload, HeaderFilterResetPayload, HeaderFiltersState, OrderByItem, FieldCatalog } from './type';
 import { FieldValues, OmitTypes, CascaderProps, FormItemValueType, FieldValueType } from 'yc-pro-components/es/types/form';
 import { PlusSearchSelfProps } from 'yc-pro-components/es/components/search';
@@ -8000,6 +8001,7 @@ declare const _default: __VLS_WithTemplateSlots< DefineComponent<__VLS_WithDefau
     upsertHeaderFilter: (field: string, op: string, value?: string | undefined) => void;
     removeHeaderFilter: (field: string) => void;
     setOrderBy: (field: string, direction?: "desc" | "asc" | undefined) => void;
+    resetAllHeaderFilters: () => void;
     getList: () => Promise<void> | undefined;
 }, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
     "header-filter-confirm": (payload: HeaderFilterPayload) => void;

package/es/components/yc-plus-page/src/index.vue.mjs

@@ -1,6 +1,6 @@
 import _sfc_main from './index.vue2.mjs';
 import _export_sfc from '../../../_virtual/_plugin-vue_export-helper.mjs';
 
-var YcPlusPageComponent = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-bc9aafd7"], ["__file", "index.vue"]]);
+var YcPlusPageComponent = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-8c4a287b"], ["__file", "index.vue"]]);
 
 export { YcPlusPageComponent as default };

package/es/components/yc-plus-page/src/index.vue2.mjs

@@ -78,7 +78,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       getOpsByProp,
       getMergedQuery,
       updateCatalogs,
-      isFieldFilterable
+      isFieldFilterable,
+      resetAllHeaderFilters
       // isFieldVisible 已在 enhancedColumns 中直接使用 fieldCatalogState 实现
     } = useHeaderFilter({
       headerFilterConfig: () => props.headerFilter,
@@ -123,17 +124,27 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         );
         return (fieldConfig == null ? void 0 : fieldConfig.nullable) !== false;
       }) : cols;
-      if (!isEnabled) return visibleCols;
+      if (!isEnabled) {
+        return visibleCols;
+      }
       return visibleCols.map((col) => {
+        var _a, _b;
         const colHideFilter = col.hideHeaderFilter === true;
-        const fieldFilterable = isFieldFilterable(col.prop);
-        if (colHideFilter || !fieldFilterable) {
+        const hasExplicitHeaderFilter = col.headerFilter && typeof col.headerFilter === "object" || col.headerFilter === true;
+        const fieldFilterable = hasExplicitHeaderFilter || isFieldFilterable(col.prop);
+        if (colHideFilter) {
+          return col;
+        }
+        if (!hasExplicitHeaderFilter && !fieldFilterable) {
           return col;
         }
         const operators = getOpsByProp(col.prop);
+        const colHeaderFilter = col.headerFilter && typeof col.headerFilter === "object" ? col.headerFilter : {};
+        const globalHeaderFilter = props.headerFilter && typeof props.headerFilter === "object" ? props.headerFilter : {};
+        const columnHideSort = (_b = (_a = colHeaderFilter.hideSort) != null ? _a : globalHeaderFilter.hideSort) != null ? _b : false;
         const FILTER_ICON_WIDTH = 24;
         const SORT_ICON_WIDTH = 16;
-        const EXTRA_WIDTH = FILTER_ICON_WIDTH + SORT_ICON_WIDTH;
+        const EXTRA_WIDTH = FILTER_ICON_WIDTH + (columnHideSort ? 0 : SORT_ICON_WIDTH);
         const originalWidth = col.width || col.minWidth;
         let adjustedWidth = originalWidth;
         if (typeof originalWidth === "number") {
@@ -141,9 +152,13 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         } else if (typeof originalWidth === "string") {
           const numWidth = parseInt(originalWidth, 10);
           if (!isNaN(numWidth)) {
-            adjustedWidth = numWidth + EXTRA_WIDTH;
+            adjustedWidth = String(numWidth + EXTRA_WIDTH);
           }
         }
+        const propStr = String(col.prop || "");
+        const fieldConfig = catalog ? Object.values(catalog).find(
+          (val) => String((val == null ? void 0 : val.allowedField) || "") === propStr
+        ) : void 0;
         const userRenderHeader = col.renderHeader;
         return {
           ...col,
@@ -156,9 +171,11 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
               operators,
               filters: headerFiltersState.filters,
               orderBy: orderByState,
+              hideSort: columnHideSort,
               onConfirm: handleFilterConfirm,
               onReset: handleFilterReset,
               onSortChange: handleSortChange,
+              fieldConfig,
               // 如果用户定义了 renderHeader，传递给 referenceRenderer
               ...userRenderHeader && typeof userRenderHeader === "function" ? { referenceRenderer: () => userRenderHeader(label, col) } : {}
             });
@@ -446,6 +463,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       upsertHeaderFilter,
       removeHeaderFilter,
       setOrderBy,
+      resetAllHeaderFilters,
       getList: () => {
         var _a, _b;
         return (_b = (_a = plusPageRef.value) == null ? void 0 : _a.getList) == null ? void 0 : _b.call(_a);

package/es/components/yc-plus-page/src/type.d.ts

@@ -63,17 +63,29 @@ export interface HeaderFilterConfig {
         field: string;
         direction: 'asc' | 'desc';
     }>;
+    /** 是否隐藏所有列的排序图标（全局配置），默认 false。列级 headerFilter.hideSort 优先 */
+    hideSort?: boolean;
 }
 /**
  * 列级别的表头筛选配置
  */
 export interface ColumnHeaderFilterConfig {
+    /** 筛选交互组件类型，若未配置则根据 column.valueType 自动推断 */
+    type?: 'input' | 'select' | 'date-picker' | 'time-picker' | 'time-select' | 'cascader' | 'tree-select' | 'checkbox';
+    /** 极度自定义的渲染函数接管（如自定义业务弹窗或滑动条等），通过回调更新组件抛出的 filter 值 */
+    renderField?: <T = any>(value: T, onChange: (val: T) => void) => any;
+    /** 传递给筛选渲染组件的 props，例如 { multiple: true } */
+    props?: Record<string, unknown>;
+    /** 如果想独立设置筛选组件的 options 数据源，支持传入数组或 Promise。未设置则回退取 column.options 或 autoDict */
+    options?: any[] | Promise<any[]> | ((column: any) => any[]);
     /** 自定义操作符列表 */
     operators?: OperatorOption[];
     /** 确认回调 */
     onConfirm?: (payload: HeaderFilterPayload) => void;
     /** 重置回调 */
     onReset?: (payload: HeaderFilterResetPayload) => void;
+    /** 是否隐藏该列的排序图标，默认 false。优先级高于全局 HeaderFilterConfig.hideSort */
+    hideSort?: boolean;
 }
 /**
  * 表头筛选确认事件 payload

package/es/components/yc-plus-page/src/use-header-filter.d.ts

@@ -48,6 +48,8 @@ export interface UseHeaderFilterReturn {
     isFieldFilterable: (prop?: string) => boolean;
     /** 判断字段是否允许显示（基于 fieldCatalog 的 nullable 属性） */
     isFieldVisible: (prop?: string) => boolean;
+    /** 重置所有筛选条件和排序状态 */
+    resetAllHeaderFilters: () => void;
 }
 /**
  * 表头筛选 Hook

package/es/components/yc-plus-page/src/use-header-filter.mjs

@@ -12,11 +12,11 @@ function useHeaderFilter(options = {}) {
   const isEnabled = computed(() => {
     const hideHeaderFilter = getHideHeaderFilter();
     const headerFilterConfig = getHeaderFilterConfig();
-    if (hideHeaderFilter === true) return false;
-    if (typeof headerFilterConfig === "boolean") return headerFilterConfig;
     if (headerFilterConfig && typeof headerFilterConfig === "object") {
       return headerFilterConfig.enabled !== false;
     }
+    if (typeof headerFilterConfig === "boolean") return headerFilterConfig;
+    if (hideHeaderFilter === true) return false;
     return false;
   });
   const operatorCatalogState = computed(() => {
@@ -126,22 +126,39 @@ function useHeaderFilter(options = {}) {
       orderByState.push(next);
     }
   };
+  const resetAllHeaderFilters = () => {
+    headerFiltersState.filters.splice(0);
+    orderByState.splice(0);
+  };
   const getMergedQuery = (baseQuery) => {
+    const normalizeFilters = (filters) => {
+      return filters.map((f) => {
+        if (f.op === "in" && typeof f.value === "string" && f.value) {
+          const arr = f.value.split(",").filter(Boolean).map((s) => {
+            const n = Number(s);
+            return Number.isNaN(n) ? s : n;
+          });
+          return { ...f, value: arr };
+        }
+        return f;
+      });
+    };
     let mergedFilters = baseQuery.filters;
     if (headerFiltersState.filters.length > 0) {
+      const normalized = normalizeFilters(headerFiltersState.filters);
       const baseFilters = baseQuery.filters;
       if (baseFilters && typeof baseFilters === "object" && Array.isArray(baseFilters.filters)) {
         mergedFilters = {
           logic: baseFilters.logic || "and",
           filters: [
             ...baseFilters.filters,
-            ...headerFiltersState.filters
+            ...normalized
           ]
         };
       } else {
         mergedFilters = {
           logic: headerFiltersState.logic,
-          filters: [...headerFiltersState.filters]
+          filters: [...normalized]
         };
       }
     }
@@ -165,7 +182,8 @@ function useHeaderFilter(options = {}) {
     getMergedQuery,
     updateCatalogs,
     isFieldFilterable,
-    isFieldVisible
+    isFieldVisible,
+    resetAllHeaderFilters
   };
 }
 

package/es/components/yc-select-v2/src/index.vue2.mjs

@@ -34,7 +34,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     collapseTags: { type: Boolean, default: false },
     maxCollapseTags: { default: 1 },
     initialOptions: { default: () => [] },
-    allSelect: { type: Boolean, default: false }
+    allSelect: { type: Boolean, default: false },
+    popperClass: {}
   },
   emits: ["update:modelValue", "change"],
   setup(__props, { expose: __expose, emit: __emit }) {
@@ -364,6 +365,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         multiple: _ctx.multiple,
         "collapse-tags": _ctx.collapseTags,
         "max-collapse-tags": _ctx.maxCollapseTags,
+        "popper-class": _ctx.popperClass,
         onVisibleChange: handleVisibleChange,
         onChange: handleChange,
         onClear: handleClear,
@@ -388,7 +390,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         ]),
         _: 1
         /* STABLE */
-      }, 8, ["modelValue", "filterable", "remote", "reserve-keyword", "placeholder", "clearable", "disabled", "loading", "filter-method", "allow-create", "default-first-option", "multiple", "collapse-tags", "max-collapse-tags"])), [
+      }, 8, ["modelValue", "filterable", "remote", "reserve-keyword", "placeholder", "clearable", "disabled", "loading", "filter-method", "allow-create", "default-first-option", "multiple", "collapse-tags", "max-collapse-tags", "popper-class"])), [
         [_directive_load_more, handleLoadMore]
       ]);
     };

package/es/components/yc-select-v2/src/type.d.ts

@@ -80,4 +80,6 @@ export interface YcSelectV2Props {
     initialOptions?: SelectOption[];
     /** 是否启用全选功能（仅多选时有效） */
     allSelect?: boolean;
+    /** 下拉弹层自定义类名，用于控制 z-index 等样式 */
+    popperClass?: string;
 }