@nocobase/client-v2 2.1.0-alpha.3 → 2.1.0-alpha.31

package/src/flow/models/blocks/filter-form/fields/date-time/DateTimeNoTzFilterFieldModel.tsx

@@ -0,0 +1,30 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+import { DateTimeFilterFieldModel } from './DateTimeFilterFieldModel';
+import React from 'react';
+import { FilterableItemModel } from '@nocobase/flow-engine';
+import { DateFilterDynamicComponent } from './components/DateFilterDynamicComponent';
+
+const DateTimeNoTzPicker = (props) => {
+  const { value, format = 'YYYY-MM-DD HH:mm:ss', showTime, picker = 'date', ...rest } = props;
+  // When showTime is true, use date-only format to avoid duplication
+  // because getDateTimeFormat will append time format automatically
+  const dateFormat = showTime && picker === 'date' ? 'YYYY-MM-DD' : format;
+  return <DateFilterDynamicComponent {...rest} value={value} format={dateFormat} picker={picker} showTime={showTime} />;
+};
+
+export class DateTimeNoTzFilterFieldModel extends DateTimeFilterFieldModel {
+  render() {
+    return <DateTimeNoTzPicker {...this.props} />;
+  }
+}
+
+FilterableItemModel.bindModelToInterface('DateTimeNoTzFilterFieldModel', ['datetimeNoTz'], {
+  isDefault: true,
+});

package/src/flow/models/blocks/filter-form/fields/date-time/DateTimeTzFilterFieldModel.tsx

@@ -0,0 +1,48 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+import { DateTimeFilterFieldModel } from './DateTimeFilterFieldModel';
+import React from 'react';
+import { FilterableItemModel } from '@nocobase/flow-engine';
+import { DateFilterDynamicComponent } from './components/DateFilterDynamicComponent';
+
+const DateTimeTzPicker = (props) => {
+  const { value, format = 'YYYY-MM-DD HH:mm:ss', picker = 'date', showTime, ...rest } = props;
+  // When showTime is true, use date-only format to avoid duplication
+  // because getDateTimeFormat will append time format automatically
+  const dateFormat = showTime && picker === 'date' ? 'YYYY-MM-DD' : format;
+  const componentProps = {
+    ...rest,
+    value,
+    format: dateFormat,
+    picker,
+    showTime,
+  };
+  return <DateFilterDynamicComponent {...componentProps} />;
+};
+
+export class DateTimeTzFilterFieldModel extends DateTimeFilterFieldModel {
+  setProps(componentProps) {
+    super.setProps({
+      ...componentProps,
+      utc: true,
+    });
+  }
+
+  render() {
+    return <DateTimeTzPicker {...this.props} />;
+  }
+}
+
+FilterableItemModel.bindModelToInterface(
+  'DateTimeTzFilterFieldModel',
+  ['createdAt', 'datetime', 'updatedAt', 'unixTimestamp'],
+  {
+    isDefault: true,
+  },
+);

package/src/flow/models/blocks/filter-form/fields/date-time/components/DateFilterDynamicComponent.tsx

@@ -0,0 +1,184 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import React, { useCallback, useMemo, useState } from 'react';
+import { InputNumber, Select, Space, Divider, DatePickerProps, theme } from 'antd';
+import dayjs from 'dayjs';
+import { css } from '@emotion/css';
+import { FilterRangePicker } from './FilterRangePicker';
+import { FilterDatePicker } from './FilterDatePicker';
+import { useFlowEngine } from '@nocobase/flow-engine';
+
+const getOptions = (t, includeNow = false) => {
+  const options = [
+    {
+      value: 'exact',
+      label: t('Exact day'),
+    },
+    { value: 'past', label: t('Past') },
+    { value: 'next', label: t('Next') },
+    { value: 'today', label: t('Today') },
+    { value: 'yesterday', label: t('Yesterday') },
+    { value: 'tomorrow', label: t('Tomorrow') },
+    { value: 'thisWeek', label: t('This Week') },
+    { value: 'lastWeek', label: t('Last Week') },
+    { value: 'nextWeek', label: t('Next Week') },
+    { value: 'thisMonth', label: t('This Month') },
+    { value: 'lastMonth', label: t('Last Month') },
+    { value: 'nextMonth', label: t('Next Month') },
+    { value: 'thisQuarter', label: t('This Quarter') },
+    { value: 'lastQuarter', label: t('Last Quarter') },
+    { value: 'nextQuarter', label: t('Next Quarter') },
+    { value: 'thisYear', label: t('This Year') },
+    { value: 'lastYear', label: t('Last Year') },
+    { value: 'nextYear', label: t('Next Year') },
+  ];
+
+  if (includeNow) {
+    options.splice(3, 0, { value: 'now', label: t('Now') });
+  }
+
+  return options;
+};
+
+type SmartDatePickerProps = {
+  isRange?: boolean;
+} & (
+  | (Omit<DatePickerProps, 'onChange' | 'value'> & {
+      value?: dayjs.Dayjs;
+      onChange?: (value: dayjs.Dayjs | null) => void;
+    })
+  | (Omit<DatePickerProps, 'onChange' | 'value'> & {
+      value?: [dayjs.Dayjs, dayjs.Dayjs] | null;
+      onChange?: (value: [dayjs.Dayjs, dayjs.Dayjs] | null) => void;
+    })
+);
+
+const SmartDatePicker: React.FC<SmartDatePickerProps> = (props) => {
+  const { isRange, defaultValue, onChange: _onChange, ...rest } = props as any;
+  const onChange = useCallback((dates, dateStrings) => _onChange(dateStrings), [_onChange]);
+  return isRange ? (
+    <FilterRangePicker {...rest} onChange={onChange} />
+  ) : (
+    <FilterDatePicker {...rest} onChange={onChange} />
+  );
+};
+
+export const DateFilterDynamicComponent = (props) => {
+  const { value, onChange, includeNow = false, ...restProps } = props;
+  const flowEngine = useFlowEngine();
+  const t = flowEngine.translate.bind(flowEngine);
+  const { token } = theme.useToken();
+  const [open, setOpen] = useState(false);
+  const options = useMemo(() => getOptions(t, includeNow), [t, includeNow]);
+  const handleSelect = (val) => {
+    setOpen(false);
+    if (val === 'exact') {
+      return onChange(undefined);
+    }
+    const obj: any = {
+      type: val,
+    };
+    if (['past', 'next'].includes(val)) {
+      obj.number = 1;
+      obj.unit = 'day';
+    }
+    onChange(obj);
+  };
+  const dropdownRender = () => {
+    const firstPart = options.slice(0, 3);
+    const secondPart = options.slice(3);
+    const optionStyle = css`
+      padding: 3px 10px;
+      cursor: pointer;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      &:hover {
+        background-color: ${token.colorFillSecondary};
+      }
+    `;
+    return (
+      <div style={{ maxHeight: 300, overflowY: 'auto' }}>
+        {firstPart.map((opt) => (
+          <div key={opt.value} role="option" onClick={() => handleSelect(opt.value)} className={optionStyle}>
+            {t(opt.label)}
+          </div>
+        ))}
+        <Divider style={{ margin: '4px 0' }} />
+        {secondPart.map((opt) => (
+          <div
+            key={opt.value}
+            role="option"
+            className={optionStyle}
+            onClick={() => handleSelect(opt.value)}
+            title={t(opt.label)}
+          >
+            {t(opt.label)}
+          </div>
+        ))}
+      </div>
+    );
+  };
+  return (
+    <Space.Compact style={{ ...restProps.style, width: '100%' }}>
+      <Select
+        options={options}
+        open={open}
+        onDropdownVisibleChange={setOpen}
+        {...restProps}
+        allowClear={false}
+        style={{
+          width: '100%',
+          minWidth: 100,
+          maxWidth: ['past', 'next', 'exact', undefined].includes(value?.type) ? 100 : null,
+        }}
+        value={value?.type || 'exact'}
+        onChange={handleSelect}
+        dropdownRender={dropdownRender}
+      />
+      {['past', 'next'].includes(value?.type) && [
+        <InputNumber
+          key="number"
+          style={{ flex: 1 }}
+          value={value?.number}
+          onChange={(val) => {
+            const obj = {
+              ...value,
+              number: val,
+            };
+            onChange(obj);
+          }}
+        />,
+        <Select
+          key="unit"
+          value={value?.unit}
+          style={{ minWidth: 130, maxWidth: 140 }}
+          onChange={(val) => {
+            const obj = {
+              ...value,
+              unit: val,
+            };
+            onChange(obj);
+          }}
+          options={[
+            { value: 'day', label: t('Day') },
+            { value: 'week', label: t('Calendar week') },
+            { value: 'month', label: t('Calendar Month') },
+            { value: 'year', label: t('Calendar Year') },
+          ]}
+          popupMatchSelectWidth
+        />,
+      ]}
+      {(value?.type === 'exact' || !value?.type) && (
+        <SmartDatePicker {...restProps} value={value} onChange={onChange} />
+      )}
+    </Space.Compact>
+  );
+};

package/src/flow/models/blocks/filter-form/fields/date-time/components/FilterDatePicker.tsx

@@ -0,0 +1,108 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { useFlowContext } from '@nocobase/flow-engine';
+import { inferPickerType } from '../../../../../../../flow-compat';
+import { dayjs, getDateTimeFormat, getPickerFormat } from '@nocobase/utils/client';
+import { DatePicker as AntdDatePicker, Select, Space } from 'antd';
+import React, { useMemo, useState } from 'react';
+
+const stripTimeFromFormat = (format?: string) =>
+  format ? format.replace(/\s*HH?:mm(?::ss)?(?:\.SSS)?/g, '').trim() : format;
+
+const parseDateValue = (value: any, format: string) => {
+  if (!value) {
+    return null;
+  }
+  if (dayjs.isDayjs(value)) {
+    return value;
+  }
+  if (typeof value === 'string' && value.endsWith('Z')) {
+    const localString = dayjs(value).format(format);
+    const localParsed = dayjs(localString, format);
+    return localParsed.isValid() ? localParsed : dayjs(value);
+  }
+  const parsed = dayjs(value, format);
+  if (parsed.isValid()) {
+    return parsed;
+  }
+  const fallback = dayjs(value);
+  return fallback.isValid() ? fallback : null;
+};
+
+export const FilterDatePicker = (props: any) => {
+  const { picker = 'date', format, showTime, timeFormat, onChange } = props;
+  const ctx = useFlowContext();
+  const currentValue = Array.isArray(props.value) ? props.value[0] : props.value;
+  const initPicker = currentValue ? inferPickerType(currentValue, picker) : picker;
+  const [targetPicker, setTargetPicker] = useState(initPicker);
+  const t = ctx.model.translate.bind(ctx.model);
+  const getResolvedFormat = (value: string) => {
+    const baseFormat = value === picker && format ? format : getPickerFormat(value);
+    const dateFormat = value === 'date' ? stripTimeFromFormat(baseFormat) : baseFormat;
+    return getDateTimeFormat(value, dateFormat, showTime, timeFormat);
+  };
+  const resolvedFormat = useMemo(
+    () => getResolvedFormat(targetPicker),
+    [format, picker, showTime, targetPicker, timeFormat],
+  );
+  const dayjsValue = useMemo(() => parseDateValue(currentValue, resolvedFormat), [currentValue, resolvedFormat]);
+  const datePickerProps = {
+    utc: true,
+    inputReadOnly: ctx.isMobileLayout,
+    ...props,
+    underFilter: true,
+    showTime: showTime ? { defaultValue: dayjs('00:00:00', 'HH:mm:ss') } : false,
+    format: resolvedFormat,
+    picker: targetPicker,
+  };
+
+  return (
+    <Space.Compact style={{ width: '100%' }}>
+      <Select
+        style={{ width: '100px' }}
+        popupMatchSelectWidth={false}
+        value={targetPicker}
+        options={[
+          {
+            label: t('Date'),
+            value: 'date',
+          },
+
+          {
+            label: t('Month'),
+            value: 'month',
+          },
+          {
+            label: t('Quarter'),
+            value: 'quarter',
+          },
+          {
+            label: t('Year'),
+            value: 'year',
+          },
+        ]}
+        onChange={(nextPicker) => {
+          const nextResolvedFormat = getResolvedFormat(nextPicker);
+          const previousResolvedFormat = resolvedFormat;
+          setTargetPicker(nextPicker);
+          if (!currentValue || !onChange) {
+            return;
+          }
+          const parsedValue = parseDateValue(currentValue, previousResolvedFormat);
+          if (!parsedValue || !parsedValue.isValid()) {
+            return;
+          }
+          onChange(parsedValue, parsedValue.format(nextResolvedFormat));
+        }}
+      />
+      <AntdDatePicker {...datePickerProps} style={{ flex: 1, ...datePickerProps?.style }} value={dayjsValue} />
+    </Space.Compact>
+  );
+};

package/src/flow/models/blocks/filter-form/fields/date-time/components/FilterRangePicker.tsx

@@ -0,0 +1,84 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { useFlowEngine } from '@nocobase/flow-engine';
+import { getDateRanges, inferPickerType } from '../../../../../../../flow-compat';
+import { dayjs, getDateTimeFormat, getPickerFormat } from '@nocobase/utils/client';
+import { DatePicker } from 'antd';
+import React, { useMemo } from 'react';
+import _ from 'lodash';
+
+const stripTimeFromFormat = (format?: string) =>
+  format ? format.replace(/\s*HH?:mm(?::ss)?(?:\.SSS)?/g, '').trim() : format;
+
+const parseDateValue = (value: any, format: string) => {
+  if (!value) {
+    return null;
+  }
+  if (dayjs.isDayjs(value)) {
+    return value;
+  }
+  if (typeof value === 'string' && value.endsWith('Z')) {
+    const localString = dayjs(value).format(format);
+    const localParsed = dayjs(localString, format);
+    return localParsed.isValid() ? localParsed : dayjs(value);
+  }
+  const parsed = dayjs(value, format);
+  if (parsed.isValid()) {
+    return parsed;
+  }
+  const fallback = dayjs(value);
+  return fallback.isValid() ? fallback : null;
+};
+
+export const FilterRangePicker = (props: any) => {
+  const { value, picker = 'date', format, showTime, timeFormat } = props;
+  const flowEngine = useFlowEngine();
+  const t = flowEngine.translate.bind(flowEngine);
+  const rangesValue = getDateRanges();
+  const presets = [
+    { label: t('Today'), value: rangesValue.today },
+    { label: t('Last week'), value: rangesValue.lastWeek },
+    { label: t('This week'), value: rangesValue.thisWeek },
+    { label: t('Next week'), value: rangesValue.nextWeek },
+    { label: t('Last month'), value: rangesValue.lastMonth },
+    { label: t('This month'), value: rangesValue.thisMonth },
+    { label: t('Next month'), value: rangesValue.nextMonth },
+    { label: t('Last quarter'), value: rangesValue.lastQuarter },
+    { label: t('This quarter'), value: rangesValue.thisQuarter },
+    { label: t('Next quarter'), value: rangesValue.nextQuarter },
+    { label: t('Last year'), value: rangesValue.lastYear },
+    { label: t('This year'), value: rangesValue.thisYear },
+    { label: t('Next year'), value: rangesValue.nextYear },
+    { label: t('Last 7 days'), value: rangesValue.last7Days },
+    { label: t('Next 7 days'), value: rangesValue.next7Days },
+    { label: t('Last 30 days'), value: rangesValue.last30Days },
+    { label: t('Next 30 days'), value: rangesValue.next30Days },
+    { label: t('Last 90 days'), value: rangesValue.last90Days },
+    { label: t('Next 90 days'), value: rangesValue.next90Days },
+  ];
+
+  const targetPicker = value ? inferPickerType(value?.[0], picker) : picker;
+  const baseDateFormat = targetPicker === picker && format ? format : getPickerFormat(targetPicker);
+  const targetDateFormat = targetPicker === 'date' ? stripTimeFromFormat(baseDateFormat) : baseDateFormat;
+  const resolvedFormat = getDateTimeFormat(targetPicker, targetDateFormat, showTime, timeFormat);
+  const newProps: any = {
+    utc: true,
+    presets,
+    ...props,
+    format: resolvedFormat,
+    picker: targetPicker,
+    showTime: showTime ? { defaultValue: [dayjs('00:00:00', 'HH:mm:ss'), dayjs('23:59:59', 'HH:mm:ss')] } : false,
+  };
+  const dayjsValue = useMemo(() => {
+    return _.castArray(props.value).map((item) => parseDateValue(item, resolvedFormat));
+  }, [props.value, resolvedFormat]);
+
+  return <DatePicker.RangePicker {...newProps} style={{ flex: 1, ...newProps?.style }} value={dayjsValue} />;
+};

package/src/flow/models/blocks/filter-form/fields/date-time/components/__tests__/FilterDatePickers.test.tsx

@@ -0,0 +1,121 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import React from 'react';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { act, render } from '@nocobase/test/client';
+import { dayjs } from '@nocobase/utils/client';
+
+import { FilterDatePicker } from '../FilterDatePicker';
+import { FilterRangePicker } from '../FilterRangePicker';
+
+let capturedDatePickerProps: any;
+let capturedRangePickerProps: any;
+let capturedSelectProps: any;
+
+vi.mock('@nocobase/flow-engine', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('@nocobase/flow-engine')>();
+  return {
+    ...actual,
+    useFlowContext: () => ({
+      isMobileLayout: false,
+      model: {
+        translate: (value: string) => value,
+      },
+    }),
+    useFlowEngine: () => ({
+      translate: (value: string) => value,
+    }),
+  };
+});
+
+vi.mock('antd', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('antd')>();
+  return {
+    ...actual,
+    DatePicker: Object.assign(
+      (props: any) => {
+        capturedDatePickerProps = props;
+        return <div data-testid="date-picker" />;
+      },
+      {
+        RangePicker: (props: any) => {
+          capturedRangePickerProps = props;
+          return <div data-testid="range-picker" />;
+        },
+      },
+    ),
+    Select: (props: any) => {
+      capturedSelectProps = props;
+      return <div data-testid="select" />;
+    },
+    Space: {
+      Compact: ({ children }: { children: React.ReactNode }) => <div data-testid="compact">{children}</div>,
+    },
+  };
+});
+
+describe('Filter date pickers', () => {
+  beforeEach(() => {
+    capturedDatePickerProps = undefined;
+    capturedRangePickerProps = undefined;
+    capturedSelectProps = undefined;
+  });
+
+  it('resolves date format with showTime for single picker', () => {
+    render(
+      <FilterDatePicker
+        picker="date"
+        format="YYYY-MM-DD HH:mm:ss"
+        showTime
+        timeFormat="HH:mm:ss"
+        value="2024-01-02 12:30:00"
+      />,
+    );
+
+    expect(capturedDatePickerProps?.format).toBe('YYYY-MM-DD HH:mm:ss');
+    expect(capturedDatePickerProps?.showTime).toBeTruthy();
+  });
+
+  it('keeps non-date picker format without time', () => {
+    render(<FilterDatePicker picker="month" showTime format="YYYY-MM" value="2024-01" />);
+
+    expect(capturedDatePickerProps?.format).toBe('YYYY-MM');
+  });
+
+  it('emits formatted value when switching picker', () => {
+    const onChange = vi.fn();
+
+    render(<FilterDatePicker picker="date" value="2024-01-15" onChange={onChange} />);
+
+    act(() => {
+      capturedSelectProps?.onChange?.('month');
+    });
+
+    expect(onChange).toHaveBeenCalledTimes(1);
+    const [nextValue, nextString] = onChange.mock.calls[0];
+    expect(dayjs.isDayjs(nextValue)).toBe(true);
+    expect(nextString).toBe('2024-01');
+  });
+
+  it('resolves date format with showTime for range picker', () => {
+    render(
+      <FilterRangePicker
+        picker="date"
+        format="YYYY-MM-DD HH:mm:ss"
+        showTime
+        timeFormat="HH:mm:ss"
+        value={['2024-01-01 08:00:00', '2024-01-02 09:00:00']}
+      />,
+    );
+
+    expect(capturedRangePickerProps?.format).toBe('YYYY-MM-DD HH:mm:ss');
+    expect(capturedRangePickerProps?.showTime).toBeTruthy();
+  });
+});

package/src/flow/models/blocks/filter-form/fields/date-time/index.ts

@@ -0,0 +1,13 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+export * from './DateOnlyFilterFieldModel';
+export * from './DateTimeNoTzFilterFieldModel';
+export * from './DateTimeTzFilterFieldModel';
+export * from './DateTimeFilterFieldModel';

package/src/flow/models/blocks/filter-form/fields/index.ts

@@ -0,0 +1,14 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+export * from './FilterFormFieldModel';
+export * from './FilterFormRecordSelectFieldModel';
+export * from './date-time';
+export * from './FilterFormCustomFieldModel';
+export * from './FilterFormCustomRecordSelectFieldModel';

package/src/flow/models/blocks/filter-form/index.ts

@@ -0,0 +1,25 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+export * from './fields';
+export * from './FilterFormActionGroupModel';
+export * from './FilterFormActionModel';
+export * from './FilterFormBlockModel';
+export * from './FilterFormCollapseActionModel';
+export * from './FilterFormGridModel';
+export * from './FilterFormItemModel';
+export * from './FilterFormCustomItemModel';
+export * from './FieldModelSelect';
+export * from './FieldOperatorSelect';
+export * from './SourceCascader';
+export * from './customFieldOperators';
+export * from './FilterFormJSActionModel';
+export * from './FilterFormResetActionModel';
+export * from './FilterFormSubmitActionModel';
+//

package/src/flow/models/blocks/filter-form/legacyDefaultValueMigration.ts

@@ -0,0 +1,36 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import {
+  collectLegacyDefaultValueRules,
+  clearLegacyDefaultValues,
+  createLegacyClearer,
+  createLegacyValueExtractor,
+  mergeAssignRulesWithLegacyDefaults,
+} from '../shared/legacyDefaultValueMigrationBase';
+import type { FieldAssignRuleItem } from '../../../components/FieldAssignRulesEditor';
+
+const FILTER_FORM_FLOW_KEYS = ['filterFormItemSettings'];
+
+const getLegacyFilterFormItemInitialValue = createLegacyValueExtractor(FILTER_FORM_FLOW_KEYS);
+const clearLegacyFilterFormItemInitialValue = createLegacyClearer(FILTER_FORM_FLOW_KEYS);
+
+export function collectLegacyDefaultValueRulesFromFilterFormModel(filterFormModel: any): FieldAssignRuleItem[] {
+  return collectLegacyDefaultValueRules(filterFormModel, getLegacyFilterFormItemInitialValue);
+}
+
+export function clearLegacyDefaultValuesFromFilterFormModel(filterFormModel: any): any[] {
+  return clearLegacyDefaultValues(
+    filterFormModel,
+    getLegacyFilterFormItemInitialValue,
+    clearLegacyFilterFormItemInitialValue,
+  );
+}
+
+export { mergeAssignRulesWithLegacyDefaults };