fan-standard-comp 3.1.9 → 3.2.0

package/es/StandardForm/TabForm.js

@@ -1,58 +1,45 @@
-import "antd/es/col/style";
-import _Col from "antd/es/col";
 import "antd/es/tabs/style";
 import _Tabs from "antd/es/tabs";
-
+import "antd/es/col/style";
+import _Col from "antd/es/col";
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _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(arr, i) { if (typeof Symbol === "undefined" || !(Symbol.iterator in Object(arr))) return; var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
+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 { __rest } from "tslib";
 import React, { useEffect, useState, useMemo } from 'react';
 import './style/index.less';
 import StandardForm from './index';
 import RenderItemGroup from '../FormComp/RenderItemGroup';
 import ActionList from "./ActionList";
-var TabPane = _Tabs.TabPane;
 var TabForm = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var getFormFields = props.getFormFields,
-      _props$formItemGroup = props.formItemGroup,
-      formItemGroup = _props$formItemGroup === void 0 ? [] : _props$formItemGroup,
-      grid = props.grid,
-      layout = props.layout,
-      _props$actionAlign = props.actionAlign,
-      actionAlign = _props$actionAlign === void 0 ? 'center' : _props$actionAlign,
-      actionHide = props.actionHide,
-      fieldStatus = props.fieldStatus,
-      _props$fieldSize = props.fieldSize,
-      fieldSize = _props$fieldSize === void 0 ? "middle" : _props$fieldSize,
-      onSubmit = props.onSubmit,
-      initialValues = props.initialValues,
-      tabsConfig = props.tabsConfig,
-      displayLayout = props.displayLayout;
-
+    _props$formItemGroup = props.formItemGroup,
+    formItemGroup = _props$formItemGroup === void 0 ? [] : _props$formItemGroup,
+    grid = props.grid,
+    layout = props.layout,
+    _props$actionAlign = props.actionAlign,
+    actionAlign = _props$actionAlign === void 0 ? 'center' : _props$actionAlign,
+    actionHide = props.actionHide,
+    fieldStatus = props.fieldStatus,
+    _props$fieldSize = props.fieldSize,
+    fieldSize = _props$fieldSize === void 0 ? "middle" : _props$fieldSize,
+    onSubmit = props.onSubmit,
+    initialValues = props.initialValues,
+    tabsConfig = props.tabsConfig,
+    displayLayout = props.displayLayout;
   var _useState = useState(),
-      _useState2 = _slicedToArray(_useState, 2),
-      formChildFields = _useState2[0],
-      setFormChildFields = _useState2[1];
-
+    _useState2 = _slicedToArray(_useState, 2),
+    formChildFields = _useState2[0],
+    setFormChildFields = _useState2[1];
   var _useState3 = useState(),
-      _useState4 = _slicedToArray(_useState3, 2),
-      formChild = _useState4[0],
-      setFormChild = _useState4[1]; // const [fieldFailed, setFieldFailed] = useState(false)
-
-
+    _useState4 = _slicedToArray(_useState3, 2),
+    formChild = _useState4[0],
+    setFormChild = _useState4[1]; // const [fieldFailed, setFieldFailed] = useState(false)
   var formGridSize = useMemo(function () {
     if (typeof grid === 'string') return grid; // 数据格式为字符串，包括 xs,md,lg,xlg
-
     var sizeName = 'xs';
     if (grid <= 1) sizeName = 'xs';
     if (grid === 2) sizeName = 'md';
@@ -63,13 +50,44 @@ var TabForm = /*#__PURE__*/React.forwardRef(function (props, ref) {
   useEffect(function () {
     forceUpdateForm();
   }, [formChildFields, formChild]);
-
   var forceUpdateForm = function forceUpdateForm() {
     // console.log('TabForm强制更新表单控件')
     getFormFields && getFormFields(formChildFields, formChild);
   };
-
   if (formItemGroup.length === 0) return null;
+  var items = useMemo(function () {
+    return formItemGroup.map(function (item, index) {
+      var title = item.title,
+        fields = item.fields,
+        actions = item.actions,
+        tabConfig = __rest(item, ["title", "fields", "actions"]);
+      return Object.assign({
+        key: item.key || index,
+        label: title || item.label,
+        children: /*#__PURE__*/React.createElement("div", {
+          className: "tabForm-content ".concat(layout === 'inline' ? 'tabForm-content-inline' : '')
+        }, fields && Array.isArray(fields) ? /*#__PURE__*/React.createElement(RenderItemGroup, {
+          layout: layout,
+          form: formChild,
+          fieldStatus: fieldStatus,
+          size: formGridSize,
+          displayLayout: displayLayout,
+          doUpdateFormFields: function doUpdateFormFields() {
+            return forceUpdateForm();
+          },
+          // doUpdateFormFields={() => forceUpdateForm()}
+          itemGroup: fields
+        }) : fields, !actionHide && actions && /*#__PURE__*/React.createElement(_Col, {
+          span: 24
+        }, /*#__PURE__*/React.createElement(ActionList, {
+          list: item.actions,
+          form: formChild,
+          other: props,
+          align: actionAlign
+        })))
+      }, tabConfig);
+    });
+  }, [formItemGroup]);
   return /*#__PURE__*/React.createElement(StandardForm, {
     actionGroup: [],
     ref: ref,
@@ -85,38 +103,8 @@ var TabForm = /*#__PURE__*/React.forwardRef(function (props, ref) {
   }, /*#__PURE__*/React.createElement(_Tabs, Object.assign({
     type: "card",
     animated: false
-  }, tabsConfig), formItemGroup.map(function (item, index) {
-    var title = item.title,
-        fields = item.fields,
-        actions = item.actions,
-        tabConfig = __rest(item, ["title", "fields", "actions"]);
-
-    return /*#__PURE__*/React.createElement(TabPane, Object.assign({
-      key: "".concat(item.key || index),
-      tab: title
-    }, tabConfig, {
-      forceRender: true
-    }), /*#__PURE__*/React.createElement("div", {
-      className: "tabForm-content ".concat(layout === 'inline' ? 'tabForm-content-inline' : '')
-    }, fields && Array.isArray(fields) ? /*#__PURE__*/React.createElement(RenderItemGroup, {
-      layout: layout,
-      form: formChild,
-      fieldStatus: fieldStatus,
-      size: formGridSize,
-      displayLayout: displayLayout,
-      doUpdateFormFields: function doUpdateFormFields() {
-        return forceUpdateForm();
-      },
-      // doUpdateFormFields={() => forceUpdateForm()}
-      itemGroup: fields
-    }) : fields, !actionHide && actions && /*#__PURE__*/React.createElement(_Col, {
-      span: 24
-    }, /*#__PURE__*/React.createElement(ActionList, {
-      list: item.actions,
-      form: formChild,
-      other: props,
-      align: actionAlign
-    }))));
+  }, tabsConfig, {
+    items: items
   })));
 });
 export default TabForm;

package/es/StandardForm/index.js

@@ -2,19 +2,12 @@ import "antd/es/button/style";
 import _Button from "antd/es/button";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
-
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _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(arr, i) { if (typeof Symbol === "undefined" || !(Symbol.iterator in Object(arr))) return; var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
+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 { __rest } from "tslib";
 import React, { useEffect, useMemo } from 'react';
 import classNames from 'classnames';
@@ -24,42 +17,40 @@ import './style/index.less';
 import ActionList from "./ActionList";
 var StandardForm = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var _props$formItemGroup = props.formItemGroup,
-      formItemGroup = _props$formItemGroup === void 0 ? [] : _props$formItemGroup,
-      className = props.className,
-      initialValues = props.initialValues,
-      _props$layout = props.layout,
-      layout = _props$layout === void 0 ? 'horizontal' : _props$layout,
-      _props$grid = props.grid,
-      grid = _props$grid === void 0 ? 1 : _props$grid,
-      getFormFields = props.getFormFields,
-      fieldStatus = props.fieldStatus,
-      onSubmit = props.onSubmit,
-      _props$confirmText = props.confirmText,
-      confirmText = _props$confirmText === void 0 ? '确认' : _props$confirmText,
-      onCancel = props.onCancel,
-      _props$cancelText = props.cancelText,
-      cancelText = _props$cancelText === void 0 ? '取消' : _props$cancelText,
-      actionAlign = props.actionAlign,
-      actionGroup = props.actionGroup,
-      onFinishFailed = props.onFinishFailed,
-      children = props.children,
-      prefix = props.prefix,
-      postfix = props.postfix,
-      fieldSize = props.fieldSize,
-      displayLayout = props.displayLayout,
-      baseProps = __rest(props, ["formItemGroup", "className", "initialValues", "layout", "grid", "getFormFields", "fieldStatus", "onSubmit", "confirmText", "onCancel", "cancelText", "actionAlign", "actionGroup", "onFinishFailed", "children", "prefix", "postfix", "fieldSize", "displayLayout"]);
-
+    formItemGroup = _props$formItemGroup === void 0 ? [] : _props$formItemGroup,
+    className = props.className,
+    initialValues = props.initialValues,
+    _props$layout = props.layout,
+    layout = _props$layout === void 0 ? 'horizontal' : _props$layout,
+    _props$grid = props.grid,
+    grid = _props$grid === void 0 ? 1 : _props$grid,
+    getFormFields = props.getFormFields,
+    fieldStatus = props.fieldStatus,
+    onSubmit = props.onSubmit,
+    _props$confirmText = props.confirmText,
+    confirmText = _props$confirmText === void 0 ? '确认' : _props$confirmText,
+    onCancel = props.onCancel,
+    _props$cancelText = props.cancelText,
+    cancelText = _props$cancelText === void 0 ? '取消' : _props$cancelText,
+    actionAlign = props.actionAlign,
+    actionGroup = props.actionGroup,
+    onFinishFailed = props.onFinishFailed,
+    children = props.children,
+    prefix = props.prefix,
+    postfix = props.postfix,
+    fieldSize = props.fieldSize,
+    displayLayout = props.displayLayout,
+    baseProps = __rest(props, ["formItemGroup", "className", "initialValues", "layout", "grid", "getFormFields", "fieldStatus", "onSubmit", "confirmText", "onCancel", "cancelText", "actionAlign", "actionGroup", "onFinishFailed", "children", "prefix", "postfix", "fieldSize", "displayLayout"]);
   var _Form$useForm = _Form.useForm(),
-      _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
-      initForm = _Form$useForm2[0];
-
+    _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
+    initForm = _Form$useForm2[0];
   useEffect(function () {
     if (initForm) {
       // <---- check ref before use the form instance
       forceUpdateForm();
     }
-  }, [initForm]); // 栅格尺寸
-
+  }, [initForm]);
+  // 栅格尺寸
   var gridSize = useMemo(function () {
     var sizeName = 'xs';
     if (grid <= 1) sizeName = 'xs';
@@ -67,50 +58,43 @@ var StandardForm = /*#__PURE__*/React.forwardRef(function (props, ref) {
     if (grid === 3) sizeName = 'lg';
     if (grid > 3) sizeName = 'xlg';
     return sizeName;
-  }, [grid]); // 按钮组对齐位置
-
+  }, [grid]);
+  // 按钮组对齐位置
   var actionAlignCol = useMemo(function () {
     if (layout !== 'horizontal' || gridSize !== 'xs' || actionAlign && actionAlign !== 'default') {
       return {};
     }
-
     return Object.assign(Object.assign({}, general.modalSize[gridSize].formBlockLayout.wrapperCol), {
       offset: general.modalSize[gridSize].formBlockLayout.labelCol.span
     });
-  }, [layout, gridSize, actionAlign]); // 强制更新表单值，用于赋初始化实例值
-
+  }, [layout, gridSize, actionAlign]);
+  // 强制更新表单值，用于赋初始化实例值
   var forceUpdateForm = function forceUpdateForm() {
     // @ts-ignore
     getFormFields && getFormFields(initForm && initForm.getFieldsValue() || {}, initForm);
   };
-
   var onFormFinish = function onFormFinish(values) {
     if (onSubmit) onSubmit(values);
   };
-
   var onFormFinishFailed = function onFormFinishFailed(_ref) {
     var values = _ref.values,
-        errorFields = _ref.errorFields,
-        outOfDate = _ref.outOfDate;
+      errorFields = _ref.errorFields,
+      outOfDate = _ref.outOfDate;
     // 定位到第一条表单异常的焦点
     var errorCollection = Array.prototype.slice.call(document.getElementsByClassName('ant-form-item-has-error'));
-
     if (errorCollection[0] && errorCollection[0].getElementsByTagName('input')) {
       Array.prototype.slice.call(errorCollection[0].getElementsByTagName('input'))[0].focus();
     }
-
     if (onFinishFailed) onFinishFailed({
       values: values,
       errorFields: errorFields,
       outOfDate: outOfDate
     });
   };
-
   var onFormCancel = function onFormCancel() {
     if (onCancel) onCancel();
-  }; // 按钮组
-
-
+  };
+  // 按钮组
   var renderActionGroup = function renderActionGroup() {
     var groupNode = function groupNode() {
       if (Array.isArray(actionGroup)) {
@@ -123,10 +107,8 @@ var StandardForm = /*#__PURE__*/React.forwardRef(function (props, ref) {
           other: props
         }));
       }
-
       return actionGroup;
     };
-
     if (Array.isArray(actionGroup) && actionGroup.length === 0) return null;
     if (actionGroup) return groupNode();
     return /*#__PURE__*/React.createElement(_Form.Item, {
@@ -146,7 +128,6 @@ var StandardForm = /*#__PURE__*/React.forwardRef(function (props, ref) {
       size: fieldSize
     }, cancelText));
   };
-
   return /*#__PURE__*/React.createElement(_Form, Object.assign({
     className: classNames(className, 'standardForm'),
     ref: ref,

package/es/StandardModal/UpdateFormRef.js

@@ -1,13 +1,10 @@
 import React, { useEffect } from "react";
-
 var updateModalForm = function updateModalForm(props) {
   var getFormAndFields = props.getFormAndFields,
-      form = props.form;
-
+    form = props.form;
   var updateFormFields = function updateFormFields() {
     if (getFormAndFields) getFormAndFields(form.current.getFieldsValue() || {}, form.current);
   };
-
   useEffect(function () {
     updateFormFields();
   }, [form]);

package/es/StandardModal/index.d.ts

@@ -3,7 +3,6 @@ import { ModalProps } from 'antd/es/modal';
 import PropTypes from 'prop-types';
 import { ItemGroupProps } from '../StandardForm/index';
 import './style/index.less';
-import 'ant-design-draggable-modal/dist/index.css';
 export interface StandardModalProps extends ModalProps {
     children?: React.ReactNode;
     title?: String;