@nocobase/client 0.9.4-alpha.2 → 0.10.0-alpha.3

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

@@ -6,10 +6,14 @@ Object.defineProperty(exports, "__esModule", {
 exports.TableColumnDesigner = void 0;
 var _react = require("@formily/react");
 var _react2 = _interopRequireDefault(require("react"));
+var _lodash = require("lodash");
 var _reactI18next = require("react-i18next");
 var _collectionManager = require("../../../collection-manager");
 var _schemaSettings = require("../../../schema-settings");
 var _hooks = require("../../hooks");
+var _hooks2 = require("../association-field/hooks");
+var _FilterDynamicComponent = require("./FilterDynamicComponent");
+var _filter = require("../filter");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function 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; }
@@ -38,7 +42,7 @@ var useLabelFields = function useLabelFields(collectionName) {
   });
 };
 var TableColumnDesigner = function TableColumnDesigner(props) {
-  var _fieldSchema$xCompon, _uiSchema$xComponent, _collectionField$targ, _collectionField$uiSc, _columnSchema$xCompo, _fieldSchema$xCompon2;
+  var _fieldSchema$xCompon, _uiSchema$xComponent, _collectionField$targ, _fieldSchema$xCompon2, _fieldSchema$xCompon3, _fieldSchema$xCompon4, _collectionField$uiSc, _columnSchema$xCompo, _fieldSchema$xCompon5;
   var uiSchema = props.uiSchema,
     fieldSchema = props.fieldSchema,
     collectionField = props.collectionField;
@@ -56,6 +60,19 @@ var TableColumnDesigner = function TableColumnDesigner(props) {
   var intefaceCfg = getInterface(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface);
   var targetCollection = getCollection(collectionField === null || collectionField === void 0 ? void 0 : collectionField.target);
   var isFileField = isFileCollection(targetCollection);
+  var isSubTableColumn = ['QuickEdit', 'FormItem'].includes(fieldSchema['x-decorator']);
+  var _useAssociationFieldC = (0, _hooks2.useAssociationFieldContext)(),
+    currentMode = _useAssociationFieldC.currentMode,
+    tableField = _useAssociationFieldC.field;
+  var defaultFilter = (fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon2 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon2 === void 0 ? void 0 : (_fieldSchema$xCompon3 = _fieldSchema$xCompon2.service) === null || _fieldSchema$xCompon3 === void 0 ? void 0 : (_fieldSchema$xCompon4 = _fieldSchema$xCompon3.params) === null || _fieldSchema$xCompon4 === void 0 ? void 0 : _fieldSchema$xCompon4.filter) || {};
+  var dataSource = (0, _collectionManager.useCollectionFilterOptions)(collectionField === null || collectionField === void 0 ? void 0 : collectionField.target);
+  var readOnlyMode = 'editable';
+  if (fieldSchema['x-disabled'] === true) {
+    readOnlyMode = 'readonly';
+  }
+  if (fieldSchema['x-read-pretty'] === true) {
+    readOnlyMode = 'read-pretty';
+  }
   return /*#__PURE__*/_react2.default.createElement(_schemaSettings.GeneralSchemaDesigner, {
     disableInitializer: true
   }, /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.ModalItem, {
@@ -88,6 +105,40 @@ var TableColumnDesigner = function TableColumnDesigner(props) {
       }
       dn.refresh();
     }
+  }), currentMode && !field.readPretty && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.ModalItem, {
+    title: t('Set the data scope'),
+    schema: {
+      type: 'object',
+      title: t('Set the data scope'),
+      properties: {
+        filter: {
+          default: defaultFilter,
+          enum: dataSource,
+          'x-component': 'Filter',
+          'x-component-props': {
+            dynamicComponent: function dynamicComponent(props) {
+              return (0, _FilterDynamicComponent.FilterDynamicComponent)(_objectSpread({}, props));
+            }
+          }
+        }
+      }
+    },
+    onSubmit: function onSubmit(_ref2) {
+      var _field$path, _field$path2, _schema;
+      var filter = _ref2.filter;
+      filter = (0, _filter.removeNullCondition)(filter);
+      (0, _lodash.set)(field.componentProps, 'service.params.filter', filter);
+      fieldSchema['x-component-props'] = field.componentProps;
+      var path = (_field$path = field.path) === null || _field$path === void 0 ? void 0 : _field$path.splice(((_field$path2 = field.path) === null || _field$path2 === void 0 ? void 0 : _field$path2.length) - 1, 1);
+      tableField === null || tableField === void 0 ? void 0 : tableField.value.map(function (_, index) {
+        field.form.query("".concat(path.concat("".concat(index, ".") + fieldSchema.name))).take(function (f) {
+          (0, _lodash.set)(f.componentProps, 'service.params.filter', filter);
+        });
+      });
+      dn.emit('patch', {
+        schema: (_schema = {}, _defineProperty(_schema, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema, 'x-component-props', field.componentProps), _schema)
+      });
+    }
   }), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.ModalItem, {
     title: t('Column width'),
     schema: {
@@ -102,8 +153,8 @@ var TableColumnDesigner = function TableColumnDesigner(props) {
         }
       }
     },
-    onSubmit: function onSubmit(_ref2) {
-      var width = _ref2.width;
+    onSubmit: function onSubmit(_ref3) {
+      var width = _ref3.width;
       var props = columnSchema['x-component-props'] || {};
       props['width'] = width;
       var schema = _defineProperty({}, 'x-uid', columnSchema['x-uid']);
@@ -115,7 +166,7 @@ var TableColumnDesigner = function TableColumnDesigner(props) {
       });
       dn.refresh();
     }
-  }), intefaceCfg && intefaceCfg.sortable === true && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SwitchItem, {
+  }), intefaceCfg && intefaceCfg.sortable === true && !currentMode && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SwitchItem, {
     title: t('Sortable'),
     checked: field.componentProps.sorter,
     onChange: function onChange(v) {
@@ -130,9 +181,9 @@ var TableColumnDesigner = function TableColumnDesigner(props) {
       });
       dn.refresh();
     }
-  }), ['linkTo', 'm2m', 'm2o', 'o2m', 'obo', 'oho', 'snapshot', 'createdBy', 'updatedBy'].includes(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) && !isFileField && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SwitchItem, {
+  }), ['linkTo', 'm2m', 'm2o', 'o2m', 'obo', 'oho', 'snapshot', 'createdBy', 'updatedBy'].includes(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) && !isFileField && readOnlyMode === 'read-pretty' && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SwitchItem, {
     title: t('Enable link'),
-    checked: ((_fieldSchema$xCompon2 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon2 === void 0 ? void 0 : _fieldSchema$xCompon2.enableLink) !== false,
+    checked: ((_fieldSchema$xCompon5 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon5 === void 0 ? void 0 : _fieldSchema$xCompon5.enableLink) !== false,
     onChange: function onChange(flag) {
       fieldSchema['x-component-props'] = _objectSpread(_objectSpread({}, fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-component-props']), {}, {
         enableLink: flag
@@ -153,8 +204,8 @@ var TableColumnDesigner = function TableColumnDesigner(props) {
     options: options,
     value: fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames['label'],
     onChange: function onChange(label) {
-      var _collectionField$uiSc2, _fieldSchema$xCompon3;
-      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$xCompon3 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon3 === void 0 ? void 0 : _fieldSchema$xCompon3['fieldNames']), {}, {
+      var _collectionField$uiSc2, _fieldSchema$xCompon6;
+      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$xCompon6 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon6 === void 0 ? void 0 : _fieldSchema$xCompon6['fieldNames']), {}, {
         label: label
       });
       fieldSchema['x-component-props']['fieldNames'] = fieldNames;
@@ -169,8 +220,94 @@ var TableColumnDesigner = function TableColumnDesigner(props) {
       });
       dn.refresh();
     }
+  }), isSubTableColumn && !field.readPretty && !(uiSchema === null || uiSchema === void 0 ? void 0 : uiSchema['x-read-pretty']) && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SwitchItem, {
+    key: "required",
+    title: t('Required'),
+    checked: fieldSchema.required,
+    onChange: function onChange(required) {
+      var _field$path3, _field$path4;
+      var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
+      fieldSchema['required'] = required;
+      schema['required'] = required;
+      var path = (_field$path3 = field.path) === null || _field$path3 === void 0 ? void 0 : _field$path3.splice(((_field$path4 = field.path) === null || _field$path4 === void 0 ? void 0 : _field$path4.length) - 1, 1);
+      tableField === null || tableField === void 0 ? void 0 : tableField.value.map(function (_, index) {
+        field.form.query("".concat(path.concat("".concat(index, ".") + fieldSchema.name))).take(function (f) {
+          f.required = required;
+        });
+      });
+      dn.emit('patch', {
+        schema: schema
+      });
+      dn.refresh();
+    }
+  }), isSubTableColumn && !(field === null || field === void 0 ? void 0 : field.readPretty) && (collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) !== 'o2m' && !(0, _schemaSettings.isPatternDisabled)(fieldSchema) && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SelectItem, {
+    key: "pattern",
+    title: t('Pattern'),
+    options: [{
+      label: t('Editable'),
+      value: 'editable'
+    }, {
+      label: t('Readonly'),
+      value: 'readonly'
+    }, {
+      label: t('Easy-reading'),
+      value: 'read-pretty'
+    }],
+    value: readOnlyMode,
+    onChange: function onChange(v) {
+      var _field$path5, _field$path6;
+      var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
+      var path = (_field$path5 = field.path) === null || _field$path5 === void 0 ? void 0 : _field$path5.splice(((_field$path6 = field.path) === null || _field$path6 === void 0 ? void 0 : _field$path6.length) - 1, 1);
+      switch (v) {
+        case 'readonly':
+          {
+            fieldSchema['x-read-pretty'] = false;
+            fieldSchema['x-disabled'] = true;
+            schema['x-read-pretty'] = false;
+            schema['x-disabled'] = true;
+            tableField === null || tableField === void 0 ? void 0 : tableField.value.map(function (_, index) {
+              field.form.query("".concat(path.concat("".concat(index, ".") + fieldSchema.name))).take(function (f) {
+                f.readonly = true;
+                f.disabled = true;
+              });
+            });
+            break;
+          }
+        case 'read-pretty':
+          {
+            fieldSchema['x-read-pretty'] = true;
+            fieldSchema['x-disabled'] = false;
+            schema['x-read-pretty'] = true;
+            schema['x-disabled'] = false;
+            tableField === null || tableField === void 0 ? void 0 : tableField.value.map(function (_, index) {
+              field.form.query("".concat(path.concat("".concat(index, ".") + fieldSchema.name))).take(function (f) {
+                f.readPretty = true;
+              });
+            });
+            break;
+          }
+        default:
+          {
+            fieldSchema['x-read-pretty'] = false;
+            fieldSchema['x-disabled'] = false;
+            schema['x-read-pretty'] = false;
+            schema['x-disabled'] = false;
+            tableField === null || tableField === void 0 ? void 0 : tableField.value.map(function (_, index) {
+              field.form.query("".concat(path.concat("".concat(index, ".") + fieldSchema.name))).take(function (f) {
+                f.readPretty = false;
+                f.disabled + false;
+              });
+            });
+            break;
+          }
+      }
+      dn.emit('patch', {
+        schema: schema
+      });
+      dn.refresh();
+    }
   }), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.Divider, null), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.Remove, {
-    removeParentsIfNoChildren: true,
+    removeParentsIfNoChildren: !isSubTableColumn,
     breakRemoveOn: {
       'x-component': 'Grid'
     },

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

@@ -1 +1,2 @@
-export declare const TableColumn: (props: any) => JSX.Element;
+import React from 'react';
+export declare const TableColumn: (props: any) => React.JSX.Element;

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

@@ -1 +1,2 @@
-export declare const TableDesigner: () => JSX.Element;
+import React from 'react';
+export declare const TableDesigner: () => React.JSX.Element;

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

@@ -1 +1,2 @@
-export declare const TableIndex: (props: any) => JSX.Element;
+import React from 'react';
+export declare const TableIndex: (props: any) => React.JSX.Element;

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

@@ -7,6 +7,7 @@ exports.Table = void 0;
 var _icons = require("@ant-design/icons");
 var _sortable = require("@dnd-kit/sortable");
 var _css = require("@emotion/css");
+var _internals = require("@formily/core/esm/shared/internals");
 var _react = require("@formily/react");
 var _reactive = require("@formily/reactive");
 var _ahooks = require("ahooks");
@@ -21,7 +22,7 @@ var _utils = require("./utils");
 var _excluded = ["pagination", "useProps", "onChange"],
   _excluded2 = ["pagination", "onClickRow"],
   _excluded3 = ["dragSort", "showIndex", "onRowSelectionChange", "onChange", "rowSelection", "rowKey", "required", "onExpand"];
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10;
 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 }; }
@@ -101,7 +102,7 @@ var useTableColumns = function useTableColumns(props) {
   if (!exists) {
     return columns;
   }
-  return columns.concat({
+  var tableColumns = columns.concat({
     title: render(),
     dataIndex: 'TABLE_COLUMN_INITIALIZER',
     key: 'TABLE_COLUMN_INITIALIZER',
@@ -113,11 +114,38 @@ var useTableColumns = function useTableColumns(props) {
       });
     } : null
   });
+  if (props.showDel) {
+    tableColumns.push({
+      title: '',
+      key: 'delete',
+      width: 60,
+      align: 'center',
+      fixed: 'right',
+      render: function render(v, record, index) {
+        return /*#__PURE__*/_react2.default.createElement(_icons.DeleteOutlined, {
+          style: {
+            cursor: 'pointer'
+          },
+          onClick: function onClick() {
+            (0, _reactive.action)(function () {
+              (0, _internals.spliceArrayState)(field, {
+                startIndex: index,
+                deleteCount: 1
+              });
+              field.value.splice(index, 1);
+              return field.onInput(field.value);
+            });
+          }
+        });
+      }
+    });
+  }
+  return tableColumns;
 };
 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 _props$dataRowKey, _active$data$current$, _active$data$current, _over$data$current$so, _over$data$current, _over$data$current$so2;
   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
@@ -126,7 +154,7 @@ var SortableRow = function SortableRow(props) {
     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;
+  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$so2 = _over$data$current.sortable) === null || _over$data$current$so2 === void 0 ? void 0 : _over$data$current$so2.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), {}, {
@@ -191,7 +219,7 @@ var useValidator = function useValidator(validator) {
   }, []);
 };
 var Table = (0, _react.observer)(function (props) {
-  var _schema$parent, _schema$parent2, _field$data, _fieldSchema$parent, _fieldSchema$parent$x, _field$value4, _field$value4$slice;
+  var _schema$parent, _schema$parent2, _field$data, _field$value2, _field$value2$slice, _field$value2$slice$c, _field$value2$slice$c2, _fieldSchema$parent, _fieldSchema$parent$x;
   var pagination1 = props.pagination,
     useProps = props.useProps,
     onChange = props.onChange,
@@ -220,7 +248,7 @@ var Table = (0, _react.observer)(function (props) {
   var expandFlag = ctx.expandFlag;
   var onRowDragEnd = (0, _ahooks.useMemoizedFn)(others.onRowDragEnd || function () {});
   var paginationProps = usePaginationProps(pagination1, pagination2);
-  var requiredValidator = field.required || required;
+  // const requiredValidator = field.required || required;
   var _ref2 = (schema === null || schema === void 0 ? void 0 : (_schema$parent2 = schema.parent) === null || _schema$parent2 === void 0 ? void 0 : _schema$parent2['x-decorator-props']) || {},
     treeTable = _ref2.treeTable;
   var _useState = (0, _react2.useState)([]),
@@ -239,6 +267,8 @@ var Table = (0, _react.observer)(function (props) {
     _useState8 = _slicedToArray(_useState7, 2),
     selectedRow = _useState8[0],
     setSelectedRow = _useState8[1];
+  var dataSource = (field === null || field === void 0 ? void 0 : (_field$value2 = field.value) === null || _field$value2 === void 0 ? void 0 : (_field$value2$slice = _field$value2.slice) === null || _field$value2$slice === void 0 ? void 0 : (_field$value2$slice$c = _field$value2$slice.call(_field$value2)) === null || _field$value2$slice$c === void 0 ? void 0 : (_field$value2$slice$c2 = _field$value2$slice$c.filter) === null || _field$value2$slice$c2 === void 0 ? void 0 : _field$value2$slice$c2.call(_field$value2$slice$c, Boolean)) || [];
+  var isRowSelect = (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.type) !== 'none';
   var onRow = null,
     highlightRow = '';
   if (onClickRow) {
@@ -249,20 +279,20 @@ var Table = (0, _react.observer)(function (props) {
         }
       };
     };
-    highlightRow = (0, _css.css)(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n      & > td {\n        background-color: #caedff !important;\n      }\n      &:hover > td {\n        background-color: #caedff !important;\n      }\n    "])));
+    highlightRow = (0, _css.css)(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n        & > td {\n          background-color: #caedff !important;\n        }\n        &:hover > td {\n          background-color: #caedff !important;\n        }\n      "])));
   }
-  (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]);
+  // useEffect(() => {
+  //   field.setValidator((value) => {
+  //     if (requiredValidator) {
+  //       return Array.isArray(value) && value.length > 0 ? null : 'The field value is required';
+  //     }
+  //     return;
+  //   });
+  // }, [requiredValidator]);
   (0, _react2.useEffect)(function () {
     if (treeTable !== false) {
-      var _field$value2, _field$value2$slice;
-      var keys = (0, _utils.getIdsWithChildren)((_field$value2 = field.value) === null || _field$value2 === void 0 ? void 0 : (_field$value2$slice = _field$value2.slice) === null || _field$value2$slice === void 0 ? void 0 : _field$value2$slice.call(_field$value2));
+      var _field$value3, _field$value3$slice;
+      var keys = (0, _utils.getIdsWithChildren)((_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));
       setAllIncludesChildren(keys);
     }
   }, [field.value]);
@@ -281,7 +311,7 @@ var Table = (0, _react.observer)(function (props) {
         },
         cell: function cell(props) {
           return /*#__PURE__*/_react2.default.createElement("th", _objectSpread(_objectSpread({}, props), {}, {
-            className: (0, _classnames.default)(props.className, (0, _css.css)(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n                  max-width: 300px;\n                  white-space: nowrap;\n                  &:hover .general-schema-designer {\n                    display: block;\n                  }\n                "]))))
+            className: (0, _classnames.default)(props.className, (0, _css.css)(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n                    max-width: 300px;\n                    white-space: nowrap;\n                    &:hover .general-schema-designer {\n                      display: block;\n                    }\n                  "]))))
           }));
         }
       },
@@ -313,15 +343,15 @@ var Table = (0, _react.observer)(function (props) {
         },
         cell: function cell(props) {
           return /*#__PURE__*/_react2.default.createElement("td", _objectSpread(_objectSpread({}, props), {}, {
-            className: (0, _classnames.default)(props.className, (0, _css.css)(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n                max-width: 300px;\n                white-space: nowrap;\n                .nb-read-pretty-input-number {\n                  text-align: right;\n                }\n              "]))))
+            className: (0, _classnames.default)(props.className, (0, _css.css)(_templateObject5 || (_templateObject5 = _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$value3, _field$value3$indexOf;
-    return (_field$value3 = field.value) === null || _field$value3 === void 0 ? void 0 : (_field$value3$indexOf = _field$value3.indexOf) === null || _field$value3$indexOf === void 0 ? void 0 : _field$value3$indexOf.call(_field$value3, record);
+    var _field$value4, _field$value4$indexOf;
+    return (_field$value4 = field.value) === null || _field$value4 === void 0 ? void 0 : (_field$value4$indexOf = _field$value4.indexOf) === null || _field$value4$indexOf === void 0 ? void 0 : _field$value4$indexOf.call(_field$value4, record);
   };
   var getRowKey = function getRowKey(record) {
     if (typeof rowKey === 'string') {
@@ -358,23 +388,24 @@ var Table = (0, _react.observer)(function (props) {
           index = (0, _utils.extractIndex)(record.__index);
         }
         return /*#__PURE__*/_react2.default.createElement("div", {
-          className: (0, _classnames.default)(checked ? 'checked' : null, (0, _css.css)(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n                    position: relative;\n                    display: flex;\n                    float: left;\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)(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n                      position: relative;\n                      display: flex;\n                      float: left;\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                    "]))), _defineProperty({}, (0, _css.css)(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral(["\n                        &:hover {\n                          .nb-table-index {\n                            opacity: 0;\n                          }\n                          .nb-origin-node {\n                            display: block;\n                          }\n                        }\n                      "]))), isRowSelect))
         }, /*#__PURE__*/_react2.default.createElement("div", {
-          className: (0, _classnames.default)(checked ? 'checked' : null, (0, _css.css)(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral(["\n                      position: relative;\n                      display: flex;\n                      align-items: center;\n                      justify-content: space-evenly;\n                    "]))))
+          className: (0, _classnames.default)(checked ? 'checked' : null, (0, _css.css)(_templateObject8 || (_templateObject8 = _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)(_templateObject8 || (_templateObject8 = _taggedTemplateLiteral(["\n                      position: absolute;\n                      right: 50%;\n                      transform: translateX(50%);\n                      &:not(.checked) {\n                        display: none;\n                      }\n                    "]))))
+        })), isRowSelect && /*#__PURE__*/_react2.default.createElement("div", {
+          className: (0, _classnames.default)('nb-origin-node', checked ? 'checked' : null, (0, _css.css)(_templateObject9 || (_templateObject9 = _taggedTemplateLiteral(["\n                          position: absolute;\n                          right: 50%;\n                          transform: translateX(50%);\n                          &:not(.checked) {\n                            display: none;\n                          }\n                        "]))))
         }, originNode));
       }
     }, rowSelection) : undefined
   };
   var SortableWrapper = (0, _react2.useCallback)(function (_ref4) {
+    var _field$value5, _field$value5$map;
     var children = _ref4.children;
     return dragSort ? /*#__PURE__*/_react2.default.createElement(_sortable.SortableContext, {
-      items: field.value.map(getRowKey),
+      items: ((_field$value5 = field.value) === null || _field$value5 === void 0 ? void 0 : (_field$value5$map = _field$value5.map) === null || _field$value5$map === void 0 ? void 0 : _field$value5$map.call(_field$value5, getRowKey)) || [],
       children: children
     }) : /*#__PURE__*/_react2.default.createElement(_react2.default.Fragment, {
       children: children
@@ -394,11 +425,11 @@ var Table = (0, _react.observer)(function (props) {
     };
   }, [fixedBlock, tableHeight]);
   return /*#__PURE__*/_react2.default.createElement("div", {
-    className: (0, _css.css)(_templateObject9 || (_templateObject9 = _taggedTemplateLiteral(["\n        height: 100%;\n        overflow: hidden;\n        .ant-table-wrapper {\n          height: 100%;\n          .ant-spin-nested-loading {\n            height: 100%;\n            .ant-spin-container {\n              height: 100%;\n              display: flex;\n              flex-direction: column;\n            }\n          }\n        }\n        .ant-table {\n          overflow-x: auto;\n          overflow-y: hidden;\n        }\n      "])))
+    className: (0, _css.css)(_templateObject10 || (_templateObject10 = _taggedTemplateLiteral(["\n          height: 100%;\n          overflow: hidden;\n          .ant-table-wrapper {\n            height: 100%;\n            .ant-spin-nested-loading {\n              height: 100%;\n              .ant-spin-container {\n                height: 100%;\n                display: flex;\n                flex-direction: column;\n              }\n            }\n          }\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({
     ref: tableSizeRefCallback,
     rowKey: rowKey !== null && rowKey !== void 0 ? rowKey : defaultRowKey,
-    dataSource: field === null || field === void 0 ? void 0 : (_field$value4 = field.value) === null || _field$value4 === void 0 ? void 0 : (_field$value4$slice = _field$value4.slice) === null || _field$value4$slice === void 0 ? void 0 : _field$value4$slice.call(_field$value4)
+    dataSource: dataSource
   }, others), restProps), {}, {
     pagination: paginationProps,
     components: components,
@@ -429,5 +460,7 @@ var Table = (0, _react.observer)(function (props) {
       return /*#__PURE__*/_react2.default.createElement("div", null, message);
     });
   })));
+}, {
+  displayName: 'Table'
 });
 exports.Table = Table;

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

@@ -1 +1,2 @@
-export declare const TableBlockDesigner: () => JSX.Element;
+import React from 'react';
+export declare const TableBlockDesigner: () => React.JSX.Element;