fan-standard-comp 3.2.1 → 3.2.2

package/lib/StandardDragModal/index.js

@@ -3,36 +3,30 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-var _DraggableModal = require("./DraggableModal");
-Object.keys(_DraggableModal).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _DraggableModal[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _DraggableModal[key];
-    }
-  });
-});
-var _DraggableModalContext = require("./DraggableModalContext");
-Object.keys(_DraggableModalContext).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _DraggableModalContext[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _DraggableModalContext[key];
-    }
-  });
-});
-var _DraggableModalProvider = require("./DraggableModalProvider");
-Object.keys(_DraggableModalProvider).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _DraggableModalProvider[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _DraggableModalProvider[key];
-    }
-  });
-});
+exports.default = void 0;
+var _tslib = require("tslib");
+var _react = _interopRequireDefault(require("react"));
+var _antDesignDraggableModal = require("ant-design-draggable-modal");
+require("ant-design-draggable-modal/dist/index.css");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+var StandardDragModal = function StandardDragModal(props) {
+  var visible = props.visible,
+    onCancel = props.onCancel,
+    onSubmit = props.onSubmit,
+    children = props.children,
+    others = (0, _tslib.__rest)(props, ["visible", "onCancel", "onSubmit", "children"]);
+  var handleOk = function handleOk() {
+    onSubmit && onSubmit();
+  };
+  var handleCancel = function handleCancel() {
+    onCancel && onCancel();
+  };
+  return /*#__PURE__*/_react.default.createElement(_antDesignDraggableModal.DraggableModalProvider, null, /*#__PURE__*/_react.default.createElement(_antDesignDraggableModal.DraggableModal, Object.assign({
+    visible: visible,
+    onOk: handleOk,
+    onCancel: handleCancel
+  }, others, {
+    zIndex: 1001
+  }), children));
+};
+var _default = exports.default = StandardDragModal;

package/lib/StandardFilter/index.d.ts

@@ -17,21 +17,10 @@ export interface StandardFilterProps {
     min?: number;
     codes?: any[];
     permissionCodes?: string[];
+    formLayout?: 'inline' | 'horizontal' | 'vertical';
+    gridLayout?: 'inline' | 'horizontal';
+    colon?: boolean;
+    [k: string]: any;
 }
-declare class StandardFilter extends React.Component<StandardFilterProps, any> {
-    static getDerivedStateFromProps(nextProps: StandardFilterProps): {
-        reFormItemGroup: FieldComponentProps[];
-    };
-    private filterFormRef;
-    constructor(props: StandardFilterProps);
-    componentDidMount(): void;
-    componentDidUpdate(prevProps: StandardFilterProps): void;
-    updateFormFields: (newVal?: any, force?: boolean) => void;
-    forceUpdateForm: () => void;
-    handleSearch: (values: object) => void;
-    handleReset: () => void;
-    itemIsHide: (isHide: any) => any;
-    renderFormItemGroup: () => any;
-    render(): JSX.Element;
-}
+declare const StandardFilter: React.ForwardRefExoticComponent<Omit<StandardFilterProps, "ref"> & React.RefAttributes<unknown>>;
 export default StandardFilter;

package/lib/StandardFilter/index.js

@@ -9,216 +9,230 @@ require("antd/es/button/style");
 var _button = _interopRequireDefault(require("antd/es/button"));
 require("antd/es/form/style");
 var _form = _interopRequireDefault(require("antd/es/form"));
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 var _ValueFormat = _interopRequireDefault(require("../utils/ValueFormat.js"));
 var _index = _interopRequireDefault(require("../ButtonGroup/index"));
+var _index2 = require("../data/index");
 require("./style/index.less");
 var _RenderItemGroup = _interopRequireDefault(require("../FormComp/RenderItemGroup"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
-function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } // import { general } from '../data/index';
+var _ConfigContext = require("../ConfigContext");
+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 && {}.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; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _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."); }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+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(r) { if (Array.isArray(r)) return r; } // @ts-nocheck
 var FormItem = _form.default.Item;
-var StandardFilter = /*#__PURE__*/function (_React$Component) {
-  _inherits(StandardFilter, _React$Component);
-  var _super = _createSuper(StandardFilter);
-  function StandardFilter(props) {
-    var _this;
-    _classCallCheck(this, StandardFilter);
-    _this = _super.call(this, props);
-    _this.filterFormRef = /*#__PURE__*/_react.default.createRef();
-    // 更新表单控件值，用于外部获取当前表单实例(force是否强制清空表单)
-    _this.updateFormFields = function (newVal, force) {
-      var getFormFields = _this.props.getFormFields;
-      var resetValues = {};
-      if (force) {
-        // this.filterFormRef.current.resetFields()
-        // 先清空 再赋值
-        resetValues = _this.filterFormRef.current.getFieldsValue();
-        Object.keys(resetValues).forEach(function (item) {
-          resetValues[item] = undefined;
-        });
-      }
-      _this.filterFormRef.current.setFieldsValue(Object.assign(Object.assign({}, resetValues), newVal)); // 直接清空表单的赋值
-      if (getFormFields) getFormFields(_this.filterFormRef.current.getFieldsValue(), _this.filterFormRef);
-    }; // 强制更新表单值，用于赋初始化实例值
-    _this.forceUpdateForm = function () {
-      var getFormFields = _this.props.getFormFields;
-      if (getFormFields) getFormFields(_this.filterFormRef.current.getFieldsValue(), _this.filterFormRef);
-    };
-    _this.handleSearch = function (values) {
-      var _this$props = _this.props,
-        formItemGroup = _this$props.formItemGroup,
-        onFilterSearch = _this$props.onFilterSearch; // if (Object.prototype.hasOwnProperty.call(values, false)) {
-      //   delete values.false // TODO 自定义结构会莫名的出来一个false字段
-      // }
-      var resultValues = (0, _ValueFormat.default)(values, formItemGroup);
-      if (onFilterSearch) {
-        onFilterSearch(Object.assign({}, resultValues));
+var StandardFilter = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
+  var InitFanContext = (0, _react.useContext)(_ConfigContext.FanContext);
+  var providerConfig = InitFanContext['StandardFilter'] || {}; // 使用上下文（全局配置）设置扩展的配置项
+  var _Object$assign = Object.assign(Object.assign({}, providerConfig), props),
+    _Object$assign$formIt = _Object$assign.formItemGroup,
+    formItemGroup = _Object$assign$formIt === void 0 ? [] : _Object$assign$formIt,
+    itemGroupConfig = _Object$assign.itemGroupConfig,
+    initialValues = _Object$assign.initialValues,
+    getFormFields = _Object$assign.getFormFields,
+    onFilterSearch = _Object$assign.onFilterSearch,
+    onFilterReset = _Object$assign.onFilterReset,
+    className = _Object$assign.className,
+    style = _Object$assign.style,
+    _Object$assign$button = _Object$assign.buttonGroup,
+    buttonGroup = _Object$assign$button === void 0 ? [] : _Object$assign$button,
+    buttonGroupConfig = _Object$assign.buttonGroupConfig,
+    min = _Object$assign.min,
+    codes = _Object$assign.codes,
+    permissionCodes = _Object$assign.permissionCodes,
+    confirmText = _Object$assign.confirmText,
+    cancelText = _Object$assign.cancelText,
+    _Object$assign$confir = _Object$assign.confirmButtonProps,
+    confirmButtonProps = _Object$assign$confir === void 0 ? {} : _Object$assign$confir,
+    _Object$assign$cancel = _Object$assign.cancelButtonProps,
+    cancelButtonProps = _Object$assign$cancel === void 0 ? {} : _Object$assign$cancel,
+    filterButtonColSpan = _Object$assign.filterButtonColSpan,
+    filterButtonConfig = _Object$assign.filterButtonConfig,
+    formLayout = _Object$assign.formLayout,
+    gridLayout = _Object$assign.gridLayout,
+    filterFormStyle = _Object$assign.filterFormStyle,
+    filterBtnsStyle = _Object$assign.filterBtnsStyle,
+    _Object$assign$colon = _Object$assign.colon,
+    colon = _Object$assign$colon === void 0 ? true : _Object$assign$colon;
+  var filterFormRef = (0, _react.useRef)();
+  // ref 的转发
+  (0, _react.useImperativeHandle)(ref, function () {
+    return filterFormRef === null || filterFormRef === void 0 ? void 0 : filterFormRef.current;
+  });
+  var _useState = (0, _react.useState)([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    reFormItemGroup = _useState2[0],
+    setReFormItemGroup = _useState2[1];
+  var _useState3 = (0, _react.useState)(0),
+    _useState4 = _slicedToArray(_useState3, 2),
+    isHideCount = _useState4[0],
+    setIsHideCount = _useState4[1]; // 表单隐藏项数量值
+  var filterFormLayout = (0, _react.useMemo)(function () {
+    return formLayout || 'inline';
+  }, [formLayout]);
+  //  配置筛选按钮（确认与取消）
+  var filterActionButtons = (0, _react.useMemo)(function () {
+    // 当前栅栅数量
+    var itemGroupSize = (itemGroupConfig === null || itemGroupConfig === void 0 ? void 0 : itemGroupConfig.size) || (filterFormLayout === 'horizontal' ? 'xxlg' : 'md');
+    // 计算扣除栅格列数是否还有多余的项，用来判断筛选按钮的版式（初始化的时候，可能会受默认值内配置的isHide影响导致计算错误;或自定义表单控件组栅格影响）
+    var complementationTimes = (formItemGroup.length - isHideCount) % _index2.general.modalSize[itemGroupSize].columnNumber;
+    // xs:1列  sm:1列   【span:24】
+    // md:2列           【span:12】
+    // lg:3列  xlg:3列  【span:8】
+    // xxlg:4列        【span:6】
+    if (!onFilterSearch && !onFilterReset) return [];
+    return [Object.assign(Object.assign({
+      label: '',
+      type: 'custom',
+      // display: 'block',
+      display: {
+        wrapperCol: {
+          // 占用的格子数按对应size配置的formItem(md下额外再新增1）
+          span: _index2.general.modalSize[itemGroupSize].formLayout.labelCol.span + _index2.general.modalSize[itemGroupSize].formLayout.wrapperCol.span + (itemGroupSize === 'md' ? 1 : 0)
+        }
+      },
+      protoFormItem: {
+        style: {
+          textAlign: filterFormLayout === 'horizontal' ? 'right' : 'left'
+        }
+      },
+      colSpan: filterButtonColSpan || 24 - complementationTimes * (24 / _index2.general.modalSize[itemGroupSize].columnNumber)
+    }, filterButtonConfig), {
+      customRender: function customRender() {
+        return /*#__PURE__*/_react.default.createElement(FormItem, {
+          noStyle: true
+        }, onFilterSearch && /*#__PURE__*/_react.default.createElement(_button.default, Object.assign({
+          type: "primary",
+          htmlType: "submit"
+        }, confirmButtonProps), confirmText || '查询'), onFilterReset && /*#__PURE__*/_react.default.createElement(_button.default, Object.assign({
+          type: "primary",
+          style: {
+            marginLeft: 8
+          },
+          onClick: handleReset,
+          ghost: true
+        }, cancelButtonProps), cancelText || '重置'));
       }
-    };
-    _this.handleReset = function () {
-      var onFilterReset = _this.props.onFilterReset; // 使用此方法，表单校验无法清空掉
-      // const resetValues = this.filterFormRef.current.getFieldsValue()
-      // Object.keys(resetValues).forEach((item) => {
-      //   resetValues[item] = undefined
-      // })
-      // this.filterFormRef.current.setFieldsValue({ ...resetValues }) // 直接清空表单的赋值
-      _this.filterFormRef.current.resetFields();
-      _this.setState({
-        reFormItemGroup: _this.props.formItemGroup // 重新渲染列表
+    })];
+  }, [confirmText, cancelText, filterFormLayout, reFormItemGroup, onFilterSearch, onFilterReset, itemGroupConfig, filterFormRef, isHideCount]);
+  // 更新表单控件值，用于外部获取当前表单实例(force是否强制清空表单)
+  var updateFormFields = function updateFormFields(newVal, force) {
+    var resetValues = {};
+    if (force) {
+      // this.filterFormRef.current.resetFields()
+      // 先清空 再赋值
+      resetValues = filterFormRef.current.getFieldsValue();
+      Object.keys(resetValues).forEach(function (item) {
+        resetValues[item] = undefined;
       });
-
-      if (onFilterReset) {
-        onFilterReset(_this.filterFormRef.current.getFieldsValue());
-      }
-    };
-    _this.itemIsHide = function (isHide) {
-      var current = _this.filterFormRef.current;
-      if (!isHide) return false;
-      if (typeof isHide === 'function') {
-        return isHide(current ? current.getFieldsValue() : {}, current);
-      }
-      return isHide;
-    };
-    // 表单列表组 formItemGroup 类型为数组或者React.Node
-    _this.renderFormItemGroup = function () {
-      var reFormItemGroup = _this.state.reFormItemGroup;
-      if (Array.isArray(reFormItemGroup)) {
-        return /*#__PURE__*/_react.default.createElement(_RenderItemGroup.default, {
-          itemGroup: reFormItemGroup,
-          layout: "inline",
-          form: _this.filterFormRef,
-          doUpdateFormFields: function doUpdateFormFields() {
-            return _this.forceUpdateForm();
-          }
-        });
-        /* return <>
-           {
-             reFormItemGroup.map((item, index) => {
-               const { componentStyle, isHide } = item
-               if (this.itemIsHide(isHide)) return null
-               return (
-                 <FormItem key={item.filedName} label={item.label}
-                           name={item.type !== 'custom' && item.filedName}
-                           rules={item.rules || (item.fieldOptions ? item.fieldOptions.rules : [])}
-                           {...item.protoFormItem}>
-                   {
-                     (item.type === 'custom' && item.customRender) ? item.customRender(this.filterFormRef, { ...item }) :
-                       <FieldComponent {...item}
-                                       onChange={(val, ...otherParams) => {
-                                         let updateValue = val
-                                         if (item.type === 'input' || item.type === 'textarea' || item.type === 'radio') {
-                                           updateValue = val.target.value
-                                         }
-                                         if (Array.isArray(val)) {
-                                           updateValue = [...val]
-                                         }
-                                         this.updateFormFields({ [item.filedName]: updateValue })
-                                         if (item.onChange) item.onChange(val, this.filterFormRef, ...otherParams)
-                                       }}
-                                       style={{ width: item.type === 'checkbox' || item.type === 'radio' ? 'auto' : general.formItemStyle.xsm.width, ...componentStyle }}/>
-                   }
-                 </FormItem>
-               )
-             })
-           }
-         </>*/
-      }
-
-      return reFormItemGroup;
-    };
-    _this.state = {
-      // recombinationGroup: [],
-      reFormItemGroup: undefined
-    };
-    return _this;
-  }
-  _createClass(StandardFilter, [{
-    key: "componentDidMount",
-    value: function componentDidMount() {
-      var initialValues = this.props.initialValues;
-      this.updateFormFields(initialValues, true);
     }
-  }, {
-    key: "componentDidUpdate",
-    value: function componentDidUpdate(prevProps) {
-      var initialValues = this.props.initialValues;
-      if (prevProps.initialValues !== initialValues) {
-        this.updateFormFields(initialValues, true);
-      }
+    filterFormRef.current.setFieldsValue(Object.assign(Object.assign({}, resetValues), newVal || {})); // 直接清空表单的赋值
+    updateCalculate(filterFormRef.current.getFieldsValue());
+    if (getFormFields) getFormFields(filterFormRef.current.getFieldsValue(), filterFormRef);
+  };
+  // 强制更新表单值，用于赋初始化实例值
+  var forceUpdateForm = function forceUpdateForm() {
+    var formValues = filterFormRef.current.getFieldsValue();
+    // if (Object.prototype.hasOwnProperty.call(formValues, false)) {
+    //   delete formValues.false // TODO 自定义结构会莫名的出来一个false字段
+    // }
+    updateCalculate(formValues); // 更新当前表单数量，排除被隐藏的值
+    if (getFormFields) getFormFields(filterFormRef.current.getFieldsValue(), filterFormRef);
+  };
+  // 计算表单隐藏项
+  var updateCalculate = (0, _react.useCallback)(function (formValues) {
+    setIsHideCount(reFormItemGroup.filter(function (item) {
+      return item.hasOwnProperty('isHide') ? item.isHide(Object.assign({}, formValues), filterFormRef) : false;
+    }).length);
+  }, [reFormItemGroup, filterFormRef]);
+  var handleSearch = function handleSearch(values) {
+    // if (Object.prototype.hasOwnProperty.call(values, false)) {
+    //   delete values.false // TODO 自定义结构会莫名的出来一个false字段
+    // }
+    var resultValues = (0, _ValueFormat.default)(values, formItemGroup);
+    if (onFilterSearch) {
+      onFilterSearch(Object.assign({}, resultValues));
     }
-  }, {
-    key: "render",
-    value: function render() {
-      var _this$props2 = this.props,
-        className = _this$props2.className,
-        style = _this$props2.style,
-        onFilterReset = _this$props2.onFilterReset,
-        _this$props2$buttonGr = _this$props2.buttonGroup,
-        buttonGroup = _this$props2$buttonGr === void 0 ? [] : _this$props2$buttonGr,
-        min = _this$props2.min,
-        codes = _this$props2.codes,
-        permissionCodes = _this$props2.permissionCodes,
-        confirmText = _this$props2.confirmText,
-        cancelText = _this$props2.cancelText,
-        onFilterSearch = _this$props2.onFilterSearch,
-        buttonGroupConfig = _this$props2.buttonGroupConfig; // const { recombinationGroup } = this.state;
-      return /*#__PURE__*/_react.default.createElement(_form.default, {
-        name: "standard-filter-form",
-        ref: this.filterFormRef,
-        layout: "inline",
-        onFinish: this.handleSearch,
-        className: className,
-        style: style
-      }, /*#__PURE__*/_react.default.createElement("div", {
-        className: "filter-grid"
-      }, /*#__PURE__*/_react.default.createElement("div", {
-        className: "filter-form"
-      }, this.state.reFormItemGroup ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, this.renderFormItemGroup(), /*#__PURE__*/_react.default.createElement(FormItem, {
-        style: {
-          display: !onFilterSearch && !onFilterReset ? 'none' : 'inline-block'
+  };
+  var handleReset = function handleReset() {
+    var _a, _b;
+    // 使用此方法，表单校验无法清空掉
+    // const resetValues = this.filterFormRef.current.getFieldsValue()
+    // Object.keys(resetValues).forEach((item) => {
+    //   resetValues[item] = undefined
+    // })
+    // this.filterFormRef.current.setFieldsValue({ ...resetValues }) // 直接清空表单的赋值
+    filterFormRef.current.resetFields();
+    setReFormItemGroup(formItemGroup); // 重新渲染列表
+    updateCalculate((_a = filterFormRef === null || filterFormRef === void 0 ? void 0 : filterFormRef.current) === null || _a === void 0 ? void 0 : _a.getFieldsValue());
+    if (onFilterReset) {
+      onFilterReset((_b = filterFormRef === null || filterFormRef === void 0 ? void 0 : filterFormRef.current) === null || _b === void 0 ? void 0 : _b.getFieldsValue());
+    }
+  };
+  (0, _react.useEffect)(function () {
+    if (initialValues && JSON.stringify(initialValues) !== '{}') {
+      updateFormFields(initialValues, true);
+    }
+  }, [initialValues]);
+  (0, _react.useEffect)(function () {
+    setReFormItemGroup(formItemGroup);
+  }, [formItemGroup]);
+  // / 表单列表组 formItemGroup 类型为数组或者React.Node
+  var renderFormItemGroup = function renderFormItemGroup() {
+    if (Array.isArray(reFormItemGroup)) {
+      // 数组则默认加上"确认与取消"按钮
+      return /*#__PURE__*/_react.default.createElement(_RenderItemGroup.default, Object.assign({
+        itemGroup: reFormItemGroup.concat(filterActionButtons),
+        size: filterFormLayout === 'horizontal' ? 'xxlg' : 'md',
+        layout: filterFormLayout,
+        form: filterFormRef,
+        // displayLayout={{labelCol: { span: 8 }, wrapperCol: { span: 16 },}}
+        doUpdateFormFields: function doUpdateFormFields() {
+          return forceUpdateForm();
         }
-      }, onFilterSearch && /*#__PURE__*/_react.default.createElement(_button.default, {
-        type: "primary",
-        htmlType: "submit"
-      }, "  ", confirmText || '查询'), onFilterReset && /*#__PURE__*/_react.default.createElement(_button.default, {
-        type: "primary",
-        style: {
-          marginLeft: 8
-        },
-        onClick: this.handleReset,
-        ghost: true
-      }, cancelText || '重置'))) : null), buttonGroup && buttonGroup.length > 0 ? /*#__PURE__*/_react.default.createElement("div", {
-        className: "filter-btns"
-      }, /*#__PURE__*/_react.default.createElement(_index.default, {
-        options: buttonGroup,
-        min: min,
-        codes: codes,
-        permissionCodes: permissionCodes,
-        dropdownConfig: buttonGroupConfig
-      })) : null));
+      }, itemGroupConfig));
     }
-  }], [{
-    key: "getDerivedStateFromProps",
-    value: function getDerivedStateFromProps(nextProps) {
-      var formItemGroup = nextProps.formItemGroup; // const restOptionList = removeNoPermission(buttonGroup, permissionCodes, codes) || []
-      return {
-        // recombinationGroup: restOptionList,
-        reFormItemGroup: formItemGroup
-      };
+    return reFormItemGroup;
+  };
+  /**
+   * 生成guid
+   */
+  var guid = function guid() {
+    function S4() {
+      return ((1 + Math.random()) * 0x10000 | 0).toString(16).substring(1);
     }
-  }]);
-  return StandardFilter;
-}(_react.default.Component);
-var _default = StandardFilter;
-exports.default = _default;
+    return "".concat(S4(), "-").concat(S4());
+  };
+  var renderButtonGroup = function renderButtonGroup() {
+    return buttonGroup && buttonGroup.length > 0 ? /*#__PURE__*/_react.default.createElement("div", {
+      className: "filter-btns ",
+      style: filterBtnsStyle
+    }, /*#__PURE__*/_react.default.createElement(_index.default, {
+      options: buttonGroup,
+      min: min,
+      codes: codes,
+      permissionCodes: permissionCodes,
+      dropdownConfig: buttonGroupConfig
+    })) : null;
+  };
+  return /*#__PURE__*/_react.default.createElement(_form.default, {
+    name: 'standard-filter-form-' + guid(),
+    ref: filterFormRef,
+    layout: filterFormLayout,
+    onFinish: handleSearch,
+    className: "standard-filter ".concat(className || ''),
+    style: style,
+    colon: colon
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    className: "filter-grid filter-grid-".concat(gridLayout),
+    style: filterFormStyle
+  }, reFormItemGroup.length === 0 ? null : /*#__PURE__*/_react.default.createElement("div", {
+    className: "filter-form filter-form-".concat(formLayout)
+  }, reFormItemGroup ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, renderFormItemGroup()) : null), renderButtonGroup()));
+});
+var _default = exports.default = StandardFilter;

package/lib/StandardFilter/indexClass.d.ts

@@ -0,0 +1,37 @@
+import React from 'react';
+import { FieldComponentProps } from '../FormComp/FieldComponent';
+import { ButtonGroupOptionsProps } from '../ButtonGroup/index';
+import './style/index.less';
+export interface StandardFilterProps {
+    buttonGroup?: ButtonGroupOptionsProps[];
+    buttonGroupConfig?: Object;
+    formItemGroup?: FieldComponentProps[];
+    confirmText?: string;
+    onFilterSearch?: (value?: object) => void;
+    onFilterReset?: (value?: object) => void;
+    cancelText?: string;
+    initialValues?: any;
+    getFormFields?: (fields: any, form: any) => void;
+    className?: string;
+    style?: React.CSSProperties;
+    min?: number;
+    codes?: any[];
+    permissionCodes?: string[];
+}
+declare class StandardFilter extends React.Component<StandardFilterProps, any> {
+    static getDerivedStateFromProps(nextProps: StandardFilterProps): {
+        reFormItemGroup: FieldComponentProps[];
+    };
+    private filterFormRef;
+    constructor(props: StandardFilterProps);
+    componentDidMount(): void;
+    componentDidUpdate(prevProps: StandardFilterProps): void;
+    updateFormFields: (newVal?: any, force?: boolean) => void;
+    forceUpdateForm: () => void;
+    handleSearch: (values: object) => void;
+    handleReset: () => void;
+    itemIsHide: (isHide: any) => any;
+    renderFormItemGroup: () => any;
+    render(): React.JSX.Element;
+}
+export default StandardFilter;