framework / qx-form-render · Commits

Commit 8667e4fa2a3378ffd001370fa565958f9c2f3263

Authored by 邢晴晴
2 parents a85fa49b 04ac2adb

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
Inline Side-by-side
Showing 58 changed files with 1809 additions and 1036 deletions
  1 +# misc
  2 +.idea
  3 +.DS_Store
  4 +.idea
  5 +.vscode
... ...
... ... @@ -9,13 +9,13 @@ import _ArrowUpOutlined from "@ant-design/icons/es/icons/ArrowUpOutlined";
9 9
10 10 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); }
11 11
12   -function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
  12 +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; }
13 13
14   -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; }
  14 +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; }
15 15
16 16 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; }
17 17
18   -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); }
  18 +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); }
19 19
20 20 import React from 'react';
21 21 import { useTools } from '../../../hooks';
... ...
... ... @@ -25,13 +25,13 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
25 25
26 26 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
27 27
28   -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; }
  28 +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; }
29 29
30   -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; }
  30 +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; }
31 31
32 32 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; }
33 33
34   -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); }
  34 +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); }
35 35
36 36 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; }
37 37
... ...
... ... @@ -73,8 +73,7 @@ var ListForMobile = function ListForMobile(_ref) {
73 73 getFieldsProps = _ref.getFieldsProps;
74 74 var _schema$props = schema.props,
75 75 props = _schema$props === void 0 ? {} : _schema$props,
76   - itemProps = schema.itemProps,
77   - handleAddDefault = schema.handleAddDefault;
  76 + itemProps = schema.itemProps;
78 77
79 78 var _useState = useState([]),
80 79 _useState2 = _slicedToArray(_useState, 2),
... ... @@ -158,7 +157,7 @@ var ListForMobile = function ListForMobile(_ref) {
158 157 }))), /*#__PURE__*/React.createElement("a", {
159 158 className: 'add-button',
160 159 onClick: function onClick() {
161   - addItem(handleAddDefault);
  160 + addItem();
162 161 }
163 162 }, /*#__PURE__*/React.createElement(_PlusCircleFilled, {
164 163 style: {
... ...
... ... @@ -9,13 +9,13 @@ import _DeleteOutlined from "@ant-design/icons/es/icons/DeleteOutlined";
9 9
10 10 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); }
11 11
12   -function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
  12 +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; }
13 13
14   -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; }
  14 +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; }
15 15
16 16 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; }
17 17
18   -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); }
  18 +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); }
19 19
20 20 import React from 'react';
21 21 import Core from '../../index';
... ...
... ... @@ -23,13 +23,13 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
23 23
24 24 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; }
25 25
26   -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; }
  26 +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; }
27 27
28   -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; }
  28 +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; }
29 29
30 30 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; }
31 31
32   -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); }
  32 +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); }
33 33
34 34 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; }
35 35
... ...
... ... @@ -10,15 +10,16 @@ import _DownOutlined from "@ant-design/icons/es/icons/DownOutlined";
10 10 import "antd/es/input/style";
11 11 import _Input from "antd/es/input";
12 12 import _SearchOutlined from "@ant-design/icons/es/icons/SearchOutlined";
13   -import "antd/es/message/style";
14   -import _message from "antd/es/message";
15 13 import "antd/es/tooltip/style";
16 14 import _Tooltip from "antd/es/tooltip";
17   -import _ExclamationCircleOutlined from "@ant-design/icons/es/icons/ExclamationCircleOutlined";
  15 +import _InfoCircleOutlined from "@ant-design/icons/es/icons/InfoCircleOutlined";
18 16 import "antd/es/menu/style";
19 17 import _Menu from "antd/es/menu";
20 18 import "antd/es/button/style";
21 19 import _Button from "antd/es/button";
  20 +import _ExclamationCircleOutlined from "@ant-design/icons/es/icons/ExclamationCircleOutlined";
  21 +import "antd/es/message/style";
  22 +import _message from "antd/es/message";
22 23 import _AlertOutlined from "@ant-design/icons/es/icons/AlertOutlined";
23 24 import _BarsOutlined from "@ant-design/icons/es/icons/BarsOutlined";
24 25 import _AppstoreOutlined from "@ant-design/icons/es/icons/AppstoreOutlined";
... ... @@ -43,7 +44,7 @@ import _MinusOutlined from "@ant-design/icons/es/icons/MinusOutlined";
43 44 import _PlusOutlined from "@ant-design/icons/es/icons/PlusOutlined";
44 45 import "antd/es/modal/style";
45 46 import _Modal from "antd/es/modal";
46   -var _excluded = ["scrollY", "summary", "batchKey", "type", "bar", "line", "searchKey", "rowSelection", "size"];
  47 +var _excluded = ["scrollY", "summary", "batchKey", "type", "bar", "line", "searchKey", "rowSelection", "size", "originWidget"];
47 48
48 49 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); } }
49 50
... ... @@ -51,9 +52,9 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
51 52
52 53 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); }
53 54
54   -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; }
  55 +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; }
55 56
56   -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; }
  57 +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; }
57 58
58 59 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; }
59 60
... ... @@ -65,7 +66,7 @@ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symb
65 66
66 67 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
67 68
68   -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); }
  69 +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); }
69 70
70 71 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
71 72
... ... @@ -86,10 +87,12 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
86 87 /* eslint-disable jsx-a11y/anchor-is-valid */
87 88 import React, { useEffect, useMemo, useRef, useState } from 'react';
88 89 import Core from '../../index';
89   -var confirm = _Modal.confirm; // import {useVT} from 'virtualizedtableforantd4';
  90 +var confirm = _Modal.confirm; // import { isDesignPage } from './utils'
90 91
91   -import QxIcon from './icon';
92 92 import * as dd from 'dingtalk-jsapi';
  93 +import moment from 'moment'; // import {useVT} from 'virtualizedtableforantd4';
  94 +
  95 +import QxIcon from './icon';
93 96 var BUTTON_ICONS_MAP = {
94 97 PlusOutlined: /*#__PURE__*/React.createElement(_PlusOutlined, null),
95 98 MinusOutlined: /*#__PURE__*/React.createElement(_MinusOutlined, null),
... ... @@ -125,7 +128,7 @@ var EXPORT_STATUS = {
125 128 };
126 129
127 130 var VirtualList = function VirtualList(_ref) {
128   - var _line$buttons;
  131 + var _dd$env;
129 132
130 133 var _ref$displayList = _ref.displayList,
131 134 displayList = _ref$displayList === void 0 ? [] : _ref$displayList,
... ... @@ -140,7 +143,8 @@ var VirtualList = function VirtualList(_ref) {
140 143 schema = _ref.schema,
141 144 listData = _ref.listData,
142 145 changeList = _ref.changeList,
143   - copyItem = _ref.copyItem;
  146 + copyItem = _ref.copyItem,
  147 + dataPath = _ref.dataPath;
144 148 var _schema$props = schema.props,
145 149 props = _schema$props === void 0 ? {} : _schema$props,
146 150 _schema$itemProps = schema.itemProps,
... ... @@ -149,9 +153,10 @@ var VirtualList = function VirtualList(_ref) {
149 153 _schema$qxProps = schema.qxProps,
150 154 qxProps = _schema$qxProps === void 0 ? {} : _schema$qxProps,
151 155 subformMode = schema.subformMode,
  156 + isReadOnly = schema.isReadOnly,
152 157 subReadOnly = schema.subReadOnly,
153 158 isLoading = schema.isLoading,
154   - handleAddDefault = schema.handleAddDefault;
  159 + isFullScreen = schema.isFullScreen;
155 160
156 161 var _props$scrollY = props.scrollY,
157 162 scrollY = _props$scrollY === void 0 ? 300 : _props$scrollY,
... ... @@ -165,6 +170,7 @@ var VirtualList = function VirtualList(_ref) {
165 170 searchKey = props.searchKey,
166 171 rowSelection = props.rowSelection,
167 172 size = props.size,
  173 + originWidget = props.originWidget,
168 174 rest = _objectWithoutProperties(props, _excluded); // const [vt, set_components] = useVT(() => ({scroll: {y: scrollY}}), []);
169 175
170 176
... ... @@ -208,6 +214,19 @@ var VirtualList = function VirtualList(_ref) {
208 214 loading = _useState14[0],
209 215 setLoading = _useState14[1];
210 216
  217 + var mergeFieldsMap = useRef({});
  218 + var isMergeFieldExist = useRef(false); // const [cloneList, setCloneList] = useState([]);
  219 +
  220 + 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';
  221 +
  222 + if (subReadOnly) {
  223 + Object.keys(flatten).forEach(function (key) {
  224 + if (key.indexOf(schema.$id) === 0 && key.split('.').length > 1) {
  225 + flatten[key].schema.readOnly = true;
  226 + }
  227 + });
  228 + }
  229 +
211 230 useEffect(function () {
212 231 setLoading(!!isLoading);
213 232 }, [isLoading]);
... ... @@ -217,8 +236,7 @@ var VirtualList = function VirtualList(_ref) {
217 236 var newRowSelection = useMemo(function () {
218 237 var _bar$buttons;
219 238
220   - if (schema.isReadOnly) return null;
221   -
  239 + // if (schema.isReadOnly) return null
222 240 var _rowSelection = _.cloneDeep(rowSelection); // 根据是否含有批量操作按钮，渲染表格是否可选择
223 241
224 242
... ... @@ -239,25 +257,151 @@ var VirtualList = function VirtualList(_ref) {
239 257 }
240 258
241 259 return _rowSelection;
242   - }, [rowSelection, selectedRowKeys, bar, rowSelection]);
243   - useEffect(function () {
244   - displayList.forEach(function (item, index) {
  260 + }, [JSON.stringify(bar.buttons), JSON.stringify(rowSelection), JSON.stringify(selectedRowKeys)]); // useEffect(() => {
  261 + // const _cloneList = _.cloneDeep(displayList);
  262 + // _cloneList.forEach((item, index) => {
  263 + // if (typeof item === 'object') {
  264 + // item.orginIdx = index
  265 + // }
  266 + // })
  267 + // setCloneList(_cloneList);
  268 + // }, [displayList])
  269 + //
  270 + // let _displayList = []
  271 + //
  272 + // // 筛选展示的数据
  273 + // if (props.originWidget === 'relSelector') {
  274 + // cloneList.forEach(item => {
  275 + // if (!item.hasOwnProperty('$auth') || item.$auth) {
  276 + // _displayList.push(item)
  277 + // }
  278 + // })
  279 + // } else {
  280 + // _displayList = [...cloneList]
  281 + // }
  282 +
  283 + var cloneList = useMemo(function () {
  284 + //console.log('useMemo cloneList', displayList)
  285 + var _cloneList = _.cloneDeep(displayList);
  286 +
  287 + _cloneList.forEach(function (item, index) {
245 288 if (_typeof(item) === 'object') {
246 289 item.orginIdx = index;
247 290 }
248 291 });
249   - }, [displayList]);
250   - var _displayList = []; // 筛选展示的数据
251 292
252   - if (props.originWidget === 'relSelector') {
253   - displayList.forEach(function (item) {
254   - if (!item.hasOwnProperty('$auth') || item.$auth) {
255   - _displayList.push(item);
  293 + return _cloneList;
  294 + }, [displayList]); // 数据变化时，子表汇总值重新计算，并加到主表的formData中
  295 +
  296 + useEffect(function () {
  297 + var _schema$qxProps2;
  298 +
  299 + console.log('计算汇总');
  300 + if (schema.originWidget !== 'subform') return;
  301 + var subKey = schema.fieldName || schema.propertyKey;
  302 + if (!schema._setValueByPath) return;
  303 + (((_schema$qxProps2 = schema.qxProps) === null || _schema$qxProps2 === void 0 ? void 0 : _schema$qxProps2.summary) || []).forEach(function (item) {
  304 + var fx = item.fx,
  305 + relField = item.relField,
  306 + code = item.code;
  307 + var key = "".concat(subKey, ":").concat(code, ":").concat(fx); // subKey + '.' + code +;
  308 +
  309 + var values = (displayList || []).map(function (it) {
  310 + return it[relField];
  311 + });
  312 +
  313 + if (!values.length) {
  314 + schema._setValueByPath(key, 'EMPTY');
  315 +
  316 + return;
  317 + }
  318 +
  319 + if (['COUNTUNIQUE', 'COUNTA'].includes(fx)) {
  320 + values.forEach(function (_item, index) {
  321 + if (Array.isArray(_item)) {
  322 + values[index] = String(_item);
  323 + }
  324 + });
  325 + }
  326 +
  327 + values = values.filter(function (item) {
  328 + return item !== undefined;
  329 + });
  330 +
  331 + if (fx === 'MAX' || fx === 'MIN') {
  332 + var widget = '';
  333 + var keys = Object.keys(flatten || {});
  334 +
  335 + for (var i = 0; i < keys.length; i++) {
  336 + if (keys[i].indexOf(relField) > -1) {
  337 + var _flatten$keys$i, _flatten$keys$i$schem;
  338 +
  339 + 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;
  340 +
  341 + if (_widget !== 'qxSummary') {
  342 + widget = _widget;
  343 + break;
  344 + }
  345 + }
  346 + }
  347 +
  348 + if (['qxDatetime', 'createdAt', 'updatedAt'].includes(widget)) {
  349 + var _moment$fx$toLowerCas;
  350 +
  351 + values = values.filter(function (it) {
  352 + return it;
  353 + }); // 计算日期的最大最小时，过滤掉空值
  354 +
  355 + values.forEach(function (it, index) {
  356 + values[index] = moment(it);
  357 + }); // schema.parentFormData[key] = moment[fx.toLowerCase()](values)?._i || 'EMPTY';
  358 +
  359 + schema._setValueByPath(key, ((_moment$fx$toLowerCas = moment[fx.toLowerCase()](values)) === null || _moment$fx$toLowerCas === void 0 ? void 0 : _moment$fx$toLowerCas._i) || 'EMPTY');
  360 + } else if (widget === 'qxTime') {
  361 + var _moment$fx$toLowerCas2, _moment$fx$toLowerCas3;
  362 +
  363 + values = values.filter(function (it) {
  364 + return it;
  365 + }); // 计算时间的最大最小时，过滤掉空值
  366 +
  367 + values.forEach(function (it, index) {
  368 + values[index] = moment('0001-01-01 ' + it); // 随意拼个年月日返回，计算时替换
  369 + }); // schema.parentFormData[key] = (moment[fx.toLowerCase()](values)?._i)?.slice(11) || 'EMPTY';
  370 +
  371 + 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');
  372 + } else {
  373 + // schema.parentFormData[key] = window[fx](values);
  374 + schema._setValueByPath(key, window[fx](values));
  375 + }
  376 + } else {
  377 + // schema.parentFormData['__SUMMARY_' + subKey][key] = window[fx](values);
  378 + var res = window[fx](values);
  379 +
  380 + if (String(res).startsWith('Error')) {
  381 + res = null;
  382 + }
  383 +
  384 + schema._setValueByPath(key, res);
256 385 }
257 386 });
258   - } else {
259   - _displayList = _toConsumableArray(displayList);
260   - } // useEffect(() => {
  387 + }, [JSON.stringify(displayList)]);
  388 +
  389 + var _displayList = useMemo(function () {
  390 + //console.log('useMemo _displayList', cloneList)
  391 + var _displayList1 = []; // 筛选展示的数据
  392 +
  393 + if (props.originWidget === 'relSelector') {
  394 + cloneList.forEach(function (item) {
  395 + if (!item.hasOwnProperty('$auth') || item.$auth) {
  396 + _displayList1.push(item);
  397 + }
  398 + });
  399 + } else {
  400 + _displayList1 = _toConsumableArray(cloneList);
  401 + }
  402 +
  403 + return _displayList1;
  404 + }, [cloneList]); // useEffect(() => {
261 405 // 筛选展示的数据
262 406 // if (props.originWidget === 'relSelector') {
263 407 // displayList.forEach((item, index) => {
... ... @@ -299,23 +443,27 @@ var VirtualList = function VirtualList(_ref) {
299 443
300 444 var selectedIds = useMemo(function () {
301 445 var _selectedIds = [];
302   - displayList.forEach(function (item) {
303   - if (item && selectedRowKeys.includes(item.orginIdx)) {
  446 + cloneList.forEach(function (item) {
  447 + if (item && selectedRowKeys.includes(props.originWidget === 'subform' ? item.orginIdx : item.id)) {
304 448 _selectedIds.push(item.id);
305 449 }
306 450 });
307 451 return _selectedIds;
308   - }, [selectedRowKeys, displayList]); // useEffect(() => {
309   -
310   - var dataSource = (keyWord.length ? _displayList.filter(function (item) {
311   - var _String;
312   -
313   - return ((_String = String(item[searchKey])) === null || _String === void 0 ? void 0 : _String.indexOf(keyWord)) > -1;
314   - }) : _displayList).map(function (item, idx) {
315   - return _objectSpread(_objectSpread({}, item), {}, {
316   - index: item.hasOwnProperty('orginIdx') ? item.orginIdx : idx
  452 + }, [selectedRowKeys, cloneList]); // useEffect(() => {
  453 +
  454 + var dataSource = useMemo(function () {
  455 + //console.log('useMemo dataSource',dataSource);
  456 + return (keyWord.length ? _displayList.filter(function (item) {
  457 + var _String;
  458 +
  459 + return ((_String = String(item[searchKey])) === null || _String === void 0 ? void 0 : _String.indexOf(keyWord)) > -1;
  460 + }) : _displayList).map(function (item, idx) {
  461 + return _objectSpread(_objectSpread({}, item), {}, {
  462 + index: item.hasOwnProperty('orginIdx') ? item.orginIdx : idx,
  463 + orginIdx: item.hasOwnProperty('orginIdx') ? item.orginIdx : null
  464 + });
317 465 });
318   - }); // useEffect(() => {
  466 + }, [_displayList, keyWord, searchKey]); // useEffect(() => {
319 467 // setRefresh(refresh + '1')
320 468 // }, [JSON.stringify(dataSource)])
321 469 // setDataSource(_dataSource)
... ... @@ -345,6 +493,7 @@ var VirtualList = function VirtualList(_ref) {
345 493 };
346 494
347 495 var pagination = useMemo(function () {
  496 + // console.log('useMemo pagination', dataSource?.length, props.limit)
348 497 return {
349 498 total: dataSource.length,
350 499 position: ['bottomRight'],
... ... @@ -356,9 +505,20 @@ var VirtualList = function VirtualList(_ref) {
356 505 size: size || 'small' // hideOnSinglePage: true
357 506
358 507 };
359   - }, [dataSource, props.limit]);
  508 + }, [dataSource === null || dataSource === void 0 ? void 0 : dataSource.length, props.limit]);
360 509 var barButtons = useMemo(function () {
361   - var _barButtons = _.cloneDeep(bar.buttons || []); // 关联表的导入，先隐藏 TODO
  510 + // console.log('useMemo barButtons', schema.isReadOnly, bar.buttons, originWidget, type, subReadOnly)
  511 + var _barButtons = _.cloneDeep(bar.buttons || []);
  512 +
  513 + if (schema.isReadOnly) {
  514 + // 关联表只读
  515 + // return _barButtons.filter(item => item.code === 'EXPORT')
  516 + return [];
  517 + } else if (subReadOnly) {
  518 + return _barButtons.filter(function (item) {
  519 + return item.code === 'EXPORT';
  520 + });
  521 + } // 关联表的导入，先隐藏 TODO
362 522
363 523
364 524 if (props.originWidget === 'relSelector') {
... ... @@ -421,103 +581,455 @@ var VirtualList = function VirtualList(_ref) {
421 581
422 582 if (props.originWidget === 'subform') {
423 583 addBtns.push('DELETE');
  584 + return _barButtons.filter(function (item) {
  585 + return addBtns.includes(item.code);
  586 + });
424 587 }
425   -
426   - return _barButtons.filter(function (item) {
427   - return addBtns.includes(item.code);
428   - });
429 588 } else if (type === 'view') {
430 589 return _barButtons.filter(function (item) {
431 590 return item.code === 'EXPORT';
432 591 });
433 592 }
434 593
435   - if (schema.isReadOnly) {
436   - // return _barButtons.filter(item => item.code === 'EXPORT')
437   - return [];
  594 + return _barButtons;
  595 + }, [schema.isReadOnly, bar.buttons, originWidget, type, subReadOnly]);
  596 +
  597 + var barBtnClick = function barBtnClick(code, needConfirm, confirmContent, action, item) {
  598 + setSelectedRowKeys([]);
  599 +
  600 + if (needConfirm && confirmContent) {
  601 + if (!selectedRowKeys.length) {
  602 + return _message.warning('请选择数据');
  603 + }
  604 +
  605 + confirm({
  606 + title: confirmContent,
  607 + icon: /*#__PURE__*/React.createElement(_ExclamationCircleOutlined, null),
  608 + okText: '确认',
  609 + okType: 'danger',
  610 + cancelText: '取消',
  611 + onOk: function onOk() {
  612 + if (code === 'DELETE') {
  613 + if (props.originWidget === 'subform') {
  614 + batchDelete(selectedRowKeys);
  615 + setSelectedRowKeys([]);
  616 + } else {
  617 + props.handleBarBtnClick(code, fieldName, batchKey, selectedRowKeys, schema.$id, selectedIds);
  618 + }
  619 + } else if (code === 'EXPORT') {
  620 + handleExport();
  621 + } else if (code === 'SELECT') {
  622 + props.openRelSelect(schema.$id);
  623 + } else if (code === 'ADD') {
  624 + props.handleRelAdd(schema.$id);
  625 + } else if (code === 'subformEdit') {
  626 + props.handleBatchEdit(fieldName, schema.$id, selectedIds);
  627 + } else if (action === 'CUSTOM') {
  628 + props.handleCustom(item, selectedIds, schema.$id);
  629 + } else {
  630 + props.handleBarBtnClick(code, fieldName, batchKey, selectedRowKeys, schema.$id, selectedIds);
  631 + }
  632 + },
  633 + onCancel: function onCancel() {}
  634 + });
  635 + } else {
  636 + if (code === 'DELETE') {
  637 + if (props.originWidget === 'subform') {
  638 + batchDelete(selectedRowKeys);
  639 + setSelectedRowKeys([]);
  640 + } else {
  641 + props.handleBarBtnClick(code, fieldName, batchKey, selectedRowKeys, schema.$id, selectedIds);
  642 + }
  643 + } else if (code === 'EXPORT') {
  644 + handleExport();
  645 + } else if (code === 'SELECT') {
  646 + props.openRelSelect(schema.$id);
  647 + } else if (code === 'ADD') {
  648 + props.handleRelAdd(schema.$id);
  649 + } else if (code === 'subformEdit') {
  650 + props.handleBatchEdit(fieldName, schema.$id, selectedIds);
  651 + } else if (action === 'CUSTOM') {
  652 + props.handleCustom(item, selectedIds, schema.$id);
  653 + } else {
  654 + props.handleBarBtnClick(code, fieldName, batchKey, selectedRowKeys, schema.$id, selectedIds);
  655 + }
438 656 }
  657 + };
439 658
440   - return _barButtons;
441   - }, [props, type]);
442   - var moreButtons = /*#__PURE__*/React.createElement(_Menu, null, barButtons.slice(3).map(function (item) {
443   - var name = item.name,
444   - code = item.code,
445   - needConfirm = item.needConfirm,
446   - confirmContent = item.confirmContent,
447   - icon = item.icon,
448   - action = item.action;
449   - return /*#__PURE__*/React.createElement(_Menu.Item, null, /*#__PURE__*/React.createElement(_Button, _extends({
450   - key: code,
451   - style: {
452   - marginLeft: 8,
453   - border: 'none'
  659 + var moreButtons = useMemo(function () {
  660 + var _barButtons = _.cloneDeep(barButtons);
  661 +
  662 + return /*#__PURE__*/React.createElement(_Menu, null, _barButtons.slice(3).filter(function (item) {
  663 + return isInDing ? !['EXPORT', 'IMPORT'].includes(item.code) : true;
  664 + }).map(function (item) {
  665 + var name = item.name,
  666 + code = item.code,
  667 + needConfirm = item.needConfirm,
  668 + confirmContent = item.confirmContent,
  669 + icon = item.icon,
  670 + action = item.action;
  671 + return /*#__PURE__*/React.createElement(_Menu.Item, null, /*#__PURE__*/React.createElement(_Button, _extends({
  672 + key: code,
  673 + style: {
  674 + marginLeft: 8,
  675 + border: 'none'
  676 + }
  677 + }, item, {
  678 + icon: icon && bar.style !== 'TEXT' ? String(icon).indexOf('http') > -1 ? /*#__PURE__*/React.createElement("img", {
  679 + src: String(icon),
  680 + style: {
  681 + width: '16px',
  682 + height: '16px',
  683 + marginRight: '4px',
  684 + verticalAlign: 'text-bottom',
  685 + borderRadius: '50%'
  686 + },
  687 + alt: ""
  688 + }) : String(icon).indexOf('-') > -1 ? /*#__PURE__*/React.createElement(QxIcon, {
  689 + type: String(icon)
  690 + }) : BUTTON_ICONS_MAP[icon + ''] : null,
  691 + onClick: function onClick() {
  692 + barBtnClick(code, needConfirm, confirmContent, action, item);
  693 + }
  694 + }), name));
  695 + }));
  696 + }, [barButtons, barBtnClick, selectedRowKeys]);
  697 +
  698 + var handleColumn = function handleColumn(schema, child, index) {
  699 + var _schema$props2;
  700 +
  701 + if (props.editable && props.originWidget === 'subform') {
  702 + if (isSubCanEdit && !['relField', 'qxFormula'].includes(schema.widget)) {
  703 + schema.readOnly = false;
  704 + } else if (!isSubCanEdit) {
  705 + schema.readOnly = true;
454 706 }
455   - }, item, {
456   - icon: icon && bar.style !== 'TEXT' ? String(icon).indexOf('http') > -1 ? /*#__PURE__*/React.createElement("img", {
457   - src: String(icon),
  707 + }
  708 +
  709 + if (schema.fieldName === searchKey) {
  710 + setSearchName(schema.title);
  711 + }
  712 +
  713 + var tip = schema.description ? /*#__PURE__*/React.createElement("span", {
  714 + className: 'qx-column_desc'
  715 + }, /*#__PURE__*/React.createElement(_Tooltip, {
  716 + title: schema.description
  717 + }, /*#__PURE__*/React.createElement(_InfoCircleOutlined, null))) : null;
  718 + var column = ((_schema$props2 = schema.props) === null || _schema$props2 === void 0 ? void 0 : _schema$props2.column) || {};
  719 +
  720 + var _dataIndex = child.indexOf(dataPath) === -1 ? dataPath + '[].' + child : child;
  721 +
  722 + var _width = parseInt(column.width);
  723 +
  724 + return {
  725 + dataIndex: _dataIndex,
  726 + width: (column.width && _width ? _width : FIELD_LENGTH) + padding,
  727 + align: props.originWidget === 'subform' ? 'left' : column.align || 'left',
  728 + fixed: column.fixed || props.fixed && typeof index === 'number' && !isMergeFieldExist.current && index < props.fixed,
  729 + title: /*#__PURE__*/React.createElement("div", {
458 730 style: {
459   - width: '16px',
460   - height: '16px',
461   - marginRight: '4px',
462   - verticalAlign: 'text-bottom',
463   - borderRadius: '50%'
464   - },
465   - alt: ""
466   - }) : String(icon).indexOf('-') > -1 ? /*#__PURE__*/React.createElement(QxIcon, {
467   - type: String(icon)
468   - }) : BUTTON_ICONS_MAP[icon + ''] : null,
469   - onClick: function onClick() {
470   - barBtnClick(code, needConfirm, confirmContent, action, item);
  731 + width: (column.width ? parseInt(column.width) : FIELD_LENGTH) + "px"
  732 + }
  733 + }, schema.required ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
  734 + className: "fr-label-required"
  735 + }, " *"), /*#__PURE__*/React.createElement("span", {
  736 + className: "qx-virtual_title__required",
  737 + title: schema.title
  738 + }, schema.title), tip) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
  739 + className: "qx-virtual_title",
  740 + title: schema.title
  741 + }, schema.title), tip)),
  742 + render: function render(value, record, index) {
  743 + // Check: record.index 似乎是antd自己会给的，不错哦
  744 + var childIndex = [].concat(_toConsumableArray(dataIndex), [record.index]);
  745 + return /*#__PURE__*/React.createElement(Core, {
  746 + hideTitle: true,
  747 + displayType: "inline",
  748 + key: index.toString(),
  749 + id: _dataIndex,
  750 + dataIndex: childIndex,
  751 + _item: flatten[_dataIndex] ? null : getItemSchema(_dataIndex) // subReadOnly={subReadOnly}
  752 +
  753 + });
471 754 }
472   - }), name));
473   - }));
  755 + };
  756 + };
  757 +
  758 + var getItemSchema = function getItemSchema(id) {
  759 + var _item;
  760 +
  761 + Object.keys(mergeFieldsMap.current || {}).forEach(function (key) {
  762 + if (id.indexOf(key) > -1) {
  763 + _item = mergeFieldsMap.current[key];
  764 + }
  765 + });
  766 + return _item;
  767 + };
  768 +
  769 + var handleMergeField = function handleMergeField(schema) {
  770 + // const column = schema.props?.column || {};
  771 + var _props = schema.props;
  772 + return {
  773 + title: _props.title,
  774 + align: _props.align,
  775 + dataIndex: _props.dataIndex,
  776 + children: Object.keys(schema.children).map(function (key) {
  777 + var _schema$children$key, _schema$children$key2;
  778 +
  779 + 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)) {
  780 + return {
  781 + show: false
  782 + };
  783 + }
  784 +
  785 + var isMergeField = key.indexOf('_merge_field') > -1 && Object.keys(schema.children[key].children || {}).length;
  786 +
  787 + if (isMergeField) {
  788 + return handleMergeField(schema.children[key]);
  789 + } else {
  790 + return handleColumn(schema.children[key], key);
  791 + }
  792 + })
  793 + };
  794 + };
  795 +
  796 + var getMergeMap = function getMergeMap() {
  797 + var _map = {};
  798 + Object.keys(flatten).forEach(function (key) {
  799 + var _schema$schema;
  800 +
  801 + var _schema = flatten[key];
  802 +
  803 + var _children = (_schema === null || _schema === void 0 ? void 0 : (_schema$schema = _schema.schema) === null || _schema$schema === void 0 ? void 0 : _schema$schema.children) || {};
  804 +
  805 + if (key.indexOf('_merge_field') > -1 && Object.keys(_children).length) {
  806 + Object.keys(_children).forEach(function (item) {
  807 + var _schema1 = _children[item];
  808 +
  809 + var _children1 = _schema1.children || {};
  810 +
  811 + if (item.indexOf('_merge_field') > -1 && Object.keys(_children1).length) {
  812 + Object.keys(_children1).forEach(function (it) {
  813 + _map[it] = {
  814 + schema: _children1[it]
  815 + };
  816 + });
  817 + } else {
  818 + _map[item] = {
  819 + schema: _schema1
  820 + };
  821 + }
  822 + });
  823 + }
  824 + });
  825 + return _map;
  826 + };
  827 +
474 828 var columns = useMemo(function () {
475   - return children.map(function (child, index) {
476   - var _schema$props2;
  829 + var _line_buttons2;
  830 +
  831 + //console.log('useMemo columns', isSubCanEdit, subReadOnly, JSON.stringify(line.buttons))
  832 + mergeFieldsMap.current = getMergeMap();
  833 + isMergeFieldExist.current = false;
  834 +
  835 + var _line_buttons = _.cloneDeep(line.buttons);
  836 +
  837 + var _columns = (children || []).map(function (child, index) {
  838 + var _schema$children;
477 839
478 840 var item = flatten[child];
479 841 var schema = item && item.schema || {};
480 842
481   - if (props.editable && props.originWidget === 'subform') {
482   - if (isSubCanEdit && !['relField', 'qxFormula'].includes(schema.widget)) {
483   - schema.readOnly = false;
484   - } else if (!isSubCanEdit) {
485   - schema.readOnly = true;
486   - }
  843 + 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)) {
  844 + return {
  845 + show: false
  846 + };
487 847 }
488 848
489   - if (schema.fieldName === searchKey) {
490   - setSearchName(schema.title);
  849 + var isMergeField = child.indexOf('_merge_field') > -1 && Object.keys(schema.children || {}).length;
  850 +
  851 + if (isMergeField) {
  852 + isMergeFieldExist.current = true;
  853 + return handleMergeField(schema, index);
  854 + } else {
  855 + return handleColumn(schema, child, index);
491 856 }
  857 + });
492 858
493   - var column = ((_schema$props2 = schema.props) === null || _schema$props2 === void 0 ? void 0 : _schema$props2.column) || {};
494   - return {
495   - dataIndex: child,
496   - width: (column.width ? parseInt(column.width) : FIELD_LENGTH) + padding,
497   - align: column.align || 'left',
498   - fixed: column.fixed || props.fixed && index < props.fixed,
499   - title: /*#__PURE__*/React.createElement("div", {
500   - style: {
501   - width: (column.width ? parseInt(column.width) : FIELD_LENGTH) + "px"
502   - }
503   - }, schema.required ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
504   - className: "fr-label-required"
505   - }, " *"), /*#__PURE__*/React.createElement("span", null, schema.title)) : schema.title),
506   - render: function render(value, record, index) {
507   - // Check: record.index 似乎是antd自己会给的，不错哦
508   - var childIndex = [].concat(_toConsumableArray(dataIndex), [record.index]);
509   - return /*#__PURE__*/React.createElement(Core, {
510   - hideTitle: true,
511   - displayType: "inline",
512   - key: index.toString(),
513   - id: child,
514   - dataIndex: childIndex // subReadOnly={subReadOnly}
  859 + _columns = _columns.filter(function (item) {
  860 + return Object.keys(item).length !== 1 && (!item.hidden || item.show);
  861 + });
  862 +
  863 + if (((_line_buttons2 = _line_buttons) === null || _line_buttons2 === void 0 ? void 0 : _line_buttons2.length) || Array.isArray(itemProps.buttons)) {
  864 + var top = line.top,
  865 + _line$style = line.style,
  866 + style = _line$style === void 0 ? 'ICON' : _line$style,
  867 + fixed = line.fixed;
515 868
  869 + if (type === 'add') {
  870 + if (props.originWidget === 'subform') {
  871 + _line_buttons = _line_buttons.filter(function (item) {
  872 + return item.code === 'DELETE';
516 873 });
  874 + } // 关联记录放开所有行按钮关联XQ230328006
  875 + // else if (props.originWidget === 'relSelector') {
  876 + // // jbl ERP需求，新增时放开编辑按钮
  877 + // _line_buttons = _line_buttons.filter(item => ['REMOVE', 'EDIT'].includes(item.code))
  878 + // }
  879 +
  880 + } else if ((type === 'view' || isReadOnly) && originWidget === 'relSelector') {
  881 + _line_buttons = _line_buttons.filter(function (item) {
  882 + return item.code === 'VIEW';
  883 + });
  884 + }
  885 +
  886 + var len = (_line_buttons || []).length;
  887 + var action = subReadOnly || isReadOnly && originWidget === 'subform' ? {} : {
  888 + title: '操作',
  889 + key: '$action',
  890 + fixed: fixed ? top ? 'left' : 'right' : props.originWidget === 'subform' ? 'right' : false,
  891 + align: 'center',
  892 + // width: ((buttons || []).length + (props.removeable ? 1 : 0)) * (style === 'ICON' ? 32 : style === 'TEXT' ? 36 : 57) + 16,
  893 + render: function render(value, record, idx) {
  894 + return /*#__PURE__*/React.createElement(React.Fragment, null, Array.isArray(itemProps.buttons) ? itemProps.buttons.map(function (item, idx) {
  895 + var callback = item.callback,
  896 + text = item.text,
  897 + html = item.html;
  898 +
  899 + var onClick = function onClick() {};
  900 +
  901 + if (typeof window[callback] === 'function') {
  902 + onClick = function onClick() {
  903 + window[callback]({
  904 + value: listData,
  905 + onChange: changeList,
  906 + schema: schema
  907 + });
  908 + };
  909 + }
  910 +
  911 + return /*#__PURE__*/React.createElement("a", {
  912 + key: idx.toString(),
  913 + style: {
  914 + marginLeft: 8
  915 + },
  916 + onClick: onClick
  917 + }, /*#__PURE__*/React.createElement("span", {
  918 + dangerouslySetInnerHTML: {
  919 + __html: html || text
  920 + }
  921 + }));
  922 + }) : null, Array.isArray(_line_buttons) ? _line_buttons.map(function (item) {
  923 + var name = item.name,
  924 + code = item.code,
  925 + needConfirm = item.needConfirm,
  926 + confirmContent = item.confirmContent,
  927 + icon = item.icon;
  928 + var display = handleState(record, code, props.originWidget); // if (display === '') {
  929 + // btnMap[code] = ''
  930 + // }
  931 +
  932 + return /*#__PURE__*/React.createElement(_Tooltip, {
  933 + title: name
  934 + }, /*#__PURE__*/React.createElement(_Button, _extends({
  935 + key: code,
  936 + style: {
  937 + marginLeft: 8,
  938 + display: display
  939 + }
  940 + }, item, {
  941 + icon: icon && style !== 'TEXT' ? String(icon).indexOf('http') > -1 ? /*#__PURE__*/React.createElement("img", {
  942 + src: String(icon),
  943 + style: {
  944 + width: '16px',
  945 + height: '16px',
  946 + marginRight: '4px',
  947 + verticalAlign: 'text-bottom',
  948 + borderRadius: '50%'
  949 + },
  950 + alt: ""
  951 + }) : String(icon).indexOf('-') > -1 ? /*#__PURE__*/React.createElement(QxIcon, {
  952 + type: String(icon)
  953 + }) : BUTTON_ICONS_MAP[icon + ''] : null,
  954 + type: 'link',
  955 + size: 'small' // disabled={props.originWidget === 'subform' ? false : handleAuth(record, code)}
  956 + ,
  957 + onClick: function onClick() {
  958 + // 已有数据进行操作时才二次提示
  959 + if (needConfirm && confirmContent && (props.originWidget === 'relSelector' ? record.hasOwnProperty('$auth') : record.hasOwnProperty('id'))) {
  960 + confirm({
  961 + title: confirmContent,
  962 + icon: /*#__PURE__*/React.createElement(_ExclamationCircleOutlined, null),
  963 + okText: '确认',
  964 + okType: 'danger',
  965 + cancelText: '取消',
  966 + onOk: function onOk() {
  967 + if (code === 'DELETE' && props.originWidget === 'subform') {
  968 + deleteItem(idx);
  969 + } else if (code === 'REMOVE') {
  970 + deleteItem(record.orginIdx);
  971 + props.handleLineBtnClick(code, record, schema.$id);
  972 + } else if (code === 'COPY') {
  973 + copyItem(record.orginIdx);
  974 + } else if (item.action === 'CUSTOM') {
  975 + props.handleCustom(item, record, schema.$id);
  976 + } else {
  977 + props.handleLineBtnClick(code, record, schema.$id, line.action);
  978 + }
  979 + },
  980 + onCancel: function onCancel() {}
  981 + });
  982 + } else {
  983 + if (code === 'DELETE' && props.originWidget === 'subform') {
  984 + deleteItem(idx);
  985 + } else if (code === 'REMOVE') {
  986 + deleteItem(record.orginIdx);
  987 + props.handleLineBtnClick(code, record, schema.$id);
  988 + } else if (code === 'COPY') {
  989 + copyItem(record.orginIdx);
  990 + } else if (item.action === 'CUSTOM') {
  991 + props.handleCustom(item, record, schema.$id);
  992 + } else {
  993 + props.handleLineBtnClick(code, record, schema.$id, line.action, schema);
  994 + }
  995 + }
  996 + }
  997 + }), style !== 'ICON' || !icon ? name : null)); // }
  998 + }) : null);
517 999 }
518 1000 };
519   - });
520   - }, [children, flatten, isSubCanEdit]);
  1001 + var actionLength = 0;
  1002 +
  1003 + _line_buttons.forEach(function (item) {
  1004 + if (props.originWidget === 'subform' || style === 'ICON' && item.icon) {
  1005 + actionLength += 32;
  1006 + } else if (style !== 'ICON' || style === 'ICON' && !item.icon) {
  1007 + var div = document.createElement('div');
  1008 + div.style.position = 'absolute';
  1009 + div.style.visibility = 'hidden';
  1010 + div.style.fontSize = '14px';
  1011 + window.document.body.appendChild(div);
  1012 + div.innerHTML = item.name;
  1013 + actionLength += div.clientWidth + (style !== 'TEXT' && item.icon ? 32 : 0);
  1014 + div.remove();
  1015 + }
  1016 + });
  1017 +
  1018 + action.width = actionLength + padding * 2 - 8;
  1019 +
  1020 + if ((_columns || []).findIndex(function (item) {
  1021 + return item.key === '$action';
  1022 + }) === -1 && len > 0 && action.title) {
  1023 + if (top) {
  1024 + _columns.unshift(action);
  1025 + } else {
  1026 + _columns.push(action);
  1027 + }
  1028 + }
  1029 + }
  1030 +
  1031 + return _columns;
  1032 + }, [isSubCanEdit, subReadOnly, JSON.stringify(line.buttons), deleteItem]);
521 1033
522 1034 var handleAuth = function handleAuth(record, code) {
523 1035 switch (code) {
... ... @@ -559,192 +1071,6 @@ var VirtualList = function VirtualList(_ref) {
559 1071 }
560 1072 };
561 1073
562   - if (!props.hideDelete && ((_line$buttons = line.buttons) === null || _line$buttons === void 0 ? void 0 : _line$buttons.length) || Array.isArray(itemProps.buttons)) {
563   - var top = line.top,
564   - _line$style = line.style,
565   - style = _line$style === void 0 ? 'ICON' : _line$style,
566   - fixed = line.fixed,
567   - buttons = line.buttons;
568   -
569   - if (type === 'add') {
570   - if (props.originWidget === 'subform') {
571   - line.buttons = buttons.filter(function (item) {
572   - return item.code === 'DELETE';
573   - });
574   - } else if (props.originWidget === 'relSelector') {
575   - line.buttons = buttons.filter(function (item) {
576   - return item.code === 'REMOVE';
577   - });
578   - }
579   - } // if (props.removeable && buttons.findIndex(item => item.code === 'REMOVE') === -1) {
580   - // buttons.push({
581   - // icon: 'remove',
582   - // code: 'REMOVE',
583   - // name: '移除',
584   - // line: true,
585   - // needConfirm: true,
586   - // confirmContent: props.removeContent
587   - // })
588   - // }
589   -
590   -
591   - var len = (line.buttons || []).length;
592   - var action = schema.isReadOnly || subReadOnly ? {} : {
593   - title: '操作',
594   - key: '$action',
595   - fixed: fixed ? top ? 'left' : 'right' : props.originWidget === 'subform' ? 'right' : false,
596   - align: 'center',
597   - // width: ((buttons || []).length + (props.removeable ? 1 : 0)) * (style === 'ICON' ? 32 : style === 'TEXT' ? 36 : 57) + 16,
598   - render: function render(value, record, idx) {
599   - return /*#__PURE__*/React.createElement(React.Fragment, null, Array.isArray(itemProps.buttons) ? itemProps.buttons.map(function (item, idx) {
600   - var callback = item.callback,
601   - text = item.text,
602   - html = item.html;
603   -
604   - var onClick = function onClick() {};
605   -
606   - if (typeof window[callback] === 'function') {
607   - onClick = function onClick() {
608   - window[callback]({
609   - value: listData,
610   - onChange: changeList,
611   - schema: schema
612   - });
613   - };
614   - }
615   -
616   - return /*#__PURE__*/React.createElement("a", {
617   - key: idx.toString(),
618   - style: {
619   - marginLeft: 8
620   - },
621   - onClick: onClick
622   - }, /*#__PURE__*/React.createElement("span", {
623   - dangerouslySetInnerHTML: {
624   - __html: html || text
625   - }
626   - }));
627   - }) : null, Array.isArray(line.buttons) ? line.buttons.map(function (item) {
628   - var name = item.name,
629   - code = item.code,
630   - needConfirm = item.needConfirm,
631   - confirmContent = item.confirmContent,
632   - icon = item.icon;
633   - var display = handleState(record, code, props.originWidget); // if (display === '') {
634   - // btnMap[code] = ''
635   - // }
636   -
637   - return /*#__PURE__*/React.createElement(_Tooltip, {
638   - title: name
639   - }, /*#__PURE__*/React.createElement(_Button, _extends({
640   - key: code,
641   - style: {
642   - marginLeft: 8,
643   - display: display
644   - }
645   - }, item, {
646   - icon: icon && style !== 'TEXT' ? String(icon).indexOf('http') > -1 ? /*#__PURE__*/React.createElement("img", {
647   - src: String(icon),
648   - style: {
649   - width: '16px',
650   - height: '16px',
651   - marginRight: '4px',
652   - verticalAlign: 'text-bottom',
653   - borderRadius: '50%'
654   - },
655   - alt: ""
656   - }) : String(icon).indexOf('-') > -1 ? /*#__PURE__*/React.createElement(QxIcon, {
657   - type: String(icon)
658   - }) : BUTTON_ICONS_MAP[icon + ''] : null,
659   - type: 'link',
660   - size: 'small' // disabled={props.originWidget === 'subform' ? false : handleAuth(record, code)}
661   - ,
662   - onClick: function onClick() {
663   - // 已有数据进行操作时才二次提示
664   - if (needConfirm && confirmContent && (props.originWidget === 'relSelector' ? record.hasOwnProperty('$auth') : record.hasOwnProperty('id'))) {
665   - confirm({
666   - title: confirmContent,
667   - icon: /*#__PURE__*/React.createElement(_ExclamationCircleOutlined, null),
668   - okText: '确认',
669   - okType: 'danger',
670   - cancelText: '取消',
671   - onOk: function onOk() {
672   - if (code === 'DELETE' && props.originWidget === 'subform') {
673   - deleteItem(idx);
674   - } else if (code === 'REMOVE') {
675   - deleteItem(record.orginIdx);
676   - props.handleLineBtnClick(code, record, schema.$id);
677   - } else if (code === 'COPY') {
678   - copyItem(record.orginIdx);
679   - } else if (item.action === 'CUSTOM') {
680   - props.handleCustom(item, record, schema.$id);
681   - } else {
682   - props.handleLineBtnClick(code, record, schema.$id, line.action);
683   - }
684   - },
685   - onCancel: function onCancel() {}
686   - });
687   - } else {
688   - if (code === 'DELETE' && props.originWidget === 'subform') {
689   - deleteItem(idx);
690   - } else if (code === 'REMOVE') {
691   - deleteItem(record.orginIdx);
692   - props.handleLineBtnClick(code, record, schema.$id);
693   - } else if (code === 'COPY') {
694   - copyItem(record.orginIdx);
695   - } else if (item.action === 'CUSTOM') {
696   - props.handleCustom(item, record, schema.$id);
697   - } else {
698   - props.handleLineBtnClick(code, record, schema.$id, line.action);
699   - }
700   - }
701   - }
702   - }), style !== 'ICON' ? name : null)); // }
703   - }) : null);
704   - }
705   - };
706   -
707   - if (style === "ICON" || props.originWidget === 'subform') {
708   - // let effectiveLength = 0
709   - // console.log(line.buttons)
710   - // line.buttons.forEach((btn) => {
711   - // // console.log(btnMap)
712   - // if (btnMap[btn.code] === '') {
713   - // effectiveLength += 1
714   - // console.log(effectiveLength);
715   - // }
716   - // })
717   - // console.log(effectiveLength, padding);
718   - action.width = len * 32 - 16 >= 30 ? len * 32 + padding - 8 : 30 + padding;
719   - } else {
720   - var leng = 0;
721   - line.buttons.map(function (item) {
722   - var div = document.createElement('div');
723   - div.style.position = 'absolute';
724   - div.style.visibility = 'hidden';
725   - div.style.fontSize = '14px';
726   - window.document.body.appendChild(div);
727   - div.innerHTML = item.name; // leng += btnMap?.[item.code] === '' ? (div.clientWidth + (style !== 'TEXT' && item.icon ? 22 : 0)) : 0;
728   -
729   - leng += div.clientWidth + (style !== 'TEXT' && item.icon ? 22 : 0); // console.log(leng);
730   -
731   - div.remove();
732   - }); // console.log(leng + padding * 2 - 8, 'leng');
733   -
734   - action.width = leng + padding * 2 - 8;
735   - }
736   -
737   - if (columns.findIndex(function (item) {
738   - return item.key === '$action';
739   - }) === -1 && len > 0 && action.title) {
740   - if (top) {
741   - columns.unshift(action);
742   - } else {
743   - columns.push(action);
744   - }
745   - }
746   - }
747   -
748 1074 var handleExport = /*#__PURE__*/function () {
749 1075 var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
750 1076 var queryParams, currentAppCode, currentFunCode, appCode, funCode, fieldName, result;
... ... @@ -876,68 +1202,6 @@ var VirtualList = function VirtualList(_ref) {
876 1202 setSubEdit(false);
877 1203 };
878 1204
879   - var barBtnClick = function barBtnClick(code, needConfirm, confirmContent, action, item) {
880   - setSelectedRowKeys([]);
881   -
882   - if (needConfirm && confirmContent) {
883   - if (!selectedRowKeys.length) {
884   - return _message.warning('请选择数据');
885   - }
886   -
887   - confirm({
888   - title: confirmContent,
889   - icon: /*#__PURE__*/React.createElement(_ExclamationCircleOutlined, null),
890   - okText: '确认',
891   - okType: 'danger',
892   - cancelText: '取消',
893   - onOk: function onOk() {
894   - if (code === 'DELETE') {
895   - if (props.originWidget === 'subform') {
896   - batchDelete(selectedRowKeys);
897   - setSelectedRowKeys([]);
898   - } else {
899   - props.handleBarBtnClick(code, fieldName, batchKey, selectedRowKeys, schema.$id, selectedIds);
900   - }
901   - } else if (code === 'EXPORT') {
902   - handleExport();
903   - } else if (code === 'SELECT') {
904   - props.openRelSelect(schema.$id);
905   - } else if (code === 'ADD') {
906   - props.handleRelAdd(schema.$id);
907   - } else if (code === 'subformEdit') {
908   - props.handleBatchEdit(fieldName, schema.$id, selectedIds);
909   - } else if (action === 'CUSTOM') {
910   - props.handleCustom(item, selectedIds, schema.$id);
911   - } else {
912   - props.handleBarBtnClick(code, fieldName, batchKey, selectedRowKeys, schema.$id, selectedIds);
913   - }
914   - },
915   - onCancel: function onCancel() {}
916   - });
917   - } else {
918   - if (code === 'DELETE') {
919   - if (props.originWidget === 'subform') {
920   - batchDelete(selectedRowKeys);
921   - setSelectedRowKeys([]);
922   - } else {
923   - props.handleBarBtnClick(code, fieldName, batchKey, selectedRowKeys, schema.$id, selectedIds);
924   - }
925   - } else if (code === 'EXPORT') {
926   - handleExport();
927   - } else if (code === 'SELECT') {
928   - props.openRelSelect(schema.$id);
929   - } else if (code === 'ADD') {
930   - props.handleRelAdd(schema.$id);
931   - } else if (code === 'subformEdit') {
932   - props.handleBatchEdit(fieldName, schema.$id, selectedIds);
933   - } else if (action === 'CUSTOM') {
934   - props.handleCustom(item, selectedIds, schema.$id);
935   - } else {
936   - props.handleBarBtnClick(code, fieldName, batchKey, selectedRowKeys, schema.$id, selectedIds);
937   - }
938   - }
939   - };
940   -
941 1205 return /*#__PURE__*/React.createElement("div", null, props.editable ? isSubCanEdit ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Button, {
942 1206 type: 'text',
943 1207 size: "small",
... ... @@ -983,7 +1247,9 @@ var VirtualList = function VirtualList(_ref) {
983 1247
984 1248 setKeyWord(((_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.value) || '');
985 1249 }
986   - }) : /*#__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) {
  1250 + }) : /*#__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) {
  1251 + return isInDing ? !['EXPORT', 'IMPORT'].includes(item.code) : true;
  1252 + }).map(function (item) {
987 1253 var name = item.name,
988 1254 code = item.code,
989 1255 needConfirm = item.needConfirm,
... ... @@ -1071,10 +1337,11 @@ var VirtualList = function VirtualList(_ref) {
1071 1337 id: 'qxVirtualList',
1072 1338 className: 'qx-virtualList',
1073 1339 rowKey: props.originWidget === 'relSelector' ? 'id' : 'orginIdx',
1074   - scroll: {
1075   - y: scrollY,
  1340 + scroll: _objectSpread({
1076 1341 x: '100%'
1077   - } // components={vt}
  1342 + }, !isFullScreen && {
  1343 + y: scrollY
  1344 + }) // components={vt}
1078 1345 ,
1079 1346 size: size || 'small'
1080 1347 }, props.originWidget === 'relSelector' ? {
... ... @@ -1096,7 +1363,7 @@ var VirtualList = function VirtualList(_ref) {
1096 1363 type: "link",
1097 1364 icon: /*#__PURE__*/React.createElement(_PlusOutlined, null),
1098 1365 onClick: function onClick() {
1099   - addItem(handleAddDefault);
  1366 + addItem();
1100 1367 }
1101 1368 }, "\u65B0\u589E"));
1102 1369 };
... ... @@ -1115,14 +1382,7 @@ function handleDownload(_x, _x2, _x3) {
1115 1382
1116 1383 function _handleDownload() {
1117 1384 _handleDownload = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(url, name, request) {
1118   - var _dd$env;
1119   -
1120 1385 var isDownload,
1121   - isInDing,
1122   - needToken,
1123   - dingUrl,
1124   - prev,
1125   - append,
1126 1386 link,
1127 1387 blob,
1128 1388 downloadUrl,
... ... @@ -1136,44 +1396,46 @@ function _handleDownload() {
1136 1396
1137 1397 if (isDownload === null || Boolean(isDownload)) {
1138 1398 _message.warning('即将开始下载，请勿重复点击。');
1139   - }
1140   -
1141   - isInDing = (dd === null || dd === void 0 ? void 0 : (_dd$env = dd.env) === null || _dd$env === void 0 ? void 0 : _dd$env.platform) !== 'notInDingTalk';
1142   -
1143   - if (!isInDing) {
1144   - _context2.next = 8;
1145   - break;
1146   - }
  1399 + } // console.log('url========', url);
  1400 + // const isInDing = dd && dd?.env?.platform !== 'notInDingTalk';
  1401 + // if (isInDing) {
  1402 + // // 比如导出 导入
  1403 + // const needToken = !(url.includes('http://') || url.includes('https://'));
  1404 + // let dingUrl;
  1405 + // if (needToken) {
  1406 + // const apiUri = process.env.apiUrl || '';
  1407 + // const needConcat = !(apiUri.includes('http://') || apiUri.includes('https://')); // 打包后
  1408 + // const prev = `${needConcat ? location.origin : ''}${apiUri}${url}`;
  1409 + // const append = `_token=${QIXIAO_TOKEN}${isDesignPage() ? '&_bizCode=design' : ''}`;
  1410 + // dingUrl = `${prev}${prev.includes('?') ? '&' : '?'}${append}`; // 文件服务器 不能加参数
  1411 + // } else {
  1412 + // dingUrl = url;
  1413 + // }
  1414 + // console.log('dingUrl========', dingUrl);
  1415 + // const fileName = name || '下载文件';
  1416 + // dd.biz.util.downloadFile({
  1417 + // url: dingUrl,
  1418 + // name: fileName,
  1419 + // onFail: function () {
  1420 + // message.error(`${fileName} 文件下载失败`);
  1421 + // },
  1422 + // });
  1423 + // return;
  1424 + // }
1147 1425
1148   - // 比如导出 导入
1149   - needToken = !(url.includes('http://') || url.includes('https://'));
1150   -
1151   - if (needToken) {
1152   - prev = "".concat(process.env.apiUrl).concat(url);
1153   - append = "_token=".concat(QIXIAO_TOKEN).concat(isDesignPage() ? '&_bizCode=design' : '');
1154   - dingUrl = "".concat(prev).concat(prev.includes('?') ? '&' : '?').concat(append); // 文件服务器 不能加参数
1155   - } else {
1156   - dingUrl = url;
1157   - }
1158   -
1159   - dd.biz.util.downloadFile({
1160   - url: dingUrl
1161   - });
1162   - return _context2.abrupt("return");
1163 1426
1164   - case 8:
1165 1427 link = document.createElement('a');
1166 1428 link.href = url;
1167 1429 link.download = name;
1168 1430 link.target = '_blank';
1169 1431 document.body.appendChild(link); //TODO 文件过大时，看不到下载进度
1170 1432
1171   - _context2.next = 15;
  1433 + _context2.next = 9;
1172 1434 return request.get(url, {
1173 1435 autoShowError: true
1174 1436 });
1175 1437
1176   - case 15:
  1438 + case 9:
1177 1439 blob = _context2.sent;
1178 1440
1179 1441 if (blob !== null) {
... ... @@ -1184,7 +1446,7 @@ function _handleDownload() {
1184 1446 URL.revokeObjectURL(downloadUrl);
1185 1447 }
1186 1448
1187   - case 17:
  1449 + case 11:
1188 1450 case "end":
1189 1451 return _context2.stop();
1190 1452 }
... ...
... ... @@ -10,15 +10,15 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
10 10
11 11 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; }
12 12
13   -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; }
  13 +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; }
14 14
15   -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; }
  15 +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; }
16 16
17 17 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; }
18 18
19 19 /* eslint-disable jsx-a11y/anchor-is-valid */
20 20 import React from 'react';
21   -import { get } from 'lodash-es';
  21 +import { cloneDeep, get, isFunction } from 'lodash-es';
22 22 import { useStore, useTools } from '../../../hooks';
23 23 import { generateDataSkeleton, getDataPath, getSchemaFromFlatten } from '../../../utils';
24 24 import CardList from './CardList';
... ... @@ -74,36 +74,23 @@ var RenderList = function RenderList(_ref) {
74 74 onItemChange(dataPath, newList);
75 75 };
76 76
77   - var addItem = function addItem(handleAddDefault) {
78   - // const newList = [...displayList, {_active: true}];
  77 + var addItem = function addItem() {
  78 + var _item = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
  79 +
79 80 var _schema = getSchemaFromFlatten(flatten, parentId);
80 81
81   - var _newItem = generateDataSkeleton(_schema.items) || {};
  82 + var newItem = _objectSpread(_objectSpread({}, generateDataSkeleton(_schema.items) || {}), _item);
82 83
83   - var newItem = _objectSpread(_objectSpread({}, _newItem), {}, {
  84 + var newList = [].concat(_toConsumableArray(displayList), [_objectSpread(_objectSpread({}, newItem), {}, {
84 85 _active: true
85   - });
86   -
87   - var callback = function callback() {
88   - var _new = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : newItem;
89   -
90   - onItemChange(dataPath, [].concat(_toConsumableArray(displayList), [_objectSpread(_objectSpread({}, _new), {}, {
91   - _active: true
92   - })]));
93   - };
94   -
95   - if (_.isFunction(handleAddDefault)) {
96   - handleAddDefault(newItem, callback);
97   - } else {
98   - callback();
99   - }
100   -
101   - return displayList.length;
  86 + })]);
  87 + var newIndex = newList.length - 1;
  88 + onItemChange(dataPath, newList);
  89 + return newIndex;
102 90 };
103 91
104 92 var copyItem = function copyItem(idx) {
105   - var newItem = _.cloneDeep(displayList[idx]);
106   -
  93 + var newItem = cloneDeep(displayList[idx]);
107 94 delete newItem.id;
108 95 var newList = [].concat(_toConsumableArray(displayList.slice(0, idx + 1)), [newItem], _toConsumableArray(displayList.slice(idx + 1)));
109 96 onItemChange(dataPath, JSON.parse(JSON.stringify(newList)));
... ... @@ -209,7 +196,19 @@ var RenderList = function RenderList(_ref) {
209 196 errorFields: errorFields,
210 197 displayType: displayType,
211 198 getFieldsProps: getFieldsProps
212   - };
  199 + }; // 外部定义：添加按钮事件
  200 +
  201 + var onAdd = methods[props.onAdd];
  202 +
  203 + if (isFunction(onAdd)) {
  204 + displayProps.addItem = function () {
  205 + return onAdd(function (_item) {
  206 + return addItem(_item);
  207 + }, {
  208 + schema: schema
  209 + });
  210 + };
  211 + }
213 212
214 213 if (renderWidget === 'listForMobile') {
215 214 return /*#__PURE__*/React.createElement(ListForMobile, displayProps);
... ...
  1 +export function isDesignPage() {
  2 + var href = location.href;
  3 + var res = false;
  4 +
  5 + if (href.indexOf('/app-view/') > -1) {
  6 + res = true;
  7 + } else if (href.indexOf('/apps/design') > -1) {
  8 + res = true;
  9 + } else if (href.indexOf('/editor/form') > -1) {
  10 + res = true;
  11 + } else if (href.indexOf('/editor/setting') > -1) {
  12 + res = true;
  13 + } else if (href.indexOf('/editor/view') > -1) {
  14 + res = true;
  15 + } else if (href.indexOf('/editor/detail') > -1) {
  16 + res = true;
  17 + } else if (href.indexOf('/editor/custom') > -1) {
  18 + res = true;
  19 + } else if (href.indexOf('/editor/aggregation') > -1) {
  20 + res = true;
  21 + } else if (href.indexOf('/component') > -1) {
  22 + res = true;
  23 + } else if (href.indexOf('/editor/chart') > -1) {
  24 + res = true;
  25 + } else if (href.indexOf('businessCode=design') > -1) {
  26 + res = true;
  27 + } else if (href.indexOf('refer=/app-view/') > -1) {
  28 + res = true;
  29 + } else if (href.indexOf('/datacube/edit') > -1) {
  30 + res = true;
  31 + } else if (href.indexOf('/datacube/config') > -1) {
  32 + res = true;
  33 + } else if (href.indexOf('/datacube/design') > -1) {
  34 + res = true;
  35 + }
  36 +
  37 + return res;
  38 +}
\ No newline at end of file
... ...
1   -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; }
  1 +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; }
2 2
3   -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; }
  3 +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; }
4 4
5 5 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; }
6 6
... ... @@ -90,7 +90,7 @@ var ExtendedWidget = function ExtendedWidget(_ref) {
90 90 }
91 91
92 92 var Widget = widgets[widgetName] || widgets['html'];
93   - var extraSchema = extraSchemaList[widgetName];
  93 + var extraSchema = extraSchemaList[widgetName]; // console.log(hasError, '----------');
94 94
95 95 var widgetProps = _objectSpread(_objectSpread({
96 96 schema: _objectSpread(_objectSpread({}, schema), extraSchema),
... ... @@ -173,21 +173,41 @@ var ExtendedWidget = function ExtendedWidget(_ref) {
173 173 }, /*#__PURE__*/React.createElement(Widget, finalProps)));
174 174 };
175 175
  176 +function getValue(_data, key) {
  177 + if (!key) {
  178 + return null;
  179 + }
  180 +
  181 + var keys = key.split('.');
  182 + return keys.reduce(function (prev, cur) {
  183 + if (cur === keys[keys.length - 1]) {
  184 + return prev[cur];
  185 + } else {
  186 + return prev[cur] || {};
  187 + }
  188 + }, _data);
  189 +}
  190 +
176 191 var areEqual = function areEqual(prev, current) {
  192 + var _prev$schema, _prev$schema$props;
  193 +
177 194 if (prev.schema && current.schema) {
178 195 if (prev.schema.$id === '#') {
179 196 return false;
180   - }
  197 + } // if (prev.schema.hidden && current.schema.hidden) {
  198 + // return true;
  199 + // }
181 200
182   - if (prev.schema.hidden && current.schema.hidden) {
183   - return true;
184   - }
185 201 }
186 202
187 203 if (prev.readOnly !== current.readOnly) {
188 204 return false;
189 205 }
190 206
  207 + if (prev.hasError !== current.hasError) {
  208 + return false;
  209 + }
  210 +
191 211 if (prev.disabled !== current.disabled) {
192 212 return false;
193 213 }
... ... @@ -196,6 +216,10 @@ var areEqual = function areEqual(prev, current) {
196 216 return false;
197 217 }
198 218
  219 + 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))) {
  220 + return false;
  221 + }
  222 +
199 223 if (isObjType(prev.schema) && isObjType(current.schema)) {
200 224 return false;
201 225 }
... ... @@ -207,4 +231,4 @@ var areEqual = function areEqual(prev, current) {
207 231 return false;
208 232 };
209 233
210   -export default /*#__PURE__*/React.memo(ExtendedWidget, areEqual);
\ No newline at end of file
  234 +export default /*#__PURE__*/React.memo(ExtendedWidget, areEqual); // export default ExtendedWidget;
\ No newline at end of file
... ...
1   -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); }
  1 +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); }
2 2
3 3 import React from 'react';
4 4 import { useTools } from '../../hooks';
... ...
... ... @@ -62,7 +62,8 @@ var Description = function Description(_ref) {
62 62 }
63 63
64 64 return /*#__PURE__*/React.createElement("span", {
65   - className: "fr-desc ml2"
  65 + className: "fr-desc ml2",
  66 + title: description
66 67 }, "( ".concat(description, " )"));
67 68 }
68 69 };
... ...
... ... @@ -62,7 +62,8 @@ var RenderField = function RenderField(props) {
62 62 renderTitle = _useTools.renderTitle,
63 63 requiredMark = _useTools.requiredMark,
64 64 setFieldValidating = _useTools.setFieldValidating,
65   - removeFieldValidating = _useTools.removeFieldValidating;
  65 + removeFieldValidating = _useTools.removeFieldValidating,
  66 + setValueByPath = _useTools.setValueByPath;
66 67
67 68 var formDataRef = useRef();
68 69 formDataRef.current = formData; // console.log('<renderField>', $id);
... ... @@ -184,6 +185,10 @@ var RenderField = function RenderField(props) {
184 185 return getValueByPath(formData, path);
185 186 };
186 187
  188 + if (formDataRef.current && ['virtualList', 'listForMobile'].includes(_schema.widget)) {
  189 + _schema._setValueByPath = setValueByPath;
  190 + }
  191 +
187 192 var widgetProps = {
188 193 $id: $id,
189 194 schema: _schema,
... ...
1 1 var _excluded = ["id", "_item", "dataIndex", "hideTitle", "hideValidation", "debugCss"],
2 2 _excluded2 = ["id", "item", "dataIndex", "dataPath", "hideTitle", "hideValidation", "debugCss", "schema", "_value", "dependValues", "displayType", "labelAlign", "column", "labelWidth", "readOnly", "errorFields", "effectiveLabelWidth"];
3 3
4   -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; }
  4 +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; }
5 5
6   -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; }
  6 +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; }
7 7
8 8 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
... ... @@ -140,12 +140,11 @@ var CoreRender = function CoreRender(_ref2) {
140 140 effectiveLabelWidth = _ref2.effectiveLabelWidth,
141 141 rest = _objectWithoutProperties(_ref2, _excluded2);
142 142
143   - if (schema.hidden) {
144   - return null;
145   - } // 样式的逻辑全放在这层
  143 + // if (schema.hidden) {
  144 + // return null;
  145 + // }
  146 + // 样式的逻辑全放在这层
146 147 // displayType 一层层网上找值
147   -
148   -
149 148 var _displayType = schema.displayType || rest.displayType || displayType || 'column';
150 149
151 150 var _labelAlign = schema.labelAlign || rest.labelAlign || labelAlign || 'right';
... ... @@ -238,6 +237,12 @@ var CoreRender = function CoreRender(_ref2) {
238 237
239 238 var columnStyle = {};
240 239
  240 + if (schema.currentStep === false) {
  241 + columnStyle.display = 'none';
  242 + } else {
  243 + columnStyle = {};
  244 + }
  245 +
241 246 if (schema.hidden) {
242 247 columnStyle.display = 'none';
243 248 } // if (!isComplex) {
... ...
... ... @@ -3,9 +3,9 @@ var _excluded = ["schema"],
3 3
4 4 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); }
5 5
6   -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; }
  6 +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; }
7 7
8   -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; }
  8 +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; }
9 9
10 10 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 11
... ...
1   -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; }
  1 +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; }
2 2
3   -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; }
  3 +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; }
4 4
5 5 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; }
6 6
... ... @@ -52,6 +52,11 @@ export var useSet = function useSet(initState) {
52 52 // console.groupEnd();
53 53
54 54
  55 + // console.group(newState.action || 'action'); // TODO: give it a name
  56 + // console.log('%cState:', 'color: #9E9E9E; font-weight: 700;', state);
  57 + // console.log('%cAction:', 'color: #00A7F7; font-weight: 700;', action);
  58 + // console.log('%cNext:', 'color: #47B04B; font-weight: 700;', result);
  59 + // console.groupEnd();
55 60 return result;
56 61 }, initState),
57 62 _useReducer2 = _slicedToArray(_useReducer, 2),
... ...
... ... @@ -329,6 +329,35 @@
329 329 visibility: hidden;
330 330 word-wrap: break-word;
331 331 }
  332 +.fr-container .fr-tooltip-triangle {
  333 + position: absolute;
  334 + left: 50%;
  335 + border-left: 5px solid transparent;
  336 + border-right: 5px solid transparent;
  337 + border-top: 5px solid #2b222a;
  338 + transition: all 0.5s ease;
  339 + content: ' ';
  340 + font-size: 0;
  341 + line-height: 0;
  342 + margin-left: -5px;
  343 + width: 0;
  344 + bottom: -5px;
  345 +}
  346 +.fr-container .fr-tooltip-toggle::before,
  347 +.fr-container .fr-tooltip-toggle::after {
  348 + color: #efefef;
  349 + font-size: 13px;
  350 + opacity: 0;
  351 + pointer-events: none;
  352 + text-align: center;
  353 +}
  354 +.fr-container .fr-tooltip-toggle:focus::before,
  355 +.fr-container .fr-tooltip-toggle:focus::after,
  356 +.fr-container .fr-tooltip-toggle:hover::before,
  357 +.fr-container .fr-tooltip-toggle:hover::after {
  358 + opacity: 1;
  359 + transition: all 0.75s ease;
  360 +}
332 361 .fr-container .fr-slider {
333 362 display: flex;
334 363 width: 100%;
... ...
... ... @@ -4,11 +4,11 @@ var _excluded = ["id", "widgets", "layoutWidgets", "mapping", "form", "className
4 4
5 5 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); }
6 6
7   -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); }
  7 +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); }
8 8
9   -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; }
  9 +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; }
10 10
11   -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; }
  11 +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; }
12 12
13 13 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; }
14 14
... ...
1   -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; }
  1 +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; }
2 2
3   -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; }
  3 +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; }
4 4
5 5 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; }
6 6
... ...
1   -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; }
  1 +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; }
2 2
3   -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; }
  3 +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; }
4 4
5 5 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; }
6 6
... ... @@ -399,7 +399,9 @@ var useForm = function useForm(props) {
399 399
400 400 if (Array.isArray(nameList)) {
401 401 nameList.forEach(function (path) {
402   - set(currentData, path, get(data, path));
  402 + var _path = path.replace('[]', '');
  403 +
  404 + set(currentData, _path, get(data, _path));
403 405 });
404 406 } else {
405 407 currentData = data;
... ... @@ -557,11 +559,20 @@ var useForm = function useForm(props) {
557 559 var data = _data.current;
558 560
559 561 if (Array.isArray(nameList)) {
560   - set(data, {});
  562 + data = {};
561 563 nameList.forEach(function (path) {
562   - set(data, path, get(_data.current, path));
  564 + var _path = path.replace('[]', '');
  565 +
  566 + set(data, _path, get(_data.current, _path));
563 567 });
564   - }
  568 + } // const data = _data.current;
  569 + // if (Array.isArray(nameList)) {
  570 + // set(data, {});
  571 + // nameList.forEach(path => {
  572 + // set(data, path, get(_data.current, path));
  573 + // });
  574 + // }
  575 +
565 576
566 577 setState({
567 578 isValidating: true
... ...
... ... @@ -13,11 +13,11 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
13 13
14 14 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; }
15 15
16   -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); }
  16 +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); }
17 17
18   -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; }
  18 +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; }
19 19
20   -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; }
  20 +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; }
21 21
22 22 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; }
23 23
... ... @@ -541,8 +541,8 @@ export function parseSingleExpression(func) {
541 541 try {
542 542 return Function(str)();
543 543 } catch (error) {
544   - console.log(error, func, dataPath);
545   - return null; // 如果计算有错误，return null 最合适
  544 + return null; // 如果计算有错误，return null
  545 + // 最合适
546 546 } // const funcBody = func.substring(2, func.length - 2);
547 547 // //TODO: 这样有问题，例如 a.b.indexOf(), 会把 a.b.indexOf 当做值
548 548 // const match1 = /formData.([a-zA-Z0-9.$_\[\]]+)/g;
... ... @@ -1148,9 +1148,9 @@ export var cleanEmpty = function cleanEmpty(obj) {
1148 1148 return obj.map(function (v) {
1149 1149 return v && isObject(v) ? cleanEmpty(v) : v;
1150 1150 }).filter(function (v) {
1151   - return !(v == undefined);
  1151 + return !(v === undefined);
1152 1152 });
1153   - } else if (isObject(obj)) {
  1153 + } else if (isObject(obj) && obj) {
1154 1154 return Object.entries(obj).map(function (_ref12) {
1155 1155 var _ref13 = _slicedToArray(_ref12, 2),
1156 1156 k = _ref13[0],
... ... @@ -1162,7 +1162,7 @@ export var cleanEmpty = function cleanEmpty(obj) {
1162 1162 k = _ref15[0],
1163 1163 v = _ref15[1];
1164 1164
1165   - return v == undefined ? a : (a[k] = v, a);
  1165 + return v === undefined ? a : (a[k] = v, a);
1166 1166 }, {});
1167 1167 } else {
1168 1168 return obj;
... ...
... ... @@ -27,19 +27,19 @@ export var defaultValidateMessagesCN = {
27 27 len: '${title}长度不是${len}',
28 28 min: '${title}长度不能小于${min}',
29 29 max: '${title}长度不能大于${max}',
30   - range: '${title}长度需在${min}与${max}之间'
  30 + range: '${title}长度需在${min}～${max}之间'
31 31 },
32 32 number: {
33 33 len: '${title}不等于${len}',
34 34 min: '${title}不能小于${min}',
35 35 max: '${title}不能大于${max}',
36   - range: '${title}需在${min}与${max}之间'
  36 + range: '${title}需在${min}～${max}之间'
37 37 },
38 38 array: {
39 39 len: '${title}长度不是${len}',
40 40 min: '${title}长度不能小于${min}',
41 41 max: '${title}长度不能大于${max}',
42   - range: '${title}长度需在${min}与${max}之间'
  42 + range: '${title}长度需在${min}～${max}之间'
43 43 },
44 44 pattern: {
45 45 mismatch: '${title}未通过正则判断${pattern}'
... ...
... ... @@ -4,9 +4,9 @@ var _excluded = ["widgets", "configProvider"];
4 4
5 5 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); }
6 6
7   -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; }
  7 +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; }
8 8
9   -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; }
  9 +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; }
10 10
11 11 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; }
12 12
... ...
... ... @@ -4,9 +4,9 @@ var _excluded = ["onChange", "format", "value", "style"];
4 4
5 5 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); }
6 6
7   -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; }
  7 +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; }
8 8
9   -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; }
  9 +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; }
10 10
11 11 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; }
12 12
... ...
... ... @@ -15,9 +15,9 @@ var _excluded = ["style"],
15 15
16 16 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); }
17 17
18   -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; }
  18 +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; }
19 19
20   -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; }
  20 +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; }
21 21
22 22 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; }
23 23
... ...
... ... @@ -4,9 +4,9 @@ var _excluded = ["schema", "style", "value", "onChange", "options", "addons"];
4 4
5 5 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); }
6 6
7   -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; }
  7 +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; }
8 8
9   -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; }
  9 +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; }
10 10
11 11 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; }
12 12
... ...
1 1 "use strict";
2 2
3   -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); }
  3 +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); }
4 4
5 5 Object.defineProperty(exports, "__esModule", {
6 6 value: true
... ...
1 1 "use strict";
2 2
3   -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); }
  3 +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); }
4 4
5 5 Object.defineProperty(exports, "__esModule", {
6 6 value: true
... ...
... ... @@ -31,13 +31,13 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
31 31
32 32 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); }
33 33
34   -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; }
  34 +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; }
35 35
36   -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; }
  36 +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; }
37 37
38 38 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; }
39 39
40   -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); }
  40 +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); }
41 41
42 42 var CardList = function CardList(_ref) {
43 43 var _ref$displayList = _ref.displayList,
... ...
... ... @@ -58,13 +58,13 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
58 58
59 59 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
60 60
61   -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; }
  61 +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; }
62 62
63   -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; }
  63 +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; }
64 64
65 65 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; }
66 66
67   -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); }
  67 +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); }
68 68
69 69 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; }
70 70
... ...
1 1 "use strict";
2 2
3   -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); }
  3 +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); }
4 4
5 5 Object.defineProperty(exports, "__esModule", {
6 6 value: true
... ... @@ -89,8 +89,7 @@ var ListForMobile = function ListForMobile(_ref) {
89 89 getFieldsProps = _ref.getFieldsProps;
90 90 var _schema$props = schema.props,
91 91 props = _schema$props === void 0 ? {} : _schema$props,
92   - itemProps = schema.itemProps,
93   - handleAddDefault = schema.handleAddDefault;
  92 + itemProps = schema.itemProps;
94 93
95 94 var _useState = (0, _react.useState)([]),
96 95 _useState2 = _slicedToArray(_useState, 2),
... ... @@ -174,7 +173,7 @@ var ListForMobile = function ListForMobile(_ref) {
174 173 }))), /*#__PURE__*/_react.default.createElement("a", {
175 174 className: 'add-button',
176 175 onClick: function onClick() {
177   - addItem(handleAddDefault);
  176 + addItem();
178 177 }
179 178 }, /*#__PURE__*/_react.default.createElement(_PlusCircleFilled2.default, {
180 179 style: {
... ...
... ... @@ -29,13 +29,13 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
29 29
30 30 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); }
31 31
32   -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; }
  32 +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; }
33 33
34   -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; }
  34 +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; }
35 35
36 36 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; }
37 37
38   -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); }
  38 +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); }
39 39
40 40 var SimpleList = function SimpleList(_ref) {
41 41 var schema = _ref.schema,
... ...
1 1 "use strict";
2 2
3   -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); }
  3 +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); }
4 4
5 5 Object.defineProperty(exports, "__esModule", {
6 6 value: true
... ...
... ... @@ -44,13 +44,13 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
44 44
45 45 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; }
46 46
47   -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; }
  47 +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; }
48 48
49   -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; }
  49 +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; }
50 50
51 51 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 52
53   -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); }
  53 +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); }
54 54
55 55 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; }
56 56
... ...
... ... @@ -29,15 +29,11 @@ var _input = _interopRequireDefault(require("antd/es/input"));
29 29
30 30 var _SearchOutlined2 = _interopRequireDefault(require("@ant-design/icons/lib/icons/SearchOutlined"));
31 31
32   -require("antd/es/message/style");
33   -
34   -var _message2 = _interopRequireDefault(require("antd/es/message"));
35   -
36 32 require("antd/es/tooltip/style");
37 33
38 34 var _tooltip = _interopRequireDefault(require("antd/es/tooltip"));
39 35
40   -var _ExclamationCircleOutlined2 = _interopRequireDefault(require("@ant-design/icons/lib/icons/ExclamationCircleOutlined"));
  36 +var _InfoCircleOutlined2 = _interopRequireDefault(require("@ant-design/icons/lib/icons/InfoCircleOutlined"));
41 37
42 38 require("antd/es/menu/style");
43 39
... ... @@ -47,6 +43,12 @@ require("antd/es/button/style");
47 43
48 44 var _button = _interopRequireDefault(require("antd/es/button"));
49 45
  46 +var _ExclamationCircleOutlined2 = _interopRequireDefault(require("@ant-design/icons/lib/icons/ExclamationCircleOutlined"));
  47 +
  48 +require("antd/es/message/style");
  49 +
  50 +var _message2 = _interopRequireDefault(require("antd/es/message"));
  51 +
50 52 var _AlertOutlined2 = _interopRequireDefault(require("@ant-design/icons/lib/icons/AlertOutlined"));
51 53
52 54 var _BarsOutlined2 = _interopRequireDefault(require("@ant-design/icons/lib/icons/BarsOutlined"));
... ... @@ -99,11 +101,13 @@ var _react = _interopRequireWildcard(require("react"));
99 101
100 102 var _index2 = _interopRequireDefault(require("../../index"));
101 103
102   -var _icon = _interopRequireDefault(require("./icon"));
103   -
104 104 var dd = _interopRequireWildcard(require("dingtalk-jsapi"));
105 105
106   -var _excluded = ["scrollY", "summary", "batchKey", "type", "bar", "line", "searchKey", "rowSelection", "size"];
  106 +var _moment = _interopRequireDefault(require("moment"));
  107 +
  108 +var _icon = _interopRequireDefault(require("./icon"));
  109 +
  110 +var _excluded = ["scrollY", "summary", "batchKey", "type", "bar", "line", "searchKey", "rowSelection", "size", "originWidget"];
107 111
108 112 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); }
109 113
... ... @@ -117,9 +121,9 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
117 121
118 122 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); }
119 123
120   -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; }
  124 +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; }
121 125
122   -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; }
  126 +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; }
123 127
124 128 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; }
125 129
... ... @@ -131,7 +135,7 @@ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symb
131 135
132 136 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
133 137
134   -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); }
  138 +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); }
135 139
136 140 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
137 141
... ... @@ -149,7 +153,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
149 153
150 154 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; }
151 155
152   -var confirm = _modal.default.confirm; // import {useVT} from 'virtualizedtableforantd4';
  156 +var confirm = _modal.default.confirm; // import { isDesignPage } from './utils'
153 157
154 158 var BUTTON_ICONS_MAP = {
155 159 PlusOutlined: /*#__PURE__*/_react.default.createElement(_PlusOutlined2.default, null),
... ... @@ -186,7 +190,7 @@ var EXPORT_STATUS = {
186 190 };
187 191
188 192 var VirtualList = function VirtualList(_ref) {
189   - var _line$buttons;
  193 + var _dd$env;
190 194
191 195 var _ref$displayList = _ref.displayList,
192 196 displayList = _ref$displayList === void 0 ? [] : _ref$displayList,
... ... @@ -201,7 +205,8 @@ var VirtualList = function VirtualList(_ref) {
201 205 schema = _ref.schema,
202 206 listData = _ref.listData,
203 207 changeList = _ref.changeList,
204   - copyItem = _ref.copyItem;
  208 + copyItem = _ref.copyItem,
  209 + dataPath = _ref.dataPath;
205 210 var _schema$props = schema.props,
206 211 props = _schema$props === void 0 ? {} : _schema$props,
207 212 _schema$itemProps = schema.itemProps,
... ... @@ -210,9 +215,10 @@ var VirtualList = function VirtualList(_ref) {
210 215 _schema$qxProps = schema.qxProps,
211 216 qxProps = _schema$qxProps === void 0 ? {} : _schema$qxProps,
212 217 subformMode = schema.subformMode,
  218 + isReadOnly = schema.isReadOnly,
213 219 subReadOnly = schema.subReadOnly,
214 220 isLoading = schema.isLoading,
215   - handleAddDefault = schema.handleAddDefault;
  221 + isFullScreen = schema.isFullScreen;
216 222
217 223 var _props$scrollY = props.scrollY,
218 224 scrollY = _props$scrollY === void 0 ? 300 : _props$scrollY,
... ... @@ -226,6 +232,7 @@ var VirtualList = function VirtualList(_ref) {
226 232 searchKey = props.searchKey,
227 233 rowSelection = props.rowSelection,
228 234 size = props.size,
  235 + originWidget = props.originWidget,
229 236 rest = _objectWithoutProperties(props, _excluded); // const [vt, set_components] = useVT(() => ({scroll: {y: scrollY}}), []);
230 237
231 238
... ... @@ -269,6 +276,19 @@ var VirtualList = function VirtualList(_ref) {
269 276 loading = _useState14[0],
270 277 setLoading = _useState14[1];
271 278
  279 + var mergeFieldsMap = (0, _react.useRef)({});
  280 + var isMergeFieldExist = (0, _react.useRef)(false); // const [cloneList, setCloneList] = useState([]);
  281 +
  282 + 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';
  283 +
  284 + if (subReadOnly) {
  285 + Object.keys(flatten).forEach(function (key) {
  286 + if (key.indexOf(schema.$id) === 0 && key.split('.').length > 1) {
  287 + flatten[key].schema.readOnly = true;
  288 + }
  289 + });
  290 + }
  291 +
272 292 (0, _react.useEffect)(function () {
273 293 setLoading(!!isLoading);
274 294 }, [isLoading]);
... ... @@ -278,8 +298,7 @@ var VirtualList = function VirtualList(_ref) {
278 298 var newRowSelection = (0, _react.useMemo)(function () {
279 299 var _bar$buttons;
280 300
281   - if (schema.isReadOnly) return null;
282   -
  301 + // if (schema.isReadOnly) return null
283 302 var _rowSelection = _.cloneDeep(rowSelection); // 根据是否含有批量操作按钮，渲染表格是否可选择
284 303
285 304
... ... @@ -300,25 +319,151 @@ var VirtualList = function VirtualList(_ref) {
300 319 }
301 320
302 321 return _rowSelection;
303   - }, [rowSelection, selectedRowKeys, bar, rowSelection]);
304   - (0, _react.useEffect)(function () {
305   - displayList.forEach(function (item, index) {
  322 + }, [JSON.stringify(bar.buttons), JSON.stringify(rowSelection), JSON.stringify(selectedRowKeys)]); // useEffect(() => {
  323 + // const _cloneList = _.cloneDeep(displayList);
  324 + // _cloneList.forEach((item, index) => {
  325 + // if (typeof item === 'object') {
  326 + // item.orginIdx = index
  327 + // }
  328 + // })
  329 + // setCloneList(_cloneList);
  330 + // }, [displayList])
  331 + //
  332 + // let _displayList = []
  333 + //
  334 + // // 筛选展示的数据
  335 + // if (props.originWidget === 'relSelector') {
  336 + // cloneList.forEach(item => {
  337 + // if (!item.hasOwnProperty('$auth') || item.$auth) {
  338 + // _displayList.push(item)
  339 + // }
  340 + // })
  341 + // } else {
  342 + // _displayList = [...cloneList]
  343 + // }
  344 +
  345 + var cloneList = (0, _react.useMemo)(function () {
  346 + //console.log('useMemo cloneList', displayList)
  347 + var _cloneList = _.cloneDeep(displayList);
  348 +
  349 + _cloneList.forEach(function (item, index) {
306 350 if (_typeof(item) === 'object') {
307 351 item.orginIdx = index;
308 352 }
309 353 });
310   - }, [displayList]);
311   - var _displayList = []; // 筛选展示的数据
312 354
313   - if (props.originWidget === 'relSelector') {
314   - displayList.forEach(function (item) {
315   - if (!item.hasOwnProperty('$auth') || item.$auth) {
316   - _displayList.push(item);
  355 + return _cloneList;
  356 + }, [displayList]); // 数据变化时，子表汇总值重新计算，并加到主表的formData中
  357 +
  358 + (0, _react.useEffect)(function () {
  359 + var _schema$qxProps2;
  360 +
  361 + console.log('计算汇总');
  362 + if (schema.originWidget !== 'subform') return;
  363 + var subKey = schema.fieldName || schema.propertyKey;
  364 + if (!schema._setValueByPath) return;
  365 + (((_schema$qxProps2 = schema.qxProps) === null || _schema$qxProps2 === void 0 ? void 0 : _schema$qxProps2.summary) || []).forEach(function (item) {
  366 + var fx = item.fx,
  367 + relField = item.relField,
  368 + code = item.code;
  369 + var key = "".concat(subKey, ":").concat(code, ":").concat(fx); // subKey + '.' + code +;
  370 +
  371 + var values = (displayList || []).map(function (it) {
  372 + return it[relField];
  373 + });
  374 +
  375 + if (!values.length) {
  376 + schema._setValueByPath(key, 'EMPTY');
  377 +
  378 + return;
  379 + }
  380 +
  381 + if (['COUNTUNIQUE', 'COUNTA'].includes(fx)) {
  382 + values.forEach(function (_item, index) {
  383 + if (Array.isArray(_item)) {
  384 + values[index] = String(_item);
  385 + }
  386 + });
  387 + }
  388 +
  389 + values = values.filter(function (item) {
  390 + return item !== undefined;
  391 + });
  392 +
  393 + if (fx === 'MAX' || fx === 'MIN') {
  394 + var widget = '';
  395 + var keys = Object.keys(flatten || {});
  396 +
  397 + for (var i = 0; i < keys.length; i++) {
  398 + if (keys[i].indexOf(relField) > -1) {
  399 + var _flatten$keys$i, _flatten$keys$i$schem;
  400 +
  401 + 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;
  402 +
  403 + if (_widget !== 'qxSummary') {
  404 + widget = _widget;
  405 + break;
  406 + }
  407 + }
  408 + }
  409 +
  410 + if (['qxDatetime', 'createdAt', 'updatedAt'].includes(widget)) {
  411 + var _moment$fx$toLowerCas;
  412 +
  413 + values = values.filter(function (it) {
  414 + return it;
  415 + }); // 计算日期的最大最小时，过滤掉空值
  416 +
  417 + values.forEach(function (it, index) {
  418 + values[index] = (0, _moment.default)(it);
  419 + }); // schema.parentFormData[key] = moment[fx.toLowerCase()](values)?._i || 'EMPTY';
  420 +
  421 + schema._setValueByPath(key, ((_moment$fx$toLowerCas = _moment.default[fx.toLowerCase()](values)) === null || _moment$fx$toLowerCas === void 0 ? void 0 : _moment$fx$toLowerCas._i) || 'EMPTY');
  422 + } else if (widget === 'qxTime') {
  423 + var _moment$fx$toLowerCas2, _moment$fx$toLowerCas3;
  424 +
  425 + values = values.filter(function (it) {
  426 + return it;
  427 + }); // 计算时间的最大最小时，过滤掉空值
  428 +
  429 + values.forEach(function (it, index) {
  430 + values[index] = (0, _moment.default)('0001-01-01 ' + it); // 随意拼个年月日返回，计算时替换
  431 + }); // schema.parentFormData[key] = (moment[fx.toLowerCase()](values)?._i)?.slice(11) || 'EMPTY';
  432 +
  433 + 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');
  434 + } else {
  435 + // schema.parentFormData[key] = window[fx](values);
  436 + schema._setValueByPath(key, window[fx](values));
  437 + }
  438 + } else {
  439 + // schema.parentFormData['__SUMMARY_' + subKey][key] = window[fx](values);
  440 + var res = window[fx](values);
  441 +
  442 + if (String(res).startsWith('Error')) {
  443 + res = null;
  444 + }
  445 +
  446 + schema._setValueByPath(key, res);
317 447 }
318 448 });
319   - } else {
320   - _displayList = _toConsumableArray(displayList);
321   - } // useEffect(() => {
  449 + }, [JSON.stringify(displayList)]);
  450 +
  451 + var _displayList = (0, _react.useMemo)(function () {
  452 + //console.log('useMemo _displayList', cloneList)
  453 + var _displayList1 = []; // 筛选展示的数据
  454 +
  455 + if (props.originWidget === 'relSelector') {
  456 + cloneList.forEach(function (item) {
  457 + if (!item.hasOwnProperty('$auth') || item.$auth) {
  458 + _displayList1.push(item);
  459 + }
  460 + });
  461 + } else {
  462 + _displayList1 = _toConsumableArray(cloneList);
  463 + }
  464 +
  465 + return _displayList1;
  466 + }, [cloneList]); // useEffect(() => {
322 467 // 筛选展示的数据
323 468 // if (props.originWidget === 'relSelector') {
324 469 // displayList.forEach((item, index) => {
... ... @@ -360,23 +505,27 @@ var VirtualList = function VirtualList(_ref) {
360 505
361 506 var selectedIds = (0, _react.useMemo)(function () {
362 507 var _selectedIds = [];
363   - displayList.forEach(function (item) {
364   - if (item && selectedRowKeys.includes(item.orginIdx)) {
  508 + cloneList.forEach(function (item) {
  509 + if (item && selectedRowKeys.includes(props.originWidget === 'subform' ? item.orginIdx : item.id)) {
365 510 _selectedIds.push(item.id);
366 511 }
367 512 });
368 513 return _selectedIds;
369   - }, [selectedRowKeys, displayList]); // useEffect(() => {
370   -
371   - var dataSource = (keyWord.length ? _displayList.filter(function (item) {
372   - var _String;
373   -
374   - return ((_String = String(item[searchKey])) === null || _String === void 0 ? void 0 : _String.indexOf(keyWord)) > -1;
375   - }) : _displayList).map(function (item, idx) {
376   - return _objectSpread(_objectSpread({}, item), {}, {
377   - index: item.hasOwnProperty('orginIdx') ? item.orginIdx : idx
  514 + }, [selectedRowKeys, cloneList]); // useEffect(() => {
  515 +
  516 + var dataSource = (0, _react.useMemo)(function () {
  517 + //console.log('useMemo dataSource',dataSource);
  518 + return (keyWord.length ? _displayList.filter(function (item) {
  519 + var _String;
  520 +
  521 + return ((_String = String(item[searchKey])) === null || _String === void 0 ? void 0 : _String.indexOf(keyWord)) > -1;
  522 + }) : _displayList).map(function (item, idx) {
  523 + return _objectSpread(_objectSpread({}, item), {}, {
  524 + index: item.hasOwnProperty('orginIdx') ? item.orginIdx : idx,
  525 + orginIdx: item.hasOwnProperty('orginIdx') ? item.orginIdx : null
  526 + });
378 527 });
379   - }); // useEffect(() => {
  528 + }, [_displayList, keyWord, searchKey]); // useEffect(() => {
380 529 // setRefresh(refresh + '1')
381 530 // }, [JSON.stringify(dataSource)])
382 531 // setDataSource(_dataSource)
... ... @@ -406,6 +555,7 @@ var VirtualList = function VirtualList(_ref) {
406 555 };
407 556
408 557 var pagination = (0, _react.useMemo)(function () {
  558 + // console.log('useMemo pagination', dataSource?.length, props.limit)
409 559 return {
410 560 total: dataSource.length,
411 561 position: ['bottomRight'],
... ... @@ -417,9 +567,20 @@ var VirtualList = function VirtualList(_ref) {
417 567 size: size || 'small' // hideOnSinglePage: true
418 568
419 569 };
420   - }, [dataSource, props.limit]);
  570 + }, [dataSource === null || dataSource === void 0 ? void 0 : dataSource.length, props.limit]);
421 571 var barButtons = (0, _react.useMemo)(function () {
422   - var _barButtons = _.cloneDeep(bar.buttons || []); // 关联表的导入，先隐藏 TODO
  572 + // console.log('useMemo barButtons', schema.isReadOnly, bar.buttons, originWidget, type, subReadOnly)
  573 + var _barButtons = _.cloneDeep(bar.buttons || []);
  574 +
  575 + if (schema.isReadOnly) {
  576 + // 关联表只读
  577 + // return _barButtons.filter(item => item.code === 'EXPORT')
  578 + return [];
  579 + } else if (subReadOnly) {
  580 + return _barButtons.filter(function (item) {
  581 + return item.code === 'EXPORT';
  582 + });
  583 + } // 关联表的导入，先隐藏 TODO
423 584
424 585
425 586 if (props.originWidget === 'relSelector') {
... ... @@ -482,105 +643,455 @@ var VirtualList = function VirtualList(_ref) {
482 643
483 644 if (props.originWidget === 'subform') {
484 645 addBtns.push('DELETE');
  646 + return _barButtons.filter(function (item) {
  647 + return addBtns.includes(item.code);
  648 + });
485 649 }
486   -
487   - return _barButtons.filter(function (item) {
488   - return addBtns.includes(item.code);
489   - });
490 650 } else if (type === 'view') {
491 651 return _barButtons.filter(function (item) {
492 652 return item.code === 'EXPORT';
493 653 });
494 654 }
495 655
496   - if (schema.isReadOnly) {
497   - // return _barButtons.filter(item => item.code === 'EXPORT')
498   - return [];
  656 + return _barButtons;
  657 + }, [schema.isReadOnly, bar.buttons, originWidget, type, subReadOnly]);
  658 +
  659 + var barBtnClick = function barBtnClick(code, needConfirm, confirmContent, action, item) {
  660 + setSelectedRowKeys([]);
  661 +
  662 + if (needConfirm && confirmContent) {
  663 + if (!selectedRowKeys.length) {
  664 + return _message2.default.warning('请选择数据');
  665 + }
  666 +
  667 + confirm({
  668 + title: confirmContent,
  669 + icon: /*#__PURE__*/_react.default.createElement(_ExclamationCircleOutlined2.default, null),
  670 + okText: '确认',
  671 + okType: 'danger',
  672 + cancelText: '取消',
  673 + onOk: function onOk() {
  674 + if (code === 'DELETE') {
  675 + if (props.originWidget === 'subform') {
  676 + batchDelete(selectedRowKeys);
  677 + setSelectedRowKeys([]);
  678 + } else {
  679 + props.handleBarBtnClick(code, fieldName, batchKey, selectedRowKeys, schema.$id, selectedIds);
  680 + }
  681 + } else if (code === 'EXPORT') {
  682 + handleExport();
  683 + } else if (code === 'SELECT') {
  684 + props.openRelSelect(schema.$id);
  685 + } else if (code === 'ADD') {
  686 + props.handleRelAdd(schema.$id);
  687 + } else if (code === 'subformEdit') {
  688 + props.handleBatchEdit(fieldName, schema.$id, selectedIds);
  689 + } else if (action === 'CUSTOM') {
  690 + props.handleCustom(item, selectedIds, schema.$id);
  691 + } else {
  692 + props.handleBarBtnClick(code, fieldName, batchKey, selectedRowKeys, schema.$id, selectedIds);
  693 + }
  694 + },
  695 + onCancel: function onCancel() {}
  696 + });
  697 + } else {
  698 + if (code === 'DELETE') {
  699 + if (props.originWidget === 'subform') {
  700 + batchDelete(selectedRowKeys);
  701 + setSelectedRowKeys([]);
  702 + } else {
  703 + props.handleBarBtnClick(code, fieldName, batchKey, selectedRowKeys, schema.$id, selectedIds);
  704 + }
  705 + } else if (code === 'EXPORT') {
  706 + handleExport();
  707 + } else if (code === 'SELECT') {
  708 + props.openRelSelect(schema.$id);
  709 + } else if (code === 'ADD') {
  710 + props.handleRelAdd(schema.$id);
  711 + } else if (code === 'subformEdit') {
  712 + props.handleBatchEdit(fieldName, schema.$id, selectedIds);
  713 + } else if (action === 'CUSTOM') {
  714 + props.handleCustom(item, selectedIds, schema.$id);
  715 + } else {
  716 + props.handleBarBtnClick(code, fieldName, batchKey, selectedRowKeys, schema.$id, selectedIds);
  717 + }
499 718 }
  719 + };
500 720
501   - return _barButtons;
502   - }, [props, type]);
  721 + var moreButtons = (0, _react.useMemo)(function () {
  722 + var _barButtons = _.cloneDeep(barButtons);
  723 +
  724 + return /*#__PURE__*/_react.default.createElement(_menu.default, null, _barButtons.slice(3).filter(function (item) {
  725 + return isInDing ? !['EXPORT', 'IMPORT'].includes(item.code) : true;
  726 + }).map(function (item) {
  727 + var name = item.name,
  728 + code = item.code,
  729 + needConfirm = item.needConfirm,
  730 + confirmContent = item.confirmContent,
  731 + icon = item.icon,
  732 + action = item.action;
  733 + return /*#__PURE__*/_react.default.createElement(_menu.default.Item, null, /*#__PURE__*/_react.default.createElement(_button.default, _extends({
  734 + key: code,
  735 + style: {
  736 + marginLeft: 8,
  737 + border: 'none'
  738 + }
  739 + }, item, {
  740 + icon: icon && bar.style !== 'TEXT' ? String(icon).indexOf('http') > -1 ? /*#__PURE__*/_react.default.createElement("img", {
  741 + src: String(icon),
  742 + style: {
  743 + width: '16px',
  744 + height: '16px',
  745 + marginRight: '4px',
  746 + verticalAlign: 'text-bottom',
  747 + borderRadius: '50%'
  748 + },
  749 + alt: ""
  750 + }) : String(icon).indexOf('-') > -1 ? /*#__PURE__*/_react.default.createElement(_icon.default, {
  751 + type: String(icon)
  752 + }) : BUTTON_ICONS_MAP[icon + ''] : null,
  753 + onClick: function onClick() {
  754 + barBtnClick(code, needConfirm, confirmContent, action, item);
  755 + }
  756 + }), name));
  757 + }));
  758 + }, [barButtons, barBtnClick, selectedRowKeys]);
503 759
504   - var moreButtons = /*#__PURE__*/_react.default.createElement(_menu.default, null, barButtons.slice(3).map(function (item) {
505   - var name = item.name,
506   - code = item.code,
507   - needConfirm = item.needConfirm,
508   - confirmContent = item.confirmContent,
509   - icon = item.icon,
510   - action = item.action;
511   - return /*#__PURE__*/_react.default.createElement(_menu.default.Item, null, /*#__PURE__*/_react.default.createElement(_button.default, _extends({
512   - key: code,
513   - style: {
514   - marginLeft: 8,
515   - border: 'none'
  760 + var handleColumn = function handleColumn(schema, child, index) {
  761 + var _schema$props2;
  762 +
  763 + if (props.editable && props.originWidget === 'subform') {
  764 + if (isSubCanEdit && !['relField', 'qxFormula'].includes(schema.widget)) {
  765 + schema.readOnly = false;
  766 + } else if (!isSubCanEdit) {
  767 + schema.readOnly = true;
516 768 }
517   - }, item, {
518   - icon: icon && bar.style !== 'TEXT' ? String(icon).indexOf('http') > -1 ? /*#__PURE__*/_react.default.createElement("img", {
519   - src: String(icon),
  769 + }
  770 +
  771 + if (schema.fieldName === searchKey) {
  772 + setSearchName(schema.title);
  773 + }
  774 +
  775 + var tip = schema.description ? /*#__PURE__*/_react.default.createElement("span", {
  776 + className: 'qx-column_desc'
  777 + }, /*#__PURE__*/_react.default.createElement(_tooltip.default, {
  778 + title: schema.description
  779 + }, /*#__PURE__*/_react.default.createElement(_InfoCircleOutlined2.default, null))) : null;
  780 + var column = ((_schema$props2 = schema.props) === null || _schema$props2 === void 0 ? void 0 : _schema$props2.column) || {};
  781 +
  782 + var _dataIndex = child.indexOf(dataPath) === -1 ? dataPath + '[].' + child : child;
  783 +
  784 + var _width = parseInt(column.width);
  785 +
  786 + return {
  787 + dataIndex: _dataIndex,
  788 + width: (column.width && _width ? _width : FIELD_LENGTH) + padding,
  789 + align: props.originWidget === 'subform' ? 'left' : column.align || 'left',
  790 + fixed: column.fixed || props.fixed && typeof index === 'number' && !isMergeFieldExist.current && index < props.fixed,
  791 + title: /*#__PURE__*/_react.default.createElement("div", {
520 792 style: {
521   - width: '16px',
522   - height: '16px',
523   - marginRight: '4px',
524   - verticalAlign: 'text-bottom',
525   - borderRadius: '50%'
526   - },
527   - alt: ""
528   - }) : String(icon).indexOf('-') > -1 ? /*#__PURE__*/_react.default.createElement(_icon.default, {
529   - type: String(icon)
530   - }) : BUTTON_ICONS_MAP[icon + ''] : null,
531   - onClick: function onClick() {
532   - barBtnClick(code, needConfirm, confirmContent, action, item);
  793 + width: (column.width ? parseInt(column.width) : FIELD_LENGTH) + "px"
  794 + }
  795 + }, schema.required ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("span", {
  796 + className: "fr-label-required"
  797 + }, " *"), /*#__PURE__*/_react.default.createElement("span", {
  798 + className: "qx-virtual_title__required",
  799 + title: schema.title
  800 + }, schema.title), tip) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("span", {
  801 + className: "qx-virtual_title",
  802 + title: schema.title
  803 + }, schema.title), tip)),
  804 + render: function render(value, record, index) {
  805 + // Check: record.index 似乎是antd自己会给的，不错哦
  806 + var childIndex = [].concat(_toConsumableArray(dataIndex), [record.index]);
  807 + return /*#__PURE__*/_react.default.createElement(_index2.default, {
  808 + hideTitle: true,
  809 + displayType: "inline",
  810 + key: index.toString(),
  811 + id: _dataIndex,
  812 + dataIndex: childIndex,
  813 + _item: flatten[_dataIndex] ? null : getItemSchema(_dataIndex) // subReadOnly={subReadOnly}
  814 +
  815 + });
533 816 }
534   - }), name));
535   - }));
  817 + };
  818 + };
  819 +
  820 + var getItemSchema = function getItemSchema(id) {
  821 + var _item;
  822 +
  823 + Object.keys(mergeFieldsMap.current || {}).forEach(function (key) {
  824 + if (id.indexOf(key) > -1) {
  825 + _item = mergeFieldsMap.current[key];
  826 + }
  827 + });
  828 + return _item;
  829 + };
  830 +
  831 + var handleMergeField = function handleMergeField(schema) {
  832 + // const column = schema.props?.column || {};
  833 + var _props = schema.props;
  834 + return {
  835 + title: _props.title,
  836 + align: _props.align,
  837 + dataIndex: _props.dataIndex,
  838 + children: Object.keys(schema.children).map(function (key) {
  839 + var _schema$children$key, _schema$children$key2;
  840 +
  841 + 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)) {
  842 + return {
  843 + show: false
  844 + };
  845 + }
  846 +
  847 + var isMergeField = key.indexOf('_merge_field') > -1 && Object.keys(schema.children[key].children || {}).length;
  848 +
  849 + if (isMergeField) {
  850 + return handleMergeField(schema.children[key]);
  851 + } else {
  852 + return handleColumn(schema.children[key], key);
  853 + }
  854 + })
  855 + };
  856 + };
  857 +
  858 + var getMergeMap = function getMergeMap() {
  859 + var _map = {};
  860 + Object.keys(flatten).forEach(function (key) {
  861 + var _schema$schema;
  862 +
  863 + var _schema = flatten[key];
  864 +
  865 + var _children = (_schema === null || _schema === void 0 ? void 0 : (_schema$schema = _schema.schema) === null || _schema$schema === void 0 ? void 0 : _schema$schema.children) || {};
  866 +
  867 + if (key.indexOf('_merge_field') > -1 && Object.keys(_children).length) {
  868 + Object.keys(_children).forEach(function (item) {
  869 + var _schema1 = _children[item];
  870 +
  871 + var _children1 = _schema1.children || {};
  872 +
  873 + if (item.indexOf('_merge_field') > -1 && Object.keys(_children1).length) {
  874 + Object.keys(_children1).forEach(function (it) {
  875 + _map[it] = {
  876 + schema: _children1[it]
  877 + };
  878 + });
  879 + } else {
  880 + _map[item] = {
  881 + schema: _schema1
  882 + };
  883 + }
  884 + });
  885 + }
  886 + });
  887 + return _map;
  888 + };
536 889
537 890 var columns = (0, _react.useMemo)(function () {
538   - return children.map(function (child, index) {
539   - var _schema$props2;
  891 + var _line_buttons2;
  892 +
  893 + //console.log('useMemo columns', isSubCanEdit, subReadOnly, JSON.stringify(line.buttons))
  894 + mergeFieldsMap.current = getMergeMap();
  895 + isMergeFieldExist.current = false;
  896 +
  897 + var _line_buttons = _.cloneDeep(line.buttons);
  898 +
  899 + var _columns = (children || []).map(function (child, index) {
  900 + var _schema$children;
540 901
541 902 var item = flatten[child];
542 903 var schema = item && item.schema || {};
543 904
544   - if (props.editable && props.originWidget === 'subform') {
545   - if (isSubCanEdit && !['relField', 'qxFormula'].includes(schema.widget)) {
546   - schema.readOnly = false;
547   - } else if (!isSubCanEdit) {
548   - schema.readOnly = true;
549   - }
  905 + 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)) {
  906 + return {
  907 + show: false
  908 + };
550 909 }
551 910
552   - if (schema.fieldName === searchKey) {
553   - setSearchName(schema.title);
  911 + var isMergeField = child.indexOf('_merge_field') > -1 && Object.keys(schema.children || {}).length;
  912 +
  913 + if (isMergeField) {
  914 + isMergeFieldExist.current = true;
  915 + return handleMergeField(schema, index);
  916 + } else {
  917 + return handleColumn(schema, child, index);
554 918 }
  919 + });
555 920
556   - var column = ((_schema$props2 = schema.props) === null || _schema$props2 === void 0 ? void 0 : _schema$props2.column) || {};
557   - return {
558   - dataIndex: child,
559   - width: (column.width ? parseInt(column.width) : FIELD_LENGTH) + padding,
560   - align: column.align || 'left',
561   - fixed: column.fixed || props.fixed && index < props.fixed,
562   - title: /*#__PURE__*/_react.default.createElement("div", {
563   - style: {
564   - width: (column.width ? parseInt(column.width) : FIELD_LENGTH) + "px"
565   - }
566   - }, schema.required ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("span", {
567   - className: "fr-label-required"
568   - }, " *"), /*#__PURE__*/_react.default.createElement("span", null, schema.title)) : schema.title),
569   - render: function render(value, record, index) {
570   - // Check: record.index 似乎是antd自己会给的，不错哦
571   - var childIndex = [].concat(_toConsumableArray(dataIndex), [record.index]);
572   - return /*#__PURE__*/_react.default.createElement(_index2.default, {
573   - hideTitle: true,
574   - displayType: "inline",
575   - key: index.toString(),
576   - id: child,
577   - dataIndex: childIndex // subReadOnly={subReadOnly}
  921 + _columns = _columns.filter(function (item) {
  922 + return Object.keys(item).length !== 1 && (!item.hidden || item.show);
  923 + });
  924 +
  925 + if (((_line_buttons2 = _line_buttons) === null || _line_buttons2 === void 0 ? void 0 : _line_buttons2.length) || Array.isArray(itemProps.buttons)) {
  926 + var top = line.top,
  927 + _line$style = line.style,
  928 + style = _line$style === void 0 ? 'ICON' : _line$style,
  929 + fixed = line.fixed;
578 930
  931 + if (type === 'add') {
  932 + if (props.originWidget === 'subform') {
  933 + _line_buttons = _line_buttons.filter(function (item) {
  934 + return item.code === 'DELETE';
579 935 });
  936 + } // 关联记录放开所有行按钮关联XQ230328006
  937 + // else if (props.originWidget === 'relSelector') {
  938 + // // jbl ERP需求，新增时放开编辑按钮
  939 + // _line_buttons = _line_buttons.filter(item => ['REMOVE', 'EDIT'].includes(item.code))
  940 + // }
  941 +
  942 + } else if ((type === 'view' || isReadOnly) && originWidget === 'relSelector') {
  943 + _line_buttons = _line_buttons.filter(function (item) {
  944 + return item.code === 'VIEW';
  945 + });
  946 + }
  947 +
  948 + var len = (_line_buttons || []).length;
  949 + var action = subReadOnly || isReadOnly && originWidget === 'subform' ? {} : {
  950 + title: '操作',
  951 + key: '$action',
  952 + fixed: fixed ? top ? 'left' : 'right' : props.originWidget === 'subform' ? 'right' : false,
  953 + align: 'center',
  954 + // width: ((buttons || []).length + (props.removeable ? 1 : 0)) * (style === 'ICON' ? 32 : style === 'TEXT' ? 36 : 57) + 16,
  955 + render: function render(value, record, idx) {
  956 + return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, Array.isArray(itemProps.buttons) ? itemProps.buttons.map(function (item, idx) {
  957 + var callback = item.callback,
  958 + text = item.text,
  959 + html = item.html;
  960 +
  961 + var onClick = function onClick() {};
  962 +
  963 + if (typeof window[callback] === 'function') {
  964 + onClick = function onClick() {
  965 + window[callback]({
  966 + value: listData,
  967 + onChange: changeList,
  968 + schema: schema
  969 + });
  970 + };
  971 + }
  972 +
  973 + return /*#__PURE__*/_react.default.createElement("a", {
  974 + key: idx.toString(),
  975 + style: {
  976 + marginLeft: 8
  977 + },
  978 + onClick: onClick
  979 + }, /*#__PURE__*/_react.default.createElement("span", {
  980 + dangerouslySetInnerHTML: {
  981 + __html: html || text
  982 + }
  983 + }));
  984 + }) : null, Array.isArray(_line_buttons) ? _line_buttons.map(function (item) {
  985 + var name = item.name,
  986 + code = item.code,
  987 + needConfirm = item.needConfirm,
  988 + confirmContent = item.confirmContent,
  989 + icon = item.icon;
  990 + var display = handleState(record, code, props.originWidget); // if (display === '') {
  991 + // btnMap[code] = ''
  992 + // }
  993 +
  994 + return /*#__PURE__*/_react.default.createElement(_tooltip.default, {
  995 + title: name
  996 + }, /*#__PURE__*/_react.default.createElement(_button.default, _extends({
  997 + key: code,
  998 + style: {
  999 + marginLeft: 8,
  1000 + display: display
  1001 + }
  1002 + }, item, {
  1003 + icon: icon && style !== 'TEXT' ? String(icon).indexOf('http') > -1 ? /*#__PURE__*/_react.default.createElement("img", {
  1004 + src: String(icon),
  1005 + style: {
  1006 + width: '16px',
  1007 + height: '16px',
  1008 + marginRight: '4px',
  1009 + verticalAlign: 'text-bottom',
  1010 + borderRadius: '50%'
  1011 + },
  1012 + alt: ""
  1013 + }) : String(icon).indexOf('-') > -1 ? /*#__PURE__*/_react.default.createElement(_icon.default, {
  1014 + type: String(icon)
  1015 + }) : BUTTON_ICONS_MAP[icon + ''] : null,
  1016 + type: 'link',
  1017 + size: 'small' // disabled={props.originWidget === 'subform' ? false : handleAuth(record, code)}
  1018 + ,
  1019 + onClick: function onClick() {
  1020 + // 已有数据进行操作时才二次提示
  1021 + if (needConfirm && confirmContent && (props.originWidget === 'relSelector' ? record.hasOwnProperty('$auth') : record.hasOwnProperty('id'))) {
  1022 + confirm({
  1023 + title: confirmContent,
  1024 + icon: /*#__PURE__*/_react.default.createElement(_ExclamationCircleOutlined2.default, null),
  1025 + okText: '确认',
  1026 + okType: 'danger',
  1027 + cancelText: '取消',
  1028 + onOk: function onOk() {
  1029 + if (code === 'DELETE' && props.originWidget === 'subform') {
  1030 + deleteItem(idx);
  1031 + } else if (code === 'REMOVE') {
  1032 + deleteItem(record.orginIdx);
  1033 + props.handleLineBtnClick(code, record, schema.$id);
  1034 + } else if (code === 'COPY') {
  1035 + copyItem(record.orginIdx);
  1036 + } else if (item.action === 'CUSTOM') {
  1037 + props.handleCustom(item, record, schema.$id);
  1038 + } else {
  1039 + props.handleLineBtnClick(code, record, schema.$id, line.action);
  1040 + }
  1041 + },
  1042 + onCancel: function onCancel() {}
  1043 + });
  1044 + } else {
  1045 + if (code === 'DELETE' && props.originWidget === 'subform') {
  1046 + deleteItem(idx);
  1047 + } else if (code === 'REMOVE') {
  1048 + deleteItem(record.orginIdx);
  1049 + props.handleLineBtnClick(code, record, schema.$id);
  1050 + } else if (code === 'COPY') {
  1051 + copyItem(record.orginIdx);
  1052 + } else if (item.action === 'CUSTOM') {
  1053 + props.handleCustom(item, record, schema.$id);
  1054 + } else {
  1055 + props.handleLineBtnClick(code, record, schema.$id, line.action, schema);
  1056 + }
  1057 + }
  1058 + }
  1059 + }), style !== 'ICON' || !icon ? name : null)); // }
  1060 + }) : null);
580 1061 }
581 1062 };
582   - });
583   - }, [children, flatten, isSubCanEdit]);
  1063 + var actionLength = 0;
  1064 +
  1065 + _line_buttons.forEach(function (item) {
  1066 + if (props.originWidget === 'subform' || style === 'ICON' && item.icon) {
  1067 + actionLength += 32;
  1068 + } else if (style !== 'ICON' || style === 'ICON' && !item.icon) {
  1069 + var div = document.createElement('div');
  1070 + div.style.position = 'absolute';
  1071 + div.style.visibility = 'hidden';
  1072 + div.style.fontSize = '14px';
  1073 + window.document.body.appendChild(div);
  1074 + div.innerHTML = item.name;
  1075 + actionLength += div.clientWidth + (style !== 'TEXT' && item.icon ? 32 : 0);
  1076 + div.remove();
  1077 + }
  1078 + });
  1079 +
  1080 + action.width = actionLength + padding * 2 - 8;
  1081 +
  1082 + if ((_columns || []).findIndex(function (item) {
  1083 + return item.key === '$action';
  1084 + }) === -1 && len > 0 && action.title) {
  1085 + if (top) {
  1086 + _columns.unshift(action);
  1087 + } else {
  1088 + _columns.push(action);
  1089 + }
  1090 + }
  1091 + }
  1092 +
  1093 + return _columns;
  1094 + }, [isSubCanEdit, subReadOnly, JSON.stringify(line.buttons), deleteItem]);
584 1095
585 1096 var handleAuth = function handleAuth(record, code) {
586 1097 switch (code) {
... ... @@ -622,192 +1133,6 @@ var VirtualList = function VirtualList(_ref) {
622 1133 }
623 1134 };
624 1135
625   - if (!props.hideDelete && ((_line$buttons = line.buttons) === null || _line$buttons === void 0 ? void 0 : _line$buttons.length) || Array.isArray(itemProps.buttons)) {
626   - var top = line.top,
627   - _line$style = line.style,
628   - style = _line$style === void 0 ? 'ICON' : _line$style,
629   - fixed = line.fixed,
630   - buttons = line.buttons;
631   -
632   - if (type === 'add') {
633   - if (props.originWidget === 'subform') {
634   - line.buttons = buttons.filter(function (item) {
635   - return item.code === 'DELETE';
636   - });
637   - } else if (props.originWidget === 'relSelector') {
638   - line.buttons = buttons.filter(function (item) {
639   - return item.code === 'REMOVE';
640   - });
641   - }
642   - } // if (props.removeable && buttons.findIndex(item => item.code === 'REMOVE') === -1) {
643   - // buttons.push({
644   - // icon: 'remove',
645   - // code: 'REMOVE',
646   - // name: '移除',
647   - // line: true,
648   - // needConfirm: true,
649   - // confirmContent: props.removeContent
650   - // })
651   - // }
652   -
653   -
654   - var len = (line.buttons || []).length;
655   - var action = schema.isReadOnly || subReadOnly ? {} : {
656   - title: '操作',
657   - key: '$action',
658   - fixed: fixed ? top ? 'left' : 'right' : props.originWidget === 'subform' ? 'right' : false,
659   - align: 'center',
660   - // width: ((buttons || []).length + (props.removeable ? 1 : 0)) * (style === 'ICON' ? 32 : style === 'TEXT' ? 36 : 57) + 16,
661   - render: function render(value, record, idx) {
662   - return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, Array.isArray(itemProps.buttons) ? itemProps.buttons.map(function (item, idx) {
663   - var callback = item.callback,
664   - text = item.text,
665   - html = item.html;
666   -
667   - var onClick = function onClick() {};
668   -
669   - if (typeof window[callback] === 'function') {
670   - onClick = function onClick() {
671   - window[callback]({
672   - value: listData,
673   - onChange: changeList,
674   - schema: schema
675   - });
676   - };
677   - }
678   -
679   - return /*#__PURE__*/_react.default.createElement("a", {
680   - key: idx.toString(),
681   - style: {
682   - marginLeft: 8
683   - },
684   - onClick: onClick
685   - }, /*#__PURE__*/_react.default.createElement("span", {
686   - dangerouslySetInnerHTML: {
687   - __html: html || text
688   - }
689   - }));
690   - }) : null, Array.isArray(line.buttons) ? line.buttons.map(function (item) {
691   - var name = item.name,
692   - code = item.code,
693   - needConfirm = item.needConfirm,
694   - confirmContent = item.confirmContent,
695   - icon = item.icon;
696   - var display = handleState(record, code, props.originWidget); // if (display === '') {
697   - // btnMap[code] = ''
698   - // }
699   -
700   - return /*#__PURE__*/_react.default.createElement(_tooltip.default, {
701   - title: name
702   - }, /*#__PURE__*/_react.default.createElement(_button.default, _extends({
703   - key: code,
704   - style: {
705   - marginLeft: 8,
706   - display: display
707   - }
708   - }, item, {
709   - icon: icon && style !== 'TEXT' ? String(icon).indexOf('http') > -1 ? /*#__PURE__*/_react.default.createElement("img", {
710   - src: String(icon),
711   - style: {
712   - width: '16px',
713   - height: '16px',
714   - marginRight: '4px',
715   - verticalAlign: 'text-bottom',
716   - borderRadius: '50%'
717   - },
718   - alt: ""
719   - }) : String(icon).indexOf('-') > -1 ? /*#__PURE__*/_react.default.createElement(_icon.default, {
720   - type: String(icon)
721   - }) : BUTTON_ICONS_MAP[icon + ''] : null,
722   - type: 'link',
723   - size: 'small' // disabled={props.originWidget === 'subform' ? false : handleAuth(record, code)}
724   - ,
725   - onClick: function onClick() {
726   - // 已有数据进行操作时才二次提示
727   - if (needConfirm && confirmContent && (props.originWidget === 'relSelector' ? record.hasOwnProperty('$auth') : record.hasOwnProperty('id'))) {
728   - confirm({
729   - title: confirmContent,
730   - icon: /*#__PURE__*/_react.default.createElement(_ExclamationCircleOutlined2.default, null),
731   - okText: '确认',
732   - okType: 'danger',
733   - cancelText: '取消',
734   - onOk: function onOk() {
735   - if (code === 'DELETE' && props.originWidget === 'subform') {
736   - deleteItem(idx);
737   - } else if (code === 'REMOVE') {
738   - deleteItem(record.orginIdx);
739   - props.handleLineBtnClick(code, record, schema.$id);
740   - } else if (code === 'COPY') {
741   - copyItem(record.orginIdx);
742   - } else if (item.action === 'CUSTOM') {
743   - props.handleCustom(item, record, schema.$id);
744   - } else {
745   - props.handleLineBtnClick(code, record, schema.$id, line.action);
746   - }
747   - },
748   - onCancel: function onCancel() {}
749   - });
750   - } else {
751   - if (code === 'DELETE' && props.originWidget === 'subform') {
752   - deleteItem(idx);
753   - } else if (code === 'REMOVE') {
754   - deleteItem(record.orginIdx);
755   - props.handleLineBtnClick(code, record, schema.$id);
756   - } else if (code === 'COPY') {
757   - copyItem(record.orginIdx);
758   - } else if (item.action === 'CUSTOM') {
759   - props.handleCustom(item, record, schema.$id);
760   - } else {
761   - props.handleLineBtnClick(code, record, schema.$id, line.action);
762   - }
763   - }
764   - }
765   - }), style !== 'ICON' ? name : null)); // }
766   - }) : null);
767   - }
768   - };
769   -
770   - if (style === "ICON" || props.originWidget === 'subform') {
771   - // let effectiveLength = 0
772   - // console.log(line.buttons)
773   - // line.buttons.forEach((btn) => {
774   - // // console.log(btnMap)
775   - // if (btnMap[btn.code] === '') {
776   - // effectiveLength += 1
777   - // console.log(effectiveLength);
778   - // }
779   - // })
780   - // console.log(effectiveLength, padding);
781   - action.width = len * 32 - 16 >= 30 ? len * 32 + padding - 8 : 30 + padding;
782   - } else {
783   - var leng = 0;
784   - line.buttons.map(function (item) {
785   - var div = document.createElement('div');
786   - div.style.position = 'absolute';
787   - div.style.visibility = 'hidden';
788   - div.style.fontSize = '14px';
789   - window.document.body.appendChild(div);
790   - div.innerHTML = item.name; // leng += btnMap?.[item.code] === '' ? (div.clientWidth + (style !== 'TEXT' && item.icon ? 22 : 0)) : 0;
791   -
792   - leng += div.clientWidth + (style !== 'TEXT' && item.icon ? 22 : 0); // console.log(leng);
793   -
794   - div.remove();
795   - }); // console.log(leng + padding * 2 - 8, 'leng');
796   -
797   - action.width = leng + padding * 2 - 8;
798   - }
799   -
800   - if (columns.findIndex(function (item) {
801   - return item.key === '$action';
802   - }) === -1 && len > 0 && action.title) {
803   - if (top) {
804   - columns.unshift(action);
805   - } else {
806   - columns.push(action);
807   - }
808   - }
809   - }
810   -
811 1136 var handleExport = /*#__PURE__*/function () {
812 1137 var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
813 1138 var queryParams, currentAppCode, currentFunCode, appCode, funCode, fieldName, result;
... ... @@ -939,68 +1264,6 @@ var VirtualList = function VirtualList(_ref) {
939 1264 setSubEdit(false);
940 1265 };
941 1266
942   - var barBtnClick = function barBtnClick(code, needConfirm, confirmContent, action, item) {
943   - setSelectedRowKeys([]);
944   -
945   - if (needConfirm && confirmContent) {
946   - if (!selectedRowKeys.length) {
947   - return _message2.default.warning('请选择数据');
948   - }
949   -
950   - confirm({
951   - title: confirmContent,
952   - icon: /*#__PURE__*/_react.default.createElement(_ExclamationCircleOutlined2.default, null),
953   - okText: '确认',
954   - okType: 'danger',
955   - cancelText: '取消',
956   - onOk: function onOk() {
957   - if (code === 'DELETE') {
958   - if (props.originWidget === 'subform') {
959   - batchDelete(selectedRowKeys);
960   - setSelectedRowKeys([]);
961   - } else {
962   - props.handleBarBtnClick(code, fieldName, batchKey, selectedRowKeys, schema.$id, selectedIds);
963   - }
964   - } else if (code === 'EXPORT') {
965   - handleExport();
966   - } else if (code === 'SELECT') {
967   - props.openRelSelect(schema.$id);
968   - } else if (code === 'ADD') {
969   - props.handleRelAdd(schema.$id);
970   - } else if (code === 'subformEdit') {
971   - props.handleBatchEdit(fieldName, schema.$id, selectedIds);
972   - } else if (action === 'CUSTOM') {
973   - props.handleCustom(item, selectedIds, schema.$id);
974   - } else {
975   - props.handleBarBtnClick(code, fieldName, batchKey, selectedRowKeys, schema.$id, selectedIds);
976   - }
977   - },
978   - onCancel: function onCancel() {}
979   - });
980   - } else {
981   - if (code === 'DELETE') {
982   - if (props.originWidget === 'subform') {
983   - batchDelete(selectedRowKeys);
984   - setSelectedRowKeys([]);
985   - } else {
986   - props.handleBarBtnClick(code, fieldName, batchKey, selectedRowKeys, schema.$id, selectedIds);
987   - }
988   - } else if (code === 'EXPORT') {
989   - handleExport();
990   - } else if (code === 'SELECT') {
991   - props.openRelSelect(schema.$id);
992   - } else if (code === 'ADD') {
993   - props.handleRelAdd(schema.$id);
994   - } else if (code === 'subformEdit') {
995   - props.handleBatchEdit(fieldName, schema.$id, selectedIds);
996   - } else if (action === 'CUSTOM') {
997   - props.handleCustom(item, selectedIds, schema.$id);
998   - } else {
999   - props.handleBarBtnClick(code, fieldName, batchKey, selectedRowKeys, schema.$id, selectedIds);
1000   - }
1001   - }
1002   - };
1003   -
1004 1267 return /*#__PURE__*/_react.default.createElement("div", null, props.editable ? isSubCanEdit ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_button.default, {
1005 1268 type: 'text',
1006 1269 size: "small",
... ... @@ -1046,7 +1309,9 @@ var VirtualList = function VirtualList(_ref) {
1046 1309
1047 1310 setKeyWord(((_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.value) || '');
1048 1311 }
1049   - }) : /*#__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) {
  1312 + }) : /*#__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) {
  1313 + return isInDing ? !['EXPORT', 'IMPORT'].includes(item.code) : true;
  1314 + }).map(function (item) {
1050 1315 var name = item.name,
1051 1316 code = item.code,
1052 1317 needConfirm = item.needConfirm,
... ... @@ -1134,10 +1399,11 @@ var VirtualList = function VirtualList(_ref) {
1134 1399 id: 'qxVirtualList',
1135 1400 className: 'qx-virtualList',
1136 1401 rowKey: props.originWidget === 'relSelector' ? 'id' : 'orginIdx',
1137   - scroll: {
1138   - y: scrollY,
  1402 + scroll: _objectSpread({
1139 1403 x: '100%'
1140   - } // components={vt}
  1404 + }, !isFullScreen && {
  1405 + y: scrollY
  1406 + }) // components={vt}
1141 1407 ,
1142 1408 size: size || 'small'
1143 1409 }, props.originWidget === 'relSelector' ? {
... ... @@ -1159,7 +1425,7 @@ var VirtualList = function VirtualList(_ref) {
1159 1425 type: "link",
1160 1426 icon: /*#__PURE__*/_react.default.createElement(_PlusOutlined2.default, null),
1161 1427 onClick: function onClick() {
1162   - addItem(handleAddDefault);
  1428 + addItem();
1163 1429 }
1164 1430 }, "\u65B0\u589E"));
1165 1431 };
... ... @@ -1178,14 +1444,7 @@ function handleDownload(_x, _x2, _x3) {
1178 1444
1179 1445 function _handleDownload() {
1180 1446 _handleDownload = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(url, name, request) {
1181   - var _dd$env;
1182   -
1183 1447 var isDownload,
1184   - isInDing,
1185   - needToken,
1186   - dingUrl,
1187   - prev,
1188   - append,
1189 1448 link,
1190 1449 blob,
1191 1450 downloadUrl,
... ... @@ -1199,44 +1458,46 @@ function _handleDownload() {
1199 1458
1200 1459 if (isDownload === null || Boolean(isDownload)) {
1201 1460 _message2.default.warning('即将开始下载，请勿重复点击。');
1202   - }
1203   -
1204   - isInDing = (dd === null || dd === void 0 ? void 0 : (_dd$env = dd.env) === null || _dd$env === void 0 ? void 0 : _dd$env.platform) !== 'notInDingTalk';
1205   -
1206   - if (!isInDing) {
1207   - _context2.next = 8;
1208   - break;
1209   - }
  1461 + } // console.log('url========', url);
  1462 + // const isInDing = dd && dd?.env?.platform !== 'notInDingTalk';
  1463 + // if (isInDing) {
  1464 + // // 比如导出 导入
  1465 + // const needToken = !(url.includes('http://') || url.includes('https://'));
  1466 + // let dingUrl;
  1467 + // if (needToken) {
  1468 + // const apiUri = process.env.apiUrl || '';
  1469 + // const needConcat = !(apiUri.includes('http://') || apiUri.includes('https://')); // 打包后
  1470 + // const prev = `${needConcat ? location.origin : ''}${apiUri}${url}`;
  1471 + // const append = `_token=${QIXIAO_TOKEN}${isDesignPage() ? '&_bizCode=design' : ''}`;
  1472 + // dingUrl = `${prev}${prev.includes('?') ? '&' : '?'}${append}`; // 文件服务器 不能加参数
  1473 + // } else {
  1474 + // dingUrl = url;
  1475 + // }
  1476 + // console.log('dingUrl========', dingUrl);
  1477 + // const fileName = name || '下载文件';
  1478 + // dd.biz.util.downloadFile({
  1479 + // url: dingUrl,
  1480 + // name: fileName,
  1481 + // onFail: function () {
  1482 + // message.error(`${fileName} 文件下载失败`);
  1483 + // },
  1484 + // });
  1485 + // return;
  1486 + // }
1210 1487
1211   - // 比如导出 导入
1212   - needToken = !(url.includes('http://') || url.includes('https://'));
1213   -
1214   - if (needToken) {
1215   - prev = "".concat(process.env.apiUrl).concat(url);
1216   - append = "_token=".concat(QIXIAO_TOKEN).concat(isDesignPage() ? '&_bizCode=design' : '');
1217   - dingUrl = "".concat(prev).concat(prev.includes('?') ? '&' : '?').concat(append); // 文件服务器 不能加参数
1218   - } else {
1219   - dingUrl = url;
1220   - }
1221   -
1222   - dd.biz.util.downloadFile({
1223   - url: dingUrl
1224   - });
1225   - return _context2.abrupt("return");
1226 1488
1227   - case 8:
1228 1489 link = document.createElement('a');
1229 1490 link.href = url;
1230 1491 link.download = name;
1231 1492 link.target = '_blank';
1232 1493 document.body.appendChild(link); //TODO 文件过大时，看不到下载进度
1233 1494
1234   - _context2.next = 15;
  1495 + _context2.next = 9;
1235 1496 return request.get(url, {
1236 1497 autoShowError: true
1237 1498 });
1238 1499
1239   - case 15:
  1500 + case 9:
1240 1501 blob = _context2.sent;
1241 1502
1242 1503 if (blob !== null) {
... ... @@ -1247,7 +1508,7 @@ function _handleDownload() {
1247 1508 URL.revokeObjectURL(downloadUrl);
1248 1509 }
1249 1510
1250   - case 17:
  1511 + case 11:
1251 1512 case "end":
1252 1513 return _context2.stop();
1253 1514 }
... ...
... ... @@ -43,9 +43,9 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
43 43
44 44 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; }
45 45
46   -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; }
  46 +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; }
47 47
48   -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; }
  48 +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; }
49 49
50 50 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; }
51 51
... ... @@ -93,36 +93,23 @@ var RenderList = function RenderList(_ref) {
93 93 onItemChange(dataPath, newList);
94 94 };
95 95
96   - var addItem = function addItem(handleAddDefault) {
97   - // const newList = [...displayList, {_active: true}];
  96 + var addItem = function addItem() {
  97 + var _item = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
  98 +
98 99 var _schema = (0, _utils.getSchemaFromFlatten)(flatten, parentId);
99 100
100   - var _newItem = (0, _utils.generateDataSkeleton)(_schema.items) || {};
  101 + var newItem = _objectSpread(_objectSpread({}, (0, _utils.generateDataSkeleton)(_schema.items) || {}), _item);
101 102
102   - var newItem = _objectSpread(_objectSpread({}, _newItem), {}, {
  103 + var newList = [].concat(_toConsumableArray(displayList), [_objectSpread(_objectSpread({}, newItem), {}, {
103 104 _active: true
104   - });
105   -
106   - var callback = function callback() {
107   - var _new = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : newItem;
108   -
109   - onItemChange(dataPath, [].concat(_toConsumableArray(displayList), [_objectSpread(_objectSpread({}, _new), {}, {
110   - _active: true
111   - })]));
112   - };
113   -
114   - if (_.isFunction(handleAddDefault)) {
115   - handleAddDefault(newItem, callback);
116   - } else {
117   - callback();
118   - }
119   -
120   - return displayList.length;
  105 + })]);
  106 + var newIndex = newList.length - 1;
  107 + onItemChange(dataPath, newList);
  108 + return newIndex;
121 109 };
122 110
123 111 var copyItem = function copyItem(idx) {
124   - var newItem = _.cloneDeep(displayList[idx]);
125   -
  112 + var newItem = (0, _lodashEs.cloneDeep)(displayList[idx]);
126 113 delete newItem.id;
127 114 var newList = [].concat(_toConsumableArray(displayList.slice(0, idx + 1)), [newItem], _toConsumableArray(displayList.slice(idx + 1)));
128 115 onItemChange(dataPath, JSON.parse(JSON.stringify(newList)));
... ... @@ -228,7 +215,19 @@ var RenderList = function RenderList(_ref) {
228 215 errorFields: errorFields,
229 216 displayType: displayType,
230 217 getFieldsProps: getFieldsProps
231   - };
  218 + }; // 外部定义：添加按钮事件
  219 +
  220 + var onAdd = methods[props.onAdd];
  221 +
  222 + if ((0, _lodashEs.isFunction)(onAdd)) {
  223 + displayProps.addItem = function () {
  224 + return onAdd(function (_item) {
  225 + return addItem(_item);
  226 + }, {
  227 + schema: schema
  228 + });
  229 + };
  230 + }
232 231
233 232 if (renderWidget === 'listForMobile') {
234 233 return /*#__PURE__*/_react.default.createElement(_ListForMobile.default, displayProps);
... ...
  1 +"use strict";
  2 +
  3 +Object.defineProperty(exports, "__esModule", {
  4 + value: true
  5 +});
  6 +exports.isDesignPage = isDesignPage;
  7 +
  8 +function isDesignPage() {
  9 + var href = location.href;
  10 + var res = false;
  11 +
  12 + if (href.indexOf('/app-view/') > -1) {
  13 + res = true;
  14 + } else if (href.indexOf('/apps/design') > -1) {
  15 + res = true;
  16 + } else if (href.indexOf('/editor/form') > -1) {
  17 + res = true;
  18 + } else if (href.indexOf('/editor/setting') > -1) {
  19 + res = true;
  20 + } else if (href.indexOf('/editor/view') > -1) {
  21 + res = true;
  22 + } else if (href.indexOf('/editor/detail') > -1) {
  23 + res = true;
  24 + } else if (href.indexOf('/editor/custom') > -1) {
  25 + res = true;
  26 + } else if (href.indexOf('/editor/aggregation') > -1) {
  27 + res = true;
  28 + } else if (href.indexOf('/component') > -1) {
  29 + res = true;
  30 + } else if (href.indexOf('/editor/chart') > -1) {
  31 + res = true;
  32 + } else if (href.indexOf('businessCode=design') > -1) {
  33 + res = true;
  34 + } else if (href.indexOf('refer=/app-view/') > -1) {
  35 + res = true;
  36 + } else if (href.indexOf('/datacube/edit') > -1) {
  37 + res = true;
  38 + } else if (href.indexOf('/datacube/config') > -1) {
  39 + res = true;
  40 + } else if (href.indexOf('/datacube/design') > -1) {
  41 + res = true;
  42 + }
  43 +
  44 + return res;
  45 +}
\ No newline at end of file
... ...
1 1 "use strict";
2 2
3   -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); }
  3 +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); }
4 4
5 5 Object.defineProperty(exports, "__esModule", {
6 6 value: true
... ... @@ -21,9 +21,9 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
21 21
22 22 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; }
23 23
24   -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; }
  24 +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; }
25 25
26   -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; }
  26 +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; }
27 27
28 28 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; }
29 29
... ... @@ -107,7 +107,7 @@ var ExtendedWidget = function ExtendedWidget(_ref) {
107 107 }
108 108
109 109 var Widget = widgets[widgetName] || widgets['html'];
110   - var extraSchema = _mapping.extraSchemaList[widgetName];
  110 + var extraSchema = _mapping.extraSchemaList[widgetName]; // console.log(hasError, '----------');
111 111
112 112 var widgetProps = _objectSpread(_objectSpread({
113 113 schema: _objectSpread(_objectSpread({}, schema), extraSchema),
... ... @@ -190,21 +190,41 @@ var ExtendedWidget = function ExtendedWidget(_ref) {
190 190 }, /*#__PURE__*/_react.default.createElement(Widget, finalProps)));
191 191 };
192 192
  193 +function getValue(_data, key) {
  194 + if (!key) {
  195 + return null;
  196 + }
  197 +
  198 + var keys = key.split('.');
  199 + return keys.reduce(function (prev, cur) {
  200 + if (cur === keys[keys.length - 1]) {
  201 + return prev[cur];
  202 + } else {
  203 + return prev[cur] || {};
  204 + }
  205 + }, _data);
  206 +}
  207 +
193 208 var areEqual = function areEqual(prev, current) {
  209 + var _prev$schema, _prev$schema$props;
  210 +
194 211 if (prev.schema && current.schema) {
195 212 if (prev.schema.$id === '#') {
196 213 return false;
197   - }
  214 + } // if (prev.schema.hidden && current.schema.hidden) {
  215 + // return true;
  216 + // }
198 217
199   - if (prev.schema.hidden && current.schema.hidden) {
200   - return true;
201   - }
202 218 }
203 219
204 220 if (prev.readOnly !== current.readOnly) {
205 221 return false;
206 222 }
207 223
  224 + if (prev.hasError !== current.hasError) {
  225 + return false;
  226 + }
  227 +
208 228 if (prev.disabled !== current.disabled) {
209 229 return false;
210 230 }
... ... @@ -213,6 +233,10 @@ var areEqual = function areEqual(prev, current) {
213 233 return false;
214 234 }
215 235
  236 + 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))) {
  237 + return false;
  238 + }
  239 +
216 240 if ((0, _utils.isObjType)(prev.schema) && (0, _utils.isObjType)(current.schema)) {
217 241 return false;
218 242 }
... ... @@ -224,6 +248,7 @@ var areEqual = function areEqual(prev, current) {
224 248 return false;
225 249 };
226 250
227   -var _default = /*#__PURE__*/_react.default.memo(ExtendedWidget, areEqual);
  251 +var _default = /*#__PURE__*/_react.default.memo(ExtendedWidget, areEqual); // export default ExtendedWidget;
  252 +
228 253
229 254 exports.default = _default;
\ No newline at end of file
... ...
... ... @@ -13,7 +13,7 @@ require("./Extra.css");
13 13
14 14 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
15 15
16   -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); }
  16 +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); }
17 17
18 18 var Extra = function Extra(_ref) {
19 19 var schema = _ref.schema;
... ...
... ... @@ -75,7 +75,8 @@ var Description = function Description(_ref) {
75 75 }
76 76
77 77 return /*#__PURE__*/_react.default.createElement("span", {
78   - className: "fr-desc ml2"
  78 + className: "fr-desc ml2",
  79 + title: description
79 80 }, "( ".concat(description, " )"));
80 81 }
81 82 };
... ...
1 1 "use strict";
2 2
3   -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); }
  3 +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); }
4 4
5 5 Object.defineProperty(exports, "__esModule", {
6 6 value: true
... ... @@ -86,7 +86,8 @@ var RenderField = function RenderField(props) {
86 86 renderTitle = _useTools.renderTitle,
87 87 requiredMark = _useTools.requiredMark,
88 88 setFieldValidating = _useTools.setFieldValidating,
89   - removeFieldValidating = _useTools.removeFieldValidating;
  89 + removeFieldValidating = _useTools.removeFieldValidating,
  90 + setValueByPath = _useTools.setValueByPath;
90 91
91 92 var formDataRef = (0, _react.useRef)();
92 93 formDataRef.current = formData; // console.log('<renderField>', $id);
... ... @@ -208,6 +209,10 @@ var RenderField = function RenderField(props) {
208 209 return (0, _utils.getValueByPath)(formData, path);
209 210 };
210 211
  212 + if (formDataRef.current && ['virtualList', 'listForMobile'].includes(_schema.widget)) {
  213 + _schema._setValueByPath = setValueByPath;
  214 + }
  215 +
211 216 var widgetProps = {
212 217 $id: $id,
213 218 schema: _schema,
... ...
1 1 "use strict";
2 2
3   -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); }
  3 +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); }
4 4
5 5 Object.defineProperty(exports, "__esModule", {
6 6 value: true
... ... @@ -28,9 +28,9 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
28 28
29 29 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; }
30 30
31   -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; }
  31 +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; }
32 32
33   -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; }
  33 +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; }
34 34
35 35 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; }
36 36
... ... @@ -160,12 +160,11 @@ var CoreRender = function CoreRender(_ref2) {
160 160 effectiveLabelWidth = _ref2.effectiveLabelWidth,
161 161 rest = _objectWithoutProperties(_ref2, _excluded2);
162 162
163   - if (schema.hidden) {
164   - return null;
165   - } // 样式的逻辑全放在这层
  163 + // if (schema.hidden) {
  164 + // return null;
  165 + // }
  166 + // 样式的逻辑全放在这层
166 167 // displayType 一层层网上找值
167   -
168   -
169 168 var _displayType = schema.displayType || rest.displayType || displayType || 'column';
170 169
171 170 var _labelAlign = schema.labelAlign || rest.labelAlign || labelAlign || 'right';
... ... @@ -258,6 +257,12 @@ var CoreRender = function CoreRender(_ref2) {
258 257
259 258 var columnStyle = {};
260 259
  260 + if (schema.currentStep === false) {
  261 + columnStyle.display = 'none';
  262 + } else {
  263 + columnStyle = {};
  264 + }
  265 +
261 266 if (schema.hidden) {
262 267 columnStyle.display = 'none';
263 268 } // if (!isComplex) {
... ...
... ... @@ -16,9 +16,9 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
16 16
17 17 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); }
18 18
19   -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; }
  19 +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; }
20 20
21   -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; }
  21 +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; }
22 22
23 23 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; }
24 24
... ...
... ... @@ -11,9 +11,9 @@ exports.useWindowState = exports.useTools = exports.useStore2 = exports.useStore
11 11
12 12 var _react = require("react");
13 13
14   -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; }
  14 +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; }
15 15
16   -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; }
  16 +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; }
17 17
18 18 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; }
19 19
... ... @@ -77,6 +77,11 @@ var useSet = function useSet(initState) {
77 77 // console.groupEnd();
78 78
79 79
  80 + // console.group(newState.action || 'action'); // TODO: give it a name
  81 + // console.log('%cState:', 'color: #9E9E9E; font-weight: 700;', state);
  82 + // console.log('%cAction:', 'color: #00A7F7; font-weight: 700;', action);
  83 + // console.log('%cNext:', 'color: #47B04B; font-weight: 700;', result);
  84 + // console.groupEnd();
80 85 return result;
81 86 }, initState),
82 87 _useReducer2 = _slicedToArray(_useReducer, 2),
... ...
... ... @@ -329,6 +329,35 @@
329 329 visibility: hidden;
330 330 word-wrap: break-word;
331 331 }
  332 +.fr-container .fr-tooltip-triangle {
  333 + position: absolute;
  334 + left: 50%;
  335 + border-left: 5px solid transparent;
  336 + border-right: 5px solid transparent;
  337 + border-top: 5px solid #2b222a;
  338 + transition: all 0.5s ease;
  339 + content: ' ';
  340 + font-size: 0;
  341 + line-height: 0;
  342 + margin-left: -5px;
  343 + width: 0;
  344 + bottom: -5px;
  345 +}
  346 +.fr-container .fr-tooltip-toggle::before,
  347 +.fr-container .fr-tooltip-toggle::after {
  348 + color: #efefef;
  349 + font-size: 13px;
  350 + opacity: 0;
  351 + pointer-events: none;
  352 + text-align: center;
  353 +}
  354 +.fr-container .fr-tooltip-toggle:focus::before,
  355 +.fr-container .fr-tooltip-toggle:focus::after,
  356 +.fr-container .fr-tooltip-toggle:hover::before,
  357 +.fr-container .fr-tooltip-toggle:hover::after {
  358 + opacity: 1;
  359 + transition: all 0.75s ease;
  360 +}
332 361 .fr-container .fr-slider {
333 362 display: flex;
334 363 width: 100%;
... ...
... ... @@ -63,11 +63,11 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
63 63
64 64 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); }
65 65
66   -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); }
  66 +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); }
67 67
68   -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; }
  68 +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; }
69 69
70   -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; }
  70 +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; }
71 71
72 72 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; }
73 73
... ...
... ... @@ -9,9 +9,9 @@ var _lodashEs = require("lodash-es");
9 9
10 10 var _utils = require("./utils");
11 11
12   -function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
  12 +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; }
13 13
14   -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; }
  14 +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; }
15 15
16 16 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; }
17 17
... ...
... ... @@ -21,9 +21,9 @@ var _validator = require("./validator");
21 21
22 22 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
23 23
24   -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; }
  24 +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; }
25 25
26   -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; }
  26 +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; }
27 27
28 28 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; }
29 29
... ... @@ -413,7 +413,9 @@ var useForm = function useForm(props) {
413 413
414 414 if (Array.isArray(nameList)) {
415 415 nameList.forEach(function (path) {
416   - (0, _lodashEs.set)(currentData, path, (0, _lodashEs.get)(data, path));
  416 + var _path = path.replace('[]', '');
  417 +
  418 + (0, _lodashEs.set)(currentData, _path, (0, _lodashEs.get)(data, _path));
417 419 });
418 420 } else {
419 421 currentData = data;
... ... @@ -571,11 +573,20 @@ var useForm = function useForm(props) {
571 573 var data = _data.current;
572 574
573 575 if (Array.isArray(nameList)) {
574   - (0, _lodashEs.set)(data, {});
  576 + data = {};
575 577 nameList.forEach(function (path) {
576   - (0, _lodashEs.set)(data, path, (0, _lodashEs.get)(_data.current, path));
  578 + var _path = path.replace('[]', '');
  579 +
  580 + (0, _lodashEs.set)(data, _path, (0, _lodashEs.get)(_data.current, _path));
577 581 });
578   - }
  582 + } // const data = _data.current;
  583 + // if (Array.isArray(nameList)) {
  584 + // set(data, {});
  585 + // nameList.forEach(path => {
  586 + // set(data, path, get(_data.current, path));
  587 + // });
  588 + // }
  589 +
579 590
580 591 setState({
581 592 isValidating: true
... ...
... ... @@ -60,11 +60,11 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
60 60
61 61 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; }
62 62
63   -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); }
  63 +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); }
64 64
65   -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; }
  65 +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; }
66 66
67   -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; }
  67 +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; }
68 68
69 69 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; }
70 70
... ... @@ -620,8 +620,8 @@ function parseSingleExpression(func) {
620 620 try {
621 621 return Function(str)();
622 622 } catch (error) {
623   - console.log(error, func, dataPath);
624   - return null; // 如果计算有错误，return null 最合适
  623 + return null; // 如果计算有错误，return null
  624 + // 最合适
625 625 } // const funcBody = func.substring(2, func.length - 2);
626 626 // //TODO: 这样有问题，例如 a.b.indexOf(), 会把 a.b.indexOf 当做值
627 627 // const match1 = /formData.([a-zA-Z0-9.$_\[\]]+)/g;
... ... @@ -1284,9 +1284,9 @@ var cleanEmpty = function cleanEmpty(obj) {
1284 1284 return obj.map(function (v) {
1285 1285 return v && isObject(v) ? cleanEmpty(v) : v;
1286 1286 }).filter(function (v) {
1287   - return !(v == undefined);
  1287 + return !(v === undefined);
1288 1288 });
1289   - } else if (isObject(obj)) {
  1289 + } else if (isObject(obj) && obj) {
1290 1290 return Object.entries(obj).map(function (_ref12) {
1291 1291 var _ref13 = _slicedToArray(_ref12, 2),
1292 1292 k = _ref13[0],
... ... @@ -1298,7 +1298,7 @@ var cleanEmpty = function cleanEmpty(obj) {
1298 1298 k = _ref15[0],
1299 1299 v = _ref15[1];
1300 1300
1301   - return v == undefined ? a : (a[k] = v, a);
  1301 + return v === undefined ? a : (a[k] = v, a);
1302 1302 }, {});
1303 1303 } else {
1304 1304 return obj;
... ...
... ... @@ -33,19 +33,19 @@ var defaultValidateMessagesCN = {
33 33 len: '${title}长度不是${len}',
34 34 min: '${title}长度不能小于${min}',
35 35 max: '${title}长度不能大于${max}',
36   - range: '${title}长度需在${min}与${max}之间'
  36 + range: '${title}长度需在${min}～${max}之间'
37 37 },
38 38 number: {
39 39 len: '${title}不等于${len}',
40 40 min: '${title}不能小于${min}',
41 41 max: '${title}不能大于${max}',
42   - range: '${title}需在${min}与${max}之间'
  42 + range: '${title}需在${min}～${max}之间'
43 43 },
44 44 array: {
45 45 len: '${title}长度不是${len}',
46 46 min: '${title}长度不能小于${min}',
47 47 max: '${title}长度不能大于${max}',
48   - range: '${title}长度需在${min}与${max}之间'
  48 + range: '${title}长度需在${min}～${max}之间'
49 49 },
50 50 pattern: {
51 51 mismatch: '${title}未通过正则判断${pattern}'
... ...
1 1 "use strict";
2 2
3   -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); }
  3 +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); }
4 4
5 5 Object.defineProperty(exports, "__esModule", {
6 6 value: true
... ... @@ -59,9 +59,9 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
59 59
60 60 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); }
61 61
62   -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; }
  62 +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; }
63 63
64   -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; }
  64 +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; }
65 65
66 66 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; }
67 67
... ...
1 1 "use strict";
2 2
3   -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); }
  3 +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); }
4 4
5 5 Object.defineProperty(exports, "__esModule", {
6 6 value: true
... ... @@ -23,9 +23,9 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
23 23
24 24 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
25 25
26   -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; }
  26 +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; }
27 27
28   -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; }
  28 +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; }
29 29
30 30 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; }
31 31
... ...
1 1 "use strict";
2 2
3   -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); }
  3 +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); }
4 4
5 5 Object.defineProperty(exports, "__esModule", {
6 6 value: true
... ...
1 1 "use strict";
2 2
3   -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); }
  3 +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); }
4 4
5 5 Object.defineProperty(exports, "__esModule", {
6 6 value: true
... ... @@ -27,9 +27,9 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
27 27
28 28 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); }
29 29
30   -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; }
  30 +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; }
31 31
32   -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; }
  32 +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; }
33 33
34 34 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; }
35 35
... ...
1 1 "use strict";
2 2
3   -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); }
  3 +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); }
4 4
5 5 Object.defineProperty(exports, "__esModule", {
6 6 value: true
... ... @@ -25,9 +25,9 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
25 25
26 26 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); }
27 27
28   -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; }
  28 +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; }
29 29
30   -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; }
  30 +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; }
31 31
32 32 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; }
33 33
... ...
1 1 "use strict";
2 2
3   -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); }
  3 +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); }
4 4
5 5 Object.defineProperty(exports, "__esModule", {
6 6 value: true
... ... @@ -25,9 +25,9 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
25 25
26 26 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); }
27 27
28   -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; }
  28 +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; }
29 29
30   -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; }
  30 +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; }
31 31
32 32 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; }
33 33
... ...
1 1 "use strict";
2 2
3   -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); }
  3 +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); }
4 4
5 5 Object.defineProperty(exports, "__esModule", {
6 6 value: true
... ... @@ -27,9 +27,9 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
27 27
28 28 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); }
29 29
30   -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; }
  30 +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; }
31 31
32   -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; }
  32 +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; }
33 33
34 34 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; }
35 35
... ...
1 1 {
2 2 "name": "@qx/form-render",
3   - "version": "0.1.6",
4   - "description": "通过 JSON Schema 生成标准 Form，常用于自定义搭建配置界面生成",
  3 + "version": "0.1.27.beta.1",
  4 + "keywords": [
  5 + "Form",
  6 + "FormRender",
  7 + "Render",
  8 + "XRender",
  9 + "React",
  10 + "Json Schema",
  11 + "Ant Design"
  12 + ],
5 13 "repository": {
6   - "type": "git",
7   - "url": "git@github.com:alibaba/form-render.git"
  14 + "type": "gitlab",
  15 + "url": "http://gitlab.qgutech.com/third-party/x-render.git"
8 16 },
9 17 "license": "MIT",
10 18 "contributors": [
11 19 {
12   - "name": "Tw93",
13   - "email": "tw93@qq.com"
  20 + "name": "zhu",
  21 + "email": "zhuqin@qgutech.com"
14 22 },
15 23 {
16   - "name": "mankaiviky",
17   - "email": "mankaiviky@163.com"
  24 + "name": "xqq",
  25 + "email": "xingqingqing@qgutech.com"
18 26 },
19 27 {
20   - "name": "FateRiddle",
21   - "email": "fateriddle@gmail.com"
  28 + "name": "qiaoqitao",
  29 + "email": "qiaoqitao@qgutech.com"
22 30 }
23 31 ],
24   - "scripts": {},
25 32 "main": "lib/index.js",
26 33 "module": "es/index.js",
27   - "gitHooks": {
28   - "pre-commit": "lint-staged"
  34 + "files": [
  35 + "es",
  36 + "lib",
  37 + "package.json"
  38 + ],
  39 + "scripts": {
29 40 },
30 41 "lint-staged": {
31 42 "*.{js,jsx,less,md,json}": [
... ... @@ -37,36 +48,30 @@
37 48 },
38 49 "dependencies": {
39 50 "@ant-design/icons": "^4.0.2",
  51 + "@qx/icon-btn": "^0.0.1",
  52 + "antd-mobile": "^5.17.2",
40 53 "async-validator": "^3.5.1",
  54 + "classnames": "^2.3.1",
41 55 "color": "^3.1.2",
42 56 "dingtalk-jsapi": "^3.0.9",
43 57 "lodash-es": "^4.17.21",
44 58 "moment": "^2.24.0",
45   - "nanoid": "^3.1.20",
46 59 "rc-color-picker": "^1.2.6",
47 60 "smooth-scroll": "^16.1.3",
48 61 "virtualizedtableforantd4": "^1.1.2"
49 62 },
  63 + "devDependencies": {
  64 + "@umijs/plugin-antd-mobile": "^1.2.0",
  65 + "deep-equal": "^2.0.3",
  66 + "rollup-plugin-copy": "^3.4.0"
  67 + },
50 68 "peerDependencies": {
51 69 "antd": "4.x",
52 70 "react": ">=16.8.0",
53 71 "react-dom": ">=16.8.0"
54 72 },
55   - "devDependencies": {
56   - "deep-equal": "^2.0.3",
57   - "rollup-plugin-copy": "^3.4.0"
  73 + "gitHooks": {
  74 + "pre-commit": "lint-staged"
58 75 },
59   - "keywords": [
60   - "Form",
61   - "FormRender",
62   - "Render",
63   - "XRender",
64   - "React",
65   - "Json Schema",
66   - "Ant Design"
67   - ],
68   - "homepage": "https://x-render.gitee.io/form-render",
69   - "bugs": {
70   - "url": "https://github.com/alibaba/x-render/issues"
71   - }
  76 + "sideEffect": false
72 77 }
... ...