@lm_fe/components_m 0.1.201 → 0.2.2

package/dist/a_chunks/Inner.js

@@ -3,48 +3,17 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 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; }
-import 'antd/es/config-provider/style';
-import _ConfigProvider from 'antd/es/config-provider';
-import 'antd/es/popover/style';
-import _Popover from 'antd/es/popover';
-import 'antd/es/button/style';
-import _Button from 'antd/es/button';
-import 'antd/es/empty/style';
-import _Empty from 'antd/es/empty';
-import 'antd/es/row/style';
-import _Row from 'antd/es/row';
-import 'antd/es/form/style';
-import _Form from 'antd/es/form';
-import 'antd/es/col/style';
-import _Col from 'antd/es/col';
-import _set from 'lodash/set';
-import _omit from 'lodash/omit';
-import _map from 'lodash/map';
-import _join from 'lodash/join';
-import _isNil from 'lodash/isNil';
-import _isEmpty from 'lodash/isEmpty';
-import _get from 'lodash/get';
-import { DownOutlined, ScanOutlined, DisconnectOutlined, SettingOutlined } from '@ant-design/icons';
-import { safe_json_parse, expect_array } from '@lm_fe/utils';
+import { useMchcDriverStatus, MyIcon, LazyAntd, MyCheckbox, MyLazyComponent } from '@lm_fe/components';
+import { expect_array, safe_json_parse } from '@lm_fe/utils';
+import { Menu, Space, Tabs, ConfigProvider, Empty, Popover, Button, Row, Col } from 'antd';
 import zhCN from 'antd/lib/locale/zh_CN';
+import { isEmpty, forEach, get, isNil, omit, join, map } from 'lodash';
 import React, { useState, useEffect, useRef, lazy } from 'react';
-import { s as styles, d as MyCheckbox, f as formatFormConfig, R as RenderEditItem } from './index.js';
-import { useMchcDriverStatus, LazyAntd, MyLazyComponent } from '@lm_fe/components';
-import 'antd/es/tabs/style';
-import _Tabs from 'antd/es/tabs';
-import 'antd/es/message/style';
-import _message from 'antd/es/message';
-import _isString from 'lodash/isString';
-import _isObject from 'lodash/isObject';
-import _isFunction from 'lodash/isFunction';
-import _isArray from 'lodash/isArray';
 import { mchcDriver, mchcEvent } from '@lm_fe/env';
 import { SMchc_FormDescriptions } from '@lm_fe/service';
 import classnames from 'classnames';
-import 'antd/es/space/style';
-import _Space from 'antd/es/space';
-import 'antd/es/menu/style';
-import _Menu from 'antd/es/menu';
+import { use_provoke } from '@lm_fe/provoke';
+import { s as styles, f as formatFormConfig, R as RenderEditItem } from './index.js';
 var Tree = LazyAntd.Tree,
   TreeSelect = LazyAntd.TreeSelect,
   Select = LazyAntd.Select,
@@ -64,10 +33,10 @@ function IdNOButton(props) {
     setTarget = _useState2[1];
   var _useMchcDriverStatus = useMchcDriverStatus(),
     isOpen = _useMchcDriverStatus.isOpen;
-  var menuProps = /*#__PURE__*/React.createElement(_Menu, {
+  var menuProps = /*#__PURE__*/React.createElement(Menu, {
     onClick: function onClick(e) {}
   }, types.map(function (k) {
-    return /*#__PURE__*/React.createElement(_Menu.Item, {
+    return /*#__PURE__*/React.createElement(Menu.Item, {
       onClick: function onClick() {
         setTarget(k);
         send_msg(k);
@@ -89,12 +58,17 @@ function IdNOButton(props) {
       color: isOpen ? undefined : 'red'
     },
     type: isOpen ? 'primary' : undefined,
-    icon: /*#__PURE__*/React.createElement(DownOutlined, null),
+    icon: /*#__PURE__*/React.createElement(MyIcon, {
+      value: 'DownOutlined'
+    }),
     overlay: menuProps,
     onClick: function onClick(e) {
       return send_msg(target);
     }
-  }, /*#__PURE__*/React.createElement(_Space, null, isOpen ? /*#__PURE__*/React.createElement(ScanOutlined, null) : /*#__PURE__*/React.createElement(DisconnectOutlined, {
+  }, /*#__PURE__*/React.createElement(Space, null, isOpen ? /*#__PURE__*/React.createElement(MyIcon, {
+    value: 'ScanOutlined'
+  }) : /*#__PURE__*/React.createElement(MyIcon, {
+    value: 'DisconnectOutlined',
     style: {
       color: 'red'
     }
@@ -116,82 +90,10 @@ function useReadIdNO() {
     id_NO_msg: id_NO_msg
   };
 }
-function getFormItemControl(getFieldValue, config) {
-  var _config$inputProps;
-  var dependency = config === null || config === void 0 || (_config$inputProps = config.inputProps) === null || _config$inputProps === void 0 ? void 0 : _config$inputProps.dependency;
-  if (dependency) {
-    return getFormItemControlByDependency(getFieldValue, config);
-  } else {
-    return getFormItemControlByNew(getFieldValue, config);
-  }
-}
-function getFormItemControlByNew(form_ins, config) {
-  var showDeps = config === null || config === void 0 ? void 0 : config.showDeps;
-  var requiredDeps = config === null || config === void 0 ? void 0 : config.requiredDeps;
-  var disabledDeps = config === null || config === void 0 ? void 0 : config.disabledDeps;
-  var res = {
-    isShow: compute_dep_status(form_ins, showDeps, !showDeps),
-    isRequired: compute_dep_status(form_ins, requiredDeps),
-    isDisabled: compute_dep_status(form_ins, disabledDeps)
-  };
-  return res;
-}
-function compute_dep_status(form_ins, dep_config) {
-  var default_status = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-  if (_isFunction(dep_config)) {
-    return dep_config(form_ins);
-  }
-  var config_obj = dep_config !== null && dep_config !== void 0 ? dep_config : {};
-  var dep_keys = Object.keys(config_obj);
-  return dep_keys.reduce(function (state, k) {
-    return state || getDepStatus(form_ins, k, config_obj[k]);
-  }, default_status);
-}
-function getFormItemControlByDependency(form_ins, config) {
-  var _config$inputProps2, _dependency$show, _dependency$show2, _dependency$disabled, _dependency$disabled2, _dependency$required, _dependency$required2;
-  var dependency = config === null || config === void 0 || (_config$inputProps2 = config.inputProps) === null || _config$inputProps2 === void 0 ? void 0 : _config$inputProps2.dependency;
-  return {
-    isShow: getDepStatus(form_ins, dependency === null || dependency === void 0 || (_dependency$show = dependency.show) === null || _dependency$show === void 0 ? void 0 : _dependency$show.key, dependency === null || dependency === void 0 || (_dependency$show2 = dependency.show) === null || _dependency$show2 === void 0 ? void 0 : _dependency$show2.value),
-    isDisabled: getDepStatus(form_ins, dependency === null || dependency === void 0 || (_dependency$disabled = dependency.disabled) === null || _dependency$disabled === void 0 ? void 0 : _dependency$disabled.key, dependency === null || dependency === void 0 || (_dependency$disabled2 = dependency.disabled) === null || _dependency$disabled2 === void 0 ? void 0 : _dependency$disabled2.value),
-    isRequired: getDepStatus(form_ins, dependency === null || dependency === void 0 || (_dependency$required = dependency.required) === null || _dependency$required === void 0 ? void 0 : _dependency$required.key, dependency === null || dependency === void 0 || (_dependency$required2 = dependency.required) === null || _dependency$required2 === void 0 ? void 0 : _dependency$required2.value)
-  };
-}
-function getDepStatus(form_ins) {
-  var depKey = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
-  var depValue = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
-  //key值有.的情况下showKey处理
-  if (_isString(depKey) && depKey.includes('.')) {
-    depKey = depKey.split('.');
-  }
-  var __showVal = form_ins.getFieldValue(depKey);
-  var targetShowVal = getUglyValue(__showVal);
-  if (_isFunction(depValue)) return depValue(targetShowVal);
-  return depValue.includes(targetShowVal);
-}
-function getUglyValue(v) {
-  var __value = safe_json_parse(v, v);
-  var checkedValue = __value;
-  if (_isArray(__value)) {
-    return getUglyArrValue(__value);
-  }
-  if (_isObject(__value)) {
-    // [todo]:如果是多选的情况 如何处理
-    return getUglyObjValue(__value);
-  }
-  return checkedValue;
-}
-function getUglyArrValue(__arr) {
-  if (!_isArray(__arr)) return __arr;
-  if (__arr.length > 1) {
-    return __arr.map(getUglyObjValue).join(',');
-  }
-  return getUglyObjValue(__arr[0]);
-}
-function getUglyObjValue(__obj) {
-  var _ref, _obj$value, _obj$checkedValues;
-  return (_ref = (_obj$value = __obj === null || __obj === void 0 ? void 0 : __obj.value) !== null && _obj$value !== void 0 ? _obj$value : __obj === null || __obj === void 0 ? void 0 : __obj.key) !== null && _ref !== void 0 ? _ref : __obj === null || __obj === void 0 || (_obj$checkedValues = __obj.checkedValues) === null || _obj$checkedValues === void 0 ? void 0 : _obj$checkedValues[0];
-}
 function RenderTab(props) {
+  use_provoke(function (s) {
+    return s.sys_theme;
+  });
   var fds = props.fds,
     renderContent = props.renderContent,
     form = props.form;
@@ -211,45 +113,22 @@ function RenderTab(props) {
       form: form
     });
   }
-  return /*#__PURE__*/React.createElement(_Tabs, {
-    size: "small",
+  return /*#__PURE__*/React.createElement(Tabs, {
+    size: 'small',
     tabBarStyle: {
-      marginBottom: 4
+      marginBottom: 6
     },
     activeKey: activeKey,
+    // tabPosition='right'
     onChange: function onChange(k) {
-      var items = configArr.find(function (_) {
-        var title = SMchc_FormDescriptions.get_form_item_title_or_Name(_);
-        return title === activeKey;
-      });
-      if (form && items) {
-        var _items$children;
-        var arr = (_items$children = items.children) !== null && _items$children !== void 0 ? _items$children : [];
-        var keys = arr.map(function (_) {
-          return SMchc_FormDescriptions.parse_form_item_name(_);
-        });
-        form.validateFields(keys).then(function () {
-          return changeActiveKey(k);
-        })["catch"](function (e) {
-          var _e$errorFields;
-          var errorFields = (_e$errorFields = e === null || e === void 0 ? void 0 : e.errorFields) !== null && _e$errorFields !== void 0 ? _e$errorFields : [];
-          var str = errorFields.map(function (_) {
-            var errorText = _.errors[0];
-            return errorText;
-          }).filter(function (_) {
-            return _;
-          }).join('、');
-          _message.warning(str);
-        });
-      } else {
-        changeActiveKey(k);
-      }
+      return changeActiveKey(k);
     }
   }, configArr.map(function (_) {
     var _$children;
     var title = SMchc_FormDescriptions.get_form_item_title_or_Name(_);
     var tabConfig = (_$children = _ === null || _ === void 0 ? void 0 : _.children) !== null && _$children !== void 0 ? _$children : [];
-    return /*#__PURE__*/React.createElement(_Tabs.TabPane, {
+    return /*#__PURE__*/React.createElement(Tabs.TabPane, {
+      forceRender: !(_ !== null && _ !== void 0 && _.fd_lazy),
       tabKey: title,
       key: title,
       tab: /*#__PURE__*/React.createElement("span", {
@@ -257,19 +136,25 @@ function RenderTab(props) {
           textDecorationLine: _ !== null && _ !== void 0 && _.remote_filter_key ? 'underline' : 'unset'
         }
       }, title)
-    }, _isEmpty(tabConfig) ? "\u8BF7\u914D\u7F6E".concat(title, "\u7684 children") : renderContent(tabConfig));
+    }, isEmpty(tabConfig) ? "\u8BF7\u914D\u7F6E".concat(title, "\u7684 children") : renderContent(tabConfig));
   }));
 }
 function RenderSection(props) {
+  var _sys_theme$colors;
   var fd = props.fd,
     renderContent = props.renderContent;
+  var sys_theme = use_provoke(function (s) {
+    return s.sys_theme;
+  });
   if (!fd) return null;
+  // const bg = '#eee'
+  var bg = (_sys_theme$colors = sys_theme.colors) === null || _sys_theme$colors === void 0 ? void 0 : _sys_theme$colors.light[0];
   var _fd$containerType = fd.containerType,
     containerType = _fd$containerType === void 0 ? 'section(default)' : _fd$containerType,
     _fd$children = fd.children,
     children = _fd$children === void 0 ? [] : _fd$children,
     collapsed = fd.collapsed;
-  if (_isEmpty(children)) return null;
+  if (isEmpty(children)) return null;
   var title = SMchc_FormDescriptions.get_form_item_title_or_Name(fd);
   var _useState7 = useState(collapsed),
     _useState8 = _slicedToArray(_useState7, 2),
@@ -284,32 +169,53 @@ function RenderSection(props) {
       padding: '4px 0',
       fontWeight: 'bold',
       fontSize: 20,
-      color: '#150f55',
-      borderBottom: '1px dashed #150f55',
+      color: sys_theme.colorPrimary,
       margin: '6px 0 12px 0',
       textIndent: 12
     }
-  }, title), node);
+  }, title, ":"), node);
   return title ? /*#__PURE__*/React.createElement("div", {
-    className: classnames(styles['base-edit-panel-form_section'], _defineProperty({}, styles['border'], true))
+    className: classnames(styles['base-edit-panel-form_section'], _defineProperty({}, styles['border'], true)),
+    style: {
+      border: "1px solid ".concat(bg),
+      borderRadius: 4
+    }
   }, /*#__PURE__*/React.createElement("span", {
     className: styles["base-edit-panel-form_section_title"],
     style: {
-      cursor: 'pointer'
+      cursor: 'pointer',
+      color: sys_theme.colorPrimary,
+      background: sys_theme.bg_color
     },
     onClick: function onClick() {
       return setHidden(!hidden);
     }
-  }, hidden ? '▶ ' : '▼ ', /*#__PURE__*/React.createElement("span", {
+  }, /*#__PURE__*/React.createElement(MyIcon, {
+    value: hidden ? 'RightOutlined' : 'DownOutlined',
     style: {
-      textDecorationLine: fd !== null && fd !== void 0 && fd.remote_filter_key ? 'underline' : 'unset'
+      fontSize: 14,
+      marginRight: 6
+    }
+  }), /*#__PURE__*/React.createElement("span", {
+    style: {
+      userSelect: 'none'
     }
   }, title)), node) : node;
 }
 function use_form_config(props) {
-  var formDescriptions = props.formDescriptions;
+  var formDescriptions = props.formDescriptions,
+    bf_config = props.bf_config,
+    initialValues = props.initialValues;
   var form = props.form;
   var value_cache = useRef();
+  function assign_cache(value) {
+    if (!value) return;
+    if (!value_cache.current) {
+      value_cache.current = {};
+    }
+    Object.assign(value_cache.current, value);
+  }
+  var is_init = useRef(false);
   var _useReadIdNO = useReadIdNO(),
     id_NO_msg = _useReadIdNO.id_NO_msg;
   var _useState9 = useState(),
@@ -321,8 +227,9 @@ function use_form_config(props) {
       form.setFieldsValue_old = form.setFieldsValue;
     }
     form.setFieldsValue = function (value) {
+      // mchcLogger.log('setFieldsValue 00', form, value_cache.current, value, form_config)
       if (!form_config) {
-        value_cache.current = value;
+        assign_cache(value);
       } else {
         var _form$setFieldsValue_;
         (_form$setFieldsValue_ = form.setFieldsValue_old) === null || _form$setFieldsValue_ === void 0 || _form$setFieldsValue_.call(form, value);
@@ -330,20 +237,27 @@ function use_form_config(props) {
     };
   }
   useEffect(function () {
+    if (!is_init.current && initialValues) {
+      is_init.current = true;
+      assign_cache(initialValues);
+    }
     return function () {};
-  }, []);
+  }, [initialValues]);
   useEffect(function () {
-    formDescriptions && SMchc_FormDescriptions.filter_form_config(formDescriptions).then(function (f) {
+    var fd_config = formDescriptions !== null && formDescriptions !== void 0 ? formDescriptions : bf_config === null || bf_config === void 0 ? void 0 : bf_config.tableColumns;
+    fd_config && SMchc_FormDescriptions.filter_form_config(fd_config).then(function (f) {
       setForm_config(f);
-      if (value_cache.current) {
-        setTimeout(function () {
+      // mchcLogger.log('setFieldsValue 11 0', form, value_cache.current, value_cache)
+      setTimeout(function () {
+        if (value_cache.current) {
+          // mchcLogger.log('setFieldsValue 11 1', form, value_cache.current)
           form === null || form === void 0 || form.setFieldsValue(value_cache.current);
           value_cache.current = undefined;
-        }, 400);
-      }
+        }
+      }, 500);
     });
     return function () {};
-  }, [formDescriptions]);
+  }, [formDescriptions, bf_config]);
   useEffect(function () {
     if (id_NO_msg !== null && id_NO_msg !== void 0 && id_NO_msg.data && form) {
       form.setFieldsValue(id_NO_msg.data);
@@ -352,12 +266,13 @@ function use_form_config(props) {
   return [form_config];
 }
 var RenderFormSectionComponent = /*#__PURE__*/lazy(function () {
-  return import('./.root79.js');
+  return import('./.root46.js');
 });
 var typeToText = {
   'section(default)': '分块(默认)',
   'plain': '简约',
-  'tabs': '标签页'
+  'tabs': '标签页',
+  'segs': '分段'
 };
 var typeOption = Object.keys(typeToText).map(function (k) {
   return {
@@ -377,53 +292,22 @@ function MyFormSection(props) {
   function renderRowAndCol() {
     var arr = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
     var dynamicFormItemProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-    var rowKey = _join(_map(arr, 'key'), '~');
-    return /*#__PURE__*/React.createElement(_Row, {
+    var rowKey = join(map(arr, 'key'), '~');
+    return /*#__PURE__*/React.createElement(Row, {
       key: rowKey,
       gutter: 24
-    }, _map(arr, function (_config) {
-      var _config$inputProps3, _get2, _config$offset, _config$push, _config$pull;
+    }, map(arr, function (_config) {
+      var _config$inputProps, _get, _config$offset, _config$push, _config$pull;
       if (!_config) return;
-      var dependency = (_config$inputProps3 = _config.inputProps) === null || _config$inputProps3 === void 0 ? void 0 : _config$inputProps3.dependency;
-      var showDeps = _config.showDeps;
-      var disabledDeps = _config.disabledDeps;
-      var requiredDeps = _config.requiredDeps;
-      var span = (_get2 = _get(_config, 'span')) !== null && _get2 !== void 0 ? _get2 : props.span;
+      (_config$inputProps = _config.inputProps) === null || _config$inputProps === void 0 || _config$inputProps.dependency;
+      _config.showDeps;
+      _config.disabledDeps;
+      _config.requiredDeps;
+      var span = (_get = get(_config, 'span')) !== null && _get !== void 0 ? _get : props.span;
       var offset = (_config$offset = _config.offset) !== null && _config$offset !== void 0 ? _config$offset : 0;
       var push = (_config$push = _config.push) !== null && _config$push !== void 0 ? _config$push : 0;
       var pull = (_config$pull = _config.pull) !== null && _config$pull !== void 0 ? _config$pull : 0;
-      if (dependency || showDeps || disabledDeps || requiredDeps) {
-        return /*#__PURE__*/React.createElement(_Form.Item, {
-          noStyle: true,
-          shouldUpdate: true,
-          key: _config.key
-        }, function (f) {
-          var _getFormItemControl = getFormItemControl(f, _config),
-            isShow = _getFormItemControl.isShow,
-            isDisabled = _getFormItemControl.isDisabled,
-            isRequired = _getFormItemControl.isRequired;
-          var newDescription = _objectSpread({}, _config);
-          if (isDisabled) {
-            var inputProps = _get(newDescription, 'inputProps', {});
-            newDescription.inputProps = _objectSpread(_objectSpread({}, inputProps), {}, {
-              disabled: true
-            });
-          }
-          if (isRequired) {
-            _set(newDescription, 'required', true);
-          }
-          if (!isShow) {
-            return null;
-          }
-          return /*#__PURE__*/React.createElement(_Col, {
-            span: span,
-            offset: offset,
-            push: push,
-            pull: pull
-          }, renderItem(newDescription, dynamicFormItemProps));
-        });
-      }
-      return /*#__PURE__*/React.createElement(_Col, {
+      return /*#__PURE__*/React.createElement(Col, {
         span: span,
         push: push,
         pull: pull,
@@ -432,10 +316,10 @@ function MyFormSection(props) {
       }, renderItem(_config, dynamicFormItemProps));
     }));
   }
-  function renderTab() {
+  function renderTab_Wrap() {
     var arr = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
     var dynamicFormItemProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-    var rowKey = _join(_map(arr, 'key'), '~');
+    var rowKey = join(map(arr, 'key'), '~');
     return /*#__PURE__*/React.createElement(RenderTab, {
       fds: arr,
       key: rowKey,
@@ -450,7 +334,7 @@ function MyFormSection(props) {
   }
   // 返回 renderEditItem 的返回
   function renderItem(_config) {
-    var _config$inputProps4;
+    var _config$inputProps2, _inputProps$size;
     var dynamicFormItemProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     var id = props.id,
       data = props.data,
@@ -476,8 +360,8 @@ function MyFormSection(props) {
     var _inputProps = _config.inputProps;
     var parseProps = safe_json_parse(_inputProps, {});
     _config.inputProps = _typeof(_inputProps) === 'object' ? _objectSpread({}, _inputProps) : parseProps;
-    _config.inputProps = (_config$inputProps4 = _config.inputProps) !== null && _config$inputProps4 !== void 0 ? _config$inputProps4 : {};
-    _inputProps.size = props.size;
+    _config.inputProps = (_config$inputProps2 = _config.inputProps) !== null && _config$inputProps2 !== void 0 ? _config$inputProps2 : {};
+    _inputProps.size = (_inputProps$size = _inputProps.size) !== null && _inputProps$size !== void 0 ? _inputProps$size : props.size;
     if (_config.editable === false) {
       _inputProps.disabled = true;
     }
@@ -498,18 +382,20 @@ function MyFormSection(props) {
       targetLabelCol: getLabelCol()
     };
     // 返回 renderEditItem 的返回
-    return /*#__PURE__*/React.createElement(RenderFormSectionComponent, option);
+    return /*#__PURE__*/React.createElement(RenderFormSectionComponent, _objectSpread({}, option));
   }
-  function _renderEditItemInner(config, defaultOptions) {
+  function _renderEditItemInner(_, defaultOptions) {
     var _props$renderEditItem;
     var R = (_props$renderEditItem = props.renderEditItemInner) !== null && _props$renderEditItem !== void 0 ? _props$renderEditItem : RenderEditItem;
-    return function (key, ReactNode) {
+    return function (c, ReactNode) {
       var userSetConfig = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-      return R(config, ReactNode, _objectSpread(_objectSpread({}, defaultOptions), userSetConfig));
+      return R(c, ReactNode, _objectSpread(_objectSpread({}, defaultOptions), userSetConfig));
     };
   }
-  function renderContent(fds) {
+  function renderContent() {
+    var _fds = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
     var dynamicFormItemProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    var fds = _fds || [];
     var _props$inline = props.inline,
       inline = _props$inline === void 0 ? false : _props$inline;
     var tempArr = [];
@@ -518,55 +404,55 @@ function MyFormSection(props) {
     var formArray = [];
     var len = fds.length;
     var flush = function flush() {
-      if (!_isEmpty(tempArr)) {
+      if (!isEmpty(tempArr)) {
         formArray.push(renderRowAndCol(tempArr, dynamicFormItemProps));
         tempArr = [];
         tempSpan = 0;
       }
     };
     var flushTab = function flushTab() {
-      if (!_isEmpty(tempTabItemArr)) {
-        formArray.push(renderTab(tempTabItemArr, dynamicFormItemProps));
+      if (!isEmpty(tempTabItemArr)) {
+        formArray.push(renderTab_Wrap(tempTabItemArr, dynamicFormItemProps));
         tempTabItemArr = [];
       }
     };
-    _map(fds, function (_config, index) {
-      var _get3, _config$offset2;
+    forEach(fds, function (_config, index) {
+      var _get2, _config$offset2;
       if (!_config) return;
-      var span = (_get3 = _get(_config, 'span')) !== null && _get3 !== void 0 ? _get3 : props.span;
+      var span = (_get2 = get(_config, 'span')) !== null && _get2 !== void 0 ? _get2 : props.span;
       var offset = (_config$offset2 = _config.offset) !== null && _config$offset2 !== void 0 ? _config$offset2 : 0;
       if (!_config.isActive) return;
-      var children = _config.children;
+      var children = _config.inputType === 'straw' ? [] : _config.children;
       if (_config.containerType === 'tabs') {
         flush();
         tempTabItemArr.push(_config);
-      } else {
-        flushTab();
-        if (children && !_isEmpty(children)) {
+        return;
+      }
+      flushTab();
+      if (children && !isEmpty(children)) {
+        flush();
+        var n = renderSection(_config);
+        formArray.push(n);
+      } else if (!isNil(span) && !isNil(offset) && !inline) {
+        if (get(_config, 'isNewRow')) {
           flush();
-          var n = renderSection(_config);
-          formArray.push(n);
-        } else if (!_isNil(span) && !_isNil(offset) && !inline) {
-          if (_get(_config, 'isNewRow')) {
-            flush();
-          }
-          if (tempSpan < 25 && tempSpan + span + offset < 25) {
-            tempSpan = tempSpan + span + offset;
-            tempArr.push(_config);
-            if (Number(index) === len - 1) {
-              flush();
-            }
-          } else {
+        }
+        if (tempSpan < 25 && tempSpan + span + offset < 25) {
+          tempSpan = tempSpan + span + offset;
+          tempArr.push(_config);
+          if (Number(index) === len - 1) {
             flush();
-            tempSpan = tempSpan + span + offset;
-            tempArr.push(_config);
           }
         } else {
-          // 修改位置！
           flush();
-          // 修改位置！
-          formArray.push(renderItem(_config, dynamicFormItemProps));
+          tempSpan = tempSpan + span + offset;
+          tempArr.push(_config);
         }
+      } else {
+        // 修改位置！
+        flush();
+        // 修改位置！
+        formArray.push(renderItem(_config, dynamicFormItemProps));
       }
     });
     // 修改位置！
@@ -583,33 +469,33 @@ function MyFormSection(props) {
     });
   }
   function __formatFormConfig(_, siblings) {
-    var _props$requiredKeys, _config$children;
+    var _props$requiredKeys, _c$children;
     var defaultData = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-    var config = formatFormConfig(_, getLabelCol(), _objectSpread({
+    var c = formatFormConfig(_, getLabelCol(), _objectSpread({
       layout: props.defaultFormItemLayout,
       required: props.defaultRequired
     }, defaultData));
-    var formItemName = config.name;
+    var formItemName = c.name;
     var requiredKeys = (_props$requiredKeys = props.requiredKeys) !== null && _props$requiredKeys !== void 0 ? _props$requiredKeys : {};
     var keys = Object.keys(requiredKeys);
     if (keys.includes(formItemName)) {
-      config.required = requiredKeys[formItemName];
+      c.required = requiredKeys[formItemName];
     }
-    var arr = (_config$children = config.children) !== null && _config$children !== void 0 ? _config$children : config.fields;
+    var arr = (_c$children = c.children) !== null && _c$children !== void 0 ? _c$children : c.fields;
     if (arr) {
       var filterArr = arr.filter(function (_) {
         return _;
       });
-      config.children = filterArr.map(function (c) {
-        c.parent = _omit(config, ['children', 'fields']);
+      c.children = filterArr.map(function (c) {
+        c.parent = omit(c, ['children', 'fields']);
         return __formatFormConfig(c, filterArr);
       });
     }
-    config.siblings = siblings;
-    return config;
+    c.siblings = siblings;
+    return c;
   }
   function render() {
-    if (!f_config || _isEmpty(f_config)) return /*#__PURE__*/React.createElement(_Empty, null);
+    if (!f_config || isEmpty(f_config)) return /*#__PURE__*/React.createElement(Empty, null);
     var filterArr = (f_config !== null && f_config !== void 0 ? f_config : []).filter(function (_) {
       return _;
     });
@@ -634,8 +520,8 @@ function MyFormSection(props) {
         zIndex: 999,
         position: 'relative'
       }
-    }, /*#__PURE__*/React.createElement(_Popover, {
-      placement: "leftBottom",
+    }, /*#__PURE__*/React.createElement(Popover, {
+      placement: 'leftBottom',
       content: /*#__PURE__*/React.createElement(MyCheckbox, {
         marshal: 0,
         value: dispalyType,
@@ -645,12 +531,14 @@ function MyFormSection(props) {
         options: typeOption
       }),
       title: "\u663E\u793A\u6A21\u5F0F"
-    }, /*#__PURE__*/React.createElement(_Button, {
-      icon: /*#__PURE__*/React.createElement(SettingOutlined, null),
-      shape: "circle"
+    }, /*#__PURE__*/React.createElement(Button, {
+      icon: /*#__PURE__*/React.createElement(MyIcon, {
+        value: 'SettingOutlined'
+      }),
+      shape: 'circle'
     }))), node);
   }
-  return /*#__PURE__*/React.createElement(_ConfigProvider, {
+  return /*#__PURE__*/React.createElement(ConfigProvider, {
     locale: zhCN
   }, render());
 }
@@ -659,4 +547,3 @@ var Inner = {
   'default': MyFormSection
 };
 export { IdNOButton as I, Inner as a };
-//# sourceMappingURL=Inner.js.map