fan-standard-comp 4.1.2 → 4.1.3

package/es/utils/ValueFormat.js

@@ -1,3 +1,9 @@
+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); }
+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); }
 // @ts-nocheck
 import dayjs from 'dayjs';
 /*
@@ -6,37 +12,45 @@ import dayjs from 'dayjs';
 * @params {Array} formItemGroup: 表单组
 * */
 var dateFieldTypes = ['datePicker', 'dateTimePicker', 'rangePicker', 'rangeTimePicker', 'timePicker', 'timePickerRange'];
-export var UtilValueFormat = function UtilValueFormat(fieldsValue, formItemGroup) {
+export var UtilValueFormat = function UtilValueFormat(fieldsValue, formItemGroup, dateFormatter) {
   formItemGroup && formItemGroup.forEach(function (item) {
     var _item$protoConfig, _fieldsValue, _item$protoConfig2, _fieldsValue$, _item$protoConfig3, _fieldsValue$2, _item$protoConfig4;
     if (!fieldsValue[item.filedName || item.fieldName]) return;
-    switch (item.type) {
-      case 'datePicker':
-      case 'dateTimePicker':
-      case 'rangePicker':
-      case 'rangeTimePicker':
-        var pickerFormatNew;
-        if (item !== null && item !== void 0 && (_item$protoConfig = item.protoConfig) !== null && _item$protoConfig !== void 0 && _item$protoConfig.picker) {
-          switch (item.protoConfig.picker) {
-            case 'week':
-              pickerFormatNew = 'YYYY-wo';
-              break;
-            case 'month':
-              pickerFormatNew = 'MM月';
-              break;
-            case 'year':
-              pickerFormatNew = 'YYYY';
-              break;
-            default:
-              break;
+    if (dateFormatter === 'string') {
+      // 默认转换成字符串格式返回
+      switch (item.type) {
+        case 'datePicker':
+        case 'dateTimePicker':
+        case 'rangePicker':
+        case 'rangeTimePicker':
+          var pickerFormatNew;
+          if (item !== null && item !== void 0 && (_item$protoConfig = item.protoConfig) !== null && _item$protoConfig !== void 0 && _item$protoConfig.picker) {
+            switch (item.protoConfig.picker) {
+              case 'week':
+                pickerFormatNew = 'YYYY-wo';
+                break;
+              case 'month':
+                pickerFormatNew = 'MM月';
+                break;
+              case 'year':
+                pickerFormatNew = 'YYYY';
+                break;
+              default:
+                break;
+            }
+          } else {
+            pickerFormatNew = item.type === 'datePicker' || item.type === 'rangePicker' ? 'YYYY-MM-DD' : 'YYYY-MM-DD HH:mm:ss';
           }
-        } else {
-          pickerFormatNew = item.type === 'datePicker' || item.type === 'rangePicker' ? 'YYYY-MM-DD' : 'YYYY-MM-DD HH:mm:ss';
-        }
-        fieldsValue[item.filedName || item.fieldName] = item.type === 'datePicker' || item.type === 'dateTimePicker' ? (_fieldsValue = fieldsValue[item.filedName || item.fieldName]) === null || _fieldsValue === void 0 ? void 0 : _fieldsValue.format((item === null || item === void 0 || (_item$protoConfig2 = item.protoConfig) === null || _item$protoConfig2 === void 0 ? void 0 : _item$protoConfig2.format) || pickerFormatNew) : [(_fieldsValue$ = fieldsValue[item.filedName || item.fieldName][0]) === null || _fieldsValue$ === void 0 ? void 0 : _fieldsValue$.format((item === null || item === void 0 || (_item$protoConfig3 = item.protoConfig) === null || _item$protoConfig3 === void 0 ? void 0 : _item$protoConfig3.format) || pickerFormatNew), (_fieldsValue$2 = fieldsValue[item.filedName || item.fieldName][1]) === null || _fieldsValue$2 === void 0 ? void 0 : _fieldsValue$2.format((item === null || item === void 0 || (_item$protoConfig4 = item.protoConfig) === null || _item$protoConfig4 === void 0 ? void 0 : _item$protoConfig4.format) || pickerFormatNew)];
-        break;
-      default:
-        break;
+          fieldsValue[item.filedName || item.fieldName] = item.type === 'datePicker' || item.type === 'dateTimePicker' ? (_fieldsValue = fieldsValue[item.filedName || item.fieldName]) === null || _fieldsValue === void 0 ? void 0 : _fieldsValue.format((item === null || item === void 0 || (_item$protoConfig2 = item.protoConfig) === null || _item$protoConfig2 === void 0 ? void 0 : _item$protoConfig2.format) || pickerFormatNew) : [(_fieldsValue$ = fieldsValue[item.filedName || item.fieldName][0]) === null || _fieldsValue$ === void 0 ? void 0 : _fieldsValue$.format((item === null || item === void 0 || (_item$protoConfig3 = item.protoConfig) === null || _item$protoConfig3 === void 0 ? void 0 : _item$protoConfig3.format) || pickerFormatNew), (_fieldsValue$2 = fieldsValue[item.filedName || item.fieldName][1]) === null || _fieldsValue$2 === void 0 ? void 0 : _fieldsValue$2.format((item === null || item === void 0 || (_item$protoConfig4 = item.protoConfig) === null || _item$protoConfig4 === void 0 ? void 0 : _item$protoConfig4.format) || pickerFormatNew)];
+          break;
+        default:
+          break;
+      }
+    }
+    if (item !== null && item !== void 0 && item.transform) {
+      var _item$transform;
+      var transValue = (item === null || item === void 0 || (_item$transform = item.transform) === null || _item$transform === void 0 ? void 0 : _item$transform.call(item, fieldsValue[item.filedName || item.fieldName])) || {};
+      fieldsValue = _objectSpread(_objectSpread({}, fieldsValue), transValue);
     }
   });
   return fieldsValue;

package/es/utils/urlUtils.d.ts

@@ -16,3 +16,9 @@ export declare const isHttpUrl: (path: string) => boolean;
  *  是否是完整的URL
  * */
 export declare const isUrl: (path: string) => boolean;
+/***
+ * transSearchByColumn URL上带orders[xxx]=xxx相关参数值，转换成order排序数组
+ * @param searchParams     url上的search参数
+ * @param transOptionName = 'orders'               // 提交需要的字段名
+ */
+export declare const transSearchByColumn: (params?: any, transOptionName?: string) => any;

package/es/utils/urlUtils.js

@@ -1,3 +1,9 @@
+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); }
+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); }
 // @ts-nocheck 文件忽略(添加到该文件的首行)
 import { parse } from "qs";
 
@@ -63,4 +69,24 @@ var reg = /(((^https?:(?:\/\/)?)(?:[-;:&=\+\$,\w]+@)?[A-Za-z0-9.-]+(?::\d+)?|(?:
  * */
 export var isUrl = function isUrl(path) {
   return reg.test(path);
+};
+
+/***
+ * transSearchByColumn URL上带orders[xxx]=xxx相关参数值，转换成order排序数组
+ * @param searchParams     url上的search参数
+ * @param transOptionName = 'orders'               // 提交需要的字段名
+ */
+export var transSearchByColumn = function transSearchByColumn(params) {
+  var transOptionName = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'orders';
+  var paramsKeys = _objectSpread({}, params);
+  var paramOrders = params[transOptionName || 'orders'] || {};
+  var orders = [];
+  Object.keys(paramOrders).forEach(function (oItem) {
+    orders.push({
+      column: oItem,
+      asc: paramOrders[oItem] === 'descend'
+    });
+  });
+  paramsKeys[transOptionName || 'orders'] = orders;
+  return paramsKeys;
 };

package/lib/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/lib/FormComp/FieldComponent/ExtensionField.js

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

package/lib/StandardFilter/index.js

@@ -12,6 +12,7 @@ var _ButtonGroup = _interopRequireDefault(require("../ButtonGroup/"));
 var _data = require("../data/");
 require("./style/index.less");
 var _ConfigContext = require("../ConfigContext");
+var _dayjs = _interopRequireDefault(require("dayjs"));
 var _FilterStyle = _interopRequireDefault(require("./style/FilterStyle"));
 var _SpecIcon = _interopRequireDefault(require("../SpecIcon"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -76,7 +77,11 @@ var StandardFilter = /*#__PURE__*/_react.default.forwardRef(function (props, ref
   var filterFormRef = (0, _react.useRef)();
   // ref 的转发
   (0, _react.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 = (0, _react.useState)([]),
     _useState2 = _slicedToArray(_useState, 2),
@@ -238,6 +243,7 @@ var StandardFilter = /*#__PURE__*/_react.default.forwardRef(function (props, ref
 
   // 更新表单控件值，用于外部获取当前表单实例(force是否强制清空表单)
   var updateFormFields = function updateFormFields(newVal, force) {
+    // console.log('更新表单控件值，用于外部获取当前表单实例(force是否强制清空表单)')
     var resetValues = {};
     if (force) {
       // this.filterFormRef.current.resetFields()
@@ -247,27 +253,30 @@ var StandardFilter = /*#__PURE__*/_react.default.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] = (0, _dayjs.default)(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' ? (0, _dayjs.default)(valItem) : valItem;
+            });
+          } else {
+            // console.log('其他情况', newVal[dItem.filedName] instanceof Date)
+            // console.log('其他情况,当它是日期格式，则不进行转换')
           }
-        })
-      } */
+        }
+      });
+    }
     filterFormRef.current.setFieldsValue(_objectSpread(_objectSpread({}, resetValues), newVal || {})); // 直接清空表单的赋值
     forceUpdateForm();
   };
@@ -284,7 +293,8 @@ var StandardFilter = /*#__PURE__*/_react.default.forwardRef(function (props, ref
     if (Object.prototype.hasOwnProperty.call(values, false)) {
       delete values.false; // 自定义结构会莫名的出来一个false字段
     }
-    var resultValues = dateFormatter === 'string' ? (0, _utils.UtilValueFormat)(values, reFormItemGroup) : values;
+    var resultValues = (0, _utils.UtilValueFormat)(values, reFormItemGroup, dateFormatter);
+    // reFormItemGroup里面有 transform，则筛选转换
     // console.log('格式化前数据', values)
     // console.log('格式化后数据', resultValues)
     if (onFilterSearch) {

package/lib/StandardForm/index.js

@@ -13,6 +13,7 @@ require("./style/index.less");
 var _ActionList = _interopRequireDefault(require("./ActionList"));
 var _index2 = _interopRequireDefault(require("./style/index"));
 var _ConfigContext = require("../ConfigContext");
+var _utils = require("../utils");
 var _excluded = ["formItemGroup", "className", "initialValues", "layout", "grid", "getFormFields", "fieldStatus", "onSubmit", "confirmText", "onCancel", "cancelText", "confirmButtonProps", "cancelButtonProps", "actionAlign", "actionGroup", "onFinishFailed", "children", "prefix", "postfix", "fieldSize", "displayLayout", "itemGroupConfig"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
@@ -107,7 +108,8 @@ var StandardForm = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     getFormFields && getFormFields(initForm && initForm.getFieldsValue() || {}, initForm);
   };
   var onFormFinish = function onFormFinish(values) {
-    if (onSubmit) onSubmit(values);
+    var resultValues = (0, _utils.UtilValueFormat)(values, formItemGroup);
+    if (onSubmit) onSubmit(_objectSpread({}, resultValues));
   };
   var onFormFinishFailed = function onFormFinishFailed(_ref) {
     var values = _ref.values,

package/lib/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/lib/StandardTable/index.js

@@ -13,7 +13,7 @@ require("./style/index.less");
 var _ConfigContext = require("../ConfigContext");
 var _lodash = _interopRequireDefault(require("lodash"));
 var _index3 = _interopRequireDefault(require("./style/index"));
-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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -63,6 +63,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({
@@ -86,7 +87,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) {
@@ -144,10 +146,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);
@@ -193,6 +212,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);
+    }
+  }))));
 };
 var _default = exports.default = StandardTable;

package/lib/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/lib/StandardTable/types.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/lib/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;