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

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

@@ -1,6 +1,6 @@
 import { TableProps } from 'antd';
 import React from 'react';
-export declare const TableRowSelection: React.MemoExoticComponent<React.FunctionComponent<TableProps<any> & {
+export declare const TableRowSelection: React.MemoExoticComponent<import("@formily/react").ReactFC<TableProps<any> & {
     value?: any;
     onChange?: any;
     objectValue?: boolean;

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

@@ -46,5 +46,7 @@ var TableRowSelection = (0, _react.observer)(function (props) {
   return /*#__PURE__*/_react2.default.createElement(_Table.TableVoid, _objectSpread(_objectSpread({}, props), {}, {
     rowSelection: rowSelection
   }));
+}, {
+  displayName: 'TableRowSelection'
 });
 exports.TableRowSelection = TableRowSelection;

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

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

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

@@ -1,4 +1,4 @@
-import { Options, Result } from 'ahooks/lib/useRequest/src/types';
+import { Options, Result } from 'ahooks/es/useRequest/src/types';
 import { TableProps } from 'antd';
 import React from 'react';
 declare type TableVoidProps = TableProps<any> & {

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

@@ -143,5 +143,7 @@ var TableVoid = (0, _react.observer)(function (props) {
     loading: result === null || result === void 0 ? void 0 : result.loading,
     pagination: usePaginationProps(props, result)
   })))));
+}, {
+  displayName: 'TableVoid'
 });
 exports.TableVoid = TableVoid;

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

@@ -1,2 +1,2 @@
-/// <reference types="react" />
-export declare function FilterDynamicComponent(props: any): JSX.Element;
+import React from 'react';
+export declare function FilterDynamicComponent(props: any): React.JSX.Element;

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

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

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

@@ -1,3 +1,3 @@
 import React from 'react';
 export declare const designerCss: string;
-export declare const TableColumnActionBar: React.MemoExoticComponent<React.FunctionComponent<unknown>>;
+export declare const TableColumnActionBar: React.MemoExoticComponent<import("@formily/react").ReactFC<unknown>>;

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

@@ -18,5 +18,7 @@ var TableColumnActionBar = (0, _react.observer)(function (props) {
   return /*#__PURE__*/_react2.default.createElement(_.SortableItem, {
     className: designerCss
   }, /*#__PURE__*/_react2.default.createElement(Designer, null), props.children);
+}, {
+  displayName: 'TableColumnActionBar'
 });
 exports.TableColumnActionBar = TableColumnActionBar;

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

@@ -1,3 +1,4 @@
+import React from 'react';
 export declare const useColumnSchema: () => {
     columnSchema?: undefined;
     fieldSchema?: undefined;
@@ -9,4 +10,4 @@ export declare const useColumnSchema: () => {
     collectionField: any;
     uiSchema: any;
 };
-export declare const TableColumnDecorator: (props: any) => JSX.Element;
+export declare const TableColumnDecorator: (props: any) => React.JSX.Element;

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

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

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

@@ -10,6 +10,7 @@ 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");
 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; }
@@ -56,6 +57,17 @@ 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 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, {
@@ -115,7 +127,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,7 +142,7 @@ 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,
     onChange: function onChange(flag) {
@@ -169,6 +181,92 @@ 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$path, _field$path2;
+      var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
+      fieldSchema['required'] = required;
+      schema['required'] = required;
+      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) {
+          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$path3, _field$path4;
+      var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
+      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);
+      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,
     breakRemoveOn: {

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) {
@@ -251,18 +281,18 @@ 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    "])));
   }
-  (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]);
@@ -320,8 +350,8 @@ var Table = (0, _react.observer)(function (props) {
     };
   }, [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,

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;

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

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.TableBlockDesigner = void 0;
 var _antd = require("@formily/antd");
 var _react = require("@formily/react");
-var _react2 = _interopRequireDefault(require("react"));
+var _react2 = _interopRequireWildcard(require("react"));
 var _reactI18next = require("react-i18next");
 var _blockProvider = require("../../../block-provider");
 var _SharedFilterProvider = require("../../../block-provider/SharedFilterProvider");
@@ -19,7 +19,8 @@ var _hooks = require("../../hooks");
 var _filter = require("../filter");
 var _page = require("../page");
 var _FilterDynamicComponent = require("./FilterDynamicComponent");
-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 _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 _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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -33,13 +34,14 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 var TableBlockDesigner = function TableBlockDesigner() {
-  var _fieldSchema$xDecora, _fieldSchema$xDecora$, _fieldSchema$xDecora2, _fieldSchema$xDecora3, _fieldSchema$xDecora4, _fieldSchema$xDecora5, _getCollectionField, _field$decoratorProps2, _field$decoratorProps3;
+  var _fieldSchema$xDecora, _fieldSchema$xDecora$, _fieldSchema$xDecora2, _fieldSchema$xDecora3, _fieldSchema$xDecora4, _fieldSchema$xDecora5, _getCollection, _getCollectionField, _field$decoratorProps2, _field$decoratorProps3;
   var _useCollection = (0, _collectionManager.useCollection)(),
     name = _useCollection.name,
     title = _useCollection.title,
     sortable = _useCollection.sortable;
   var _useCollectionManager = (0, _collectionManager.useCollectionManager)(),
-    getCollectionField = _useCollectionManager.getCollectionField;
+    getCollectionField = _useCollectionManager.getCollectionField,
+    getCollection = _useCollectionManager.getCollection;
   var field = (0, _react.useField)();
   var fieldSchema = (0, _react.useFieldSchema)();
   var dataSource = (0, _actionHooks.useCollectionFilterOptions)(name);
@@ -50,6 +52,7 @@ var TableBlockDesigner = function TableBlockDesigner() {
     t = _useTranslation.t;
   var _useDesignable = (0, _hooks.useDesignable)(),
     dn = _useDesignable.dn;
+  var compile = (0, _hooks.useCompile)();
   var defaultFilter = (fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xDecora = fieldSchema['x-decorator-props']) === null || _fieldSchema$xDecora === void 0 ? void 0 : (_fieldSchema$xDecora$ = _fieldSchema$xDecora.params) === null || _fieldSchema$xDecora$ === void 0 ? void 0 : _fieldSchema$xDecora$.filter) || {};
   var defaultSort = (fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xDecora2 = fieldSchema['x-decorator-props']) === null || _fieldSchema$xDecora2 === void 0 ? void 0 : (_fieldSchema$xDecora3 = _fieldSchema$xDecora2.params) === null || _fieldSchema$xDecora3 === void 0 ? void 0 : _fieldSchema$xDecora3.sort) || [];
   var defaultResource = fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xDecora4 = fieldSchema['x-decorator-props']) === null || _fieldSchema$xDecora4 === void 0 ? void 0 : _fieldSchema$xDecora4.resource;
@@ -68,19 +71,57 @@ var TableBlockDesigner = function TableBlockDesigner() {
   var _field$decoratorProps = field.decoratorProps,
     dragSort = _field$decoratorProps.dragSort,
     resource = _field$decoratorProps.resource;
-  var treeChildren = (resource === null || resource === void 0 ? void 0 : resource.includes('.')) ? (_getCollectionField = getCollectionField(resource)) === null || _getCollectionField === void 0 ? void 0 : _getCollectionField.treeChildren : !!(collection === null || collection === void 0 ? void 0 : collection.tree);
+  var treeCollection = (resource === null || resource === void 0 ? void 0 : resource.includes('.')) ? (_getCollection = getCollection((_getCollectionField = getCollectionField(resource)) === null || _getCollectionField === void 0 ? void 0 : _getCollectionField.target)) === null || _getCollection === void 0 ? void 0 : _getCollection.tree : !!(collection === null || collection === void 0 ? void 0 : collection.tree);
+  var dataScopeSchema = (0, _react2.useMemo)(function () {
+    return {
+      type: 'object',
+      title: t('Set the data scope'),
+      properties: {
+        filter: {
+          default: defaultFilter,
+          // title: '数据范围',
+          enum: compile(dataSource),
+          'x-component': 'Filter',
+          'x-component-props': {
+            dynamicComponent: function dynamicComponent(props) {
+              return (0, _FilterDynamicComponent.FilterDynamicComponent)(_objectSpread({}, props));
+            }
+          }
+        }
+      }
+    };
+  }, [dataSource, defaultFilter]);
+  var onDataScopeSubmit = (0, _react2.useCallback)(function (_ref) {
+    var _service$params, _service$params$, _service$params2, _schema;
+    var filter = _ref.filter;
+    filter = (0, _filter.removeNullCondition)(filter);
+    var params = field.decoratorProps.params || {};
+    params.filter = filter;
+    field.decoratorProps.params = params;
+    fieldSchema['x-decorator-props']['params'] = params;
+    var filters = ((_service$params = service.params) === null || _service$params === void 0 ? void 0 : (_service$params$ = _service$params[1]) === null || _service$params$ === void 0 ? void 0 : _service$params$.filters) || {};
+    service.run(_objectSpread(_objectSpread({}, (_service$params2 = service.params) === null || _service$params2 === void 0 ? void 0 : _service$params2[0]), {}, {
+      filter: (0, _SharedFilterProvider.mergeFilter)([].concat(_toConsumableArray(Object.values(filters)), [filter])),
+      page: 1
+    }), {
+      filters: filters
+    });
+    dn.emit('patch', {
+      schema: (_schema = {}, _defineProperty(_schema, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema, 'x-decorator-props', fieldSchema['x-decorator-props']), _schema)
+    });
+  }, [field]);
   return /*#__PURE__*/_react2.default.createElement(_schemaSettings.GeneralSchemaDesigner, {
     template: template,
     title: title || name
   }, /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.BlockTitleItem, null), (collection === null || collection === void 0 ? void 0 : collection.tree) && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SwitchItem, {
     title: t('Tree table'),
     defaultChecked: true,
-    checked: treeChildren ? field.decoratorProps.treeTable !== false : false,
+    checked: treeCollection ? field.decoratorProps.treeTable !== false : false,
     onChange: function onChange(flag) {
-      var _service$params;
+      var _service$params3;
       field.decoratorProps.treeTable = flag;
       fieldSchema['x-decorator-props'].treeTable = flag;
-      var params = _objectSpread(_objectSpread({}, (_service$params = service.params) === null || _service$params === void 0 ? void 0 : _service$params[0]), {}, {
+      var params = _objectSpread(_objectSpread({}, (_service$params3 = service.params) === null || _service$params3 === void 0 ? void 0 : _service$params3[0]), {}, {
         tree: flag ? true : null
       });
       dn.emit('patch', {
@@ -93,54 +134,20 @@ var TableBlockDesigner = function TableBlockDesigner() {
     title: t('Enable drag and drop sorting'),
     checked: field.decoratorProps.dragSort,
     onChange: function onChange(dragSort) {
-      var _service$params2, _schema;
+      var _service$params4, _schema2;
       field.decoratorProps.dragSort = dragSort;
       fieldSchema['x-decorator-props'].dragSort = dragSort;
-      service.run(_objectSpread(_objectSpread({}, (_service$params2 = service.params) === null || _service$params2 === void 0 ? void 0 : _service$params2[0]), {}, {
+      service.run(_objectSpread(_objectSpread({}, (_service$params4 = service.params) === null || _service$params4 === void 0 ? void 0 : _service$params4[0]), {}, {
         sort: 'sort'
       }));
       dn.emit('patch', {
-        schema: (_schema = {}, _defineProperty(_schema, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema, 'x-decorator-props', fieldSchema['x-decorator-props']), _schema)
+        schema: (_schema2 = {}, _defineProperty(_schema2, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema2, 'x-decorator-props', fieldSchema['x-decorator-props']), _schema2)
       });
     }
   }), /*#__PURE__*/_react2.default.createElement(_page.FixedBlockDesignerItem, null), /*#__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,
-          // title: '数据范围',
-          enum: dataSource,
-          'x-component': 'Filter',
-          'x-component-props': {
-            dynamicComponent: function dynamicComponent(props) {
-              return (0, _FilterDynamicComponent.FilterDynamicComponent)(_objectSpread({}, props));
-            }
-          }
-        }
-      }
-    },
-    onSubmit: function onSubmit(_ref) {
-      var _service$params3, _service$params3$, _service$params4, _schema2;
-      var filter = _ref.filter;
-      filter = (0, _filter.removeNullCondition)(filter);
-      var params = field.decoratorProps.params || {};
-      params.filter = filter;
-      field.decoratorProps.params = params;
-      fieldSchema['x-decorator-props']['params'] = params;
-      var filters = ((_service$params3 = service.params) === null || _service$params3 === void 0 ? void 0 : (_service$params3$ = _service$params3[1]) === null || _service$params3$ === void 0 ? void 0 : _service$params3$.filters) || {};
-      service.run(_objectSpread(_objectSpread({}, (_service$params4 = service.params) === null || _service$params4 === void 0 ? void 0 : _service$params4[0]), {}, {
-        filter: (0, _SharedFilterProvider.mergeFilter)([].concat(_toConsumableArray(Object.values(filters)), [filter])),
-        page: 1
-      }), {
-        filters: filters
-      });
-      dn.emit('patch', {
-        schema: (_schema2 = {}, _defineProperty(_schema2, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema2, 'x-decorator-props', fieldSchema['x-decorator-props']), _schema2)
-      });
-    }
+    schema: dataScopeSchema,
+    onSubmit: onDataScopeSubmit
   }), !dragSort && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.ModalItem, {
     title: t('Set default sorting rules'),
     components: {

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

@@ -40,6 +40,8 @@ var TableField = (0, _react.observer)(function (props) {
     field.decoratorProps.asterisk = fieldSchema.required;
   }, [fieldSchema.required]);
   return /*#__PURE__*/_react2.default.createElement("div", null, props.children);
+}, {
+  displayName: 'TableField'
 });
 exports.TableField = TableField;
 TableField.ActionBar = (0, _react.observer)(function (props) {
@@ -53,4 +55,6 @@ TableField.ActionBar = (0, _react.observer)(function (props) {
       marginTop: -32
     }
   }, /*#__PURE__*/_react2.default.createElement(_action.ActionBar, _objectSpread({}, props)));
+}, {
+  displayName: 'TableField.ActionBar'
 });

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

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