@pisell/materials 1.8.12 → 1.8.14

package/es/components/dataSourceComponents/hooks/useActions.d.ts

@@ -6,13 +6,13 @@ export interface UseActionsParams {
     extraParams?: Record<string, any>;
 }
 declare const useActions: ({ dataSource: propsDataSource, currentValue: propsCurrentValue, __designMode, extraParams: propsExtraParams, }?: UseActionsParams) => {
-    create: (values: Record<string, any>) => Promise<any>;
-    get: () => Promise<any>;
-    update: (values: Record<string, any>) => Promise<any>;
-    list: (params: {
+    create: (this: unknown, values: Record<string, any>) => Promise<any>;
+    get: (this: unknown) => Promise<any>;
+    update: (this: unknown, values: Record<string, any>) => Promise<any>;
+    list: (this: unknown, params: {
         page: number;
         pageSize: number;
     }) => Promise<any>;
-    destroy: (id: string) => Promise<any>;
+    destroy: (this: unknown, id: string) => Promise<any>;
 };
 export default useActions;

package/es/components/dataSourceComponents/hooks/useActions.js

@@ -111,7 +111,8 @@ var useActions = function useActions() {
                 baseUrl: baseUrlMap[dataSourceKey] || (options === null || options === void 0 ? void 0 : options.baseUrl),
                 params: params,
                 headers: headers,
-                body: body
+                body: body,
+                dataSourceKey: dataSourceKey
               });
             case 2:
               result = _context.sent;
@@ -338,7 +339,7 @@ var useActions = function useActions() {
             listApi = genCustomApi(actions === null || actions === void 0 ? void 0 : actions.list);
             _context5.t0 = formatListResult;
             _context5.next = 9;
-            return listApi(formatParams);
+            return listApi(_objectSpread(_objectSpread({}, formatParams), (extraParams === null || extraParams === void 0 ? void 0 : extraParams.list) || {}));
           case 9:
             _context5.t1 = _context5.sent;
             return _context5.abrupt("return", (0, _context5.t0)(_context5.t1));

package/es/components/dataSourceComponents/hooks/useFormSettingParams.js

@@ -0,0 +1,32 @@
+import useEngineContext from "../../../hooks/useEngineContext";
+import { getUrlParams } from "../dataSourceForm/urlUtils";
+var scopeMap = {
+  saas: 'saas',
+  org: 'organization',
+  biz: 'business',
+  channel: 'channel',
+  board: 'board'
+};
+var useFormSettingParams = function useFormSettingParams() {
+  var _context$appHelper, _app$history;
+  var context = useEngineContext();
+  var _context$appHelper$ut = (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils,
+    getApp = _context$appHelper$ut.getApp;
+  var app = getApp === null || getApp === void 0 ? void 0 : getApp();
+  var params = app === null || app === void 0 || (_app$history = app.history) === null || _app$history === void 0 ? void 0 : _app$history.useParams();
+  var queryParams = getUrlParams();
+  var businessCode = (queryParams === null || queryParams === void 0 ? void 0 : queryParams.biz) || (queryParams === null || queryParams === void 0 ? void 0 : queryParams.business_code);
+  var channelCode = queryParams === null || queryParams === void 0 ? void 0 : queryParams.channel;
+  var scope = scopeMap[params === null || params === void 0 ? void 0 : params.scope];
+  var originTarget = businessCode && channelCode ? "".concat(businessCode, "+").concat(channelCode) : businessCode || channelCode;
+
+  // saas / organization：无需传值
+  var target = ['organization', 'saas'].includes(scope) ? undefined : originTarget;
+  return {
+    businessCode: businessCode,
+    channelCode: channelCode,
+    scope: scope,
+    target: target
+  };
+};
+export default useFormSettingParams;

package/es/components/dataSourceComponents/hooks/useParseActionsVariable.d.ts

@@ -1,6 +1,11 @@
-import { Collection } from '../dataSourceForm/serve';
-declare type Actions = Collection['actions'];
+import { ActionsItem } from '../dataSourceForm/serve';
 declare const useParseActionsVariable: () => {
-    parseActions: (actions: Actions, localVariables: Record<string, any>) => Record<string, any>;
+    parseActions: (this: unknown, actions: {
+        get: ActionsItem;
+        update: ActionsItem;
+        create: ActionsItem;
+        delete: ActionsItem;
+        list: ActionsItem;
+    }, localVariables: Record<string, any>) => Record<string, any>;
 };
 export default useParseActionsVariable;

package/es/components/date-picker/datePickerCpt.d.ts

@@ -1,8 +1,9 @@
+import React from 'react';
 import { PickerDateProps } from 'antd/es/date-picker/generatePicker';
 import { Dayjs } from 'dayjs';
 import './index.less';
 interface DatePickerCptProps extends PickerDateProps<Dayjs> {
     showTime: any;
 }
-declare const DatePickerCpt: (props: DatePickerCptProps) => JSX.Element;
+declare const DatePickerCpt: (props: DatePickerCptProps) => React.JSX.Element;
 export default DatePickerCpt;

package/es/components/date-picker/index.d.ts

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

package/es/components/drag-sort-tree/TreeItem/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import './index.less';
 import { ValueProps, SortType } from '../types';
 declare type IdType = string | number;
@@ -14,5 +15,5 @@ declare type TreeItemProps = {
     onSelectKeys?: (ids: IdType) => void;
     onChange?: (value: any[]) => void;
 };
-declare const TreeItem: (props: TreeItemProps) => JSX.Element;
+declare const TreeItem: (props: TreeItemProps) => React.JSX.Element;
 export default TreeItem;

package/es/components/drag-sort-tree/index.d.ts

@@ -1,4 +1,5 @@
+import React from 'react';
 import './index.less';
 import { SortType } from './types';
-declare const DragSortTree: (props: SortType) => JSX.Element;
+declare const DragSortTree: (props: SortType) => React.JSX.Element;
 export default DragSortTree;

package/es/components/dropdown/index.d.ts

@@ -1,2 +1,3 @@
-declare const Dropdown: (props: any) => JSX.Element;
+import React from 'react';
+declare const Dropdown: (props: any) => React.JSX.Element;
 export default Dropdown;

package/es/components/filter/components/Dropdown/index.js

@@ -77,6 +77,10 @@ var Dropdown = function Dropdown(props) {
     quickFilter: getText('table-action-filter-quick-filter-tip'),
     otherFilter: getText('table-action-filter-other-filter-tip')
   };
+  var getTooltipTitle = useCallback(function (id) {
+    var fn = tooltipMap[id];
+    return typeof fn === 'function' ? fn(quickFilterMaxLength) : fn;
+  }, [quickFilterMaxLength]);
   var renderContainer = useCallback(function (_ref) {
     var children = _ref.children,
       ref = _ref.ref,
@@ -88,14 +92,14 @@ var Dropdown = function Dropdown(props) {
     }, /*#__PURE__*/React.createElement("span", {
       className: "filter-dropdown-container-title"
     }, titleMap[id]), /*#__PURE__*/React.createElement(Tooltip, {
-      title: tooltipMap[id](quickFilterMaxLength)
+      title: getTooltipTitle(id)
     }, /*#__PURE__*/React.createElement(HelpCircle, {
       className: "filter-dropdown-container-icon-help"
     }))), /*#__PURE__*/React.createElement("div", {
       ref: ref,
       className: "filter-dropdown-container-filter-wrap"
     }, children));
-  }, [quickFilterMaxLength]);
+  }, [quickFilterMaxLength, getTooltipTitle]);
   return /*#__PURE__*/React.createElement("div", {
     className: "filter-dropdown-wrap"
   }, /*#__PURE__*/React.createElement("div", {

package/es/components/filter/components/FilterButton/index.js

@@ -13,9 +13,19 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useMemo, useRef, useState } from 'react';
 import { Button, Popover } from 'antd';
 import FilterLines from '@pisell/icon/es/FilterLines';
+import { locales as utilsLocales } from '@pisell/utils';
 import Dropdown from "../Dropdown";
 import { getText } from "../../../../locales";
 import { isMobile } from "../../../../utils/platform";
+
+/** 与 Quick Filter 同源：优先 utils，若 utils 返回 key（未命中）则用 materials RecordBoard 再回退 table-action */
+function getFilterButtonLabel(buttonText) {
+  if (buttonText != null && buttonText !== '') return buttonText;
+  var key = 'pisell2.recordBoard.toolbar.filter';
+  var fromUtils = utilsLocales.getText(key);
+  if (fromUtils && fromUtils !== key) return fromUtils;
+  return getText(key) || getText('table-action-filter-button');
+}
 var Filter = function Filter(_ref) {
   var value = _ref.value,
     hiddenQuickFilter = _ref.hiddenQuickFilter,
@@ -24,7 +34,11 @@ var Filter = function Filter(_ref) {
     quickFilterMaxLength = _ref.quickFilterMaxLength,
     formFiltersPrefix = _ref.formFiltersPrefix,
     renderItem = _ref.renderItem,
-    placement = _ref.placement;
+    placement = _ref.placement,
+    _ref$size = _ref.size,
+    size = _ref$size === void 0 ? 'large' : _ref$size,
+    buttonClassName = _ref.buttonClassName,
+    buttonText = _ref.buttonText;
   var ref = useRef(null);
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -83,10 +97,11 @@ var Filter = function Filter(_ref) {
       }
       setOpen(visible);
     },
-    placement: placement
+    placement: placement !== null && placement !== void 0 ? placement : 'bottom'
   }, /*#__PURE__*/React.createElement(Button, {
+    className: buttonClassName,
     icon: /*#__PURE__*/React.createElement(FilterLines, null),
-    size: "large"
-  }, isMobileBool ? null : getText('table-action-filter-button'))));
+    size: size
+  }, isMobileBool ? null : getFilterButtonLabel(buttonText))));
 };
 export default Filter;

package/es/components/filter/components/FilterItem/AsyncOptionsSelectWrapper.d.ts

@@ -0,0 +1,21 @@
+/**
+ * 筛选项中 singleSelect/multipleSelect 的异步 options 包装器。
+ * 当列配置传入 getOptions（同步或异步）时，先解析再渲染 PisellSingleSelect/PisellMultipleSelect。
+ */
+import React from 'react';
+export declare type GetOptionsFn = (() => {
+    label: string;
+    value: any;
+}[]) | (() => Promise<{
+    label: string;
+    value: any;
+}[]>);
+export interface AsyncOptionsSelectWrapperProps {
+    getOptions: GetOptionsFn;
+    fieldType: 'singleSelect' | 'multipleSelect';
+    value?: any;
+    onChange?: (value: any, option?: any) => void;
+    [key: string]: any;
+}
+declare const AsyncOptionsSelectWrapper: React.FC<AsyncOptionsSelectWrapperProps>;
+export default AsyncOptionsSelectWrapper;

package/es/components/filter/components/FilterItem/AsyncOptionsSelectWrapper.js

@@ -0,0 +1,90 @@
+var _excluded = ["getOptions", "fieldType", "value", "onChange"];
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+/**
+ * 筛选项中 singleSelect/multipleSelect 的异步 options 包装器。
+ * 当列配置传入 getOptions（同步或异步）时，先解析再渲染 PisellSingleSelect/PisellMultipleSelect。
+ */
+
+import React, { useState, useEffect } from 'react';
+import { Spin } from 'antd';
+import { PisellSingleSelect } from "../../../pisellSingleSelect";
+import { PisellMultipleSelect } from "../../../pisellMultipleSelect";
+function normalizeOptions(list) {
+  if (!Array.isArray(list)) return [];
+  return list.map(function (item) {
+    return item && _typeof(item) === 'object' && 'label' in item && 'value' in item ? {
+      label: String(item.label),
+      value: item.value
+    } : {
+      label: String(item),
+      value: item
+    };
+  });
+}
+var AsyncOptionsSelectWrapper = function AsyncOptionsSelectWrapper(props) {
+  var getOptions = props.getOptions,
+    fieldType = props.fieldType,
+    value = props.value,
+    onChange = props.onChange,
+    rest = _objectWithoutProperties(props, _excluded);
+  var _useState = useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    options = _useState2[0],
+    setOptions = _useState2[1];
+  var _useState3 = useState(true),
+    _useState4 = _slicedToArray(_useState3, 2),
+    loading = _useState4[0],
+    setLoading = _useState4[1];
+  useEffect(function () {
+    setLoading(true);
+    var result = getOptions();
+    var resolved = Promise.resolve(result);
+    resolved.then(function (list) {
+      setOptions(normalizeOptions(list));
+    }).finally(function () {
+      setLoading(false);
+    });
+  }, [getOptions]);
+  var commonProps = _objectSpread(_objectSpread({}, rest), {}, {
+    options: options,
+    mode: 'edit'
+  });
+  if (loading) {
+    return /*#__PURE__*/React.createElement(Spin, {
+      spinning: true,
+      size: "small"
+    }, /*#__PURE__*/React.createElement("span", {
+      style: {
+        display: 'inline-block',
+        minWidth: 120,
+        minHeight: 32
+      }
+    }));
+  }
+  if (fieldType === 'multipleSelect') {
+    return /*#__PURE__*/React.createElement(PisellMultipleSelect, _extends({}, commonProps, {
+      value: value,
+      onChange: onChange
+    }));
+  }
+  return /*#__PURE__*/React.createElement(PisellSingleSelect, _extends({}, commonProps, {
+    value: value,
+    onChange: onChange
+  }));
+};
+AsyncOptionsSelectWrapper.displayName = 'AsyncOptionsSelectWrapper';
+export default AsyncOptionsSelectWrapper;

package/es/components/filter/components/FilterItem/index.d.ts

@@ -1,5 +1,5 @@
-import React from "react";
-import { FilterItemProps } from "../../types";
-import "./index.less";
+import React from 'react';
+import { FilterItemProps } from '../../types';
+import './index.less';
 declare const FilterItem: React.FC<FilterItemProps>;
 export default FilterItem;

package/es/components/filter/components/FilterItem/index.js

@@ -1,23 +1,154 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+var _excluded = ["value", "onChange"],
+  _excluded2 = ["getOptions"];
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-import React, { useMemo } from "react";
-import { Form } from "antd";
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+import React, { useMemo } from 'react';
+import { DatePicker, Form } from 'antd';
+import dayjs from 'dayjs';
 import { fieldMaps } from "../../../table/Table/fields";
+import { PisellSingleLineText } from "../../../pisellSingleLineText";
+import { PisellLongText } from "../../../pisellLongText";
+import { PisellEmail } from "../../../pisellEmail";
+import { PisellPhone } from "../../../pisellPhone";
+import { PisellUrl } from "../../../pisellUrl";
+import { PisellNumber } from "../../../pisellNumber";
+import { PisellCurrency } from "../../../pisellCurrency";
+import { PisellPercent } from "../../../pisellPercent";
+import { PisellRating } from "../../../pisellRating";
+import { PisellSingleSelect } from "../../../pisellSingleSelect";
+import { PisellMultipleSelect } from "../../../pisellMultipleSelect";
+import { getText } from "../../../../locales";
+import AsyncOptionsSelectWrapper from "./AsyncOptionsSelectWrapper";
 import "./index.less";
+var RangePicker = DatePicker.RangePicker;
+
+/** 列 type（RecordBoardFieldType）对应 Pisell 组件，用于筛选项编辑态；与 RecordBoard 列 type 一致 */
+var PISELL_FIELD_TYPE_MAP = {
+  singleLineText: PisellSingleLineText,
+  longText: PisellLongText,
+  email: PisellEmail,
+  phone: PisellPhone,
+  url: PisellUrl,
+  number: PisellNumber,
+  currency: PisellCurrency,
+  percent: PisellPercent,
+  rating: PisellRating,
+  singleSelect: PisellSingleSelect,
+  multipleSelect: PisellMultipleSelect
+};
+
+/** 筛选类型到 table field 类型的映射（table fields 无 single/input，用 select/text） */
+var FILTER_TYPE_TO_FIELD = {
+  single: 'select',
+  input: 'text',
+  datePicker: 'date',
+  rangePicker: 'rangePicker',
+  search: 'search'
+};
+
+/** 将 form 中可能为 string[] 或 dayjs[] 的值转为 RangePicker 需要的 [Dayjs, Dayjs] | null */
+function toRangePickerValue(val) {
+  if (val == null) return null;
+  if (Array.isArray(val) && val.length >= 2) {
+    var start = val[0] ? dayjs.isDayjs(val[0]) ? val[0] : dayjs(val[0]) : null;
+    var end = val[1] ? dayjs.isDayjs(val[1]) ? val[1] : dayjs(val[1]) : null;
+    if (start && end) return [start, end];
+  }
+  return null;
+}
+
+/** 使用 antd RangePicker，仅做 value 归一化以兼容 form 里存的 string[] */
+var AntdRangePickerWithValue = /*#__PURE__*/React.forwardRef(function AntdRangePickerWithValue(_ref, ref) {
+  var value = _ref.value,
+    _onChange = _ref.onChange,
+    rest = _objectWithoutProperties(_ref, _excluded);
+  var normalized = toRangePickerValue(value);
+  return /*#__PURE__*/React.createElement(RangePicker, _extends({}, rest, {
+    ref: ref,
+    placeholder: [getText('table-action-range-picker-placeholder-start'), getText('table-action-range-picker-placeholder-end')],
+    value: normalized,
+    onChange: function onChange(dates) {
+      return _onChange === null || _onChange === void 0 ? void 0 : _onChange(dates !== null && dates !== void 0 ? dates : undefined);
+    }
+  }));
+});
 var FilterItem = function FilterItem(props) {
+  var _componentProps$getOp;
   var label = props.label,
     type = props.type,
     name = props.name,
     other = props.other,
-    isHidden = props.isHidden;
+    isHidden = props.isHidden,
+    itemProps = props.props;
+  var fieldTypeFromColumn = other === null || other === void 0 ? void 0 : other.fieldType;
+  var PisellCom = fieldTypeFromColumn ? PISELL_FIELD_TYPE_MAP[fieldTypeFromColumn] : undefined;
+
+  // 无 type 列的自定义筛选组件：接收 value/onChange（由 Form.Item 注入）
+  if (type === 'custom') {
+    var CustomComponent = other === null || other === void 0 ? void 0 : other.component;
+    if (!CustomComponent) return null;
+    var _componentProps = _objectSpread(_objectSpread({}, itemProps || {}), other || {});
+    delete _componentProps.component;
+    return /*#__PURE__*/React.createElement(Form.Item, _extends({
+      label: label,
+      name: name,
+      hidden: isHidden
+    }, (other === null || other === void 0 ? void 0 : other.formItemProps) || {}), /*#__PURE__*/React.createElement(CustomComponent, _componentProps));
+  }
+
+  // rangePickerNew：使用 antd DatePicker.RangePicker，样式按 Figma；prefixCls 使 DOM 使用 pisell-lowcode- 便于样式隔离。rangePicker 走下方 fieldMaps，使用物料库自研 RangePicker。
+  if (type === 'rangePickerNew') {
+    var _componentProps2 = _objectSpread(_objectSpread(_objectSpread({}, itemProps || {}), other || {}), {}, {
+      prefixCls: 'pisell-lowcode'
+    });
+    return /*#__PURE__*/React.createElement(Form.Item, _extends({
+      label: label,
+      name: name
+    }, (other === null || other === void 0 ? void 0 : other.formItemProps) || {}, {
+      hidden: isHidden,
+      className: "pisell-lowcode-range-picker-wrap"
+    }), /*#__PURE__*/React.createElement(AntdRangePickerWithValue, _componentProps2));
+  }
   var Com = useMemo(function () {
-    var _fieldMaps;
-    return (_fieldMaps = fieldMaps[type]) === null || _fieldMaps === void 0 ? void 0 : _fieldMaps.edit;
-  }, [type]);
+    var _FILTER_TYPE_TO_FIELD, _fieldMaps;
+    if (PisellCom) return PisellCom;
+    var fieldType = (_FILTER_TYPE_TO_FIELD = FILTER_TYPE_TO_FIELD[type]) !== null && _FILTER_TYPE_TO_FIELD !== void 0 ? _FILTER_TYPE_TO_FIELD : type;
+    return (_fieldMaps = fieldMaps[fieldType]) === null || _fieldMaps === void 0 ? void 0 : _fieldMaps.edit;
+  }, [type, PisellCom]);
+  if (!Com) {
+    return null;
+  }
+  var isPisell = Boolean(PisellCom);
+  var componentProps = _objectSpread(_objectSpread(_objectSpread({}, itemProps || {}), other || {}), isPisell ? {
+    mode: 'edit'
+  } : {});
+  var getOptions = (_componentProps$getOp = componentProps.getOptions) !== null && _componentProps$getOp !== void 0 ? _componentProps$getOp : other === null || other === void 0 ? void 0 : other.getOptions;
+  var useAsyncOptions = isPisell && typeof getOptions === 'function' && (fieldTypeFromColumn === 'singleSelect' || fieldTypeFromColumn === 'multipleSelect');
+  if (useAsyncOptions && fieldTypeFromColumn) {
+    var _go = componentProps.getOptions,
+      restProps = _objectWithoutProperties(componentProps, _excluded2);
+    return /*#__PURE__*/React.createElement(Form.Item, _extends({
+      label: label,
+      name: name
+    }, (other === null || other === void 0 ? void 0 : other.formItemProps) || {}, {
+      hidden: isHidden
+    }), /*#__PURE__*/React.createElement(AsyncOptionsSelectWrapper, _extends({
+      getOptions: getOptions,
+      fieldType: fieldTypeFromColumn
+    }, restProps)));
+  }
   return /*#__PURE__*/React.createElement(Form.Item, _extends({
     label: label,
     name: name
   }, (other === null || other === void 0 ? void 0 : other.formItemProps) || {}, {
     hidden: isHidden
-  }), /*#__PURE__*/React.createElement(Com, other));
+  }), /*#__PURE__*/React.createElement(Com, componentProps));
 };
 export default FilterItem;

package/es/components/filter/components/FilterItem/index.less

@@ -0,0 +1,90 @@
+/**
+ * FilterItem 样式
+ * RangePicker 按 Figma Pisell 2.0 Component Library (node-id=13586-90520)
+ * 使用 pisell-lowcode- 前缀（RangePicker 传入 prefixCls="pisell-lowcode"）
+ * - Border: Gray/300 #D0D5DD, 1px
+ * - Background: Base/White #FFFFFF
+ * - Text/Icon: Gray/500 #667085
+ * - Typography: Text md/Regular - Inter 16px, weight 400, line-height 24px
+ * - Shadow: Shadow/xs 0 1px 2px rgba(16, 24, 40, 0.05)
+ * - Border radius: 8px
+ */
+
+.pisell-lowcode-range-picker-wrap {
+  //width: 257px;
+  width: 100%;
+
+  .pisell-lowcode-range {
+    font-size: 16px;
+    font-weight: 400;
+    line-height: 24px;
+    letter-spacing: 0;
+    color: #667085;
+    border-radius: 8px;
+    border: 1px solid #d0d5dd;
+    background: #ffffff;
+    box-shadow: 0 1px 2px rgba(16, 24, 40, 0.05);
+    width: 100%;
+    height: 48px;
+    min-height: 48px;
+    padding: 6px 11px;
+
+    .pisell-lowcode-picker-input {
+      height: 36px;
+
+      > input {
+        font-family: inherit;
+        font-size: 16px;
+        font-weight: 400;
+        line-height: 24px;
+        color: #667085;
+
+        &::placeholder {
+          color: #667085;
+          opacity: 0.6;
+        }
+      }
+    }
+
+    .pisell-lowcode-picker-separator {
+      color: #667085;
+    }
+
+    .pisell-lowcode-picker-suffix,
+    .pisell-lowcode-picker-clear {
+      color: #667085;
+    }
+
+    &:hover {
+      border-color: #d0d5dd;
+    }
+
+    &.pisell-lowcode-picker-focused {
+      border-color: #d0d5dd;
+      box-shadow: 0 0 0 2px rgba(16, 24, 40, 0.05);
+    }
+
+    &.pisell-lowcode-picker-large {
+      height: 48px;
+      min-height: 48px;
+      padding: 6px 11px;
+
+      .pisell-lowcode-picker-input {
+        height: 36px;
+      }
+    }
+
+    &.pisell-lowcode-picker-small {
+      min-height: 32px;
+      padding: 2px 7px;
+
+      .pisell-lowcode-picker-input {
+        height: 24px;
+      }
+
+      .pisell-lowcode-picker-input > input {
+        font-size: 14px;
+      }
+    }
+  }
+}

package/es/components/filter/components/items/index.d.ts

@@ -6,8 +6,8 @@ export declare const fieldMaps: {
             field_type: string;
             default_value: string;
         };
-        Preview: (props: any) => JSX.Element;
-        Editor: () => JSX.Element;
+        Preview: (props: any) => import("react").JSX.Element;
+        Editor: () => import("react").JSX.Element;
     };
 };
 export declare const fieldList: {
@@ -23,8 +23,8 @@ export declare const getFieldByType: (type: string) => {
         field_type: string;
         default_value: string;
     };
-    Preview: (props: any) => JSX.Element;
-    Editor: () => JSX.Element;
+    Preview: (props: any) => import("react").JSX.Element;
+    Editor: () => import("react").JSX.Element;
 };
 declare const _default: {
     text: {
@@ -34,8 +34,8 @@ declare const _default: {
             field_type: string;
             default_value: string;
         };
-        Preview: (props: any) => JSX.Element;
-        Editor: () => JSX.Element;
+        Preview: (props: any) => import("react").JSX.Element;
+        Editor: () => import("react").JSX.Element;
     };
 };
 export default _default;

package/es/components/filter/components/items/text/Editor/index.d.ts

@@ -1,2 +1,2 @@
-declare const Text: () => JSX.Element;
+declare const Text: () => import("react").JSX.Element;
 export default Text;

package/es/components/filter/components/items/text/Preview/index.d.ts

@@ -1,2 +1,2 @@
-declare const Text: (props: any) => JSX.Element;
+declare const Text: (props: any) => import("react").JSX.Element;
 export default Text;

package/es/components/filter/components/items/text/index.d.ts

@@ -5,7 +5,7 @@ declare const _default: {
         field_type: string;
         default_value: string;
     };
-    Preview: (props: any) => JSX.Element;
-    Editor: () => JSX.Element;
+    Preview: (props: any) => import("react").JSX.Element;
+    Editor: () => import("react").JSX.Element;
 };
 export default _default;

package/es/components/filter/index.d.ts

@@ -1,3 +1,4 @@
+import React from "react";
 import { FilterProps } from "./types";
-declare const Filter: (props: FilterProps) => JSX.Element | null;
+declare const Filter: (props: FilterProps) => React.JSX.Element | null;
 export default Filter;