fan-standard-comp 4.1.2 → 4.1.4

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;
@@ -64,11 +65,18 @@ var StandardFilter = /*#__PURE__*/React.forwardRef(function (props, ref) {
     colon = _providerConfig$props10 === void 0 ? true : _providerConfig$props10,
     dateFormatter = _providerConfig$props.dateFormatter,
     _providerConfig$props11 = _providerConfig$props.collapseable,
-    collapseable = _providerConfig$props11 === void 0 ? false : _providerConfig$props11;
+    collapseable = _providerConfig$props11 === void 0 ? false : _providerConfig$props11,
+    parseTransform = _providerConfig$props.parseTransform,
+    _providerConfig$props12 = _providerConfig$props.forceListener,
+    forceListener = _providerConfig$props12 === void 0 ? true : _providerConfig$props12;
   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),
@@ -193,7 +201,8 @@ var StandardFilter = /*#__PURE__*/React.forwardRef(function (props, ref) {
       protoFormItem: {
         style: {
           textAlign: filterFormLayout === 'horizontal' ? 'right' : 'left'
-        }
+        },
+        className: filterFormLayout === 'horizontal' ? 'filter-action-right' : 'filter-action-left'
       },
       colSpan: filterButtonColSpan || 24 - calculateTimes * (24 / general.modalSize[itemGroupSize].columnNumber)
     }, filterButtonConfig), {}, {
@@ -239,27 +248,33 @@ 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);
+    });
+    if (parseTransform) {
+      newVal = parseTransform(_objectSpread({}, newVal));
+    }
+    // 如果配置了dateFormatter='string'，则将默认对其他进行格式转换
+    if (dateFormatter === 'string') {
+      // 需要将字符串转换成日期格式
+      filterDateFields.forEach(function (dItem) {
+        if (newVal[dItem.filedName || dItem.fieldName]) {
+          if (typeof newVal[dItem.filedName || dItem.fieldName] === 'string') {
+            // console.log('将字符串转换成dayjs')
+            newVal[dItem.filedName || dItem.fieldName] = dayjs(newVal[dItem.filedName || dItem.fieldName]);
+          } else if (Array.isArray(newVal[dItem.filedName || dItem.fieldName])) {
+            // console.log('将数组转换成dayjs数组')
+            newVal[dItem.filedName || dItem.fieldName] = newVal[dItem.filedName || dItem.fieldName].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 +291,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) {
@@ -359,11 +375,19 @@ var StandardFilter = /*#__PURE__*/React.forwardRef(function (props, ref) {
     }
   }, [formItemGroup, collapseable, filterFormLayout, collapsed, columnNumberAndSize === null || columnNumberAndSize === void 0 ? void 0 : columnNumberAndSize.columnNumber, itemGroupConfig, filterFormRef, filterFormRef === null || filterFormRef === void 0 || (_filterFormRef$curren4 = filterFormRef.current) === null || _filterFormRef$curren4 === void 0 ? void 0 : _filterFormRef$curren4.getFieldValue()]);
   useEffect(function () {
-    if (initialValues && JSON.stringify(initialValues) !== '{}') {
-      updateFormFields(initialValues, true);
+    if (!forceListener) {
+      if (initialValues && JSON.stringify(initialValues) !== '{}') {
+        updateFormFields(initialValues, true);
+      }
     }
-  }, [initialValues]);
-
+  }, []);
+  useEffect(function () {
+    if (forceListener) {
+      if (initialValues && JSON.stringify(initialValues) !== '{}') {
+        updateFormFields(initialValues, true);
+      }
+    }
+  }, [forceListener, initialValues]);
   // / 表单列表组 formItemGroup 类型为数组或者React.Node
   var renderFormItemGroup = function renderFormItemGroup() {
     if (Array.isArray(reFormItemGroup)) {

package/es/StandardFilter/style/FilterStyle.js

@@ -16,8 +16,9 @@ var StandardFilterStyleFunc = function StandardFilterStyleFunc(prefix) {
         // backgroundColor: token.colorBgBase,
         '.filter-form': {
           '.ant-form-item-control, ant-form-item-label': {
-            lineHeight: token.controlHeight + 'px' //  @input-height-base;
-          }
+            // lineHeight: token.controlHeight + 'px'//  @input-height-base;
+          },
+          '.ant-btn .ant-btn-icon': {}
         },
         '.filter-form .ant-form-item': {
           marginRight: token.paddingMD,

package/es/StandardFilter/style/index.less

@@ -71,6 +71,13 @@
       .ant-form-item {
         margin-right: 0;
       }
+      .filter-action-right {
+        //display: flex;
+        //justify-content: end;
+        .ant-btn {
+          vertical-align: middle;
+        }
+      }
     }
     .ant-form-item {
       //margin-right: @padding-md; // 16px

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 React 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;
-}
-declare const StandardTable: FC<StandardTableProps>;
-export default StandardTable;
+import type { StandardTableProps } from './types';
+declare const _default: React.NamedExoticComponent<StandardTableProps>;
+export default _default;

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; }
@@ -14,7 +14,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useContext } from 'react';
+import React, { useContext, memo } from 'react';
 import classNames from 'classnames';
 import { Table, Card } from 'antd';
 import ButtonGroup from "../ButtonGroup/index";
@@ -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,47 @@ 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.map(function (item) {
+          return {
+            column: item.columnKey,
+            asc: item.order == 'ascend'
+          };
+        }),
+        // 对象
+        sorters: sorters,
+        // 数组
+        sorterParams: sorterParams // 对象
+      }), filters, sorter, extra);
+    }
+  }))));
 };
-export default StandardTable;
+export default /*#__PURE__*/memo(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,7 @@
 import React from 'react';
-import { StandardTableProps } from '../StandardTable';
-interface StandardTableProType extends StandardTableProps {
-    filterForm?: any;
-    modalForm?: any;
-    [k: string]: any;
-}
-declare const StandardTablePro: React.ForwardRefExoticComponent<React.RefAttributes<StandardTableProType>>;
+import { StandardTableProType } from './types';
+/**
+ * 复合表格：筛选+表格列表
+ * */
+declare const StandardTablePro: React.ForwardRefExoticComponent<Omit<StandardTableProType, "ref"> & React.RefAttributes<HTMLDivElement>>;
 export default StandardTablePro;