@nocobase/client 0.7.0-alpha.82 → 0.7.1-alpha.4

package/lib/schema-component/antd/input/EllipsisWithTooltip.d.ts

@@ -1 +1,8 @@
-export declare const EllipsisWithTooltip: (props: any) => JSX.Element;
+import React from 'react';
+interface IEllipsisWithTooltipProps {
+    ellipsis: boolean;
+    popoverContent: unknown;
+    children: any;
+}
+export declare const EllipsisWithTooltip: React.ForwardRefExoticComponent<Partial<IEllipsisWithTooltipProps> & React.RefAttributes<unknown>>;
+export {};

package/lib/schema-component/antd/input/EllipsisWithTooltip.js

@@ -40,8 +40,7 @@ var ellipsisDefaultStyle = {
   whiteSpace: 'nowrap',
   wordBreak: 'break-all'
 };
-
-var EllipsisWithTooltip = function EllipsisWithTooltip(props) {
+var EllipsisWithTooltip = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
       ellipsis = _useState2[0],
@@ -52,6 +51,12 @@ var EllipsisWithTooltip = function EllipsisWithTooltip(props) {
       visible = _useState4[0],
       setVisible = _useState4[1];
 
+  (0, _react.useImperativeHandle)(ref, function () {
+    return {
+      setPopoverVisible: setVisible
+    };
+  });
+
   if (!props.ellipsis) {
     return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, props.children);
   }
@@ -75,6 +80,5 @@ var EllipsisWithTooltip = function EllipsisWithTooltip(props) {
       setEllipsis(el.scrollWidth > el.clientWidth);
     }
   }, props.children));
-};
-
+});
 exports.EllipsisWithTooltip = EllipsisWithTooltip;

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

@@ -48,18 +48,18 @@ ReadPretty.TextArea = function (props) {
       text = props.text;
 
   var html = /*#__PURE__*/_react.default.createElement("div", {
+    style: {
+      lineHeight: 1.612
+    },
     dangerouslySetInnerHTML: {
       __html: (0, _shared.HTMLEncode)(value).split('\n').join('<br/>')
     }
   });
 
-  console.log('value', value);
-
-  var content = /*#__PURE__*/_react.default.createElement(_EllipsisWithTooltip.EllipsisWithTooltip, {
+  var content = ellipsis ? /*#__PURE__*/_react.default.createElement(_EllipsisWithTooltip.EllipsisWithTooltip, {
     ellipsis: ellipsis,
     popoverContent: autop ? html : value
-  }, ellipsis ? text || value : html);
-
+  }, text || value) : autop ? html : value;
   return /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)(prefixCls, props.className),
     style: props.style

package/lib/schema-component/antd/kanban/Kanban.Card.Designer.js

@@ -75,7 +75,7 @@ var KanbanCardDesigner = function KanbanCardDesigner(props) {
   var fieldSchema = (0, _react.useFieldSchema)();
   var fields = (0, _utils.useFormItemInitializerFields)({
     readPretty: true,
-    block: 'KanbanV2'
+    block: 'Kanban'
   });
 
   if (!designable) {

package/lib/schema-component/antd/kanban/Kanban.Designer.js

@@ -32,7 +32,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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; }
 
 var KanbanDesigner = function KanbanDesigner() {
-  var _fieldSchema$xDecora, _fieldSchema$xDecora$;
+  var _fieldSchema$xDecora, _fieldSchema$xDecora$, _fieldSchema$xDecora2;
 
   var _useCollection = (0, _collectionManager.useCollection)(),
       name = _useCollection.name,
@@ -52,11 +52,12 @@ var KanbanDesigner = function KanbanDesigner() {
       dn = _useDesignable.dn;
 
   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 defaultResource = fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xDecora2 = fieldSchema['x-decorator-props']) === null || _fieldSchema$xDecora2 === void 0 ? void 0 : _fieldSchema$xDecora2.resource;
   var template = (0, _schemaTemplates.useSchemaTemplate)();
   return /*#__PURE__*/_react2.default.createElement(_schemaSettings.GeneralSchemaDesigner, {
     template: template,
     title: title || name
-  }, /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.ModalItem, {
+  }, /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.BlockTitleItem, null), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.ModalItem, {
     title: t('Set the data scope'),
     schema: {
       type: 'object',
@@ -87,7 +88,8 @@ var KanbanDesigner = function KanbanDesigner() {
     }
   }), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.Divider, null), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.Template, {
     componentName: 'Kanban',
-    collectionName: name
+    collectionName: name,
+    resourceName: defaultResource
   }), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.Divider, null), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.Remove, {
     removeParentsIfNoChildren: true,
     breakRemoveOn: {

package/lib/schema-component/antd/markdown/Markdown.d.ts

@@ -1,2 +1,3 @@
+import './style.less';
 export declare const Markdown: any;
 export default Markdown;

package/lib/schema-component/antd/markdown/Markdown.js

@@ -19,6 +19,8 @@ var _Markdown = require("./Markdown.Void");
 
 var _util = require("./util");
 
+require("./style.less");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: 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; }
@@ -42,11 +44,12 @@ var Markdown = (0, _react.connect)(_antd.Input.TextArea, (0, _react.mapProps)(fu
   var value = /*#__PURE__*/_react2.default.createElement("div", {
     className: 'nb-markdown',
     dangerouslySetInnerHTML: {
-      __html: (0, _util.markdown)(text)
+      __html: (0, _util.markdown)(props.value)
     }
   });
 
   return /*#__PURE__*/_react2.default.createElement(_input.ReadPretty.TextArea, _objectSpread(_objectSpread({}, props), {}, {
+    autop: false,
     text: text,
     value: value
   }));

package/lib/schema-component/antd/markdown/style.less

@@ -1,3 +1,7 @@
+.nb-markdown {
+  line-height: 1.612;
+}
+
 .nb-markdown > *:last-child {
   margin-bottom: 0;
 }

package/lib/schema-component/antd/percent/Percent.d.ts

@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const Percent: React.ForwardRefExoticComponent<Pick<Partial<any>, string | number | symbol> & React.RefAttributes<unknown>>;

package/lib/{action-logs/ActionLogProvider.js → schema-component/antd/percent/Percent.js}

@@ -5,38 +5,45 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ActionLogProvider = void 0;
+exports.Percent = void 0;
 
-var _react = _interopRequireWildcard(require("react"));
+var _react = require("@formily/react");
 
-var _schemaInitializer = require("../schema-initializer");
+var _antd = require("antd");
+
+var _react2 = _interopRequireDefault(require("react"));
+
+var _ReadPretty = require("../input-number/ReadPretty");
+
+var math = _interopRequireWildcard(require("mathjs"));
 
 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 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; }
 
-var actionLogsItemGroup = {
-  type: 'itemGroup',
-  title: '{{t("Others")}}',
-  children: [{
-    type: 'item',
-    title: '{{t("Action logs")}}',
-    component: 'ActionLogBlockInitializer'
-  }]
-};
-
-var ActionLogProvider = function ActionLogProvider(props) {
-  var initializes = (0, _react.useContext)(_schemaInitializer.SchemaInitializerContext);
-  initializes.BlockInitializers.items.push(_objectSpread({}, actionLogsItemGroup));
-  return /*#__PURE__*/_react.default.createElement(_schemaInitializer.SchemaInitializerProvider, {
-    initializers: initializes
-  }, props.children);
-};
-
-exports.ActionLogProvider = ActionLogProvider;
+var Percent = (0, _react.connect)(function (props) {
+  var value = props.value,
+      _onChange = props.onChange;
+  return /*#__PURE__*/_react2.default.createElement(_antd.InputNumber, _objectSpread(_objectSpread({}, props), {}, {
+    addonAfter: "%",
+    value: math.round(value * 100, 9),
+    onChange: function onChange(v) {
+      if (_onChange) {
+        _onChange(math.round(v / 100, 9));
+      }
+    }
+  }));
+}, (0, _react.mapReadPretty)(function (props) {
+  return /*#__PURE__*/_react2.default.createElement(_ReadPretty.ReadPretty, _objectSpread(_objectSpread({}, props), {}, {
+    value: props.value ? math.round(props.value * 100, 9) : null
+  }));
+}));
+exports.Percent = Percent;

package/lib/schema-component/antd/percent/index.d.ts

@@ -0,0 +1 @@
+export * from './Percent';

package/lib/{slate → schema-component/antd/percent}/index.js

@@ -4,15 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
-var _Slate = require("./Slate");
+var _Percent = require("./Percent");
 
-Object.keys(_Slate).forEach(function (key) {
+Object.keys(_Percent).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _Slate[key]) return;
+  if (key in exports && exports[key] === _Percent[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
-      return _Slate[key];
+      return _Percent[key];
     }
   });
 });

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

@@ -25,7 +25,8 @@ var _action = require("../action");
 
 var _useFieldNames = require("./useFieldNames");
 
-var _excluded = ["onRowSelectionChange", "rowKey"];
+var _excluded = ["onRowSelectionChange", "rowKey"],
+    _excluded2 = ["value", "multiple", "onChange"];
 
 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); }
 
@@ -124,7 +125,9 @@ var useAssociation = function useAssociation(props) {
 var InputRecordPicker = function InputRecordPicker(props) {
   var value = props.value,
       multiple = props.multiple,
-      _onChange = props.onChange;
+      _onChange = props.onChange,
+      others = _objectWithoutProperties(props, _excluded2);
+
   var fieldNames = (0, _useFieldNames.useFieldNames)(props);
 
   var _useState = (0, _react2.useState)(false),
@@ -148,8 +151,7 @@ var InputRecordPicker = function InputRecordPicker(props) {
   var values = options === null || options === void 0 ? void 0 : options.map(function (option) {
     return option[fieldNames.value];
   });
-  return /*#__PURE__*/_react2.default.createElement("div", null, /*#__PURE__*/_react2.default.createElement(_antd.Select, {
-    size: props.size,
+  return /*#__PURE__*/_react2.default.createElement("div", null, /*#__PURE__*/_react2.default.createElement(_antd.Select, _objectSpread(_objectSpread({}, others), {}, {
     mode: multiple ? 'multiple' : props.mode,
     fieldNames: fieldNames,
     onDropdownVisibleChange: function onDropdownVisibleChange(open) {
@@ -178,7 +180,7 @@ var InputRecordPicker = function InputRecordPicker(props) {
     options: options,
     value: multiple ? values : values === null || values === void 0 ? void 0 : values[0],
     open: false
-  }), /*#__PURE__*/_react2.default.createElement(RecordPickerContext.Provider, {
+  })), /*#__PURE__*/_react2.default.createElement(RecordPickerContext.Provider, {
     value: {
       multiple: multiple,
       onChange: _onChange,

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

@@ -11,8 +11,6 @@ var _react = require("@formily/react");
 
 var _shared = require("@formily/shared");
 
-var _antd = require("antd");
-
 var _react2 = _interopRequireWildcard(require("react"));
 
 var _blockProvider = require("../../../block-provider");
@@ -27,6 +25,8 @@ var _hooks = require("../../hooks");
 
 var _action = require("../action");
 
+var _EllipsisWithTooltip = require("../input/EllipsisWithTooltip");
+
 var _useFieldNames = require("./useFieldNames");
 
 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); }
@@ -46,6 +46,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var ReadPrettyRecordPicker = (0, _react.observer)(function (props) {
+  var ellipsis = props.ellipsis;
   var fieldSchema = (0, _react.useFieldSchema)();
   var field = (0, _react.useField)();
   var fieldNames = (0, _useFieldNames.useFieldNames)(props);
@@ -55,39 +56,53 @@ var ReadPrettyRecordPicker = (0, _react.observer)(function (props) {
       visible = _useState2[0],
       setVisible = _useState2[1];
 
+  var _useState3 = (0, _react2.useState)(),
+      _useState4 = _slicedToArray(_useState3, 2),
+      popoverVisible = _useState4[0],
+      setPopoverVisible = _useState4[1];
+
   var _useCollection = (0, _collectionManager.useCollection)(),
       getField = _useCollection.getField;
 
   var collectionField = getField(fieldSchema.name);
 
-  var _useState3 = (0, _react2.useState)({}),
-      _useState4 = _slicedToArray(_useState3, 2),
-      record = _useState4[0],
-      setRecord = _useState4[1];
+  var _useState5 = (0, _react2.useState)({}),
+      _useState6 = _slicedToArray(_useState5, 2),
+      record = _useState6[0],
+      setRecord = _useState6[1];
 
   var compile = (0, _hooks.useCompile)();
+  var ellipsisWithTooltipRef = (0, _react2.useRef)();
+
+  var renderRecords = function renderRecords() {
+    return (0, _shared.toArr)(field.value).map(function (record, index, arr) {
+      return /*#__PURE__*/_react2.default.createElement(_react2.default.Fragment, null, /*#__PURE__*/_react2.default.createElement("span", null, /*#__PURE__*/_react2.default.createElement("a", {
+        onClick: function onClick(e) {
+          var _ellipsisWithTooltipR;
+
+          e.stopPropagation();
+          e.preventDefault();
+          setVisible(true);
+          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", {
+        style: {
+          marginRight: 4,
+          color: '#aaa'
+        }
+      }, ", ") : null);
+    });
+  };
+
   return collectionField ? /*#__PURE__*/_react2.default.createElement("div", null, /*#__PURE__*/_react2.default.createElement(_blockProvider.BlockAssociationContext.Provider, {
     value: "".concat(collectionField.collectionName, ".").concat(collectionField.name)
   }, /*#__PURE__*/_react2.default.createElement(_collectionManager.CollectionProvider, {
     name: collectionField.target
-  }, /*#__PURE__*/_react2.default.createElement(_antd.Space, {
-    size: 0,
-    split: /*#__PURE__*/_react2.default.createElement("span", {
-      style: {
-        marginRight: 4,
-        color: '#aaa'
-      }
-    }, ", ")
-  }, (0, _shared.toArr)(field.value).map(function (record, index) {
-    return /*#__PURE__*/_react2.default.createElement("span", null, /*#__PURE__*/_react2.default.createElement("a", {
-      onClick: function onClick(e) {
-        e.stopPropagation();
-        e.preventDefault();
-        setVisible(true);
-        setRecord(record);
-      }
-    }, compile(record === null || record === void 0 ? void 0 : record[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.label) || 'label'])));
-  })), /*#__PURE__*/_react2.default.createElement(_action.ActionContext.Provider, {
+  }, /*#__PURE__*/_react2.default.createElement(_EllipsisWithTooltip.EllipsisWithTooltip, {
+    ellipsis: ellipsis,
+    ref: ellipsisWithTooltipRef
+  }, renderRecords()), /*#__PURE__*/_react2.default.createElement(_action.ActionContext.Provider, {
     value: {
       visible: visible,
       setVisible: setVisible,
@@ -95,9 +110,11 @@ var ReadPrettyRecordPicker = (0, _react.observer)(function (props) {
     }
   }, /*#__PURE__*/_react2.default.createElement(_recordProvider.RecordProvider, {
     record: record
+  }, /*#__PURE__*/_react2.default.createElement(_blockProvider.WithoutTableFieldResource.Provider, {
+    value: true
   }, /*#__PURE__*/_react2.default.createElement(_core.FormProvider, null, /*#__PURE__*/_react2.default.createElement(_react.RecursionField, {
     schema: fieldSchema,
     onlyRenderProperties: true
-  }))))))) : null;
+  })))))))) : null;
 });
 exports.ReadPrettyRecordPicker = ReadPrettyRecordPicker;

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

@@ -102,7 +102,23 @@ var TableColumnDesigner = function TableColumnDesigner(props) {
 
       dn.refresh();
     }
-  }), (collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) === 'linkTo' && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SelectItem, {
+  }), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SwitchItem, {
+    title: t('Sortable'),
+    checked: field.componentProps.sorter,
+    onChange: function onChange(v) {
+      var schema = _defineProperty({}, 'x-uid', columnSchema['x-uid']);
+
+      columnSchema['x-component-props'] = _objectSpread(_objectSpread({}, columnSchema['x-component-props']), {}, {
+        sorter: v
+      });
+      schema['x-component-props'] = columnSchema['x-component-props'];
+      field.componentProps.sorter = v;
+      dn.emit('patch', {
+        schema: schema
+      });
+      dn.refresh();
+    }
+  }), ['linkTo', 'm2m', 'm2o', 'o2m', 'obo', 'oho'].includes(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SelectItem, {
     title: t('Title field'),
     options: options,
     value: fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames['label'],
@@ -118,9 +134,7 @@ var TableColumnDesigner = function TableColumnDesigner(props) {
       dn.emit('patch', {
         schema: {
           'x-uid': fieldSchema['x-uid'],
-          'x-component-props': {
-            fieldNames: fieldNames
-          }
+          'x-component-props': _objectSpread({}, fieldSchema['x-component-props'])
         }
       });
       dn.refresh();

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

@@ -55,6 +55,10 @@ var isColumnComponent = function isColumnComponent(schema) {
   return ((_schema$xComponent = schema['x-component']) === null || _schema$xComponent === void 0 ? void 0 : _schema$xComponent.endsWith('.Column')) > -1;
 };
 
+var isCollectionFieldComponent = function isCollectionFieldComponent(schema) {
+  return schema['x-component'] === 'CollectionField';
+};
+
 var useTableColumns = function useTableColumns() {
   var start = Date.now();
   var field = (0, _react.useField)();
@@ -62,21 +66,31 @@ var useTableColumns = function useTableColumns() {
 
   var _useSchemaInitializer = (0, _2.useSchemaInitializer)(schema['x-initializer']),
       exists = _useSchemaInitializer.exists,
-      render = _useSchemaInitializer.render;
+      render = _useSchemaInitializer.render; // console.log('useTableColumns', exists);
+
 
   var columns = schema.reduceProperties(function (buf, s) {
     if (isColumnComponent(s)) {
       return buf.concat([s]);
     }
   }, []).map(function (s) {
+    var _s$xComponentProps;
+
+    var collectionFields = s.reduceProperties(function (buf, s) {
+      if (isCollectionFieldComponent(s)) {
+        return buf.concat([s]);
+      }
+    }, []);
+    var dataIndex = (collectionFields === null || collectionFields === void 0 ? void 0 : collectionFields.length) > 0 ? collectionFields[0].name : s.name;
     return {
       title: /*#__PURE__*/_react2.default.createElement(_react.RecursionField, {
         name: s.name,
         schema: s,
         onlyRenderSelf: true
       }),
-      dataIndex: s.name,
+      dataIndex: dataIndex,
       key: s.name,
+      sorter: (_s$xComponentProps = s['x-component-props']) === null || _s$xComponentProps === void 0 ? void 0 : _s$xComponentProps['sorter'],
       // width: 300,
       render: function render(v, record) {
         var _field$value;

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

@@ -34,7 +34,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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; }
 
 var TableBlockDesigner = function TableBlockDesigner() {
-  var _fieldSchema$xDecora, _fieldSchema$xDecora$, _fieldSchema$xDecora2, _fieldSchema$xDecora3, _field$decoratorProps, _field$decoratorProps2;
+  var _fieldSchema$xDecora, _fieldSchema$xDecora$, _fieldSchema$xDecora2, _fieldSchema$xDecora3, _fieldSchema$xDecora4, _field$decoratorProps, _field$decoratorProps2;
 
   var _useCollection = (0, _collectionManager.useCollection)(),
       name = _useCollection.name,
@@ -53,10 +53,12 @@ var TableBlockDesigner = function TableBlockDesigner() {
       t = _useTranslation.t;
 
   var _useDesignable = (0, _hooks.useDesignable)(),
-      dn = _useDesignable.dn;
+      dn = _useDesignable.dn,
+      refresh = _useDesignable.refresh;
 
   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;
   var sort = defaultSort === null || defaultSort === void 0 ? void 0 : defaultSort.map(function (item) {
     return item.startsWith('-') ? {
       field: item.substring(1),
@@ -71,7 +73,7 @@ var TableBlockDesigner = function TableBlockDesigner() {
   return /*#__PURE__*/_react2.default.createElement(_schemaSettings.GeneralSchemaDesigner, {
     template: template,
     title: title || name
-  }, /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SwitchItem, {
+  }, /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.BlockTitleItem, null), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SwitchItem, {
     title: t('Enable drag and drop sorting'),
     checked: field.decoratorProps.dragSort,
     onChange: function onChange(dragSort) {
@@ -242,7 +244,8 @@ var TableBlockDesigner = function TableBlockDesigner() {
     }
   }), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.Divider, null), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.Template, {
     componentName: 'Table',
-    collectionName: name
+    collectionName: name,
+    resourceName: defaultResource
   }), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.Divider, null), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.Remove, {
     removeParentsIfNoChildren: true,
     breakRemoveOn: {

package/lib/schema-initializer/SchemaInitializer.js

@@ -24,7 +24,7 @@ var _hooks = require("../schema-component/hooks");
 var _templateObject;
 
 var _excluded = ["title", "insert", "wrap", "items", "insertPosition", "dropdown", "component", "style", "icon", "onSuccess"],
-    _excluded2 = ["items", "children", "icon", "onClick"];
+    _excluded2 = ["eventKey", "items", "children", "icon", "onClick"];
 
 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); }
 
@@ -117,7 +117,7 @@ SchemaInitializer.Button = (0, _react.observer)(function (props) {
       if (item.type === 'item' && item.component) {
         var Component = findComponent(item.component);
         return Component && /*#__PURE__*/_react2.default.createElement(SchemaInitializerItemContext.Provider, {
-          key: "item-".concat(indexA),
+          key: "".concat(item.key || 'item', "-").concat(indexA),
           value: {
             index: indexA,
             item: item,
@@ -188,7 +188,8 @@ SchemaInitializer.Item = function (props) {
 
   var compile = (0, _hooks.useCompile)();
 
-  var _props$items2 = props.items,
+  var eventKey = props.eventKey,
+      _props$items2 = props.items,
       items = _props$items2 === void 0 ? [] : _props$items2,
       _props$children = props.children,
       children = _props$children === void 0 ? info === null || info === void 0 ? void 0 : info.title : _props$children,
@@ -241,27 +242,32 @@ SchemaInitializer.Item = function (props) {
       });
     };
 
-    return (
-      /*#__PURE__*/
+    return /*#__PURE__*/_react2.default.createElement(_antd.Menu.SubMenu // @ts-ignore
+    , {
       // @ts-ignore
-      _react2.default.createElement(_antd.Menu.SubMenu, {
-        eventKey: index,
-        key: index,
-        title: compile(children),
-        icon: icon
-      }, renderMenuItem(items))
-    );
+      eventKey: eventKey ? "".concat(eventKey, "-").concat(index) : info.key,
+      key: info.key,
+      title: compile(children),
+      icon: typeof icon === 'string' ? /*#__PURE__*/_react2.default.createElement(_icon.Icon, {
+        type: icon
+      }) : icon
+    }, renderMenuItem(items));
   }
 
-  return /*#__PURE__*/_react2.default.createElement(_antd.Menu.Item, _objectSpread({
-    eventKey: index,
-    icon: icon,
+  return /*#__PURE__*/_react2.default.createElement(_antd.Menu.Item // {...others}
+  , {
+    // {...others}
+    key: info.key,
+    eventKey: eventKey ? "".concat(eventKey, "-").concat(index) : info.key,
+    icon: typeof icon === 'string' ? /*#__PURE__*/_react2.default.createElement(_icon.Icon, {
+      type: icon
+    }) : icon,
     onClick: function onClick(opts) {
       _onClick(_objectSpread(_objectSpread({}, opts), {}, {
         item: info
       }));
     }
-  }, others), compile(children));
+  }, compile(children));
 };
 
 SchemaInitializer.itemWrap = function (component) {

package/lib/schema-initializer/SchemaInitializerProvider.d.ts

@@ -8,4 +8,5 @@ export declare const useSchemaInitializer: (name: string) => {
     exists: boolean;
     render: (props?: any) => React.CElement<any, React.Component<any, any, any>>;
 };
+export declare const SchemaInitializerPluginContext: React.Context<any>;
 export declare const SchemaInitializerProvider: React.FC<SchemaInitializerProviderProps>;

package/lib/schema-initializer/SchemaInitializerProvider.js

@@ -5,7 +5,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useSchemaInitializer = exports.SchemaInitializerProvider = exports.SchemaInitializerContext = void 0;
+exports.useSchemaInitializer = exports.SchemaInitializerProvider = exports.SchemaInitializerPluginContext = exports.SchemaInitializerContext = void 0;
 
 var _shared = require("@formily/shared");
 
@@ -80,6 +80,8 @@ var useSchemaInitializer = function useSchemaInitializer(name) {
 };
 
 exports.useSchemaInitializer = useSchemaInitializer;
+var SchemaInitializerPluginContext = /*#__PURE__*/(0, _react.createContext)(null);
+exports.SchemaInitializerPluginContext = SchemaInitializerPluginContext;
 
 var SchemaInitializerProvider = function SchemaInitializerProvider(props) {
   var initializers = props.initializers,