fan-standard-comp 4.1.2 → 4.1.3

package/lib/StandardTablePro/index.js

@@ -7,12 +7,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _ConfigContext = require("../ConfigContext");
-var _index = _interopRequireDefault(require("./style/index"));
-var _StandardTable = _interopRequireDefault(require("../StandardTable"));
 var _StandardFilter = _interopRequireDefault(require("../StandardFilter"));
-var _StandardModal = _interopRequireDefault(require("../StandardModal"));
+var _StandardTable = _interopRequireDefault(require("../StandardTable"));
+var _index = _interopRequireDefault(require("./style/index"));
 var _classnames = _interopRequireDefault(require("classnames"));
-var _excluded = ["proClassname", "filterForm", "modalForm", "codes", "permissionCodes", "onChange", "children", "className"]; // import { FanContext } from "fan-standard-comp";
+var _excluded = ["proClassname", "filter", "formConfig", "codes", "permissionCodes", "onSubmit", "onReset", "onChange", "children", "className", "columns", "params"]; // import { FanContext, StandardFilter, StandardTable } from "fan-standard-comp";
 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; }
@@ -30,18 +29,25 @@ 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; }
+/**
+ * 复合表格：筛选+表格列表
+ * */
 var StandardTablePro = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var InitFanContext = (0, _react.useContext)(_ConfigContext.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,
@@ -53,101 +59,72 @@ var StandardTablePro = /*#__PURE__*/(0, _react.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 = (0, _react.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 = (0, _react.useState)({}),
     _useState2 = _slicedToArray(_useState, 2),
-    filterFormFields = _useState2[0],
-    setFilterFormFields = _useState2[1];
-  var _useState3 = (0, _react.useState)(),
-    _useState4 = _slicedToArray(_useState3, 2),
-    filterFormInstance = _useState4[0],
-    setFilterFormInstance = _useState4[1];
-  var _useState5 = (0, _react.useState)({}),
-    _useState6 = _slicedToArray(_useState5, 2),
-    modalFormFields = _useState6[0],
-    setModalFormFields = _useState6[1];
-  var _useState7 = (0, _react.useState)(),
-    _useState8 = _slicedToArray(_useState7, 2),
-    modalFormInstance = _useState8[0],
-    setModalFormInstance = _useState8[1];
-  var _useState9 = (0, _react.useState)(false),
-    _useState10 = _slicedToArray(_useState9, 2),
-    modalVisible = _useState10[0],
-    setModalVisible = _useState10[1];
-
+    filterInstance = _useState2[0],
+    setFilterFormInstance = _useState2[1];
+  // const [filterValues, setFilterValues] = useState<any>({})
   // ref 的转发
   (0, _react.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.default.createElement("div", {
     className: (0, _classnames.default)(componentName, proClassname, hashId)
-  }, /*#__PURE__*/_react.default.createElement(_StandardFilter.default, _extends({}, commonConfig, filterForm, {
+  }, /*#__PURE__*/_react.default.createElement(_StandardFilter.default, _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: (0, _classnames.default)('spec-standard-table-pro-filter', filterForm === null || filterForm === void 0 ? void 0 : filterForm.className)
-  })), /*#__PURE__*/_react.default.createElement(_StandardModal.default, _extends({}, commonConfig, modalForm, {
-    getFormFields: function getFormFields(fields, form) {
-      setModalFormFields(fields);
-      setModalFormInstance(form);
-    },
-    className: (0, _classnames.default)('spec-standard-table-pro-modal', modalForm === null || modalForm === void 0 ? void 0 : modalForm.className)
+    className: (0, _classnames.default)('spec-standard-table-pro-filter', filter === null || filter === void 0 ? void 0 : filter.className)
   })), /*#__PURE__*/_react.default.createElement(_StandardTable.default, _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: (0, _classnames.default)('spec-standard-table-pro-table', className)
   })), children));

package/lib/StandardTablePro/types.js

@@ -0,0 +1 @@
+"use strict";

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

@@ -14,6 +14,7 @@ var _exportNames = {
   RefactorTree: true,
   StandardPanel: true,
   StandardTable: true,
+  StandardTablePro: true,
   StandardForm: true,
   StepForm: true,
   TabForm: true,
@@ -144,6 +145,12 @@ Object.defineProperty(exports, "StandardTable", {
     return _StandardTable.default;
   }
 });
+Object.defineProperty(exports, "StandardTablePro", {
+  enumerable: true,
+  get: function get() {
+    return _StandardTablePro.default;
+  }
+});
 Object.defineProperty(exports, "StepForm", {
   enumerable: true,
   get: function get() {
@@ -190,6 +197,7 @@ var _SplitterLayout = _interopRequireDefault(require("./StandardContent/Splitter
 var _RefactorTree = _interopRequireDefault(require("./RefactorTree"));
 var _StandardPanel = _interopRequireDefault(require("./StandardPanel"));
 var _StandardTable = _interopRequireDefault(require("./StandardTable"));
+var _StandardTablePro = _interopRequireDefault(require("./StandardTablePro"));
 var _StandardForm = _interopRequireDefault(require("./StandardForm"));
 var _StepForm = _interopRequireDefault(require("./StandardForm/StepForm"));
 var _TabForm = _interopRequireDefault(require("./StandardForm/TabForm"));
@@ -249,6 +257,18 @@ Object.keys(_ConfigContext).forEach(function (key) {
     }
   });
 });
+var _types = require("./types");
+Object.keys(_types).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _types[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _types[key];
+    }
+  });
+});
 var _index = _interopRequireDefault(require("./ImageGallery/index"));
 var _ImagePreview = _interopRequireDefault(require("./ImageGallery/ImagePreview"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/lib/types.d.ts

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

package/lib/types.js

@@ -0,0 +1,16 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+var _types = require("./StandardTable/types");
+Object.keys(_types).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _types[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _types[key];
+    }
+  });
+});

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

package/lib/utils/ValueFormat.js

@@ -6,45 +6,57 @@ Object.defineProperty(exports, "__esModule", {
 exports.isDate = exports.dateOrTimeStringToDayjs = exports.UtilValueFormat = void 0;
 var _dayjs = _interopRequireDefault(require("dayjs"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-// @ts-nocheck
-
+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
 /*
 * 工具类： 表单组控件值格式转换工具
 * @params {Object} fieldsValue: 表单组内的控件值
 * @params {Array} formItemGroup: 表单组
 * */
 var dateFieldTypes = ['datePicker', 'dateTimePicker', 'rangePicker', 'rangeTimePicker', 'timePicker', 'timePickerRange'];
-var UtilValueFormat = exports.UtilValueFormat = function UtilValueFormat(fieldsValue, formItemGroup) {
+var UtilValueFormat = exports.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/lib/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/lib/utils/urlUtils.js

@@ -3,10 +3,14 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isUrl = exports.isHttpUrl = exports.getJumpUrlBySearch = void 0;
+exports.transSearchByColumn = exports.isUrl = exports.isHttpUrl = exports.getJumpUrlBySearch = void 0;
 var _qs = require("qs");
-// @ts-nocheck 文件忽略(添加到该文件的首行)
-
+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 文件忽略(添加到该文件的首行)
 /**
  *  跳转外链、iframe 地址支持带参
  *  获取url的search，并有条件：`^{变量名}`的条件取本地存储的数据 // 参数格式：^{变量名} 变量名支持数字、字母、下划线
@@ -69,4 +73,24 @@ var reg = /(((^https?:(?:\/\/)?)(?:[-;:&=\+\$,\w]+@)?[A-Za-z0-9.-]+(?::\d+)?|(?:
  * */
 var isUrl = exports.isUrl = function isUrl(path) {
   return reg.test(path);
+};
+
+/***
+ * transSearchByColumn URL上带orders[xxx]=xxx相关参数值，转换成order排序数组
+ * @param searchParams     url上的search参数
+ * @param transOptionName = 'orders'               // 提交需要的字段名
+ */
+var transSearchByColumn = exports.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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fan-standard-comp",
-  "version": "4.1.2",
+  "version": "4.1.3",
   "description": "FZ standard-comp,basic of antd5.0 and custom component.",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -19,7 +19,7 @@
     "lint": "npm run lint:es && npm run lint:css",
     "lint:css": "stylelint \"{src,test}/**/*.{css,less}\"",
     "lint:es": "eslint \"{src,test}/**/*.{js,jsx,ts,tsx}\"",
-    "package-to-tgz": "tar -czf fan-standard-comp-4.1.2.tgz package && yarn"
+    "package-to-tgz": "tar -czf fan-standard-comp-4.1.3.tgz package && yarn"
   },
   "authors": [
     "shomychen"