@pisell/materials 6.3.27 → 6.3.28

package/lib/components/pisellDataSourceContainer/components/Table/useColumns.js

@@ -24,18 +24,31 @@ __export(useColumns_exports, {
 module.exports = __toCommonJS(useColumns_exports);
 var import_react = require("react");
 var import_ColumnsSetting = require("../ColumnsSetting");
+var import_utils = require("../ColumnsSetting/utils");
 var useColumns = (params) => {
-  const { columns, scopeId, refManager } = params;
+  const { columns, scopeId, refManager, __id } = params;
   const [columnSettings, setColumnSettings] = (0, import_react.useState)([]);
   (0, import_react.useEffect)(() => {
     if (!(columns == null ? void 0 : columns.length)) return;
-    const settings = columns.map((col, index) => ({
-      key: col.key || col.dataIndex,
+    const mergedColumns = (0, import_utils.mergeColumnSettingSimple)({
+      columns: columns.map((col, index) => ({
+        key: col.key || col.dataIndex,
+        dataIndex: col.dataIndex,
+        title: col.title,
+        titleString: typeof col.title === "string" ? col.title : col.dataIndex,
+        isShow: typeof col.isShow === "boolean" ? col.isShow : true,
+        sortIndex: index,
+        fixed: col.fixed
+      })),
+      componentId: __id
+    });
+    const settings = mergedColumns.map((col) => ({
+      key: col.key,
       dataIndex: col.dataIndex,
       title: col.title,
-      titleString: typeof col.title === "string" ? col.title : col.dataIndex,
-      isShow: typeof col.isShow === "boolean" ? col.isShow : true,
-      sortIndex: index,
+      titleString: col.titleString,
+      isShow: col.isShow,
+      sortIndex: col.sortIndex,
       fixed: col.fixed
     }));
     refManager.setSharedState(
@@ -43,7 +56,7 @@ var useColumns = (params) => {
       settings
     );
     setColumnSettings(settings);
-  }, [columns, refManager, scopeId]);
+  }, [columns, refManager, scopeId, __id]);
   (0, import_react.useEffect)(() => {
     const unsubscribe = refManager.subscribeSharedState(
       import_ColumnsSetting.COLUMNS_SHARED_STATE_KEYS.columnsChange(scopeId),
@@ -51,14 +64,12 @@ var useColumns = (params) => {
     );
     return unsubscribe;
   }, [refManager, scopeId]);
-  const visibleColumns = (0, import_react.useMemo)(() => {
-    if (!(columns == null ? void 0 : columns.length)) return [];
-    if (!(columnSettings == null ? void 0 : columnSettings.length)) return columns;
+  return (0, import_react.useMemo)(() => {
+    if (!(columns == null ? void 0 : columns.length)) return { visibleColumns: [] };
+    if (!(columnSettings == null ? void 0 : columnSettings.length)) return { visibleColumns: columns };
     const columnMap = new Map(columns.map((col) => [col.dataIndex, col]));
-    return columnSettings.filter((setting) => setting.isShow).map((setting) => columnMap.get(setting.dataIndex)).filter(Boolean);
+    const visibleColumns = columnSettings.filter((setting) => setting.isShow).map((setting) => columnMap.get(setting.dataIndex)).filter(Boolean);
+    return { visibleColumns };
   }, [columns, columnSettings]);
-  return {
-    visibleColumns
-  };
 };
 var useColumns_default = useColumns;

package/lib/components/pisellDataSourceContainer/utils/formatData.d.ts

@@ -0,0 +1,9 @@
+declare const formatListResult: (result: any) => {
+    list: any;
+    count: any;
+};
+declare const formatListParams: (params: any) => {
+    page: any;
+    pageSize: any;
+};
+export { formatListParams, formatListResult };

package/lib/components/pisellDatePicker/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const PisellDatePicker: (props: any) => import("react").JSX.Element;
 export default PisellDatePicker;

package/lib/components/pisellDateTimeDisplay/PisellDateTimeDisplay.js

@@ -41,9 +41,12 @@ var import_hooks = require("./hooks");
 var import_utils = require("./utils");
 var import_components = require("./components");
 var import_dateTimeDisplayFormats = require("./formats/dateTimeDisplayFormats");
+var import_useEngineContext = __toESM(require("../../hooks/useEngineContext"));
 var import_PisellDateTimeDisplay = require("./PisellDateTimeDisplay.less");
 var PisellDateTimeDisplay = (props) => {
+  var _a, _b;
   const {
+    value: valueProp,
     layout = "horizontal",
     textAlign = "center",
     fields,
@@ -65,7 +68,9 @@ var PisellDateTimeDisplay = (props) => {
     className,
     style
   } = props;
-  const localeKey = (0, import_utils.getDayjsLocale)(locale);
+  const context = (0, import_useEngineContext.default)();
+  const resolvedLocale = locale || ((_b = (_a = context == null ? void 0 : context.engine) == null ? void 0 : _a.props) == null ? void 0 : _b.locale) || "en";
+  const localeKey = (0, import_utils.getDayjsLocale)(resolvedLocale);
   const baseLocale = localeKey.split("-")[0];
   const presetSource = formatByLocale ?? import_dateTimeDisplayFormats.DATETIME_DISPLAY_FORMATS;
   const preset = presetSource[localeKey] ?? presetSource[baseLocale] ?? {};
@@ -76,12 +81,13 @@ var PisellDateTimeDisplay = (props) => {
   const computedRefreshInterval = refreshInterval ?? (0, import_utils.getRefreshInterval)(effectiveTimeFormat);
   const currentTime = (0, import_hooks.useCurrentTime)({
     refreshInterval: computedRefreshInterval,
-    disabled: disableAutoRefresh,
-    locale,
+    disabled: disableAutoRefresh || valueProp !== void 0,
+    locale: resolvedLocale,
     onUpdate: onTimeUpdate
   });
+  const displayTime = valueProp !== void 0 && valueProp !== null ? (0, import_dayjs.default)(valueProp).locale(localeKey) : currentTime;
   if (customFormat) {
-    const formattedTime = currentTime.format(customFormat);
+    const formattedTime = displayTime.format(customFormat);
     const containerInlineStyle2 = {
       background: containerStyle == null ? void 0 : containerStyle.background,
       borderRadius: containerStyle == null ? void 0 : containerStyle.borderRadius,
@@ -108,7 +114,7 @@ var PisellDateTimeDisplay = (props) => {
     fieldOrder = ["time", "date", "weekday"]
   } = effectiveFields || {};
   const referenceDate = (0, import_dayjs.default)();
-  const relativeDay = (effectiveDateFormat == null ? void 0 : effectiveDateFormat.showRelativeDay) ? (0, import_utils.getRelativeDay)(currentTime, referenceDate) : null;
+  const relativeDay = (effectiveDateFormat == null ? void 0 : effectiveDateFormat.showRelativeDay) ? (0, import_utils.getRelativeDay)(displayTime, referenceDate) : null;
   const hideWeekdayWhenDateRelative = showDate && relativeDay !== null;
   const containerInlineStyle = {
     background: containerStyle == null ? void 0 : containerStyle.background,
@@ -127,7 +133,7 @@ var PisellDateTimeDisplay = (props) => {
           import_components.TimeDisplay,
           {
             key: "time",
-            time: currentTime,
+            time: displayTime,
             format: effectiveTimeFormat,
             style: timeStyle
           }
@@ -137,7 +143,7 @@ var PisellDateTimeDisplay = (props) => {
           import_components.DateDisplay,
           {
             key: "date",
-            date: currentTime,
+            date: displayTime,
             format: effectiveDateFormat,
             referenceDate: (0, import_dayjs.default)(),
             style: dateStyle
@@ -148,7 +154,7 @@ var PisellDateTimeDisplay = (props) => {
           import_components.WeekdayDisplay,
           {
             key: "weekday",
-            weekday: currentTime,
+            weekday: displayTime,
             format: effectiveWeekdayFormat,
             style: weekdayStyle
           }
@@ -179,12 +185,12 @@ var PisellDateTimeDisplay = (props) => {
   }
   if (layout === "horizontal") {
     const timeField = showTime ? renderField("time") : null;
-    const currentLocale = currentTime.locale();
+    const currentLocale = displayTime.locale();
     const isChinese = (0, import_utils.isChinese)(currentLocale);
     if (showDate && showWeekday) {
       const labels = effectiveDateFormat == null ? void 0 : effectiveDateFormat.relativeDayLabels;
-      const dateStr = relativeDay ? (labels == null ? void 0 : labels[relativeDay]) ?? (0, import_utils.getRelativeDayLabel)(relativeDay, currentTime.locale()) : isChinese ? currentTime.format("M月D日") : currentTime.format("D MMM");
-      const weekdayStr = currentTime.format("ddd");
+      const dateStr = relativeDay ? (labels == null ? void 0 : labels[relativeDay]) ?? (0, import_utils.getRelativeDayLabel)(relativeDay, displayTime.locale()) : isChinese ? displayTime.format("M月D日") : displayTime.format("D MMM");
+      const weekdayStr = displayTime.format("ddd");
       const combinedStr = relativeDay ? dateStr : isChinese ? `${weekdayStr} ${dateStr}` : `${weekdayStr}, ${dateStr}`;
       const dateInlineStyle = {
         fontSize: dateStyle == null ? void 0 : dateStyle.fontSize,

package/lib/components/pisellDateTimeDisplay/PisellDateTimeDisplay.less

@@ -64,9 +64,10 @@
     line-height: 1.2;
   }
 
-  // 分隔符
+  // 分隔符：保留空格占位，避免纯空格时被折叠不显示
   &-separator {
     display: inline-block;
+    white-space: pre;
   }
 
   // 自定义格式化

package/lib/components/pisellDateTimeDisplay/hooks/useCurrentTime.js

@@ -36,7 +36,9 @@ var import_react = require("react");
 var import_dayjs = __toESM(require("dayjs"));
 var import_localeUtils = require("../utils/localeUtils");
 var import_usePisellConfig = __toESM(require("../../pisell-config-provider/hooks/usePisellConfig"));
+var import_useEngineContext = __toESM(require("../../../hooks/useEngineContext"));
 function useCurrentTime(options) {
+  var _a, _b;
   const {
     refreshInterval = 6e4,
     disabled = false,
@@ -44,8 +46,12 @@ function useCurrentTime(options) {
     onUpdate
   } = options || {};
   const globalConfig = (0, import_usePisellConfig.default)();
+  const context = (0, import_useEngineContext.default)();
   const globalLocale = globalConfig == null ? void 0 : globalConfig.locale;
-  const dayjsLocale = (0, import_localeUtils.getDayjsLocale)(userLocale || globalLocale);
+  const engineLocale = (_b = (_a = context == null ? void 0 : context.engine) == null ? void 0 : _a.props) == null ? void 0 : _b.locale;
+  const dayjsLocale = (0, import_localeUtils.getDayjsLocale)(
+    userLocale || globalLocale || engineLocale || "en"
+  );
   const [currentTime, setCurrentTime] = (0, import_react.useState)(() => {
     const time = (0, import_dayjs.default)();
     return time.locale(dayjsLocale);

package/lib/components/pisellDateTimeDisplay/types.d.ts

@@ -247,6 +247,11 @@ export interface DateTimeDisplayFormatPreset {
  * PisellDateTimeDisplay 组件 Props
  */
 export interface PisellDateTimeDisplayProps {
+    /**
+     * 传入时展示该时间，不传则展示当前时间（并可按 refreshInterval 刷新）
+     * @description 用于表格列、详情等展示给定时间；支持 dayjs、时间戳、ISO 字符串
+     */
+    value?: Dayjs | string | number;
     /**
      * 布局方向
      * @default 'horizontal'

package/lib/components/pisellDateTimeDisplay/utils/localeUtils.d.ts

@@ -14,9 +14,9 @@ export declare function normalizeLocale(locale: string): string;
 export declare function isChinese(locale: string): boolean;
 /**
  * 获取 dayjs 兼容的 locale 代码
- * 未传 locale 时使用 i18n 当前语言（全局配置 / umi_locale），不再使用浏览器语言
+ * 未传 locale 时：优先 materials 当前语言（globalConfig / umi_locale），若为默认 en-US 则用 @pisell/utils getLocale
  * @param locale 原始 locale 代码（可选）
- * @returns dayjs 兼容的 locale 代码
+ * @returns dayjs 兼容的 locale 代码（与已加载的 zh-cn、en 对齐）
  * @example 'zh-CN' -> 'zh-cn', 'en-US' -> 'en'
  */
 export declare function getDayjsLocale(locale?: string): string;

package/lib/components/pisellDateTimeDisplay/utils/localeUtils.js

@@ -24,6 +24,7 @@ __export(localeUtils_exports, {
   normalizeLocale: () => normalizeLocale
 });
 module.exports = __toCommonJS(localeUtils_exports);
+var import_utils = require("@pisell/utils");
 var import_locale = require("../../../utils/locale");
 function normalizeLocale(locale) {
   return locale.toLowerCase();
@@ -32,11 +33,18 @@ function isChinese(locale) {
   const normalizedLocale = normalizeLocale(locale);
   return normalizedLocale.startsWith("zh");
 }
+function toDayjsLoadedLocale(normalized) {
+  if (normalized.startsWith("en")) return "en";
+  return normalized;
+}
 function getDayjsLocale(locale) {
   if (!locale) {
-    return normalizeLocale((0, import_locale.getCurrentLocale)());
+    const fromMaterials = (0, import_locale.getCurrentLocale)();
+    const fromUtils = typeof import_utils.locales.getLocale === "function" ? import_utils.locales.getLocale() : void 0;
+    const raw = (fromMaterials && fromMaterials !== "en-US" ? fromMaterials : void 0) || (typeof fromUtils === "string" && fromUtils ? fromUtils : void 0) || fromMaterials;
+    return toDayjsLoadedLocale(normalizeLocale(raw));
   }
-  return normalizeLocale(locale);
+  return toDayjsLoadedLocale(normalizeLocale(locale));
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/components/pisellDateTimeDisplay/utils/relativeDay.d.ts

@@ -15,6 +15,7 @@ export declare type RelativeDay = 'today' | 'yesterday' | 'tomorrow';
 export declare function getRelativeDay(date: Dayjs, reference: Dayjs): RelativeDay | null;
 /**
  * 根据 locale 返回相对日期的展示文案
+ * 未传 locale 时使用 getDayjsLocale()（与 locales.getLocale 同源）
  *
  * @param day 'today' | 'yesterday' | 'tomorrow'
  * @param locale dayjs locale，如 'zh-cn'、'en'

package/lib/components/pisellDateTimeDisplay/utils/relativeDay.js

@@ -44,7 +44,8 @@ function getRelativeDay(date, reference) {
   return null;
 }
 function getRelativeDayLabel(day, locale) {
-  const isZh = locale ? (0, import_localeUtils.isChinese)(locale) : false;
+  const resolvedLocale = locale ?? (0, import_localeUtils.getDayjsLocale)();
+  const isZh = (0, import_localeUtils.isChinese)(resolvedLocale);
   return isZh ? LABELS_ZH[day] : LABELS_EN[day];
 }
 // Annotate the CommonJS export names for ESM import in node:

package/lib/components/pisellEmail/PisellEmail.less

@@ -1,31 +1,129 @@
 /**
  * PisellEmail 组件样式
+ * 基于 Figma 设计规范，与 SingleLineText 设计体系一致
  */
 
 .pisell-email {
   &-edit {
+    position: relative;
     width: 100%;
 
-    // 错误提示样式
-    &-error {
-      margin-top: 4px;
-      font-size: 12px;
-      color: #ff4d4f;
-      line-height: 1.5;
+    // 仅对 affix-wrapper 设边框，避免与内层 input 双边框（Figma 设计规范）
+    .pisell-lowcode-input-affix-wrapper {
+      font-size: 16px !important;
+      line-height: 24px !important;
+      border-radius: 8px !important;
+      border: 1px solid #d0d5dd !important; // Gray/300
+      padding: 0 !important;
+      height: 48px !important;
+      color: #101828 !important; // Gray/900
+      background-color: #ffffff !important;
+
+      &:focus,
+      &:focus-within {
+        border-color: #d6bbfb !important; // Primary/300
+        box-shadow: 0 0 0 4px #f4ebff !important; // Primary/100
+        outline: none !important;
+      }
+
+      &:hover:not(:focus):not(:focus-within):not([disabled]) {
+        border-color: #b692f6 !important; // Primary/400
+      }
+
+      &[disabled],
+      &.pisell-lowcode-input-disabled {
+        background-color: #f9fafb !important; // Gray/50
+        color: #98a2b3 !important; // Gray/400
+        border-color: #d0d5dd !important;
+        cursor: not-allowed !important;
+      }
     }
+
+    // 内层 input（无边框，由 wrapper 统一描边）
+    .pisell-lowcode-input-affix-wrapper .pisell-lowcode-input {
+      &::placeholder {
+        color: #667085 !important; // Gray/500
+      }
+    }
+
+    // 带前缀（邮箱图标）的 Input 容器
+    .pisell-lowcode-input-affix-wrapper {
+
+      .pisell-lowcode-input-prefix {
+        margin-right: 8px;
+        margin-left: 16px;
+        color: #667085; // Gray/500
+        font-size: 16px;
+      }
+
+      .pisell-lowcode-input-suffix {
+        margin-left: 8px;
+        margin-right: 16px;
+        color: #667085;
+        font-size: 16px;
+      }
+
+      .pisell-lowcode-input {
+        padding: 12px 0 !important;
+        border: none !important;
+        box-shadow: none !important;
+
+        &:focus {
+          box-shadow: none !important;
+        }
+      }
+    }
+
+    // 清空按钮
+    .pisell-lowcode-input-clear-icon {
+      color: #667085 !important;
+      font-size: 14px !important;
+
+      &:hover {
+        color: #344054 !important; // Gray/700
+      }
+    }
+
+    // 错误状态
+    .pisell-lowcode-input-status-error,
+    .pisell-lowcode-input-affix-wrapper-status-error {
+      border-color: #fda29b !important; // Error/300
+
+      &:focus,
+      &:focus-within {
+        border-color: #f97066 !important; // Error/400
+        box-shadow: 0 0 0 4px #fee4e2 !important; // Error/100
+      }
+
+      &:hover:not(:focus):not(:focus-within) {
+        border-color: #f97066 !important; // Error/400
+      }
+    }
+  }
+
+  // 错误提示（与设计体系一致）
+  &-edit-error {
+    margin-top: 4px;
+    font-size: 12px;
+    color: #d92d20; // Error/600
+    line-height: 1.5;
+    animation: pisell-email-fadeIn 0.3s ease-in-out;
   }
 
   &-read {
     display: inline-flex;
     align-items: center;
 
-    // 链接样式
     .pisell-lowcode-typography-link {
       cursor: pointer;
-      transition: all 0.3s;
+      transition: color 0.2s ease-in-out;
 
       &:hover {
-        opacity: 0.8;
+        color: #6d48c4 !important;
+      }
+
+      &:active {
+        color: #5f3da8 !important;
       }
     }
   }
@@ -40,7 +138,7 @@
   }
 }
 
-// AutoComplete 下拉样式优化
+// AutoComplete 下拉样式
 .pisell-email-autocomplete-dropdown {
   .pisell-lowcode-select-item-option-content {
     display: flex;
@@ -48,3 +146,14 @@
     gap: 8px;
   }
 }
+
+@keyframes pisell-email-fadeIn {
+  from {
+    opacity: 0;
+    transform: translateY(-4px);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}

package/lib/components/pisellEmail/PisellEmail.stories.js

@@ -60,7 +60,7 @@ module.exports = __toCommonJS(PisellEmail_stories_exports);
 var import_PisellEmail = require("./PisellEmail");
 var import_react = __toESM(require("react"));
 var meta = {
-  title: "表单/PisellEmail",
+  title: "表单/表单组件/PisellEmail",
   component: import_PisellEmail.PisellEmail,
   parameters: {
     layout: "centered",

package/lib/components/pisellEmail/constants/emailDomains.d.ts

@@ -0,0 +1,5 @@
+/**
+ * 常用邮箱域名列表
+ * 用于域名自动补全功能
+ */
+export declare const COMMON_EMAIL_DOMAINS: string[];

package/lib/components/pisellEmail/constants/emailRegex.d.ts

@@ -0,0 +1,13 @@
+/**
+ * 邮箱正则表达式常量
+ */
+/**
+ * 标准邮箱格式正则
+ * 覆盖99%的常见邮箱格式
+ */
+export declare const EMAIL_REGEX: RegExp;
+/**
+ * 严格邮箱格式正则（RFC 5322）
+ * 支持更复杂的邮箱格式，符合 RFC 5322 标准
+ */
+export declare const STRICT_EMAIL_REGEX: RegExp;

package/lib/components/pisellEmail/index.d.ts

@@ -1,5 +1,7 @@
 /**
  * PisellEmail 组件导出文件
  */
-export { PisellEmail, default } from './PisellEmail';
+import PisellEmail from './PisellEmail';
+export { PisellEmail };
+export default PisellEmail;
 export type { PisellEmailProps, MailtoOptions } from './types';

package/lib/components/pisellEmail/index.js

@@ -29,11 +29,19 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/components/pisellEmail/index.tsx
 var pisellEmail_exports = {};
 __export(pisellEmail_exports, {
-  PisellEmail: () => import_PisellEmail.PisellEmail,
-  default: () => import_PisellEmail.default
+  PisellEmail: () => import_PisellEmail.default,
+  default: () => pisellEmail_default
 });
 module.exports = __toCommonJS(pisellEmail_exports);
+var import_locales = require("../../locales");
 var import_PisellEmail = __toESM(require("./PisellEmail"));
+import_PisellEmail.default.SortOptions = {
+  getSortItems: (fieldKey) => [
+    { key: `${fieldKey}:asc`, label: (0, import_locales.getText)("sort-a-z") },
+    { key: `${fieldKey}:desc`, label: (0, import_locales.getText)("sort-z-a") }
+  ]
+};
+var pisellEmail_default = import_PisellEmail.default;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   PisellEmail

package/lib/components/pisellEmail/utils/domainSuggestions.d.ts

@@ -0,0 +1,15 @@
+/**
+ * 域名补全工具函数（框架占位符）
+ * TODO: 实现完整的补全逻辑
+ */
+/**
+ * 获取邮箱域名补全建议
+ * @param input 用户输入
+ * @param domains 域名列表
+ * @returns 补全建议列表
+ *
+ * @example
+ * getEmailSuggestions('user@g', COMMON_EMAIL_DOMAINS)
+ * // 返回: ['user@gmail.com']
+ */
+export declare function getEmailSuggestions(input: string, domains?: string[]): string[];

package/lib/components/pisellFilter/index.js

@@ -43,38 +43,109 @@ var PisellFilter = (props) => {
     hiddenQuickFilter = true,
     hiddenOtherFilter = false,
     hasForm = true,
+    onChange,
     ...otherProps
   } = props;
-  const [value, setValue] = (0, import_react.useState)({});
+  const [form] = import_antd.Form.useForm();
+  const [value, setValue] = (0, import_react.useState)(() => ({
+    quickFilter: (originalValue == null ? void 0 : originalValue.quickFilter) || [],
+    otherFilter: (originalValue == null ? void 0 : originalValue.otherFilter) || [],
+    values: (originalValue == null ? void 0 : originalValue.values) || {}
+  }));
+  const isInternalChange = (0, import_react.useRef)(false);
   (0, import_react.useEffect)(() => {
-    setValue({
-      quickFilter: (originalValue == null ? void 0 : originalValue.quickFilter) || [],
-      otherFilter: (originalValue == null ? void 0 : originalValue.otherFilter) || []
-    });
-  }, [originalValue]);
+    setValue((prev) => ({
+      quickFilter: (originalValue == null ? void 0 : originalValue.quickFilter) ?? prev.quickFilter,
+      otherFilter: (originalValue == null ? void 0 : originalValue.otherFilter) ?? prev.otherFilter,
+      values: (originalValue == null ? void 0 : originalValue.values) ?? prev.values ?? {}
+    }));
+  }, [
+    originalValue == null ? void 0 : originalValue.quickFilter,
+    originalValue == null ? void 0 : originalValue.otherFilter,
+    originalValue == null ? void 0 : originalValue.values
+  ]);
+  (0, import_react.useEffect)(() => {
+    if (!hasForm || typeof (originalValue == null ? void 0 : originalValue.values) !== "object") return;
+    if (isInternalChange.current) {
+      isInternalChange.current = false;
+      return;
+    }
+    const nextValues = (originalValue == null ? void 0 : originalValue.values) ?? {};
+    if (Object.keys(nextValues).length === 0) {
+      const current = form.getFieldsValue(true);
+      const cleared = Object.keys(current).reduce(
+        (acc, k) => {
+          acc[k] = void 0;
+          return acc;
+        },
+        {}
+      );
+      if (Object.keys(cleared).length > 0) {
+        form.setFieldsValue(cleared);
+      }
+    } else {
+      form.setFieldsValue(nextValues);
+    }
+  }, [hasForm, form, originalValue == null ? void 0 : originalValue.values]);
+  const handleChange = (0, import_react.useCallback)(
+    (newVal) => {
+      setValue((prev) => ({
+        ...prev,
+        ...newVal,
+        values: newVal.values ?? prev.values
+      }));
+      onChange == null ? void 0 : onChange(newVal);
+    },
+    [onChange]
+  );
+  const handleFormValuesChange = (0, import_react.useCallback)(
+    (_, allValues) => {
+      if (typeof allValues !== "object" || allValues === null) return;
+      isInternalChange.current = true;
+      const mergedValues = { ...value.values, ...allValues };
+      const next = {
+        quickFilter: value.quickFilter,
+        otherFilter: value.otherFilter,
+        values: mergedValues
+      };
+      setValue(next);
+      onChange == null ? void 0 : onChange(next);
+    },
+    [value.quickFilter, value.otherFilter, value.values, onChange]
+  );
   const content = (0, import_react.useMemo)(() => {
     return /* @__PURE__ */ import_react.default.createElement(
       import_FilterButton.default,
       {
         ...otherProps,
+        onChange: handleChange,
         value: {
           quickFilter: value.quickFilter,
           otherFilter: value.otherFilter
         },
         hiddenQuickFilter,
         hiddenOtherFilter,
-        onChange: setValue,
         quickFilterMaxLength: quickFilterMaxLength || 100,
         formFiltersPrefix: formFiltersPrefix || ""
       }
     );
-  }, [value, hiddenQuickFilter, hiddenOtherFilter, quickFilterMaxLength, formFiltersPrefix]);
+  }, [
+    value,
+    hiddenQuickFilter,
+    hiddenOtherFilter,
+    quickFilterMaxLength,
+    formFiltersPrefix,
+    handleChange
+  ]);
   if (hasForm) {
     return /* @__PURE__ */ import_react.default.createElement(
       import_antd.Form,
       {
+        form,
         size: "large",
         layout: "vertical",
+        initialValues: value.values,
+        onValuesChange: handleFormValuesChange,
         ...otherProps
       },
       content