@nocobase/client 0.7.2-alpha.7 → 0.7.4-alpha.4

package/lib/schema-component/antd/table-v2/Table.js

@@ -1,23 +1,29 @@
 "use strict";
 
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.components = exports.Table = void 0;
+exports.Table = void 0;
 
 var _icons = require("@ant-design/icons");
 
+var _sortable = require("@dnd-kit/sortable");
+
 var _css = require("@emotion/css");
 
 var _react = require("@formily/react");
 
+var _reactive = require("@formily/reactive");
+
+var _ahooks = require("ahooks");
+
 var _antd = require("antd");
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _react2 = _interopRequireDefault(require("react"));
-
-var _reactDragListview = _interopRequireDefault(require("react-drag-listview"));
+var _react2 = _interopRequireWildcard(require("react"));
 
 var _reactI18next = require("react-i18next");
 
@@ -27,28 +33,28 @@ var _2 = require("../../../");
 
 var _excluded = ["pagination", "useProps", "onChange"],
     _excluded2 = ["pagination"],
-    _excluded3 = ["dragSort", "showIndex", "onRowDragEnd", "onRowSelectionChange", "onChange", "rowSelection"];
+    _excluded3 = ["dragSort", "showIndex", "onRowSelectionChange", "onChange", "rowSelection", "rowKey", "required"];
 
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8;
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
-function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
+function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
+
 var isColumnComponent = function isColumnComponent(schema) {
   var _schema$xComponent;
 
@@ -66,8 +72,7 @@ var useTableColumns = function useTableColumns() {
 
   var _useSchemaInitializer = (0, _2.useSchemaInitializer)(schema['x-initializer']),
       exists = _useSchemaInitializer.exists,
-      render = _useSchemaInitializer.render; // console.log('useTableColumns', exists);
-
+      render = _useSchemaInitializer.render;
 
   var columns = schema.reduceProperties(function (buf, s) {
     if (isColumnComponent(s)) {
@@ -82,7 +87,6 @@ var useTableColumns = function useTableColumns() {
       }
     }, []);
     var dataIndex = (collectionFields === null || collectionFields === void 0 ? void 0 : collectionFields.length) > 0 ? collectionFields[0].name : s.name;
-    console.log('useTableColumns', s.name, s, field.value);
     return {
       title: /*#__PURE__*/_react2.default.createElement(_react.RecursionField, {
         name: s.name,
@@ -98,7 +102,6 @@ var useTableColumns = function useTableColumns() {
 
         var index = (_field$value = field.value) === null || _field$value === void 0 ? void 0 : _field$value.indexOf(record); // console.log((Date.now() - start) / 1000);
 
-        console.log('useTableColumns.index', index, record);
         return /*#__PURE__*/_react2.default.createElement(_2.RecordIndexProvider, {
           index: index
         }, /*#__PURE__*/_react2.default.createElement(_2.RecordProvider, {
@@ -123,40 +126,41 @@ var useTableColumns = function useTableColumns() {
   });
 };
 
-var components = {
-  header: {
-    wrapper: function wrapper(props) {
-      return /*#__PURE__*/_react2.default.createElement(_.DndContext, null, /*#__PURE__*/_react2.default.createElement("thead", _objectSpread({}, props)));
-    },
-    cell: function cell(props) {
-      return /*#__PURE__*/_react2.default.createElement("th", _objectSpread(_objectSpread({}, props), {}, {
-        className: (0, _classnames.default)(props.className, (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n              max-width: 300px;\n              white-space: nowrap;\n              &:hover .general-schema-designer {\n                display: block;\n              }\n            "]))))
-      }));
-    }
-  },
-  body: {
-    wrapper: function wrapper(props) {
-      return /*#__PURE__*/_react2.default.createElement(_.DndContext, null, /*#__PURE__*/_react2.default.createElement("tbody", _objectSpread({}, props)));
-    },
-    row: function row(props) {
-      return /*#__PURE__*/_react2.default.createElement("tr", _objectSpread({}, props));
-    },
-    cell: function cell(props) {
-      return /*#__PURE__*/_react2.default.createElement("td", _objectSpread(_objectSpread({}, props), {}, {
-        className: (0, _classnames.default)(props.className, (0, _css.css)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n            max-width: 300px;\n            white-space: nowrap;\n            .nb-read-pretty-input-number {\n              text-align: right;\n            }\n          "]))))
-      }));
-    }
-  }
+var topActiveClass = (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  & > td {\n    border-top: 2px solid rgba(241, 139, 98, 0.6) !important;\n  }\n"])));
+var bottomActiveClass = (0, _css.css)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  & > td {\n    border-bottom: 2px solid rgba(241, 139, 98, 0.6) !important;\n  }\n"])));
+
+var SortableRow = function SortableRow(props) {
+  var _props$dataRowKey, _active$data$current$, _active$data$current, _over$data$current$so, _over$data$current;
+
+  var id = (_props$dataRowKey = props['data-row-key']) === null || _props$dataRowKey === void 0 ? void 0 : _props$dataRowKey.toString();
+
+  var _useSortable = (0, _sortable.useSortable)({
+    id: id
+  }),
+      setNodeRef = _useSortable.setNodeRef,
+      isOver = _useSortable.isOver,
+      active = _useSortable.active,
+      over = _useSortable.over;
+
+  var className = ((_active$data$current$ = active === null || active === void 0 ? void 0 : (_active$data$current = active.data.current) === null || _active$data$current === void 0 ? void 0 : _active$data$current.sortable.index) !== null && _active$data$current$ !== void 0 ? _active$data$current$ : -1) > ((_over$data$current$so = over === null || over === void 0 ? void 0 : (_over$data$current = over.data.current) === null || _over$data$current === void 0 ? void 0 : _over$data$current.sortable.index) !== null && _over$data$current$so !== void 0 ? _over$data$current$so : -1) ? topActiveClass : bottomActiveClass;
+  return /*#__PURE__*/_react2.default.createElement("tr", _objectSpread(_objectSpread({
+    ref: (active === null || active === void 0 ? void 0 : active.id) !== id ? setNodeRef : null
+  }, props), {}, {
+    className: (0, _classnames.default)(_defineProperty({}, className, active && isOver))
+  }));
 };
-exports.components = components;
 
-var SortHandle = function SortHandle() {
-  return /*#__PURE__*/_react2.default.createElement(_icons.MenuOutlined, {
-    className: 'drag-handle',
+var SortHandle = function SortHandle(props) {
+  var _useSortable2 = (0, _sortable.useSortable)({
+    id: props.id
+  }),
+      listeners = _useSortable2.listeners;
+
+  return /*#__PURE__*/_react2.default.createElement(_icons.MenuOutlined, _objectSpread(_objectSpread({}, listeners), {}, {
     style: {
       cursor: 'grab'
     }
-  });
+  }));
 };
 
 var TableIndex = function TableIndex(props) {
@@ -191,6 +195,25 @@ var usePaginationProps = function usePaginationProps(pagination1, pagination2) {
   }, pagination1), pagination2);
 };
 
+var useValidator = function useValidator(validator) {
+  var field = (0, _react.useField)();
+  (0, _react2.useEffect)(function () {
+    var dispose = (0, _reactive.reaction)(function () {
+      return field.value;
+    }, function (value) {
+      var message = validator(value);
+      field.setFeedback({
+        type: 'error',
+        code: 'ValidateError',
+        messages: message ? [message] : []
+      });
+    });
+    return function () {
+      dispose();
+    };
+  }, []);
+};
+
 var Table = (0, _react.observer)(function (props) {
   var _field$data, _field$value3, _field$value3$slice;
 
@@ -211,13 +234,92 @@ var Table = (0, _react.observer)(function (props) {
       dragSort = _others1$others$dragS === void 0 ? false : _others1$others$dragS,
       _others1$others$showI = _others1$others.showIndex,
       showIndex = _others1$others$showI === void 0 ? true : _others1$others$showI,
-      onRowDragEnd = _others1$others.onRowDragEnd,
       onRowSelectionChange = _others1$others.onRowSelectionChange,
       onTableChange = _others1$others.onChange,
       rowSelection = _others1$others.rowSelection,
+      rowKey = _others1$others.rowKey,
+      required = _others1$others.required,
       others = _objectWithoutProperties(_others1$others, _excluded3);
 
+  var onRowDragEnd = (0, _ahooks.useMemoizedFn)(others.onRowDragEnd || function () {});
   var paginationProps = usePaginationProps(pagination1, pagination2);
+  var requiredValidator = field.required || required;
+  (0, _react2.useEffect)(function () {
+    field.setValidator(function (value) {
+      if (requiredValidator) {
+        return Array.isArray(value) && value.length > 0 ? null : 'The field value is required';
+      }
+
+      return;
+    });
+  }, [requiredValidator]);
+  var components = (0, _react2.useMemo)(function () {
+    return {
+      header: {
+        wrapper: function wrapper(props) {
+          return /*#__PURE__*/_react2.default.createElement(_.DndContext, null, /*#__PURE__*/_react2.default.createElement("thead", _objectSpread({}, props)));
+        },
+        cell: function cell(props) {
+          return /*#__PURE__*/_react2.default.createElement("th", _objectSpread(_objectSpread({}, props), {}, {
+            className: (0, _classnames.default)(props.className, (0, _css.css)(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n                  max-width: 300px;\n                  white-space: nowrap;\n                  &:hover .general-schema-designer {\n                    display: block;\n                  }\n                "]))))
+          }));
+        }
+      },
+      body: {
+        wrapper: function wrapper(props) {
+          return /*#__PURE__*/_react2.default.createElement(_.DndContext, {
+            onDragEnd: function onDragEnd(e) {
+              var _e$active, _e$active$data$curren, _e$active$data$curren2, _e$over, _e$over$data$current, _e$over$data$current$;
+
+              if (!e.active || !e.over) {
+                console.warn('move cancel');
+                return;
+              }
+
+              var fromIndex = (_e$active = e.active) === null || _e$active === void 0 ? void 0 : (_e$active$data$curren = _e$active.data.current) === null || _e$active$data$curren === void 0 ? void 0 : (_e$active$data$curren2 = _e$active$data$curren.sortable) === null || _e$active$data$curren2 === void 0 ? void 0 : _e$active$data$curren2.index;
+              var toIndex = (_e$over = e.over) === null || _e$over === void 0 ? void 0 : (_e$over$data$current = _e$over.data.current) === null || _e$over$data$current === void 0 ? void 0 : (_e$over$data$current$ = _e$over$data$current.sortable) === null || _e$over$data$current$ === void 0 ? void 0 : _e$over$data$current$.index;
+              var from = field.value[fromIndex];
+              var to = field.value[toIndex];
+              field.move(fromIndex, toIndex);
+              onRowDragEnd({
+                fromIndex: fromIndex,
+                toIndex: toIndex,
+                from: from,
+                to: to
+              });
+            }
+          }, /*#__PURE__*/_react2.default.createElement("tbody", _objectSpread({}, props)));
+        },
+        row: function row(props) {
+          return /*#__PURE__*/_react2.default.createElement(SortableRow, _objectSpread({}, props));
+        },
+        cell: function cell(props) {
+          return /*#__PURE__*/_react2.default.createElement("td", _objectSpread(_objectSpread({}, props), {}, {
+            className: (0, _classnames.default)(props.className, (0, _css.css)(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n                max-width: 300px;\n                white-space: nowrap;\n                .nb-read-pretty-input-number {\n                  text-align: right;\n                }\n              "]))))
+          }));
+        }
+      }
+    };
+  }, [field, onRowDragEnd, dragSort]);
+
+  var defaultRowKey = function defaultRowKey(record) {
+    var _field$value2, _field$value2$indexOf;
+
+    return (_field$value2 = field.value) === null || _field$value2 === void 0 ? void 0 : (_field$value2$indexOf = _field$value2.indexOf) === null || _field$value2$indexOf === void 0 ? void 0 : _field$value2$indexOf.call(_field$value2, record);
+  };
+
+  var getRowKey = function getRowKey(record) {
+    if (typeof rowKey === 'string') {
+      var _record$rowKey;
+
+      return (_record$rowKey = record[rowKey]) === null || _record$rowKey === void 0 ? void 0 : _record$rowKey.toString();
+    } else {
+      var _ref2;
+
+      return (_ref2 = (rowKey !== null && rowKey !== void 0 ? rowKey : defaultRowKey)(record)) === null || _ref2 === void 0 ? void 0 : _ref2.toString();
+    }
+  };
+
   var restProps = {
     rowSelection: rowSelection ? _objectSpread({
       type: 'checkbox',
@@ -242,62 +344,32 @@ var Table = (0, _react.observer)(function (props) {
         }
 
         return /*#__PURE__*/_react2.default.createElement("div", {
-          className: (0, _classnames.default)(checked ? 'checked' : null, (0, _css.css)(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n                    position: relative;\n                    display: flex;\n                    align-items: center;\n                    justify-content: space-evenly;\n                    padding-right: 8px;\n                    .nb-table-index {\n                      opacity: 0;\n                    }\n                    &:not(.checked) {\n                      .nb-table-index {\n                        opacity: 1;\n                      }\n                    }\n                    &:hover {\n                      .nb-table-index {\n                        opacity: 0;\n                      }\n                      .nb-origin-node {\n                        display: block;\n                      }\n                    }\n                  "]))))
+          className: (0, _classnames.default)(checked ? 'checked' : null, (0, _css.css)(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n                    position: relative;\n                    display: flex;\n                    align-items: center;\n                    justify-content: space-evenly;\n                    padding-right: 8px;\n                    .nb-table-index {\n                      opacity: 0;\n                    }\n                    &:not(.checked) {\n                      .nb-table-index {\n                        opacity: 1;\n                      }\n                    }\n                    &:hover {\n                      .nb-table-index {\n                        opacity: 0;\n                      }\n                      .nb-origin-node {\n                        display: block;\n                      }\n                    }\n                  "]))))
         }, /*#__PURE__*/_react2.default.createElement("div", {
-          className: (0, _classnames.default)(checked ? 'checked' : null, (0, _css.css)(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n                      position: relative;\n                      display: flex;\n                      align-items: center;\n                      justify-content: space-evenly;\n                    "]))))
-        }, dragSort && /*#__PURE__*/_react2.default.createElement(SortHandle, null), showIndex && /*#__PURE__*/_react2.default.createElement(TableIndex, {
+          className: (0, _classnames.default)(checked ? 'checked' : null, (0, _css.css)(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n                      position: relative;\n                      display: flex;\n                      align-items: center;\n                      justify-content: space-evenly;\n                    "]))))
+        }, dragSort && /*#__PURE__*/_react2.default.createElement(SortHandle, {
+          id: getRowKey(record)
+        }), showIndex && /*#__PURE__*/_react2.default.createElement(TableIndex, {
           index: index
         })), /*#__PURE__*/_react2.default.createElement("div", {
-          className: (0, _classnames.default)('nb-origin-node', checked ? 'checked' : null, (0, _css.css)(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n                      position: absolute;\n                      right: 50%;\n                      transform: translateX(50%);\n                      &:not(.checked) {\n                        display: none;\n                      }\n                    "]))))
+          className: (0, _classnames.default)('nb-origin-node', checked ? 'checked' : null, (0, _css.css)(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral(["\n                      position: absolute;\n                      right: 50%;\n                      transform: translateX(50%);\n                      &:not(.checked) {\n                        display: none;\n                      }\n                    "]))))
         }, originNode));
       }
     }, rowSelection) : undefined
   };
-
-  var defaultRowKey = function defaultRowKey(record) {
-    var _field$value2, _field$value2$indexOf;
-
-    return (_field$value2 = field.value) === null || _field$value2 === void 0 ? void 0 : (_field$value2$indexOf = _field$value2.indexOf) === null || _field$value2$indexOf === void 0 ? void 0 : _field$value2$indexOf.call(_field$value2, record);
-  };
-
+  var SortableWrapper = (0, _react2.useCallback)(function (_ref3) {
+    var children = _ref3.children;
+    return dragSort ? /*#__PURE__*/_react2.default.createElement(_sortable.SortableContext, {
+      items: field.value.map(getRowKey),
+      children: children
+    }) : /*#__PURE__*/_react2.default.createElement(_react2.default.Fragment, {
+      children: children
+    });
+  }, [field, dragSort]);
   return /*#__PURE__*/_react2.default.createElement("div", {
-    className: (0, _css.css)(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n        .ant-table {\n          overflow-x: auto;\n          overflow-y: hidden;\n        }\n      "])))
-  }, /*#__PURE__*/_react2.default.createElement(_reactDragListview.default, {
-    handleSelector: '.drag-handle',
-    onDragEnd: function () {
-      var _onDragEnd = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(fromIndex, toIndex) {
-        var from, to;
-        return regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                from = field.value[fromIndex];
-                to = field.value[toIndex];
-                field.move(fromIndex, toIndex);
-                onRowDragEnd({
-                  fromIndex: fromIndex,
-                  toIndex: toIndex,
-                  from: from,
-                  to: to
-                });
-
-              case 4:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee);
-      }));
-
-      function onDragEnd(_x, _x2) {
-        return _onDragEnd.apply(this, arguments);
-      }
-
-      return onDragEnd;
-    }(),
-    lineClassName: (0, _css.css)(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral(["\n          border-bottom: 2px solid rgba(241, 139, 98, 0.6) !important;\n        "])))
-  }, /*#__PURE__*/_react2.default.createElement(_antd.Table, _objectSpread(_objectSpread(_objectSpread({
-    rowKey: defaultRowKey
+    className: (0, _css.css)(_templateObject8 || (_templateObject8 = _taggedTemplateLiteral(["\n        .ant-table {\n          overflow-x: auto;\n          overflow-y: hidden;\n        }\n      "])))
+  }, /*#__PURE__*/_react2.default.createElement(SortableWrapper, null, /*#__PURE__*/_react2.default.createElement(_antd.Table, _objectSpread(_objectSpread(_objectSpread({
+    rowKey: rowKey !== null && rowKey !== void 0 ? rowKey : defaultRowKey
   }, others), restProps), {}, {
     pagination: paginationProps,
     components: components,
@@ -308,6 +380,12 @@ var Table = (0, _react.observer)(function (props) {
     // scroll={{ x: 12 * 300 + 80 }}
     columns: columns,
     dataSource: field === null || field === void 0 ? void 0 : (_field$value3 = field.value) === null || _field$value3 === void 0 ? void 0 : (_field$value3$slice = _field$value3.slice) === null || _field$value3$slice === void 0 ? void 0 : _field$value3$slice.call(_field$value3)
-  }))));
+  }))), field.errors.length > 0 && /*#__PURE__*/_react2.default.createElement("div", {
+    className: "ant-formily-item-error-help ant-formily-item-help ant-formily-item-help-enter ant-formily-item-help-enter-active"
+  }, field.errors.map(function (error) {
+    return error.messages.map(function (message) {
+      return /*#__PURE__*/_react2.default.createElement("div", null, message);
+    });
+  })));
 });
 exports.Table = Table;

package/lib/schema-component/antd/table-v2/TableField.js

@@ -51,6 +51,9 @@ var TableField = (0, _react.observer)(function (props) {
       ctx.field.added.add(fieldSchema.name);
     }
   }, []);
+  (0, _react2.useEffect)(function () {
+    field.decoratorProps.asterisk = fieldSchema.required;
+  }, [fieldSchema.required]);
   return /*#__PURE__*/_react2.default.createElement("div", null, props.children);
 });
 exports.TableField = TableField;

package/lib/schema-component/antd/tabs/Tabs.Designer.js

@@ -39,28 +39,39 @@ var TabsDesigner = function TabsDesigner() {
       properties: {
         title: {
           title: t('Tab name'),
+          required: true,
           'x-decorator': 'FormItem',
           'x-component': 'Input',
           'x-component-props': {}
+        },
+        icon: {
+          title: t('Icon'),
+          'x-decorator': 'FormItem',
+          'x-component': 'IconPicker',
+          'x-component-props': {}
         }
       }
     },
     initialValues: {
-      title: field.title
+      title: field.title,
+      icon: field.componentProps.icon
     },
     onSubmit: function onSubmit(_ref) {
-      var title = _ref.title;
+      var _schema;
 
-      if (title) {
-        var _schema;
-
-        fieldSchema.title = title;
-        field.title = title;
-        dn.emit('patch', {
-          schema: (_schema = {}, _defineProperty(_schema, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema, "title", title), _schema)
-        });
-        dn.refresh();
-      }
+      var title = _ref.title,
+          icon = _ref.icon;
+      var props = fieldSchema['x-component-props'] || {};
+      fieldSchema.title = title;
+      field.title = title;
+      props.icon = icon;
+      field.componentProps.icon = icon;
+      fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
+      fieldSchema['x-component-props'].icon = icon;
+      dn.emit('patch', {
+        schema: (_schema = {}, _defineProperty(_schema, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema, "title", title), _defineProperty(_schema, 'x-component-props', props), _schema)
+      });
+      dn.refresh();
     }
   }), /*#__PURE__*/_react2.default.createElement(_2.SchemaSettings.Divider, null), /*#__PURE__*/_react2.default.createElement(_2.SchemaSettings.Remove, null));
 };

package/lib/schema-component/antd/tabs/Tabs.js

@@ -15,6 +15,8 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _react2 = _interopRequireDefault(require("react"));
 
+var _icon = require("../../../icon");
+
 var _schemaInitializer = require("../../../schema-initializer");
 
 var _common = require("../../common");
@@ -61,6 +63,11 @@ Tabs.TabPane = (0, _react.observer)(function (props) {
   var field = (0, _react.useField)();
   return /*#__PURE__*/_react2.default.createElement(_common.SortableItem, {
     className: (0, _classnames.default)('nb-action-link', designerCss, props.className)
-  }, props.tab || field.title, /*#__PURE__*/_react2.default.createElement(Designer, null));
+  }, props.icon && /*#__PURE__*/_react2.default.createElement(_icon.Icon, {
+    style: {
+      marginRight: 2
+    },
+    type: props.icon
+  }), " ", props.tab || field.title, /*#__PURE__*/_react2.default.createElement(Designer, null));
 });
 Tabs.Designer = _Tabs.TabsDesigner;

package/lib/schema-component/antd/time-picker/ReadPretty.js

@@ -11,17 +11,24 @@ var _shared = require("@formily/shared");
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _moment = _interopRequireDefault(require("moment"));
+
 var _react = _interopRequireDefault(require("react"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var ReadPretty = function ReadPretty(props) {
-  var placeholder = props.placeholder;
+  var value = props.value,
+      _props$format = props.format,
+      format = _props$format === void 0 ? 'HH:mm:ss' : _props$format;
   var prefixCls = (0, _builtins__.usePrefixCls)('description-text', props);
+  var values = (0, _shared.toArr)(value);
 
   var getLabels = function getLabels() {
-    var labels = (0, _builtins__.formatMomentValue)(props.value, props.format, placeholder);
-    return (0, _shared.isArr)(labels) ? labels.join('~') : labels;
+    var labels = values.map(function (v) {
+      return (0, _moment.default)(v, 'HH:mm:ss').format(format);
+    });
+    return labels.join('~');
   };
 
   return /*#__PURE__*/_react.default.createElement("div", {

package/lib/schema-component/core/DesignableSwitch.js

@@ -15,6 +15,8 @@ var _ = require("..");
 
 var _pluginManager = require("../../plugin-manager");
 
+var _reactHotkeysHook = require("react-hotkeys-hook");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var DesignableSwitch = function DesignableSwitch() {
@@ -29,12 +31,17 @@ var DesignableSwitch = function DesignableSwitch() {
 
   if (designable) {
     style['backgroundColor'] = '#f18b62';
-  }
+  } // 快捷键切换编辑状态
+
 
+  (0, _reactHotkeysHook.useHotkeys)('Ctrl+Shift+U', function () {
+    return setDesignable(!designable);
+  }, [designable]);
   return /*#__PURE__*/_react.default.createElement(_pluginManager.PluginManager.Toolbar.Item, {
     selected: designable,
     icon: /*#__PURE__*/_react.default.createElement(_icons.HighlightOutlined, null),
     title: t('UI Editor'),
+    subtitle: 'Ctrl+Shift+U',
     style: style,
     onClick: function onClick() {
       setDesignable(!designable);

package/lib/schema-component/hooks/useDesignable.js

@@ -755,6 +755,27 @@ var Designable = /*#__PURE__*/function () {
           wrap = _options$wrap4 === void 0 ? defaultWrap : _options$wrap4,
           breakRemoveOn = options.breakRemoveOn,
           removeParentsIfNoChildren = options.removeParentsIfNoChildren;
+      var order = 0;
+      var newOrder = 0;
+      var start = false;
+      var properties = {};
+      this.current.parent.mapProperties(function (property, key) {
+        property['x-index'] = order;
+
+        if (key === _this4.current.name) {
+          ++order;
+          newOrder = order;
+          start = true;
+        }
+
+        ++order;
+
+        if (start && key !== _this4.current.name) {
+          properties[key] = property;
+
+          _this4.current.parent.removeProperty(key);
+        }
+      });
 
       if (_react.Schema.isSchemaInstance(schema)) {
         if (this.parentsIn(schema)) {
@@ -778,27 +799,6 @@ var Designable = /*#__PURE__*/function () {
         schema = (0, _cloneDeep.default)(schema);
       }
 
-      var order = 0;
-      var newOrder = 0;
-      var start = false;
-      var properties = {};
-      this.current.parent.mapProperties(function (property, key) {
-        property['x-index'] = order;
-
-        if (key === _this4.current.name) {
-          ++order;
-          newOrder = order;
-          start = true;
-        }
-
-        ++order;
-
-        if (start && key !== _this4.current.name) {
-          properties[key] = property;
-
-          _this4.current.parent.removeProperty(key);
-        }
-      });
       this.prepareProperty(schema);
       var wrapped = wrap(schema);
       var s = this.current.parent.addProperty(wrapped.name || (0, _shared.uid)(), wrapped);

package/lib/schema-component/hooks/useProps.js

@@ -17,7 +17,7 @@ var useProps = function useProps(props, options) {
   var useProps = props.useProps,
       props1 = _objectWithoutProperties(props, _excluded);
 
-  var props2 = (useProps === null || useProps === void 0 ? void 0 : useProps()) || {};
+  var props2 = typeof useProps === 'function' ? useProps() : {};
   return (0, _shared.merge)(props1 || {}, props2, options);
 };
 

package/lib/schema-initializer/buttons/FormItemInitializers.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.FormItemInitializers = void 0;
 
+var _lodash = require("lodash");
+
 var _react = _interopRequireDefault(require("react"));
 
 var _reactI18next = require("react-i18next");
@@ -22,14 +24,24 @@ var FormItemInitializers = function FormItemInitializers(props) {
 
   var insertPosition = props.insertPosition,
       component = props.component;
+  var associationFields = (0, _utils.useAssociatedFormItemInitializerFields)({
+    readPretty: true,
+    block: 'Form'
+  });
   return /*#__PURE__*/_react.default.createElement(_SchemaInitializer.SchemaInitializer.Button, {
     wrap: _utils.gridRowColWrap,
     icon: 'SettingOutlined',
-    items: [{
+    items: (0, _lodash.union)([{
       type: 'itemGroup',
       title: t('Display fields'),
       children: (0, _utils.useFormItemInitializerFields)()
+    }], associationFields.length > 0 ? [{
+      type: 'divider'
     }, {
+      type: 'itemGroup',
+      title: t('Display association fields'),
+      children: associationFields
+    }] : [], [{
       type: 'divider'
     }, {
       type: 'item',
@@ -45,7 +57,7 @@ var FormItemInitializers = function FormItemInitializers(props) {
           content: t('This is a demo text, **supports Markdown syntax**.')
         }
       }
-    }],
+    }]),
     insertPosition: insertPosition,
     component: component,
     title: component ? null : t('Configure fields')