升级

+import { createFromIconfontCN } from '@ant-design/icons/lib';
+/**
+ * 使用：
+ *    import QxIcon from '@/packages/qx-icon';
+ *    <QxIcon type="xxx"/>
+ * 说明：
+ *    `xxx`为图标唯一标识，`iconfont.cn`对应图标下的“复制代码”所得，建议命名为“icon-xxx_yyy”，
+ *    “icon-”为固定前缀，xxx为模块类型，yyy为图标名。公共类的xxx命名为“comm”
+ * eg: <QxIcon type="icon-flow_eye"/>
+ *
+ * @type {React.FC<IconFontProps<string>>}
+ */
+
+var QxIcon = createFromIconfontCN({
+  scriptUrl: 'https://lf1-cdn-tos.bytegoofy.com/obj/iconpark/icons_13749_95.b05de9dc2fbe8efffb150f83b64da806.es5.js'
+});
+export default QxIcon;

-import React from 'react';
-import { useStore2 } from '../../hooks';
-import { isCheckBoxType } from '../../utils';
-
-var Description = function Description(_ref) {
-  var displayType = _ref.displayType,
-      schema = _ref.schema;
-  var description = schema.description,
-      descType = schema.descType;
-  if (!description) return null;
-
-  switch (displayType) {
-    case 'row':
-      return /*#__PURE__*/React.createElement("span", {
-        className: "fr-tooltip-toggle",
-        "aria-label": description
-      }, /*#__PURE__*/React.createElement("i", {
-        className: "fr-tooltip-icon"
-      }), /*#__PURE__*/React.createElement("div", {
-        className: "fr-tooltip-container"
-      }, /*#__PURE__*/React.createElement("i", {
-        className: "fr-tooltip-triangle"
-      }), description));
-
-    case 'inline':
-      return null;
-
-    default:
-      if (descType === 'icon') {
-        return /*#__PURE__*/React.createElement("span", {
-          className: "fr-tooltip-toggle",
-          "aria-label": description
-        }, /*#__PURE__*/React.createElement("i", {
-          className: "fr-tooltip-icon"
-        }), /*#__PURE__*/React.createElement("div", {
-          className: "fr-tooltip-container"
-        }, /*#__PURE__*/React.createElement("i", {
-          className: "fr-tooltip-triangle"
-        }), description));
-      }
-
-      return /*#__PURE__*/React.createElement("span", {
-        className: "fr-desc ml2"
-      }, "( ".concat(description, " )"));
-  }
-};
-
-var Title = function Title(_ref2) {
-  var labelClass = _ref2.labelClass,
-      labelStyle = _ref2.labelStyle,
-      schema = _ref2.schema,
-      displayType = _ref2.displayType;
-
-  var _useStore = useStore2(),
-      globalDisplayType = _useStore.displayType,
-      readOnly = _useStore.readOnly;
-
-  var title = schema.title,
-      required = schema.required,
-      type = schema.type;
-  var isObjType = type === 'object';
-
-  var _displayType = schema.displayType || displayType || globalDisplayType || 'column';
-
-  return /*#__PURE__*/React.createElement("div", {
-    className: labelClass,
-    style: labelStyle
-  }, title ? /*#__PURE__*/React.createElement("label", {
-    className: "fr-label-title ".concat(isCheckBoxType(schema, readOnly) || _displayType === 'column' ? 'no-colon' : '') // checkbox不带冒号
-    ,
-    title: title
-  }, required === true && /*#__PURE__*/React.createElement("span", {
-    className: "fr-label-required"
-  }, " *"), /*#__PURE__*/React.createElement("span", {
-    className: "".concat(isObjType ? 'b' : '', " ").concat(_displayType === 'column' ? 'flex-none' : '')
-  }, /*#__PURE__*/React.createElement("span", {
-    dangerouslySetInnerHTML: {
-      __html: title
-    }
-  })), /*#__PURE__*/React.createElement(Description, {
-    schema: schema,
-    displayType: _displayType
-  })) : null);
-};
-
-export default Title;

+/* eslint-disable react-hooks/exhaustive-deps */
+import { useEffect } from 'react';
+import { getValueByPath } from './utils';
+
+var Watcher = function Watcher(_ref) {
+  var watchKey = _ref.watchKey,
+      watch = _ref.watch,
+      formData = _ref.formData,
+      firstMount = _ref.firstMount;
+  var value = getValueByPath(formData, watchKey);
+  var watchObj = watch[watchKey];
+  useEffect(function () {
+    var runWatcher = function runWatcher() {
+      if (typeof watchObj === 'function') {
+        try {
+          watchObj(value);
+        } catch (error) {
+          console.log("".concat(watchKey, "\u5BF9\u5E94\u7684watch\u51FD\u6570\u6267\u884C\u62A5\u9519\uFF1A"), error);
+        }
+      } else if (watchObj && typeof watchObj.handler === 'function') {
+        try {
+          watchObj.handler(value);
+        } catch (error) {
+          console.log("".concat(watchKey, "\u5BF9\u5E94\u7684watch\u51FD\u6570\u6267\u884C\u62A5\u9519\uFF1A"), error);
+        }
+      }
+    };
+
+    if (firstMount) {
+      var immediate = watchObj && watchObj.immediate;
+
+      if (immediate) {
+        runWatcher();
+      }
+    } else {
+      runWatcher();
+    }
+  }, [JSON.stringify(value), firstMount]);
+  return null;
+};
+
+export default Watcher;

@@ -1066,7 +1066,7 @@
   outline: 1px solid black;
   outline: 1px solid black;
 }
 }
 .fr-container .debug-grid {
 .fr-container .debug-grid {
-  background: transparent url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAAFElEQVR4AWPAC97/9x0eCsAEPgwAVLshdpENIxcAAAAASUVORK5CYII= ) repeat top left;
+  background: transparent url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAAFElEQVR4AWPAC97/9x0eCsAEPgwAVLshdpENIxcAAAAASUVORK5CYII=) repeat top left;
 }
 }
 .fr-container .truncate {
 .fr-container .truncate {
   white-space: nowrap;
   white-space: nowrap;

 import "antd/es/button/style";
 import "antd/es/button/style";
 import _Button from "antd/es/button";
 import _Button from "antd/es/button";
-import "antd/es/space/style";
-import _Space from "antd/es/space";
-import _ArrowDownOutlined from "@ant-design/icons/es/icons/ArrowDownOutlined";
-import _ArrowUpOutlined from "@ant-design/icons/es/icons/ArrowUpOutlined";
-import _CopyOutlined from "@ant-design/icons/es/icons/CopyOutlined";
 import "antd/es/popconfirm/style";
 import "antd/es/popconfirm/style";
 import _Popconfirm from "antd/es/popconfirm";
 import _Popconfirm from "antd/es/popconfirm";
-import _DeleteOutlined from "@ant-design/icons/es/icons/DeleteOutlined";
+import _CloseOutlined from "@ant-design/icons/es/icons/CloseOutlined";
+import _CopyOutlined from "@ant-design/icons/es/icons/CopyOutlined";
+import _ArrowDownOutlined from "@ant-design/icons/es/icons/ArrowDownOutlined";
+import _ArrowUpOutlined from "@ant-design/icons/es/icons/ArrowUpOutlined";
 
 
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
 
@@ -19,8 +17,8 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
 
-/* eslint-disable jsx-a11y/anchor-is-valid */
 import React from 'react';
 import React from 'react';
+import { useTools } from '../../../hooks';
 import Core from '../../index';
 import Core from '../../index';
 
 
 var CardList = function CardList(_ref) {
 var CardList = function CardList(_ref) {
@@ -38,16 +36,33 @@ var CardList = function CardList(_ref) {
       getFieldsProps = _ref.getFieldsProps;
       getFieldsProps = _ref.getFieldsProps;
   var _schema$props = schema.props,
   var _schema$props = schema.props,
       props = _schema$props === void 0 ? {} : _schema$props,
       props = _schema$props === void 0 ? {} : _schema$props,
-      itemProps = schema.itemProps;
+      itemProps = schema.itemProps,
+      _schema$min = schema.min,
+      min = _schema$min === void 0 ? 0 : _schema$min,
+      _schema$max = schema.max,
+      max = _schema$max === void 0 ? 9999 : _schema$max;
+
+  var _useTools = useTools(),
+      methods = _useTools.methods;
+
   var addBtnProps = {
   var addBtnProps = {
     type: 'dashed',
     type: 'dashed',
     children: '新增一条'
     children: '新增一条'
   };
   };
+  var delConfirmProps = {
+    title: '确定删除?',
+    okText: '确定',
+    cancelText: '取消'
+  };
 
 
   if (props.addBtnProps && _typeof(props.addBtnProps) === 'object') {
   if (props.addBtnProps && _typeof(props.addBtnProps) === 'object') {
     addBtnProps = _objectSpread(_objectSpread({}, addBtnProps), props.addBtnProps);
     addBtnProps = _objectSpread(_objectSpread({}, addBtnProps), props.addBtnProps);
   }
   }
 
 
+  if (props.delConfirmProps && _typeof(props.delConfirmProps) === 'object') {
+    delConfirmProps = _objectSpread(_objectSpread({}, delConfirmProps), props.delConfirmProps);
+  }
+
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "fr-card-list"
     className: "fr-card-list"
   }, displayList.map(function (item, idx) {
   }, displayList.map(function (item, idx) {
@@ -58,51 +73,60 @@ var CardList = function CardList(_ref) {
       key: idx
       key: idx
     }, /*#__PURE__*/React.createElement("div", {
     }, /*#__PURE__*/React.createElement("div", {
       className: "fr-card-index"
       className: "fr-card-index"
-    }, idx + 1), /*#__PURE__*/React.createElement(Core, fieldsProps), /*#__PURE__*/React.createElement(_Space, {
+    }, idx + 1), /*#__PURE__*/React.createElement(Core, fieldsProps), /*#__PURE__*/React.createElement("div", {
       direction: "horizontal",
       direction: "horizontal",
       className: "fr-card-toolbar"
       className: "fr-card-toolbar"
-    }, !props.hideDelete && /*#__PURE__*/React.createElement(_Popconfirm, {
-      title: "\u786E\u5B9A\u5220\u9664?",
-      onConfirm: function onConfirm() {
-        return deleteItem(idx);
-      },
-      okText: "\u786E\u5B9A",
-      cancelText: "\u53D6\u6D88"
-    }, /*#__PURE__*/React.createElement(_DeleteOutlined, {
-      style: {
-        fontSize: 17,
-        marginLeft: 8
-      }
-    })), !props.hideAdd && !props.hideCopy && /*#__PURE__*/React.createElement(_CopyOutlined, {
+    }, !props.hideMove && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_ArrowUpOutlined, {
       style: {
       style: {
         fontSize: 16,
         fontSize: 16,
-        marginLeft: 8
+        marginLeft: 4
       },
       },
       onClick: function onClick() {
       onClick: function onClick() {
-        return copyItem(idx);
+        return moveItemUp(idx);
       }
       }
-    }), !props.hideMove && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_ArrowUpOutlined, {
+    }), /*#__PURE__*/React.createElement(_ArrowDownOutlined, {
       style: {
       style: {
         fontSize: 16,
         fontSize: 16,
         marginLeft: 4
         marginLeft: 4
       },
       },
       onClick: function onClick() {
       onClick: function onClick() {
-        return moveItemUp(idx);
+        return moveItemDown(idx);
       }
       }
-    }), /*#__PURE__*/React.createElement(_ArrowDownOutlined, {
+    })), !props.hideAdd && !props.hideCopy && /*#__PURE__*/React.createElement(_CopyOutlined, {
       style: {
       style: {
         fontSize: 16,
         fontSize: 16,
-        marginLeft: 4
+        marginLeft: 8
       },
       },
       onClick: function onClick() {
       onClick: function onClick() {
-        return moveItemDown(idx);
+        return copyItem(idx);
+      }
+    }), !props.hideDelete && displayList.length > min && /*#__PURE__*/React.createElement(_Popconfirm, _extends({
+      onConfirm: function onConfirm() {
+        if (props.onConfirm && typeof props.onConfirm === 'string') {
+          var cb = methods[props.onConfirm];
+
+          if (typeof cb === 'function') {
+            var result = cb(item, idx);
+
+            if (!result) {
+              return;
+            }
+          }
+        }
+
+        deleteItem(idx);
+      }
+    }, delConfirmProps), /*#__PURE__*/React.createElement(_CloseOutlined, {
+      style: {
+        fontSize: 16,
+        marginLeft: 8
       }
       }
     }))));
     }))));
   })), /*#__PURE__*/React.createElement("div", {
   })), /*#__PURE__*/React.createElement("div", {
     style: {
     style: {
       marginTop: displayList.length > 0 ? 0 : 8
       marginTop: displayList.length > 0 ? 0 : 8
     }
     }
-  }, !props.hideAdd && /*#__PURE__*/React.createElement(_Button, _extends({
+  }, !props.hideAdd && displayList.length < max && /*#__PURE__*/React.createElement(_Button, _extends({
     onClick: addItem
     onClick: addItem
   }, addBtnProps)), Array.isArray(props.buttons) ? props.buttons.map(function (item, idx) {
   }, addBtnProps)), Array.isArray(props.buttons) ? props.buttons.map(function (item, idx) {
     var callback = item.callback,
     var callback = item.callback,

@@ -4,8 +4,6 @@ import "antd/es/drawer/style";
 import _Drawer from "antd/es/drawer";
 import _Drawer from "antd/es/drawer";
 import "antd/es/button/style";
 import "antd/es/button/style";
 import _Button from "antd/es/button";
 import _Button from "antd/es/button";
-import "antd/es/space/style";
-import _Space from "antd/es/space";
 import _ArrowDownOutlined from "@ant-design/icons/es/icons/ArrowDownOutlined";
 import _ArrowDownOutlined from "@ant-design/icons/es/icons/ArrowDownOutlined";
 import _ArrowUpOutlined from "@ant-design/icons/es/icons/ArrowUpOutlined";
 import _ArrowUpOutlined from "@ant-design/icons/es/icons/ArrowUpOutlined";
 import "antd/es/popconfirm/style";
 import "antd/es/popconfirm/style";
@@ -33,15 +31,16 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
 
-/* eslint-disable jsx-a11y/anchor-is-valid */
 import React, { useRef } from 'react';
 import React, { useRef } from 'react';
+import { useSet, useTools } from '../../../hooks';
+import { getDataPath, getDisplayValue, getKeyFromPath } from '../../../utils';
 import Core from '../../index';
 import Core from '../../index';
-import { useSet } from '../../../hooks';
-import { getDataPath, getKeyFromPath, getDisplayValue } from '../../../utils';
 import ErrorMessage from '../../RenderField/ErrorMessage';
 import ErrorMessage from '../../RenderField/ErrorMessage';
 var FIELD_LENGTH = 170;
 var FIELD_LENGTH = 170;
 
 
@@ -62,6 +61,10 @@ var DrawerList = function DrawerList(_ref) {
       schema = _ref.schema,
       schema = _ref.schema,
       changeList = _ref.changeList,
       changeList = _ref.changeList,
       listData = _ref.listData;
       listData = _ref.listData;
+
+  var _useTools = useTools(),
+      widgets = _useTools.widgets;
+
   var _schema$props = schema.props,
   var _schema$props = schema.props,
       props = _schema$props === void 0 ? {} : _schema$props,
       props = _schema$props === void 0 ? {} : _schema$props,
       _schema$itemProps = schema.itemProps,
       _schema$itemProps = schema.itemProps,
@@ -74,6 +77,34 @@ var DrawerList = function DrawerList(_ref) {
       pagination = _props$pagination === void 0 ? {} : _props$pagination,
       pagination = _props$pagination === void 0 ? {} : _props$pagination,
       rest = _objectWithoutProperties(props, _excluded2);
       rest = _objectWithoutProperties(props, _excluded2);
 
 
+  var actionColumnProps = {
+    colHeaderText: '操作',
+    editText: '编辑',
+    delText: '删除'
+  };
+  var delConfirmProps = {
+    title: '确定删除?',
+    okText: '确定',
+    cancelText: '取消'
+  };
+  var addBtnProps = {
+    type: 'primary',
+    children: '新增一条',
+    size: 'small'
+  };
+
+  if (props.actionColumnProps && _typeof(props.actionColumnProps) === 'object') {
+    actionColumnProps = _objectSpread(_objectSpread({}, actionColumnProps), props.actionColumnProps);
+  }
+
+  if (props.delConfirmProps && _typeof(props.delConfirmProps) === 'object') {
+    delConfirmProps = _objectSpread(_objectSpread({}, delConfirmProps), props.delConfirmProps);
+  }
+
+  if (props.addBtnProps && _typeof(props.addBtnProps) === 'object') {
+    addBtnProps = _objectSpread(_objectSpread({}, addBtnProps), props.addBtnProps);
+  }
+
   var paginationConfig = pagination && _objectSpread({
   var paginationConfig = pagination && _objectSpread({
     size: 'small',
     size: 'small',
     hideOnSinglePage: true
     hideOnSinglePage: true
@@ -112,7 +143,11 @@ var DrawerList = function DrawerList(_ref) {
           return item.name == childPath;
           return item.name == childPath;
         }) || {}; //TODO: 万一error在更深的层，这个办法是find不到的，会展示那一行没有提示。可以整一行加一个红线的方式处理
         }) || {}; //TODO: 万一error在更深的层，这个办法是find不到的，会展示那一行没有提示。可以整一行加一个红线的方式处理
 
 
-        return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", null, getDisplayValue(value, schema)), errorObj.error && /*#__PURE__*/React.createElement(ErrorMessage, {
+        var Widget = widgets[schema.readOnlyWidget];
+        return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", null, Widget ? /*#__PURE__*/React.createElement(Widget, {
+          value: value,
+          schema: schema
+        }) : getDisplayValue(value, schema)), errorObj.error && /*#__PURE__*/React.createElement(ErrorMessage, {
           message: errorObj.error,
           message: errorObj.error,
           schema: schema
           schema: schema
         }));
         }));
@@ -120,40 +155,41 @@ var DrawerList = function DrawerList(_ref) {
     }, columnProps);
     }, columnProps);
   });
   });
   columns.push({
   columns.push({
-    title: '操作',
+    title: actionColumnProps.colHeaderText,
     key: '$action',
     key: '$action',
     fixed: 'right',
     fixed: 'right',
     width: 120,
     width: 120,
     render: function render(value, record, idx) {
     render: function render(value, record, idx) {
       var index = value && value.$idx || 0;
       var index = value && value.$idx || 0;
-      return /*#__PURE__*/React.createElement(_Space, null, /*#__PURE__*/React.createElement("a", {
+      return /*#__PURE__*/React.createElement("div", null, !props.hideEdit && /*#__PURE__*/React.createElement("a", {
         onClick: function onClick() {
         onClick: function onClick() {
           return openDrawer(index);
           return openDrawer(index);
         }
         }
-      }, "\u7F16\u8F91"), !props.hideDelete && /*#__PURE__*/React.createElement(_Popconfirm, {
-        title: "\u786E\u5B9A\u5220\u9664?",
+      }, actionColumnProps.editText), !props.hideDelete && /*#__PURE__*/React.createElement(_Popconfirm, _extends({
         onConfirm: function onConfirm() {
         onConfirm: function onConfirm() {
           return deleteItem(index);
           return deleteItem(index);
-        },
-        okText: "\u786E\u5B9A",
-        cancelText: "\u53D6\u6D88"
-      }, /*#__PURE__*/React.createElement("a", null, "\u5220\u9664")), !props.hideMove && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_ArrowUpOutlined, {
+        }
+      }, delConfirmProps), /*#__PURE__*/React.createElement("a", {
+        style: {
+          marginLeft: 8
+        }
+      }, actionColumnProps.delText)), !props.hideMove && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_ArrowUpOutlined, {
         style: {
         style: {
           color: '#1890ff',
           color: '#1890ff',
           fontSize: 16,
           fontSize: 16,
-          marginLeft: 4
+          marginLeft: 8
         },
         },
         onClick: function onClick() {
         onClick: function onClick() {
-          return moveItemUp(idx);
+          return moveItemUp(index);
         }
         }
       }), /*#__PURE__*/React.createElement(_ArrowDownOutlined, {
       }), /*#__PURE__*/React.createElement(_ArrowDownOutlined, {
         style: {
         style: {
           color: '#1890ff',
           color: '#1890ff',
           fontSize: 16,
           fontSize: 16,
-          marginLeft: 4
+          marginLeft: 8
         },
         },
         onClick: function onClick() {
         onClick: function onClick() {
-          return moveItemDown(idx);
+          return moveItemDown(index);
         }
         }
       })));
       })));
     }
     }
@@ -181,11 +217,9 @@ var DrawerList = function DrawerList(_ref) {
 
 
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "w-100 mb2 tr"
     className: "w-100 mb2 tr"
-  }, !props.hideAdd && /*#__PURE__*/React.createElement(_Button, {
-    type: "primary",
-    size: "small",
+  }, !props.hideAdd && /*#__PURE__*/React.createElement(_Button, _extends({}, addBtnProps, {
     onClick: handleAdd
     onClick: handleAdd
-  }, "\u65B0\u589E"), Array.isArray(props.buttons) ? props.buttons.map(function (item, idx) {
+  })), Array.isArray(props.buttons) ? props.buttons.map(function (item, idx) {
     var callback = item.callback,
     var callback = item.callback,
         text = item.text,
         text = item.text,
         html = item.html;
         html = item.html;
@@ -222,7 +256,7 @@ var DrawerList = function DrawerList(_ref) {
     }));
     }));
   }) : null), /*#__PURE__*/React.createElement(_Drawer, {
   }) : null), /*#__PURE__*/React.createElement(_Drawer, {
     width: "600",
     width: "600",
-    title: "\u7F16\u8F91",
+    title: actionColumnProps.colHeaderText,
     placement: "right",
     placement: "right",
     onClose: closeDrawer,
     onClose: closeDrawer,
     visible: showDrawer,
     visible: showDrawer,

+import _PlusCircleFilled from "@ant-design/icons/es/icons/PlusCircleFilled";
+import _DownOutlined from "@ant-design/icons/es/icons/DownOutlined";
+import _UpOutlined from "@ant-design/icons/es/icons/UpOutlined";
+import _DeleteOutlined from "@ant-design/icons/es/icons/DeleteOutlined";
+
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
+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) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_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 _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+/* eslint-disable jsx-a11y/anchor-is-valid */
+import React, { useEffect, useMemo, useState } from 'react';
+import Core from '../../index'; // import { Button, Space, Popconfirm } from 'antd';
+// import ArrowDown from '../../../components/ArrowDown';
+// import { Collapse } from 'antd-mobile'
+
+// 数字转汉字
+function convertToChinaNum(num) {
+  var arr1 = ['零', '一', '二', '三', '四', '五', '六', '七', '八', '九'];
+  var arr2 = ['', '十', '百', '千', '万', '十', '百', '千', '亿', '十', '百', '千', '万', '十', '百', '千', '亿']; //可继续追加更高位转换值
+
+  if (!num || isNaN(num)) {
+    return "零";
+  }
+
+  var english = num.toString().split("");
+  var result = "";
+
+  for (var i = 0; i < english.length; i++) {
+    var des_i = english.length - 1 - i; //倒序排列设值
+
+    result = arr2[i] + result;
+    var arr1_index = english[des_i];
+    result = arr1[arr1_index] + result;
+  }
+
+  result = result.replace(/零(千|百|十)/g, '零').replace(/十零/g, '十');
+  result = result.replace(/零+/g, '零');
+  result = result.replace(/零亿/g, '亿').replace(/零万/g, '万');
+  result = result.replace(/亿万/g, '亿');
+  result = result.replace(/零+$/, '');
+  result = result.replace(/^一十/g, '十');
+  return result;
+}
+
+var ListForMobile = function ListForMobile(_ref) {
+  var _ref$displayList = _ref.displayList,
+      displayList = _ref$displayList === void 0 ? [] : _ref$displayList,
+      listData = _ref.listData,
+      changeList = _ref.changeList,
+      schema = _ref.schema,
+      deleteItem = _ref.deleteItem,
+      copyItem = _ref.copyItem,
+      addItem = _ref.addItem,
+      moveItemUp = _ref.moveItemUp,
+      moveItemDown = _ref.moveItemDown,
+      displayType = _ref.displayType,
+      getFieldsProps = _ref.getFieldsProps;
+  var _schema$props = schema.props,
+      props = _schema$props === void 0 ? {} : _schema$props,
+      itemProps = schema.itemProps;
+
+  var _useState = useState([]),
+      _useState2 = _slicedToArray(_useState, 2),
+      allKeys = _useState2[0],
+      setKeys = _useState2[1]; // let addBtnProps = {
+  //   type: 'dashed',
+  //   children: '新增一条list',
+  // };
+  // if (props.addBtnProps && typeof props.addBtnProps === 'object') {
+  //   addBtnProps = { ...addBtnProps, ...props.addBtnProps };
+  // }
+
+
+  useEffect(function () {
+    var _allKeys = [];
+    displayList.forEach(function (item, idx) {
+      if (item._active) {
+        _allKeys.push(String(idx));
+      }
+    });
+    setKeys(_allKeys);
+  }, [displayList]);
+
+  var getTitle = function getTitle(id) {
+    return /*#__PURE__*/React.createElement("div", {
+      style: {
+        display: 'flex',
+        justifyContent: "space-between",
+        alignItems: 'center'
+      }
+    }, /*#__PURE__*/React.createElement("span", null, "\u6570\u636E", id + 1), /*#__PURE__*/React.createElement("a", {
+      onClick: function onClick(e) {
+        e.stopPropagation();
+        deleteItem(id);
+      },
+      style: {
+        display: 'inline-block',
+        padding: '0 10px'
+      }
+    }, /*#__PURE__*/React.createElement(_DeleteOutlined, {
+      style: {
+        fontSize: 16,
+        width: 16,
+        height: 16
+      }
+    })));
+  };
+
+  var handleArrow = function handleArrow(active) {
+    if (active) {
+      return /*#__PURE__*/React.createElement(_UpOutlined, {
+        onClick: function onClick() {}
+      });
+    } else {
+      return /*#__PURE__*/React.createElement(_DownOutlined, null);
+    }
+  };
+
+  return null;
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+    className: "fr-card-list qx-card-mobile"
+  }, /*#__PURE__*/React.createElement(Collapse, {
+    activeKey: allKeys
+  }, displayList.map(function (item, idx) {
+    var fieldsProps = getFieldsProps(idx);
+    fieldsProps.displayType = displayType;
+    return /*#__PURE__*/React.createElement(Collapse.Panel, {
+      key: String(idx),
+      title: getTitle(idx),
+      arrow: handleArrow,
+      onClick: function onClick() {
+        var _active = item._active || false;
+
+        displayList[idx]._active = !_active;
+        changeList(_toConsumableArray(displayList));
+      }
+    }, /*#__PURE__*/React.createElement("div", {
+      className: "fr-card-item qx-card-mobile-item ".concat(displayType === 'row' ? 'fr-card-item-row' : ''),
+      key: idx
+    }, /*#__PURE__*/React.createElement(Core, fieldsProps)));
+  }))), /*#__PURE__*/React.createElement("a", {
+    className: 'add-button',
+    onClick: function onClick() {
+      addItem();
+    }
+  }, /*#__PURE__*/React.createElement(_PlusCircleFilled, {
+    style: {
+      marginRight: 2,
+      width: 14,
+      height: 14
+    }
+  }), "\u70B9\u51FB\u65B0\u589E\u6570\u636E"));
+};
+
+export default ListForMobile;

@@ -34,16 +34,29 @@ var SimpleList = function SimpleList(_ref) {
       getFieldsProps = _ref.getFieldsProps;
       getFieldsProps = _ref.getFieldsProps;
   var _schema$props = schema.props,
   var _schema$props = schema.props,
       props = _schema$props === void 0 ? {} : _schema$props,
       props = _schema$props === void 0 ? {} : _schema$props,
-      itemProps = schema.itemProps;
+      itemProps = schema.itemProps,
+      _schema$min = schema.min,
+      min = _schema$min === void 0 ? 0 : _schema$min,
+      _schema$max = schema.max,
+      max = _schema$max === void 0 ? 99999 : _schema$max;
   var addBtnProps = {
   var addBtnProps = {
     type: 'dashed',
     type: 'dashed',
     children: '新增一条'
     children: '新增一条'
   };
   };
+  var delConfirmProps = {
+    title: '确定删除?',
+    okText: '确定',
+    cancelText: '取消'
+  };
 
 
   if (props.addBtnProps && _typeof(props.addBtnProps) === 'object') {
   if (props.addBtnProps && _typeof(props.addBtnProps) === 'object') {
     addBtnProps = _objectSpread(_objectSpread({}, addBtnProps), props.addBtnProps);
     addBtnProps = _objectSpread(_objectSpread({}, addBtnProps), props.addBtnProps);
   }
   }
 
 
+  if (props.delConfirmProps && _typeof(props.delConfirmProps) === 'object') {
+    delConfirmProps = _objectSpread(_objectSpread({}, delConfirmProps), props.delConfirmProps);
+  }
+
   return /*#__PURE__*/React.createElement("div", {
   return /*#__PURE__*/React.createElement("div", {
     className: "fr-list-1"
     className: "fr-list-1"
   }, displayList.map(function (item, idx) {
   }, displayList.map(function (item, idx) {
@@ -63,14 +76,11 @@ var SimpleList = function SimpleList(_ref) {
       style: {
       style: {
         marginTop: 6
         marginTop: 6
       }
       }
-    }, !props.hideDelete && /*#__PURE__*/React.createElement(_Popconfirm, {
-      title: "\u786E\u5B9A\u5220\u9664?",
+    }, !props.hideDelete && displayList.length > min && /*#__PURE__*/React.createElement(_Popconfirm, _extends({
       onConfirm: function onConfirm() {
       onConfirm: function onConfirm() {
         return deleteItem(idx);
         return deleteItem(idx);
-      },
-      okText: "\u786E\u5B9A",
-      cancelText: "\u53D6\u6D88"
-    }, /*#__PURE__*/React.createElement(_DeleteOutlined, {
+      }
+    }, delConfirmProps), /*#__PURE__*/React.createElement(_DeleteOutlined, {
       style: {
       style: {
         fontSize: 17,
         fontSize: 17,
         marginLeft: 8
         marginLeft: 8
@@ -104,7 +114,7 @@ var SimpleList = function SimpleList(_ref) {
     style: {
     style: {
       marginTop: displayList.length > 0 ? 0 : 8
       marginTop: displayList.length > 0 ? 0 : 8
     }
     }
-  }, !props.hideAdd && /*#__PURE__*/React.createElement(_Button, _extends({
+  }, !props.hideAdd && displayList.length < max && /*#__PURE__*/React.createElement(_Button, _extends({
     onClick: addItem
     onClick: addItem
   }, addBtnProps)), Array.isArray(props.buttons) ? props.buttons.map(function (item, idx) {
   }, addBtnProps)), Array.isArray(props.buttons) ? props.buttons.map(function (item, idx) {
     var callback = item.callback,
     var callback = item.callback,

+import "antd/es/tabs/style";
+import _Tabs from "antd/es/tabs";
+var _excluded = ["tabName", "type", "draggable"];
+
+function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
+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) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_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 _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+/* eslint-disable jsx-a11y/anchor-is-valid */
+import React, { useState, useRef } from 'react';
+import Core from '../../index';
+var TabPane = _Tabs.TabPane;
+var dragType = 'DraggableTabNode';
+
+var DraggableTabNode = function DraggableTabNode(_ref) {
+  var index = _ref.index,
+      children = _ref.children,
+      moveNode = _ref.moveNode;
+  var ref = useRef(null);
+
+  var _useDrop = useDrop({
+    accept: dragType,
+    collect: function collect(monitor) {
+      var _ref2 = monitor.getItem() || {},
+          dragIndex = _ref2.index;
+
+      if (dragIndex === index) {
+        return {};
+      }
+
+      return {
+        isOver: monitor.isOver(),
+        dropClassName: 'dropping'
+      };
+    },
+    drop: function drop(item) {
+      moveNode(item.index, index);
+    }
+  }),
+      _useDrop2 = _slicedToArray(_useDrop, 2),
+      _useDrop2$ = _useDrop2[0],
+      isOver = _useDrop2$.isOver,
+      dropClassName = _useDrop2$.dropClassName,
+      drop = _useDrop2[1];
+
+  var _useDrag = useDrag({
+    type: dragType,
+    item: {
+      index: index
+    },
+    collect: function collect(monitor) {
+      return {
+        isDragging: monitor.isDragging()
+      };
+    }
+  }),
+      _useDrag2 = _slicedToArray(_useDrag, 2),
+      drag = _useDrag2[1];
+
+  drop(drag(ref));
+  return /*#__PURE__*/React.createElement("div", {
+    ref: ref,
+    style: {
+      marginRight: 2
+    },
+    className: isOver ? dropClassName : ''
+  }, children);
+};
+
+var TabList = function TabList(_ref3) {
+  var _ref3$displayList = _ref3.displayList,
+      displayList = _ref3$displayList === void 0 ? [] : _ref3$displayList,
+      listData = _ref3.listData,
+      changeList = _ref3.changeList,
+      schema = _ref3.schema,
+      deleteItem = _ref3.deleteItem,
+      copyItem = _ref3.copyItem,
+      addItem = _ref3.addItem,
+      moveItemUp = _ref3.moveItemUp,
+      moveItemDown = _ref3.moveItemDown,
+      displayType = _ref3.displayType,
+      getFieldsProps = _ref3.getFieldsProps;
+
+  var _useState = useState('0'),
+      _useState2 = _slicedToArray(_useState, 2),
+      activeKey = _useState2[0],
+      setActiveKey = _useState2[1];
+
+  var _schema$props = schema.props,
+      props = _schema$props === void 0 ? {} : _schema$props,
+      itemProps = schema.itemProps;
+
+  var tabName = props.tabName,
+      type = props.type,
+      _props$draggable = props.draggable,
+      draggable = _props$draggable === void 0 ? false : _props$draggable,
+      restProps = _objectWithoutProperties(props, _excluded);
+
+  var onEdit = function onEdit(targetKey, action) {
+    if (action === 'add') {
+      var currentKey = addItem();
+      setActiveKey("".concat(currentKey));
+    } else if (action === 'remove') {
+      deleteItem(Number(targetKey));
+      setActiveKey("".concat(targetKey > 1 ? targetKey - 1 : 0));
+    } else {
+      return null;
+    }
+  }; //  如果tabName传数组是可以「自定义」tab页的名字的。表单联动可以使用formrender的watch 配合 setSchemaByPath
+
+
+  var getCurrentTabPaneName = function getCurrentTabPaneName(idx) {
+    return tabName instanceof Array ? tabName[idx] || idx + 1 : "".concat(tabName || '项目', " ").concat(idx + 1);
+  };
+
+  return /*#__PURE__*/React.createElement(_Tabs, _extends({
+    type: type || 'line',
+    onChange: setActiveKey,
+    activeKey: activeKey,
+    onEdit: onEdit
+  }, restProps), displayList.map(function (item, idx) {
+    var fieldsProps = getFieldsProps(idx);
+    fieldsProps.displayType = displayType;
+    return /*#__PURE__*/React.createElement(TabPane, {
+      tab: getCurrentTabPaneName(idx),
+      key: "".concat(idx)
+    }, /*#__PURE__*/React.createElement(Core, fieldsProps));
+  }));
+};
+
+export default TabList;

@@ -2,8 +2,6 @@ import "antd/es/table/style";
 import _Table from "antd/es/table";
 import _Table from "antd/es/table";
 import "antd/es/button/style";
 import "antd/es/button/style";
 import _Button from "antd/es/button";
 import _Button from "antd/es/button";
-import "antd/es/space/style";
-import _Space from "antd/es/space";
 import _ArrowDownOutlined from "@ant-design/icons/es/icons/ArrowDownOutlined";
 import _ArrowDownOutlined from "@ant-design/icons/es/icons/ArrowDownOutlined";
 import _ArrowUpOutlined from "@ant-design/icons/es/icons/ArrowUpOutlined";
 import _ArrowUpOutlined from "@ant-design/icons/es/icons/ArrowUpOutlined";
 import "antd/es/popconfirm/style";
 import "antd/es/popconfirm/style";
@@ -31,14 +29,14 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
 
-/* eslint-disable jsx-a11y/anchor-is-valid */
 import React from 'react';
 import React from 'react';
 import Core from '../../index';
 import Core from '../../index';
-// import ArrowDown from '../../../components/ArrowDown';
 var FIELD_LENGTH = 170;
 var FIELD_LENGTH = 170;
 
 
 var TableList = function TableList(_ref) {
 var TableList = function TableList(_ref) {
@@ -67,6 +65,34 @@ var TableList = function TableList(_ref) {
       pagination = _props$pagination === void 0 ? {} : _props$pagination,
       pagination = _props$pagination === void 0 ? {} : _props$pagination,
       rest = _objectWithoutProperties(props, _excluded2);
       rest = _objectWithoutProperties(props, _excluded2);
 
 
+  var actionColumnProps = {
+    colHeaderText: '操作',
+    copyText: '复制',
+    delText: '删除'
+  };
+  var delConfirmProps = {
+    title: '确定删除?',
+    okText: '确定',
+    cancelText: '取消'
+  };
+  var addBtnProps = {
+    type: 'primary',
+    children: '新增一条',
+    size: 'small'
+  };
+
+  if (props.actionColumnProps && _typeof(props.actionColumnProps) === 'object') {
+    actionColumnProps = _objectSpread(_objectSpread({}, actionColumnProps), props.actionColumnProps);
+  }
+
+  if (props.delConfirmProps && _typeof(props.delConfirmProps) === 'object') {
+    delConfirmProps = _objectSpread(_objectSpread({}, delConfirmProps), props.delConfirmProps);
+  }
+
+  if (props.addBtnProps && _typeof(props.addBtnProps) === 'object') {
+    addBtnProps = _objectSpread(_objectSpread({}, addBtnProps), props.addBtnProps);
+  }
+
   var paginationConfig = pagination && _objectSpread({
   var paginationConfig = pagination && _objectSpread({
     size: 'small',
     size: 'small',
     hideOnSinglePage: true
     hideOnSinglePage: true
@@ -102,27 +128,29 @@ var TableList = function TableList(_ref) {
 
 
   if (!props.hideDelete || !props.hideAdd || !props.hideCopy || !props.hideMove) {
   if (!props.hideDelete || !props.hideAdd || !props.hideCopy || !props.hideMove) {
     columns.push({
     columns.push({
-      title: '操作',
+      title: actionColumnProps.colHeaderText,
       key: '$action',
       key: '$action',
       fixed: 'right',
       fixed: 'right',
       width: 120,
       width: 120,
-      render: function render(value, record, idx) {
-        return /*#__PURE__*/React.createElement(_Space, null, !props.hideAdd && !props.hideCopy && /*#__PURE__*/React.createElement("a", {
+      render: function render(value, record) {
+        var idx = record.index;
+        return /*#__PURE__*/React.createElement("div", null, !props.hideAdd && !props.hideCopy && /*#__PURE__*/React.createElement("a", {
           onClick: function onClick() {
           onClick: function onClick() {
             return copyItem(idx);
             return copyItem(idx);
           }
           }
-        }, "\u590D\u5236"), !props.hideDelete && /*#__PURE__*/React.createElement(_Popconfirm, {
-          title: "\u786E\u5B9A\u5220\u9664?",
+        }, actionColumnProps.copyText), !props.hideDelete && /*#__PURE__*/React.createElement(_Popconfirm, _extends({
           onConfirm: function onConfirm() {
           onConfirm: function onConfirm() {
             return deleteItem(idx);
             return deleteItem(idx);
-          },
-          okText: "\u786E\u5B9A",
-          cancelText: "\u53D6\u6D88"
-        }, /*#__PURE__*/React.createElement("a", null, "\u5220\u9664")), !props.hideMove && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_ArrowUpOutlined, {
+          }
+        }, delConfirmProps), /*#__PURE__*/React.createElement("a", {
+          style: {
+            marginLeft: 8
+          }
+        }, actionColumnProps.delText)), !props.hideMove && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_ArrowUpOutlined, {
           style: {
           style: {
             color: '#1890ff',
             color: '#1890ff',
             fontSize: 16,
             fontSize: 16,
-            marginLeft: 4
+            marginLeft: 8
           },
           },
           onClick: function onClick() {
           onClick: function onClick() {
             return moveItemUp(idx);
             return moveItemUp(idx);
@@ -131,7 +159,7 @@ var TableList = function TableList(_ref) {
           style: {
           style: {
             color: '#1890ff',
             color: '#1890ff',
             fontSize: 16,
             fontSize: 16,
-            marginLeft: 4
+            marginLeft: 8
           },
           },
           onClick: function onClick() {
           onClick: function onClick() {
             return moveItemDown(idx);
             return moveItemDown(idx);
@@ -143,11 +171,9 @@ var TableList = function TableList(_ref) {
 
 
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "w-100 mb2 tr"
     className: "w-100 mb2 tr"
-  }, !props.hideAdd && /*#__PURE__*/React.createElement(_Button, {
-    type: "primary",
-    size: "small",
+  }, !props.hideAdd && /*#__PURE__*/React.createElement(_Button, _extends({}, addBtnProps, {
     onClick: addItem
     onClick: addItem
-  }, "\u65B0\u589E"), Array.isArray(props.buttons) ? props.buttons.map(function (item, idx) {
+  })), Array.isArray(props.buttons) ? props.buttons.map(function (item, idx) {
     var callback = item.callback,
     var callback = item.callback,
         text = item.text,
         text = item.text,
         html = item.html;
         html = item.html;

@@ -10,8 +10,6 @@ import _DownOutlined from "@ant-design/icons/es/icons/DownOutlined";
 import "antd/es/input/style";
 import "antd/es/input/style";
 import _Input from "antd/es/input";
 import _Input from "antd/es/input";
 import _SearchOutlined from "@ant-design/icons/es/icons/SearchOutlined";
 import _SearchOutlined from "@ant-design/icons/es/icons/SearchOutlined";
-import _CloseOutlined from "@ant-design/icons/es/icons/CloseOutlined";
-import _CheckOutlined from "@ant-design/icons/es/icons/CheckOutlined";
 import "antd/es/message/style";
 import "antd/es/message/style";
 import _message from "antd/es/message";
 import _message from "antd/es/message";
 import "antd/es/tooltip/style";
 import "antd/es/tooltip/style";
@@ -21,16 +19,28 @@ import "antd/es/menu/style";
 import _Menu from "antd/es/menu";
 import _Menu from "antd/es/menu";
 import "antd/es/button/style";
 import "antd/es/button/style";
 import _Button from "antd/es/button";
 import _Button from "antd/es/button";
-import _MinusOutlined from "@ant-design/icons/es/icons/MinusOutlined";
-import _SelectOutlined from "@ant-design/icons/es/icons/SelectOutlined";
-import _ExpandAltOutlined from "@ant-design/icons/es/icons/ExpandAltOutlined";
+import _AlertOutlined from "@ant-design/icons/es/icons/AlertOutlined";
+import _BarsOutlined from "@ant-design/icons/es/icons/BarsOutlined";
+import _AppstoreOutlined from "@ant-design/icons/es/icons/AppstoreOutlined";
+import _PauseCircleOutlined from "@ant-design/icons/es/icons/PauseCircleOutlined";
+import _PlayCircleOutlined from "@ant-design/icons/es/icons/PlayCircleOutlined";
+import _ExportOutlined from "@ant-design/icons/es/icons/ExportOutlined";
+import _ImportOutlined from "@ant-design/icons/es/icons/ImportOutlined";
+import _CopyOutlined from "@ant-design/icons/es/icons/CopyOutlined";
+import _ToolOutlined from "@ant-design/icons/es/icons/ToolOutlined";
+import _SettingOutlined from "@ant-design/icons/es/icons/SettingOutlined";
+import _EllipsisOutlined from "@ant-design/icons/es/icons/EllipsisOutlined";
+import _FileTextOutlined from "@ant-design/icons/es/icons/FileTextOutlined";
 import _EditOutlined from "@ant-design/icons/es/icons/EditOutlined";
 import _EditOutlined from "@ant-design/icons/es/icons/EditOutlined";
 import _EyeOutlined from "@ant-design/icons/es/icons/EyeOutlined";
 import _EyeOutlined from "@ant-design/icons/es/icons/EyeOutlined";
-import _CopyOutlined from "@ant-design/icons/es/icons/CopyOutlined";
-import _PlusOutlined from "@ant-design/icons/es/icons/PlusOutlined";
 import _DeleteOutlined from "@ant-design/icons/es/icons/DeleteOutlined";
 import _DeleteOutlined from "@ant-design/icons/es/icons/DeleteOutlined";
-import _ImportOutlined from "@ant-design/icons/es/icons/ImportOutlined";
-import _ExportOutlined from "@ant-design/icons/es/icons/ExportOutlined";
+import _CheckOutlined from "@ant-design/icons/es/icons/CheckOutlined";
+import _CloseOutlined from "@ant-design/icons/es/icons/CloseOutlined";
+import _CloseCircleOutlined from "@ant-design/icons/es/icons/CloseCircleOutlined";
+import _MinusCircleOutlined from "@ant-design/icons/es/icons/MinusCircleOutlined";
+import _PlusCircleOutlined from "@ant-design/icons/es/icons/PlusCircleOutlined";
+import _MinusOutlined from "@ant-design/icons/es/icons/MinusOutlined";
+import _PlusOutlined from "@ant-design/icons/es/icons/PlusOutlined";
 import "antd/es/modal/style";
 import "antd/es/modal/style";
 import _Modal from "antd/es/modal";
 import _Modal from "antd/es/modal";
 var _excluded = ["scrollY", "summary", "batchKey", "type", "bar", "line", "searchKey", "rowSelection", "size"];
 var _excluded = ["scrollY", "summary", "batchKey", "type", "bar", "line", "searchKey", "rowSelection", "size"];
@@ -78,17 +88,30 @@ import React, { useEffect, useMemo, useRef, useState } from 'react';
 import Core from '../../index';
 import Core from '../../index';
 var confirm = _Modal.confirm; // import {useVT} from 'virtualizedtableforantd4';
 var confirm = _Modal.confirm; // import {useVT} from 'virtualizedtableforantd4';
 
 
+import QxIcon from './icon';
 var BUTTON_ICONS_MAP = {
 var BUTTON_ICONS_MAP = {
-  ExportOutlined: /*#__PURE__*/React.createElement(_ExportOutlined, null),
-  ImportOutlined: /*#__PURE__*/React.createElement(_ImportOutlined, null),
-  DeleteOutlined: /*#__PURE__*/React.createElement(_DeleteOutlined, null),
   PlusOutlined: /*#__PURE__*/React.createElement(_PlusOutlined, null),
   PlusOutlined: /*#__PURE__*/React.createElement(_PlusOutlined, null),
-  CopyOutlined: /*#__PURE__*/React.createElement(_CopyOutlined, null),
+  MinusOutlined: /*#__PURE__*/React.createElement(_MinusOutlined, null),
+  PlusCircleOutlined: /*#__PURE__*/React.createElement(_PlusCircleOutlined, null),
+  MinusCircleOutlined: /*#__PURE__*/React.createElement(_MinusCircleOutlined, null),
+  CloseCircleOutlined: /*#__PURE__*/React.createElement(_CloseCircleOutlined, null),
+  CloseOutlined: /*#__PURE__*/React.createElement(_CloseOutlined, null),
+  CheckOutlined: /*#__PURE__*/React.createElement(_CheckOutlined, null),
+  DeleteOutlined: /*#__PURE__*/React.createElement(_DeleteOutlined, null),
   EyeOutlined: /*#__PURE__*/React.createElement(_EyeOutlined, null),
   EyeOutlined: /*#__PURE__*/React.createElement(_EyeOutlined, null),
   EditOutlined: /*#__PURE__*/React.createElement(_EditOutlined, null),
   EditOutlined: /*#__PURE__*/React.createElement(_EditOutlined, null),
-  remove: /*#__PURE__*/React.createElement(_ExpandAltOutlined, null),
-  SelectOutlined: /*#__PURE__*/React.createElement(_SelectOutlined, null),
-  MinusOutlined: /*#__PURE__*/React.createElement(_MinusOutlined, null)
+  FileTextOutlined: /*#__PURE__*/React.createElement(_FileTextOutlined, null),
+  EllipsisOutlined: /*#__PURE__*/React.createElement(_EllipsisOutlined, null),
+  SettingOutlined: /*#__PURE__*/React.createElement(_SettingOutlined, null),
+  ToolOutlined: /*#__PURE__*/React.createElement(_ToolOutlined, null),
+  CopyOutlined: /*#__PURE__*/React.createElement(_CopyOutlined, null),
+  ImportOutlined: /*#__PURE__*/React.createElement(_ImportOutlined, null),
+  ExportOutlined: /*#__PURE__*/React.createElement(_ExportOutlined, null),
+  PlayCircleOutlined: /*#__PURE__*/React.createElement(_PlayCircleOutlined, null),
+  PauseCircleOutlined: /*#__PURE__*/React.createElement(_PauseCircleOutlined, null),
+  AppstoreOutlined: /*#__PURE__*/React.createElement(_AppstoreOutlined, null),
+  BarsOutlined: /*#__PURE__*/React.createElement(_BarsOutlined, null),
+  AlertOutlined: /*#__PURE__*/React.createElement(_AlertOutlined, null)
 };
 };
 var FIELD_LENGTH = 170;
 var FIELD_LENGTH = 170;
 var EXPORT_STATUS = {
 var EXPORT_STATUS = {
@@ -124,7 +147,9 @@ var VirtualList = function VirtualList(_ref) {
       fieldName = schema.fieldName,
       fieldName = schema.fieldName,
       _schema$qxProps = schema.qxProps,
       _schema$qxProps = schema.qxProps,
       qxProps = _schema$qxProps === void 0 ? {} : _schema$qxProps,
       qxProps = _schema$qxProps === void 0 ? {} : _schema$qxProps,
-      subformMode = schema.subformMode;
+      subformMode = schema.subformMode,
+      subReadOnly = schema.subReadOnly,
+      isLoading = schema.isLoading;
 
 
   var _props$scrollY = props.scrollY,
   var _props$scrollY = props.scrollY,
       scrollY = _props$scrollY === void 0 ? 300 : _props$scrollY,
       scrollY = _props$scrollY === void 0 ? 300 : _props$scrollY,
@@ -171,9 +196,19 @@ var VirtualList = function VirtualList(_ref) {
   var _useState11 = useState(''),
   var _useState11 = useState(''),
       _useState12 = _slicedToArray(_useState11, 2),
       _useState12 = _slicedToArray(_useState11, 2),
       searchName = _useState12[0],
       searchName = _useState12[0],
-      setSearchName = _useState12[1];
+      setSearchName = _useState12[1]; // const [dataSource, setDataSource] = useState([]);
+  // const [refresh, setRefresh] = useState('1');
+  // const [authDisplayList, setAuthDisplayList] = useState([]) // 有权限展示的数据
+
+
+  var _useState13 = useState(false),
+      _useState14 = _slicedToArray(_useState13, 2),
+      loading = _useState14[0],
+      setLoading = _useState14[1];
 
 
-  var btnMap = useRef({});
+  useEffect(function () {
+    setLoading(!!isLoading);
+  }, [isLoading]);
   var padding = useMemo(function () {
   var padding = useMemo(function () {
     return size === 'default' ? 32 : 16;
     return size === 'default' ? 32 : 16;
   }, [size]);
   }, [size]);
@@ -220,7 +255,28 @@ var VirtualList = function VirtualList(_ref) {
     });
     });
   } else {
   } else {
     _displayList = _toConsumableArray(displayList);
     _displayList = _toConsumableArray(displayList);
-  } // const _displayList = useMemo(() => {
+  } // useEffect(() => {
+  // 筛选展示的数据
+  // if (props.originWidget === 'relSelector') {
+  //   displayList.forEach((item, index) => {
+  //     if (typeof item === 'object') {
+  //       item.orginIdx = index;
+  //     }
+  //     if ((!item.hasOwnProperty('$auth') || item.$auth) && item.id) {
+  //       _displayList.push(item)
+  //     }
+  //   })
+  // } else {
+  //   _displayList = [...displayList];
+  //   _displayList.forEach((item, index) => {
+  //     if (typeof item === 'object') {
+  //       item.orginIdx = index;
+  //     }
+  //   })
+  // }
+  // setAuthDisplayList(_displayList)
+  // }, [displayList, props.originWidget])
+  // const _displayList = useMemo(() => {
   //   let arr = []
   //   let arr = []
   //   const cloneList = _.cloneDeep(displayList)
   //   const cloneList = _.cloneDeep(displayList)
   //   cloneList.forEach((item, index) => {
   //   cloneList.forEach((item, index) => {
@@ -242,21 +298,32 @@ var VirtualList = function VirtualList(_ref) {
   var selectedIds = useMemo(function () {
   var selectedIds = useMemo(function () {
     var _selectedIds = [];
     var _selectedIds = [];
     displayList.forEach(function (item) {
     displayList.forEach(function (item) {
-      if (selectedRowKeys.includes(item.orginIdx)) {
+      if (item && selectedRowKeys.includes(item.orginIdx)) {
         _selectedIds.push(item.id);
         _selectedIds.push(item.id);
       }
       }
     });
     });
     return _selectedIds;
     return _selectedIds;
-  }, [selectedRowKeys, displayList]);
+  }, [selectedRowKeys, displayList]); // useEffect(() => {
+
   var dataSource = (keyWord.length ? _displayList.filter(function (item) {
   var dataSource = (keyWord.length ? _displayList.filter(function (item) {
     var _String;
     var _String;
 
 
     return ((_String = String(item[searchKey])) === null || _String === void 0 ? void 0 : _String.indexOf(keyWord)) > -1;
     return ((_String = String(item[searchKey])) === null || _String === void 0 ? void 0 : _String.indexOf(keyWord)) > -1;
   }) : _displayList).map(function (item, idx) {
   }) : _displayList).map(function (item, idx) {
-    return _objectSpread({
+    return _objectSpread(_objectSpread({}, item), {}, {
       index: item.hasOwnProperty('orginIdx') ? item.orginIdx : idx
       index: item.hasOwnProperty('orginIdx') ? item.orginIdx : idx
-    }, item);
-  });
+    });
+  }); // useEffect(() => {
+  //   setRefresh(refresh + '1')
+  // }, [JSON.stringify(dataSource)])
+  // setDataSource(_dataSource)
+  // }, [keyWord, JSON.stringify(_displayList)])
+  // useEffect(() => {
+  // const dataSource = (keyWord.length ? _displayList.filter(item => String(item[searchKey])?.indexOf(keyWord) > -1) : _displayList).map((item, idx) => {
+  //   return {...item, index: item.hasOwnProperty('orginIdx') ? item.orginIdx : idx};
+  // })
+  // setDataSource(_dataSource)
+  // }, [keyWord, authDisplayList])
 
 
   var handleTotal = function handleTotal(total) {
   var handleTotal = function handleTotal(total) {
     if (!total) {
     if (!total) {
@@ -284,7 +351,8 @@ var VirtualList = function VirtualList(_ref) {
         return handleTotal(total);
         return handleTotal(total);
       },
       },
       defaultCurrent: 1,
       defaultCurrent: 1,
-      size: 'default'
+      size: size || 'small' // hideOnSinglePage: true
+
     };
     };
   }, [dataSource, props.limit]);
   }, [dataSource, props.limit]);
   var barButtons = useMemo(function () {
   var barButtons = useMemo(function () {
@@ -383,7 +451,19 @@ var VirtualList = function VirtualList(_ref) {
         border: 'none'
         border: 'none'
       }
       }
     }, item, {
     }, item, {
-      icon: icon && bar.style !== 'TEXT' ? BUTTON_ICONS_MAP[icon] : null,
+      icon: icon && bar.style !== 'TEXT' ? String(icon).indexOf('http') > -1 ? /*#__PURE__*/React.createElement("img", {
+        src: String(icon),
+        style: {
+          width: '16px',
+          height: '16px',
+          marginRight: '4px',
+          verticalAlign: 'text-bottom',
+          borderRadius: '50%'
+        },
+        alt: ""
+      }) : String(icon).indexOf('-') > -1 ? /*#__PURE__*/React.createElement(QxIcon, {
+        type: String(icon)
+      }) : BUTTON_ICONS_MAP[icon + ''] : null,
       onClick: function onClick() {
       onClick: function onClick() {
         barBtnClick(code, needConfirm, confirmContent, action, item);
         barBtnClick(code, needConfirm, confirmContent, action, item);
       }
       }
@@ -429,7 +509,8 @@ var VirtualList = function VirtualList(_ref) {
             displayType: "inline",
             displayType: "inline",
             key: index.toString(),
             key: index.toString(),
             id: child,
             id: child,
-            dataIndex: childIndex
+            dataIndex: childIndex // subReadOnly={subReadOnly}
+
           });
           });
         }
         }
       };
       };
@@ -506,7 +587,7 @@ var VirtualList = function VirtualList(_ref) {
 
 
 
 
     var len = (line.buttons || []).length;
     var len = (line.buttons || []).length;
-    var action = schema.isReadOnly ? {} : {
+    var action = schema.isReadOnly || subReadOnly ? {} : {
       title: '操作',
       title: '操作',
       key: '$action',
       key: '$action',
       fixed: fixed ? top ? 'left' : 'right' : props.originWidget === 'subform' ? 'right' : false,
       fixed: fixed ? top ? 'left' : 'right' : props.originWidget === 'subform' ? 'right' : false,
@@ -535,7 +616,6 @@ var VirtualList = function VirtualList(_ref) {
             style: {
             style: {
               marginLeft: 8
               marginLeft: 8
             },
             },
-            size: "small",
             onClick: onClick
             onClick: onClick
           }, /*#__PURE__*/React.createElement("span", {
           }, /*#__PURE__*/React.createElement("span", {
             dangerouslySetInnerHTML: {
             dangerouslySetInnerHTML: {
@@ -548,8 +628,10 @@ var VirtualList = function VirtualList(_ref) {
               needConfirm = item.needConfirm,
               needConfirm = item.needConfirm,
               confirmContent = item.confirmContent,
               confirmContent = item.confirmContent,
               icon = item.icon;
               icon = item.icon;
-          var display = handleState(record, code, props.originWidget);
-          btnMap.current[code] = display;
+          var display = handleState(record, code, props.originWidget); // if (display === '') {
+          //   btnMap[code] = ''
+          // }
+
           return /*#__PURE__*/React.createElement(_Tooltip, {
           return /*#__PURE__*/React.createElement(_Tooltip, {
             title: name
             title: name
           }, /*#__PURE__*/React.createElement(_Button, _extends({
           }, /*#__PURE__*/React.createElement(_Button, _extends({
@@ -559,7 +641,19 @@ var VirtualList = function VirtualList(_ref) {
               display: display
               display: display
             }
             }
           }, item, {
           }, item, {
-            icon: icon && style !== 'TEXT' ? BUTTON_ICONS_MAP[icon] : null,
+            icon: icon && style !== 'TEXT' ? String(icon).indexOf('http') > -1 ? /*#__PURE__*/React.createElement("img", {
+              src: String(icon),
+              style: {
+                width: '16px',
+                height: '16px',
+                marginRight: '4px',
+                verticalAlign: 'text-bottom',
+                borderRadius: '50%'
+              },
+              alt: ""
+            }) : String(icon).indexOf('-') > -1 ? /*#__PURE__*/React.createElement(QxIcon, {
+              type: String(icon)
+            }) : BUTTON_ICONS_MAP[icon + ''] : null,
             type: 'link',
             type: 'link',
             size: 'small' // disabled={props.originWidget === 'subform' ? false : handleAuth(record, code)}
             size: 'small' // disabled={props.originWidget === 'subform' ? false : handleAuth(record, code)}
             ,
             ,
@@ -603,34 +697,39 @@ var VirtualList = function VirtualList(_ref) {
                 }
                 }
               }
               }
             }
             }
-          }), style !== 'ICON' || !item.icon ? name : null)); // }
+          }), style !== 'ICON' ? name : null)); // }
         }) : null);
         }) : null);
       }
       }
     };
     };
 
 
     if (style === "ICON" || props.originWidget === 'subform') {
     if (style === "ICON" || props.originWidget === 'subform') {
-      var effectiveLength = 0;
-      Object.keys(btnMap.current || {}).forEach(function (code) {
-        if (btnMap.current[code] !== 'none') {
-          effectiveLength += 1;
-        }
-      });
-      action.width = effectiveLength * 32 + padding - 8;
+      // let effectiveLength = 0
+      // console.log(line.buttons)
+      // line.buttons.forEach((btn) => {
+      //   // console.log(btnMap)
+      //   if (btnMap[btn.code] === '') {
+      //     effectiveLength += 1
+      //     console.log(effectiveLength);
+      //   }
+      // })
+      // console.log(effectiveLength, padding);
+      action.width = len * 32 - 16 >= 30 ? len * 32 + padding - 8 : 30 + padding;
     } else {
     } else {
-      var div = document.createElement('div');
-      div.style.position = 'absolute';
-      div.style.visibility = 'hidden';
-      div.style.fontSize = '14px';
-      window.document.body.appendChild(div);
       var leng = 0;
       var leng = 0;
       line.buttons.map(function (item) {
       line.buttons.map(function (item) {
-        var _btnMap$current;
+        var div = document.createElement('div');
+        div.style.position = 'absolute';
+        div.style.visibility = 'hidden';
+        div.style.fontSize = '14px';
+        window.document.body.appendChild(div);
+        div.innerHTML = item.name; // leng += btnMap?.[item.code] === '' ? (div.clientWidth + (style !== 'TEXT' && item.icon ? 22 : 0)) : 0;
 
 
-        div.innerHTML = item.name;
-        leng += ((_btnMap$current = btnMap.current) === null || _btnMap$current === void 0 ? void 0 : _btnMap$current[item.code]) === 'none' ? 0 : div.clientWidth + padding + (style !== 'TEXT' && item.icon ? 22 : 0);
-      });
-      action.width = leng + padding - 8;
-      div.remove();
+        leng += div.clientWidth + (style !== 'TEXT' && item.icon ? 22 : 0); // console.log(leng);
+
+        div.remove();
+      }); // console.log(leng + padding * 2 - 8, 'leng');
+
+      action.width = leng + padding * 2 - 8;
     }
     }
 
 
     if (columns.findIndex(function (item) {
     if (columns.findIndex(function (item) {
@@ -646,7 +745,7 @@ var VirtualList = function VirtualList(_ref) {
 
 
   var handleExport = /*#__PURE__*/function () {
   var handleExport = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-      var queryParams, appCode, funCode, fieldName, result;
+      var queryParams, currentAppCode, currentFunCode, fieldName, result;
       return regeneratorRuntime.wrap(function _callee$(_context) {
       return regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
         while (1) {
           switch (_context.prev = _context.next) {
           switch (_context.prev = _context.next) {
@@ -658,9 +757,9 @@ var VirtualList = function VirtualList(_ref) {
               queryParams = _defineProperty({
               queryParams = _defineProperty({
                 dataId: props.dataId
                 dataId: props.dataId
               }, searchKey, keyWord);
               }, searchKey, keyWord);
-              appCode = qxProps.appCode, funCode = qxProps.funCode, fieldName = qxProps.fieldName;
+              currentAppCode = qxProps.currentAppCode, currentFunCode = qxProps.currentFunCode, fieldName = qxProps.fieldName;
               _context.next = 5;
               _context.next = 5;
-              return props.exportChild(appCode, funCode, fieldName, queryParams);
+              return props.exportChild(currentAppCode, currentFunCode, fieldName, queryParams);
 
 
             case 5:
             case 5:
               result = _context.sent;
               result = _context.sent;
@@ -895,7 +994,19 @@ var VirtualList = function VirtualList(_ref) {
         marginLeft: 8
         marginLeft: 8
       }
       }
     }, item, {
     }, item, {
-      icon: icon && bar.style !== 'TEXT' ? BUTTON_ICONS_MAP[icon] : null,
+      icon: icon && bar.style !== 'TEXT' ? String(icon).indexOf('http') > -1 ? /*#__PURE__*/React.createElement("img", {
+        src: String(icon),
+        style: {
+          width: '16px',
+          height: '16px',
+          marginRight: '4px',
+          verticalAlign: 'text-bottom',
+          borderRadius: '50%'
+        },
+        alt: ""
+      }) : String(icon).indexOf('-') > -1 ? /*#__PURE__*/React.createElement(QxIcon, {
+        type: String(icon)
+      }) : BUTTON_ICONS_MAP[icon + ''] : null,
       onClick: function onClick() {
       onClick: function onClick() {
         barBtnClick(code, needConfirm, confirmContent, action, item);
         barBtnClick(code, needConfirm, confirmContent, action, item);
       }
       }
@@ -954,15 +1065,19 @@ var VirtualList = function VirtualList(_ref) {
       handleCloseExport(exportProgressData.taskId);
       handleCloseExport(exportProgressData.taskId);
     }
     }
   }) : null, /*#__PURE__*/React.createElement(_Table, _extends({
   }) : null, /*#__PURE__*/React.createElement(_Table, _extends({
+    // key={props.originWidget === 'relSelector' ? refresh : ''}
     id: 'qxVirtualList',
     id: 'qxVirtualList',
     className: 'qx-virtualList',
     className: 'qx-virtualList',
-    rowKey: "index",
+    rowKey: props.originWidget === 'relSelector' ? 'id' : 'orginIdx',
     scroll: {
     scroll: {
       y: scrollY,
       y: scrollY,
       x: '100%'
       x: '100%'
     } // components={vt}
     } // components={vt}
     ,
     ,
-    size: size || 'small',
+    size: size || 'small'
+  }, props.originWidget === 'relSelector' ? {
+    loading: loading
+  } : {}, {
     columns: columns,
     columns: columns,
     dataSource: dataSource,
     dataSource: dataSource,
     pagination: pagination // style={{marginBottom: 25}}
     pagination: pagination // style={{marginBottom: 25}}
@@ -975,7 +1090,7 @@ var VirtualList = function VirtualList(_ref) {
 
 
       return _summary(listData);
       return _summary(listData);
     }
     }
-  }, rest)), !props.hideAdd && props.originWidget === 'subform' && /*#__PURE__*/React.createElement(_Button, {
+  }, rest)), !props.hideAdd && props.originWidget === 'subform' && !subReadOnly && /*#__PURE__*/React.createElement(_Button, {
     type: "link",
     type: "link",
     icon: /*#__PURE__*/React.createElement(_PlusOutlined, null),
     icon: /*#__PURE__*/React.createElement(_PlusOutlined, null),
     onClick: addItem
     onClick: addItem

+import { createFromIconfontCN } from '@ant-design/icons/lib';
+/**
+ * 使用：
+ *    import QxIcon from '@/packages/qx-icon';
+ *    <QxIcon type="xxx"/>
+ * 说明：
+ *    `xxx`为图标唯一标识，`iconfont.cn`对应图标下的“复制代码”所得，建议命名为“icon-xxx_yyy”，
+ *    “icon-”为固定前缀，xxx为模块类型，yyy为图标名。公共类的xxx命名为“comm”
+ * eg: <QxIcon type="icon-flow_eye"/>
+ *
+ * @type {React.FC<IconFontProps<string>>}
+ */
+
+var QxIcon = createFromIconfontCN({
+  scriptUrl: 'https://lf1-cdn-tos.bytegoofy.com/obj/iconpark/icons_13749_95.b05de9dc2fbe8efffb150f83b64da806.es5.js'
+});
+export default QxIcon;

@@ -20,13 +20,13 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 import React from 'react';
 import React from 'react';
 import { get } from 'lodash-es';
 import { get } from 'lodash-es';
 import { useStore, useTools } from '../../../hooks';
 import { useStore, useTools } from '../../../hooks';
-import { getDataPath, getKeyFromPath, getDisplayValue } from '../../../utils'; // import ArrowDown from '../../../components/ArrowDown';
-
+import { generateDataSkeleton, getDataPath, getSchemaFromFlatten } from '../../../utils';
+import CardList from './CardList';
+import DrawerList from './DrawerList';
 import "./list.css";
 import "./list.css";
 import SimpleList from './SimpleList';
 import SimpleList from './SimpleList';
-import CardList from './CardList';
 import TableList from './TableList';
 import TableList from './TableList';
-import DrawerList from './DrawerList';
+import TabList from './TabList';
 import VirtualList from './VirtualList';
 import VirtualList from './VirtualList';
 import ListForMobile from "./ListForMobile";
 import ListForMobile from "./ListForMobile";
 
 
@@ -47,8 +47,12 @@ var RenderList = function RenderList(_ref) {
 
 
   var _useTools = useTools(),
   var _useTools = useTools(),
       onItemChange = _useTools.onItemChange,
       onItemChange = _useTools.onItemChange,
-      removeTouched = _useTools.removeTouched;
+      removeTouched = _useTools.removeTouched,
+      methods = _useTools.methods,
+      layoutWidgets = _useTools.layoutWidgets;
 
 
+  var _schema$props = schema.props,
+      props = _schema$props === void 0 ? {} : _schema$props;
   var renderWidget = 'list';
   var renderWidget = 'list';
 
 
   try {
   try {
@@ -71,9 +75,13 @@ var RenderList = function RenderList(_ref) {
   };
   };
 
 
   var addItem = function addItem() {
   var addItem = function addItem() {
-    var newList = [].concat(_toConsumableArray(displayList), [{
+    // const newList = [...displayList, {_active: true}];
+    var _schema = getSchemaFromFlatten(flatten, parentId);
+
+    var newItem = generateDataSkeleton(_schema.items) || {};
+    var newList = [].concat(_toConsumableArray(displayList), [_objectSpread(_objectSpread({}, newItem), {}, {
       _active: true
       _active: true
-    }]);
+    })]);
     var newIndex = newList.length - 1;
     var newIndex = newList.length - 1;
     onItemChange(dataPath, newList);
     onItemChange(dataPath, newList);
     return newIndex;
     return newIndex;
@@ -98,10 +106,23 @@ var RenderList = function RenderList(_ref) {
     });
     });
     onItemChange(dataPath, newList);
     onItemChange(dataPath, newList);
     removeTouched("".concat(dataPath, "[").concat(idx, "]"));
     removeTouched("".concat(dataPath, "[").concat(idx, "]"));
+  };
+
+  var handleMoving = function handleMoving() {
+    if (props.onMove && typeof props.onMove === 'string') {
+      var cb = methods[props.onMove];
+
+      if (typeof cb === 'function') {
+        cb();
+      }
+    }
   }; // 批量删除的方法
   }; // 批量删除的方法
 
 
 
 
   var batchDelete = function batchDelete(ids) {
   var batchDelete = function batchDelete(ids) {
+    displayList.forEach(function (item) {
+      return delete item.orginIdx;
+    });
     var newList = displayList.filter(function (item, kdx) {
     var newList = displayList.filter(function (item, kdx) {
       return !ids.includes(kdx);
       return !ids.includes(kdx);
     });
     });
@@ -113,6 +134,7 @@ var RenderList = function RenderList(_ref) {
 
 
 
 
   var moveItemUp = function moveItemUp(idx) {
   var moveItemUp = function moveItemUp(idx) {
+    handleMoving();
     if (idx === 0) return;
     if (idx === 0) return;
     var currentItem = displayList[idx];
     var currentItem = displayList[idx];
     var itemAbove = displayList[idx - 1];
     var itemAbove = displayList[idx - 1];
@@ -125,6 +147,7 @@ var RenderList = function RenderList(_ref) {
   };
   };
 
 
   var moveItemDown = function moveItemDown(idx) {
   var moveItemDown = function moveItemDown(idx) {
+    handleMoving();
     if (idx >= displayList.length - 1) return;
     if (idx >= displayList.length - 1) return;
     var currentItem = displayList[idx];
     var currentItem = displayList[idx];
     var itemBelow = displayList[idx + 1];
     var itemBelow = displayList[idx + 1];
@@ -138,7 +161,6 @@ var RenderList = function RenderList(_ref) {
 
 
   var itemSchema = {
   var itemSchema = {
     type: 'object',
     type: 'object',
-    // properties: (schema.items && schema.items.properties) || {},
     properties: {},
     properties: {},
     props: schema.props || {},
     props: schema.props || {},
     $id: schema.$id
     $id: schema.$id
@@ -179,11 +201,12 @@ var RenderList = function RenderList(_ref) {
     return /*#__PURE__*/React.createElement(ListForMobile, displayProps);
     return /*#__PURE__*/React.createElement(ListForMobile, displayProps);
   }
   }
 
 
-  switch (renderWidget) {
-    case 'list0':
-    case 'cardList':
-      return /*#__PURE__*/React.createElement(CardList, displayProps);
+  if (layoutWidgets && layoutWidgets[renderWidget]) {
+    var Component = layoutWidgets[renderWidget];
+    return /*#__PURE__*/React.createElement(Component, displayProps);
+  }
 
 
+  switch (renderWidget) {
     case 'list1':
     case 'list1':
     case 'simpleList':
     case 'simpleList':
       return /*#__PURE__*/React.createElement(SimpleList, displayProps);
       return /*#__PURE__*/React.createElement(SimpleList, displayProps);
@@ -199,9 +222,12 @@ var RenderList = function RenderList(_ref) {
     case 'list4':
     case 'list4':
     case 'virtualList':
     case 'virtualList':
       return /*#__PURE__*/React.createElement(VirtualList, displayProps);
       return /*#__PURE__*/React.createElement(VirtualList, displayProps);
-    // case 'listForMobile':
-    //   return <ListForMobile {...displayProps} />
 
 
+    case 'tabList':
+      return /*#__PURE__*/React.createElement(TabList, displayProps);
+
+    case 'list0':
+    case 'cardList':
     default:
     default:
       return /*#__PURE__*/React.createElement(CardList, displayProps);
       return /*#__PURE__*/React.createElement(CardList, displayProps);
   }
   }

+.fr-container .ant-table-container .field-block {
+  display: none !important;
+}
 .fr-container .fr-card-item {
 .fr-container .fr-card-item {
   border: 0.5px solid rgba(0, 0, 0, 0.1);
   border: 0.5px solid rgba(0, 0, 0, 0.1);
   padding: 10px 0 4px 0;
   padding: 10px 0 4px 0;

@@ -9,10 +9,12 @@ var RenderObject = function RenderObject(_ref) {
       _ref$dataIndex = _ref.dataIndex,
       _ref$dataIndex = _ref.dataIndex,
       dataIndex = _ref$dataIndex === void 0 ? [] : _ref$dataIndex,
       dataIndex = _ref$dataIndex === void 0 ? [] : _ref$dataIndex,
       displayType = _ref.displayType,
       displayType = _ref.displayType,
+      labelAlign = _ref.labelAlign,
       hideTitle = _ref.hideTitle;
       hideTitle = _ref.hideTitle;
   return /*#__PURE__*/React.createElement(React.Fragment, null, children.map(function (child, i) {
   return /*#__PURE__*/React.createElement(React.Fragment, null, children.map(function (child, i) {
     var FRProps = {
     var FRProps = {
       displayType: displayType,
       displayType: displayType,
+      labelAlign: labelAlign,
       id: child,
       id: child,
       dataIndex: dataIndex,
       dataIndex: dataIndex,
       hideTitle: hideTitle
       hideTitle: hideTitle

@@ -5,3 +5,6 @@
   line-height: 1.5715;
   line-height: 1.5715;
   transition: color 0.3s cubic-bezier(0.215, 0.61, 0.355, 1);
   transition: color 0.3s cubic-bezier(0.215, 0.61, 0.355, 1);
 }
 }
+.fr-container .field-block {
+  min-height: 24px;
+}

@@ -14,7 +14,9 @@ var ErrorMessage = function ErrorMessage(_ref) {
     msg = message[0] || '';
     msg = message[0] || '';
   }
   }
 
 
-  msg = translateMessage(msg, schema);
+  msg = translateMessage(msg, schema); // 无错误信息不渲染 msg 元素占位，表单之间的间隔通过 field-block 元素分隔
+
+  if (!msg) return null;
   if (hardHidden) return /*#__PURE__*/React.createElement("div", {
   if (hardHidden) return /*#__PURE__*/React.createElement("div", {
     className: "error-message"
     className: "error-message"
   });
   });

@@ -5,10 +5,10 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 
 import React, { Suspense } from 'react';
 import React, { Suspense } from 'react';
-import { getWidgetName, extraSchemaList } from '../../mapping';
-import { useTools, useStore } from '../../hooks';
 import { transformProps } from '../../createWidget';
 import { transformProps } from '../../createWidget';
-import { isObjType, isListType, isObject } from '../../utils';
+import { useStore, useTools } from '../../hooks';
+import { extraSchemaList, getWidgetName } from '../../mapping';
+import { isListType, isObject, isObjType } from '../../utils';
 
 
 var ErrorSchema = function ErrorSchema(schema) {
 var ErrorSchema = function ErrorSchema(schema) {
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
@@ -30,7 +30,9 @@ var ExtendedWidget = function ExtendedWidget(_ref) {
       readOnly = _ref.readOnly,
       readOnly = _ref.readOnly,
       dataPath = _ref.dataPath,
       dataPath = _ref.dataPath,
       disabled = _ref.disabled,
       disabled = _ref.disabled,
-      dataIndex = _ref.dataIndex;
+      dataIndex = _ref.dataIndex,
+      watch = _ref.watch,
+      hasError = _ref.hasError;
 
 
   var _useTools = useTools(),
   var _useTools = useTools(),
       widgets = _useTools.widgets,
       widgets = _useTools.widgets,
@@ -43,7 +45,15 @@ var ExtendedWidget = function ExtendedWidget(_ref) {
       getValues = _useTools.getValues,
       getValues = _useTools.getValues,
       resetFields = _useTools.resetFields,
       resetFields = _useTools.resetFields,
       setErrorFields = _useTools.setErrorFields,
       setErrorFields = _useTools.setErrorFields,
-      removeErrorField = _useTools.removeErrorField;
+      removeErrorField = _useTools.removeErrorField,
+      validateFields = _useTools.validateFields,
+      isFieldTouched = _useTools.isFieldTouched,
+      isFieldsTouched = _useTools.isFieldsTouched,
+      isFieldValidating = _useTools.isFieldValidating,
+      scrollToPath = _useTools.scrollToPath,
+      getFieldError = _useTools.getFieldError,
+      getFieldsError = _useTools.getFieldsError,
+      setFields = _useTools.setFields;
 
 
   var _useStore = useStore(),
   var _useStore = useStore(),
       globalProps = _useStore.globalProps; // if (isObjType(schema)) {
       globalProps = _useStore.globalProps; // if (isObjType(schema)) {
@@ -79,7 +89,7 @@ var ExtendedWidget = function ExtendedWidget(_ref) {
     });
     });
   }
   }
 
 
-  var Widget = widgets[widgetName];
+  var Widget = widgets[widgetName] || widgets['html'];
   var extraSchema = extraSchemaList[widgetName];
   var extraSchema = extraSchemaList[widgetName];
 
 
   var widgetProps = _objectSpread(_objectSpread({
   var widgetProps = _objectSpread(_objectSpread({
@@ -88,7 +98,10 @@ var ExtendedWidget = function ExtendedWidget(_ref) {
     value: value,
     value: value,
     children: children,
     children: children,
     disabled: disabled,
     disabled: disabled,
-    readOnly: readOnly
+    readOnly: readOnly,
+    // dataPath,
+    // dataIndex,
+    className: hasError ? 'fr-item-status-error' : ''
   }, schema.props), globalProps);
   }, schema.props), globalProps);
 
 
   if (schema.type === 'string' && typeof schema.max === 'number') {
   if (schema.type === 'string' && typeof schema.max === 'number') {
@@ -141,7 +154,16 @@ var ExtendedWidget = function ExtendedWidget(_ref) {
     resetFields: resetFields,
     resetFields: resetFields,
     setErrorFields: setErrorFields,
     setErrorFields: setErrorFields,
     removeErrorField: removeErrorField,
     removeErrorField: removeErrorField,
-    hideSelf: hideSelf
+    validateFields: validateFields,
+    isFieldTouched: isFieldTouched,
+    isFieldsTouched: isFieldsTouched,
+    isFieldValidating: isFieldValidating,
+    scrollToPath: scrollToPath,
+    getFieldError: getFieldError,
+    getFieldsError: getFieldsError,
+    setFields: setFields,
+    hideSelf: hideSelf,
+    watch: watch
   };
   };
   var finalProps = transformProps(widgetProps);
   var finalProps = transformProps(widgetProps);
   return /*#__PURE__*/React.createElement(Suspense, {
   return /*#__PURE__*/React.createElement(Suspense, {
@@ -149,34 +171,37 @@ var ExtendedWidget = function ExtendedWidget(_ref) {
   }, /*#__PURE__*/React.createElement("div", {
   }, /*#__PURE__*/React.createElement("div", {
     className: "fr-item-wrapper"
     className: "fr-item-wrapper"
   }, /*#__PURE__*/React.createElement(Widget, finalProps)));
   }, /*#__PURE__*/React.createElement(Widget, finalProps)));
-};
-
-var areEqual = function areEqual(prev, current) {
-  if (prev.schema && prev.schema.$id === '#') {
-    return false;
-  }
-
-  if (prev.readOnly !== current.readOnly) {
-    return false;
-  }
-
-  if (prev.disabled !== current.disabled) {
-    return false;
-  }
-
-  if (JSON.stringify(prev.dependValues) !== JSON.stringify(current.dependValues)) {
-    return false;
-  }
-
-  if (isObjType(prev.schema) && isObjType(current.schema)) {
-    return false;
-  }
-
-  if (JSON.stringify(prev.value) === JSON.stringify(current.value) && JSON.stringify(prev.schema) === JSON.stringify(current.schema)) {
-    return true;
-  }
-
-  return false;
-};
-
-export default /*#__PURE__*/React.memo(ExtendedWidget, areEqual);
+}; // const areEqual = (prev, current) => {
+//   if (prev.schema && current.schema) {
+//     if (prev.schema.$id === '#') {
+//       return false;
+//     }
+//     if (prev.schema.hidden && current.schema.hidden) {
+//       return true;
+//     }
+//   }
+//   if (prev.readOnly !== current.readOnly) {
+//     return false;
+//   }
+//   if (prev.disabled !== current.disabled) {
+//     return false;
+//   }
+//   if (
+//     JSON.stringify(prev.dependValues) !== JSON.stringify(current.dependValues)
+//   ) {
+//     return false;
+//   }
+//   if (isObjType(prev.schema) && isObjType(current.schema)) {
+//     return false;
+//   }
+//   if (
+//     JSON.stringify(prev.value) === JSON.stringify(current.value) &&
+//     JSON.stringify(prev.schema) === JSON.stringify(current.schema)
+//   ) {
+//     return true;
+//   }
+//   return false;
+// };
+
+
+export default ExtendedWidget;

+import "antd/es/tooltip/style";
+import _Tooltip from "antd/es/tooltip";
+import React from 'react';
+import { useStore2, useTools } from '../../hooks';
+import { isCheckBoxType } from '../../utils';
+
+var Description = function Description(_ref) {
+  var displayType = _ref.displayType,
+      schema = _ref.schema;
+  var description = schema.description,
+      descType = schema.descType,
+      descWidget = schema.descWidget;
+  if (!description && !descWidget) return null;
+
+  var _useTools = useTools(),
+      widgets = _useTools.widgets;
+
+  var _description = typeof description === 'string' && /(^<|\/>)/.test(description) ? /*#__PURE__*/React.createElement("div", {
+    dangerouslySetInnerHTML: {
+      __html: description
+    }
+  }) : description;
+
+  var RenderDesc = function RenderDesc() {
+    var Widget = widgets[schema.descWidget];
+
+    if (Widget) {
+      return /*#__PURE__*/React.createElement(Widget, {
+        schema: schema
+      });
+    }
+
+    return null;
+  };
+
+  switch (displayType) {
+    case 'row':
+      if (descType === 'widget') {
+        return /*#__PURE__*/React.createElement(RenderDesc, null);
+      }
+
+      return /*#__PURE__*/React.createElement(_Tooltip, {
+        title: _description
+      }, /*#__PURE__*/React.createElement("i", {
+        className: "fr-tooltip-icon"
+      }));
+
+    case 'inline':
+      return null;
+
+    default:
+      if (descType === 'widget') {
+        return /*#__PURE__*/React.createElement(RenderDesc, null);
+      }
+
+      if (descType === 'icon') {
+        return /*#__PURE__*/React.createElement(_Tooltip, {
+          title: _description
+        }, /*#__PURE__*/React.createElement("i", {
+          className: "fr-tooltip-icon"
+        }));
+      }
+
+      return /*#__PURE__*/React.createElement("span", {
+        className: "fr-desc ml2"
+      }, "( ".concat(description, " )"));
+  }
+};
+
+var Title = function Title(_ref2) {
+  var labelClass = _ref2.labelClass,
+      labelStyle = _ref2.labelStyle,
+      schema = _ref2.schema,
+      displayType = _ref2.displayType,
+      renderTitle = _ref2.renderTitle,
+      globalRequiredMark = _ref2.requiredMark;
+
+  var _useStore = useStore2(),
+      globalDisplayType = _useStore.displayType,
+      readOnly = _useStore.readOnly,
+      colon = _useStore.colon;
+
+  var title = schema.title,
+      required = schema.required,
+      type = schema.type,
+      schemaRequiredMark = schema.requiredMark;
+  var isObjType = type === 'object';
+
+  var _displayType = schema.displayType || displayType || globalDisplayType || 'column';
+
+  if (renderTitle) {
+    return renderTitle({
+      labelClass: labelClass,
+      labelStyle: labelStyle,
+      schema: schema,
+      displayType: _displayType,
+      readOnly: readOnly,
+      colon: colon
+    });
+  }
+
+  var requiredMark = typeof schemaRequiredMark === 'undefined' ? globalRequiredMark : schemaRequiredMark; // 左侧的的 * 号提示
+
+  var TitleRequiredMark = null; // 左侧的 option 提示
+
+  var TitleTextMark = null;
+
+  if (required) {
+    /**
+     * ant-design requiredMark 实现
+     * https://ant.design/components/form-cn/
+     */
+    if (requiredMark !== false && requiredMark !== 'optional') {
+      TitleRequiredMark = /*#__PURE__*/React.createElement("span", {
+        className: "fr-label-required"
+      }, " *");
+      TitleTextMark = null;
+    }
+  } else {
+    if (requiredMark === 'optional') {
+      TitleRequiredMark = null;
+      TitleTextMark = /*#__PURE__*/React.createElement("span", {
+        className: "fr-label-required-text"
+      }, "\uFF08\u53EF\u9009\uFF09");
+    }
+  } // requiredMark 为 false 不展示必填符号
+
+
+  if (requiredMark === false) {
+    TitleRequiredMark = null;
+    TitleTextMark = null;
+  }
+
+  return /*#__PURE__*/React.createElement("div", {
+    className: labelClass,
+    style: labelStyle
+  }, title ? /*#__PURE__*/React.createElement("label", {
+    className: "fr-label-title ".concat(isCheckBoxType(schema, readOnly) || _displayType === 'column' || !colon ? 'no-colon' : '') // checkbox不带冒号
+    ,
+    title: title
+  }, TitleRequiredMark, /*#__PURE__*/React.createElement("span", {
+    className: "".concat(isObjType ? 'b' : '', " ").concat(_displayType === 'column' ? 'flex-none' : '')
+  }, /*#__PURE__*/React.createElement("span", {
+    dangerouslySetInnerHTML: {
+      __html: title
+    }
+  })), TitleTextMark, /*#__PURE__*/React.createElement(Description, {
+    schema: schema,
+    displayType: _displayType
+  })) : null);
+};
+
+export default Title;

 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
 
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread 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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
+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 _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 
-import React, { useEffect, useRef } from 'react';
+import React, { useRef } from 'react';
 import { useStore, useStore2, useTools } from '../../hooks';
 import { useStore, useStore2, useTools } from '../../hooks';
 import useDebouncedCallback from '../../useDebounce';
 import useDebouncedCallback from '../../useDebounce';
-import { getValueByPath, isCheckBoxType, isObjType } from '../../utils';
+import { getValueByPath, isCheckBoxType, isObjType, isBlockType } from '../../utils';
+import { validateField } from '../../validator';
 import ErrorMessage from './ErrorMessage';
 import ErrorMessage from './ErrorMessage';
+import ExtendedWidget from './ExtendedWidget';
 import Extra from './Extra';
 import Extra from './Extra';
-import FieldTitle from './Title';
-import ExtendedWidget from './ExtendedWidget'; // TODO: 之后不要直接用get，收口到一个内部方法getValue，便于全局 ctrl + f 查找
+import FieldTitle from './Title'; // TODO: 之后不要直接用get，收口到一个内部方法getValue，便于全局 ctrl + f 查找
 
 
 var RenderField = function RenderField(props) {
 var RenderField = function RenderField(props) {
   var $id = props.$id,
   var $id = props.$id,
@@ -28,19 +41,28 @@ var RenderField = function RenderField(props) {
       displayType = props.displayType;
       displayType = props.displayType;
 
 
   var _useStore = useStore(),
   var _useStore = useStore(),
-      formData = _useStore.formData;
+      formData = _useStore.formData,
+      flatten = _useStore.flatten;
 
 
   var _useStore2 = useStore2(),
   var _useStore2 = useStore2(),
       debounceInput = _useStore2.debounceInput,
       debounceInput = _useStore2.debounceInput,
       readOnly = _useStore2.readOnly,
       readOnly = _useStore2.readOnly,
       disabled = _useStore2.disabled,
       disabled = _useStore2.disabled,
-      showValidate = _useStore2.showValidate;
+      showValidate = _useStore2.showValidate,
+      validateMessages = _useStore2.validateMessages,
+      locale = _useStore2.locale,
+      watch = _useStore2.watch;
 
 
   var _useTools = useTools(),
   var _useTools = useTools(),
       onValuesChange = _useTools.onValuesChange,
       onValuesChange = _useTools.onValuesChange,
       onItemChange = _useTools.onItemChange,
       onItemChange = _useTools.onItemChange,
       setEditing = _useTools.setEditing,
       setEditing = _useTools.setEditing,
-      touchKey = _useTools.touchKey;
+      touchKey = _useTools.touchKey,
+      _setErrors = _useTools._setErrors,
+      renderTitle = _useTools.renderTitle,
+      requiredMark = _useTools.requiredMark,
+      setFieldValidating = _useTools.setFieldValidating,
+      removeFieldValidating = _useTools.removeFieldValidating;
 
 
   var formDataRef = useRef();
   var formDataRef = useRef();
   formDataRef.current = formData; // console.log('<renderField>', $id);
   formDataRef.current = formData; // console.log('<renderField>', $id);
@@ -58,7 +80,38 @@ var RenderField = function RenderField(props) {
 
 
   var _readOnly = readOnly !== undefined ? readOnly : _schema.readOnly;
   var _readOnly = readOnly !== undefined ? readOnly : _schema.readOnly;
 
 
-  var _disabled = disabled !== undefined ? disabled : _schema.disabled; // TODO: 优化一下，只有touch还是false的时候，setTouched
+  var _disabled = disabled !== undefined ? disabled : _schema.disabled;
+
+  var removeDupErrors = function removeDupErrors(arr) {
+    if (!Array.isArray(arr)) {
+      console.log('in removeDups: param is not an array');
+      return;
+    }
+
+    var array = [];
+
+    for (var i = 0; i < arr.length; i++) {
+      var sameNameIndex = array.findIndex(function (item) {
+        return item.name === arr[i].name;
+      });
+
+      if (sameNameIndex > -1) {
+        var sameNameItem = array[sameNameIndex];
+        var error1 = sameNameItem.error;
+        var error2 = arr[i].error;
+        array[sameNameIndex] = {
+          name: sameNameItem.name,
+          error: error1.length > 0 && error2.length > 0 ? error2 : []
+        };
+      } else {
+        array.push(arr[i]);
+      }
+    }
+
+    return array.filter(function (item) {
+      return Array.isArray(item.error) && item.error.length > 0;
+    });
+  }; // TODO: 优化一下，只有touch还是false的时候，setTouched
 
 
 
 
   var onChange = function onChange(value) {
   var onChange = function onChange(value) {
@@ -78,13 +131,33 @@ var RenderField = function RenderField(props) {
     if (typeof onValuesChange === 'function') {
     if (typeof onValuesChange === 'function') {
       onValuesChange(_defineProperty({}, dataPath, value), formDataRef.current);
       onValuesChange(_defineProperty({}, dataPath, value), formDataRef.current);
     }
     }
+
+    validateField({
+      path: dataPath,
+      formData: formDataRef.current,
+      flatten: flatten,
+      options: {
+        locale: locale,
+        validateMessages: validateMessages
+      },
+      formInstance: {
+        setFieldValidating: setFieldValidating,
+        removeFieldValidating: removeFieldValidating
+      }
+    }).then(function (res) {
+      _setErrors(function (errors) {
+        return removeDupErrors([].concat(_toConsumableArray(errors), _toConsumableArray(res)));
+      });
+    });
   };
   };
 
 
   var titleProps = {
   var titleProps = {
     labelClass: labelClass,
     labelClass: labelClass,
     labelStyle: labelStyle,
     labelStyle: labelStyle,
     schema: _schema,
     schema: _schema,
-    displayType: displayType
+    displayType: displayType,
+    renderTitle: renderTitle,
+    requiredMark: requiredMark
   };
   };
   var messageProps = {
   var messageProps = {
     message: errorMessage,
     message: errorMessage,
@@ -124,17 +197,31 @@ var RenderField = function RenderField(props) {
     onItemChange: onItemChange,
     onItemChange: onItemChange,
     dataIndex: dataIndex,
     dataIndex: dataIndex,
     dataPath: dataPath,
     dataPath: dataPath,
-    children: children
+    children: children,
+    watch: watch,
+    hasError: hasError
+  };
+
+  var displayBlock = function displayBlock() {
+    if (hasError && !_schema.extra) {
+      return false;
+    }
+
+    return true;
   }; // if (_schema && _schema.default !== undefined) {
   }; // if (_schema && _schema.default !== undefined) {
   //   widgetProps.value = _schema.default;
   //   widgetProps.value = _schema.default;
   // }
   // }
   // checkbox必须单独处理，布局太不同了
   // checkbox必须单独处理，布局太不同了
 
 
+
   if (isCheckBoxType(_schema, _readOnly)) {
   if (isCheckBoxType(_schema, _readOnly)) {
     return /*#__PURE__*/React.createElement(React.Fragment, null, _showTitle && /*#__PURE__*/React.createElement("div", placeholderTitleProps), /*#__PURE__*/React.createElement("div", {
     return /*#__PURE__*/React.createElement(React.Fragment, null, _showTitle && /*#__PURE__*/React.createElement("div", placeholderTitleProps), /*#__PURE__*/React.createElement("div", {
       className: contentClass,
       className: contentClass,
-      style: contentStyle
-    }, /*#__PURE__*/React.createElement(ExtendedWidget, widgetProps), /*#__PURE__*/React.createElement(Extra, widgetProps), /*#__PURE__*/React.createElement(ErrorMessage, messageProps)));
+      style: contentStyle,
+      datapath: dataPath
+    }, /*#__PURE__*/React.createElement(ExtendedWidget, widgetProps), /*#__PURE__*/React.createElement(ErrorMessage, messageProps), /*#__PURE__*/React.createElement(Extra, widgetProps), displayBlock() && /*#__PURE__*/React.createElement("div", {
+      className: "field-block"
+    })));
   }
   }
 
 
   var titleElement = /*#__PURE__*/React.createElement(FieldTitle, titleProps);
   var titleElement = /*#__PURE__*/React.createElement(FieldTitle, titleProps);
@@ -144,20 +231,30 @@ var RenderField = function RenderField(props) {
       style: {
       style: {
         display: 'flex'
         display: 'flex'
       }
       }
-    }, titleElement, /*#__PURE__*/React.createElement(ErrorMessage, messageProps));
+    }, titleElement, /*#__PURE__*/React.createElement(ErrorMessage, messageProps), displayBlock() && /*#__PURE__*/React.createElement("div", {
+      className: "field-block"
+    }));
     return /*#__PURE__*/React.createElement("div", {
     return /*#__PURE__*/React.createElement("div", {
       className: contentClass,
       className: contentClass,
-      style: contentStyle
+      style: contentStyle,
+      datapath: dataPath
     }, /*#__PURE__*/React.createElement(ExtendedWidget, _extends({}, widgetProps, {
     }, /*#__PURE__*/React.createElement(ExtendedWidget, _extends({}, widgetProps, {
       message: errorMessage,
       message: errorMessage,
       title: _showTitle ? titleElement : undefined
       title: _showTitle ? titleElement : undefined
     })), /*#__PURE__*/React.createElement(Extra, widgetProps));
     })), /*#__PURE__*/React.createElement(Extra, widgetProps));
+  } else if (isBlockType(_schema)) {
+    return /*#__PURE__*/React.createElement("div", {
+      datapath: dataPath
+    }, /*#__PURE__*/React.createElement(ExtendedWidget, widgetProps));
   }
   }
 
 
   return /*#__PURE__*/React.createElement(React.Fragment, null, _showTitle && titleElement, /*#__PURE__*/React.createElement("div", {
   return /*#__PURE__*/React.createElement(React.Fragment, null, _showTitle && titleElement, /*#__PURE__*/React.createElement("div", {
     className: "".concat(contentClass, " ").concat(hideTitle ? 'fr-content-no-title' : ''),
     className: "".concat(contentClass, " ").concat(hideTitle ? 'fr-content-no-title' : ''),
-    style: contentStyle
-  }, /*#__PURE__*/React.createElement(ExtendedWidget, widgetProps), /*#__PURE__*/React.createElement(Extra, widgetProps), /*#__PURE__*/React.createElement(ErrorMessage, messageProps)));
+    style: contentStyle,
+    datapath: dataPath
+  }, /*#__PURE__*/React.createElement(ExtendedWidget, widgetProps), /*#__PURE__*/React.createElement(ErrorMessage, messageProps), /*#__PURE__*/React.createElement(Extra, widgetProps), displayBlock() && /*#__PURE__*/React.createElement("div", {
+    className: "field-block"
+  })));
 };
 };
 
 
 export default RenderField;
 export default RenderField;

 var _excluded = ["id", "_item", "dataIndex", "hideTitle", "hideValidation", "debugCss"],
 var _excluded = ["id", "_item", "dataIndex", "hideTitle", "hideValidation", "debugCss"],
-    _excluded2 = ["id", "item", "dataIndex", "dataPath", "hideTitle", "hideValidation", "debugCss", "schema", "_value", "dependValues", "displayType", "column", "labelWidth", "readOnly", "errorFields", "effectiveLabelWidth"];
+    _excluded2 = ["id", "item", "dataIndex", "dataPath", "hideTitle", "hideValidation", "debugCss", "schema", "_value", "dependValues", "displayType", "labelAlign", "column", "labelWidth", "readOnly", "errorFields", "effectiveLabelWidth"];
 
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 
@@ -12,11 +12,11 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
 
 import React, { useRef } from 'react';
 import React, { useRef } from 'react';
+import { useStore, useStore2 } from '../hooks';
+import { clone, getDataPath, getParentPath, getParentProps, getValueByPath, isCheckBoxType, isCssLength, isListType, isLooselyNumber, isObjType, parseRootValueInSchema } from '../utils';
 import RenderList from './RenderChildren/RenderList';
 import RenderList from './RenderChildren/RenderList';
 import RenderObject from './RenderChildren/RenderObject';
 import RenderObject from './RenderChildren/RenderObject';
 import RenderField from './RenderField';
 import RenderField from './RenderField';
-import { useStore, useStore2 } from '../hooks';
-import { isLooselyNumber, isCssLength, getParentProps, getParentPath, isListType, isCheckBoxType, isObjType, getValueByPath, getDataPath, parseRootValueInSchema, clone } from '../utils';
 
 
 var Core = function Core(_ref) {
 var Core = function Core(_ref) {
   var _ref$id = _ref.id,
   var _ref$id = _ref.id,
@@ -31,7 +31,6 @@ var Core = function Core(_ref) {
       debugCss = _ref.debugCss,
       debugCss = _ref.debugCss,
       rest = _objectWithoutProperties(_ref, _excluded);
       rest = _objectWithoutProperties(_ref, _excluded);
 
 
-  // console.log('<Core>', id);
   var snapShot = useRef();
   var snapShot = useRef();
 
 
   var _useStore = useStore(),
   var _useStore = useStore(),
@@ -45,7 +44,8 @@ var Core = function Core(_ref) {
       displayType = _useStore2.displayType,
       displayType = _useStore2.displayType,
       column = _useStore2.column,
       column = _useStore2.column,
       labelWidth = _useStore2.labelWidth,
       labelWidth = _useStore2.labelWidth,
-      readOnly = _useStore2.readOnly;
+      readOnly = _useStore2.readOnly,
+      labelAlign = _useStore2.labelAlign;
 
 
   var item = _item ? _item : flatten[id];
   var item = _item ? _item : flatten[id];
   if (!item) return null;
   if (!item) return null;
@@ -54,7 +54,8 @@ var Core = function Core(_ref) {
 
 
   var _value = getValueByPath(formData, dataPath);
   var _value = getValueByPath(formData, dataPath);
 
 
-  var schema = clone(item.schema);
+  var schema = clone(item.schema); // schema.disabled = !!subReadOnly;
+
   var dependencies = schema.dependencies;
   var dependencies = schema.dependencies;
   var dependValues = [];
   var dependValues = [];
   var rootValue;
   var rootValue;
@@ -73,6 +74,10 @@ var Core = function Core(_ref) {
 
 
   try {
   try {
     rootValue = getValueByPath(formData, parentPath);
     rootValue = getValueByPath(formData, parentPath);
+
+    if (dataIndex.length) {
+      rootValue.index = dataIndex[dataIndex.length - 1];
+    }
   } catch (error) {} // 节流部分逻辑，编辑时不执行
   } catch (error) {} // 节流部分逻辑，编辑时不执行
 
 
 
 
@@ -108,7 +113,8 @@ var Core = function Core(_ref) {
     readOnly: readOnly,
     readOnly: readOnly,
     errorFields: errorFields,
     errorFields: errorFields,
     effectiveLabelWidth: effectiveLabelWidth,
     effectiveLabelWidth: effectiveLabelWidth,
-    allTouched: allTouched
+    allTouched: allTouched,
+    labelAlign: labelAlign
   }, rest);
   }, rest);
 
 
   return /*#__PURE__*/React.createElement(CoreRender, dataProps);
   return /*#__PURE__*/React.createElement(CoreRender, dataProps);
@@ -126,6 +132,7 @@ var CoreRender = function CoreRender(_ref2) {
       _value = _ref2._value,
       _value = _ref2._value,
       dependValues = _ref2.dependValues,
       dependValues = _ref2.dependValues,
       displayType = _ref2.displayType,
       displayType = _ref2.displayType,
+      labelAlign = _ref2.labelAlign,
       column = _ref2.column,
       column = _ref2.column,
       labelWidth = _ref2.labelWidth,
       labelWidth = _ref2.labelWidth,
       readOnly = _ref2.readOnly,
       readOnly = _ref2.readOnly,
@@ -133,13 +140,16 @@ var CoreRender = function CoreRender(_ref2) {
       effectiveLabelWidth = _ref2.effectiveLabelWidth,
       effectiveLabelWidth = _ref2.effectiveLabelWidth,
       rest = _objectWithoutProperties(_ref2, _excluded2);
       rest = _objectWithoutProperties(_ref2, _excluded2);
 
 
-  // if (schema.hidden) {
-  //   return null;
-  // }
-  // 样式的逻辑全放在这层
+  if (schema.hidden) {
+    return null;
+  } // 样式的逻辑全放在这层
   // displayType 一层层网上找值
   // displayType 一层层网上找值
+
+
   var _displayType = schema.displayType || rest.displayType || displayType || 'column';
   var _displayType = schema.displayType || rest.displayType || displayType || 'column';
 
 
+  var _labelAlign = schema.labelAlign || rest.labelAlign || labelAlign || 'right';
+
   var isList = isListType(schema);
   var isList = isListType(schema);
   var isObj = isObjType(schema);
   var isObj = isObjType(schema);
   var isComplex = isObj || isList;
   var isComplex = isObj || isList;
@@ -215,7 +225,7 @@ var CoreRender = function CoreRender(_ref2) {
     } else if (_displayType === 'row') {
     } else if (_displayType === 'row') {
       // row specific className
       // row specific className
       containerClass += '';
       containerClass += '';
-      labelClass += ' fr-label-row';
+      labelClass += " fr-label-row ".concat(_labelAlign === 'right' ? 'fr-label-align-right' : 'fr-label-align-left');
       contentClass += ' fr-content-row';
       contentClass += ' fr-content-row';
 
 
       if (!isObj && !isCheckBox) {
       if (!isObj && !isCheckBox) {
@@ -293,6 +303,7 @@ var CoreRender = function CoreRender(_ref2) {
     dataIndex: dataIndex,
     dataIndex: dataIndex,
     errorFields: errorFields,
     errorFields: errorFields,
     displayType: _displayType,
     displayType: _displayType,
+    labelAlign: _labelAlign,
     hideTitle: hideTitle
     hideTitle: hideTitle
   }, item.children));
   }, item.children));
   var listChildren = /*#__PURE__*/React.createElement(RenderList, {
   var listChildren = /*#__PURE__*/React.createElement(RenderList, {
@@ -320,7 +331,8 @@ var CoreRender = function CoreRender(_ref2) {
     style: columnStyle,
     style: columnStyle,
     className: "".concat(containerClass, " ").concat(debugCss ? 'debug' : '')
     className: "".concat(containerClass, " ").concat(debugCss ? 'debug' : '')
   }, /*#__PURE__*/React.createElement(RenderField, fieldProps, _children));
   }, /*#__PURE__*/React.createElement(RenderField, fieldProps, _children));
-};
+}; // haven't used
+
 
 
 var areEqual = function areEqual(prev, current) {
 var areEqual = function areEqual(prev, current) {
   if (prev.allTouched !== current.allTouched) {
   if (prev.allTouched !== current.allTouched) {
@@ -339,6 +351,24 @@ var areEqual = function areEqual(prev, current) {
     return false;
     return false;
   }
   }
 
 
+  if (prev.readOnly !== current.readOnly) {
+    return false;
+  }
+
+  if (prev.disabled !== current.disabled) {
+    return false;
+  }
+
+  if (prev.schema && current.schema) {
+    if (prev.schema.$id === '#') {
+      return false;
+    }
+  }
+
+  if (isObjType(prev.schema) && isObjType(current.schema)) {
+    return false;
+  }
+
   if (JSON.stringify(prev.dependValues) !== JSON.stringify(current.dependValues)) {
   if (JSON.stringify(prev.dependValues) !== JSON.stringify(current.dependValues)) {
     return false;
     return false;
   }
   }
@@ -350,5 +380,4 @@ var areEqual = function areEqual(prev, current) {
   return false;
   return false;
 };
 };
 
 
-var MCore = /*#__PURE__*/React.memo(CoreRender, areEqual);
 export default Core;
 export default Core;

@@ -76,6 +76,7 @@ export var transformProps = function transformProps(props) {
   };
   };
 
 
   if (trigger && typeof trigger === 'string') {
   if (trigger && typeof trigger === 'string') {
+    controlProps.onChange = _onChange;
     controlProps[trigger] = _onChange;
     controlProps[trigger] = _onChange;
   } else {
   } else {
     controlProps.onChange = _onChange;
     controlProps.onChange = _onChange;

@@ -16,7 +16,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 
-import { useReducer, useContext, useRef, useEffect, useState, createContext } from 'react';
+import { createContext, useContext, useEffect, useReducer, useRef, useState } from 'react';
 export var Ctx = /*#__PURE__*/createContext(function () {});
 export var Ctx = /*#__PURE__*/createContext(function () {});
 export var StoreCtx = /*#__PURE__*/createContext({});
 export var StoreCtx = /*#__PURE__*/createContext({});
 export var Store2Ctx = /*#__PURE__*/createContext({});
 export var Store2Ctx = /*#__PURE__*/createContext({});

@@ -29,13 +29,56 @@
   align-items: center;
   align-items: center;
   min-height: 32px;
   min-height: 32px;
 }
 }
+.fr-container .fr-item-has-error {
+  border-color: #ff4d4f;
+}
+.fr-container .fr-item-has-error:focus {
+  border-color: #ff7875 !important;
+  box-shadow: 0 0 0 2px rgba(255, 77, 79, 0.2) !important;
+}
+.fr-container .fr-item-has-error:hover {
+  border-color: #ff7875 !important;
+  box-shadow: 0 0 0 2px rgba(255, 77, 79, 0.2) !important;
+}
+.fr-container .fr-item-status-error {
+  border-color: #ff4d4f;
+}
+.fr-container .fr-item-status-error:focus {
+  border-color: #ff7875 !important;
+  box-shadow: 0 0 0 2px rgba(255, 77, 79, 0.2) !important;
+}
+.fr-container .fr-item-status-error:hover {
+  border-color: #ff7875 !important;
+  box-shadow: 0 0 0 2px rgba(255, 77, 79, 0.2) !important;
+}
+.fr-container .fr-item-status-error input[class~='ant-input'] {
+  border-color: #ff4d4f;
+}
+.fr-container .fr-item-status-error input[class~='ant-input']:focus {
+  border-color: #ff7875 !important;
+  box-shadow: 0 0 0 2px rgba(255, 77, 79, 0.2) !important;
+}
+.fr-container .fr-item-status-error input[class~='ant-input']:hover {
+  border-color: #ff7875 !important;
+  box-shadow: 0 0 0 2px rgba(255, 77, 79, 0.2) !important;
+}
+.fr-container .fr-item-status-error div[class~='ant-select-selector'] {
+  border-color: #ff4d4f;
+}
+.fr-container .fr-item-status-error div[class~='ant-select-selector']:focus {
+  border-color: #ff7875 !important;
+  box-shadow: 0 0 0 2px rgba(255, 77, 79, 0.2) !important;
+}
+.fr-container .fr-item-status-error div[class~='ant-select-selector']:hover {
+  border-color: #ff7875 !important;
+  box-shadow: 0 0 0 2px rgba(255, 77, 79, 0.2) !important;
+}
 .fr-container .ant-table-cell .fr-field {
 .fr-container .ant-table-cell .fr-field {
   margin-bottom: 0;
   margin-bottom: 0;
 }
 }
 .fr-container .fr-collapse-object {
 .fr-container .fr-collapse-object {
   margin-bottom: 8px;
   margin-bottom: 8px;
   overflow: hidden;
   overflow: hidden;
-  background: #f7f7f7;
   border-radius: 2px;
   border-radius: 2px;
 }
 }
 .fr-container .fr-collapse-object .ant-collapse-header {
 .fr-container .fr-collapse-object .ant-collapse-header {
@@ -48,14 +91,25 @@
 .fr-container .fr-collapse-object .ant-collapse-arrow {
 .fr-container .fr-collapse-object .ant-collapse-arrow {
   padding-top: 5px !important;
   padding-top: 5px !important;
 }
 }
+.fr-container .fr-collapse-object .fr-collapse-object-child-column {
+  padding: 0 20px;
+}
+.fr-container .fr-collapse-object .fr-collapse-object-child-row {
+  padding: 0 32px;
+}
 .fr-container .fr-label {
 .fr-container .fr-label {
   display: block;
   display: block;
 }
 }
 .fr-container .fr-label-row {
 .fr-container .fr-label-row {
-  text-align: right;
   flex-shrink: 0;
   flex-shrink: 0;
   margin-top: 5px;
   margin-top: 5px;
 }
 }
+.fr-container .fr-label-align-right {
+  text-align: right;
+}
+.fr-container .fr-label-align-left {
+  text-align: left;
+}
 .fr-container .fr-label-column {
 .fr-container .fr-label-column {
   margin-bottom: 4px;
   margin-bottom: 4px;
 }
 }
@@ -73,6 +127,12 @@
   font-size: 14px;
   font-size: 14px;
   font-family: SimSun, sans-serif;
   font-family: SimSun, sans-serif;
 }
 }
+.fr-container .fr-label-required-text {
+  margin: 0 4px 0 0;
+  color: rgba(0, 0, 0, 0.45);
+  font-size: 14px;
+  font-family: SimSun, sans-serif;
+}
 .fr-container .fr-label-title::after {
 .fr-container .fr-label-title::after {
   content: ':';
   content: ':';
   position: relative;
   position: relative;
@@ -80,8 +140,8 @@
   margin: 0 10px 0 2px;
   margin: 0 10px 0 2px;
 }
 }
 .fr-container .fr-label-title.no-colon::after {
 .fr-container .fr-label-title.no-colon::after {
-  content: '';
-  margin: 0;
+  content: ' ';
+  margin: 0 10px 0 2px;
 }
 }
 .fr-container .fr-label-object .fr-label-title {
 .fr-container .fr-label-object .fr-label-title {
   font-size: 16px;
   font-size: 16px;
@@ -235,10 +295,6 @@
   cursor: pointer;
   cursor: pointer;
   position: relative;
   position: relative;
 }
 }
-.fr-container .fr-tooltip-toggle:hover .fr-tooltip-container {
-  opacity: 1;
-  visibility: visible;
-}
 .fr-container .fr-tooltip-icon {
 .fr-container .fr-tooltip-icon {
   height: 14px;
   height: 14px;
   width: 14px;
   width: 14px;
@@ -247,57 +303,6 @@
   display: block;
   display: block;
   margin: 4px 0 0 4px;
   margin: 4px 0 0 4px;
 }
 }
-.fr-container .fr-tooltip-container {
-  position: absolute;
-  width: 160px;
-  white-space: initial !important;
-  top: -4px;
-  left: 0;
-  bottom: unset;
-  transform: translateY(-100%);
-  text-align: left;
-  background: #2b222a;
-  padding: 4px;
-  margin-left: -69px;
-  border-radius: 4px;
-  color: #efefef;
-  font-size: 13px;
-  cursor: auto;
-  z-index: 99999;
-  transition: all 0.5s ease;
-  opacity: 0;
-  visibility: hidden;
-  word-wrap: break-word;
-}
-.fr-container .fr-tooltip-triangle {
-  position: absolute;
-  left: 50%;
-  border-left: 5px solid transparent;
-  border-right: 5px solid transparent;
-  border-top: 5px solid #2b222a;
-  transition: all 0.5s ease;
-  content: ' ';
-  font-size: 0;
-  line-height: 0;
-  margin-left: -5px;
-  width: 0;
-  bottom: -5px;
-}
-.fr-container .fr-tooltip-toggle::before,
-.fr-container .fr-tooltip-toggle::after {
-  color: #efefef;
-  font-size: 13px;
-  opacity: 0;
-  pointer-events: none;
-  text-align: center;
-}
-.fr-container .fr-tooltip-toggle:focus::before,
-.fr-container .fr-tooltip-toggle:focus::after,
-.fr-container .fr-tooltip-toggle:hover::before,
-.fr-container .fr-tooltip-toggle:hover::after {
-  opacity: 1;
-  transition: all 0.75s ease;
-}
 .fr-container .fr-slider {
 .fr-container .fr-slider {
   display: flex;
   display: flex;
   width: 100%;
   width: 100%;
@@ -314,14 +319,6 @@
   background-color: rgba(255, 77, 79, 0.2);
   background-color: rgba(255, 77, 79, 0.2);
 }
 }
 .fr-container .fr-theme-card-wrap {
 .fr-container .fr-theme-card-wrap {
-  background-color: #fff;
-  padding: 36px 40px;
-  margin-bottom: 24px;
-  border-radius: 4px;
-  display: flex;
-  justify-content: space-between;
-}
-.fr-container .fr-theme-card-wrap .fr-theme-card-title {
-  font-size: 16px;
   margin-bottom: 16px;
   margin-bottom: 16px;
+  width: 100%;
 }
 }

+import * as React from 'react';
+export interface Error {
+  /** 错误的数据路径 */
+  name: string;
+  /** 错误的内容 */
+  error: string[];
+}
+export interface FormParams {
+  formData?: any;
+  onChange?: (data: any) => void;
+  onValidate?: (valid: any) => void;
+  showValidate?: boolean;
+  /** 数据分析接口，表单展示完成渲染时触发 */
+  logOnMount?: (stats: any) => void;
+  /** 数据分析接口，表单提交成功时触发，获得本次表单填写的总时长 */
+  logOnSubmit?: (stats: any) => void;
+}
+
+export interface ValidateParams {
+  formData: any;
+  schema: any;
+  error: Error[];
+  [k: string]: any;
+}
+
+export interface ResetParams {
+  formData?: any;
+  submitData?: any;
+  errorFields?: Error[];
+  touchedKeys?: any[];
+  allTouched?: boolean;
+  [k: string]: any;
+}
+
+export interface FormInstance {
+  formData: any;
+  schema: any;
+  flatten: any;
+  touchedKeys: string[];
+  touchKey: (key: string) => void;
+  onItemChange: (path: string, value: any) => void;
+  setValueByPath: (path: string, value: any) => void;
+  getSchemaByPath: (path: string) => object;
+  setSchemaByPath: (path: string, value: any) => void;
+  setSchema: (settings: any) => void;
+  setValues: (formData: any) => void;
+  getValues: () => any;
+  resetFields: (options?: ResetParams) => void;
+  submit: () => Promise<void> | Promise<any[]>;
+  submitData: any;
+  errorFields: Error[];
+  isValidating: boolean;
+  outsideValidating: boolean;
+  isSubmitting: boolean;
+  endValidating: () => void;
+  endSubmitting: () => void;
+  setErrorFields: (error: Error[]) => void;
+  removeErrorField: (path: string) => void;
+  removeTouched: (path: string) => void;
+  changeTouchedKeys: (pathArray: string[]) => void;
+  isEditing: boolean;
+  setEditing: (status: boolean) => void;
+  syncStuff: (args: any) => void;
+  /** 折中升级方案中使用到，正常用不到 */
+  init: () => void;
+  /** 数据分析接口，表单展示完成渲染时触发 */
+  logOnMount: (args: any) => void;
+  /** 数据分析接口，表单提交成功时触发，获得本次表单填写的总时长 */
+  logOnSubmit: (args: any) => void;
+  _setErrors: (args: any) => void;
+  validateFields: (nameList?: string[]) => Promise<any>;
+  isFieldTouched: (name: string) => boolean;
+  isFieldsTouched: (nameList?: string[], allTouched?: boolean) => boolean;
+  isFieldValidating: (name: string) => boolean;
+  scrollToPath: (name: string) => void;
+  getFieldError: (name: string) => string[];
+  getFieldsError: (nameList?: string[]) => Error[];
+  setFields: (nameList: string[]) => void;
+}
+
+export type WatchProperties = {
+  [path: string]:
+    | {
+        handler: (value: any) => void;
+        immediate?: boolean;
+      }
+    | ((value: any) => void);
+};
+
+export interface FRProps {
+  /** 表单 id */
+  id?: string | number;
+  /** 表单顶层的className */
+  className?: string;
+  /** 表单顶层的样式 */
+  style?: any;
+  /** 表单 schema */
+  schema: any;
+  /** form单例 */
+  form: FormInstance;
+  /** 组件和schema的映射规则 */
+  mapping?: any;
+  /** 自定义组件 */
+  widgets?: any;
+  /** 表单提交前钩子 */
+  displayType?: string;
+  /** 只读模式 */
+  readOnly?: boolean;
+  /** 禁用模式 */
+  disabled?: boolean;
+  /** 标签宽度 */
+  labelWidth?: string | number;
+  /** antd的全局config */
+  configProvider?: any;
+  theme?: string | number;
+  /** 覆盖默认的校验信息 */
+  validateMessages?: any;
+  /** 显示当前表单内部状态 */
+  debug?: boolean;
+  /** 显示css布局提示线 */
+  debugCss?: boolean;
+  locale?: string;
+  column?: number;
+  debounceInput?: boolean;
+  size?: string;
+  // 数据会作为 beforeFinish 的第四个参数传入
+  config?: any;
+  // 类似于 vuejs 的 watch 的用法，监控值的变化，触发 callback
+  watch?: WatchProperties;
+  /** 对象组件是否折叠（全局的控制） */
+  allCollapsed?: boolean;
+  /** 表单的全局共享属性 */
+  globalProps?: any;
+  /** 表单首次加载钩子 */
+  onMount?: () => void;
+  /** 表单提交前钩子 */
+  beforeFinish?: (params: ValidateParams) => Error[] | Promise<Error[]>;
+  /** 表单提交后钩子 */
+  onFinish?: (formData: any, error: Error[]) => void;
+  /** 时时与外部更新同步的钩子 */
+  onValuesChange?: (changedValues: any, formData: any) => void;
+  /** 隐藏的数据是否去掉，默认不去掉（false） */
+  removeHiddenData?: boolean;
+}
+
+declare const FR: React.FC<FRProps>;
+
+export declare function useForm(params?: FormParams): FormInstance;
+
+export type ConnectedForm<T> = T & {
+  form: FormInstance;
+};
+
+export declare function connectForm<T extends {} = any>(
+  component: React.ComponentType<ConnectedForm<T>>
+): React.ComponentType<T>;
+
+export default FR;

+var _excluded = ["id", "widgets", "layoutWidgets", "mapping", "form", "className", "style", "beforeFinish", "onFinish", "displayType", "labelAlign", "colon", "schema", "debug", "debugCss", "locale", "debounceInput", "size", "configProvider", "theme", "validateMessages", "watch", "config", "onMount", "labelWidth", "readOnly", "disabled", "allCollapsed", "onValuesChange", "column", "removeHiddenData", "globalProps", "methods", "renderTitle", "requiredMark"],
+    _excluded2 = ["onItemChange", "setEditing", "touchKey", "setValueByPath", "getSchemaByPath", "setSchemaByPath", "setSchema", "setValues", "getValues", "resetFields", "submit", "endValidating", "endSubmitting", "setErrorFields", "removeErrorField", "removeTouched", "changeTouchedKeys", "syncStuff", "logOnMount", "logOnSubmit", "setFirstMount", "_setErrors"],
+    _excluded3 = ["isOldVersion", "schema"];
+
+function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
+/* eslint-disable react-hooks/exhaustive-deps */
+import React, { useEffect, useMemo, useRef } from 'react';
+import "./atom.css";
+import Core from './core';
+import { Ctx, Store2Ctx, StoreCtx } from './hooks';
+import "./index.css";
+import { mapping as defaultMapping } from './mapping';
+import { getParamByName, msToTime, updateSchemaToNewVersion, yymmdd } from './utils';
+import Watcher from './Watcher';
+
+var defaultFinish = function defaultFinish(data, errors) {
+  console.log('onFinish:', {
+    data: data,
+    errors: errors
+  });
+};
+
+export { default as connectForm } from './connectForm';
+export { createWidget } from './createWidget';
+export { default as useForm } from './useForm';
+export { defaultMapping as mapping };
+
+function App(_ref) {
+  var id = _ref.id,
+      widgets = _ref.widgets,
+      layoutWidgets = _ref.layoutWidgets,
+      mapping = _ref.mapping,
+      form = _ref.form,
+      className = _ref.className,
+      style = _ref.style,
+      beforeFinish = _ref.beforeFinish,
+      _ref$onFinish = _ref.onFinish,
+      onFinish = _ref$onFinish === void 0 ? defaultFinish : _ref$onFinish,
+      _ref$displayType = _ref.displayType,
+      displayType = _ref$displayType === void 0 ? 'column' : _ref$displayType,
+      _ref$labelAlign = _ref.labelAlign,
+      labelAlign = _ref$labelAlign === void 0 ? 'right' : _ref$labelAlign,
+      _ref$colon = _ref.colon,
+      colon = _ref$colon === void 0 ? true : _ref$colon,
+      schema = _ref.schema,
+      debug = _ref.debug,
+      debugCss = _ref.debugCss,
+      _ref$locale = _ref.locale,
+      locale = _ref$locale === void 0 ? 'cn' : _ref$locale,
+      _ref$debounceInput = _ref.debounceInput,
+      debounceInput = _ref$debounceInput === void 0 ? false : _ref$debounceInput,
+      size = _ref.size,
+      configProvider = _ref.configProvider,
+      theme = _ref.theme,
+      validateMessages = _ref.validateMessages,
+      _ref$watch = _ref.watch,
+      watch = _ref$watch === void 0 ? {} : _ref$watch,
+      config = _ref.config,
+      onMount = _ref.onMount,
+      labelWidth = _ref.labelWidth,
+      readOnly = _ref.readOnly,
+      disabled = _ref.disabled,
+      _ref$allCollapsed = _ref.allCollapsed,
+      allCollapsed = _ref$allCollapsed === void 0 ? false : _ref$allCollapsed,
+      onValuesChange = _ref.onValuesChange,
+      column = _ref.column,
+      _ref$removeHiddenData = _ref.removeHiddenData,
+      removeHiddenData = _ref$removeHiddenData === void 0 ? false : _ref$removeHiddenData,
+      _ref$globalProps = _ref.globalProps,
+      globalProps = _ref$globalProps === void 0 ? {} : _ref$globalProps,
+      _ref$methods = _ref.methods,
+      methods = _ref$methods === void 0 ? {} : _ref$methods,
+      renderTitle = _ref.renderTitle,
+      requiredMark = _ref.requiredMark,
+      rest = _objectWithoutProperties(_ref, _excluded);
+
+  try {
+    var _ = form.submit;
+  } catch (error) {
+    console.error('form 为必填 props，<FormRender /> 没有接收到 form 属性!');
+  }
+
+  var _column = schema && schema.column || column;
+
+  var onItemChange = form.onItemChange,
+      setEditing = form.setEditing,
+      touchKey = form.touchKey,
+      setValueByPath = form.setValueByPath,
+      getSchemaByPath = form.getSchemaByPath,
+      setSchemaByPath = form.setSchemaByPath,
+      setSchema = form.setSchema,
+      setValues = form.setValues,
+      getValues = form.getValues,
+      resetFields = form.resetFields,
+      submit = form.submit,
+      endValidating = form.endValidating,
+      endSubmitting = form.endSubmitting,
+      setErrorFields = form.setErrorFields,
+      removeErrorField = form.removeErrorField,
+      removeTouched = form.removeTouched,
+      changeTouchedKeys = form.changeTouchedKeys,
+      syncStuff = form.syncStuff,
+      logOnMount = form.logOnMount,
+      logOnSubmit = form.logOnSubmit,
+      setFirstMount = form.setFirstMount,
+      _setErrors = form._setErrors,
+      valuesThatWillChange = _objectWithoutProperties(form, _excluded2);
+
+  var submitData = valuesThatWillChange.submitData,
+      errorFields = valuesThatWillChange.errorFields,
+      isValidating = valuesThatWillChange.isValidating,
+      outsideValidating = valuesThatWillChange.outsideValidating,
+      isSubmitting = valuesThatWillChange.isSubmitting,
+      formData = valuesThatWillChange.formData,
+      flatten = valuesThatWillChange.flatten,
+      showValidate = valuesThatWillChange.showValidate,
+      firstMount = valuesThatWillChange.firstMount;
+  useEffect(function () {
+    // Schema最外层的type是object来判断，没有的话，认为schema没有传
+    if (schema && schema.type) {
+      setFirstMount(true);
+      syncStuff({
+        schema: schema,
+        locale: locale,
+        validateMessages: validateMessages,
+        beforeFinish: beforeFinish,
+        onMount: onMount,
+        removeHiddenData: removeHiddenData
+      });
+    } else {}
+  }, [JSON.stringify(schema)]);
+  useEffect(function () {
+    if (!firstMount && schema && schema.type) {
+      if (typeof onMount === 'function') {
+        // 等一下 useForm 里接到第一份schema时，计算第一份data的骨架
+        setTimeout(function () {
+          onMount();
+        }, 0);
+      }
+
+      setTimeout(onMountLogger, 0);
+    }
+  }, [JSON.stringify(schema), firstMount]);
+
+  var onMountLogger = function onMountLogger() {
+    var start = new Date().getTime();
+
+    if (typeof logOnMount === 'function' || typeof logOnSubmit === 'function') {
+      sessionStorage.setItem('FORM_MOUNT_TIME', start);
+      sessionStorage.setItem('FORM_START', start);
+    }
+
+    if (typeof logOnMount === 'function') {
+      var logParams = {
+        schema: schema,
+        url: location.href,
+        formData: JSON.stringify(form.getValues()),
+        formMount: yymmdd(start)
+      };
+
+      if (id) {
+        logParams.id = id;
+      }
+
+      logOnMount(logParams);
+    } // 如果是要计算时间，在 onMount 时存一个时间戳
+
+
+    if (typeof logOnSubmit === 'function') {
+      sessionStorage.setItem('NUMBER_OF_SUBMITS', 0);
+      sessionStorage.setItem('FAILED_ATTEMPTS', 0);
+    }
+  }; // 组件 destroy 的时候，destroy form，因为useForm可能在上层，所以不一定会跟着destroy
+
+
+  useEffect(function () {
+    return function () {
+      form.resetFields();
+    };
+  }, []);
+  var store = useMemo(function () {
+    return _objectSpread(_objectSpread({}, valuesThatWillChange), {}, {
+      globalProps: globalProps
+    }, rest);
+  }, [JSON.stringify(flatten), JSON.stringify(formData), JSON.stringify(errorFields), JSON.stringify(globalProps)]); // 不常用的context单独放一个地方
+
+  var store2 = useMemo(function () {
+    return {
+      displayType: displayType,
+      labelAlign: labelAlign,
+      colon: colon,
+      theme: theme,
+      column: _column,
+      debounceInput: debounceInput,
+      debug: debug,
+      labelWidth: labelWidth,
+      locale: locale,
+      validateMessages: validateMessages,
+      readOnly: readOnly,
+      disabled: disabled,
+      allCollapsed: allCollapsed,
+      showValidate: showValidate,
+      watch: watch
+    };
+  }, [displayType, labelAlign, colon, theme, _column, debounceInput, debug, labelWidth, locale, validateMessages, readOnly, disabled, allCollapsed, showValidate, watch]);
+  var tools = useMemo(function () {
+    return _objectSpread({
+      widgets: widgets,
+      layoutWidgets: layoutWidgets,
+      mapping: _objectSpread(_objectSpread({}, defaultMapping), mapping),
+      onValuesChange: onValuesChange,
+      renderTitle: renderTitle,
+      requiredMark: requiredMark,
+      methods: methods
+    }, form);
+  }, [widgets]);
+  useEffect(function () {
+    // 需要外部校验的情况，此时 submitting 还是 false
+    if (outsideValidating === true) {
+      Promise.resolve(beforeFinish(_objectSpread({
+        data: submitData,
+        schema: schema,
+        errors: errorFields
+      }, config))).then(function (error) {
+        if (error) {
+          setErrorFields(error);
+        }
+
+        endValidating();
+      });
+      return;
+    } // 如果validation结束，submitting开始
+
+
+    if (isValidating === false && isSubmitting === true) {
+      endSubmitting();
+      onFinish(submitData, errorFields);
+
+      if (typeof logOnSubmit === 'function') {
+        var start = sessionStorage.getItem('FORM_START');
+        var mount = sessionStorage.getItem('FORM_MOUNT_TIME');
+        var numberOfSubmits = Number(sessionStorage.getItem('NUMBER_OF_SUBMITS')) + 1;
+        var end = new Date().getTime();
+        var failedAttempts = Number(sessionStorage.getItem('FAILED_ATTEMPTS'));
+
+        if (errorFields.length > 0) {
+          failedAttempts = failedAttempts + 1;
+        }
+
+        var logParams = {
+          formMount: yymmdd(mount),
+          ms: end - start,
+          duration: msToTime(end - start),
+          numberOfSubmits: numberOfSubmits,
+          failedAttempts: failedAttempts,
+          url: location.href,
+          formData: JSON.stringify(submitData),
+          errors: JSON.stringify(errorFields),
+          schema: JSON.stringify(schema)
+        };
+
+        if (id) {
+          logParams.id = id;
+        }
+
+        logOnSubmit(logParams);
+        sessionStorage.setItem('FORM_START', end);
+        sessionStorage.setItem('NUMBER_OF_SUBMITS', numberOfSubmits);
+        sessionStorage.setItem('FAILED_ATTEMPTS', failedAttempts);
+      }
+    }
+  }, [isValidating, isSubmitting, outsideValidating]); // TODO: fk doesn't work
+
+  var sizeCls = '';
+
+  if (size === 'small') {
+    sizeCls = 'fr-form-small';
+  } else if (size === 'large') {
+    sizeCls = 'fr-form-large';
+  }
+
+  var rootProps = {
+    className: "fr-container ".concat(sizeCls, " ").concat(className || '')
+  };
+
+  if (style && _typeof(style) === 'object') {
+    rootProps.style = style;
+  }
+
+  if (id && ['number', 'string'].indexOf(_typeof(id)) > -1) {
+    rootProps.id = id;
+  }
+
+  var debugForm = getParamByName('_debug_form');
+  var debugFormCss = getParamByName('_debug_form_css');
+  var isPre = location.href.indexOf('pre') > -1;
+  var watchList = Object.keys(watch);
+  return /*#__PURE__*/React.createElement(StoreCtx.Provider, {
+    value: store
+  }, /*#__PURE__*/React.createElement(Store2Ctx.Provider, {
+    value: store2
+  }, /*#__PURE__*/React.createElement(Ctx.Provider, {
+    value: tools
+  }, /*#__PURE__*/React.createElement("div", rootProps, isPre && debugForm || debug ? /*#__PURE__*/React.createElement("div", {
+    className: "mv2 bg-black-05 pa2 br2"
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      display: 'flex'
+    }
+  }, /*#__PURE__*/React.createElement("span", null, "formData:"), /*#__PURE__*/React.createElement("span", {
+    style: {
+      display: 'inline-block',
+      wordBreak: 'break-all',
+      whiteSpace: 'pre-wrap',
+      maxWidth: 600
+    }
+  }, JSON.stringify(form.formData, null, 4))), /*#__PURE__*/React.createElement("div", null, 'errorFields:' + JSON.stringify(form.errorFields)), /*#__PURE__*/React.createElement("div", null, 'touchedKeys:' + JSON.stringify(form.touchedKeys)), /*#__PURE__*/React.createElement("div", null, 'allTouched:' + JSON.stringify(form.allTouched)), /*#__PURE__*/React.createElement("div", null, 'descriptor:' + JSON.stringify(window.descriptor))) : null, watchList.length > 0 ? watchList.map(function (item, idx) {
+    return /*#__PURE__*/React.createElement(Watcher, {
+      key: idx.toString(),
+      watchKey: item,
+      watch: watch,
+      formData: formData,
+      firstMount: firstMount
+    });
+  }) : null, /*#__PURE__*/React.createElement(Core, {
+    debugCss: isPre && debugFormCss || debugCss
+  })))));
+}
+
+var Wrapper = function Wrapper(props) {
+  var _ref2 = props || {},
+      _ref2$isOldVersion = _ref2.isOldVersion,
+      isOldVersion = _ref2$isOldVersion === void 0 ? true : _ref2$isOldVersion,
+      schema = _ref2.schema,
+      rest = _objectWithoutProperties(_ref2, _excluded3);
+
+  var _schema = useRef(schema);
+
+  if (isOldVersion) {
+    _schema.current = updateSchemaToNewVersion(schema);
+  }
+
+  return /*#__PURE__*/React.createElement(App, _extends({
+    schema: _schema.current
+  }, rest));
+};
+
+export default Wrapper;

+export var mapping = {
+  default: 'input',
+  string: 'input',
+  array: 'list',
+  boolean: 'checkbox',
+  integer: 'number',
+  number: 'number',
+  object: 'map',
+  html: 'html',
+  'string:upload': 'upload',
+  'string:url': 'url',
+  'string:dateTime': 'date',
+  'string:date': 'date',
+  'string:year': 'date',
+  'string:month': 'date',
+  'string:week': 'date',
+  'string:quarter': 'date',
+  'string:time': 'time',
+  'string:textarea': 'textarea',
+  'string:color': 'color',
+  'string:image': 'imageInput',
+  'range:time': 'timeRange',
+  'range:dateTime': 'dateRange',
+  'range:date': 'dateRange',
+  'range:year': 'dateRange',
+  'range:month': 'dateRange',
+  'range:week': 'dateRange',
+  'range:quarter': 'dateRange',
+  '*?enum': 'radio',
+  '*?enum_long': 'select',
+  'array?enum': 'checkboxes',
+  'array?enum_long': 'multiSelect',
+  '*?readOnly': 'html' // TODO: html widgets for list / object
+
+};
+export function getWidgetName(schema) {
+  var _mapping = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : mapping;
+
+  var type = schema.type,
+      format = schema.format,
+      enums = schema.enum,
+      readOnly = schema.readOnly,
+      widget = schema.widget; // 如果已经注明了渲染widget，那最好
+  // if (schema['ui:widget']) {
+  //   return schema['ui:widget'];
+  // }
+
+  var list = [];
+
+  if (readOnly) {
+    list.push("".concat(type, "?readOnly"));
+    list.push('*?readOnly');
+  }
+
+  if (enums) {
+    // 根据enum长度来智能选择控件
+    if (Array.isArray(enums) && (type === 'array' && enums.length > 6 || type !== 'array' && enums.length > 2)) {
+      list.push("".concat(type, "?enum_long"));
+      list.push('*?enum_long');
+    } else {
+      list.push("".concat(type, "?enum")); // array 默认使用list，array?enum 默认使用checkboxes，*?enum 默认使用select
+
+      list.push('*?enum');
+    }
+  }
+
+  var _widget = widget || format;
+
+  if (_widget) {
+    list.push("".concat(type, ":").concat(_widget));
+  }
+
+  list.push(type); // 放在最后兜底，其他都不match时使用type默认的组件
+
+  var found = '';
+  list.some(function (item) {
+    found = _mapping[item];
+    return !!found;
+  });
+  return found;
+}
+export var extraSchemaList = {
+  checkbox: {
+    valuePropName: 'checked'
+  },
+  switch: {
+    valuePropName: 'checked'
+  }
+};

@@ -4,13 +4,12 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 
-import { removeEmptyItemFromList, cleanEmpty, removeHiddenFromResult } from './utils';
-import { unset, get, set } from 'lodash-es';
-import { isObject, clone } from './utils'; // 提交前需要先处理formData的逻辑
+import { get, set, unset } from 'lodash-es';
+import { cleanEmpty, clone, isObject, removeEmptyItemFromList, removeHiddenFromResult } from './utils'; // 提交前需要先处理formData的逻辑
 
 
 export var processData = function processData(data, flatten, removeHiddenData) {
 export var processData = function processData(data, flatten, removeHiddenData) {
-  // 1. 去掉 hidden = true 的元素
-  var _data = clone(data);
+  var _data = clone(data); // 1. 去掉 hidden = true 的元素
+
 
 
   if (removeHiddenData) {
   if (removeHiddenData) {
     _data = removeHiddenFromResult(data, flatten);
     _data = removeHiddenFromResult(data, flatten);

-import { useRef, useEffect, useMemo } from 'react';
+import { useEffect, useMemo, useRef } from 'react';
 
 
 function useDebouncedCallback(func, wait, options) {
 function useDebouncedCallback(func, wait, options) {
   var _this = this;
   var _this = this;

@@ -25,12 +25,13 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 
 /* eslint-disable react-hooks/exhaustive-deps */
 /* eslint-disable react-hooks/exhaustive-deps */
-import { useEffect, useRef, useMemo, useState } from 'react';
-import { validateAll } from './validator';
+import { set, sortedUniqBy, get, isEmpty, isFunction } from 'lodash-es';
+import { useEffect, useMemo, useRef, useState } from 'react';
 import { useSet } from './hooks';
 import { useSet } from './hooks';
-import { set, sortedUniqBy } from 'lodash-es';
 import { processData, transformDataWithBind2 } from './processData';
 import { processData, transformDataWithBind2 } from './processData';
-import { generateDataSkeleton, flattenSchema, clone, schemaContainsExpression, parseAllExpression } from './utils';
+import SmoothScroll from 'smooth-scroll';
+import { clone, flattenSchema, generateDataSkeleton, parseAllExpression, schemaContainsExpression, getHiddenData } from './utils';
+import { validateAll } from './validator';
 
 
 var useForm = function useForm(props) {
 var useForm = function useForm(props) {
   var _ref = props || {},
   var _ref = props || {},
@@ -69,7 +70,9 @@ var useForm = function useForm(props) {
     // schema 的转换结构，便于处理
     // schema 的转换结构，便于处理
     finalFlatten: {},
     finalFlatten: {},
     // 表达式等被处理过的flatten，用于渲染
     // 表达式等被处理过的flatten，用于渲染
-    firstMount: true
+    firstMount: true,
+    validatingFields: [] // 在校验状态的表单fields
+
   }),
   }),
       _useSet2 = _slicedToArray(_useSet, 2),
       _useSet2 = _slicedToArray(_useSet, 2),
       state = _useSet2[0],
       state = _useSet2[0],
@@ -100,6 +103,8 @@ var useForm = function useForm(props) {
   var _allErrors = useRef([]); // 内部和外部的错误的合并
   var _allErrors = useRef([]); // 内部和外部的错误的合并
 
 
 
 
+  var _validatingFields = useRef([]);
+
   var innerData = state.formData,
   var innerData = state.formData,
       submitData = state.submitData,
       submitData = state.submitData,
       _state$errorFields = state.errorFields,
       _state$errorFields = state.errorFields,
@@ -176,20 +181,7 @@ var useForm = function useForm(props) {
     setState({
     setState({
       finalFlatten: newFlatten
       finalFlatten: newFlatten
     });
     });
-  }, [JSON.stringify(_flatten.current), JSON.stringify(_data.current), firstMount]);
-  useEffect(function () {
-    if (firstMount) return;
-    validateAll({
-      formData: _data.current,
-      flatten: _finalFlatten.current,
-      isRequired: allTouched,
-      touchedKeys: _touchedKeys.current,
-      locale: localeRef.current,
-      validateMessages: validateMessagesRef.current
-    }).then(function (res) {
-      _setErrors(res);
-    });
-  }, [JSON.stringify(_data.current)]); // All form methods are down here ----------------------------------------------------------------
+  }, [JSON.stringify(_flatten.current), JSON.stringify(_data.current), firstMount]); // All form methods are down here ----------------------------------------------------------------
   // 两个兼容 0.x 的函数
   // 两个兼容 0.x 的函数
 
 
   var _setData = function _setData(data) {
   var _setData = function _setData(data) {
@@ -200,7 +192,8 @@ var useForm = function useForm(props) {
         formData: data
         formData: data
       });
       });
     }
     }
-  };
+  }; // Allow function to get the old value
+
 
 
   var _setErrors = function _setErrors(errors) {
   var _setErrors = function _setErrors(errors) {
     if (typeof _onValidate === 'function') {
     if (typeof _onValidate === 'function') {
@@ -211,9 +204,18 @@ var useForm = function useForm(props) {
       _onValidate(oldFormatErrors);
       _onValidate(oldFormatErrors);
     }
     }
 
 
-    setState({
-      errorFields: errors
-    });
+    if (typeof errors === 'function') {
+      setState(function (_ref4) {
+        var errorFields = _ref4.errorFields;
+        return {
+          errorFields: errors(errorFields)
+        };
+      });
+    } else {
+      setState({
+        errorFields: errors
+      });
+    }
   };
   };
 
 
   var setFirstMount = function setFirstMount(value) {
   var setFirstMount = function setFirstMount(value) {
@@ -228,6 +230,7 @@ var useForm = function useForm(props) {
     }
     }
 
 
     var newKeyList = [].concat(_toConsumableArray(_touchedKeys.current), [key]);
     var newKeyList = [].concat(_toConsumableArray(_touchedKeys.current), [key]);
+    _touchedKeys.current = newKeyList;
     setState({
     setState({
       touchedKeys: newKeyList
       touchedKeys: newKeyList
     });
     });
@@ -238,6 +241,7 @@ var useForm = function useForm(props) {
       return item.indexOf(key) === -1;
       return item.indexOf(key) === -1;
     });
     });
 
 
+    _touchedKeys.current = newTouch;
     setState({
     setState({
       touchedKeys: newTouch
       touchedKeys: newTouch
     });
     });
@@ -272,12 +276,12 @@ var useForm = function useForm(props) {
   // ]
   // ]
 
 
 
 
-  var syncStuff = function syncStuff(_ref4) {
-    var schema = _ref4.schema,
-        locale = _ref4.locale,
-        validateMessages = _ref4.validateMessages,
-        beforeFinish = _ref4.beforeFinish,
-        removeHiddenData = _ref4.removeHiddenData;
+  var syncStuff = function syncStuff(_ref5) {
+    var schema = _ref5.schema,
+        locale = _ref5.locale,
+        validateMessages = _ref5.validateMessages,
+        beforeFinish = _ref5.beforeFinish,
+        removeHiddenData = _ref5.removeHiddenData;
     schemaRef.current = schema;
     schemaRef.current = schema;
     localeRef.current = locale;
     localeRef.current = locale;
     validateMessagesRef.current = validateMessages;
     validateMessagesRef.current = validateMessages;
@@ -357,6 +361,7 @@ var useForm = function useForm(props) {
     newErrorFields = sortedUniqBy(newErrorFields, function (item) {
     newErrorFields = sortedUniqBy(newErrorFields, function (item) {
       return item.name;
       return item.name;
     });
     });
+    _outErrorFields.current = newErrorFields;
     setState({
     setState({
       outErrorFields: newErrorFields
       outErrorFields: newErrorFields
     });
     });
@@ -367,13 +372,69 @@ var useForm = function useForm(props) {
       return item.name.indexOf(path) === -1;
       return item.name.indexOf(path) === -1;
     });
     });
 
 
+    var newOutError = _outErrorFields.current.filter(function (item) {
+      return item.name.indexOf(path) === -1;
+    });
+
     setState({
     setState({
-      outErrorFields: newError
+      errorFields: newError,
+      outErrorFields: newOutError
     });
     });
   };
   };
+  /**
+   * (nameList?: NamePath[], filterFunc?: (meta: { touched: boolean, validating: boolean }) => boolean) => any
+   * 参考rc-field-form中的getFieldsValue
+   * 如果第一个参数为数组类型,则获取nameList数据并且做filterFunc过滤
+   * 如果第一个参数非数组类型,则获取所有数据并做filterFunc过滤
+   *
+   * @returns
+   */
+
+
+  var getValues = function getValues(nameList, filterFunc) {
+    var flatten = _finalFlatten.current;
+    var data = _data.current;
+    var currentData = {};
+    var filterMetaKeys = []; // 当前符合filter条件的key
+
+    if (Array.isArray(nameList)) {
+      nameList.forEach(function (path) {
+        set(currentData, path, get(data, path));
+      });
+    } else {
+      currentData = data;
+    } // 过滤出满足条件的path
+
 
 
-  var getValues = function getValues() {
-    return processData(_data.current, _finalFlatten.current, removeHiddenDataRef.current);
+    if (filterFunc && isFunction(filterFunc)) {
+      if (Array.isArray) {
+        flatten = {};
+        nameList.forEach(function (path) {
+          flatten[path] = get(_finalFlatten.current, path);
+        });
+      }
+
+      var metas = {};
+      Object.keys(flatten).forEach(function (key) {
+        metas[key] = {
+          touched: isFieldTouched(key),
+          validating: isFieldValidating(key)
+        };
+      });
+      filterMetaKeys = Object.keys(metas).filter(function (k) {
+        return filterFunc(metas[k]);
+      }); //  没有filter满足条件的就返回{}
+
+      currentData = {};
+
+      if (!isEmpty(filterMetaKeys)) {
+        filterMetaKeys.forEach(function (key) {
+          set(currentData, key, get(data, key));
+        });
+      }
+    }
+
+    return processData(currentData, _finalFlatten.current, removeHiddenDataRef.current);
   };
   };
 
 
   var setValues = function setValues(newFormData) {
   var setValues = function setValues(newFormData) {
@@ -392,10 +453,14 @@ var useForm = function useForm(props) {
     return validateAll({
     return validateAll({
       formData: _data.current,
       formData: _data.current,
       flatten: _finalFlatten.current,
       flatten: _finalFlatten.current,
-      touchedKeys: [],
-      isRequired: true,
-      locale: localeRef.current,
-      validateMessages: validateMessagesRef.current
+      options: {
+        locale: localeRef.current,
+        validateMessages: validateMessagesRef.current
+      },
+      formInstance: {
+        setFieldValidating: setFieldValidating,
+        removeFieldValidating: removeFieldValidating
+      }
     }).then(function (errors) {
     }).then(function (errors) {
       setState({
       setState({
         errorFields: errors
         errorFields: errors
@@ -438,13 +503,13 @@ var useForm = function useForm(props) {
     });
     });
   };
   };
 
 
-  var resetFields = function resetFields() {
+  var resetFields = function resetFields(options) {
     setState({
     setState({
-      formData: {},
-      submitData: {},
-      errorFields: [],
-      touchedKeys: [],
-      allTouched: false
+      formData: (options === null || options === void 0 ? void 0 : options.formData) || {},
+      submitData: (options === null || options === void 0 ? void 0 : options.submitData) || {},
+      errorFields: (options === null || options === void 0 ? void 0 : options.errorFields) || [],
+      touchedKeys: (options === null || options === void 0 ? void 0 : options.touchedKeys) || [],
+      allTouched: (options === null || options === void 0 ? void 0 : options.allTouched) || false
     });
     });
   };
   };
 
 
@@ -464,6 +529,187 @@ var useForm = function useForm(props) {
     });
     });
   };
   };
 
 
+  var setFieldValidating = function setFieldValidating(namePath) {
+    if (_validatingFields.current.indexOf(namePath) > -1) {
+      return;
+    }
+
+    _validatingFields.current = [].concat(_toConsumableArray(_validatingFields.current), [namePath]);
+  };
+
+  var removeFieldValidating = function removeFieldValidating(namePath) {
+    _validatingFields.current = _validatingFields.current.filter(function (item) {
+      return item !== namePath;
+    });
+  };
+
+  var isFieldValidating = function isFieldValidating(namePath) {
+    return _validatingFields.current.indexOf(namePath) > -1;
+  };
+  /**
+   * 参考rc-field-form 校验不包含外部设置的error
+   * @param {*} nameList
+   * @returns
+   */
+
+
+  var validateFields = function validateFields(nameList) {
+    var data = _data.current;
+
+    if (Array.isArray(nameList)) {
+      set(data, {});
+      nameList.forEach(function (path) {
+        set(data, path, get(_data.current, path));
+      });
+    }
+
+    setState({
+      isValidating: true
+    });
+    return validateAll({
+      formData: data,
+      flatten: _finalFlatten.current,
+      options: {
+        locale: localeRef.current,
+        validateMessages: validateMessagesRef.current
+      },
+      formInstance: {
+        setFieldValidating: setFieldValidating,
+        removeFieldValidating: removeFieldValidating
+      }
+    }).then(function (errors) {
+      setState({
+        isValidating: false,
+        errorFields: errors
+      });
+
+      if (!isEmpty(errors)) {
+        return Promise.reject({
+          errors: errors,
+          data: processData(data, _finalFlatten.current, removeHiddenDataRef.current)
+        });
+      } else {
+        return Promise.resolve(processData(data, _finalFlatten.current, removeHiddenDataRef.current));
+      }
+    });
+  };
+  /**
+   * (nameList?: NamePath[], allTouched?: boolean) => boolean
+   * 参照antd rc-field-form的处理逻辑
+   * 如果入参为空，则返回 是否有表单被触碰过
+   * 如果参数为一个
+   *    当args0 === Array，则返回当前表单list是否 >= 1个表单被触碰过
+   *    否则，args0 ? 返回 是否‘所有’表单被触碰过 ：是否有表单被触碰过
+   * 如果参数为两个
+   *    args1 ? args0中的’所有‘表单都被触碰过： args0中的表单 >= 1个被触碰过
+   * @returns
+   */
+
+
+  function isFieldsTouched() {
+    var argsLen = arguments.length;
+    var namePathList = [];
+    var isAllFieldsTouched = false;
+    var allTouchedKeys = _touchedKeys.current;
+
+    if (argsLen === 0) {
+      return _touchedKeys.current.length > 0;
+    } else if (argsLen === 1) {
+      if (Array.isArray(arguments[0])) {
+        namePathList = arguments[0];
+      } else {
+        return arguments[0] ? allTouched : _touchedKeys.current.length > 0;
+      }
+    } else {
+      namePathList = Array.isArray(arguments[0]) ? arguments[0] : [];
+      isAllFieldsTouched = arguments[1];
+    }
+
+    try {
+      var touchedFunc = function touchedFunc(key) {
+        return allTouchedKeys.indexOf(key) !== -1;
+      };
+
+      return isAllFieldsTouched ? namePathList.every(touchedFunc) : namePathList.some(touchedFunc);
+    } catch (e) {
+      console.error('>>>> isFieldsTouched error, check your input arguments', e);
+    }
+  }
+
+  var isFieldTouched = function isFieldTouched(namePath) {
+    return _touchedKeys.current.indexOf(namePath) > -1;
+  };
+
+  var scrollToPath = function scrollToPath(namePath) {
+    var scroll = new SmoothScroll();
+    var node = document.querySelector("[datapath=\"".concat(namePath, "\"]"));
+
+    if (node) {
+      scroll.animateScroll(node);
+    }
+  };
+
+  var getFieldError = function getFieldError(namePath) {
+    var _allErrors$current$fi;
+
+    return ((_allErrors$current$fi = _allErrors.current.find(function (error) {
+      return error.name === namePath;
+    })) === null || _allErrors$current$fi === void 0 ? void 0 : _allErrors$current$fi.error) || [];
+  };
+
+  var getFieldsError = function getFieldsError(nameList) {
+    if (!nameList || !Array.isArray(nameList)) {
+      return _allErrors.current;
+    }
+
+    return _allErrors.current.filter(function (error) {
+      return nameList.indexOf(error.name) > -1;
+    });
+  };
+  /**
+   * fields: {error?, name, touched?, validating?, value?}
+   * 参照rc-field-form的实现逻辑
+   * @param {*} fields
+   * 设置一组字段状态
+   */
+
+
+  var setFields = function setFields(fields) {
+    // 设置error调用统一的函数，直接设置数组，省去forEach频繁操作
+    var errors = fields.filter(function (field) {
+      return field.error;
+    }).map(function (field) {
+      return {
+        name: field.name,
+        error: field.error
+      };
+    });
+    !isEmpty(errors) && setErrorFields(errors); // 对 value, touched, validating进行设置
+
+    fields.forEach(function (field) {
+      var name = field.name,
+          value = field.value,
+          touched = field.touched,
+          validating = field.validating;
+
+      if ('value' in field) {
+        onItemChange(name, value);
+      }
+
+      if (typeof touched === 'boolean') {
+        touched ? touchKey(name) : removeTouched(name);
+      }
+
+      if (typeof validating === 'boolean') {
+        validating ? setFieldValidating(name) : removeFieldValidating(name);
+      }
+    });
+  };
+
+  var getHiddenValues = function getHiddenValues() {
+    return getHiddenData(_data.current, _finalFlatten.current);
+  };
+
   var form = {
   var form = {
     // state
     // state
     formData: _data.current,
     formData: _data.current,
@@ -483,6 +729,7 @@ var useForm = function useForm(props) {
     setSchema: setSchema,
     setSchema: setSchema,
     setValues: setValues,
     setValues: setValues,
     getValues: getValues,
     getValues: getValues,
+    getHiddenValues: getHiddenValues,
     resetFields: resetFields,
     resetFields: resetFields,
     submit: submit,
     submit: submit,
     init: submit,
     init: submit,
@@ -500,11 +747,23 @@ var useForm = function useForm(props) {
     setEditing: setEditing,
     setEditing: setEditing,
     syncStuff: syncStuff,
     syncStuff: syncStuff,
     showValidate: _showValidate,
     showValidate: _showValidate,
+    validateFields: validateFields,
+    isFieldTouched: isFieldTouched,
+    isFieldsTouched: isFieldsTouched,
+    setFieldValidating: setFieldValidating,
+    removeFieldValidating: removeFieldValidating,
+    isFieldValidating: isFieldValidating,
+    scrollToPath: scrollToPath,
+    getFieldError: getFieldError,
+    getFieldsError: getFieldsError,
+    setFields: setFields,
     // firstMount,
     // firstMount,
     setFirstMount: setFirstMount,
     setFirstMount: setFirstMount,
     // logs
     // logs
     logOnMount: logOnMount,
     logOnMount: logOnMount,
-    logOnSubmit: logOnSubmit
+    logOnSubmit: logOnSubmit,
+    // inner api, DON'T USE
+    _setErrors: _setErrors
   };
   };
   return form;
   return form;
 };
 };

+var _excluded = ["propsSchema"],
+    _excluded2 = ["schema"];
+
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+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) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_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 _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+import { cloneDeep, get, isEmpty, set } from 'lodash-es';
+export function getParamByName(name) {
+  var url = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : window.location.href;
+  name = name.replace(/[\[\]]/g, '\\$&');
+  var regex = new RegExp('[?&]' + name + '(=([^&#]*)|&|#|$)'),
+      results = regex.exec(url);
+  if (!results) return null;
+  if (!results[2]) return '';
+  return decodeURIComponent(results[2].replace(/\+/g, ' '));
+} // export function isUrl(string) {
+//   const protocolRE = /^(?:\w+:)?\/\/(\S+)$/;
+//   // const domainRE = /^[^\s\.]+\.\S{2,}$/;
+//   if (typeof string !== 'string') return false;
+//   return protocolRE.test(string);
+// }
+
+export function isCheckBoxType(schema, readOnly) {
+  if (readOnly) return false;
+  if (schema.widget === 'checkbox') return true;
+
+  if (schema && schema.type === 'boolean') {
+    if (schema.enum) return false;
+    if (schema.widget === undefined) return true;
+    return false;
+  }
+} // a[].b.c => a.b.c
+
+function removeBrackets(string) {
+  if (typeof string === 'string') {
+    return string.replace(/\[\]/g, '');
+  } else {
+    return string;
+  }
+}
+
+export function getParentPath(path) {
+  if (typeof path === 'string') {
+    var pathArr = path.split('.');
+
+    if (pathArr.length === 1) {
+      return '#';
+    }
+
+    pathArr.pop();
+    return pathArr.join('.');
+  }
+
+  return '#';
+}
+export function getValueByPath(formData, path) {
+  if (path === '#' || !path) {
+    return formData || {};
+  } else if (typeof path === 'string') {
+    return get(formData, path);
+  } else {
+    console.error('path has to be a string');
+  }
+} //  path: 'a.b[1].c[0]' => { id: 'a.b[].c[]'  dataIndex: [1,0] }
+
+export function destructDataPath(path) {
+  var id;
+  var dataIndex;
+
+  if (path === '#') {
+    return {
+      id: '#',
+      dataIndex: []
+    };
+  }
+
+  if (typeof path !== 'string') {
+    throw Error("path ".concat(path, " is not a string!!! Something wrong here"));
+  }
+
+  var pattern = /\[[0-9]+\]/g;
+  var matchList = path.match(pattern);
+
+  if (!matchList) {
+    id = path;
+  } else {
+    id = path.replace(pattern, '[]'); // 这个是match下来的结果，可安全处理
+
+    dataIndex = matchList.map(function (item) {
+      return Number(item.substring(1, item.length - 1));
+    });
+  }
+
+  return {
+    id: id,
+    dataIndex: dataIndex
+  };
+} // id: 'a.b[].c[]'  dataIndex: [1,0] =>  'a.b[1].c[0]'
+
+export function getDataPath(id, dataIndex) {
+  if (id === '#') {
+    return id;
+  }
+
+  if (typeof id !== 'string') {
+    throw Error("id ".concat(id, " is not a string!!! Something wrong here"));
+  }
+
+  var _id = id;
+
+  if (Array.isArray(dataIndex)) {
+    // const matches = id.match(/\[\]/g) || [];
+    // const count = matches.length;
+    dataIndex.forEach(function (item) {
+      _id = _id.replace(/\[\]/, "[".concat(item, "]"));
+    });
+  }
+
+  return removeBrackets(_id);
+}
+export function isObjType(schema) {
+  return schema && schema.type === 'object' && schema.properties && !schema.widget;
+}
+export function isBlockType(schema) {
+  return schema && schema.type === 'block' && schema.widget;
+} // TODO: to support case that item is not an object
+
+export function isListType(schema) {
+  return schema && schema.type === 'array' && isObjType(schema.items) && schema.enum === undefined;
+}
+export function orderProperties(properties) {
+  var orderKey = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'order';
+  var orderHash = new Map(); // order不为数字的数据
+
+  var unsortedList = [];
+
+  var insert = function insert(item) {
+    var _item = _slicedToArray(item, 2),
+        value = _item[1];
+
+    if (typeof value[orderKey] !== 'number') {
+      unsortedList.push(item);
+      return;
+    }
+
+    if (orderHash.has(value[orderKey])) {
+      orderHash.get(value[orderKey]).push(item);
+    } else {
+      orderHash.set(value[orderKey], [item]);
+    }
+  };
+
+  properties.forEach(function (item) {
+    return insert(item);
+  });
+  var sortedList = Array.from(orderHash.entries()).sort(function (_ref, _ref2) {
+    var _ref3 = _slicedToArray(_ref, 1),
+        order1 = _ref3[0];
+
+    var _ref4 = _slicedToArray(_ref2, 1),
+        order2 = _ref4[0];
+
+    return order1 - order2;
+  }) // order值越小越靠前
+  .flatMap(function (_ref5) {
+    var _ref6 = _slicedToArray(_ref5, 2),
+        items = _ref6[1];
+
+    return items;
+  });
+  return sortedList.concat(unsortedList);
+} // TODO: more tests to make sure weird & wrong schema won't crush
+
+export function flattenSchema() {
+  var _schema = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
+  var name = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '#';
+  var parent = arguments.length > 2 ? arguments[2] : undefined;
+  var result = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+  // 排序
+  // _schema = orderBy(_schema, item => item.order, ['asc']);
+  var schema = clone(_schema);
+  var _name = name;
+
+  if (!schema.$id) {
+    schema.$id = _name; // path as $id, for easy access to path in schema
+  }
+
+  var children = [];
+
+  if (isObjType(schema)) {
+    orderProperties(Object.entries(schema.properties)).forEach(function (_ref7) {
+      var _ref8 = _slicedToArray(_ref7, 2),
+          key = _ref8[0],
+          value = _ref8[1];
+
+      var _key = isListType(value) ? key + '[]' : key;
+
+      var uniqueName = _name === '#' ? _key : _name + '.' + _key;
+      children.push(uniqueName);
+      flattenSchema(value, uniqueName, _name, result);
+    });
+    schema.properties = {};
+  }
+
+  if (isListType(schema)) {
+    orderProperties(Object.entries(schema.items.properties)).forEach(function (_ref9) {
+      var _ref10 = _slicedToArray(_ref9, 2),
+          key = _ref10[0],
+          value = _ref10[1];
+
+      var _key = isListType(value) ? key + '[]' : key;
+
+      var uniqueName = _name === '#' ? _key : _name + '.' + _key;
+      children.push(uniqueName);
+      flattenSchema(value, uniqueName, _name, result);
+    });
+    schema.items.properties = {};
+  }
+
+  if (schema.type) {
+    result[_name] = {
+      parent: parent,
+      schema: schema,
+      children: children
+    };
+  }
+
+  return result;
+}
+export function getSchemaFromFlatten(flatten) {
+  var path = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '#';
+  var schema = {};
+  var item = clone(flatten[path]);
+
+  if (item) {
+    schema = item.schema; // schema.$id && delete schema.$id;
+
+    if (item.children.length > 0) {
+      item.children.forEach(function (child) {
+        if (!flatten[child]) return;
+        var key = getKeyFromPath(child);
+
+        if (isObjType(schema)) {
+          schema.properties[key] = getSchemaFromFlatten(flatten, child);
+        }
+
+        if (isListType(schema)) {
+          schema.items.properties[key] = getSchemaFromFlatten(flatten, child);
+        }
+      });
+    }
+  }
+
+  return schema;
+}
+
+function stringContains(str, text) {
+  return str.indexOf(text) > -1;
+}
+
+export var isObject = function isObject(a) {
+  return stringContains(Object.prototype.toString.call(a), 'Object');
+};
+export var clone = cloneDeep; // '3' => true, 3 => true, undefined => false
+
+export function isLooselyNumber(num) {
+  if (typeof num === 'number') return true;
+
+  if (typeof num === 'string') {
+    return !Number.isNaN(Number(num));
+  }
+
+  return false;
+}
+export function isCssLength(str) {
+  if (typeof str !== 'string') return false;
+  return str.match(/^([0-9])*(%|px|rem|em)$/i);
+}
+export function isDeepEqual(param1, param2) {
+  if (param1 === undefined && param2 === undefined) return true;else if (param1 === undefined || param2 === undefined) return false;
+  if (param1 === null && param2 === null) return true;else if (param1 === null || param2 === null) return false;else if (param1.constructor !== param2.constructor) return false;
+
+  if (param1.constructor === Array) {
+    if (param1.length !== param2.length) return false;
+
+    for (var i = 0; i < param1.length; i++) {
+      if (param1[i].constructor === Array || param1[i].constructor === Object) {
+        if (!isDeepEqual(param1[i], param2[i])) return false;
+      } else if (param1[i] !== param2[i]) return false;
+    }
+  } else if (param1.constructor === Object) {
+    if (Object.keys(param1).length !== Object.keys(param2).length) return false;
+
+    for (var _i2 = 0; _i2 < Object.keys(param1).length; _i2++) {
+      var key = Object.keys(param1)[_i2];
+
+      if (param1[key] && typeof param1[key] !== 'number' && (param1[key].constructor === Array || param1[key].constructor === Object)) {
+        if (!isDeepEqual(param1[key], param2[key])) return false;
+      } else if (param1[key] !== param2[key]) return false;
+    }
+  } else if (param1.constructor === String || param1.constructor === Number) {
+    return param1 === param2;
+  }
+
+  return true;
+} // export function getFormat(format) {
+//   let dateFormat;
+//   switch (format) {
+//     case 'date':
+//       dateFormat = 'YYYY-MM-DD';
+//       break;
+//     case 'time':
+//       dateFormat = 'HH:mm:ss';
+//       break;
+//     case 'dateTime':
+//       dateFormat = 'YYYY-MM-DD HH:mm:ss';
+//       break;
+//     case 'week':
+//       dateFormat = 'YYYY-w';
+//       break;
+//     case 'year':
+//       dateFormat = 'YYYY';
+//       break;
+//     case 'quarter':
+//       dateFormat = 'YYYY-Q';
+//       break;
+//     case 'month':
+//       dateFormat = 'YYYY-MM';
+//       break;
+//     default:
+//       // dateTime
+//       if (typeof format === 'string') {
+//         dateFormat = format;
+//       } else {
+//         dateFormat = 'YYYY-MM-DD';
+//       }
+//   }
+//   return dateFormat;
+// }
+
+export function hasRepeat(list) {
+  return list.find(function (x, i, self) {
+    return i !== self.findIndex(function (y) {
+      return JSON.stringify(x) === JSON.stringify(y);
+    });
+  });
+}
+export function combineSchema() {
+  var propsSchema = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var uiSchema = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var propList = getChildren(propsSchema);
+  var newList = propList.map(function (p) {
+    var name = p.name;
+    var _p$schema = p.schema,
+        type = _p$schema.type,
+        options = _p$schema.enum,
+        properties = _p$schema.properties,
+        items = _p$schema.items;
+    var isObj = type === 'object' && properties;
+    var isArr = type === 'array' && items && !options; // enum + array 代表的多选框，没有sub
+
+    var ui = name && uiSchema[p.name];
+
+    if (!ui) {
+      return p;
+    } // 如果是list，递归合并items
+
+
+    if (isArr) {
+      var newItems = combineSchema(items, ui.items || {});
+      return _objectSpread(_objectSpread({}, p), {}, {
+        schema: _objectSpread(_objectSpread(_objectSpread({}, p.schema), ui), {}, {
+          items: newItems
+        })
+      });
+    } // object递归合并整个schema
+
+
+    if (isObj) {
+      var newSchema = combineSchema(p.schema, ui);
+      return _objectSpread(_objectSpread({}, p), {}, {
+        schema: newSchema
+      });
+    }
+
+    return _objectSpread(_objectSpread({}, p), {}, {
+      schema: _objectSpread(_objectSpread({}, p.schema), ui)
+    });
+  });
+  var newObj = {};
+  newList.forEach(function (s) {
+    newObj[s.name] = s.schema;
+  });
+  var topLevelUi = {};
+  Object.keys(uiSchema).forEach(function (key) {
+    if (typeof key === 'string' && key.substring(0, 3) === 'ui:') {
+      topLevelUi[key] = uiSchema[key];
+    }
+  });
+
+  if (isEmpty(newObj)) {
+    return _objectSpread(_objectSpread({}, propsSchema), topLevelUi);
+  }
+
+  return _objectSpread(_objectSpread(_objectSpread({}, propsSchema), topLevelUi), {}, {
+    properties: newObj
+  });
+} // export function isEmpty(obj) {
+//   return Object.keys(obj).length === 0;
+// }
+
+function getChildren(schema) {
+  if (!schema) return [];
+  var properties = schema.properties,
+      items = schema.items,
+      type = schema.type;
+
+  if (!properties && !items) {
+    return [];
+  }
+
+  var schemaSubs = {};
+
+  if (type === 'object') {
+    schemaSubs = properties;
+  }
+
+  if (type === 'array') {
+    schemaSubs = items;
+  }
+
+  return Object.keys(schemaSubs).map(function (name) {
+    return {
+      schema: schemaSubs[name],
+      name: name
+    };
+  });
+}
+
+export var parseString = function parseString(string) {
+  return Function('"use strict";return (' + string + ')')();
+};
+export var evaluateString = function evaluateString(string, formData, rootValue) {
+  return Function("\"use strict\";\n    const rootValue = ".concat(JSON.stringify(rootValue), ";\n    const formData = ").concat(JSON.stringify(formData), ";\n    return (").concat(string, ")"))();
+};
+export function isExpression(func) {
+  // if (typeof func === 'function') {
+  //   const funcString = func.toString();
+  //   return (
+  //     funcString.indexOf('formData') > -1 ||
+  //     funcString.indexOf('rootValue') > -1
+  //   );
+  // }
+  if (typeof func !== 'string') return false;
+  var pattern = /^{{(.+)}}$/;
+  var reg1 = /^{{function\(.+}}$/; // const reg2 = /^{{(.+=>.+)}}$/;
+
+  if (typeof func === 'string' && func.match(pattern) && !func.match(reg1)) {
+    return true;
+  }
+
+  return false;
+}
+export var parseRootValueInSchema = function parseRootValueInSchema(schema, rootValue) {
+  var result = clone(schema);
+
+  if (isObject(schema)) {
+    Object.keys(schema).forEach(function (key) {
+      var item = schema[key];
+
+      if (isObject(item)) {
+        result[key] = parseRootValueInSchema(item, rootValue);
+      } else if (typeof item === 'string') {
+        result[key] = parseSingleRootValue(item, rootValue);
+      }
+    });
+  } else {
+    console.error('schema is not an object:', schema);
+  }
+
+  return result;
+}; // handle rootValue inside List
+
+export var parseSingleRootValue = function parseSingleRootValue(expression) {
+  var rootValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+
+  if (typeof expression === 'string' && expression.indexOf('rootValue') > 0) {
+    var funcBody = expression.substring(2, expression.length - 2);
+    var str = "\n    return ".concat(funcBody.replace(/rootValue/g, JSON.stringify(rootValue)));
+
+    try {
+      return Function(str)();
+    } catch (error) {
+      console.error(error, 'expression:', expression, 'rootValue:', rootValue);
+      return null; // 如果计算有错误，return null 最合适
+    }
+  } else {
+    return expression;
+  }
+};
+export function parseSingleExpression(func) {
+  var formData = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var dataPath = arguments.length > 2 ? arguments[2] : undefined;
+  var parentPath = getParentPath(dataPath);
+  var parent = getValueByPath(formData, parentPath) || {};
+
+  if (typeof func === 'string') {
+    var funcBody = func.substring(2, func.length - 2);
+    var str = "\n    return ".concat(funcBody.replace(/formData/g, JSON.stringify(formData)).replace(/rootValue/g, JSON.stringify(parent)));
+
+    try {
+      return Function(str)();
+    } catch (error) {
+      console.log(error, func, dataPath);
+      return null; // 如果计算有错误，return null 最合适
+    } // const funcBody = func.substring(2, func.length - 2);
+    // //TODO: 这样有问题，例如 a.b.indexOf(), 会把 a.b.indexOf 当做值
+    // const match1 = /formData.([a-zA-Z0-9.$_\[\]]+)/g;
+    // const match2 = /rootValue.([a-zA-Z0-9.$_\[\]]+)/g;
+    // const str = `
+    // return (${funcBody
+    //   .replaceAll(match1, (v, m1) =>
+    //     JSON.stringify(getValueByPath(formData, m1))
+    //   )
+    //   .replaceAll(match2, (v, m1) =>
+    //     JSON.stringify(getValueByPath(parent, m1))
+    //   )})`;
+    // try {
+    //   return Function(str)();
+    // } catch (error) {
+    //   console.log(error);
+    //   return func;
+    // }
+
+  } else return func;
+}
+export var schemaContainsExpression = function schemaContainsExpression(schema) {
+  if (isObject(schema)) {
+    return Object.keys(schema).some(function (key) {
+      var value = schema[key];
+
+      if (typeof value === 'string') {
+        return isExpression(value);
+      } else if (isObject(value)) {
+        return schemaContainsExpression(value);
+      } else {
+        return false;
+      }
+    });
+  }
+
+  return false;
+};
+export var parseAllExpression = function parseAllExpression(_schema, formData, dataPath) {
+  var schema = clone(_schema);
+  Object.keys(schema).forEach(function (key) {
+    var value = schema[key];
+
+    if (isObject(value)) {
+      schema[key] = parseAllExpression(value, formData, dataPath);
+    } else if (isExpression(value)) {
+      schema[key] = parseSingleExpression(value, formData, dataPath);
+    } else if (typeof key === 'string' && key.toLowerCase().indexOf('props') > -1) {
+      // 有可能叫 xxxProps
+      var propsObj = schema[key];
+
+      if (isObject(propsObj)) {
+        Object.keys(propsObj).forEach(function (k) {
+          schema[key][k] = parseSingleExpression(propsObj[k], formData, dataPath);
+        });
+      }
+    }
+  });
+  return schema;
+};
+export function isFunctionSchema(schema) {
+  return Object.keys(schema).some(function (key) {
+    if (typeof schema[key] === 'function') {
+      return true;
+    } else if (typeof schema[key] === 'string') {
+      return isExpression(schema[key]);
+    } else if (_typeof(schema[key]) === 'object') {
+      return isFunctionSchema(schema[key]);
+    } else {
+      return false;
+    }
+  });
+}
+export var getParentProps = function getParentProps(propName, id, flatten) {
+  try {
+    var item = flatten[id];
+    if (item.schema[propName] !== undefined) return item.schema[propName];
+
+    if (item && item.parent) {
+      var parentSchema = flatten[item.parent].schema;
+
+      if (parentSchema[propName] !== undefined) {
+        return parentSchema[propName];
+      } else {
+        return getParentProps(propName, item.parent, flatten);
+      }
+    }
+  } catch (error) {
+    return undefined;
+  }
+};
+export var getSaveNumber = function getSaveNumber() {
+  var searchStr = localStorage.getItem('SAVES');
+
+  if (searchStr) {
+    try {
+      var saves = JSON.parse(searchStr);
+      var length = saves.length;
+      if (length) return length + 1;
+    } catch (error) {
+      return 1;
+    }
+  } else {
+    return 1;
+  }
+};
+export function looseJsonParse(obj) {
+  return Function('"use strict";return (' + obj + ')')();
+}
+export var isFunctionString = function isFunctionString(fString) {
+  return typeof fString === 'string' && fString.indexOf('function(') === 0;
+};
+export function parseFunction(fString) {
+  if (isFunctionString(fString)) {
+    return Function('return ' + fString)();
+  }
+
+  return fString;
+} // 获得propsSchema的children
+// function getChildren2(schema) {
+//   if (!schema) return [];
+//   const {
+//     // object
+//     properties,
+//     // array
+//     items,
+//     type,
+//   } = schema;
+//   if (!properties && !items) {
+//     return [];
+//   }
+//   let schemaSubs = {};
+//   if (type === 'object') {
+//     schemaSubs = properties;
+//   }
+//   if (type === 'array') {
+//     schemaSubs = items.properties;
+//   }
+//   return Object.keys(schemaSubs).map(name => ({
+//     schema: schemaSubs[name],
+//     name,
+//   }));
+// }
+
+export var oldSchemaToNew = function oldSchemaToNew(schema) {
+  if (schema && schema.propsSchema) {
+    var propsSchema = schema.propsSchema,
+        rest = _objectWithoutProperties(schema, _excluded);
+
+    return _objectSpread({
+      schema: propsSchema
+    }, rest);
+  }
+
+  return schema;
+};
+export var newSchemaToOld = function newSchemaToOld(setting) {
+  if (setting && setting.schema) {
+    var schema = setting.schema,
+        rest = _objectWithoutProperties(setting, _excluded2);
+
+    return _objectSpread({
+      propsSchema: schema
+    }, rest);
+  }
+
+  return setting;
+}; // from FR
+
+export var getEnum = function getEnum(schema) {
+  if (!schema) return undefined;
+  var itemEnum = schema && schema.items && schema.items.enum;
+  var schemaEnum = schema && schema.enum;
+  return itemEnum ? itemEnum : schemaEnum;
+}; // export const getArray = (arr, defaultValue = []) => {
+//   if (Array.isArray(arr)) return arr;
+//   return defaultValue;
+// };
+
+export var isEmail = function isEmail(value) {
+  var regex = '^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(.[a-zA-Z0-9_-]+)+$';
+
+  if (value && new RegExp(regex).test(value)) {
+    return true;
+  }
+
+  return false;
+};
+export function defaultGetValueFromEvent(valuePropName) {
+  var event = arguments.length <= 1 ? undefined : arguments[1];
+
+  if (event && event.target && valuePropName in event.target) {
+    return event.target[valuePropName];
+  }
+
+  return event;
+}
+export var getKeyFromPath = function getKeyFromPath() {
+  var path = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '#';
+
+  try {
+    var arr = path.split('.');
+    var last = arr.slice(-1)[0];
+    var result = last.replace('[]', '');
+    return result;
+  } catch (error) {
+    console.error(error, 'getKeyFromPath');
+    return '';
+  }
+}; // 更多的值获取
+
+export var getDisplayValue = function getDisplayValue(value, schema) {
+  if (typeof value === 'boolean') {
+    return value ? 'yes' : 'no';
+  }
+
+  if (isObjType(schema) || isListType(schema)) {
+    return '-';
+  }
+
+  if (Array.isArray(schema.enum) && Array.isArray(schema.enumNames)) {
+    try {
+      return schema.enumNames[schema.enum.indexOf(value)];
+    } catch (error) {
+      return value;
+    }
+  }
+
+  if (_typeof(value) === 'object') {
+    return JSON.stringify(value);
+  }
+
+  return value;
+}; // 去掉数组里的空元素 {a: [null, {x:1}]} => {a: [{x:1}]}
+
+export var removeEmptyItemFromList = function removeEmptyItemFromList(formData) {
+  var result = {};
+
+  if (isObject(formData)) {
+    Object.keys(formData).forEach(function (key) {
+      result[key] = removeEmptyItemFromList(formData[key]);
+    });
+  } else if (Array.isArray(formData)) {
+    result = formData.filter(function (item) {
+      if ([false, 0, ''].indexOf(item) > -1) return true;
+
+      if (item && JSON.stringify(item) !== '{}') {
+        return true;
+      }
+
+      return false;
+    });
+  } else {
+    result = formData;
+  }
+
+  return result;
+};
+export var getDescriptorSimple = function getDescriptorSimple() {
+  var schema = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var path = arguments.length > 1 ? arguments[1] : undefined;
+  var result = {};
+
+  if (isObject(schema)) {
+    if (schema.type) {
+      switch (schema.type) {
+        case 'range':
+          result.type = 'array';
+          break;
+
+        case 'html':
+          result.type = 'string';
+          break;
+
+        default:
+          result.type = schema.type;
+          break;
+      }
+    }
+
+    ['pattern', 'min', 'max', 'len', 'required'].forEach(function (key) {
+      if (Object.keys(schema).indexOf(key) > -1) {
+        result[key] = schema[key];
+      }
+    });
+
+    switch (schema.format) {
+      case 'email':
+      case 'url':
+        result.type = schema.format;
+        break;
+
+      default:
+        break;
+    }
+
+    var handleRegx = function handleRegx(desc) {
+      if (desc.pattern && typeof desc.pattern === 'string') {
+        desc.pattern = new RegExp(desc.pattern);
+      }
+
+      return desc;
+    }; // result be array
+
+
+    if (schema.rules) {
+      if (Array.isArray(schema.rules)) {
+        var requiredRule = schema.rules.find(function (rule) {
+          return rule.required === true;
+        });
+
+        if (requiredRule) {
+          result = _objectSpread(_objectSpread({}, result), requiredRule);
+        }
+
+        result = [result].concat(_toConsumableArray(schema.rules));
+        result = result.map(function (r) {
+          return handleRegx(r);
+        });
+      } else if (isObject(schema.rules)) {
+        result = [result, schema.rules];
+        result = result.map(function (r) {
+          return handleRegx(r);
+        });
+      }
+    } else {
+      result = [result];
+    }
+  }
+
+  return _defineProperty({}, path, result);
+}; // _path 只供内部递归使用
+
+export var generateDataSkeleton = function generateDataSkeleton(schema, formData) {
+  var _formData = clone(formData);
+
+  var result = _formData;
+
+  if (isObjType(schema)) {
+    if (_formData === undefined || _typeof(_formData) !== 'object') {
+      _formData = {};
+      result = {};
+    }
+
+    Object.keys(schema.properties).forEach(function (key) {
+      var childSchema = schema.properties[key];
+      var childData = _formData[key];
+      var childResult = generateDataSkeleton(childSchema, childData);
+      result[key] = childResult;
+    });
+  } else if (_formData !== undefined) {// result = _formData;
+  } else if (schema.default !== undefined) {
+    result = clone(schema.default);
+  } else if (isListType(schema)) {
+    result = [generateDataSkeleton(schema.items)];
+  } else if (schema.type === 'boolean' && !schema.widget) {
+    // result = false;
+    result = undefined;
+  } else {
+    result = undefined;
+  }
+
+  return result;
+};
+export var translateMessage = function translateMessage(msg, schema) {
+  if (typeof msg !== 'string') {
+    return '';
+  }
+
+  if (!schema) return msg;
+  msg = msg.replace('${title}', schema.title);
+  msg = msg.replace('${type}', schema.format || schema.type); // 兼容代码
+
+  if (typeof schema.min === 'number') {
+    msg = msg.replace('${min}', schema.min);
+  }
+
+  if (typeof schema.max === 'number') {
+    msg = msg.replace('${max}', schema.max);
+  }
+
+  if (schema.rules) {
+    var minRule = schema.rules.find(function (r) {
+      return r.min !== undefined;
+    });
+
+    if (minRule) {
+      msg = msg.replace('${min}', minRule.min);
+    }
+
+    var maxRule = schema.rules.find(function (r) {
+      return r.max !== undefined;
+    });
+
+    if (maxRule) {
+      msg = msg.replace('${max}', maxRule.max);
+    }
+
+    var lenRule = schema.rules.find(function (r) {
+      return r.len !== undefined;
+    });
+
+    if (lenRule) {
+      msg = msg.replace('${len}', lenRule.len);
+    }
+
+    var patternRule = schema.rules.find(function (r) {
+      return r.pattern !== undefined;
+    });
+
+    if (patternRule) {
+      msg = msg.replace('${pattern}', patternRule.pattern);
+    }
+  }
+
+  return msg;
+};
+
+var changeSchema = function changeSchema(_schema, singleChange) {
+  var schema = clone(_schema);
+  schema = singleChange(schema);
+
+  if (isObjType(schema)) {
+    var requiredKeys = [];
+
+    if (Array.isArray(schema.required)) {
+      requiredKeys = schema.required;
+      delete schema.required;
+    }
+
+    Object.keys(schema.properties).forEach(function (key) {
+      var item = schema.properties[key];
+
+      if (requiredKeys.indexOf(key) > -1) {
+        item.required = true;
+      }
+
+      schema.properties[key] = changeSchema(item, singleChange);
+    });
+  } else if (isListType(schema)) {
+    Object.keys(schema.items.properties).forEach(function (key) {
+      var item = schema.items.properties[key];
+      schema.items.properties[key] = changeSchema(item, singleChange);
+    });
+  }
+
+  return schema;
+};
+
+export var updateSchemaToNewVersion = function updateSchemaToNewVersion(schema) {
+  return changeSchema(schema, updateSingleSchema);
+};
+
+var updateSingleSchema = function updateSingleSchema(schema) {
+  try {
+    schema.rules = schema.rules || [];
+    schema.props = schema.props || {};
+
+    if (schema['ui:options']) {
+      schema.props = schema['ui:options'];
+      delete schema['ui:options'];
+    }
+
+    if (schema.pattern) {
+      var validItem = {
+        pattern: schema.pattern
+      };
+
+      if (schema.message && schema.message.pattern) {
+        validItem.message = schema.message.pattern;
+      }
+
+      schema.rules.push(validItem);
+      delete schema.pattern;
+      delete schema.message;
+    } // min / max
+
+
+    if (schema.minLength) {
+      schema.min = schema.minLength;
+      delete schema.minLength;
+    }
+
+    if (schema.maxLength) {
+      schema.max = schema.maxLength;
+      delete schema.maxLength;
+    }
+
+    if (schema.minItems) {
+      schema.min = schema.minItems;
+      delete schema.minItems;
+    }
+
+    if (schema.maxItems) {
+      schema.max = schema.maxItems;
+      delete schema.maxItems;
+    }
+
+    if (schema.step) {
+      schema.props.step = schema.step;
+      delete schema.step;
+    } // ui:xxx
+
+
+    if (schema['ui:className']) {
+      schema.className = schema['ui:className'];
+      delete schema['ui:className'];
+    }
+
+    if (schema['ui:hidden']) {
+      schema.hidden = schema['ui:hidden'];
+      delete schema['ui:hidden'];
+    }
+
+    if (schema['ui:readonly']) {
+      schema.readOnly = schema['ui:readonly']; // 改成驼峰了
+
+      delete schema['ui:readonly'];
+    }
+
+    if (schema['ui:disabled']) {
+      schema.disabled = schema['ui:disabled'];
+      delete schema['ui:disabled'];
+    }
+
+    if (schema['ui:width']) {
+      schema.width = schema['ui:width'];
+      delete schema['ui:width'];
+    }
+
+    if (schema['ui:displayType']) {
+      schema.displayType = schema['ui:displayType'];
+      delete schema['ui:displayType'];
+    }
+
+    if (schema['ui:column']) {
+      schema.column = schema['ui:column'];
+      delete schema['ui:column'];
+    }
+
+    if (schema['ui:widget']) {
+      schema.widget = schema['ui:widget'];
+      delete schema['ui:widget'];
+    }
+
+    if (schema['ui:labelWidth']) {
+      schema.labelWidth = schema['ui:labelWidth'];
+      delete schema['ui:labelWidth'];
+    }
+
+    if (schema.rules && schema.rules.length === 0) {
+      delete schema.rules;
+    }
+
+    if (typeof schema.props === 'function' || isObject(schema.props) && Object.keys(schema.props).length > 0) {} else {
+      delete schema.props;
+    }
+
+    return schema;
+  } catch (error) {
+    console.error('schema转换失败！', error);
+    return schema;
+  }
+}; // 检验一个string是 function（传统活箭头函数）
+
+
+export var parseFunctionString = function parseFunctionString(string) {
+  if (typeof string !== 'string') return false;
+  var reg1 = /^{{(function.+)}}$/;
+  var reg2 = /^{{(.+=>.+)}}$/;
+
+  if (string.match(reg1)) {
+    return string.match(reg1)[1];
+  }
+
+  if (string.match(reg2)) {
+    return string.match(reg2)[1];
+  }
+
+  return false;
+};
+export var completeSchemaWithTheme = function completeSchemaWithTheme() {
+  var schema = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var theme = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var result = {};
+
+  if (isObject(schema)) {
+    if (schema.theme && theme[schema.theme]) {
+      result = _objectSpread(_objectSpread({}, schema), theme[schema.theme]);
+    }
+
+    Object.keys(schema).forEach(function (key) {
+      result[key] = completeSchemaWithTheme(schema[key], theme);
+    });
+  } else {
+    result = schema;
+  }
+
+  return result;
+};
+export var cleanEmpty = function cleanEmpty(obj) {
+  if (Array.isArray(obj)) {
+    return obj.map(function (v) {
+      return v && isObject(v) ? cleanEmpty(v) : v;
+    }).filter(function (v) {
+      return !(v == undefined);
+    });
+  } else if (isObject(obj)) {
+    return Object.entries(obj).map(function (_ref12) {
+      var _ref13 = _slicedToArray(_ref12, 2),
+          k = _ref13[0],
+          v = _ref13[1];
+
+      return [k, v && isObject(v) ? cleanEmpty(v) : v];
+    }).reduce(function (a, _ref14) {
+      var _ref15 = _slicedToArray(_ref14, 2),
+          k = _ref15[0],
+          v = _ref15[1];
+
+      return v == undefined ? a : (a[k] = v, a);
+    }, {});
+  } else {
+    return obj;
+  }
+}; // const x = { a: 1, b: { c: 2 }, d: [{ e: 3, f: [{ g: 5 }] }, { e: 4 }] };
+// ['a', 'b.c', 'd[0].e', 'd[0].f[0].g', 'd[1].e']
+
+export var dataToKeys = function dataToKeys(data) {
+  var rootKey = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+  var result = [];
+
+  if (rootKey && rootKey.slice(-1) !== ']') {
+    result.push(rootKey);
+  }
+
+  var isComplex = function isComplex(data) {
+    return isObject(data) || Array.isArray(data);
+  };
+
+  if (isObject(data)) {
+    Object.keys(data).forEach(function (key) {
+      var item = data[key];
+      var itemRootKey = rootKey ? rootKey + '.' + key : key;
+
+      if (isComplex(item)) {
+        var itemKeys = dataToKeys(item, itemRootKey);
+        result = [].concat(_toConsumableArray(result), _toConsumableArray(itemKeys));
+      } else {
+        result.push(itemRootKey);
+      }
+    });
+  } else if (Array.isArray(data)) {
+    data.forEach(function (item, idx) {
+      var itemRootKey = rootKey ? "".concat(rootKey, "[").concat(idx, "]") : "[".concat(idx, "]");
+
+      if (isComplex(item)) {
+        var itemKeys = dataToKeys(item, itemRootKey);
+        result = [].concat(_toConsumableArray(result), _toConsumableArray(itemKeys));
+      } else {
+        result.push(itemRootKey);
+      }
+    });
+  } else {}
+
+  return result;
+};
+export var removeHiddenFromResult = function removeHiddenFromResult(data, flatten) {
+  var result = clone(data);
+  var keys = dataToKeys(result);
+  keys.forEach(function (key) {
+    var _destructDataPath = destructDataPath(key),
+        id = _destructDataPath.id;
+
+    if (flatten[id]) {
+      var _ref16 = flatten[id].schema || {},
+          hidden = _ref16.hidden;
+
+      if (isExpression(hidden)) {
+        hidden = parseSingleExpression(hidden, result, key);
+      }
+
+      if (get(result, key) !== undefined && hidden) {
+        set(result, key, undefined);
+      }
+    }
+  });
+  return result;
+};
+export var getHiddenData = function getHiddenData(data, flatten) {
+  var result = clone(data);
+  var hiddenData = {};
+  var keys = dataToKeys(result);
+  keys.forEach(function (key) {
+    var _destructDataPath2 = destructDataPath(key),
+        id = _destructDataPath2.id;
+
+    if (flatten[id]) {
+      var _ref17 = flatten[id].schema || {},
+          hidden = _ref17.hidden;
+
+      if (isExpression(hidden)) {
+        hidden = parseSingleExpression(hidden, result, key);
+      }
+
+      if (hidden) {
+        debugger;
+        hiddenData[key] = result[key];
+      }
+    }
+  });
+  return hiddenData;
+};
+export function msToTime(duration) {
+  var seconds = Math.floor(duration / 1000 % 60);
+  var minutes = Math.floor(duration / (1000 * 60) % 60);
+  var hours = Math.floor(duration / (1000 * 60 * 60) % 24);
+  hours = hours < 10 ? '0' + hours : hours;
+  minutes = minutes < 10 ? '0' + minutes : minutes;
+  seconds = seconds < 10 ? '0' + seconds : seconds;
+  return hours + ':' + minutes + ':' + seconds;
+}
+export function yymmdd(timeStamp) {
+  var date_ob = new Date(Number(timeStamp));
+
+  var adjustZero = function adjustZero(num) {
+    return ('0' + num).slice(-2);
+  };
+
+  var day = adjustZero(date_ob.getDate());
+  var month = adjustZero(date_ob.getMonth());
+  var year = date_ob.getFullYear();
+  var hours = adjustZero(date_ob.getHours());
+  var minutes = adjustZero(date_ob.getMinutes());
+  var seconds = adjustZero(date_ob.getSeconds());
+  return "".concat(year, "-").concat(month, "-").concat(day, " ").concat(hours, ":").concat(minutes, ":").concat(seconds);
+}
+export function allPromiseFinish(promiseList) {
+  var hasError = false;
+  var count = promiseList.length;
+  var results = [];
+
+  if (!promiseList.length) {
+    return Promise.resolve([]);
+  }
+
+  return new Promise(function (resolve, reject) {
+    promiseList.forEach(function (promise, index) {
+      promise.catch(function (e) {
+        hasError = true;
+        return e;
+      }).then(function (result) {
+        count -= 1;
+        results[index] = result;
+
+        if (count > 0) {
+          return;
+        }
+
+        if (hasError) {
+          reject(results);
+        }
+
+        resolve(results);
+      });
+    });
+  });
+}
+export var removeDups = function removeDups(arr) {
+  if (!Array.isArray(arr)) {
+    console.log('in removeDups: param is not an array');
+    return;
+  }
+
+  var array = [];
+
+  for (var i = 0; i < arr.length; i++) {
+    if (array.indexOf(arr[i]) === -1) {
+      array.push(arr[i]);
+    }
+  }
+
+  return array;
+};

@@ -2,7 +2,6 @@ var typeTemplate = '${title} is not a valid ${type}';
 export var defaultValidateMessages = {
 export var defaultValidateMessages = {
   default: 'Validation error on field ${title}',
   default: 'Validation error on field ${title}',
   required: '${title} is required',
   required: '${title} is required',
-  // enum: '${title} must be one of [${enum}]',
   whitespace: '${title} cannot be empty',
   whitespace: '${title} cannot be empty',
   date: {
   date: {
     format: '${title} is invalid for format date',
     format: '${title} is invalid for format date',

@@ -27,7 +27,7 @@ export var defaultValidateMessagesCN = {
     len: '${title}长度不是${len}',
     len: '${title}长度不是${len}',
     min: '${title}长度不能小于${min}',
     min: '${title}长度不能小于${min}',
     max: '${title}长度不能大于${max}',
     max: '${title}长度不能大于${max}',
-    range: '${title}长度需在${min}于${max}之间'
+    range: '${title}长度需在${min}与${max}之间'
   },
   },
   number: {
   number: {
     len: '${title}不等于${len}',
     len: '${title}不等于${len}',
@@ -39,7 +39,7 @@ export var defaultValidateMessagesCN = {
     len: '${title}长度不是${len}',
     len: '${title}长度不是${len}',
     min: '${title}长度不能小于${min}',
     min: '${title}长度不能小于${min}',
     max: '${title}长度不能大于${max}',
     max: '${title}长度不能大于${max}',
-    range: '${title}长度需在${min}于${max}之间'
+    range: '${title}长度需在${min}与${max}之间'
   },
   },
   pattern: {
   pattern: {
     mismatch: '${title}未通过正则判断${pattern}'
     mismatch: '${title}未通过正则判断${pattern}'