@pisell/materials 6.0.13 → 6.0.15

package/es/components/dataSourceComponents/dataSourceForm/utils.js

@@ -17,7 +17,7 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 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, { useEffect, useMemo } from 'react';
-import { isArr, isNumber, isString } from '@pisell/utils';
+import { isArr, isFunction, isNumber, isString } from '@pisell/utils';
 import classNames from 'classnames';
 import { parsePhoneNumberFromString } from 'libphonenumber-js';
 import { getText } from "../../../locales";
@@ -27,6 +27,7 @@ import useFormSetting from "./provider/hooks/useFormSetting";
 import useJsonPrefixPath from "./provider/hooks/useJsonPrefixPath";
 import DataSourceProvider from "../provider/dataSource/DataSourceProvider";
 import useTranslationOriginal from "../../../hooks/useTranslationOriginal";
+import useVariables from "../hooks/useVariables";
 import "./style.less";
 /**
  * @title: 增加renderMode属性
@@ -178,9 +179,9 @@ export var withFormItem = function withFormItem(WrappedComponent, overlayProps)
               }
               try {
                 // 清理输入值，移除空格、括号等字符
-                var _cleanedNumber = value.replace(/\s|\(|\)/g, '');
+                var cleanedNumber = value.replace(/\s|\(|\)/g, '');
                 // 使用 parsePhoneNumberFromString 验证 E.164 格式
-                var parsedNumber = parsePhoneNumberFromString(_cleanedNumber);
+                var parsedNumber = parsePhoneNumberFromString(cleanedNumber);
                 if (!(parsedNumber !== null && parsedNumber !== void 0 && parsedNumber.isValid())) {
                   return Promise.reject(new Error(typeobj.message || getText('pisell-data-source-form-phone-message')));
                 }
@@ -200,25 +201,25 @@ export var withFormItem = function withFormItem(WrappedComponent, overlayProps)
               }
               try {
                 // 清理输入值，移除空格和括号等
-                var _cleanedNumber2 = value.replace(/\s|\(|\)/g, '');
+                var cleanedNumber = value.replace(/\s|\(|\)/g, '');
 
                 // 如果超过15位，直接返回错误
-                if (_cleanedNumber2.length > 15) {
+                if (cleanedNumber.length > 15) {
                   return Promise.reject(new Error(typeobj.message || getText('pisell-data-source-form-mobile-message')));
                 }
 
                 // 根据号码前缀判断国家
-                if (_cleanedNumber2.startsWith('+61')) {
+                if (cleanedNumber.startsWith('+61')) {
                   // 澳大利亚手机号规则：
                   // 1. 以04开头必须是10位数字
                   // 2. 以4开头必须是9位数字
-                  var numberWithoutPrefix = _cleanedNumber2.slice(3);
+                  var numberWithoutPrefix = cleanedNumber.slice(3);
                   if (!/^(?:04\d{8}|4\d{8})$/.test(numberWithoutPrefix)) {
                     return Promise.reject(new Error(typeobj.message || getText('pisell-data-source-form-mobile-message')));
                   }
-                } else if (_cleanedNumber2.startsWith('+86')) {
+                } else if (cleanedNumber.startsWith('+86')) {
                   // 中国手机号规则
-                  var _numberWithoutPrefix = _cleanedNumber2.slice(3);
+                  var _numberWithoutPrefix = cleanedNumber.slice(3);
                   if (!/^1[3-9]\d{9}$/.test(_numberWithoutPrefix)) {
                     return Promise.reject(new Error(typeobj.message || getText('pisell-data-source-form-mobile-message')));
                   }
@@ -226,7 +227,8 @@ export var withFormItem = function withFormItem(WrappedComponent, overlayProps)
                 return Promise.resolve();
               } catch (error) {
                 // 如果解析出错，只验证长度
-                if (cleanedNumber.length > 15) {
+                var _cleanedNumber = value.replace(/\s|\(|\)/g, '');
+                if (_cleanedNumber.length > 15) {
                   return Promise.reject(new Error(typeobj.message || getText('pisell-data-source-form-mobile-message')));
                 }
                 return Promise.resolve();
@@ -234,6 +236,11 @@ export var withFormItem = function withFormItem(WrappedComponent, overlayProps)
             }
           });
           break;
+        case 'url':
+          rules.push(_objectSpread(_objectSpread({}, typeobj), {}, {
+            message: typeobj.message || getText('pisell-data-source-form-url-message')
+          }));
+          break;
         case 'subdomain':
           rules.push({
             validator: function validator(_, value) {
@@ -255,6 +262,34 @@ export var withFormItem = function withFormItem(WrappedComponent, overlayProps)
             }
           });
           break;
+        case 'appIdentifier':
+          rules.push({
+            validator: function validator(_, value) {
+              if (!value) return Promise.resolve();
+
+              // 格式检查：只能包含小写字母、数字、连字符、点和下划线
+              if (!/^[a-z0-9\-\._]+$/.test(value)) {
+                return Promise.reject(new Error(getText('pisell-data-source-form-app-identifier-pattern')));
+              }
+
+              // 开头规则检查：必须以字母开头
+              if (!/^[a-z]/.test(value)) {
+                return Promise.reject(new Error(getText('pisell-data-source-form-app-identifier-start-with-letter')));
+              }
+
+              // 结尾规则检查：不能以连字符、点或下划线结尾
+              if (/[\-\._]$/.test(value)) {
+                return Promise.reject(new Error(getText('pisell-data-source-form-app-identifier-special-ends')));
+              }
+
+              // 连续特殊字符检查：不能使用连续的连字符、点或下划线
+              if (/[\-]{2,}|[\.]{2,}|[\_]{2,}/.test(value)) {
+                return Promise.reject(new Error(getText('pisell-data-source-form-app-identifier-consecutive-special')));
+              }
+              return Promise.resolve();
+            }
+          });
+          break;
       }
     }
     if (maxLengthobj && maxLengthobj.enabled) {
@@ -322,6 +357,14 @@ export var withFormItem = function withFormItem(WrappedComponent, overlayProps)
       }
       return propsLabelCol;
     }, [hideLabel, propsLabelCol]);
+    var otherFormItemProps = useMemo(function () {
+      if (isFunction(overlayProps === null || overlayProps === void 0 ? void 0 : overlayProps.otherFormItemProps)) {
+        return overlayProps === null || overlayProps === void 0 ? void 0 : overlayProps.otherFormItemProps(otherProps, {
+          rules: rules
+        });
+      }
+      return (overlayProps === null || overlayProps === void 0 ? void 0 : overlayProps.otherFormItemProps) || {};
+    }, [overlayProps === null || overlayProps === void 0 ? void 0 : overlayProps.otherFormItemProps, otherProps]);
     return /*#__PURE__*/React.createElement(Form.Item, _extends({
       required: required,
       style: _objectSpread(_objectSpread({
@@ -344,14 +387,19 @@ export var withFormItem = function withFormItem(WrappedComponent, overlayProps)
       className: classNames('pisell-data-source-form-item', {
         'pisell-data-source-form-item-view': effectiveMode === 'view'
       })
-    }, overlayProps === null || overlayProps === void 0 ? void 0 : overlayProps.otherFormItemProps), renderComponent);
+    }, otherFormItemProps), renderComponent);
   };
 };
 export var withDataSource = function withDataSource(WrappedComponent) {
   return function (props) {
     var dataSource = props.dataSource;
     return /*#__PURE__*/React.createElement(DataSourceProvider, {
-      dataSource: dataSource
+      dataSource: dataSource,
+      requestOptions: {
+        list: {
+          cacheKey: "".concat(dataSource === null || dataSource === void 0 ? void 0 : dataSource.headerDataSource, "-").concat(dataSource === null || dataSource === void 0 ? void 0 : dataSource.name, "-").concat(dataSource === null || dataSource === void 0 ? void 0 : dataSource.tableName)
+        }
+      }
     }, /*#__PURE__*/React.createElement(WrappedComponent, props));
   };
 };
@@ -362,15 +410,30 @@ export var withOptions = function withOptions(WrappedComponent) {
     var propsOptions = props.options,
       optionSourceType = props.optionSourceType,
       labelField = props.labelField,
-      valueField = props.valueField;
+      valueField = props.valueField,
+      extraParams = props.extraParams;
+    var _useVariables = useVariables(),
+      parseVariable = _useVariables.parseVariable;
     var _useDataSource2 = useDataSource(),
-      list = _useDataSource2.list;
+      list = _useDataSource2.list,
+      getCurrentRecord = _useDataSource2.getCurrentRecord;
+    var parseParams = useMemo(function () {
+      var params = {};
+      if (extraParams) {
+        Object.keys(extraParams).forEach(function (key) {
+          params[key] = parseVariable === null || parseVariable === void 0 ? void 0 : parseVariable(extraParams[key], {
+            currentRecord: getCurrentRecord()
+          });
+        });
+      }
+      return params;
+    }, [extraParams]);
     useEffect(function () {
       if (optionSourceType === 'api') {
-        list.run({
+        list.run(_objectSpread({
           page: 1,
-          pageSize: 200
-        });
+          pageSize: 500
+        }, parseParams));
       }
     }, []);
     var options = useMemo(function () {
@@ -429,7 +492,7 @@ export var renderValueWithMap = function renderValueWithMap(value, valueMap, ren
         style: textStyle
       }, valueMap === null || valueMap === void 0 ? void 0 : valueMap[item]), index < value.length - 1 && ', ');
     }));
-  } else if (isString(value)) {
+  } else if (isString(value) || isNumber(value)) {
     return /*#__PURE__*/React.createElement("span", {
       className: "pisell-form-read-pretty-text"
     }, /*#__PURE__*/React.createElement("span", {
@@ -464,4 +527,17 @@ export var transformFormObjToArrayWithUntouched = function transformFormObjToArr
     });
     return acc;
   }, []);
+};
+
+// 把表单中 touched设置为false
+export var setFormFieldsUntouched = function setFormFieldsUntouched(form) {
+  var fieldsErrorArray = form.getFieldsError();
+  var fields = fieldsErrorArray.map(function (item) {
+    return {
+      name: item.name,
+      value: form.getFieldValue(item.name),
+      touched: false
+    };
+  });
+  form.setFields(fields);
 };

package/es/components/dataSourceComponents/dataSourceMenu/Basic.d.ts

@@ -0,0 +1,2 @@
+declare const _default: any;
+export default _default;

package/es/components/dataSourceComponents/dataSourceMenu/Basic.js

@@ -0,0 +1,61 @@
+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, { forwardRef } from 'react';
+import useEngineContext from "../../../hooks/useEngineContext";
+import BaseMenu from "../../pisellMenu";
+/**
+ * @title: 数据源表单组件
+ * @description: 基于数据源动态生成表单，支持编辑、查看、禁用三种模式
+ */
+var DataSourceMenu = /*#__PURE__*/forwardRef(function (props, ref) {
+  var _appHelper$utils, _appHelper$utils$getA2, _appHelper$utils$getA3, _appHelper$utils$getA4;
+  var _useEngineContext = useEngineContext(),
+    appHelper = _useEngineContext.appHelper;
+  var _appHelper$utils$getA = appHelper === null || appHelper === void 0 ? void 0 : (_appHelper$utils = appHelper.utils) === null || _appHelper$utils === void 0 ? void 0 : (_appHelper$utils$getA2 = _appHelper$utils.getApp) === null || _appHelper$utils$getA2 === void 0 ? void 0 : (_appHelper$utils$getA3 = _appHelper$utils$getA2.call(_appHelper$utils)) === null || _appHelper$utils$getA3 === void 0 ? void 0 : (_appHelper$utils$getA4 = _appHelper$utils$getA3.menuManager) === null || _appHelper$utils$getA4 === void 0 ? void 0 : _appHelper$utils$getA4.useMenu(),
+    menuItems = _appHelper$utils$getA.menuItems,
+    selectedKeys = _appHelper$utils$getA.selectedKeys,
+    openKeys = _appHelper$utils$getA.openKeys,
+    setOpenKeys = _appHelper$utils$getA.setOpenKeys,
+    getShowChildren = _appHelper$utils$getA.getShowChildren,
+    handleClick = _appHelper$utils$getA.handleClick;
+  // 递归渲染菜单项
+  var renderMenuItems = function renderMenuItems(items) {
+    return items.map(function (item) {
+      if (item.hide) {
+        return null;
+      }
+      var _children = getShowChildren(item.children || []);
+      if (_children !== null && _children !== void 0 && _children.length) {
+        return /*#__PURE__*/React.createElement(BaseMenu.SubMenu, {
+          key: item.key,
+          title: item.label,
+          icon: item.icon,
+          router: item.path
+        }, renderMenuItems(_children));
+      }
+      return /*#__PURE__*/React.createElement(BaseMenu.Item, {
+        key: item.key,
+        icon: item.icon,
+        router: item.path
+      }, item.label);
+    });
+  };
+  return /*#__PURE__*/React.createElement(BaseMenu, _extends({
+    ref: ref,
+    mode: "inline"
+    // theme="dark"
+    ,
+    selectedKeys: selectedKeys,
+    openKeys: openKeys,
+    onOpenChange: setOpenKeys,
+    onClick: function onClick(_ref) {
+      var _item$props;
+      var item = _ref.item;
+      handleClick((_item$props = item.props) === null || _item$props === void 0 ? void 0 : _item$props.router);
+    }
+  }, props, {
+    other: {
+      items: undefined
+    }
+  }), renderMenuItems(menuItems));
+});
+export default DataSourceMenu;

package/es/components/dataSourceComponents/dataSourceMenu/index.js

@@ -1,19 +1,48 @@
-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, { forwardRef } from 'react';
-import BaseMenu from "../../pisellMenu";
+import React, { useMemo } from 'react';
+import useEngineContext from "../../../hooks/useEngineContext";
+import PisellMenu from "../../pisellMenu";
 import useVariables from "../hooks/useVariables";
-
+import BaseMenu from "./Basic";
 /**
  * @title: 数据源表单组件
  * @description: 基于数据源动态生成表单，支持编辑、查看、禁用三种模式
  */
-var DataSourceMenu = /*#__PURE__*/forwardRef(function (props, ref) {
+var DataSourceMenu = function DataSourceMenu(props, ref) {
+  var _appHelper$utils, _appHelper$utils$getA, _appHelper$utils$getA2, _appHelper$utils$getA3;
   var dataSource = props.dataSource;
   var _useVariables = useVariables(),
     parseVariable = _useVariables.parseVariable;
-  return /*#__PURE__*/React.createElement(BaseMenu, _extends({}, props, {
-    dataSource: parseVariable === null || parseVariable === void 0 ? void 0 : parseVariable(dataSource),
-    ref: ref
-  }));
-});
+  var _useEngineContext = useEngineContext(),
+    appHelper = _useEngineContext.appHelper;
+  var _dataSource = useMemo(function () {
+    if (Array.isArray(dataSource)) {
+      return dataSource;
+    }
+    if (props.__designMode === 'design') {
+      return [{
+        label: '菜单项1',
+        key: 'item-1',
+        path: '/item-1'
+      }, {
+        label: '菜单项2',
+        key: 'item-2',
+        path: '/item-2'
+      }];
+    }
+    if (typeof dataSource === 'string') {
+      return parseVariable === null || parseVariable === void 0 ? void 0 : parseVariable(dataSource);
+    }
+    return [];
+  }, [dataSource]);
+
+  // 设计模式下使用PisellMenu, 否则缺少app注入导致报错
+  if (props.__designMode === 'design') {
+    return /*#__PURE__*/React.createElement(PisellMenu, props);
+  }
+  var MenuProvider = appHelper === null || appHelper === void 0 ? void 0 : (_appHelper$utils = appHelper.utils) === null || _appHelper$utils === void 0 ? void 0 : (_appHelper$utils$getA = _appHelper$utils.getApp) === null || _appHelper$utils$getA === void 0 ? void 0 : (_appHelper$utils$getA2 = _appHelper$utils$getA.call(_appHelper$utils)) === null || _appHelper$utils$getA2 === void 0 ? void 0 : (_appHelper$utils$getA3 = _appHelper$utils$getA2.menuManager) === null || _appHelper$utils$getA3 === void 0 ? void 0 : _appHelper$utils$getA3.MenuProvider;
+  console.log('MenuProvider11', appHelper);
+  return /*#__PURE__*/React.createElement(MenuProvider, {
+    menus: _dataSource
+  }, /*#__PURE__*/React.createElement(BaseMenu, props));
+};
 export default DataSourceMenu;

package/es/components/dataSourceComponents/dataSourceTable/BaseTable.d.ts

@@ -1,4 +1,8 @@
 import React from 'react';
 import { DataSourceTableProps } from './type';
-declare const BaseTable: (props: DataSourceTableProps) => React.JSX.Element;
-export default BaseTable;
+export interface TableRef {
+    refreshCurrentPage: () => void;
+    refreshData: () => void;
+}
+declare const _default: React.ForwardRefExoticComponent<DataSourceTableProps & React.RefAttributes<TableRef>>;
+export default _default;

package/es/components/dataSourceComponents/dataSourceTable/BaseTable.js

@@ -6,7 +6,7 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 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, { useCallback, useEffect, useRef } from 'react';
+import React, { forwardRef, useCallback, useEffect, useRef, useImperativeHandle, useMemo } from 'react';
 import { useUpdateEffect } from 'ahooks';
 import Table from "../../table";
 import useVariables from "../hooks/useVariables";
@@ -19,7 +19,13 @@ import useDataSource from "../hooks/useDataSource";
 import TableSettingProvider from "./provider/tableSetting/TableSettingProvider";
 import useDataSourceKey from "./hooks/useDataSourceKey";
 import useTableProps from "./hooks/useTableProps";
-var BaseTable = function BaseTable(props) {
+var mockData = {
+  count: 1,
+  data: [{}],
+  page: 1,
+  pageSize: 10
+};
+var BaseTable = function BaseTable(props, ref) {
   var propsColumns = props.columns,
     dataSource = props.dataSource,
     operationContent = props.operationContent,
@@ -29,8 +35,16 @@ var BaseTable = function BaseTable(props) {
   var _useVariables = useVariables(),
     registerValueVariable = _useVariables.registerValueVariable;
   var _useDataSource = useDataSource(),
-    list = _useDataSource.list;
-  var data = list.data;
+    list = _useDataSource.list,
+    __designMode = _useDataSource.__designMode;
+  var originData = list.data;
+  var data = useMemo(function () {
+    var _originData$data;
+    if (__designMode === 'design' && !(originData !== null && originData !== void 0 && (_originData$data = originData.data) !== null && _originData$data !== void 0 && _originData$data.length)) {
+      return mockData;
+    }
+    return originData;
+  }, [originData, __designMode]);
   var _useDataSourceKey = useDataSourceKey(),
     dataSourceKey = _useDataSourceKey.dataSourceKey,
     dataSourceKeyRef = _useDataSourceKey.dataSourceKeyRef;
@@ -50,7 +64,8 @@ var BaseTable = function BaseTable(props) {
     queryPageConfig = _useTableQuery.queryPageConfig,
     handleValuesChange = _useTableQuery.handleValuesChange,
     refreshData = _useTableQuery.refreshData,
-    handleFilterChange = _useTableQuery.handleFilterChange;
+    handleFilterChange = _useTableQuery.handleFilterChange,
+    refreshCurrentPage = _useTableQuery.refreshCurrentPage;
   var handleAllValuesChange = function handleAllValuesChange(changedValues, values) {
     var _props$onValuesChange;
     props === null || props === void 0 ? void 0 : (_props$onValuesChange = props.onValuesChange) === null || _props$onValuesChange === void 0 ? void 0 : _props$onValuesChange.call(props, changedValues, values);
@@ -124,6 +139,15 @@ var BaseTable = function BaseTable(props) {
     handleFilterChange: handleFilterChange,
     tableRef: tableRef
   });
+  useImperativeHandle(ref, function () {
+    if (tableRef.current) {
+      tableRef.current.dataSourceTable = {
+        refreshCurrentPage: refreshCurrentPage,
+        refreshData: refreshData
+      };
+    }
+    return tableRef.current;
+  });
   return /*#__PURE__*/React.createElement(TableSettingProvider, null, /*#__PURE__*/React.createElement(Table, _extends({
     ref: tableRef
   }, others, transformProps, {
@@ -144,4 +168,4 @@ var BaseTable = function BaseTable(props) {
     destroyOnClose: true
   }), drawerContent)));
 };
-export default BaseTable;
+export default /*#__PURE__*/forwardRef(BaseTable);

package/es/components/dataSourceComponents/dataSourceTable/hooks/useColumns.js

@@ -12,8 +12,7 @@ var genFieldProps = function genFieldProps(field, fieldProps) {
     renderMode: 'tableView',
     noStyle: true
   };
-  if (!field) return props;
-  if (['Select', 'Radio.Group', 'Checkbox.Group'].includes(field.uiSchema['x-component']) && field.uiSchema.enum.length > 0) {
+  if (field && ['Select', 'Radio.Group', 'Checkbox.Group'].includes(field.uiSchema['x-component']) && field.uiSchema.enum.length > 0) {
     if (['Radio.Group', 'Checkbox.Group'].includes(field.uiSchema['x-component'])) {
       props.direction = 'horizontal';
     }

package/es/components/dataSourceComponents/dataSourceTable/hooks/useFormat.d.ts

@@ -9,12 +9,16 @@ export declare type UseFormatParams = {
     dataSourceKey: string;
     fields: Field[];
 };
-export declare type FormatListResultParams = {
+export declare type ApiListResult = {
     list: any[];
     count: number;
-    page: number;
     size: number;
+} & ({
+    page: number;
 } | {
+    skip: number;
+});
+export declare type FormatListResultParams = ApiListResult | {
     data: any[];
     meta: {
         count: number;

package/es/components/dataSourceComponents/dataSourceTable/hooks/useFormat.js

@@ -12,14 +12,20 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import { useMemoizedFn } from 'ahooks';
 import { formFieldFilterFuncMap } from "../../fields/utils";
-import { isArr, isString } from '@pisell/utils';
+import { isArr, isJson, isString } from '@pisell/utils';
 import dayjs from 'dayjs';
+// 过滤条件操作符 https://docs-cn.nocobase.com/api/database/operators
+var filterOperatorArr = ['$eq', '$ne', '$is', '$not', '$col', '$in', '$notIn', '$empty', '$notEmpty', '$and', '$or', '$isFalsy', '$isTruly', '$gt', '$gte', '$lt', '$lte', '$between', '$notBetween', '$includes', '$notIncludes', '$startsWith', '$notStatsWith', '$endsWith', '$notEndsWith', '$like', '$notLike', '$iLike', '$notILike', '$regexp', '$notRegexp', '$iRegexp', '$notIRegexp', '$dateOn', '$dateNotOn', '$dateBefore', '$dateNotBefore', '$dateAfter', '$dateNotAfter', '$match', '$notMatch', '$anyOf', '$noneOf', '$arrayEmpty', '$arrayNotEmpty', '$exists', '$notExists'];
+
 // 转换过滤条件
 var formatFilter = function formatFilter(filterValue, fields) {
   var conditions = [];
   if (!filterValue || !(fields !== null && fields !== void 0 && fields.length)) {
     return JSON.stringify({});
   }
+  if (isString(filterValue)) {
+    return filterValue;
+  }
 
   // 处理关键字搜索
   if (filterValue._keywords) {
@@ -53,6 +59,16 @@ var formatFilter = function formatFilter(filterValue, fields) {
     if (key === '_keywords' || value === undefined || value === null || value === '' || isArr(value) && value.length === 0) {
       return;
     }
+
+    // 判断value是否包含filterOperatorArr中的元素
+    if (isString(value) && filterOperatorArr.some(function (item) {
+      return value.includes(item);
+    })) {
+      if (isJson(value)) {
+        conditions.push(_defineProperty({}, key, JSON.parse(value)));
+      }
+      return;
+    }
     var field = fieldsMap[key];
     if (!(field !== null && field !== void 0 && (_field$uiSchema = field.uiSchema) !== null && _field$uiSchema !== void 0 && _field$uiSchema['x-component'])) {
       return;
@@ -122,7 +138,7 @@ var useFormat = function useFormat(_ref4) {
     fields = _ref4.fields;
   // list接口请求 结果格式化
   var formatListResult = useMemoizedFn(function (res) {
-    if (dataSourceKey === 'pisell2-api' && 'list' in res) {
+    if (dataSourceKey === 'pisell2-api' && 'list' in res && 'page' in res) {
       return {
         data: res.list,
         count: res.count,
@@ -130,6 +146,15 @@ var useFormat = function useFormat(_ref4) {
         pageSize: res.size
       };
     }
+    if (dataSourceKey === 'mypisell-api' && 'list' in res && 'skip' in res) {
+      var skip = typeof res.skip === 'number' ? res.skip : 1;
+      return {
+        data: res.list,
+        count: res.count,
+        page: skip - 1 || 1,
+        pageSize: res.size
+      };
+    }
     if ('meta' in res) {
       return {
         data: res.data,
@@ -156,6 +181,12 @@ var useFormat = function useFormat(_ref4) {
         size: (params === null || params === void 0 ? void 0 : params.pageSize) || 10
       }, customApiFormatFilter(params.filter || {}));
     }
+    if (dataSourceKey === 'mypisell-api') {
+      return _objectSpread({
+        skip: (params === null || params === void 0 ? void 0 : params.page) || 1,
+        num: (params === null || params === void 0 ? void 0 : params.pageSize) || 10
+      }, customApiFormatFilter(params.filter || {}));
+    }
     return params;
   });
   var formatCreateUpdateParams = useMemoizedFn(function (params) {

package/es/components/dataSourceComponents/dataSourceTable/hooks/useTableProps.d.ts

@@ -43,7 +43,12 @@ declare const useTableProps: (props: UseTablePropsProps) => {
     } | undefined;
     operation?: {
         show: boolean;
-        title: string;
+        title: string; /**
+         * 处理table的props
+         * 转换title
+         * @param props
+         * @returns
+         */
         width: number;
         align: "center" | "left" | "right";
         fixed: false | "left" | "right";
@@ -65,7 +70,7 @@ declare const useTableProps: (props: UseTablePropsProps) => {
         useCustomAction: boolean;
         actionType: string;
         openMode: "modal" | "drawer";
-        openContentSize: "small" | "large" | "middle";
+        openContentSize: "small" | "middle" | "large";
         openTitle: string;
         key: string;
     } | undefined;