fan-standard-comp 4.1.2 → 4.1.3

package/es/FormComp/FieldComponent/ExtensionField.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
-declare const ExtensionField: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
-export default ExtensionField;
+declare const _default: React.MemoExoticComponent<React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>>;
+export default _default;

package/es/FormComp/FieldComponent/ExtensionField.js

@@ -15,4 +15,4 @@ var ExtensionField = /*#__PURE__*/forwardRef(function (props, ref) {
   var MatchTypeComponent = (MatchType === null || MatchType === void 0 ? void 0 : MatchType.component) || null;
   return typeof MatchTypeComponent === 'function' ? /*#__PURE__*/React.createElement(MatchTypeComponent, fieldProps) : MatchTypeComponent;
 });
-export default ExtensionField;
+export default /*#__PURE__*/React.memo(ExtensionField);

package/es/StandardFilter/index.js

@@ -20,6 +20,7 @@ import ButtonGroup from "../ButtonGroup/";
 import { general } from "../data/";
 import "./style/index.less";
 import { FanContext } from "../ConfigContext";
+import dayjs from "dayjs";
 import useStyle from "./style/FilterStyle";
 import SpecIcon from "../SpecIcon";
 var FormItem = Form.Item;
@@ -68,7 +69,11 @@ var StandardFilter = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var filterFormRef = useRef();
   // ref 的转发
   useImperativeHandle(ref, function () {
-    return filterFormRef === null || filterFormRef === void 0 ? void 0 : filterFormRef.current;
+    return _objectSpread(_objectSpread({}, filterFormRef === null || filterFormRef === void 0 ? void 0 : filterFormRef.current), {}, {
+      onSubmit: function onSubmit(values) {
+        return handleSearch(values);
+      }
+    });
   });
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
@@ -230,6 +235,7 @@ var StandardFilter = /*#__PURE__*/React.forwardRef(function (props, ref) {
 
   // 更新表单控件值，用于外部获取当前表单实例(force是否强制清空表单)
   var updateFormFields = function updateFormFields(newVal, force) {
+    // console.log('更新表单控件值，用于外部获取当前表单实例(force是否强制清空表单)')
     var resetValues = {};
     if (force) {
       // this.filterFormRef.current.resetFields()
@@ -239,27 +245,30 @@ var StandardFilter = /*#__PURE__*/React.forwardRef(function (props, ref) {
         resetValues[item] = undefined;
       });
     }
-    /*  const dateFieldTypes = ['datePicker', 'dateTimePicker', 'rangePicker', 'rangeTimePicker', 'timePicker', 'timePickerRange']
-      const filterDateFields = formItemGroup.filter(fItem => dateFieldTypes.includes(fItem.type))
-      // 如果配置了dateFormatter='string'，则将默认对其他进行格式转换
-      if (dateFormatter === 'string') {
-        // 需要将字符串转换成日期格式
-        filterDateFields.forEach(dItem => {
-          if (newVal[dItem.filedName]) {
-            if (typeof newVal[dItem.filedName] === 'string') {
-              console.log('将字符串转换成dayjs')
-              newVal[dItem.filedName] = dayjs(newVal[dItem.filedName])
-            } else if (Array.isArray(newVal[dItem.filedName])) {
-              console.log('将数组转换成dayjs数组')
-              newVal[dItem.filedName] = newVal[dItem.filedName].map(valItem => {
-                return typeof valItem === 'string' ? dayjs(valItem) : valItem
-              })
-            } else {
-              // console.log('其他情况,当它是日期格式，则不进行转换')
-            }
+    var dateFieldTypes = ['datePicker', 'dateTimePicker', 'rangePicker', 'rangeTimePicker', 'timePicker', 'timePickerRange'];
+    var filterDateFields = formItemGroup.filter(function (fItem) {
+      return dateFieldTypes.includes(fItem.type);
+    });
+    // 如果配置了dateFormatter='string'，则将默认对其他进行格式转换
+    if (dateFormatter === 'string') {
+      // 需要将字符串转换成日期格式
+      filterDateFields.forEach(function (dItem) {
+        if (newVal[dItem.filedName]) {
+          if (typeof newVal[dItem.filedName] === 'string') {
+            // console.log('将字符串转换成dayjs')
+            newVal[dItem.filedName] = dayjs(newVal[dItem.filedName]);
+          } else if (Array.isArray(newVal[dItem.filedName])) {
+            // console.log('将数组转换成dayjs数组')
+            newVal[dItem.filedName] = newVal[dItem.filedName].map(function (valItem) {
+              return typeof valItem === 'string' ? dayjs(valItem) : valItem;
+            });
+          } else {
+            // console.log('其他情况', newVal[dItem.filedName] instanceof Date)
+            // console.log('其他情况,当它是日期格式，则不进行转换')
           }
-        })
-      } */
+        }
+      });
+    }
     filterFormRef.current.setFieldsValue(_objectSpread(_objectSpread({}, resetValues), newVal || {})); // 直接清空表单的赋值
     forceUpdateForm();
   };
@@ -276,7 +285,8 @@ var StandardFilter = /*#__PURE__*/React.forwardRef(function (props, ref) {
     if (Object.prototype.hasOwnProperty.call(values, false)) {
       delete values.false; // 自定义结构会莫名的出来一个false字段
     }
-    var resultValues = dateFormatter === 'string' ? UtilValueFormat(values, reFormItemGroup) : values;
+    var resultValues = UtilValueFormat(values, reFormItemGroup, dateFormatter);
+    // reFormItemGroup里面有 transform，则筛选转换
     // console.log('格式化前数据', values)
     // console.log('格式化后数据', resultValues)
     if (onFilterSearch) {

package/es/StandardForm/index.js

@@ -23,6 +23,7 @@ import "./style/index.less";
 import ActionList from "./ActionList";
 import useStyle from "./style/index";
 import { FanContext } from "../ConfigContext";
+import { UtilValueFormat } from "../utils";
 var StandardForm = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var InitFanContext = useContext(FanContext);
   var providerConfig = InitFanContext['StandardForm'] || {}; // 使用上下文（全局配置）设置扩展的配置项
@@ -98,7 +99,8 @@ var StandardForm = /*#__PURE__*/React.forwardRef(function (props, ref) {
     getFormFields && getFormFields(initForm && initForm.getFieldsValue() || {}, initForm);
   };
   var onFormFinish = function onFormFinish(values) {
-    if (onSubmit) onSubmit(values);
+    var resultValues = UtilValueFormat(values, formItemGroup);
+    if (onSubmit) onSubmit(_objectSpread({}, resultValues));
   };
   var onFormFinishFailed = function onFormFinishFailed(_ref) {
     var values = _ref.values,

package/es/StandardTable/index.d.ts

@@ -1,29 +1,5 @@
-import React, { FC } from 'react';
+import { FC } from 'react';
 import './style/index.less';
-interface StandardTableDataProps {
-    list?: object[];
-    pagination?: any;
-}
-export interface StandardTableProps {
-    columns?: any[];
-    data: StandardTableDataProps;
-    rowKey?: string;
-    onChange?: (pageConfig?: any) => void;
-    hideOrderNumber?: boolean;
-    emptyText?: string;
-    codes?: object[];
-    permissionCodes?: string[];
-    className?: string;
-    rowSelection?: any;
-    orderNumber?: object;
-    columnsConfig?: object;
-    buttonGroup?: any[];
-    title?: React.ReactNode | string;
-    min?: number;
-    buttonGroupConfig?: any;
-    batchButtonGroup?: any[];
-    buttonGroupPlacement?: string | 'left' | 'right' | 'bottomLeft' | 'bottomRight';
-    [k: string]: any;
-}
+import type { StandardTableProps } from './types';
 declare const StandardTable: FC<StandardTableProps>;
 export default StandardTable;

package/es/StandardTable/index.js

@@ -1,5 +1,5 @@
 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 = ["data", "rowKey", "rowSelection", "columns", "hideOrderNumber", "orderNumber", "className", "emptyText", "codes", "permissionCodes", "columnsConfig", "title", "buttonGroup", "buttonGroupConfig", "min", "batchButtonGroup", "buttonGroupPlacement"];
+var _excluded = ["data", "rowKey", "rowSelection", "columns", "hideOrderNumber", "orderNumber", "className", "emptyText", "codes", "permissionCodes", "columnsConfig", "title", "buttonGroup", "buttonGroupConfig", "min", "batchButtonGroup", "buttonGroupPlacement", "sortOrders"];
 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; }
@@ -54,6 +54,7 @@ var StandardTable = function StandardTable(props) {
     batchButtonGroup = _providerConfig$props.batchButtonGroup,
     _providerConfig$props5 = _providerConfig$props.buttonGroupPlacement,
     buttonGroupPlacement = _providerConfig$props5 === void 0 ? 'right' : _providerConfig$props5,
+    sortOrders = _providerConfig$props.sortOrders,
     rest = _objectWithoutProperties(_providerConfig$props, _excluded);
   // 加上类型修复 TS:2322 报警
   var resetColumns = [_objectSpread(_objectSpread({
@@ -77,7 +78,8 @@ var StandardTable = function StandardTable(props) {
     pageSizeOptions: ['5', '10', '15', '20', '30', '50'],
     showTotal: function showTotal(total, range) {
       return "".concat(range[0], "-").concat(range[1], "\u6761 \u5171").concat(total, "\u6761");
-    }
+    },
+    pageSize: (pagination === null || pagination === void 0 ? void 0 : pagination.pageSize) || (pagination === null || pagination === void 0 ? void 0 : pagination.size)
   }, pagination);
   if (columns) {
     var recombinationColumns = columns.map(function (colItem) {
@@ -135,10 +137,27 @@ var StandardTable = function StandardTable(props) {
         colItem.render = function (text, record, rowIndex) {
           return text || text === 0 ? text : '-';
         };
+        if (sortOrders && (sortOrders.hasOwnProperty(colItem.key) || sortOrders.hasOwnProperty(colItem.dataIndex))) {
+          colItem.sortOrder = (sortOrders === null || sortOrders === void 0 ? void 0 : sortOrders[colItem.key]) || (sortOrders === null || sortOrders === void 0 ? void 0 : sortOrders[colItem.dataIndex]) || (sortOrders === null || sortOrders === void 0 ? void 0 : sortOrders[colItem.key]) || null;
+          colItem.sortOrderExtra = true;
+        } else {
+          if (colItem.sortOrderExtra) {
+            delete colItem.sortOrder;
+          }
+        }
         // return Object.assign({ ellipsis: undefined, render: undefined }, { ...otherColumns, ...colItem });  // ellipsis要配置在render之前
         return _objectSpread(_objectSpread({}, otherColumn), colItem);
       }
+      if (sortOrders && (sortOrders.hasOwnProperty(colItem.key) || sortOrders.hasOwnProperty(colItem.dataIndex))) {
+        colItem.sortOrder = (sortOrders === null || sortOrders === void 0 ? void 0 : sortOrders[colItem.key]) || (sortOrders === null || sortOrders === void 0 ? void 0 : sortOrders[colItem.dataIndex]) || (sortOrders === null || sortOrders === void 0 ? void 0 : sortOrders[colItem.key]) || null;
+        colItem.sortOrderExtra = true;
+      } else {
+        if (colItem.sortOrderExtra) {
+          delete colItem.sortOrder;
+        }
+      }
       // return Object.assign({ ellipsis: undefined, render: undefined }, { ...otherColumns, ...colItem }) // ellipsis要配置在render之前
+      // return { ...otherColumn, ...colItem }
       return _objectSpread(_objectSpread({}, otherColumn), colItem);
     });
     resetColumns = hideOrderNumber ? recombinationColumns : resetColumns.concat(recombinationColumns);
@@ -184,6 +203,41 @@ var StandardTable = function StandardTable(props) {
       filterReset: '重置',
       emptyText: emptyText || '暂无数据'
     }
-  }, rest))));
+  }, rest, {
+    // @ts-ignore
+    onChange: function onChange(pagination, filters, sorter, extra) {
+      var _rest$onChange;
+      var sorterParams = {}; // 取当前列表中有配置排序条件
+      // (columns || []).forEach((cItem: any) => {
+      //   if (cItem.hasOwnProperty('sorter') && cItem.type !== 'action') {
+      //     // 加这个赋值处理是为了避免sorter为空时，原url已经加上了排序值，但是未清空
+      //     sorterParams[`${sortPrefixToUrl}${cItem?.key || cItem?.dataIndex}`] = undefined
+      //   }
+      // })
+      var sorters = [];
+      if (Array.isArray(sorter)) {
+        // 多个条件
+        sorters = sorter.map(function (item) {
+          return _objectSpread({}, item);
+        });
+      } else if (JSON.stringify(sorter) !== '{}') {
+        // 单个条件
+        sorters.push(_objectSpread({}, sorter));
+      }
+      // 取当前字段的排序值
+      // let orders: any = {};
+      (sorters || []).forEach(function (item) {
+        sorterParams["".concat(item === null || item === void 0 ? void 0 : item.columnKey)] = item === null || item === void 0 ? void 0 : item.order;
+        // sorterParams[`${sortPrefixToUrl}${item?.columnKey}`] = item?.order
+      });
+      rest === null || rest === void 0 || (_rest$onChange = rest.onChange) === null || _rest$onChange === void 0 || _rest$onChange.call(rest, _objectSpread(_objectSpread({}, pagination), {}, {
+        size: pagination.pageSize,
+        // orders,   // 对象
+        sorters: sorters,
+        // 数组
+        sorterParams: sorterParams // 对象
+      }), filters, sorter, extra);
+    }
+  }))));
 };
 export default StandardTable;

package/es/StandardTable/types.d.ts

@@ -0,0 +1,33 @@
+/// <reference types="react" />
+import type { ButtonGroupOptionsProps } from "../ButtonGroup";
+export interface StandardTableDataProps {
+    list?: object[];
+    pagination?: any;
+}
+export interface ExButtonGroupProps {
+    buttonGroup?: ButtonGroupOptionsProps[];
+    batchButtonGroup?: ButtonGroupOptionsProps[];
+    [k: string]: any;
+}
+export interface StandardTableProps {
+    columns?: any[];
+    data: StandardTableDataProps;
+    rowKey?: string;
+    onChange?: (pageConfig?: any) => void;
+    hideOrderNumber?: boolean;
+    emptyText?: string;
+    codes?: object[];
+    permissionCodes?: string[];
+    className?: string;
+    rowSelection?: any;
+    orderNumber?: object;
+    columnsConfig?: object;
+    buttonGroup?: any[];
+    title?: React.ReactNode | string;
+    min?: number;
+    buttonGroupConfig?: any;
+    batchButtonGroup?: any[];
+    buttonGroupPlacement?: string | 'left' | 'right' | 'bottomLeft' | 'bottomRight';
+    sortOrders?: object;
+    [k: string]: any;
+}

package/es/StandardTable/types.js

@@ -0,0 +1 @@
+export {};

package/es/StandardTablePro/index.d.ts

@@ -1,9 +1,17 @@
 import React from 'react';
-import { StandardTableProps } from '../StandardTable';
+import type { StandardTableProps } from '../StandardTable/types';
 interface StandardTableProType extends StandardTableProps {
-    filterForm?: any;
-    modalForm?: any;
+    proClassname?: string;
+    filter?: any;
+    formConfig?: any;
+    onChange?: (pageParams?: any) => void;
+    onSubmit?: (searchParams?: any) => void;
+    onReset?: () => void;
+    params?: any;
     [k: string]: any;
 }
+/**
+ * 复合表格：筛选+表格列表
+ * */
 declare const StandardTablePro: React.ForwardRefExoticComponent<React.RefAttributes<StandardTableProType>>;
 export default StandardTablePro;

package/es/StandardTablePro/index.js

@@ -1,5 +1,5 @@
 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 = ["proClassname", "filterForm", "modalForm", "codes", "permissionCodes", "onChange", "children", "className"];
+var _excluded = ["proClassname", "filter", "formConfig", "codes", "permissionCodes", "onSubmit", "onReset", "onChange", "children", "className", "columns", "params"];
 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 _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."); }
@@ -14,26 +14,32 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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 _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, { useContext, useImperativeHandle, forwardRef, useState } from 'react';
-// import { FanContext } from "fan-standard-comp";
+import React, { useContext, useImperativeHandle, forwardRef, useState, useMemo } from 'react';
+// import { FanContext, StandardFilter, StandardTable } from "fan-standard-comp";
 import { FanContext } from "../ConfigContext";
-import useStyle from "./style/index";
-import StandardTable from "../StandardTable";
 import StandardFilter from "../StandardFilter";
-import StandardModal from "../StandardModal";
+import StandardTable from "../StandardTable";
+import useStyle from "./style/index";
 import classNames from "classnames";
+/**
+ * 复合表格：筛选+表格列表
+ * */
 var StandardTablePro = /*#__PURE__*/forwardRef(function (props, ref) {
   var InitFanContext = useContext(FanContext);
   var providerConfig = InitFanContext['StandardTablePro'] || {}; // 使用上下文（全局配置）设置扩展的配置项
   var _providerConfig$props = _objectSpread(_objectSpread({}, providerConfig), props),
     proClassname = _providerConfig$props.proClassname,
-    filterForm = _providerConfig$props.filterForm,
-    modalForm = _providerConfig$props.modalForm,
+    filter = _providerConfig$props.filter,
+    formConfig = _providerConfig$props.formConfig,
     codes = _providerConfig$props.codes,
     permissionCodes = _providerConfig$props.permissionCodes,
-    onChange = _providerConfig$props.onChange,
+    onSubmit = _providerConfig$props.onSubmit,
+    onReset = _providerConfig$props.onReset,
+    _onChange = _providerConfig$props.onChange,
     children = _providerConfig$props.children,
     className = _providerConfig$props.className,
+    columns = _providerConfig$props.columns,
+    params = _providerConfig$props.params,
     others = _objectWithoutProperties(_providerConfig$props, _excluded);
   var commonConfig = {
     codes: codes,
@@ -45,101 +51,72 @@ var StandardTablePro = /*#__PURE__*/forwardRef(function (props, ref) {
     wrapSSR = _useStyle2[0],
     hashId = _useStyle2[1];
   var handleChange = function handleChange(targetKey, data, defaultParam) {
-    onChange && onChange(targetKey, data, defaultParam);
+    if (targetKey === 'filterSearch') {
+      onSubmit === null || onSubmit === void 0 || onSubmit(data);
+    }
+    if (targetKey === 'filterReset') {
+      onReset === null || onReset === void 0 || onReset();
+    }
+    // if (targetKey === 'tableChange') {
+    //   onChange && onChange(data, defaultParam)
+    // }
   };
+  var formItemGroup = useMemo(function () {
+    var itemGroupFromColumns = (columns || []).filter(function (item) {
+      return item.formItem && JSON.stringify(item.formItem) !== '{}';
+    }).map(function (fItem) {
+      return _objectSpread({
+        label: fItem === null || fItem === void 0 ? void 0 : fItem.title,
+        fieldName: (fItem === null || fItem === void 0 ? void 0 : fItem.key) || (fItem === null || fItem === void 0 ? void 0 : fItem.dataIndex)
+      }, fItem.formItem);
+    });
+    return ((filter === null || filter === void 0 ? void 0 : filter.formItemGroup) || []).concat(itemGroupFromColumns);
+  }, [columns, filter === null || filter === void 0 ? void 0 : filter.formItemGroup]);
+
+  // const [filterFields, setFilterFormFields] = useState({})
   var _useState = useState({}),
     _useState2 = _slicedToArray(_useState, 2),
-    filterFormFields = _useState2[0],
-    setFilterFormFields = _useState2[1];
-  var _useState3 = useState(),
-    _useState4 = _slicedToArray(_useState3, 2),
-    filterFormInstance = _useState4[0],
-    setFilterFormInstance = _useState4[1];
-  var _useState5 = useState({}),
-    _useState6 = _slicedToArray(_useState5, 2),
-    modalFormFields = _useState6[0],
-    setModalFormFields = _useState6[1];
-  var _useState7 = useState(),
-    _useState8 = _slicedToArray(_useState7, 2),
-    modalFormInstance = _useState8[0],
-    setModalFormInstance = _useState8[1];
-  var _useState9 = useState(false),
-    _useState10 = _slicedToArray(_useState9, 2),
-    modalVisible = _useState10[0],
-    setModalVisible = _useState10[1];
-
+    filterInstance = _useState2[0],
+    setFilterFormInstance = _useState2[1];
+  // const [filterValues, setFilterValues] = useState<any>({})
   // ref 的转发
   useImperativeHandle(ref, function () {
-    return _objectSpread(_objectSpread({}, filterForm), {}, {
-      filterFormFields: filterFormFields,
-      filterFormInstance: filterFormInstance,
-      modalFormFields: modalFormFields,
-      modalFormInstance: modalFormInstance
+    return {
+      // ...filter,
+      // filterFields, // 值不会更新，不传给ref
+      filterInstance: filterInstance === null || filterInstance === void 0 ? void 0 : filterInstance.current
       // dataSource: resDataSource,
       // setDataSource: setResDataSource,
       // reload: (filter) => loadData('refresh', {}, filter) // 更新列表
-    });
-  });
+    };
+  }, [filterInstance]);
+  // sortOrder: sortedInfo.columnKey === 'name' ? sortedInfo.order : null,
+  // columns 里面需要把sort添加上去
   return wrapSSR( /*#__PURE__*/React.createElement("div", {
     className: classNames(componentName, proClassname, hashId)
-  }, /*#__PURE__*/React.createElement(StandardFilter, _extends({}, commonConfig, filterForm, {
+  }, /*#__PURE__*/React.createElement(StandardFilter, _extends({}, commonConfig, filter, {
+    // initialValue={filterValues}
+    formItemGroup: formItemGroup,
     getFormFields: function getFormFields(fieldValues, form) {
-      setFilterFormFields(fieldValues); // 获取表单内部控件值
+      var _filter$getFormFields;
+      // setFilterFormFields(fieldValues) // 获取表单内部控件值
       setFilterFormInstance(form); // 获取表单实例
+      filter === null || filter === void 0 || (_filter$getFormFields = filter.getFormFields) === null || _filter$getFormFields === void 0 || _filter$getFormFields.call(filter, fieldValues, form);
     },
     onFilterSearch: function onFilterSearch(values) {
       return handleChange('filterSearch', values);
     },
-    onFilterReset: function onFilterReset(values) {
-      return handleChange('filterReset', values);
+    onFilterReset: function onFilterReset() {
+      return handleChange('filterReset');
     },
-    className: classNames('spec-standard-table-pro-filter', filterForm === null || filterForm === void 0 ? void 0 : filterForm.className)
-  })), /*#__PURE__*/React.createElement(StandardModal, _extends({}, commonConfig, modalForm, {
-    getFormFields: function getFormFields(fields, form) {
-      setModalFormFields(fields);
-      setModalFormInstance(form);
-    },
-    className: classNames('spec-standard-table-pro-modal', modalForm === null || modalForm === void 0 ? void 0 : modalForm.className)
+    className: classNames('spec-standard-table-pro-filter', filter === null || filter === void 0 ? void 0 : filter.className)
   })), /*#__PURE__*/React.createElement(StandardTable, _extends({}, commonConfig, others, {
+    columns: columns
     // @ts-ignore
+    ,
     onChange: function onChange(pagination, filters, sorter, extra) {
-      console.log('表格筛选条件', pagination, filters, sorter, extra);
-      // console.log(' pagination, filters, sorter', pagination, filters, sorter)
-      // loadData('table', {
-      //   page: pagination.current,
-      //   size: pagination.pageSize
-      // }, filters, sorter)
-
-      console.log('pagination', pagination);
-      console.log('filters', filters);
-      console.log('sorter', sorter);
-      console.log('extra', extra);
-      var orders = [];
-      if (Array.isArray(sorter)) {
-        // 多个条件
-        orders = sorter.map(function (item) {
-          return {
-            column: item.columnKey,
-            asc: item.order === 'ascend'
-          };
-        });
-      } else {
-        // 单个条件
-        orders.push({
-          column: sorter.columnKey,
-          asc: sorter.order === 'ascend'
-        });
-      }
-      console.log('orders', orders);
-      handleChange('tableChange', {
-        page: pagination.current,
-        size: pagination.pageSize
-      }, {
-        pagination: pagination,
-        filters: filters,
-        sorter: sorter,
-        extra: extra
-      });
+      _onChange && _onChange(pagination, filters, sorter, extra);
+      // handleChange('tableChange', { pagination, filters, sorter, extra, action: extra.action })
     },
     className: classNames('spec-standard-table-pro-table', className)
   })), children));

package/es/index.d.ts

@@ -8,6 +8,7 @@ export { default as SplitterLayout } from './StandardContent/SplitterLayout';
 export { default as RefactorTree } from './RefactorTree';
 export { default as StandardPanel } from './StandardPanel';
 export { default as StandardTable } from './StandardTable';
+export { default as StandardTablePro } from './StandardTablePro';
 export { default as StandardForm } from './StandardForm';
 export { default as StepForm } from './StandardForm/StepForm';
 export { default as TabForm } from './StandardForm/TabForm';
@@ -25,5 +26,6 @@ export * from './components';
 export * from './utils';
 export * from './data';
 export * from './ConfigContext';
+export * from './types';
 export { default as ImageGallery } from './ImageGallery/index';
 export { default as ImagePreview } from './ImageGallery/ImagePreview';

package/es/index.js

@@ -13,6 +13,7 @@ export { default as RefactorTree } from "./RefactorTree";
 // // 通用组件
 export { default as StandardPanel } from "./StandardPanel";
 export { default as StandardTable } from "./StandardTable";
+export { default as StandardTablePro } from "./StandardTablePro";
 export { default as StandardForm } from "./StandardForm";
 export { default as StepForm } from "./StandardForm/StepForm";
 export { default as TabForm } from "./StandardForm/TabForm";
@@ -38,6 +39,8 @@ export * from "./utils";
 export * from "./data";
 // 上下文
 export * from "./ConfigContext";
+// 类型
+export * from "./types";
 
 // 图集
 export { default as ImageGallery } from "./ImageGallery/index";

package/es/types.d.ts

@@ -0,0 +1 @@
+export * from './StandardTable/types';

package/es/types.js

@@ -0,0 +1 @@
+export * from "./StandardTable/types";

package/es/utils/ValueFormat.d.ts

@@ -1,3 +1,3 @@
-export declare const UtilValueFormat: (fieldsValue: any, formItemGroup: any) => any;
+export declare const UtilValueFormat: (fieldsValue: any, formItemGroup: any, dateFormatter?: string) => any;
 export declare const dateOrTimeStringToDayjs: () => void;
 export declare const isDate: (value: any) => boolean;