@nocobase/client 0.7.3-alpha.1 → 0.7.4-alpha.7

package/lib/schema-component/antd/form-item/FormItem.js

@@ -1,7 +1,5 @@
 "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
 });
@@ -15,6 +13,8 @@ var _react = require("@formily/react");
 
 var _shared = require("@formily/shared");
 
+var _lodash = _interopRequireDefault(require("lodash"));
+
 var _react2 = _interopRequireDefault(require("react"));
 
 var _reactI18next = require("react-i18next");
@@ -31,14 +31,8 @@ var _blockItem = require("../block-item");
 
 var _shared2 = require("../input/shared");
 
-var _ = _interopRequireWildcard(require("lodash"));
-
 var _templateObject;
 
-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 _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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
@@ -81,7 +75,7 @@ var FormItem = function FormItem(props) {
 exports.FormItem = FormItem;
 
 FormItem.Designer = function (props) {
-  var _interfaceConfig$vali, _collectionField$uiSc, _collectionField$uiSc2, _fieldSchema$xDecora, _fieldSchema$xCompon, _field$componentProps, _field$componentProps2;
+  var _interfaceConfig$vali, _collectionField$uiSc, _collectionField$uiSc2, _fieldSchema$xDecora, _collectionField$uiSc4, _fieldSchema$xCompon, _field$componentProps, _field$componentProps2;
 
   var _useCollectionManager = (0, _collectionManager.useCollectionManager)(),
       getCollectionFields = _useCollectionManager.getCollectionFields,
@@ -236,7 +230,7 @@ FormItem.Designer = function (props) {
   }), !field.readPretty && fieldSchema['x-component'] !== 'FormField' && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SwitchItem, {
     key: "required",
     title: t('Required'),
-    checked: field.required,
+    checked: fieldSchema.required,
     onChange: function onChange(required) {
       var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
 
@@ -346,7 +340,7 @@ FormItem.Designer = function (props) {
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
           var _rule = _step.value;
-          rules.push(_.pickBy(_rule, _.identity));
+          rules.push(_lodash.default.pickBy(_rule, _lodash.default.identity));
         }
       } catch (err) {
         _iterator.e(err);
@@ -383,7 +377,7 @@ FormItem.Designer = function (props) {
         }
       }
 
-      var concatValidator = _.concat([], (collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc3 = collectionField.uiSchema) === null || _collectionField$uiSc3 === void 0 ? void 0 : _collectionField$uiSc3['x-validator']) || [], rules);
+      var concatValidator = _lodash.default.concat([], (collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc3 = collectionField.uiSchema) === null || _collectionField$uiSc3 === void 0 ? void 0 : _collectionField$uiSc3['x-validator']) || [], rules);
 
       field.validator = concatValidator;
       fieldSchema['x-validator'] = rules;
@@ -393,6 +387,38 @@ FormItem.Designer = function (props) {
       });
       refresh();
     }
+  }), form && !(form === null || form === void 0 ? void 0 : form.readPretty) && (collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc4 = collectionField.uiSchema) === null || _collectionField$uiSc4 === void 0 ? void 0 : _collectionField$uiSc4.type) && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.ModalItem, {
+    title: t('Set default value'),
+    components: {
+      ArrayCollapse: _antd.ArrayCollapse,
+      FormLayout: _antd.FormLayout
+    },
+    schema: {
+      type: 'object',
+      title: t('Set default value'),
+      properties: {
+        default: _objectSpread(_objectSpread({}, collectionField.uiSchema), {}, {
+          name: 'default',
+          title: t('Default value'),
+          'x-decorator': 'FormItem',
+          default: fieldSchema.default || collectionField.defaultValue
+        })
+      }
+    },
+    onSubmit: function onSubmit(v) {
+      var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
+
+      if (field.value !== v.default) {
+        field.value = v.default;
+      }
+
+      fieldSchema.default = v.default;
+      schema.default = v.default;
+      dn.emit('patch', {
+        schema: schema
+      });
+      refresh();
+    }
   }), form && !isSubFormAssocitionField && ['o2o', 'oho', 'obo', 'o2m'].includes(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SelectItem, {
     title: t('Field component'),
     options: (collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) === 'o2m' ? [{
@@ -501,15 +527,13 @@ FormItem.Designer = function (props) {
     options: options,
     value: field === null || field === void 0 ? void 0 : (_field$componentProps = field.componentProps) === null || _field$componentProps === void 0 ? void 0 : (_field$componentProps2 = _field$componentProps.fieldNames) === null || _field$componentProps2 === void 0 ? void 0 : _field$componentProps2.label,
     onChange: function onChange(label) {
+      var _collectionField$uiSc5, _collectionField$uiSc6;
+
       var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
 
-      var fieldNames = _objectSpread(_objectSpread({}, field.componentProps.fieldNames), {}, {
+      var fieldNames = _objectSpread(_objectSpread(_objectSpread({}, collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc5 = collectionField.uiSchema) === null || _collectionField$uiSc5 === void 0 ? void 0 : (_collectionField$uiSc6 = _collectionField$uiSc5['x-component-props']) === null || _collectionField$uiSc6 === void 0 ? void 0 : _collectionField$uiSc6['fieldNames']), field.componentProps.fieldNames), {}, {
         label: label
-      }); // if (fieldSchema['x-component-props']?.['field']?.['uiSchema']?.['x-component-props']) {
-      //   fieldSchema['x-component-props']['field']['uiSchema']['x-component-props']['fieldNames'] = fieldNames;
-      // } else {
-      // }
-
+      });
 
       fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
       fieldSchema['x-component-props']['fieldNames'] = fieldNames;

package/lib/schema-component/antd/input-number/InputNumber.js

@@ -5,12 +5,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.InputNumber = void 0;
 
-var _react = _interopRequireDefault(require("react"));
-
-var _react2 = require("@formily/react");
+var _react = require("@formily/react");
 
 var _antd = require("antd");
 
+var _react2 = _interopRequireDefault(require("react"));
+
 var _ReadPretty = require("./ReadPretty");
 
 var _excluded = ["onChange"];
@@ -27,7 +27,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
-var InputNumber = (0, _react2.connect)(function (props) {
+var InputNumber = (0, _react.connect)(function (props) {
   var onChange = props.onChange,
       others = _objectWithoutProperties(props, _excluded);
 
@@ -35,10 +35,10 @@ var InputNumber = (0, _react2.connect)(function (props) {
     onChange(parseFloat(v));
   };
 
-  return /*#__PURE__*/_react.default.createElement(_antd.InputNumber, _objectSpread({
+  return /*#__PURE__*/_react2.default.createElement(_antd.InputNumber, _objectSpread({
     onChange: handleChange
   }, others));
-}, (0, _react2.mapReadPretty)(_ReadPretty.ReadPretty));
+}, (0, _react.mapReadPretty)(_ReadPretty.ReadPretty));
 exports.InputNumber = InputNumber;
 var _default = InputNumber;
 exports.default = _default;

package/lib/schema-component/antd/input-number/ReadPretty.js

@@ -7,9 +7,7 @@ exports.ReadPretty = void 0;
 
 var _shared = require("@formily/shared");
 
-var _MiniDecimal = require("rc-input-number/lib/utils/MiniDecimal");
-
-var _numberUtil = require("rc-input-number/lib/utils/numberUtil");
+var _client = require("@nocobase/utils/client");
 
 var _react = _interopRequireDefault(require("react"));
 
@@ -25,10 +23,9 @@ var ReadPretty = function ReadPretty(props) {
     return /*#__PURE__*/_react.default.createElement("div", null);
   }
 
-  var precision = Math.max((0, _numberUtil.getNumberPrecision)(String(value)), (0, _numberUtil.getNumberPrecision)(step));
   return /*#__PURE__*/_react.default.createElement("div", {
     className: 'nb-read-pretty-input-number'
-  }, addonBefore, (0, _MiniDecimal.toFixed)(String(value), '.', precision), addonAfter);
+  }, addonBefore, (0, _client.toFixedByStep)(value, step), addonAfter);
 };
 
 exports.ReadPretty = ReadPretty;

package/lib/schema-component/antd/record-picker/InputRecordPicker.js

@@ -11,6 +11,8 @@ var _react = require("@formily/react");
 
 var _antd = require("antd");
 
+var _lodash = require("lodash");
+
 var _react2 = _interopRequireWildcard(require("react"));
 
 var _TableSelectorProvider = require("../../../block-provider/TableSelectorProvider");
@@ -25,8 +27,6 @@ var _action = require("../action");
 
 var _useFieldNames = require("./useFieldNames");
 
-var _lodash = require("lodash");
-
 var _excluded = ["onRowSelectionChange", "rowKey"],
     _excluded2 = ["value", "multiple", "onChange"];
 

package/lib/schema-component/antd/record-picker/ReadPrettyRecordPicker.js

@@ -93,7 +93,7 @@ var ReadPrettyRecordPicker = (0, _react.observer)(function (props) {
           setRecord(record);
           ellipsisWithTooltipRef === null || ellipsisWithTooltipRef === void 0 ? void 0 : (_ellipsisWithTooltipR = ellipsisWithTooltipRef.current) === null || _ellipsisWithTooltipR === void 0 ? void 0 : _ellipsisWithTooltipR.setPopoverVisible(false);
         }
-      }, compile(record === null || record === void 0 ? void 0 : record[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.label) || 'label']))), index < arr.length - 1 ? /*#__PURE__*/_react2.default.createElement("span", {
+      }, compile(record === null || record === void 0 ? void 0 : record[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.label) || 'label']) || (record === null || record === void 0 ? void 0 : record[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value) || 'value']) || (record === null || record === void 0 ? void 0 : record.id))), index < arr.length - 1 ? /*#__PURE__*/_react2.default.createElement("span", {
         style: {
           marginRight: 4,
           color: '#aaa'

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

@@ -128,7 +128,9 @@ var TableColumnDesigner = function TableColumnDesigner(props) {
     options: options,
     value: fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames['label'],
     onChange: function onChange(label) {
-      var fieldNames = _objectSpread(_objectSpread({}, fieldSchema['x-component-props']['fieldNames']), {}, {
+      var _collectionField$uiSc2, _fieldSchema$xCompon2;
+
+      var fieldNames = _objectSpread(_objectSpread(_objectSpread({}, collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc2 = collectionField.uiSchema) === null || _collectionField$uiSc2 === void 0 ? void 0 : _collectionField$uiSc2['x-component-props']['fieldNames']), fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon2 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon2 === void 0 ? void 0 : _fieldSchema$xCompon2['fieldNames']), {}, {
         label: label
       });
 

package/lib/schema-component/antd/table-v2/Table.d.ts

@@ -1,12 +1 @@
-export declare const components: {
-    header: {
-        wrapper: (props: any) => JSX.Element;
-        cell: (props: any) => JSX.Element;
-    };
-    body: {
-        wrapper: (props: any) => JSX.Element;
-        row: (props: any) => JSX.Element;
-        cell: (props: any) => JSX.Element;
-    };
-};
 export declare const Table: any;

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;
 
@@ -120,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) {
@@ -188,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;
 
@@ -208,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',
@@ -239,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,
@@ -305,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;