Merge branch 'beta'

# Conflicts:
#	es/form-render-core/src/core/RenderChildren/RenderList/CardList.js
#	es/form-render-core/src/core/RenderChildren/RenderList/DrawerList.js
#	es/form-render-core/src/core/RenderChildren/RenderList/ListForMobile.js
#	es/form-render-core/src/core/RenderChildren/RenderList/SimpleList.js
#	es/form-render-core/src/core/RenderChildren/RenderList/TableList.js
#	es/form-render-core/src/core/RenderChildren/RenderList/VirtualList.js
#	es/form-render-core/src/core/RenderChildren/RenderList/index.js
#	es/form-render-core/src/core/RenderField/ExtendedWidget.js
#	es/form-render-core/src/core/RenderField/Extra.js
#	es/form-render-core/src/core/RenderField/Title.js
#	es/form-render-core/src/core/RenderField/index.js
#	es/form-render-core/src/core/index.js
#	es/form-render-core/src/createWidget.js
#	es/form-render-core/src/hooks.js
#	es/form-render-core/src/index.css
#	es/form-render-core/src/index.js
#	es/form-render-core/src/processData.js
#	es/form-render-core/src/useForm.js
#	es/form-render-core/src/utils.js
#	es/form-render-core/src/validateMessageCN.js
#	es/index.js
#	es/widgets/antd/date.js
#	es/widgets/antd/index.js
#	es/widgets/antd/select.js
#	lib/core/RenderChildren/RenderList/ListForMobile.js
#	lib/form-render-core/src/connectForm.js
#	lib/form-render-core/src/core/RenderChildren/RenderList/CardList.js
#	lib/form-render-core/src/core/RenderChildren/RenderList/DrawerList.js
#	lib/form-render-core/src/core/RenderChildren/RenderList/ListForMobile.js
#	lib/form-render-core/src/core/RenderChildren/RenderList/SimpleList.js
#	lib/form-render-core/src/core/RenderChildren/RenderList/TabList.js
#	lib/form-render-core/src/core/RenderChildren/RenderList/TableList.js
#	lib/form-render-core/src/core/RenderChildren/RenderList/VirtualList.js
#	lib/form-render-core/src/core/RenderChildren/RenderList/index.js
#	lib/form-render-core/src/core/RenderField/ExtendedWidget.js
#	lib/form-render-core/src/core/RenderField/Extra.js
#	lib/form-render-core/src/core/RenderField/Title.js
#	lib/form-render-core/src/core/RenderField/index.js
#	lib/form-render-core/src/core/index.js
#	lib/form-render-core/src/createWidget.js
#	lib/form-render-core/src/hooks.js
#	lib/form-render-core/src/index.css
#	lib/form-render-core/src/index.js
#	lib/form-render-core/src/processData.js
#	lib/form-render-core/src/useForm.js
#	lib/form-render-core/src/utils.js
#	lib/form-render-core/src/validateMessageCN.js
#	lib/index.js
#	lib/widgets/antd/checkboxes.js
#	lib/widgets/antd/color.js
#	lib/widgets/antd/date.js
#	lib/widgets/antd/multiSelect.js
#	lib/widgets/antd/percentSlider.js
#	lib/widgets/antd/select.js
#	package.json

+# misc
+.idea
+.DS_Store
+.idea
+.vscode

@@ -9,13 +9,13 @@ 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); }
 
 
-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); if (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 _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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 _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 _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
 
 import React from 'react';
 import React from 'react';
 import { useTools } from '../../../hooks';
 import { useTools } from '../../../hooks';

@@ -25,13 +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; }
 
 
-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); if (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 _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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 _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 _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _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; }
 
 

@@ -73,8 +73,7 @@ var ListForMobile = function ListForMobile(_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,
-      handleAddDefault = schema.handleAddDefault;
+      itemProps = schema.itemProps;
 
 
   var _useState = useState([]),
   var _useState = useState([]),
       _useState2 = _slicedToArray(_useState, 2),
       _useState2 = _slicedToArray(_useState, 2),
@@ -158,7 +157,7 @@ var ListForMobile = function ListForMobile(_ref) {
   }))), /*#__PURE__*/React.createElement("a", {
   }))), /*#__PURE__*/React.createElement("a", {
     className: 'add-button',
     className: 'add-button',
     onClick: function onClick() {
     onClick: function onClick() {
-      addItem(handleAddDefault);
+      addItem();
     }
     }
   }, /*#__PURE__*/React.createElement(_PlusCircleFilled, {
   }, /*#__PURE__*/React.createElement(_PlusCircleFilled, {
     style: {
     style: {

@@ -9,13 +9,13 @@ import _DeleteOutlined from "@ant-design/icons/es/icons/DeleteOutlined";
 
 
 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 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); if (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 _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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 _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 _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
 
 import React from 'react';
 import React from 'react';
 import Core from '../../index';
 import Core from '../../index';

@@ -23,13 +23,13 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 
 
 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 _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 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); if (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 _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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 _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 _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _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; }
 
 

@@ -10,15 +10,16 @@ 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 "antd/es/message/style";
-import _message from "antd/es/message";
 import "antd/es/tooltip/style";
 import "antd/es/tooltip/style";
 import _Tooltip from "antd/es/tooltip";
 import _Tooltip from "antd/es/tooltip";
-import _ExclamationCircleOutlined from "@ant-design/icons/es/icons/ExclamationCircleOutlined";
+import _InfoCircleOutlined from "@ant-design/icons/es/icons/InfoCircleOutlined";
 import "antd/es/menu/style";
 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 _ExclamationCircleOutlined from "@ant-design/icons/es/icons/ExclamationCircleOutlined";
+import "antd/es/message/style";
+import _message from "antd/es/message";
 import _AlertOutlined from "@ant-design/icons/es/icons/AlertOutlined";
 import _AlertOutlined from "@ant-design/icons/es/icons/AlertOutlined";
 import _BarsOutlined from "@ant-design/icons/es/icons/BarsOutlined";
 import _BarsOutlined from "@ant-design/icons/es/icons/BarsOutlined";
 import _AppstoreOutlined from "@ant-design/icons/es/icons/AppstoreOutlined";
 import _AppstoreOutlined from "@ant-design/icons/es/icons/AppstoreOutlined";
@@ -43,7 +44,7 @@ import _MinusOutlined from "@ant-design/icons/es/icons/MinusOutlined";
 import _PlusOutlined from "@ant-design/icons/es/icons/PlusOutlined";
 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", "originWidget"];
 
 
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 
 
@@ -51,9 +52,9 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 
 
 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 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); if (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 _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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 _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; }
 
 
@@ -65,7 +66,7 @@ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symb
 
 
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 
 
-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"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
 
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 
@@ -86,10 +87,12 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 /* eslint-disable jsx-a11y/anchor-is-valid */
 /* eslint-disable jsx-a11y/anchor-is-valid */
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 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 { isDesignPage } from './utils'
 
 
-import QxIcon from './icon';
 import * as dd from 'dingtalk-jsapi';
 import * as dd from 'dingtalk-jsapi';
+import moment from 'moment'; // import {useVT} from 'virtualizedtableforantd4';
+
+import QxIcon from './icon';
 var BUTTON_ICONS_MAP = {
 var BUTTON_ICONS_MAP = {
   PlusOutlined: /*#__PURE__*/React.createElement(_PlusOutlined, null),
   PlusOutlined: /*#__PURE__*/React.createElement(_PlusOutlined, null),
   MinusOutlined: /*#__PURE__*/React.createElement(_MinusOutlined, null),
   MinusOutlined: /*#__PURE__*/React.createElement(_MinusOutlined, null),
@@ -125,7 +128,7 @@ var EXPORT_STATUS = {
 };
 };
 
 
 var VirtualList = function VirtualList(_ref) {
 var VirtualList = function VirtualList(_ref) {
-  var _line$buttons;
+  var _dd$env;
 
 
   var _ref$displayList = _ref.displayList,
   var _ref$displayList = _ref.displayList,
       displayList = _ref$displayList === void 0 ? [] : _ref$displayList,
       displayList = _ref$displayList === void 0 ? [] : _ref$displayList,
@@ -140,7 +143,8 @@ var VirtualList = function VirtualList(_ref) {
       schema = _ref.schema,
       schema = _ref.schema,
       listData = _ref.listData,
       listData = _ref.listData,
       changeList = _ref.changeList,
       changeList = _ref.changeList,
-      copyItem = _ref.copyItem;
+      copyItem = _ref.copyItem,
+      dataPath = _ref.dataPath;
   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,
@@ -149,9 +153,10 @@ var VirtualList = function VirtualList(_ref) {
       _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,
+      isReadOnly = schema.isReadOnly,
       subReadOnly = schema.subReadOnly,
       subReadOnly = schema.subReadOnly,
       isLoading = schema.isLoading,
       isLoading = schema.isLoading,
-      handleAddDefault = schema.handleAddDefault;
+      isFullScreen = schema.isFullScreen;
 
 
   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,
@@ -165,6 +170,7 @@ var VirtualList = function VirtualList(_ref) {
       searchKey = props.searchKey,
       searchKey = props.searchKey,
       rowSelection = props.rowSelection,
       rowSelection = props.rowSelection,
       size = props.size,
       size = props.size,
+      originWidget = props.originWidget,
       rest = _objectWithoutProperties(props, _excluded); // const [vt, set_components] = useVT(() => ({scroll: {y: scrollY}}), []);
       rest = _objectWithoutProperties(props, _excluded); // const [vt, set_components] = useVT(() => ({scroll: {y: scrollY}}), []);
 
 
 
 
@@ -208,6 +214,19 @@ var VirtualList = function VirtualList(_ref) {
       loading = _useState14[0],
       loading = _useState14[0],
       setLoading = _useState14[1];
       setLoading = _useState14[1];
 
 
+  var mergeFieldsMap = useRef({});
+  var isMergeFieldExist = useRef(false); // const [cloneList, setCloneList] = useState([]);
+
+  var isInDing = dd && (dd === null || dd === void 0 ? void 0 : (_dd$env = dd.env) === null || _dd$env === void 0 ? void 0 : _dd$env.platform) !== 'notInDingTalk';
+
+  if (subReadOnly) {
+    Object.keys(flatten).forEach(function (key) {
+      if (key.indexOf(schema.$id) === 0 && key.split('.').length > 1) {
+        flatten[key].schema.readOnly = true;
+      }
+    });
+  }
+
   useEffect(function () {
   useEffect(function () {
     setLoading(!!isLoading);
     setLoading(!!isLoading);
   }, [isLoading]);
   }, [isLoading]);
@@ -217,8 +236,7 @@ var VirtualList = function VirtualList(_ref) {
   var newRowSelection = useMemo(function () {
   var newRowSelection = useMemo(function () {
     var _bar$buttons;
     var _bar$buttons;
 
 
-    if (schema.isReadOnly) return null;
-
+    // if (schema.isReadOnly) return null
     var _rowSelection = _.cloneDeep(rowSelection); // 根据是否含有批量操作按钮，渲染表格是否可选择
     var _rowSelection = _.cloneDeep(rowSelection); // 根据是否含有批量操作按钮，渲染表格是否可选择
 
 
 
 
@@ -239,25 +257,151 @@ var VirtualList = function VirtualList(_ref) {
     }
     }
 
 
     return _rowSelection;
     return _rowSelection;
-  }, [rowSelection, selectedRowKeys, bar, rowSelection]);
-  useEffect(function () {
-    displayList.forEach(function (item, index) {
+  }, [JSON.stringify(bar.buttons), JSON.stringify(rowSelection), JSON.stringify(selectedRowKeys)]); // useEffect(() => {
+  //   const _cloneList = _.cloneDeep(displayList);
+  //   _cloneList.forEach((item, index) => {
+  //     if (typeof item === 'object') {
+  //       item.orginIdx = index
+  //     }
+  //   })
+  //   setCloneList(_cloneList);
+  // }, [displayList])
+  //
+  // let _displayList = []
+  //
+  // // 筛选展示的数据
+  // if (props.originWidget === 'relSelector') {
+  //   cloneList.forEach(item => {
+  //     if (!item.hasOwnProperty('$auth') || item.$auth) {
+  //       _displayList.push(item)
+  //     }
+  //   })
+  // } else {
+  //   _displayList = [...cloneList]
+  // }
+
+  var cloneList = useMemo(function () {
+    //console.log('useMemo cloneList', displayList)
+    var _cloneList = _.cloneDeep(displayList);
+
+    _cloneList.forEach(function (item, index) {
       if (_typeof(item) === 'object') {
       if (_typeof(item) === 'object') {
         item.orginIdx = index;
         item.orginIdx = index;
       }
       }
     });
     });
-  }, [displayList]);
-  var _displayList = []; // 筛选展示的数据
 
 
-  if (props.originWidget === 'relSelector') {
-    displayList.forEach(function (item) {
-      if (!item.hasOwnProperty('$auth') || item.$auth) {
-        _displayList.push(item);
+    return _cloneList;
+  }, [displayList]); // 数据变化时，子表汇总值重新计算，并加到主表的formData中
+
+  useEffect(function () {
+    var _schema$qxProps2;
+
+    console.log('计算汇总');
+    if (schema.originWidget !== 'subform') return;
+    var subKey = schema.fieldName || schema.propertyKey;
+    if (!schema._setValueByPath) return;
+    (((_schema$qxProps2 = schema.qxProps) === null || _schema$qxProps2 === void 0 ? void 0 : _schema$qxProps2.summary) || []).forEach(function (item) {
+      var fx = item.fx,
+          relField = item.relField,
+          code = item.code;
+      var key = "".concat(subKey, ":").concat(code, ":").concat(fx); // subKey + '.' + code +;
+
+      var values = (displayList || []).map(function (it) {
+        return it[relField];
+      });
+
+      if (!values.length) {
+        schema._setValueByPath(key, 'EMPTY');
+
+        return;
+      }
+
+      if (['COUNTUNIQUE', 'COUNTA'].includes(fx)) {
+        values.forEach(function (_item, index) {
+          if (Array.isArray(_item)) {
+            values[index] = String(_item);
+          }
+        });
+      }
+
+      values = values.filter(function (item) {
+        return item !== undefined;
+      });
+
+      if (fx === 'MAX' || fx === 'MIN') {
+        var widget = '';
+        var keys = Object.keys(flatten || {});
+
+        for (var i = 0; i < keys.length; i++) {
+          if (keys[i].indexOf(relField) > -1) {
+            var _flatten$keys$i, _flatten$keys$i$schem;
+
+            var _widget = (_flatten$keys$i = flatten[keys[i]]) === null || _flatten$keys$i === void 0 ? void 0 : (_flatten$keys$i$schem = _flatten$keys$i.schema) === null || _flatten$keys$i$schem === void 0 ? void 0 : _flatten$keys$i$schem.widget;
+
+            if (_widget !== 'qxSummary') {
+              widget = _widget;
+              break;
+            }
+          }
+        }
+
+        if (['qxDatetime', 'createdAt', 'updatedAt'].includes(widget)) {
+          var _moment$fx$toLowerCas;
+
+          values = values.filter(function (it) {
+            return it;
+          }); // 计算日期的最大最小时，过滤掉空值
+
+          values.forEach(function (it, index) {
+            values[index] = moment(it);
+          }); // schema.parentFormData[key] = moment[fx.toLowerCase()](values)?._i || 'EMPTY';
+
+          schema._setValueByPath(key, ((_moment$fx$toLowerCas = moment[fx.toLowerCase()](values)) === null || _moment$fx$toLowerCas === void 0 ? void 0 : _moment$fx$toLowerCas._i) || 'EMPTY');
+        } else if (widget === 'qxTime') {
+          var _moment$fx$toLowerCas2, _moment$fx$toLowerCas3;
+
+          values = values.filter(function (it) {
+            return it;
+          }); // 计算时间的最大最小时，过滤掉空值
+
+          values.forEach(function (it, index) {
+            values[index] = moment('0001-01-01 ' + it); // 随意拼个年月日返回，计算时替换
+          }); // schema.parentFormData[key] = (moment[fx.toLowerCase()](values)?._i)?.slice(11) || 'EMPTY';
+
+          schema._setValueByPath(key, ((_moment$fx$toLowerCas2 = moment[fx.toLowerCase()](values)) === null || _moment$fx$toLowerCas2 === void 0 ? void 0 : (_moment$fx$toLowerCas3 = _moment$fx$toLowerCas2._i) === null || _moment$fx$toLowerCas3 === void 0 ? void 0 : _moment$fx$toLowerCas3.slice(11)) || 'EMPTY');
+        } else {
+          // schema.parentFormData[key] = window[fx](values);
+          schema._setValueByPath(key, window[fx](values));
+        }
+      } else {
+        // schema.parentFormData['__SUMMARY_' + subKey][key] = window[fx](values);
+        var res = window[fx](values);
+
+        if (String(res).startsWith('Error')) {
+          res = null;
+        }
+
+        schema._setValueByPath(key, res);
       }
       }
     });
     });
-  } else {
-    _displayList = _toConsumableArray(displayList);
-  } // useEffect(() => {
+  }, [JSON.stringify(displayList)]);
+
+  var _displayList = useMemo(function () {
+    //console.log('useMemo _displayList', cloneList)
+    var _displayList1 = []; // 筛选展示的数据
+
+    if (props.originWidget === 'relSelector') {
+      cloneList.forEach(function (item) {
+        if (!item.hasOwnProperty('$auth') || item.$auth) {
+          _displayList1.push(item);
+        }
+      });
+    } else {
+      _displayList1 = _toConsumableArray(cloneList);
+    }
+
+    return _displayList1;
+  }, [cloneList]); // useEffect(() => {
   // 筛选展示的数据
   // 筛选展示的数据
   // if (props.originWidget === 'relSelector') {
   // if (props.originWidget === 'relSelector') {
   //   displayList.forEach((item, index) => {
   //   displayList.forEach((item, index) => {
@@ -299,23 +443,27 @@ var VirtualList = function VirtualList(_ref) {
 
 
   var selectedIds = useMemo(function () {
   var selectedIds = useMemo(function () {
     var _selectedIds = [];
     var _selectedIds = [];
-    displayList.forEach(function (item) {
-      if (item && selectedRowKeys.includes(item.orginIdx)) {
+    cloneList.forEach(function (item) {
+      if (item && selectedRowKeys.includes(props.originWidget === 'subform' ? item.orginIdx : item.id)) {
         _selectedIds.push(item.id);
         _selectedIds.push(item.id);
       }
       }
     });
     });
     return _selectedIds;
     return _selectedIds;
-  }, [selectedRowKeys, displayList]); // useEffect(() => {
-
-  var dataSource = (keyWord.length ? _displayList.filter(function (item) {
-    var _String;
-
-    return ((_String = String(item[searchKey])) === null || _String === void 0 ? void 0 : _String.indexOf(keyWord)) > -1;
-  }) : _displayList).map(function (item, idx) {
-    return _objectSpread(_objectSpread({}, item), {}, {
-      index: item.hasOwnProperty('orginIdx') ? item.orginIdx : idx
+  }, [selectedRowKeys, cloneList]); // useEffect(() => {
+
+  var dataSource = useMemo(function () {
+    //console.log('useMemo dataSource',dataSource);
+    return (keyWord.length ? _displayList.filter(function (item) {
+      var _String;
+
+      return ((_String = String(item[searchKey])) === null || _String === void 0 ? void 0 : _String.indexOf(keyWord)) > -1;
+    }) : _displayList).map(function (item, idx) {
+      return _objectSpread(_objectSpread({}, item), {}, {
+        index: item.hasOwnProperty('orginIdx') ? item.orginIdx : idx,
+        orginIdx: item.hasOwnProperty('orginIdx') ? item.orginIdx : null
+      });
     });
     });
-  }); // useEffect(() => {
+  }, [_displayList, keyWord, searchKey]); // useEffect(() => {
   //   setRefresh(refresh + '1')
   //   setRefresh(refresh + '1')
   // }, [JSON.stringify(dataSource)])
   // }, [JSON.stringify(dataSource)])
   // setDataSource(_dataSource)
   // setDataSource(_dataSource)
@@ -345,6 +493,7 @@ var VirtualList = function VirtualList(_ref) {
   };
   };
 
 
   var pagination = useMemo(function () {
   var pagination = useMemo(function () {
+    // console.log('useMemo pagination', dataSource?.length, props.limit)
     return {
     return {
       total: dataSource.length,
       total: dataSource.length,
       position: ['bottomRight'],
       position: ['bottomRight'],
@@ -356,9 +505,20 @@ var VirtualList = function VirtualList(_ref) {
       size: size || 'small' // hideOnSinglePage: true
       size: size || 'small' // hideOnSinglePage: true
 
 
     };
     };
-  }, [dataSource, props.limit]);
+  }, [dataSource === null || dataSource === void 0 ? void 0 : dataSource.length, props.limit]);
   var barButtons = useMemo(function () {
   var barButtons = useMemo(function () {
-    var _barButtons = _.cloneDeep(bar.buttons || []); // 关联表的导入，先隐藏 TODO
+    // console.log('useMemo barButtons', schema.isReadOnly, bar.buttons, originWidget, type, subReadOnly)
+    var _barButtons = _.cloneDeep(bar.buttons || []);
+
+    if (schema.isReadOnly) {
+      // 关联表只读
+      // return _barButtons.filter(item => item.code === 'EXPORT')
+      return [];
+    } else if (subReadOnly) {
+      return _barButtons.filter(function (item) {
+        return item.code === 'EXPORT';
+      });
+    } // 关联表的导入，先隐藏 TODO
 
 
 
 
     if (props.originWidget === 'relSelector') {
     if (props.originWidget === 'relSelector') {
@@ -421,103 +581,455 @@ var VirtualList = function VirtualList(_ref) {
 
 
       if (props.originWidget === 'subform') {
       if (props.originWidget === 'subform') {
         addBtns.push('DELETE');
         addBtns.push('DELETE');
+        return _barButtons.filter(function (item) {
+          return addBtns.includes(item.code);
+        });
       }
       }
-
-      return _barButtons.filter(function (item) {
-        return addBtns.includes(item.code);
-      });
     } else if (type === 'view') {
     } else if (type === 'view') {
       return _barButtons.filter(function (item) {
       return _barButtons.filter(function (item) {
         return item.code === 'EXPORT';
         return item.code === 'EXPORT';
       });
       });
     }
     }
 
 
-    if (schema.isReadOnly) {
-      // return _barButtons.filter(item => item.code === 'EXPORT')
-      return [];
+    return _barButtons;
+  }, [schema.isReadOnly, bar.buttons, originWidget, type, subReadOnly]);
+
+  var barBtnClick = function barBtnClick(code, needConfirm, confirmContent, action, item) {
+    setSelectedRowKeys([]);
+
+    if (needConfirm && confirmContent) {
+      if (!selectedRowKeys.length) {
+        return _message.warning('请选择数据');
+      }
+
+      confirm({
+        title: confirmContent,
+        icon: /*#__PURE__*/React.createElement(_ExclamationCircleOutlined, null),
+        okText: '确认',
+        okType: 'danger',
+        cancelText: '取消',
+        onOk: function onOk() {
+          if (code === 'DELETE') {
+            if (props.originWidget === 'subform') {
+              batchDelete(selectedRowKeys);
+              setSelectedRowKeys([]);
+            } else {
+              props.handleBarBtnClick(code, fieldName, batchKey, selectedRowKeys, schema.$id, selectedIds);
+            }
+          } else if (code === 'EXPORT') {
+            handleExport();
+          } else if (code === 'SELECT') {
+            props.openRelSelect(schema.$id);
+          } else if (code === 'ADD') {
+            props.handleRelAdd(schema.$id);
+          } else if (code === 'subformEdit') {
+            props.handleBatchEdit(fieldName, schema.$id, selectedIds);
+          } else if (action === 'CUSTOM') {
+            props.handleCustom(item, selectedIds, schema.$id);
+          } else {
+            props.handleBarBtnClick(code, fieldName, batchKey, selectedRowKeys, schema.$id, selectedIds);
+          }
+        },
+        onCancel: function onCancel() {}
+      });
+    } else {
+      if (code === 'DELETE') {
+        if (props.originWidget === 'subform') {
+          batchDelete(selectedRowKeys);
+          setSelectedRowKeys([]);
+        } else {
+          props.handleBarBtnClick(code, fieldName, batchKey, selectedRowKeys, schema.$id, selectedIds);
+        }
+      } else if (code === 'EXPORT') {
+        handleExport();
+      } else if (code === 'SELECT') {
+        props.openRelSelect(schema.$id);
+      } else if (code === 'ADD') {
+        props.handleRelAdd(schema.$id);
+      } else if (code === 'subformEdit') {
+        props.handleBatchEdit(fieldName, schema.$id, selectedIds);
+      } else if (action === 'CUSTOM') {
+        props.handleCustom(item, selectedIds, schema.$id);
+      } else {
+        props.handleBarBtnClick(code, fieldName, batchKey, selectedRowKeys, schema.$id, selectedIds);
+      }
     }
     }
+  };
 
 
-    return _barButtons;
-  }, [props, type]);
-  var moreButtons = /*#__PURE__*/React.createElement(_Menu, null, barButtons.slice(3).map(function (item) {
-    var name = item.name,
-        code = item.code,
-        needConfirm = item.needConfirm,
-        confirmContent = item.confirmContent,
-        icon = item.icon,
-        action = item.action;
-    return /*#__PURE__*/React.createElement(_Menu.Item, null, /*#__PURE__*/React.createElement(_Button, _extends({
-      key: code,
-      style: {
-        marginLeft: 8,
-        border: 'none'
+  var moreButtons = useMemo(function () {
+    var _barButtons = _.cloneDeep(barButtons);
+
+    return /*#__PURE__*/React.createElement(_Menu, null, _barButtons.slice(3).filter(function (item) {
+      return isInDing ? !['EXPORT', 'IMPORT'].includes(item.code) : true;
+    }).map(function (item) {
+      var name = item.name,
+          code = item.code,
+          needConfirm = item.needConfirm,
+          confirmContent = item.confirmContent,
+          icon = item.icon,
+          action = item.action;
+      return /*#__PURE__*/React.createElement(_Menu.Item, null, /*#__PURE__*/React.createElement(_Button, _extends({
+        key: code,
+        style: {
+          marginLeft: 8,
+          border: 'none'
+        }
+      }, item, {
+        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() {
+          barBtnClick(code, needConfirm, confirmContent, action, item);
+        }
+      }), name));
+    }));
+  }, [barButtons, barBtnClick, selectedRowKeys]);
+
+  var handleColumn = function handleColumn(schema, child, index) {
+    var _schema$props2;
+
+    if (props.editable && props.originWidget === 'subform') {
+      if (isSubCanEdit && !['relField', 'qxFormula'].includes(schema.widget)) {
+        schema.readOnly = false;
+      } else if (!isSubCanEdit) {
+        schema.readOnly = true;
       }
       }
-    }, item, {
-      icon: icon && bar.style !== 'TEXT' ? String(icon).indexOf('http') > -1 ? /*#__PURE__*/React.createElement("img", {
-        src: String(icon),
+    }
+
+    if (schema.fieldName === searchKey) {
+      setSearchName(schema.title);
+    }
+
+    var tip = schema.description ? /*#__PURE__*/React.createElement("span", {
+      className: 'qx-column_desc'
+    }, /*#__PURE__*/React.createElement(_Tooltip, {
+      title: schema.description
+    }, /*#__PURE__*/React.createElement(_InfoCircleOutlined, null))) : null;
+    var column = ((_schema$props2 = schema.props) === null || _schema$props2 === void 0 ? void 0 : _schema$props2.column) || {};
+
+    var _dataIndex = child.indexOf(dataPath) === -1 ? dataPath + '[].' + child : child;
+
+    var _width = parseInt(column.width);
+
+    return {
+      dataIndex: _dataIndex,
+      width: (column.width && _width ? _width : FIELD_LENGTH) + padding,
+      align: props.originWidget === 'subform' ? 'left' : column.align || 'left',
+      fixed: column.fixed || props.fixed && typeof index === 'number' && !isMergeFieldExist.current && index < props.fixed,
+      title: /*#__PURE__*/React.createElement("div", {
         style: {
         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() {
-        barBtnClick(code, needConfirm, confirmContent, action, item);
+          width: (column.width ? parseInt(column.width) : FIELD_LENGTH) + "px"
+        }
+      }, schema.required ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
+        className: "fr-label-required"
+      }, " *"), /*#__PURE__*/React.createElement("span", {
+        className: "qx-virtual_title__required",
+        title: schema.title
+      }, schema.title), tip) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
+        className: "qx-virtual_title",
+        title: schema.title
+      }, schema.title), tip)),
+      render: function render(value, record, index) {
+        // Check: record.index 似乎是antd自己会给的，不错哦
+        var childIndex = [].concat(_toConsumableArray(dataIndex), [record.index]);
+        return /*#__PURE__*/React.createElement(Core, {
+          hideTitle: true,
+          displayType: "inline",
+          key: index.toString(),
+          id: _dataIndex,
+          dataIndex: childIndex,
+          _item: flatten[_dataIndex] ? null : getItemSchema(_dataIndex) // subReadOnly={subReadOnly}
+
+        });
       }
       }
-    }), name));
-  }));
+    };
+  };
+
+  var getItemSchema = function getItemSchema(id) {
+    var _item;
+
+    Object.keys(mergeFieldsMap.current || {}).forEach(function (key) {
+      if (id.indexOf(key) > -1) {
+        _item = mergeFieldsMap.current[key];
+      }
+    });
+    return _item;
+  };
+
+  var handleMergeField = function handleMergeField(schema) {
+    // const column = schema.props?.column || {};
+    var _props = schema.props;
+    return {
+      title: _props.title,
+      align: _props.align,
+      dataIndex: _props.dataIndex,
+      children: Object.keys(schema.children).map(function (key) {
+        var _schema$children$key, _schema$children$key2;
+
+        if (key.indexOf('_merge_field') > -1 && Object.keys((_schema$children$key = schema.children[key]) === null || _schema$children$key === void 0 ? void 0 : _schema$children$key.children).length === 1 && ((_schema$children$key2 = schema.children[key]) === null || _schema$children$key2 === void 0 ? void 0 : _schema$children$key2.children.hidden)) {
+          return {
+            show: false
+          };
+        }
+
+        var isMergeField = key.indexOf('_merge_field') > -1 && Object.keys(schema.children[key].children || {}).length;
+
+        if (isMergeField) {
+          return handleMergeField(schema.children[key]);
+        } else {
+          return handleColumn(schema.children[key], key);
+        }
+      })
+    };
+  };
+
+  var getMergeMap = function getMergeMap() {
+    var _map = {};
+    Object.keys(flatten).forEach(function (key) {
+      var _schema$schema;
+
+      var _schema = flatten[key];
+
+      var _children = (_schema === null || _schema === void 0 ? void 0 : (_schema$schema = _schema.schema) === null || _schema$schema === void 0 ? void 0 : _schema$schema.children) || {};
+
+      if (key.indexOf('_merge_field') > -1 && Object.keys(_children).length) {
+        Object.keys(_children).forEach(function (item) {
+          var _schema1 = _children[item];
+
+          var _children1 = _schema1.children || {};
+
+          if (item.indexOf('_merge_field') > -1 && Object.keys(_children1).length) {
+            Object.keys(_children1).forEach(function (it) {
+              _map[it] = {
+                schema: _children1[it]
+              };
+            });
+          } else {
+            _map[item] = {
+              schema: _schema1
+            };
+          }
+        });
+      }
+    });
+    return _map;
+  };
+
   var columns = useMemo(function () {
   var columns = useMemo(function () {
-    return children.map(function (child, index) {
-      var _schema$props2;
+    var _line_buttons2;
+
+    //console.log('useMemo columns', isSubCanEdit, subReadOnly, JSON.stringify(line.buttons))
+    mergeFieldsMap.current = getMergeMap();
+    isMergeFieldExist.current = false;
+
+    var _line_buttons = _.cloneDeep(line.buttons);
+
+    var _columns = (children || []).map(function (child, index) {
+      var _schema$children;
 
 
       var item = flatten[child];
       var item = flatten[child];
       var schema = item && item.schema || {};
       var schema = item && item.schema || {};
 
 
-      if (props.editable && props.originWidget === 'subform') {
-        if (isSubCanEdit && !['relField', 'qxFormula'].includes(schema.widget)) {
-          schema.readOnly = false;
-        } else if (!isSubCanEdit) {
-          schema.readOnly = true;
-        }
+      if (child.indexOf('_merge_field') > -1 && (((_schema$children = schema.children) === null || _schema$children === void 0 ? void 0 : _schema$children.hidden) || !Object.keys(schema.children || {}).length)) {
+        return {
+          show: false
+        };
       }
       }
 
 
-      if (schema.fieldName === searchKey) {
-        setSearchName(schema.title);
+      var isMergeField = child.indexOf('_merge_field') > -1 && Object.keys(schema.children || {}).length;
+
+      if (isMergeField) {
+        isMergeFieldExist.current = true;
+        return handleMergeField(schema, index);
+      } else {
+        return handleColumn(schema, child, index);
       }
       }
+    });
 
 
-      var column = ((_schema$props2 = schema.props) === null || _schema$props2 === void 0 ? void 0 : _schema$props2.column) || {};
-      return {
-        dataIndex: child,
-        width: (column.width ? parseInt(column.width) : FIELD_LENGTH) + padding,
-        align: column.align || 'left',
-        fixed: column.fixed || props.fixed && index < props.fixed,
-        title: /*#__PURE__*/React.createElement("div", {
-          style: {
-            width: (column.width ? parseInt(column.width) : FIELD_LENGTH) + "px"
-          }
-        }, schema.required ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
-          className: "fr-label-required"
-        }, " *"), /*#__PURE__*/React.createElement("span", null, schema.title)) : schema.title),
-        render: function render(value, record, index) {
-          // Check: record.index 似乎是antd自己会给的，不错哦
-          var childIndex = [].concat(_toConsumableArray(dataIndex), [record.index]);
-          return /*#__PURE__*/React.createElement(Core, {
-            hideTitle: true,
-            displayType: "inline",
-            key: index.toString(),
-            id: child,
-            dataIndex: childIndex // subReadOnly={subReadOnly}
+    _columns = _columns.filter(function (item) {
+      return Object.keys(item).length !== 1 && (!item.hidden || item.show);
+    });
+
+    if (((_line_buttons2 = _line_buttons) === null || _line_buttons2 === void 0 ? void 0 : _line_buttons2.length) || Array.isArray(itemProps.buttons)) {
+      var top = line.top,
+          _line$style = line.style,
+          style = _line$style === void 0 ? 'ICON' : _line$style,
+          fixed = line.fixed;
 
 
+      if (type === 'add') {
+        if (props.originWidget === 'subform') {
+          _line_buttons = _line_buttons.filter(function (item) {
+            return item.code === 'DELETE';
           });
           });
+        } // 关联记录放开所有行按钮关联XQ230328006
+        // else if (props.originWidget === 'relSelector') {
+        //   // jbl ERP需求，新增时放开编辑按钮
+        //   _line_buttons = _line_buttons.filter(item => ['REMOVE', 'EDIT'].includes(item.code))
+        // }
+
+      } else if ((type === 'view' || isReadOnly) && originWidget === 'relSelector') {
+        _line_buttons = _line_buttons.filter(function (item) {
+          return item.code === 'VIEW';
+        });
+      }
+
+      var len = (_line_buttons || []).length;
+      var action = subReadOnly || isReadOnly && originWidget === 'subform' ? {} : {
+        title: '操作',
+        key: '$action',
+        fixed: fixed ? top ? 'left' : 'right' : props.originWidget === 'subform' ? 'right' : false,
+        align: 'center',
+        // width: ((buttons || []).length + (props.removeable ? 1 : 0)) * (style === 'ICON' ? 32 : style === 'TEXT' ? 36 : 57) + 16,
+        render: function render(value, record, idx) {
+          return /*#__PURE__*/React.createElement(React.Fragment, null, Array.isArray(itemProps.buttons) ? itemProps.buttons.map(function (item, idx) {
+            var callback = item.callback,
+                text = item.text,
+                html = item.html;
+
+            var onClick = function onClick() {};
+
+            if (typeof window[callback] === 'function') {
+              onClick = function onClick() {
+                window[callback]({
+                  value: listData,
+                  onChange: changeList,
+                  schema: schema
+                });
+              };
+            }
+
+            return /*#__PURE__*/React.createElement("a", {
+              key: idx.toString(),
+              style: {
+                marginLeft: 8
+              },
+              onClick: onClick
+            }, /*#__PURE__*/React.createElement("span", {
+              dangerouslySetInnerHTML: {
+                __html: html || text
+              }
+            }));
+          }) : null, Array.isArray(_line_buttons) ? _line_buttons.map(function (item) {
+            var name = item.name,
+                code = item.code,
+                needConfirm = item.needConfirm,
+                confirmContent = item.confirmContent,
+                icon = item.icon;
+            var display = handleState(record, code, props.originWidget); // if (display === '') {
+            //   btnMap[code] = ''
+            // }
+
+            return /*#__PURE__*/React.createElement(_Tooltip, {
+              title: name
+            }, /*#__PURE__*/React.createElement(_Button, _extends({
+              key: code,
+              style: {
+                marginLeft: 8,
+                display: display
+              }
+            }, item, {
+              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',
+              size: 'small' // disabled={props.originWidget === 'subform' ? false : handleAuth(record, code)}
+              ,
+              onClick: function onClick() {
+                // 已有数据进行操作时才二次提示
+                if (needConfirm && confirmContent && (props.originWidget === 'relSelector' ? record.hasOwnProperty('$auth') : record.hasOwnProperty('id'))) {
+                  confirm({
+                    title: confirmContent,
+                    icon: /*#__PURE__*/React.createElement(_ExclamationCircleOutlined, null),
+                    okText: '确认',
+                    okType: 'danger',
+                    cancelText: '取消',
+                    onOk: function onOk() {
+                      if (code === 'DELETE' && props.originWidget === 'subform') {
+                        deleteItem(idx);
+                      } else if (code === 'REMOVE') {
+                        deleteItem(record.orginIdx);
+                        props.handleLineBtnClick(code, record, schema.$id);
+                      } else if (code === 'COPY') {
+                        copyItem(record.orginIdx);
+                      } else if (item.action === 'CUSTOM') {
+                        props.handleCustom(item, record, schema.$id);
+                      } else {
+                        props.handleLineBtnClick(code, record, schema.$id, line.action);
+                      }
+                    },
+                    onCancel: function onCancel() {}
+                  });
+                } else {
+                  if (code === 'DELETE' && props.originWidget === 'subform') {
+                    deleteItem(idx);
+                  } else if (code === 'REMOVE') {
+                    deleteItem(record.orginIdx);
+                    props.handleLineBtnClick(code, record, schema.$id);
+                  } else if (code === 'COPY') {
+                    copyItem(record.orginIdx);
+                  } else if (item.action === 'CUSTOM') {
+                    props.handleCustom(item, record, schema.$id);
+                  } else {
+                    props.handleLineBtnClick(code, record, schema.$id, line.action, schema);
+                  }
+                }
+              }
+            }), style !== 'ICON' || !icon ? name : null)); // }
+          }) : null);
         }
         }
       };
       };
-    });
-  }, [children, flatten, isSubCanEdit]);
+      var actionLength = 0;
+
+      _line_buttons.forEach(function (item) {
+        if (props.originWidget === 'subform' || style === 'ICON' && item.icon) {
+          actionLength += 32;
+        } else if (style !== 'ICON' || style === 'ICON' && !item.icon) {
+          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;
+          actionLength += div.clientWidth + (style !== 'TEXT' && item.icon ? 32 : 0);
+          div.remove();
+        }
+      });
+
+      action.width = actionLength + padding * 2 - 8;
+
+      if ((_columns || []).findIndex(function (item) {
+        return item.key === '$action';
+      }) === -1 && len > 0 && action.title) {
+        if (top) {
+          _columns.unshift(action);
+        } else {
+          _columns.push(action);
+        }
+      }
+    }
+
+    return _columns;
+  }, [isSubCanEdit, subReadOnly, JSON.stringify(line.buttons), deleteItem]);
 
 
   var handleAuth = function handleAuth(record, code) {
   var handleAuth = function handleAuth(record, code) {
     switch (code) {
     switch (code) {
@@ -559,192 +1071,6 @@ var VirtualList = function VirtualList(_ref) {
     }
     }
   };
   };
 
 
-  if (!props.hideDelete && ((_line$buttons = line.buttons) === null || _line$buttons === void 0 ? void 0 : _line$buttons.length) || Array.isArray(itemProps.buttons)) {
-    var top = line.top,
-        _line$style = line.style,
-        style = _line$style === void 0 ? 'ICON' : _line$style,
-        fixed = line.fixed,
-        buttons = line.buttons;
-
-    if (type === 'add') {
-      if (props.originWidget === 'subform') {
-        line.buttons = buttons.filter(function (item) {
-          return item.code === 'DELETE';
-        });
-      } else if (props.originWidget === 'relSelector') {
-        line.buttons = buttons.filter(function (item) {
-          return item.code === 'REMOVE';
-        });
-      }
-    } // if (props.removeable && buttons.findIndex(item => item.code === 'REMOVE') === -1) {
-    //   buttons.push({
-    //     icon: 'remove',
-    //     code: 'REMOVE',
-    //     name: '移除',
-    //     line: true,
-    //     needConfirm: true,
-    //     confirmContent: props.removeContent
-    //   })
-    // }
-
-
-    var len = (line.buttons || []).length;
-    var action = schema.isReadOnly || subReadOnly ? {} : {
-      title: '操作',
-      key: '$action',
-      fixed: fixed ? top ? 'left' : 'right' : props.originWidget === 'subform' ? 'right' : false,
-      align: 'center',
-      // width: ((buttons || []).length + (props.removeable ? 1 : 0)) * (style === 'ICON' ? 32 : style === 'TEXT' ? 36 : 57) + 16,
-      render: function render(value, record, idx) {
-        return /*#__PURE__*/React.createElement(React.Fragment, null, Array.isArray(itemProps.buttons) ? itemProps.buttons.map(function (item, idx) {
-          var callback = item.callback,
-              text = item.text,
-              html = item.html;
-
-          var onClick = function onClick() {};
-
-          if (typeof window[callback] === 'function') {
-            onClick = function onClick() {
-              window[callback]({
-                value: listData,
-                onChange: changeList,
-                schema: schema
-              });
-            };
-          }
-
-          return /*#__PURE__*/React.createElement("a", {
-            key: idx.toString(),
-            style: {
-              marginLeft: 8
-            },
-            onClick: onClick
-          }, /*#__PURE__*/React.createElement("span", {
-            dangerouslySetInnerHTML: {
-              __html: html || text
-            }
-          }));
-        }) : null, Array.isArray(line.buttons) ? line.buttons.map(function (item) {
-          var name = item.name,
-              code = item.code,
-              needConfirm = item.needConfirm,
-              confirmContent = item.confirmContent,
-              icon = item.icon;
-          var display = handleState(record, code, props.originWidget); // if (display === '') {
-          //   btnMap[code] = ''
-          // }
-
-          return /*#__PURE__*/React.createElement(_Tooltip, {
-            title: name
-          }, /*#__PURE__*/React.createElement(_Button, _extends({
-            key: code,
-            style: {
-              marginLeft: 8,
-              display: display
-            }
-          }, item, {
-            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',
-            size: 'small' // disabled={props.originWidget === 'subform' ? false : handleAuth(record, code)}
-            ,
-            onClick: function onClick() {
-              // 已有数据进行操作时才二次提示
-              if (needConfirm && confirmContent && (props.originWidget === 'relSelector' ? record.hasOwnProperty('$auth') : record.hasOwnProperty('id'))) {
-                confirm({
-                  title: confirmContent,
-                  icon: /*#__PURE__*/React.createElement(_ExclamationCircleOutlined, null),
-                  okText: '确认',
-                  okType: 'danger',
-                  cancelText: '取消',
-                  onOk: function onOk() {
-                    if (code === 'DELETE' && props.originWidget === 'subform') {
-                      deleteItem(idx);
-                    } else if (code === 'REMOVE') {
-                      deleteItem(record.orginIdx);
-                      props.handleLineBtnClick(code, record, schema.$id);
-                    } else if (code === 'COPY') {
-                      copyItem(record.orginIdx);
-                    } else if (item.action === 'CUSTOM') {
-                      props.handleCustom(item, record, schema.$id);
-                    } else {
-                      props.handleLineBtnClick(code, record, schema.$id, line.action);
-                    }
-                  },
-                  onCancel: function onCancel() {}
-                });
-              } else {
-                if (code === 'DELETE' && props.originWidget === 'subform') {
-                  deleteItem(idx);
-                } else if (code === 'REMOVE') {
-                  deleteItem(record.orginIdx);
-                  props.handleLineBtnClick(code, record, schema.$id);
-                } else if (code === 'COPY') {
-                  copyItem(record.orginIdx);
-                } else if (item.action === 'CUSTOM') {
-                  props.handleCustom(item, record, schema.$id);
-                } else {
-                  props.handleLineBtnClick(code, record, schema.$id, line.action);
-                }
-              }
-            }
-          }), style !== 'ICON' ? name : null)); // }
-        }) : null);
-      }
-    };
-
-    if (style === "ICON" || props.originWidget === 'subform') {
-      // 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 {
-      var leng = 0;
-      line.buttons.map(function (item) {
-        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;
-
-        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) {
-      return item.key === '$action';
-    }) === -1 && len > 0 && action.title) {
-      if (top) {
-        columns.unshift(action);
-      } else {
-        columns.push(action);
-      }
-    }
-  }
-
   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, currentAppCode, currentFunCode, appCode, funCode, fieldName, result;
       var queryParams, currentAppCode, currentFunCode, appCode, funCode, fieldName, result;
@@ -876,68 +1202,6 @@ var VirtualList = function VirtualList(_ref) {
     setSubEdit(false);
     setSubEdit(false);
   };
   };
 
 
-  var barBtnClick = function barBtnClick(code, needConfirm, confirmContent, action, item) {
-    setSelectedRowKeys([]);
-
-    if (needConfirm && confirmContent) {
-      if (!selectedRowKeys.length) {
-        return _message.warning('请选择数据');
-      }
-
-      confirm({
-        title: confirmContent,
-        icon: /*#__PURE__*/React.createElement(_ExclamationCircleOutlined, null),
-        okText: '确认',
-        okType: 'danger',
-        cancelText: '取消',
-        onOk: function onOk() {
-          if (code === 'DELETE') {
-            if (props.originWidget === 'subform') {
-              batchDelete(selectedRowKeys);
-              setSelectedRowKeys([]);
-            } else {
-              props.handleBarBtnClick(code, fieldName, batchKey, selectedRowKeys, schema.$id, selectedIds);
-            }
-          } else if (code === 'EXPORT') {
-            handleExport();
-          } else if (code === 'SELECT') {
-            props.openRelSelect(schema.$id);
-          } else if (code === 'ADD') {
-            props.handleRelAdd(schema.$id);
-          } else if (code === 'subformEdit') {
-            props.handleBatchEdit(fieldName, schema.$id, selectedIds);
-          } else if (action === 'CUSTOM') {
-            props.handleCustom(item, selectedIds, schema.$id);
-          } else {
-            props.handleBarBtnClick(code, fieldName, batchKey, selectedRowKeys, schema.$id, selectedIds);
-          }
-        },
-        onCancel: function onCancel() {}
-      });
-    } else {
-      if (code === 'DELETE') {
-        if (props.originWidget === 'subform') {
-          batchDelete(selectedRowKeys);
-          setSelectedRowKeys([]);
-        } else {
-          props.handleBarBtnClick(code, fieldName, batchKey, selectedRowKeys, schema.$id, selectedIds);
-        }
-      } else if (code === 'EXPORT') {
-        handleExport();
-      } else if (code === 'SELECT') {
-        props.openRelSelect(schema.$id);
-      } else if (code === 'ADD') {
-        props.handleRelAdd(schema.$id);
-      } else if (code === 'subformEdit') {
-        props.handleBatchEdit(fieldName, schema.$id, selectedIds);
-      } else if (action === 'CUSTOM') {
-        props.handleCustom(item, selectedIds, schema.$id);
-      } else {
-        props.handleBarBtnClick(code, fieldName, batchKey, selectedRowKeys, schema.$id, selectedIds);
-      }
-    }
-  };
-
   return /*#__PURE__*/React.createElement("div", null, props.editable ? isSubCanEdit ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Button, {
   return /*#__PURE__*/React.createElement("div", null, props.editable ? isSubCanEdit ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Button, {
     type: 'text',
     type: 'text',
     size: "small",
     size: "small",
@@ -983,7 +1247,9 @@ var VirtualList = function VirtualList(_ref) {
 
 
       setKeyWord(((_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.value) || '');
       setKeyWord(((_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.value) || '');
     }
     }
-  }) : /*#__PURE__*/React.createElement(React.Fragment, null), /*#__PURE__*/React.createElement("div", null, (barButtons.length > 4 ? barButtons.slice(0, 3) : barButtons.slice(0, 4)).map(function (item) {
+  }) : /*#__PURE__*/React.createElement(React.Fragment, null), /*#__PURE__*/React.createElement("div", null, (barButtons.length > 4 ? barButtons.slice(0, 3) : barButtons.slice(0, 4)).filter(function (item) {
+    return isInDing ? !['EXPORT', 'IMPORT'].includes(item.code) : true;
+  }).map(function (item) {
     var name = item.name,
     var name = item.name,
         code = item.code,
         code = item.code,
         needConfirm = item.needConfirm,
         needConfirm = item.needConfirm,
@@ -1071,10 +1337,11 @@ var VirtualList = function VirtualList(_ref) {
     id: 'qxVirtualList',
     id: 'qxVirtualList',
     className: 'qx-virtualList',
     className: 'qx-virtualList',
     rowKey: props.originWidget === 'relSelector' ? 'id' : 'orginIdx',
     rowKey: props.originWidget === 'relSelector' ? 'id' : 'orginIdx',
-    scroll: {
-      y: scrollY,
+    scroll: _objectSpread({
       x: '100%'
       x: '100%'
-    } // components={vt}
+    }, !isFullScreen && {
+      y: scrollY
+    }) // components={vt}
     ,
     ,
     size: size || 'small'
     size: size || 'small'
   }, props.originWidget === 'relSelector' ? {
   }, props.originWidget === 'relSelector' ? {
@@ -1096,7 +1363,7 @@ var VirtualList = function VirtualList(_ref) {
     type: "link",
     type: "link",
     icon: /*#__PURE__*/React.createElement(_PlusOutlined, null),
     icon: /*#__PURE__*/React.createElement(_PlusOutlined, null),
     onClick: function onClick() {
     onClick: function onClick() {
-      addItem(handleAddDefault);
+      addItem();
     }
     }
   }, "\u65B0\u589E"));
   }, "\u65B0\u589E"));
 };
 };
@@ -1115,14 +1382,7 @@ function handleDownload(_x, _x2, _x3) {
 
 
 function _handleDownload() {
 function _handleDownload() {
   _handleDownload = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(url, name, request) {
   _handleDownload = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(url, name, request) {
-    var _dd$env;
-
     var isDownload,
     var isDownload,
-        isInDing,
-        needToken,
-        dingUrl,
-        prev,
-        append,
         link,
         link,
         blob,
         blob,
         downloadUrl,
         downloadUrl,
@@ -1136,44 +1396,46 @@ function _handleDownload() {
 
 
             if (isDownload === null || Boolean(isDownload)) {
             if (isDownload === null || Boolean(isDownload)) {
               _message.warning('即将开始下载，请勿重复点击。');
               _message.warning('即将开始下载，请勿重复点击。');
-            }
-
-            isInDing = (dd === null || dd === void 0 ? void 0 : (_dd$env = dd.env) === null || _dd$env === void 0 ? void 0 : _dd$env.platform) !== 'notInDingTalk';
-
-            if (!isInDing) {
-              _context2.next = 8;
-              break;
-            }
+            } // console.log('url========', url);
+            // const isInDing = dd && dd?.env?.platform !== 'notInDingTalk';
+            // if (isInDing) {
+            //   // 比如导出 导入
+            //   const needToken = !(url.includes('http://') || url.includes('https://'));
+            //   let dingUrl;
+            //   if (needToken) {
+            //     const apiUri = process.env.apiUrl || '';
+            //     const needConcat = !(apiUri.includes('http://') || apiUri.includes('https://')); // 打包后
+            //     const prev = `${needConcat ? location.origin : ''}${apiUri}${url}`;
+            //     const append = `_token=${QIXIAO_TOKEN}${isDesignPage() ? '&_bizCode=design' : ''}`;
+            //     dingUrl = `${prev}${prev.includes('?') ? '&' : '?'}${append}`; // 文件服务器 不能加参数
+            //   } else {
+            //     dingUrl = url;
+            //   }
+            //   console.log('dingUrl========', dingUrl);
+            //   const fileName = name || '下载文件';
+            //   dd.biz.util.downloadFile({
+            //     url: dingUrl,
+            //     name: fileName,
+            //     onFail: function () {
+            //       message.error(`${fileName} 文件下载失败`);
+            //     },
+            //   });
+            //   return;
+            // }
 
 
-            // 比如导出 导入
-            needToken = !(url.includes('http://') || url.includes('https://'));
-
-            if (needToken) {
-              prev = "".concat(process.env.apiUrl).concat(url);
-              append = "_token=".concat(QIXIAO_TOKEN).concat(isDesignPage() ? '&_bizCode=design' : '');
-              dingUrl = "".concat(prev).concat(prev.includes('?') ? '&' : '?').concat(append); // 文件服务器 不能加参数
-            } else {
-              dingUrl = url;
-            }
-
-            dd.biz.util.downloadFile({
-              url: dingUrl
-            });
-            return _context2.abrupt("return");
 
 
-          case 8:
             link = document.createElement('a');
             link = document.createElement('a');
             link.href = url;
             link.href = url;
             link.download = name;
             link.download = name;
             link.target = '_blank';
             link.target = '_blank';
             document.body.appendChild(link); //TODO 文件过大时，看不到下载进度
             document.body.appendChild(link); //TODO 文件过大时，看不到下载进度
 
 
-            _context2.next = 15;
+            _context2.next = 9;
             return request.get(url, {
             return request.get(url, {
               autoShowError: true
               autoShowError: true
             });
             });
 
 
-          case 15:
+          case 9:
             blob = _context2.sent;
             blob = _context2.sent;
 
 
             if (blob !== null) {
             if (blob !== null) {
@@ -1184,7 +1446,7 @@ function _handleDownload() {
               URL.revokeObjectURL(downloadUrl);
               URL.revokeObjectURL(downloadUrl);
             }
             }
 
 
-          case 17:
+          case 11:
           case "end":
           case "end":
             return _context2.stop();
             return _context2.stop();
         }
         }

@@ -10,15 +10,15 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 
 
 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 _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 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); if (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 _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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 _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; }
 
 
 /* eslint-disable jsx-a11y/anchor-is-valid */
 /* eslint-disable jsx-a11y/anchor-is-valid */
 import React from 'react';
 import React from 'react';
-import { get } from 'lodash-es';
+import { cloneDeep, get, isFunction } from 'lodash-es';
 import { useStore, useTools } from '../../../hooks';
 import { useStore, useTools } from '../../../hooks';
 import { generateDataSkeleton, getDataPath, getSchemaFromFlatten } from '../../../utils';
 import { generateDataSkeleton, getDataPath, getSchemaFromFlatten } from '../../../utils';
 import CardList from './CardList';
 import CardList from './CardList';
@@ -74,36 +74,23 @@ var RenderList = function RenderList(_ref) {
     onItemChange(dataPath, newList);
     onItemChange(dataPath, newList);
   };
   };
 
 
-  var addItem = function addItem(handleAddDefault) {
-    // const newList = [...displayList, {_active: true}];
+  var addItem = function addItem() {
+    var _item = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
+
     var _schema = getSchemaFromFlatten(flatten, parentId);
     var _schema = getSchemaFromFlatten(flatten, parentId);
 
 
-    var _newItem = generateDataSkeleton(_schema.items) || {};
+    var newItem = _objectSpread(_objectSpread({}, generateDataSkeleton(_schema.items) || {}), _item);
 
 
-    var newItem = _objectSpread(_objectSpread({}, _newItem), {}, {
+    var newList = [].concat(_toConsumableArray(displayList), [_objectSpread(_objectSpread({}, newItem), {}, {
       _active: true
       _active: true
-    });
-
-    var callback = function callback() {
-      var _new = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : newItem;
-
-      onItemChange(dataPath, [].concat(_toConsumableArray(displayList), [_objectSpread(_objectSpread({}, _new), {}, {
-        _active: true
-      })]));
-    };
-
-    if (_.isFunction(handleAddDefault)) {
-      handleAddDefault(newItem, callback);
-    } else {
-      callback();
-    }
-
-    return displayList.length;
+    })]);
+    var newIndex = newList.length - 1;
+    onItemChange(dataPath, newList);
+    return newIndex;
   };
   };
 
 
   var copyItem = function copyItem(idx) {
   var copyItem = function copyItem(idx) {
-    var newItem = _.cloneDeep(displayList[idx]);
-
+    var newItem = cloneDeep(displayList[idx]);
     delete newItem.id;
     delete newItem.id;
     var newList = [].concat(_toConsumableArray(displayList.slice(0, idx + 1)), [newItem], _toConsumableArray(displayList.slice(idx + 1)));
     var newList = [].concat(_toConsumableArray(displayList.slice(0, idx + 1)), [newItem], _toConsumableArray(displayList.slice(idx + 1)));
     onItemChange(dataPath, JSON.parse(JSON.stringify(newList)));
     onItemChange(dataPath, JSON.parse(JSON.stringify(newList)));
@@ -209,7 +196,19 @@ var RenderList = function RenderList(_ref) {
     errorFields: errorFields,
     errorFields: errorFields,
     displayType: displayType,
     displayType: displayType,
     getFieldsProps: getFieldsProps
     getFieldsProps: getFieldsProps
-  };
+  }; // 外部定义：添加按钮事件
+
+  var onAdd = methods[props.onAdd];
+
+  if (isFunction(onAdd)) {
+    displayProps.addItem = function () {
+      return onAdd(function (_item) {
+        return addItem(_item);
+      }, {
+        schema: schema
+      });
+    };
+  }
 
 
   if (renderWidget === 'listForMobile') {
   if (renderWidget === 'listForMobile') {
     return /*#__PURE__*/React.createElement(ListForMobile, displayProps);
     return /*#__PURE__*/React.createElement(ListForMobile, displayProps);

+export function isDesignPage() {
+  var href = location.href;
+  var res = false;
+
+  if (href.indexOf('/app-view/') > -1) {
+    res = true;
+  } else if (href.indexOf('/apps/design') > -1) {
+    res = true;
+  } else if (href.indexOf('/editor/form') > -1) {
+    res = true;
+  } else if (href.indexOf('/editor/setting') > -1) {
+    res = true;
+  } else if (href.indexOf('/editor/view') > -1) {
+    res = true;
+  } else if (href.indexOf('/editor/detail') > -1) {
+    res = true;
+  } else if (href.indexOf('/editor/custom') > -1) {
+    res = true;
+  } else if (href.indexOf('/editor/aggregation') > -1) {
+    res = true;
+  } else if (href.indexOf('/component') > -1) {
+    res = true;
+  } else if (href.indexOf('/editor/chart') > -1) {
+    res = true;
+  } else if (href.indexOf('businessCode=design') > -1) {
+    res = true;
+  } else if (href.indexOf('refer=/app-view/') > -1) {
+    res = true;
+  } else if (href.indexOf('/datacube/edit') > -1) {
+    res = true;
+  } else if (href.indexOf('/datacube/config') > -1) {
+    res = true;
+  } else if (href.indexOf('/datacube/design') > -1) {
+    res = true;
+  }
+
+  return res;
+}

-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); if (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 _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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 _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; }
 
 
@@ -90,7 +90,7 @@ var ExtendedWidget = function ExtendedWidget(_ref) {
   }
   }
 
 
   var Widget = widgets[widgetName] || widgets['html'];
   var Widget = widgets[widgetName] || widgets['html'];
-  var extraSchema = extraSchemaList[widgetName];
+  var extraSchema = extraSchemaList[widgetName]; // console.log(hasError, '----------');
 
 
   var widgetProps = _objectSpread(_objectSpread({
   var widgetProps = _objectSpread(_objectSpread({
     schema: _objectSpread(_objectSpread({}, schema), extraSchema),
     schema: _objectSpread(_objectSpread({}, schema), extraSchema),
@@ -173,21 +173,41 @@ var ExtendedWidget = function ExtendedWidget(_ref) {
   }, /*#__PURE__*/React.createElement(Widget, finalProps)));
   }, /*#__PURE__*/React.createElement(Widget, finalProps)));
 };
 };
 
 
+function getValue(_data, key) {
+  if (!key) {
+    return null;
+  }
+
+  var keys = key.split('.');
+  return keys.reduce(function (prev, cur) {
+    if (cur === keys[keys.length - 1]) {
+      return prev[cur];
+    } else {
+      return prev[cur] || {};
+    }
+  }, _data);
+}
+
 var areEqual = function areEqual(prev, current) {
 var areEqual = function areEqual(prev, current) {
+  var _prev$schema, _prev$schema$props;
+
   if (prev.schema && current.schema) {
   if (prev.schema && current.schema) {
     if (prev.schema.$id === '#') {
     if (prev.schema.$id === '#') {
       return false;
       return false;
-    }
+    } // if (prev.schema.hidden && current.schema.hidden) {
+    //   return true;
+    // }
 
 
-    if (prev.schema.hidden && current.schema.hidden) {
-      return true;
-    }
   }
   }
 
 
   if (prev.readOnly !== current.readOnly) {
   if (prev.readOnly !== current.readOnly) {
     return false;
     return false;
   }
   }
 
 
+  if (prev.hasError !== current.hasError) {
+    return false;
+  }
+
   if (prev.disabled !== current.disabled) {
   if (prev.disabled !== current.disabled) {
     return false;
     return false;
   }
   }
@@ -196,6 +216,10 @@ var areEqual = function areEqual(prev, current) {
     return false;
     return false;
   }
   }
 
 
+  if ((prev.schema.widget === 'virtualList' || prev.schema.widget === 'relSelector') && ((_prev$schema = prev.schema) === null || _prev$schema === void 0 ? void 0 : (_prev$schema$props = _prev$schema.props) === null || _prev$schema$props === void 0 ? void 0 : _prev$schema$props.mode) === 'TAG' && JSON.stringify(getValue(prev.formData, prev.schema.relformKey)) !== JSON.stringify(getValue(current.formData, current.schema.relformKey))) {
+    return false;
+  }
+
   if (isObjType(prev.schema) && isObjType(current.schema)) {
   if (isObjType(prev.schema) && isObjType(current.schema)) {
     return false;
     return false;
   }
   }
@@ -207,4 +231,4 @@ var areEqual = function areEqual(prev, current) {
   return false;
   return false;
 };
 };
 
 
-export default /*#__PURE__*/React.memo(ExtendedWidget, areEqual);
+export default /*#__PURE__*/React.memo(ExtendedWidget, areEqual); // export default ExtendedWidget;

-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"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
 
 import React from 'react';
 import React from 'react';
 import { useTools } from '../../hooks';
 import { useTools } from '../../hooks';

@@ -62,7 +62,8 @@ var Description = function Description(_ref) {
       }
       }
 
 
       return /*#__PURE__*/React.createElement("span", {
       return /*#__PURE__*/React.createElement("span", {
-        className: "fr-desc ml2"
+        className: "fr-desc ml2",
+        title: description
       }, "( ".concat(description, " )"));
       }, "( ".concat(description, " )"));
   }
   }
 };
 };

@@ -62,7 +62,8 @@ var RenderField = function RenderField(props) {
       renderTitle = _useTools.renderTitle,
       renderTitle = _useTools.renderTitle,
       requiredMark = _useTools.requiredMark,
       requiredMark = _useTools.requiredMark,
       setFieldValidating = _useTools.setFieldValidating,
       setFieldValidating = _useTools.setFieldValidating,
-      removeFieldValidating = _useTools.removeFieldValidating;
+      removeFieldValidating = _useTools.removeFieldValidating,
+      setValueByPath = _useTools.setValueByPath;
 
 
   var formDataRef = useRef();
   var formDataRef = useRef();
   formDataRef.current = formData; // console.log('<renderField>', $id);
   formDataRef.current = formData; // console.log('<renderField>', $id);
@@ -184,6 +185,10 @@ var RenderField = function RenderField(props) {
     return getValueByPath(formData, path);
     return getValueByPath(formData, path);
   };
   };
 
 
+  if (formDataRef.current && ['virtualList', 'listForMobile'].includes(_schema.widget)) {
+    _schema._setValueByPath = setValueByPath;
+  }
+
   var widgetProps = {
   var widgetProps = {
     $id: $id,
     $id: $id,
     schema: _schema,
     schema: _schema,

 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", "labelAlign", "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); if (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 _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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 _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; }
 
 
@@ -140,12 +140,11 @@ 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 _labelAlign = schema.labelAlign || rest.labelAlign || labelAlign || 'right';
@@ -238,6 +237,12 @@ var CoreRender = function CoreRender(_ref2) {
 
 
   var columnStyle = {};
   var columnStyle = {};
 
 
+  if (schema.currentStep === false) {
+    columnStyle.display = 'none';
+  } else {
+    columnStyle = {};
+  }
+
   if (schema.hidden) {
   if (schema.hidden) {
     columnStyle.display = 'none';
     columnStyle.display = 'none';
   } // if (!isComplex) {
   } // if (!isComplex) {

@@ -3,9 +3,9 @@ var _excluded = ["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 _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 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); if (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 _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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 _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 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); if (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 _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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 _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; }
 
 
@@ -52,6 +52,11 @@ export var useSet = function useSet(initState) {
     // console.groupEnd();
     // console.groupEnd();
 
 
 
 
+    // console.group(newState.action || 'action'); // TODO: give it a name
+    // console.log('%cState:', 'color: #9E9E9E; font-weight: 700;', state);
+    // console.log('%cAction:', 'color: #00A7F7; font-weight: 700;', action);
+    // console.log('%cNext:', 'color: #47B04B; font-weight: 700;', result);
+    // console.groupEnd();
     return result;
     return result;
   }, initState),
   }, initState),
       _useReducer2 = _slicedToArray(_useReducer, 2),
       _useReducer2 = _slicedToArray(_useReducer, 2),

@@ -329,6 +329,35 @@
   visibility: hidden;
   visibility: hidden;
   word-wrap: break-word;
   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%;

@@ -4,11 +4,11 @@ var _excluded = ["id", "widgets", "layoutWidgets", "mapping", "form", "className
 
 
 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 _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"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _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 ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (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 _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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 _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 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); if (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 _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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 _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 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); if (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 _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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 _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; }
 
 
@@ -399,7 +399,9 @@ var useForm = function useForm(props) {
 
 
     if (Array.isArray(nameList)) {
     if (Array.isArray(nameList)) {
       nameList.forEach(function (path) {
       nameList.forEach(function (path) {
-        set(currentData, path, get(data, path));
+        var _path = path.replace('[]', '');
+
+        set(currentData, _path, get(data, _path));
       });
       });
     } else {
     } else {
       currentData = data;
       currentData = data;
@@ -557,11 +559,20 @@ var useForm = function useForm(props) {
     var data = _data.current;
     var data = _data.current;
 
 
     if (Array.isArray(nameList)) {
     if (Array.isArray(nameList)) {
-      set(data, {});
+      data = {};
       nameList.forEach(function (path) {
       nameList.forEach(function (path) {
-        set(data, path, get(_data.current, path));
+        var _path = path.replace('[]', '');
+
+        set(data, _path, get(_data.current, _path));
       });
       });
-    }
+    } // const data = _data.current;
+    // if (Array.isArray(nameList)) {
+    //   set(data, {});
+    //   nameList.forEach(path => {
+    //     set(data, path, get(_data.current, path));
+    //   });
+    // }
+
 
 
     setState({
     setState({
       isValidating: true
       isValidating: true

@@ -13,11 +13,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; }
 
 
-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"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _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 ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (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 _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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 _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; }
 
 
@@ -541,8 +541,8 @@ export function parseSingleExpression(func) {
     try {
     try {
       return Function(str)();
       return Function(str)();
     } catch (error) {
     } catch (error) {
-      console.log(error, func, dataPath);
-      return null; // 如果计算有错误，return null 最合适
+      return null; // 如果计算有错误，return null
+      // 最合适
     } // const funcBody = func.substring(2, func.length - 2);
     } // const funcBody = func.substring(2, func.length - 2);
     // //TODO: 这样有问题，例如 a.b.indexOf(), 会把 a.b.indexOf 当做值
     // //TODO: 这样有问题，例如 a.b.indexOf(), 会把 a.b.indexOf 当做值
     // const match1 = /formData.([a-zA-Z0-9.$_\[\]]+)/g;
     // const match1 = /formData.([a-zA-Z0-9.$_\[\]]+)/g;
@@ -1148,9 +1148,9 @@ export var cleanEmpty = function cleanEmpty(obj) {
     return obj.map(function (v) {
     return obj.map(function (v) {
       return v && isObject(v) ? cleanEmpty(v) : v;
       return v && isObject(v) ? cleanEmpty(v) : v;
     }).filter(function (v) {
     }).filter(function (v) {
-      return !(v == undefined);
+      return !(v === undefined);
     });
     });
-  } else if (isObject(obj)) {
+  } else if (isObject(obj) && obj) {
     return Object.entries(obj).map(function (_ref12) {
     return Object.entries(obj).map(function (_ref12) {
       var _ref13 = _slicedToArray(_ref12, 2),
       var _ref13 = _slicedToArray(_ref12, 2),
           k = _ref13[0],
           k = _ref13[0],
@@ -1162,7 +1162,7 @@ export var cleanEmpty = function cleanEmpty(obj) {
           k = _ref15[0],
           k = _ref15[0],
           v = _ref15[1];
           v = _ref15[1];
 
 
-      return v == undefined ? a : (a[k] = v, a);
+      return v === undefined ? a : (a[k] = v, a);
     }, {});
     }, {});
   } else {
   } else {
     return obj;
     return obj;

@@ -27,19 +27,19 @@ 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}',
     min: '${title}不能小于${min}',
     min: '${title}不能小于${min}',
     max: '${title}不能大于${max}',
     max: '${title}不能大于${max}',
-    range: '${title}需在${min}与${max}之间'
+    range: '${title}需在${min}～${max}之间'
   },
   },
   array: {
   array: {
     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}'

@@ -4,9 +4,9 @@ var _excluded = ["widgets", "configProvider"];
 
 
 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 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); if (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 _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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 _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; }
 
 

@@ -4,9 +4,9 @@ var _excluded = ["onChange", "format", "value", "style"];
 
 
 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 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); if (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 _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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 _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; }
 
 

@@ -15,9 +15,9 @@ var _excluded = ["style"],
 
 
 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 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); if (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 _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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 _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; }
 
 

@@ -4,9 +4,9 @@ var _excluded = ["schema", "style", "value", "onChange", "options", "addons"];
 
 
 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 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); if (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 _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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 _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; }
 
 

 "use strict";
 "use strict";
 
 
-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"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
 
 Object.defineProperty(exports, "__esModule", {
 Object.defineProperty(exports, "__esModule", {
   value: true
   value: true

 "use strict";
 "use strict";
 
 
-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"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
 
 Object.defineProperty(exports, "__esModule", {
 Object.defineProperty(exports, "__esModule", {
   value: true
   value: true

@@ -31,13 +31,13 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 
 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 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); if (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 _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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 _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 _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
 
 var CardList = function CardList(_ref) {
 var CardList = function CardList(_ref) {
   var _ref$displayList = _ref.displayList,
   var _ref$displayList = _ref.displayList,

@@ -58,13 +58,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; }
 
 
-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); if (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 _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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 _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 _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _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; }
 
 

 "use strict";
 "use strict";
 
 
-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"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
 
 Object.defineProperty(exports, "__esModule", {
 Object.defineProperty(exports, "__esModule", {
   value: true
   value: true
@@ -89,8 +89,7 @@ var ListForMobile = function ListForMobile(_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,
-      handleAddDefault = schema.handleAddDefault;
+      itemProps = schema.itemProps;
 
 
   var _useState = (0, _react.useState)([]),
   var _useState = (0, _react.useState)([]),
       _useState2 = _slicedToArray(_useState, 2),
       _useState2 = _slicedToArray(_useState, 2),
@@ -174,7 +173,7 @@ var ListForMobile = function ListForMobile(_ref) {
   }))), /*#__PURE__*/_react.default.createElement("a", {
   }))), /*#__PURE__*/_react.default.createElement("a", {
     className: 'add-button',
     className: 'add-button',
     onClick: function onClick() {
     onClick: function onClick() {
-      addItem(handleAddDefault);
+      addItem();
     }
     }
   }, /*#__PURE__*/_react.default.createElement(_PlusCircleFilled2.default, {
   }, /*#__PURE__*/_react.default.createElement(_PlusCircleFilled2.default, {
     style: {
     style: {

@@ -29,13 +29,13 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 
 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 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); if (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 _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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 _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 _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
 
 var SimpleList = function SimpleList(_ref) {
 var SimpleList = function SimpleList(_ref) {
   var schema = _ref.schema,
   var schema = _ref.schema,

 "use strict";
 "use strict";
 
 
-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"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
 
 Object.defineProperty(exports, "__esModule", {
 Object.defineProperty(exports, "__esModule", {
   value: true
   value: true

@@ -44,13 +44,13 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 
 
 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 _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 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); if (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 _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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 _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 _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _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; }
 
 

@@ -29,15 +29,11 @@ var _input = _interopRequireDefault(require("antd/es/input"));
 
 
 var _SearchOutlined2 = _interopRequireDefault(require("@ant-design/icons/lib/icons/SearchOutlined"));
 var _SearchOutlined2 = _interopRequireDefault(require("@ant-design/icons/lib/icons/SearchOutlined"));
 
 
-require("antd/es/message/style");
-
-var _message2 = _interopRequireDefault(require("antd/es/message"));
-
 require("antd/es/tooltip/style");
 require("antd/es/tooltip/style");
 
 
 var _tooltip = _interopRequireDefault(require("antd/es/tooltip"));
 var _tooltip = _interopRequireDefault(require("antd/es/tooltip"));
 
 
-var _ExclamationCircleOutlined2 = _interopRequireDefault(require("@ant-design/icons/lib/icons/ExclamationCircleOutlined"));
+var _InfoCircleOutlined2 = _interopRequireDefault(require("@ant-design/icons/lib/icons/InfoCircleOutlined"));
 
 
 require("antd/es/menu/style");
 require("antd/es/menu/style");
 
 
@@ -47,6 +43,12 @@ require("antd/es/button/style");
 
 
 var _button = _interopRequireDefault(require("antd/es/button"));
 var _button = _interopRequireDefault(require("antd/es/button"));
 
 
+var _ExclamationCircleOutlined2 = _interopRequireDefault(require("@ant-design/icons/lib/icons/ExclamationCircleOutlined"));
+
+require("antd/es/message/style");
+
+var _message2 = _interopRequireDefault(require("antd/es/message"));
+
 var _AlertOutlined2 = _interopRequireDefault(require("@ant-design/icons/lib/icons/AlertOutlined"));
 var _AlertOutlined2 = _interopRequireDefault(require("@ant-design/icons/lib/icons/AlertOutlined"));
 
 
 var _BarsOutlined2 = _interopRequireDefault(require("@ant-design/icons/lib/icons/BarsOutlined"));
 var _BarsOutlined2 = _interopRequireDefault(require("@ant-design/icons/lib/icons/BarsOutlined"));
@@ -99,11 +101,13 @@ var _react = _interopRequireWildcard(require("react"));
 
 
 var _index2 = _interopRequireDefault(require("../../index"));
 var _index2 = _interopRequireDefault(require("../../index"));
 
 
-var _icon = _interopRequireDefault(require("./icon"));
-
 var dd = _interopRequireWildcard(require("dingtalk-jsapi"));
 var dd = _interopRequireWildcard(require("dingtalk-jsapi"));
 
 
-var _excluded = ["scrollY", "summary", "batchKey", "type", "bar", "line", "searchKey", "rowSelection", "size"];
+var _moment = _interopRequireDefault(require("moment"));
+
+var _icon = _interopRequireDefault(require("./icon"));
+
+var _excluded = ["scrollY", "summary", "batchKey", "type", "bar", "line", "searchKey", "rowSelection", "size", "originWidget"];
 
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 
@@ -117,9 +121,9 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 
 
 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 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); if (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 _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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 _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; }
 
 
@@ -131,7 +135,7 @@ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symb
 
 
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 
 
-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"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
 
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 
@@ -149,7 +153,7 @@ 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; }
 
 
-var confirm = _modal.default.confirm; // import {useVT} from 'virtualizedtableforantd4';
+var confirm = _modal.default.confirm; // import { isDesignPage } from './utils'
 
 
 var BUTTON_ICONS_MAP = {
 var BUTTON_ICONS_MAP = {
   PlusOutlined: /*#__PURE__*/_react.default.createElement(_PlusOutlined2.default, null),
   PlusOutlined: /*#__PURE__*/_react.default.createElement(_PlusOutlined2.default, null),
@@ -186,7 +190,7 @@ var EXPORT_STATUS = {
 };
 };
 
 
 var VirtualList = function VirtualList(_ref) {
 var VirtualList = function VirtualList(_ref) {
-  var _line$buttons;
+  var _dd$env;
 
 
   var _ref$displayList = _ref.displayList,
   var _ref$displayList = _ref.displayList,
       displayList = _ref$displayList === void 0 ? [] : _ref$displayList,
       displayList = _ref$displayList === void 0 ? [] : _ref$displayList,
@@ -201,7 +205,8 @@ var VirtualList = function VirtualList(_ref) {
       schema = _ref.schema,
       schema = _ref.schema,
       listData = _ref.listData,
       listData = _ref.listData,
       changeList = _ref.changeList,
       changeList = _ref.changeList,
-      copyItem = _ref.copyItem;
+      copyItem = _ref.copyItem,
+      dataPath = _ref.dataPath;
   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,
@@ -210,9 +215,10 @@ var VirtualList = function VirtualList(_ref) {
       _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,
+      isReadOnly = schema.isReadOnly,
       subReadOnly = schema.subReadOnly,
       subReadOnly = schema.subReadOnly,
       isLoading = schema.isLoading,
       isLoading = schema.isLoading,
-      handleAddDefault = schema.handleAddDefault;
+      isFullScreen = schema.isFullScreen;
 
 
   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,
@@ -226,6 +232,7 @@ var VirtualList = function VirtualList(_ref) {
       searchKey = props.searchKey,
       searchKey = props.searchKey,
       rowSelection = props.rowSelection,
       rowSelection = props.rowSelection,
       size = props.size,
       size = props.size,
+      originWidget = props.originWidget,
       rest = _objectWithoutProperties(props, _excluded); // const [vt, set_components] = useVT(() => ({scroll: {y: scrollY}}), []);
       rest = _objectWithoutProperties(props, _excluded); // const [vt, set_components] = useVT(() => ({scroll: {y: scrollY}}), []);
 
 
 
 
@@ -269,6 +276,19 @@ var VirtualList = function VirtualList(_ref) {
       loading = _useState14[0],
       loading = _useState14[0],
       setLoading = _useState14[1];
       setLoading = _useState14[1];
 
 
+  var mergeFieldsMap = (0, _react.useRef)({});
+  var isMergeFieldExist = (0, _react.useRef)(false); // const [cloneList, setCloneList] = useState([]);
+
+  var isInDing = dd && (dd === null || dd === void 0 ? void 0 : (_dd$env = dd.env) === null || _dd$env === void 0 ? void 0 : _dd$env.platform) !== 'notInDingTalk';
+
+  if (subReadOnly) {
+    Object.keys(flatten).forEach(function (key) {
+      if (key.indexOf(schema.$id) === 0 && key.split('.').length > 1) {
+        flatten[key].schema.readOnly = true;
+      }
+    });
+  }
+
   (0, _react.useEffect)(function () {
   (0, _react.useEffect)(function () {
     setLoading(!!isLoading);
     setLoading(!!isLoading);
   }, [isLoading]);
   }, [isLoading]);
@@ -278,8 +298,7 @@ var VirtualList = function VirtualList(_ref) {
   var newRowSelection = (0, _react.useMemo)(function () {
   var newRowSelection = (0, _react.useMemo)(function () {
     var _bar$buttons;
     var _bar$buttons;
 
 
-    if (schema.isReadOnly) return null;
-
+    // if (schema.isReadOnly) return null
     var _rowSelection = _.cloneDeep(rowSelection); // 根据是否含有批量操作按钮，渲染表格是否可选择
     var _rowSelection = _.cloneDeep(rowSelection); // 根据是否含有批量操作按钮，渲染表格是否可选择
 
 
 
 
@@ -300,25 +319,151 @@ var VirtualList = function VirtualList(_ref) {
     }
     }
 
 
     return _rowSelection;
     return _rowSelection;
-  }, [rowSelection, selectedRowKeys, bar, rowSelection]);
-  (0, _react.useEffect)(function () {
-    displayList.forEach(function (item, index) {
+  }, [JSON.stringify(bar.buttons), JSON.stringify(rowSelection), JSON.stringify(selectedRowKeys)]); // useEffect(() => {
+  //   const _cloneList = _.cloneDeep(displayList);
+  //   _cloneList.forEach((item, index) => {
+  //     if (typeof item === 'object') {
+  //       item.orginIdx = index
+  //     }
+  //   })
+  //   setCloneList(_cloneList);
+  // }, [displayList])
+  //
+  // let _displayList = []
+  //
+  // // 筛选展示的数据
+  // if (props.originWidget === 'relSelector') {
+  //   cloneList.forEach(item => {
+  //     if (!item.hasOwnProperty('$auth') || item.$auth) {
+  //       _displayList.push(item)
+  //     }
+  //   })
+  // } else {
+  //   _displayList = [...cloneList]
+  // }
+
+  var cloneList = (0, _react.useMemo)(function () {
+    //console.log('useMemo cloneList', displayList)
+    var _cloneList = _.cloneDeep(displayList);
+
+    _cloneList.forEach(function (item, index) {
       if (_typeof(item) === 'object') {
       if (_typeof(item) === 'object') {
         item.orginIdx = index;
         item.orginIdx = index;
       }
       }
     });
     });
-  }, [displayList]);
-  var _displayList = []; // 筛选展示的数据
 
 
-  if (props.originWidget === 'relSelector') {
-    displayList.forEach(function (item) {
-      if (!item.hasOwnProperty('$auth') || item.$auth) {
-        _displayList.push(item);
+    return _cloneList;
+  }, [displayList]); // 数据变化时，子表汇总值重新计算，并加到主表的formData中
+
+  (0, _react.useEffect)(function () {
+    var _schema$qxProps2;
+
+    console.log('计算汇总');
+    if (schema.originWidget !== 'subform') return;
+    var subKey = schema.fieldName || schema.propertyKey;
+    if (!schema._setValueByPath) return;
+    (((_schema$qxProps2 = schema.qxProps) === null || _schema$qxProps2 === void 0 ? void 0 : _schema$qxProps2.summary) || []).forEach(function (item) {
+      var fx = item.fx,
+          relField = item.relField,
+          code = item.code;
+      var key = "".concat(subKey, ":").concat(code, ":").concat(fx); // subKey + '.' + code +;
+
+      var values = (displayList || []).map(function (it) {
+        return it[relField];
+      });
+
+      if (!values.length) {
+        schema._setValueByPath(key, 'EMPTY');
+
+        return;
+      }
+
+      if (['COUNTUNIQUE', 'COUNTA'].includes(fx)) {
+        values.forEach(function (_item, index) {
+          if (Array.isArray(_item)) {
+            values[index] = String(_item);
+          }
+        });
+      }
+
+      values = values.filter(function (item) {
+        return item !== undefined;
+      });
+
+      if (fx === 'MAX' || fx === 'MIN') {
+        var widget = '';
+        var keys = Object.keys(flatten || {});
+
+        for (var i = 0; i < keys.length; i++) {
+          if (keys[i].indexOf(relField) > -1) {
+            var _flatten$keys$i, _flatten$keys$i$schem;
+
+            var _widget = (_flatten$keys$i = flatten[keys[i]]) === null || _flatten$keys$i === void 0 ? void 0 : (_flatten$keys$i$schem = _flatten$keys$i.schema) === null || _flatten$keys$i$schem === void 0 ? void 0 : _flatten$keys$i$schem.widget;
+
+            if (_widget !== 'qxSummary') {
+              widget = _widget;
+              break;
+            }
+          }
+        }
+
+        if (['qxDatetime', 'createdAt', 'updatedAt'].includes(widget)) {
+          var _moment$fx$toLowerCas;
+
+          values = values.filter(function (it) {
+            return it;
+          }); // 计算日期的最大最小时，过滤掉空值
+
+          values.forEach(function (it, index) {
+            values[index] = (0, _moment.default)(it);
+          }); // schema.parentFormData[key] = moment[fx.toLowerCase()](values)?._i || 'EMPTY';
+
+          schema._setValueByPath(key, ((_moment$fx$toLowerCas = _moment.default[fx.toLowerCase()](values)) === null || _moment$fx$toLowerCas === void 0 ? void 0 : _moment$fx$toLowerCas._i) || 'EMPTY');
+        } else if (widget === 'qxTime') {
+          var _moment$fx$toLowerCas2, _moment$fx$toLowerCas3;
+
+          values = values.filter(function (it) {
+            return it;
+          }); // 计算时间的最大最小时，过滤掉空值
+
+          values.forEach(function (it, index) {
+            values[index] = (0, _moment.default)('0001-01-01 ' + it); // 随意拼个年月日返回，计算时替换
+          }); // schema.parentFormData[key] = (moment[fx.toLowerCase()](values)?._i)?.slice(11) || 'EMPTY';
+
+          schema._setValueByPath(key, ((_moment$fx$toLowerCas2 = _moment.default[fx.toLowerCase()](values)) === null || _moment$fx$toLowerCas2 === void 0 ? void 0 : (_moment$fx$toLowerCas3 = _moment$fx$toLowerCas2._i) === null || _moment$fx$toLowerCas3 === void 0 ? void 0 : _moment$fx$toLowerCas3.slice(11)) || 'EMPTY');
+        } else {
+          // schema.parentFormData[key] = window[fx](values);
+          schema._setValueByPath(key, window[fx](values));
+        }
+      } else {
+        // schema.parentFormData['__SUMMARY_' + subKey][key] = window[fx](values);
+        var res = window[fx](values);
+
+        if (String(res).startsWith('Error')) {
+          res = null;
+        }
+
+        schema._setValueByPath(key, res);
       }
       }
     });
     });
-  } else {
-    _displayList = _toConsumableArray(displayList);
-  } // useEffect(() => {
+  }, [JSON.stringify(displayList)]);
+
+  var _displayList = (0, _react.useMemo)(function () {
+    //console.log('useMemo _displayList', cloneList)
+    var _displayList1 = []; // 筛选展示的数据
+
+    if (props.originWidget === 'relSelector') {
+      cloneList.forEach(function (item) {
+        if (!item.hasOwnProperty('$auth') || item.$auth) {
+          _displayList1.push(item);
+        }
+      });
+    } else {
+      _displayList1 = _toConsumableArray(cloneList);
+    }
+
+    return _displayList1;
+  }, [cloneList]); // useEffect(() => {
   // 筛选展示的数据
   // 筛选展示的数据
   // if (props.originWidget === 'relSelector') {
   // if (props.originWidget === 'relSelector') {
   //   displayList.forEach((item, index) => {
   //   displayList.forEach((item, index) => {
@@ -360,23 +505,27 @@ var VirtualList = function VirtualList(_ref) {
 
 
   var selectedIds = (0, _react.useMemo)(function () {
   var selectedIds = (0, _react.useMemo)(function () {
     var _selectedIds = [];
     var _selectedIds = [];
-    displayList.forEach(function (item) {
-      if (item && selectedRowKeys.includes(item.orginIdx)) {
+    cloneList.forEach(function (item) {
+      if (item && selectedRowKeys.includes(props.originWidget === 'subform' ? item.orginIdx : item.id)) {
         _selectedIds.push(item.id);
         _selectedIds.push(item.id);
       }
       }
     });
     });
     return _selectedIds;
     return _selectedIds;
-  }, [selectedRowKeys, displayList]); // useEffect(() => {
-
-  var dataSource = (keyWord.length ? _displayList.filter(function (item) {
-    var _String;
-
-    return ((_String = String(item[searchKey])) === null || _String === void 0 ? void 0 : _String.indexOf(keyWord)) > -1;
-  }) : _displayList).map(function (item, idx) {
-    return _objectSpread(_objectSpread({}, item), {}, {
-      index: item.hasOwnProperty('orginIdx') ? item.orginIdx : idx
+  }, [selectedRowKeys, cloneList]); // useEffect(() => {
+
+  var dataSource = (0, _react.useMemo)(function () {
+    //console.log('useMemo dataSource',dataSource);
+    return (keyWord.length ? _displayList.filter(function (item) {
+      var _String;
+
+      return ((_String = String(item[searchKey])) === null || _String === void 0 ? void 0 : _String.indexOf(keyWord)) > -1;
+    }) : _displayList).map(function (item, idx) {
+      return _objectSpread(_objectSpread({}, item), {}, {
+        index: item.hasOwnProperty('orginIdx') ? item.orginIdx : idx,
+        orginIdx: item.hasOwnProperty('orginIdx') ? item.orginIdx : null
+      });
     });
     });
-  }); // useEffect(() => {
+  }, [_displayList, keyWord, searchKey]); // useEffect(() => {
   //   setRefresh(refresh + '1')
   //   setRefresh(refresh + '1')
   // }, [JSON.stringify(dataSource)])
   // }, [JSON.stringify(dataSource)])
   // setDataSource(_dataSource)
   // setDataSource(_dataSource)
@@ -406,6 +555,7 @@ var VirtualList = function VirtualList(_ref) {
   };
   };
 
 
   var pagination = (0, _react.useMemo)(function () {
   var pagination = (0, _react.useMemo)(function () {
+    // console.log('useMemo pagination', dataSource?.length, props.limit)
     return {
     return {
       total: dataSource.length,
       total: dataSource.length,
       position: ['bottomRight'],
       position: ['bottomRight'],
@@ -417,9 +567,20 @@ var VirtualList = function VirtualList(_ref) {
       size: size || 'small' // hideOnSinglePage: true
       size: size || 'small' // hideOnSinglePage: true
 
 
     };
     };
-  }, [dataSource, props.limit]);
+  }, [dataSource === null || dataSource === void 0 ? void 0 : dataSource.length, props.limit]);
   var barButtons = (0, _react.useMemo)(function () {
   var barButtons = (0, _react.useMemo)(function () {
-    var _barButtons = _.cloneDeep(bar.buttons || []); // 关联表的导入，先隐藏 TODO
+    // console.log('useMemo barButtons', schema.isReadOnly, bar.buttons, originWidget, type, subReadOnly)
+    var _barButtons = _.cloneDeep(bar.buttons || []);
+
+    if (schema.isReadOnly) {
+      // 关联表只读
+      // return _barButtons.filter(item => item.code === 'EXPORT')
+      return [];
+    } else if (subReadOnly) {
+      return _barButtons.filter(function (item) {
+        return item.code === 'EXPORT';
+      });
+    } // 关联表的导入，先隐藏 TODO
 
 
 
 
     if (props.originWidget === 'relSelector') {
     if (props.originWidget === 'relSelector') {
@@ -482,105 +643,455 @@ var VirtualList = function VirtualList(_ref) {
 
 
       if (props.originWidget === 'subform') {
       if (props.originWidget === 'subform') {
         addBtns.push('DELETE');
         addBtns.push('DELETE');
+        return _barButtons.filter(function (item) {
+          return addBtns.includes(item.code);
+        });
       }
       }
-
-      return _barButtons.filter(function (item) {
-        return addBtns.includes(item.code);
-      });
     } else if (type === 'view') {
     } else if (type === 'view') {
       return _barButtons.filter(function (item) {
       return _barButtons.filter(function (item) {
         return item.code === 'EXPORT';
         return item.code === 'EXPORT';
       });
       });
     }
     }
 
 
-    if (schema.isReadOnly) {
-      // return _barButtons.filter(item => item.code === 'EXPORT')
-      return [];
+    return _barButtons;
+  }, [schema.isReadOnly, bar.buttons, originWidget, type, subReadOnly]);
+
+  var barBtnClick = function barBtnClick(code, needConfirm, confirmContent, action, item) {
+    setSelectedRowKeys([]);
+
+    if (needConfirm && confirmContent) {
+      if (!selectedRowKeys.length) {
+        return _message2.default.warning('请选择数据');
+      }
+
+      confirm({
+        title: confirmContent,
+        icon: /*#__PURE__*/_react.default.createElement(_ExclamationCircleOutlined2.default, null),
+        okText: '确认',
+        okType: 'danger',
+        cancelText: '取消',
+        onOk: function onOk() {
+          if (code === 'DELETE') {
+            if (props.originWidget === 'subform') {
+              batchDelete(selectedRowKeys);
+              setSelectedRowKeys([]);
+            } else {
+              props.handleBarBtnClick(code, fieldName, batchKey, selectedRowKeys, schema.$id, selectedIds);
+            }
+          } else if (code === 'EXPORT') {
+            handleExport();
+          } else if (code === 'SELECT') {
+            props.openRelSelect(schema.$id);
+          } else if (code === 'ADD') {
+            props.handleRelAdd(schema.$id);
+          } else if (code === 'subformEdit') {
+            props.handleBatchEdit(fieldName, schema.$id, selectedIds);
+          } else if (action === 'CUSTOM') {
+            props.handleCustom(item, selectedIds, schema.$id);
+          } else {
+            props.handleBarBtnClick(code, fieldName, batchKey, selectedRowKeys, schema.$id, selectedIds);
+          }
+        },
+        onCancel: function onCancel() {}
+      });
+    } else {
+      if (code === 'DELETE') {
+        if (props.originWidget === 'subform') {
+          batchDelete(selectedRowKeys);
+          setSelectedRowKeys([]);
+        } else {
+          props.handleBarBtnClick(code, fieldName, batchKey, selectedRowKeys, schema.$id, selectedIds);
+        }
+      } else if (code === 'EXPORT') {
+        handleExport();
+      } else if (code === 'SELECT') {
+        props.openRelSelect(schema.$id);
+      } else if (code === 'ADD') {
+        props.handleRelAdd(schema.$id);
+      } else if (code === 'subformEdit') {
+        props.handleBatchEdit(fieldName, schema.$id, selectedIds);
+      } else if (action === 'CUSTOM') {
+        props.handleCustom(item, selectedIds, schema.$id);
+      } else {
+        props.handleBarBtnClick(code, fieldName, batchKey, selectedRowKeys, schema.$id, selectedIds);
+      }
     }
     }
+  };
 
 
-    return _barButtons;
-  }, [props, type]);
+  var moreButtons = (0, _react.useMemo)(function () {
+    var _barButtons = _.cloneDeep(barButtons);
+
+    return /*#__PURE__*/_react.default.createElement(_menu.default, null, _barButtons.slice(3).filter(function (item) {
+      return isInDing ? !['EXPORT', 'IMPORT'].includes(item.code) : true;
+    }).map(function (item) {
+      var name = item.name,
+          code = item.code,
+          needConfirm = item.needConfirm,
+          confirmContent = item.confirmContent,
+          icon = item.icon,
+          action = item.action;
+      return /*#__PURE__*/_react.default.createElement(_menu.default.Item, null, /*#__PURE__*/_react.default.createElement(_button.default, _extends({
+        key: code,
+        style: {
+          marginLeft: 8,
+          border: 'none'
+        }
+      }, item, {
+        icon: icon && bar.style !== 'TEXT' ? String(icon).indexOf('http') > -1 ? /*#__PURE__*/_react.default.createElement("img", {
+          src: String(icon),
+          style: {
+            width: '16px',
+            height: '16px',
+            marginRight: '4px',
+            verticalAlign: 'text-bottom',
+            borderRadius: '50%'
+          },
+          alt: ""
+        }) : String(icon).indexOf('-') > -1 ? /*#__PURE__*/_react.default.createElement(_icon.default, {
+          type: String(icon)
+        }) : BUTTON_ICONS_MAP[icon + ''] : null,
+        onClick: function onClick() {
+          barBtnClick(code, needConfirm, confirmContent, action, item);
+        }
+      }), name));
+    }));
+  }, [barButtons, barBtnClick, selectedRowKeys]);
 
 
-  var moreButtons = /*#__PURE__*/_react.default.createElement(_menu.default, null, barButtons.slice(3).map(function (item) {
-    var name = item.name,
-        code = item.code,
-        needConfirm = item.needConfirm,
-        confirmContent = item.confirmContent,
-        icon = item.icon,
-        action = item.action;
-    return /*#__PURE__*/_react.default.createElement(_menu.default.Item, null, /*#__PURE__*/_react.default.createElement(_button.default, _extends({
-      key: code,
-      style: {
-        marginLeft: 8,
-        border: 'none'
+  var handleColumn = function handleColumn(schema, child, index) {
+    var _schema$props2;
+
+    if (props.editable && props.originWidget === 'subform') {
+      if (isSubCanEdit && !['relField', 'qxFormula'].includes(schema.widget)) {
+        schema.readOnly = false;
+      } else if (!isSubCanEdit) {
+        schema.readOnly = true;
       }
       }
-    }, item, {
-      icon: icon && bar.style !== 'TEXT' ? String(icon).indexOf('http') > -1 ? /*#__PURE__*/_react.default.createElement("img", {
-        src: String(icon),
+    }
+
+    if (schema.fieldName === searchKey) {
+      setSearchName(schema.title);
+    }
+
+    var tip = schema.description ? /*#__PURE__*/_react.default.createElement("span", {
+      className: 'qx-column_desc'
+    }, /*#__PURE__*/_react.default.createElement(_tooltip.default, {
+      title: schema.description
+    }, /*#__PURE__*/_react.default.createElement(_InfoCircleOutlined2.default, null))) : null;
+    var column = ((_schema$props2 = schema.props) === null || _schema$props2 === void 0 ? void 0 : _schema$props2.column) || {};
+
+    var _dataIndex = child.indexOf(dataPath) === -1 ? dataPath + '[].' + child : child;
+
+    var _width = parseInt(column.width);
+
+    return {
+      dataIndex: _dataIndex,
+      width: (column.width && _width ? _width : FIELD_LENGTH) + padding,
+      align: props.originWidget === 'subform' ? 'left' : column.align || 'left',
+      fixed: column.fixed || props.fixed && typeof index === 'number' && !isMergeFieldExist.current && index < props.fixed,
+      title: /*#__PURE__*/_react.default.createElement("div", {
         style: {
         style: {
-          width: '16px',
-          height: '16px',
-          marginRight: '4px',
-          verticalAlign: 'text-bottom',
-          borderRadius: '50%'
-        },
-        alt: ""
-      }) : String(icon).indexOf('-') > -1 ? /*#__PURE__*/_react.default.createElement(_icon.default, {
-        type: String(icon)
-      }) : BUTTON_ICONS_MAP[icon + ''] : null,
-      onClick: function onClick() {
-        barBtnClick(code, needConfirm, confirmContent, action, item);
+          width: (column.width ? parseInt(column.width) : FIELD_LENGTH) + "px"
+        }
+      }, schema.required ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("span", {
+        className: "fr-label-required"
+      }, " *"), /*#__PURE__*/_react.default.createElement("span", {
+        className: "qx-virtual_title__required",
+        title: schema.title
+      }, schema.title), tip) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("span", {
+        className: "qx-virtual_title",
+        title: schema.title
+      }, schema.title), tip)),
+      render: function render(value, record, index) {
+        // Check: record.index 似乎是antd自己会给的，不错哦
+        var childIndex = [].concat(_toConsumableArray(dataIndex), [record.index]);
+        return /*#__PURE__*/_react.default.createElement(_index2.default, {
+          hideTitle: true,
+          displayType: "inline",
+          key: index.toString(),
+          id: _dataIndex,
+          dataIndex: childIndex,
+          _item: flatten[_dataIndex] ? null : getItemSchema(_dataIndex) // subReadOnly={subReadOnly}
+
+        });
       }
       }
-    }), name));
-  }));
+    };
+  };
+
+  var getItemSchema = function getItemSchema(id) {
+    var _item;
+
+    Object.keys(mergeFieldsMap.current || {}).forEach(function (key) {
+      if (id.indexOf(key) > -1) {
+        _item = mergeFieldsMap.current[key];
+      }
+    });
+    return _item;
+  };
+
+  var handleMergeField = function handleMergeField(schema) {
+    // const column = schema.props?.column || {};
+    var _props = schema.props;
+    return {
+      title: _props.title,
+      align: _props.align,
+      dataIndex: _props.dataIndex,
+      children: Object.keys(schema.children).map(function (key) {
+        var _schema$children$key, _schema$children$key2;
+
+        if (key.indexOf('_merge_field') > -1 && Object.keys((_schema$children$key = schema.children[key]) === null || _schema$children$key === void 0 ? void 0 : _schema$children$key.children).length === 1 && ((_schema$children$key2 = schema.children[key]) === null || _schema$children$key2 === void 0 ? void 0 : _schema$children$key2.children.hidden)) {
+          return {
+            show: false
+          };
+        }
+
+        var isMergeField = key.indexOf('_merge_field') > -1 && Object.keys(schema.children[key].children || {}).length;
+
+        if (isMergeField) {
+          return handleMergeField(schema.children[key]);
+        } else {
+          return handleColumn(schema.children[key], key);
+        }
+      })
+    };
+  };
+
+  var getMergeMap = function getMergeMap() {
+    var _map = {};
+    Object.keys(flatten).forEach(function (key) {
+      var _schema$schema;
+
+      var _schema = flatten[key];
+
+      var _children = (_schema === null || _schema === void 0 ? void 0 : (_schema$schema = _schema.schema) === null || _schema$schema === void 0 ? void 0 : _schema$schema.children) || {};
+
+      if (key.indexOf('_merge_field') > -1 && Object.keys(_children).length) {
+        Object.keys(_children).forEach(function (item) {
+          var _schema1 = _children[item];
+
+          var _children1 = _schema1.children || {};
+
+          if (item.indexOf('_merge_field') > -1 && Object.keys(_children1).length) {
+            Object.keys(_children1).forEach(function (it) {
+              _map[it] = {
+                schema: _children1[it]
+              };
+            });
+          } else {
+            _map[item] = {
+              schema: _schema1
+            };
+          }
+        });
+      }
+    });
+    return _map;
+  };
 
 
   var columns = (0, _react.useMemo)(function () {
   var columns = (0, _react.useMemo)(function () {
-    return children.map(function (child, index) {
-      var _schema$props2;
+    var _line_buttons2;
+
+    //console.log('useMemo columns', isSubCanEdit, subReadOnly, JSON.stringify(line.buttons))
+    mergeFieldsMap.current = getMergeMap();
+    isMergeFieldExist.current = false;
+
+    var _line_buttons = _.cloneDeep(line.buttons);
+
+    var _columns = (children || []).map(function (child, index) {
+      var _schema$children;
 
 
       var item = flatten[child];
       var item = flatten[child];
       var schema = item && item.schema || {};
       var schema = item && item.schema || {};
 
 
-      if (props.editable && props.originWidget === 'subform') {
-        if (isSubCanEdit && !['relField', 'qxFormula'].includes(schema.widget)) {
-          schema.readOnly = false;
-        } else if (!isSubCanEdit) {
-          schema.readOnly = true;
-        }
+      if (child.indexOf('_merge_field') > -1 && (((_schema$children = schema.children) === null || _schema$children === void 0 ? void 0 : _schema$children.hidden) || !Object.keys(schema.children || {}).length)) {
+        return {
+          show: false
+        };
       }
       }
 
 
-      if (schema.fieldName === searchKey) {
-        setSearchName(schema.title);
+      var isMergeField = child.indexOf('_merge_field') > -1 && Object.keys(schema.children || {}).length;
+
+      if (isMergeField) {
+        isMergeFieldExist.current = true;
+        return handleMergeField(schema, index);
+      } else {
+        return handleColumn(schema, child, index);
       }
       }
+    });
 
 
-      var column = ((_schema$props2 = schema.props) === null || _schema$props2 === void 0 ? void 0 : _schema$props2.column) || {};
-      return {
-        dataIndex: child,
-        width: (column.width ? parseInt(column.width) : FIELD_LENGTH) + padding,
-        align: column.align || 'left',
-        fixed: column.fixed || props.fixed && index < props.fixed,
-        title: /*#__PURE__*/_react.default.createElement("div", {
-          style: {
-            width: (column.width ? parseInt(column.width) : FIELD_LENGTH) + "px"
-          }
-        }, schema.required ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("span", {
-          className: "fr-label-required"
-        }, " *"), /*#__PURE__*/_react.default.createElement("span", null, schema.title)) : schema.title),
-        render: function render(value, record, index) {
-          // Check: record.index 似乎是antd自己会给的，不错哦
-          var childIndex = [].concat(_toConsumableArray(dataIndex), [record.index]);
-          return /*#__PURE__*/_react.default.createElement(_index2.default, {
-            hideTitle: true,
-            displayType: "inline",
-            key: index.toString(),
-            id: child,
-            dataIndex: childIndex // subReadOnly={subReadOnly}
+    _columns = _columns.filter(function (item) {
+      return Object.keys(item).length !== 1 && (!item.hidden || item.show);
+    });
+
+    if (((_line_buttons2 = _line_buttons) === null || _line_buttons2 === void 0 ? void 0 : _line_buttons2.length) || Array.isArray(itemProps.buttons)) {
+      var top = line.top,
+          _line$style = line.style,
+          style = _line$style === void 0 ? 'ICON' : _line$style,
+          fixed = line.fixed;
 
 
+      if (type === 'add') {
+        if (props.originWidget === 'subform') {
+          _line_buttons = _line_buttons.filter(function (item) {
+            return item.code === 'DELETE';
           });
           });
+        } // 关联记录放开所有行按钮关联XQ230328006
+        // else if (props.originWidget === 'relSelector') {
+        //   // jbl ERP需求，新增时放开编辑按钮
+        //   _line_buttons = _line_buttons.filter(item => ['REMOVE', 'EDIT'].includes(item.code))
+        // }
+
+      } else if ((type === 'view' || isReadOnly) && originWidget === 'relSelector') {
+        _line_buttons = _line_buttons.filter(function (item) {
+          return item.code === 'VIEW';
+        });
+      }
+
+      var len = (_line_buttons || []).length;
+      var action = subReadOnly || isReadOnly && originWidget === 'subform' ? {} : {
+        title: '操作',
+        key: '$action',
+        fixed: fixed ? top ? 'left' : 'right' : props.originWidget === 'subform' ? 'right' : false,
+        align: 'center',
+        // width: ((buttons || []).length + (props.removeable ? 1 : 0)) * (style === 'ICON' ? 32 : style === 'TEXT' ? 36 : 57) + 16,
+        render: function render(value, record, idx) {
+          return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, Array.isArray(itemProps.buttons) ? itemProps.buttons.map(function (item, idx) {
+            var callback = item.callback,
+                text = item.text,
+                html = item.html;
+
+            var onClick = function onClick() {};
+
+            if (typeof window[callback] === 'function') {
+              onClick = function onClick() {
+                window[callback]({
+                  value: listData,
+                  onChange: changeList,
+                  schema: schema
+                });
+              };
+            }
+
+            return /*#__PURE__*/_react.default.createElement("a", {
+              key: idx.toString(),
+              style: {
+                marginLeft: 8
+              },
+              onClick: onClick
+            }, /*#__PURE__*/_react.default.createElement("span", {
+              dangerouslySetInnerHTML: {
+                __html: html || text
+              }
+            }));
+          }) : null, Array.isArray(_line_buttons) ? _line_buttons.map(function (item) {
+            var name = item.name,
+                code = item.code,
+                needConfirm = item.needConfirm,
+                confirmContent = item.confirmContent,
+                icon = item.icon;
+            var display = handleState(record, code, props.originWidget); // if (display === '') {
+            //   btnMap[code] = ''
+            // }
+
+            return /*#__PURE__*/_react.default.createElement(_tooltip.default, {
+              title: name
+            }, /*#__PURE__*/_react.default.createElement(_button.default, _extends({
+              key: code,
+              style: {
+                marginLeft: 8,
+                display: display
+              }
+            }, item, {
+              icon: icon && style !== 'TEXT' ? String(icon).indexOf('http') > -1 ? /*#__PURE__*/_react.default.createElement("img", {
+                src: String(icon),
+                style: {
+                  width: '16px',
+                  height: '16px',
+                  marginRight: '4px',
+                  verticalAlign: 'text-bottom',
+                  borderRadius: '50%'
+                },
+                alt: ""
+              }) : String(icon).indexOf('-') > -1 ? /*#__PURE__*/_react.default.createElement(_icon.default, {
+                type: String(icon)
+              }) : BUTTON_ICONS_MAP[icon + ''] : null,
+              type: 'link',
+              size: 'small' // disabled={props.originWidget === 'subform' ? false : handleAuth(record, code)}
+              ,
+              onClick: function onClick() {
+                // 已有数据进行操作时才二次提示
+                if (needConfirm && confirmContent && (props.originWidget === 'relSelector' ? record.hasOwnProperty('$auth') : record.hasOwnProperty('id'))) {
+                  confirm({
+                    title: confirmContent,
+                    icon: /*#__PURE__*/_react.default.createElement(_ExclamationCircleOutlined2.default, null),
+                    okText: '确认',
+                    okType: 'danger',
+                    cancelText: '取消',
+                    onOk: function onOk() {
+                      if (code === 'DELETE' && props.originWidget === 'subform') {
+                        deleteItem(idx);
+                      } else if (code === 'REMOVE') {
+                        deleteItem(record.orginIdx);
+                        props.handleLineBtnClick(code, record, schema.$id);
+                      } else if (code === 'COPY') {
+                        copyItem(record.orginIdx);
+                      } else if (item.action === 'CUSTOM') {
+                        props.handleCustom(item, record, schema.$id);
+                      } else {
+                        props.handleLineBtnClick(code, record, schema.$id, line.action);
+                      }
+                    },
+                    onCancel: function onCancel() {}
+                  });
+                } else {
+                  if (code === 'DELETE' && props.originWidget === 'subform') {
+                    deleteItem(idx);
+                  } else if (code === 'REMOVE') {
+                    deleteItem(record.orginIdx);
+                    props.handleLineBtnClick(code, record, schema.$id);
+                  } else if (code === 'COPY') {
+                    copyItem(record.orginIdx);
+                  } else if (item.action === 'CUSTOM') {
+                    props.handleCustom(item, record, schema.$id);
+                  } else {
+                    props.handleLineBtnClick(code, record, schema.$id, line.action, schema);
+                  }
+                }
+              }
+            }), style !== 'ICON' || !icon ? name : null)); // }
+          }) : null);
         }
         }
       };
       };
-    });
-  }, [children, flatten, isSubCanEdit]);
+      var actionLength = 0;
+
+      _line_buttons.forEach(function (item) {
+        if (props.originWidget === 'subform' || style === 'ICON' && item.icon) {
+          actionLength += 32;
+        } else if (style !== 'ICON' || style === 'ICON' && !item.icon) {
+          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;
+          actionLength += div.clientWidth + (style !== 'TEXT' && item.icon ? 32 : 0);
+          div.remove();
+        }
+      });
+
+      action.width = actionLength + padding * 2 - 8;
+
+      if ((_columns || []).findIndex(function (item) {
+        return item.key === '$action';
+      }) === -1 && len > 0 && action.title) {
+        if (top) {
+          _columns.unshift(action);
+        } else {
+          _columns.push(action);
+        }
+      }
+    }
+
+    return _columns;
+  }, [isSubCanEdit, subReadOnly, JSON.stringify(line.buttons), deleteItem]);
 
 
   var handleAuth = function handleAuth(record, code) {
   var handleAuth = function handleAuth(record, code) {
     switch (code) {
     switch (code) {
@@ -622,192 +1133,6 @@ var VirtualList = function VirtualList(_ref) {
     }
     }
   };
   };
 
 
-  if (!props.hideDelete && ((_line$buttons = line.buttons) === null || _line$buttons === void 0 ? void 0 : _line$buttons.length) || Array.isArray(itemProps.buttons)) {
-    var top = line.top,
-        _line$style = line.style,
-        style = _line$style === void 0 ? 'ICON' : _line$style,
-        fixed = line.fixed,
-        buttons = line.buttons;
-
-    if (type === 'add') {
-      if (props.originWidget === 'subform') {
-        line.buttons = buttons.filter(function (item) {
-          return item.code === 'DELETE';
-        });
-      } else if (props.originWidget === 'relSelector') {
-        line.buttons = buttons.filter(function (item) {
-          return item.code === 'REMOVE';
-        });
-      }
-    } // if (props.removeable && buttons.findIndex(item => item.code === 'REMOVE') === -1) {
-    //   buttons.push({
-    //     icon: 'remove',
-    //     code: 'REMOVE',
-    //     name: '移除',
-    //     line: true,
-    //     needConfirm: true,
-    //     confirmContent: props.removeContent
-    //   })
-    // }
-
-
-    var len = (line.buttons || []).length;
-    var action = schema.isReadOnly || subReadOnly ? {} : {
-      title: '操作',
-      key: '$action',
-      fixed: fixed ? top ? 'left' : 'right' : props.originWidget === 'subform' ? 'right' : false,
-      align: 'center',
-      // width: ((buttons || []).length + (props.removeable ? 1 : 0)) * (style === 'ICON' ? 32 : style === 'TEXT' ? 36 : 57) + 16,
-      render: function render(value, record, idx) {
-        return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, Array.isArray(itemProps.buttons) ? itemProps.buttons.map(function (item, idx) {
-          var callback = item.callback,
-              text = item.text,
-              html = item.html;
-
-          var onClick = function onClick() {};
-
-          if (typeof window[callback] === 'function') {
-            onClick = function onClick() {
-              window[callback]({
-                value: listData,
-                onChange: changeList,
-                schema: schema
-              });
-            };
-          }
-
-          return /*#__PURE__*/_react.default.createElement("a", {
-            key: idx.toString(),
-            style: {
-              marginLeft: 8
-            },
-            onClick: onClick
-          }, /*#__PURE__*/_react.default.createElement("span", {
-            dangerouslySetInnerHTML: {
-              __html: html || text
-            }
-          }));
-        }) : null, Array.isArray(line.buttons) ? line.buttons.map(function (item) {
-          var name = item.name,
-              code = item.code,
-              needConfirm = item.needConfirm,
-              confirmContent = item.confirmContent,
-              icon = item.icon;
-          var display = handleState(record, code, props.originWidget); // if (display === '') {
-          //   btnMap[code] = ''
-          // }
-
-          return /*#__PURE__*/_react.default.createElement(_tooltip.default, {
-            title: name
-          }, /*#__PURE__*/_react.default.createElement(_button.default, _extends({
-            key: code,
-            style: {
-              marginLeft: 8,
-              display: display
-            }
-          }, item, {
-            icon: icon && style !== 'TEXT' ? String(icon).indexOf('http') > -1 ? /*#__PURE__*/_react.default.createElement("img", {
-              src: String(icon),
-              style: {
-                width: '16px',
-                height: '16px',
-                marginRight: '4px',
-                verticalAlign: 'text-bottom',
-                borderRadius: '50%'
-              },
-              alt: ""
-            }) : String(icon).indexOf('-') > -1 ? /*#__PURE__*/_react.default.createElement(_icon.default, {
-              type: String(icon)
-            }) : BUTTON_ICONS_MAP[icon + ''] : null,
-            type: 'link',
-            size: 'small' // disabled={props.originWidget === 'subform' ? false : handleAuth(record, code)}
-            ,
-            onClick: function onClick() {
-              // 已有数据进行操作时才二次提示
-              if (needConfirm && confirmContent && (props.originWidget === 'relSelector' ? record.hasOwnProperty('$auth') : record.hasOwnProperty('id'))) {
-                confirm({
-                  title: confirmContent,
-                  icon: /*#__PURE__*/_react.default.createElement(_ExclamationCircleOutlined2.default, null),
-                  okText: '确认',
-                  okType: 'danger',
-                  cancelText: '取消',
-                  onOk: function onOk() {
-                    if (code === 'DELETE' && props.originWidget === 'subform') {
-                      deleteItem(idx);
-                    } else if (code === 'REMOVE') {
-                      deleteItem(record.orginIdx);
-                      props.handleLineBtnClick(code, record, schema.$id);
-                    } else if (code === 'COPY') {
-                      copyItem(record.orginIdx);
-                    } else if (item.action === 'CUSTOM') {
-                      props.handleCustom(item, record, schema.$id);
-                    } else {
-                      props.handleLineBtnClick(code, record, schema.$id, line.action);
-                    }
-                  },
-                  onCancel: function onCancel() {}
-                });
-              } else {
-                if (code === 'DELETE' && props.originWidget === 'subform') {
-                  deleteItem(idx);
-                } else if (code === 'REMOVE') {
-                  deleteItem(record.orginIdx);
-                  props.handleLineBtnClick(code, record, schema.$id);
-                } else if (code === 'COPY') {
-                  copyItem(record.orginIdx);
-                } else if (item.action === 'CUSTOM') {
-                  props.handleCustom(item, record, schema.$id);
-                } else {
-                  props.handleLineBtnClick(code, record, schema.$id, line.action);
-                }
-              }
-            }
-          }), style !== 'ICON' ? name : null)); // }
-        }) : null);
-      }
-    };
-
-    if (style === "ICON" || props.originWidget === 'subform') {
-      // 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 {
-      var leng = 0;
-      line.buttons.map(function (item) {
-        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;
-
-        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) {
-      return item.key === '$action';
-    }) === -1 && len > 0 && action.title) {
-      if (top) {
-        columns.unshift(action);
-      } else {
-        columns.push(action);
-      }
-    }
-  }
-
   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, currentAppCode, currentFunCode, appCode, funCode, fieldName, result;
       var queryParams, currentAppCode, currentFunCode, appCode, funCode, fieldName, result;
@@ -939,68 +1264,6 @@ var VirtualList = function VirtualList(_ref) {
     setSubEdit(false);
     setSubEdit(false);
   };
   };
 
 
-  var barBtnClick = function barBtnClick(code, needConfirm, confirmContent, action, item) {
-    setSelectedRowKeys([]);
-
-    if (needConfirm && confirmContent) {
-      if (!selectedRowKeys.length) {
-        return _message2.default.warning('请选择数据');
-      }
-
-      confirm({
-        title: confirmContent,
-        icon: /*#__PURE__*/_react.default.createElement(_ExclamationCircleOutlined2.default, null),
-        okText: '确认',
-        okType: 'danger',
-        cancelText: '取消',
-        onOk: function onOk() {
-          if (code === 'DELETE') {
-            if (props.originWidget === 'subform') {
-              batchDelete(selectedRowKeys);
-              setSelectedRowKeys([]);
-            } else {
-              props.handleBarBtnClick(code, fieldName, batchKey, selectedRowKeys, schema.$id, selectedIds);
-            }
-          } else if (code === 'EXPORT') {
-            handleExport();
-          } else if (code === 'SELECT') {
-            props.openRelSelect(schema.$id);
-          } else if (code === 'ADD') {
-            props.handleRelAdd(schema.$id);
-          } else if (code === 'subformEdit') {
-            props.handleBatchEdit(fieldName, schema.$id, selectedIds);
-          } else if (action === 'CUSTOM') {
-            props.handleCustom(item, selectedIds, schema.$id);
-          } else {
-            props.handleBarBtnClick(code, fieldName, batchKey, selectedRowKeys, schema.$id, selectedIds);
-          }
-        },
-        onCancel: function onCancel() {}
-      });
-    } else {
-      if (code === 'DELETE') {
-        if (props.originWidget === 'subform') {
-          batchDelete(selectedRowKeys);
-          setSelectedRowKeys([]);
-        } else {
-          props.handleBarBtnClick(code, fieldName, batchKey, selectedRowKeys, schema.$id, selectedIds);
-        }
-      } else if (code === 'EXPORT') {
-        handleExport();
-      } else if (code === 'SELECT') {
-        props.openRelSelect(schema.$id);
-      } else if (code === 'ADD') {
-        props.handleRelAdd(schema.$id);
-      } else if (code === 'subformEdit') {
-        props.handleBatchEdit(fieldName, schema.$id, selectedIds);
-      } else if (action === 'CUSTOM') {
-        props.handleCustom(item, selectedIds, schema.$id);
-      } else {
-        props.handleBarBtnClick(code, fieldName, batchKey, selectedRowKeys, schema.$id, selectedIds);
-      }
-    }
-  };
-
   return /*#__PURE__*/_react.default.createElement("div", null, props.editable ? isSubCanEdit ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_button.default, {
   return /*#__PURE__*/_react.default.createElement("div", null, props.editable ? isSubCanEdit ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_button.default, {
     type: 'text',
     type: 'text',
     size: "small",
     size: "small",
@@ -1046,7 +1309,9 @@ var VirtualList = function VirtualList(_ref) {
 
 
       setKeyWord(((_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.value) || '');
       setKeyWord(((_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.value) || '');
     }
     }
-  }) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null), /*#__PURE__*/_react.default.createElement("div", null, (barButtons.length > 4 ? barButtons.slice(0, 3) : barButtons.slice(0, 4)).map(function (item) {
+  }) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null), /*#__PURE__*/_react.default.createElement("div", null, (barButtons.length > 4 ? barButtons.slice(0, 3) : barButtons.slice(0, 4)).filter(function (item) {
+    return isInDing ? !['EXPORT', 'IMPORT'].includes(item.code) : true;
+  }).map(function (item) {
     var name = item.name,
     var name = item.name,
         code = item.code,
         code = item.code,
         needConfirm = item.needConfirm,
         needConfirm = item.needConfirm,
@@ -1134,10 +1399,11 @@ var VirtualList = function VirtualList(_ref) {
     id: 'qxVirtualList',
     id: 'qxVirtualList',
     className: 'qx-virtualList',
     className: 'qx-virtualList',
     rowKey: props.originWidget === 'relSelector' ? 'id' : 'orginIdx',
     rowKey: props.originWidget === 'relSelector' ? 'id' : 'orginIdx',
-    scroll: {
-      y: scrollY,
+    scroll: _objectSpread({
       x: '100%'
       x: '100%'
-    } // components={vt}
+    }, !isFullScreen && {
+      y: scrollY
+    }) // components={vt}
     ,
     ,
     size: size || 'small'
     size: size || 'small'
   }, props.originWidget === 'relSelector' ? {
   }, props.originWidget === 'relSelector' ? {
@@ -1159,7 +1425,7 @@ var VirtualList = function VirtualList(_ref) {
     type: "link",
     type: "link",
     icon: /*#__PURE__*/_react.default.createElement(_PlusOutlined2.default, null),
     icon: /*#__PURE__*/_react.default.createElement(_PlusOutlined2.default, null),
     onClick: function onClick() {
     onClick: function onClick() {
-      addItem(handleAddDefault);
+      addItem();
     }
     }
   }, "\u65B0\u589E"));
   }, "\u65B0\u589E"));
 };
 };
@@ -1178,14 +1444,7 @@ function handleDownload(_x, _x2, _x3) {
 
 
 function _handleDownload() {
 function _handleDownload() {
   _handleDownload = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(url, name, request) {
   _handleDownload = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(url, name, request) {
-    var _dd$env;
-
     var isDownload,
     var isDownload,
-        isInDing,
-        needToken,
-        dingUrl,
-        prev,
-        append,
         link,
         link,
         blob,
         blob,
         downloadUrl,
         downloadUrl,
@@ -1199,44 +1458,46 @@ function _handleDownload() {
 
 
             if (isDownload === null || Boolean(isDownload)) {
             if (isDownload === null || Boolean(isDownload)) {
               _message2.default.warning('即将开始下载，请勿重复点击。');
               _message2.default.warning('即将开始下载，请勿重复点击。');
-            }
-
-            isInDing = (dd === null || dd === void 0 ? void 0 : (_dd$env = dd.env) === null || _dd$env === void 0 ? void 0 : _dd$env.platform) !== 'notInDingTalk';
-
-            if (!isInDing) {
-              _context2.next = 8;
-              break;
-            }
+            } // console.log('url========', url);
+            // const isInDing = dd && dd?.env?.platform !== 'notInDingTalk';
+            // if (isInDing) {
+            //   // 比如导出 导入
+            //   const needToken = !(url.includes('http://') || url.includes('https://'));
+            //   let dingUrl;
+            //   if (needToken) {
+            //     const apiUri = process.env.apiUrl || '';
+            //     const needConcat = !(apiUri.includes('http://') || apiUri.includes('https://')); // 打包后
+            //     const prev = `${needConcat ? location.origin : ''}${apiUri}${url}`;
+            //     const append = `_token=${QIXIAO_TOKEN}${isDesignPage() ? '&_bizCode=design' : ''}`;
+            //     dingUrl = `${prev}${prev.includes('?') ? '&' : '?'}${append}`; // 文件服务器 不能加参数
+            //   } else {
+            //     dingUrl = url;
+            //   }
+            //   console.log('dingUrl========', dingUrl);
+            //   const fileName = name || '下载文件';
+            //   dd.biz.util.downloadFile({
+            //     url: dingUrl,
+            //     name: fileName,
+            //     onFail: function () {
+            //       message.error(`${fileName} 文件下载失败`);
+            //     },
+            //   });
+            //   return;
+            // }
 
 
-            // 比如导出 导入
-            needToken = !(url.includes('http://') || url.includes('https://'));
-
-            if (needToken) {
-              prev = "".concat(process.env.apiUrl).concat(url);
-              append = "_token=".concat(QIXIAO_TOKEN).concat(isDesignPage() ? '&_bizCode=design' : '');
-              dingUrl = "".concat(prev).concat(prev.includes('?') ? '&' : '?').concat(append); // 文件服务器 不能加参数
-            } else {
-              dingUrl = url;
-            }
-
-            dd.biz.util.downloadFile({
-              url: dingUrl
-            });
-            return _context2.abrupt("return");
 
 
-          case 8:
             link = document.createElement('a');
             link = document.createElement('a');
             link.href = url;
             link.href = url;
             link.download = name;
             link.download = name;
             link.target = '_blank';
             link.target = '_blank';
             document.body.appendChild(link); //TODO 文件过大时，看不到下载进度
             document.body.appendChild(link); //TODO 文件过大时，看不到下载进度
 
 
-            _context2.next = 15;
+            _context2.next = 9;
             return request.get(url, {
             return request.get(url, {
               autoShowError: true
               autoShowError: true
             });
             });
 
 
-          case 15:
+          case 9:
             blob = _context2.sent;
             blob = _context2.sent;
 
 
             if (blob !== null) {
             if (blob !== null) {
@@ -1247,7 +1508,7 @@ function _handleDownload() {
               URL.revokeObjectURL(downloadUrl);
               URL.revokeObjectURL(downloadUrl);
             }
             }
 
 
-          case 17:
+          case 11:
           case "end":
           case "end":
             return _context2.stop();
             return _context2.stop();
         }
         }

@@ -43,9 +43,9 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 
 
 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 _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 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); if (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 _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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 _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; }
 
 
@@ -93,36 +93,23 @@ var RenderList = function RenderList(_ref) {
     onItemChange(dataPath, newList);
     onItemChange(dataPath, newList);
   };
   };
 
 
-  var addItem = function addItem(handleAddDefault) {
-    // const newList = [...displayList, {_active: true}];
+  var addItem = function addItem() {
+    var _item = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
+
     var _schema = (0, _utils.getSchemaFromFlatten)(flatten, parentId);
     var _schema = (0, _utils.getSchemaFromFlatten)(flatten, parentId);
 
 
-    var _newItem = (0, _utils.generateDataSkeleton)(_schema.items) || {};
+    var newItem = _objectSpread(_objectSpread({}, (0, _utils.generateDataSkeleton)(_schema.items) || {}), _item);
 
 
-    var newItem = _objectSpread(_objectSpread({}, _newItem), {}, {
+    var newList = [].concat(_toConsumableArray(displayList), [_objectSpread(_objectSpread({}, newItem), {}, {
       _active: true
       _active: true
-    });
-
-    var callback = function callback() {
-      var _new = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : newItem;
-
-      onItemChange(dataPath, [].concat(_toConsumableArray(displayList), [_objectSpread(_objectSpread({}, _new), {}, {
-        _active: true
-      })]));
-    };
-
-    if (_.isFunction(handleAddDefault)) {
-      handleAddDefault(newItem, callback);
-    } else {
-      callback();
-    }
-
-    return displayList.length;
+    })]);
+    var newIndex = newList.length - 1;
+    onItemChange(dataPath, newList);
+    return newIndex;
   };
   };
 
 
   var copyItem = function copyItem(idx) {
   var copyItem = function copyItem(idx) {
-    var newItem = _.cloneDeep(displayList[idx]);
-
+    var newItem = (0, _lodashEs.cloneDeep)(displayList[idx]);
     delete newItem.id;
     delete newItem.id;
     var newList = [].concat(_toConsumableArray(displayList.slice(0, idx + 1)), [newItem], _toConsumableArray(displayList.slice(idx + 1)));
     var newList = [].concat(_toConsumableArray(displayList.slice(0, idx + 1)), [newItem], _toConsumableArray(displayList.slice(idx + 1)));
     onItemChange(dataPath, JSON.parse(JSON.stringify(newList)));
     onItemChange(dataPath, JSON.parse(JSON.stringify(newList)));
@@ -228,7 +215,19 @@ var RenderList = function RenderList(_ref) {
     errorFields: errorFields,
     errorFields: errorFields,
     displayType: displayType,
     displayType: displayType,
     getFieldsProps: getFieldsProps
     getFieldsProps: getFieldsProps
-  };
+  }; // 外部定义：添加按钮事件
+
+  var onAdd = methods[props.onAdd];
+
+  if ((0, _lodashEs.isFunction)(onAdd)) {
+    displayProps.addItem = function () {
+      return onAdd(function (_item) {
+        return addItem(_item);
+      }, {
+        schema: schema
+      });
+    };
+  }
 
 
   if (renderWidget === 'listForMobile') {
   if (renderWidget === 'listForMobile') {
     return /*#__PURE__*/_react.default.createElement(_ListForMobile.default, displayProps);
     return /*#__PURE__*/_react.default.createElement(_ListForMobile.default, displayProps);

+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isDesignPage = isDesignPage;
+
+function isDesignPage() {
+  var href = location.href;
+  var res = false;
+
+  if (href.indexOf('/app-view/') > -1) {
+    res = true;
+  } else if (href.indexOf('/apps/design') > -1) {
+    res = true;
+  } else if (href.indexOf('/editor/form') > -1) {
+    res = true;
+  } else if (href.indexOf('/editor/setting') > -1) {
+    res = true;
+  } else if (href.indexOf('/editor/view') > -1) {
+    res = true;
+  } else if (href.indexOf('/editor/detail') > -1) {
+    res = true;
+  } else if (href.indexOf('/editor/custom') > -1) {
+    res = true;
+  } else if (href.indexOf('/editor/aggregation') > -1) {
+    res = true;
+  } else if (href.indexOf('/component') > -1) {
+    res = true;
+  } else if (href.indexOf('/editor/chart') > -1) {
+    res = true;
+  } else if (href.indexOf('businessCode=design') > -1) {
+    res = true;
+  } else if (href.indexOf('refer=/app-view/') > -1) {
+    res = true;
+  } else if (href.indexOf('/datacube/edit') > -1) {
+    res = true;
+  } else if (href.indexOf('/datacube/config') > -1) {
+    res = true;
+  } else if (href.indexOf('/datacube/design') > -1) {
+    res = true;
+  }
+
+  return res;
+}

 "use strict";
 "use strict";
 
 
-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"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
 
 Object.defineProperty(exports, "__esModule", {
 Object.defineProperty(exports, "__esModule", {
   value: true
   value: true
@@ -21,9 +21,9 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 
-function 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); if (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 _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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 _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; }
 
 
@@ -107,7 +107,7 @@ var ExtendedWidget = function ExtendedWidget(_ref) {
   }
   }
 
 
   var Widget = widgets[widgetName] || widgets['html'];
   var Widget = widgets[widgetName] || widgets['html'];
-  var extraSchema = _mapping.extraSchemaList[widgetName];
+  var extraSchema = _mapping.extraSchemaList[widgetName]; // console.log(hasError, '----------');
 
 
   var widgetProps = _objectSpread(_objectSpread({
   var widgetProps = _objectSpread(_objectSpread({
     schema: _objectSpread(_objectSpread({}, schema), extraSchema),
     schema: _objectSpread(_objectSpread({}, schema), extraSchema),
@@ -190,21 +190,41 @@ var ExtendedWidget = function ExtendedWidget(_ref) {
   }, /*#__PURE__*/_react.default.createElement(Widget, finalProps)));
   }, /*#__PURE__*/_react.default.createElement(Widget, finalProps)));
 };
 };
 
 
+function getValue(_data, key) {
+  if (!key) {
+    return null;
+  }
+
+  var keys = key.split('.');
+  return keys.reduce(function (prev, cur) {
+    if (cur === keys[keys.length - 1]) {
+      return prev[cur];
+    } else {
+      return prev[cur] || {};
+    }
+  }, _data);
+}
+
 var areEqual = function areEqual(prev, current) {
 var areEqual = function areEqual(prev, current) {
+  var _prev$schema, _prev$schema$props;
+
   if (prev.schema && current.schema) {
   if (prev.schema && current.schema) {
     if (prev.schema.$id === '#') {
     if (prev.schema.$id === '#') {
       return false;
       return false;
-    }
+    } // if (prev.schema.hidden && current.schema.hidden) {
+    //   return true;
+    // }
 
 
-    if (prev.schema.hidden && current.schema.hidden) {
-      return true;
-    }
   }
   }
 
 
   if (prev.readOnly !== current.readOnly) {
   if (prev.readOnly !== current.readOnly) {
     return false;
     return false;
   }
   }
 
 
+  if (prev.hasError !== current.hasError) {
+    return false;
+  }
+
   if (prev.disabled !== current.disabled) {
   if (prev.disabled !== current.disabled) {
     return false;
     return false;
   }
   }
@@ -213,6 +233,10 @@ var areEqual = function areEqual(prev, current) {
     return false;
     return false;
   }
   }
 
 
+  if ((prev.schema.widget === 'virtualList' || prev.schema.widget === 'relSelector') && ((_prev$schema = prev.schema) === null || _prev$schema === void 0 ? void 0 : (_prev$schema$props = _prev$schema.props) === null || _prev$schema$props === void 0 ? void 0 : _prev$schema$props.mode) === 'TAG' && JSON.stringify(getValue(prev.formData, prev.schema.relformKey)) !== JSON.stringify(getValue(current.formData, current.schema.relformKey))) {
+    return false;
+  }
+
   if ((0, _utils.isObjType)(prev.schema) && (0, _utils.isObjType)(current.schema)) {
   if ((0, _utils.isObjType)(prev.schema) && (0, _utils.isObjType)(current.schema)) {
     return false;
     return false;
   }
   }
@@ -224,6 +248,7 @@ var areEqual = function areEqual(prev, current) {
   return false;
   return false;
 };
 };
 
 
-var _default = /*#__PURE__*/_react.default.memo(ExtendedWidget, areEqual);
+var _default = /*#__PURE__*/_react.default.memo(ExtendedWidget, areEqual); // export default ExtendedWidget;
+
 
 
 exports.default = _default;
 exports.default = _default;

@@ -13,7 +13,7 @@ require("./Extra.css");
 
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: 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 _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
 
 var Extra = function Extra(_ref) {
 var Extra = function Extra(_ref) {
   var schema = _ref.schema;
   var schema = _ref.schema;

@@ -75,7 +75,8 @@ var Description = function Description(_ref) {
       }
       }
 
 
       return /*#__PURE__*/_react.default.createElement("span", {
       return /*#__PURE__*/_react.default.createElement("span", {
-        className: "fr-desc ml2"
+        className: "fr-desc ml2",
+        title: description
       }, "( ".concat(description, " )"));
       }, "( ".concat(description, " )"));
   }
   }
 };
 };

 "use strict";
 "use strict";
 
 
-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"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
 
 Object.defineProperty(exports, "__esModule", {
 Object.defineProperty(exports, "__esModule", {
   value: true
   value: true
@@ -86,7 +86,8 @@ var RenderField = function RenderField(props) {
       renderTitle = _useTools.renderTitle,
       renderTitle = _useTools.renderTitle,
       requiredMark = _useTools.requiredMark,
       requiredMark = _useTools.requiredMark,
       setFieldValidating = _useTools.setFieldValidating,
       setFieldValidating = _useTools.setFieldValidating,
-      removeFieldValidating = _useTools.removeFieldValidating;
+      removeFieldValidating = _useTools.removeFieldValidating,
+      setValueByPath = _useTools.setValueByPath;
 
 
   var formDataRef = (0, _react.useRef)();
   var formDataRef = (0, _react.useRef)();
   formDataRef.current = formData; // console.log('<renderField>', $id);
   formDataRef.current = formData; // console.log('<renderField>', $id);
@@ -208,6 +209,10 @@ var RenderField = function RenderField(props) {
     return (0, _utils.getValueByPath)(formData, path);
     return (0, _utils.getValueByPath)(formData, path);
   };
   };
 
 
+  if (formDataRef.current && ['virtualList', 'listForMobile'].includes(_schema.widget)) {
+    _schema._setValueByPath = setValueByPath;
+  }
+
   var widgetProps = {
   var widgetProps = {
     $id: $id,
     $id: $id,
     schema: _schema,
     schema: _schema,

 "use strict";
 "use strict";
 
 
-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"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
 
 Object.defineProperty(exports, "__esModule", {
 Object.defineProperty(exports, "__esModule", {
   value: true
   value: true
@@ -28,9 +28,9 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 
-function 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); if (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 _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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 _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; }
 
 
@@ -160,12 +160,11 @@ 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 _labelAlign = schema.labelAlign || rest.labelAlign || labelAlign || 'right';
@@ -258,6 +257,12 @@ var CoreRender = function CoreRender(_ref2) {
 
 
   var columnStyle = {};
   var columnStyle = {};
 
 
+  if (schema.currentStep === false) {
+    columnStyle.display = 'none';
+  } else {
+    columnStyle = {};
+  }
+
   if (schema.hidden) {
   if (schema.hidden) {
     columnStyle.display = 'none';
     columnStyle.display = 'none';
   } // if (!isComplex) {
   } // if (!isComplex) {

@@ -16,9 +16,9 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 
 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 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); if (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 _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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 _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; }
 
 

@@ -11,9 +11,9 @@ exports.useWindowState = exports.useTools = exports.useStore2 = exports.useStore
 
 
 var _react = require("react");
 var _react = require("react");
 
 
-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); if (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 _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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 _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; }
 
 
@@ -77,6 +77,11 @@ var useSet = function useSet(initState) {
     // console.groupEnd();
     // console.groupEnd();
 
 
 
 
+    // console.group(newState.action || 'action'); // TODO: give it a name
+    // console.log('%cState:', 'color: #9E9E9E; font-weight: 700;', state);
+    // console.log('%cAction:', 'color: #00A7F7; font-weight: 700;', action);
+    // console.log('%cNext:', 'color: #47B04B; font-weight: 700;', result);
+    // console.groupEnd();
     return result;
     return result;
   }, initState),
   }, initState),
       _useReducer2 = _slicedToArray(_useReducer, 2),
       _useReducer2 = _slicedToArray(_useReducer, 2),

@@ -329,6 +329,35 @@
   visibility: hidden;
   visibility: hidden;
   word-wrap: break-word;
   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%;

@@ -63,11 +63,11 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 
 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 _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"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _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 ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (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 _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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 _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; }
 
 

@@ -9,9 +9,9 @@ var _lodashEs = require("lodash-es");
 
 
 var _utils = require("./utils");
 var _utils = require("./utils");
 
 
-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); if (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 _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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 _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; }
 
 

@@ -21,9 +21,9 @@ var _validator = require("./validator");
 
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: 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 ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (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 _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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 _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; }
 
 
@@ -413,7 +413,9 @@ var useForm = function useForm(props) {
 
 
     if (Array.isArray(nameList)) {
     if (Array.isArray(nameList)) {
       nameList.forEach(function (path) {
       nameList.forEach(function (path) {
-        (0, _lodashEs.set)(currentData, path, (0, _lodashEs.get)(data, path));
+        var _path = path.replace('[]', '');
+
+        (0, _lodashEs.set)(currentData, _path, (0, _lodashEs.get)(data, _path));
       });
       });
     } else {
     } else {
       currentData = data;
       currentData = data;
@@ -571,11 +573,20 @@ var useForm = function useForm(props) {
     var data = _data.current;
     var data = _data.current;
 
 
     if (Array.isArray(nameList)) {
     if (Array.isArray(nameList)) {
-      (0, _lodashEs.set)(data, {});
+      data = {};
       nameList.forEach(function (path) {
       nameList.forEach(function (path) {
-        (0, _lodashEs.set)(data, path, (0, _lodashEs.get)(_data.current, path));
+        var _path = path.replace('[]', '');
+
+        (0, _lodashEs.set)(data, _path, (0, _lodashEs.get)(_data.current, _path));
       });
       });
-    }
+    } // const data = _data.current;
+    // if (Array.isArray(nameList)) {
+    //   set(data, {});
+    //   nameList.forEach(path => {
+    //     set(data, path, get(_data.current, path));
+    //   });
+    // }
+
 
 
     setState({
     setState({
       isValidating: true
       isValidating: true

@@ -60,11 +60,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; }
 
 
-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"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _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 ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (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 _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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 _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; }
 
 
@@ -620,8 +620,8 @@ function parseSingleExpression(func) {
     try {
     try {
       return Function(str)();
       return Function(str)();
     } catch (error) {
     } catch (error) {
-      console.log(error, func, dataPath);
-      return null; // 如果计算有错误，return null 最合适
+      return null; // 如果计算有错误，return null
+      // 最合适
     } // const funcBody = func.substring(2, func.length - 2);
     } // const funcBody = func.substring(2, func.length - 2);
     // //TODO: 这样有问题，例如 a.b.indexOf(), 会把 a.b.indexOf 当做值
     // //TODO: 这样有问题，例如 a.b.indexOf(), 会把 a.b.indexOf 当做值
     // const match1 = /formData.([a-zA-Z0-9.$_\[\]]+)/g;
     // const match1 = /formData.([a-zA-Z0-9.$_\[\]]+)/g;
@@ -1284,9 +1284,9 @@ var cleanEmpty = function cleanEmpty(obj) {
     return obj.map(function (v) {
     return obj.map(function (v) {
       return v && isObject(v) ? cleanEmpty(v) : v;
       return v && isObject(v) ? cleanEmpty(v) : v;
     }).filter(function (v) {
     }).filter(function (v) {
-      return !(v == undefined);
+      return !(v === undefined);
     });
     });
-  } else if (isObject(obj)) {
+  } else if (isObject(obj) && obj) {
     return Object.entries(obj).map(function (_ref12) {
     return Object.entries(obj).map(function (_ref12) {
       var _ref13 = _slicedToArray(_ref12, 2),
       var _ref13 = _slicedToArray(_ref12, 2),
           k = _ref13[0],
           k = _ref13[0],
@@ -1298,7 +1298,7 @@ var cleanEmpty = function cleanEmpty(obj) {
           k = _ref15[0],
           k = _ref15[0],
           v = _ref15[1];
           v = _ref15[1];
 
 
-      return v == undefined ? a : (a[k] = v, a);
+      return v === undefined ? a : (a[k] = v, a);
     }, {});
     }, {});
   } else {
   } else {
     return obj;
     return obj;

@@ -33,19 +33,19 @@ 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}',
     min: '${title}不能小于${min}',
     min: '${title}不能小于${min}',
     max: '${title}不能大于${max}',
     max: '${title}不能大于${max}',
-    range: '${title}需在${min}与${max}之间'
+    range: '${title}需在${min}～${max}之间'
   },
   },
   array: {
   array: {
     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}'

 "use strict";
 "use strict";
 
 
-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"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
 
 Object.defineProperty(exports, "__esModule", {
 Object.defineProperty(exports, "__esModule", {
   value: true
   value: true
@@ -59,9 +59,9 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 
 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 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); if (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 _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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 _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; }
 
 

 "use strict";
 "use strict";
 
 
-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"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
 
 Object.defineProperty(exports, "__esModule", {
 Object.defineProperty(exports, "__esModule", {
   value: true
   value: true
@@ -23,9 +23,9 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: 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 ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (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 _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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 _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; }
 
 

 "use strict";
 "use strict";
 
 
-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"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
 
 Object.defineProperty(exports, "__esModule", {
 Object.defineProperty(exports, "__esModule", {
   value: true
   value: true

 "use strict";
 "use strict";
 
 
-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"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
 
 Object.defineProperty(exports, "__esModule", {
 Object.defineProperty(exports, "__esModule", {
   value: true
   value: true
@@ -27,9 +27,9 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 
 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 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); if (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 _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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 _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; }
 
 

 "use strict";
 "use strict";
 
 
-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"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
 
 Object.defineProperty(exports, "__esModule", {
 Object.defineProperty(exports, "__esModule", {
   value: true
   value: true
@@ -25,9 +25,9 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 
 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 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); if (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 _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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 _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; }
 
 

 "use strict";
 "use strict";
 
 
-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"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
 
 Object.defineProperty(exports, "__esModule", {
 Object.defineProperty(exports, "__esModule", {
   value: true
   value: true
@@ -25,9 +25,9 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 
 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 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); if (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 _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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 _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; }
 
 

 "use strict";
 "use strict";
 
 
-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"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
 
 Object.defineProperty(exports, "__esModule", {
 Object.defineProperty(exports, "__esModule", {
   value: true
   value: true
@@ -27,9 +27,9 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 
 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 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); if (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 _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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 _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; }
 
 

 {
 {
   "name": "@qx/form-render",
   "name": "@qx/form-render",
-  "version": "0.1.6",
-  "description": "通过 JSON Schema 生成标准 Form，常用于自定义搭建配置界面生成",
+  "version": "0.1.27.beta.1",
+  "keywords": [
+    "Form",
+    "FormRender",
+    "Render",
+    "XRender",
+    "React",
+    "Json Schema",
+    "Ant Design"
+  ],
   "repository": {
   "repository": {
-    "type": "git",
-    "url": "git@github.com:alibaba/form-render.git"
+    "type": "gitlab",
+    "url": "http://gitlab.qgutech.com/third-party/x-render.git"
   },
   },
   "license": "MIT",
   "license": "MIT",
   "contributors": [
   "contributors": [
     {
     {
-      "name": "Tw93",
-      "email": "tw93@qq.com"
+      "name": "zhu",
+      "email": "zhuqin@qgutech.com"
     },
     },
     {
     {
-      "name": "mankaiviky",
-      "email": "mankaiviky@163.com"
+      "name": "xqq",
+      "email": "xingqingqing@qgutech.com"
     },
     },
     {
     {
-      "name": "FateRiddle",
-      "email": "fateriddle@gmail.com"
+      "name": "qiaoqitao",
+      "email": "qiaoqitao@qgutech.com"
     }
     }
   ],
   ],
-  "scripts": {},
   "main": "lib/index.js",
   "main": "lib/index.js",
   "module": "es/index.js",
   "module": "es/index.js",
-  "gitHooks": {
-    "pre-commit": "lint-staged"
+  "files": [
+    "es",
+    "lib",
+    "package.json"
+  ],
+  "scripts": {
   },
   },
   "lint-staged": {
   "lint-staged": {
     "*.{js,jsx,less,md,json}": [
     "*.{js,jsx,less,md,json}": [
@@ -37,36 +48,30 @@
   },
   },
   "dependencies": {
   "dependencies": {
     "@ant-design/icons": "^4.0.2",
     "@ant-design/icons": "^4.0.2",
+    "@qx/icon-btn": "^0.0.1",
+    "antd-mobile": "^5.17.2",
     "async-validator": "^3.5.1",
     "async-validator": "^3.5.1",
+    "classnames": "^2.3.1",
     "color": "^3.1.2",
     "color": "^3.1.2",
     "dingtalk-jsapi": "^3.0.9",
     "dingtalk-jsapi": "^3.0.9",
     "lodash-es": "^4.17.21",
     "lodash-es": "^4.17.21",
     "moment": "^2.24.0",
     "moment": "^2.24.0",
-    "nanoid": "^3.1.20",
     "rc-color-picker": "^1.2.6",
     "rc-color-picker": "^1.2.6",
     "smooth-scroll": "^16.1.3",
     "smooth-scroll": "^16.1.3",
     "virtualizedtableforantd4": "^1.1.2"
     "virtualizedtableforantd4": "^1.1.2"
   },
   },
+  "devDependencies": {
+    "@umijs/plugin-antd-mobile": "^1.2.0",
+    "deep-equal": "^2.0.3",
+    "rollup-plugin-copy": "^3.4.0"
+  },
   "peerDependencies": {
   "peerDependencies": {
     "antd": "4.x",
     "antd": "4.x",
     "react": ">=16.8.0",
     "react": ">=16.8.0",
     "react-dom": ">=16.8.0"
     "react-dom": ">=16.8.0"
   },
   },
-  "devDependencies": {
-    "deep-equal": "^2.0.3",
-    "rollup-plugin-copy": "^3.4.0"
+  "gitHooks": {
+    "pre-commit": "lint-staged"
   },
   },
-  "keywords": [
-    "Form",
-    "FormRender",
-    "Render",
-    "XRender",
-    "React",
-    "Json Schema",
-    "Ant Design"
-  ],
-  "homepage": "https://x-render.gitee.io/form-render",
-  "bugs": {
-    "url": "https://github.com/alibaba/x-render/issues"
-  }
+  "sideEffect": false
 }
 }