fan-standard-comp 3.2.1 → 3.2.2

package/lib/StandardFilter/indexClass.js

@@ -0,0 +1,223 @@
+"use strict";
+
+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); }
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+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 _ValueFormat = _interopRequireDefault(require("../utils/ValueFormat.js"));
+var _index = _interopRequireDefault(require("../ButtonGroup/index"));
+require("./style/index.less");
+var _RenderItemGroup = _interopRequireDefault(require("../FormComp/RenderItemGroup"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
+function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
+function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : 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); }
+function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
+function _possibleConstructorReturn(t, e) { if (e && ("object" == _typeof(e) || "function" == typeof e)) return e; if (void 0 !== e) throw new TypeError("Derived constructors may only return object or undefined"); return _assertThisInitialized(t); }
+function _assertThisInitialized(e) { if (void 0 === e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); return e; }
+function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
+function _getPrototypeOf(t) { return _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function (t) { return t.__proto__ || Object.getPrototypeOf(t); }, _getPrototypeOf(t); }
+function _inherits(t, e) { if ("function" != typeof e && null !== e) throw new TypeError("Super expression must either be null or a function"); t.prototype = Object.create(e && e.prototype, { constructor: { value: t, writable: !0, configurable: !0 } }), Object.defineProperty(t, "prototype", { writable: !1 }), e && _setPrototypeOf(t, e); }
+function _setPrototypeOf(t, e) { return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, _setPrototypeOf(t, e); } // import { general } from '../data/index';
+var FormItem = _form.default.Item;
+var StandardFilter = /*#__PURE__*/function (_React$Component) {
+  function StandardFilter(props) {
+    var _this;
+    _classCallCheck(this, StandardFilter);
+    _this = _callSuper(this, StandardFilter, [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));
+      }
+    };
+    _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 // 重新渲染列表
+      });
+      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;
+  }
+  _inherits(StandardFilter, _React$Component);
+  return _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);
+      }
+    }
+  }, {
+    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'
+        }
+      }, 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));
+    }
+  }], [{
+    key: "getDerivedStateFromProps",
+    value: function getDerivedStateFromProps(nextProps) {
+      var formItemGroup = nextProps.formItemGroup;
+      // const restOptionList = removeNoPermission(buttonGroup, permissionCodes, codes) || []
+      return {
+        // recombinationGroup: restOptionList,
+        reFormItemGroup: formItemGroup
+      };
+    }
+  }]);
+}(_react.default.Component);
+var _default = exports.default = StandardFilter;

package/lib/StandardFilter/style/index.less

@@ -4,40 +4,109 @@
 .filter-grid {
   display: flex;
   width: 100%;
+  flex-wrap: wrap;
+
+  &.filter-grid-horizontal {
+    .filter-form {
+      width: 100%;
+
+      & > .ant-row {
+        width: 100%;
+      }
+
+      // 标签域自动换行
+      //.ant-form-item-label > label {
+      //  white-space: pre-wrap;
+      //  height: auto;
+      //  min-height: @input-height-base;
+      //}
+
+      // 标签域自动换行
+      //.ant-form-item-control,
+      //.ant-form-item-label {
+      //  line-height: 16px;
+      //}
+    }
+
+    .filter-btns {
+      width: 100%;
+      text-align: left;
+
+      .spec-button-group {
+        padding-left: 0;
+        padding-top: @padding-md;
+
+        .ant-btn:first-child {
+          margin-left: 0;
+        }
+      }
+    }
+
+  }
+
+
   .filter-form {
     flex: 1;
     font-size: 0;
     display: flex;
     flex-wrap: wrap;
+
+    &.filter-form-vertical {
+      display: block;
+
+      .ant-form-item {
+        margin-right: 0;
+      }
+    }
+
+    &.filter-form-horizontal {
+      .ant-form-item {
+        margin-right: 0;
+      }
+    }
     .ant-form-item {
       margin-right: @padding-md; // 16px
       margin-bottom: @padding-md;
-      .ant-form-item{
+
+      .ant-form-item {
         margin-bottom: 0;
       }
     }
-    .ant-form-item-control{
+
+    .ant-form-item-control {
       .ant-form-item-control-input {
-        min-width: 180px;
+        //min-width: 180px;
       }
     }
+
     .ant-form-item-control,
     .ant-form-item-label {
-      line-height: 32px;
+      line-height: @input-height-base;
+    }
+  }
+
+  &.filter-grid-inline {
+    .filter-form +.filter-btns {
+      .spec-button-group {
+        padding-left: 80px;
+      }
     }
   }
   .filter-btns {
     //max-width: 340px;
     text-align: right;
-    .spec-button-group {
-      padding-left: 80px;
-    }
+
     .ant-btn {
       margin-bottom: @padding-md;
       margin-left: @padding-sm;
+      &:first-child {
+        margin-left: 0;
+      }
     }
+
   }
-  .ant-select-single:not(.ant-select-customize-input) .ant-select-selector{
+
+  .ant-select-single:not(.ant-select-customize-input) .ant-select-selector {
     line-height: @height-base - 2;
   }
 
@@ -46,12 +115,15 @@
 .toolbarBtn {
   min-height: @btn-height-base;
   margin-bottom: @padding-md;
+
   .ant-btn {
     margin-right: @padding-md;
   }
 }
+
 .toolbar {
   margin-bottom: @padding-md;
+
   .toolbar-tForm {
     //min-height: @btn-height-base;
     //display: flex;
@@ -59,6 +131,7 @@
     //align-items: center;
   }
 }
-.searchForm{
+
+.searchForm {
   margin-bottom: @padding-md;
 }

package/lib/StandardForm/ActionList.js

@@ -8,7 +8,7 @@ require("antd/es/button/style");
 var _button = _interopRequireDefault(require("antd/es/button"));
 var _react = _interopRequireDefault(require("react"));
 var _IconNode = _interopRequireDefault(require("../components/IconNode"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 var ActionList = function ActionList(props) {
   var list = props.list,
     form = props.form,
@@ -46,5 +46,4 @@ var ActionList = function ActionList(props) {
     }, item.name);
   }));
 };
-var _default = ActionList;
-exports.default = _default;
+var _default = exports.default = ActionList;

package/lib/StandardForm/StepForm.d.ts

@@ -15,5 +15,5 @@ export interface StepFormProp extends StandardFormProps {
     stepClick?: (type?: string, formChild?: any, values?: any) => void;
     formItemGroup?: StepItemGroupProps[];
 }
-declare const StepForm: React.ForwardRefExoticComponent<Pick<StepFormProp, string | number> & React.RefAttributes<unknown>>;
+declare const StepForm: React.ForwardRefExoticComponent<Omit<StepFormProp, "ref"> & React.RefAttributes<unknown>>;
 export default StepForm;

package/lib/StandardForm/StepForm.js

@@ -7,25 +7,26 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 require("antd/es/col/style");
 var _col = _interopRequireDefault(require("antd/es/col"));
-require("antd/es/steps/style");
-var _steps = _interopRequireDefault(require("antd/es/steps"));
 require("antd/es/button/style");
 var _button = _interopRequireDefault(require("antd/es/button"));
-var _tslib = require("tslib");
+require("antd/es/steps/style");
+var _steps = _interopRequireDefault(require("antd/es/steps"));
 var _react = _interopRequireWildcard(require("react"));
 var _index = _interopRequireDefault(require("./index"));
 var _RenderItemGroup = _interopRequireDefault(require("../FormComp/RenderItemGroup"));
 var _ActionList = _interopRequireDefault(require("./ActionList"));
 require("./style/index.less");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+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(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-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; }
+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; }
+// import { BreadcrumbProps as AntdBreadcrumbProps } from 'antd/es/form';
+var Step = _steps.default.Step;
 var StepForm = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   var getFormFields = props.getFormFields,
     _props$formItemGroup = props.formItemGroup,
@@ -57,7 +58,8 @@ var StepForm = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   var _useState5 = (0, _react.useState)(0),
     _useState6 = _slicedToArray(_useState5, 2),
     currentStep = _useState6[0],
-    setCurrentStep = _useState6[1]; // const [fieldFailed, setFieldFailed] = useState(false)
+    setCurrentStep = _useState6[1];
+  // const [fieldFailed, setFieldFailed] = useState(false)
   (0, _react.useEffect)(function () {
     if (stepsConfig && (stepsConfig.current || stepsConfig.current === 0)) {
       setCurrentStep(stepsConfig.current); // 判断是否有设置当前选中的步骤数
@@ -97,7 +99,6 @@ var StepForm = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
           var errorFields = _ref.errorFields;
         } // console.log('表单校验不通过 ', errorFields.map(err => err))
         );
-
         break;
       case 'prev':
         if (stepClick) stepClick(type, formChild);
@@ -111,15 +112,6 @@ var StepForm = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
         break;
     }
   };
-  var stepItems = (0, _react.useMemo)(function () {
-    return (formItemGroup || []).filter(function (fItem) {
-      return !fItem.hideStep;
-    }).map(function (item, index) {
-      var hideStep = item.hideStep,
-        StepItem = (0, _tslib.__rest)(item, ["hideStep"]);
-      return Object.assign({}, StepItem);
-    });
-  }, [formItemGroup]);
   /*  const handleStepChange = (cur:any) => {
       // 自行判断是否校验通过
       /!*    if (cur > current) {
@@ -222,9 +214,23 @@ var StepForm = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     onFinishFailed: function onFinishFailed() {
       // setFieldFailed(true)
     }
-  }, /*#__PURE__*/_react.default.createElement(_steps.default, Object.assign({}, stepsConfig, {
-    items: stepItems
-  })), (formItemGroup || []).map(function (item, index) {
+  }, /*#__PURE__*/_react.default.createElement(_steps.default, Object.assign({}, stepsConfig), formItemGroup.filter(function (fItem) {
+    return !fItem.hideStep;
+  }).map(function (item, index) {
+    return /*#__PURE__*/_react.default.createElement(Step, {
+      key: "".concat(item.title).concat(index),
+      description: item.description,
+      icon: item.icon,
+      status: item.status,
+      title: item.title,
+      subTitle: item.subTitle,
+      disabled: item.disabled
+    });
+  })),
+  // 过滤隐藏掉的步骤表单
+  formItemGroup.filter(function (fItem) {
+    return !fItem.hideStep;
+  }).map(function (item, index) {
     return /*#__PURE__*/_react.default.createElement("div", {
       key: index,
       className: "stepForm-content ".concat(layout === 'inline' ? 'stepForm-content-inline' : ''),
@@ -253,5 +259,4 @@ var StepForm = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     }) : renderStepActions(item, index)));
   }));
 });
-var _default = StepForm;
-exports.default = _default;
+var _default = exports.default = StepForm;

package/lib/StandardForm/TabForm.d.ts

@@ -15,5 +15,5 @@ export interface TabFormProp extends StandardFormProps {
     actionHide?: boolean;
     formItemGroup?: TabItemGroupProps[];
 }
-declare const TabForm: React.ForwardRefExoticComponent<Pick<TabFormProp, string | number> & React.RefAttributes<unknown>>;
+declare const TabForm: React.ForwardRefExoticComponent<Omit<TabFormProp, "ref"> & React.RefAttributes<unknown>>;
 export default TabForm;

package/lib/StandardForm/TabForm.js

@@ -5,25 +5,26 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/tabs/style");
-var _tabs = _interopRequireDefault(require("antd/es/tabs"));
 require("antd/es/col/style");
 var _col = _interopRequireDefault(require("antd/es/col"));
+require("antd/es/tabs/style");
+var _tabs = _interopRequireDefault(require("antd/es/tabs"));
 var _tslib = require("tslib");
 var _react = _interopRequireWildcard(require("react"));
 require("./style/index.less");
 var _index2 = _interopRequireDefault(require("./index"));
 var _RenderItemGroup = _interopRequireDefault(require("../FormComp/RenderItemGroup"));
 var _ActionList = _interopRequireDefault(require("./ActionList"));
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+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(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-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; }
+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; }
+var TabPane = _tabs.default.TabPane;
 var TabForm = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   var getFormFields = props.getFormFields,
     _props$formItemGroup = props.formItemGroup,
@@ -47,7 +48,8 @@ var TabForm = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   var _useState3 = (0, _react.useState)(),
     _useState4 = _slicedToArray(_useState3, 2),
     formChild = _useState4[0],
-    setFormChild = _useState4[1]; // const [fieldFailed, setFieldFailed] = useState(false)
+    setFormChild = _useState4[1];
+  // const [fieldFailed, setFieldFailed] = useState(false)
   var formGridSize = (0, _react.useMemo)(function () {
     if (typeof grid === 'string') return grid; // 数据格式为字符串，包括 xs,md,lg,xlg
     var sizeName = 'xs';
@@ -65,39 +67,6 @@ var TabForm = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     getFormFields && getFormFields(formChildFields, formChild);
   };
   if (formItemGroup.length === 0) return null;
-  var items = (0, _react.useMemo)(function () {
-    return formItemGroup.map(function (item, index) {
-      var title = item.title,
-        fields = item.fields,
-        actions = item.actions,
-        tabConfig = (0, _tslib.__rest)(item, ["title", "fields", "actions"]);
-      return Object.assign({
-        key: item.key || index,
-        label: title || item.label,
-        children: /*#__PURE__*/_react.default.createElement("div", {
-          className: "tabForm-content ".concat(layout === 'inline' ? 'tabForm-content-inline' : '')
-        }, fields && Array.isArray(fields) ? /*#__PURE__*/_react.default.createElement(_RenderItemGroup.default, {
-          layout: layout,
-          form: formChild,
-          fieldStatus: fieldStatus,
-          size: formGridSize,
-          displayLayout: displayLayout,
-          doUpdateFormFields: function doUpdateFormFields() {
-            return forceUpdateForm();
-          },
-          // doUpdateFormFields={() => forceUpdateForm()}
-          itemGroup: fields
-        }) : fields, !actionHide && actions && /*#__PURE__*/_react.default.createElement(_col.default, {
-          span: 24
-        }, /*#__PURE__*/_react.default.createElement(_ActionList.default, {
-          list: item.actions,
-          form: formChild,
-          other: props,
-          align: actionAlign
-        })))
-      }, tabConfig);
-    });
-  }, [formItemGroup]);
   return /*#__PURE__*/_react.default.createElement(_index2.default, {
     actionGroup: [],
     ref: ref,
@@ -113,9 +82,37 @@ var TabForm = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   }, /*#__PURE__*/_react.default.createElement(_tabs.default, Object.assign({
     type: "card",
     animated: false
-  }, tabsConfig, {
-    items: items
+  }, tabsConfig), formItemGroup.map(function (item, index) {
+    var title = item.title,
+      fields = item.fields,
+      actions = item.actions,
+      tabConfig = (0, _tslib.__rest)(item, ["title", "fields", "actions"]);
+    return /*#__PURE__*/_react.default.createElement(TabPane, Object.assign({
+      key: "".concat(item.key || index),
+      tab: title
+    }, tabConfig, {
+      forceRender: true
+    }), /*#__PURE__*/_react.default.createElement("div", {
+      className: "tabForm-content ".concat(layout === 'inline' ? 'tabForm-content-inline' : '')
+    }, fields && Array.isArray(fields) ? /*#__PURE__*/_react.default.createElement(_RenderItemGroup.default, {
+      layout: layout,
+      form: formChild,
+      fieldStatus: fieldStatus,
+      size: formGridSize,
+      displayLayout: displayLayout,
+      doUpdateFormFields: function doUpdateFormFields() {
+        return forceUpdateForm();
+      },
+      // doUpdateFormFields={() => forceUpdateForm()}
+      itemGroup: fields
+    }) : fields, !actionHide && actions && /*#__PURE__*/_react.default.createElement(_col.default, {
+      span: 24
+    }, /*#__PURE__*/_react.default.createElement(_ActionList.default, {
+      list: item.actions,
+      form: formChild,
+      other: props,
+      align: actionAlign
+    }))));
   })));
 });
-var _default = TabForm;
-exports.default = _default;
+var _default = exports.default = TabForm;