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

package/.umirc.ts

@@ -0,0 +1,24 @@
+import { resolveNocobasePackagesAlias } from '@nocobase/devtools/umiConfig';
+import { defineConfig } from 'dumi';
+
+export default defineConfig({
+  title: 'NocoBase',
+  // outputPath: `./docs/dist/${lang}`,
+  mode: 'site',
+  resolve: {
+    includes: ['./'],
+  },
+  // locales: [[lang, lang]],
+  hash: true,
+  logo: 'https://www.nocobase.com/images/logo.png',
+  navs: [
+    null,
+    {
+      title: 'GitHub',
+      path: 'https://github.com/nocobase/nocobase',
+    },
+  ],
+  chainWebpack(config) {
+    resolveNocobasePackagesAlias(config);
+  },
+});

package/es/antd-config-provider/index.js

@@ -11,11 +11,10 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
 import { ConfigProvider, Spin } from 'antd';
-import enUS from 'antd/lib/locale/en_US';
-import zhCN from 'antd/lib/locale/zh_CN';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { useAPIClient, useRequest } from '../api-client';
+import locale from '../locale';
 export function AntdConfigProvider(props) {
   var remoteLocale = props.remoteLocale,
       others = _objectWithoutProperties(props, _excluded);
@@ -48,7 +47,9 @@ export function AntdConfigProvider(props) {
     return /*#__PURE__*/React.createElement(Spin, null);
   }
 
-  return /*#__PURE__*/React.createElement(ConfigProvider, _objectSpread(_objectSpread({}, others), {}, {
-    locale: i18n.language === 'zh-CN' ? zhCN : enUS
+  return /*#__PURE__*/React.createElement(ConfigProvider, _objectSpread(_objectSpread({
+    dropdownMatchSelectWidth: false
+  }, others), {}, {
+    locale: locale[i18n.language].antd
   }), props.children);
 }

package/es/api-client/APIClient.d.ts

@@ -2,4 +2,6 @@ import { APIClient as APIClientSDK } from '@nocobase/sdk';
 import { Result } from 'ahooks/lib/useRequest/src/types';
 export declare class APIClient extends APIClientSDK {
     services: Record<string, Result<any, any>>;
+    interceptors(): void;
+    notification(): void;
 }

package/es/api-client/APIClient.js

@@ -1,10 +1,14 @@
 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 _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _get() { if (typeof Reflect !== "undefined" && Reflect.get) { _get = Reflect.get; } else { _get = function _get(target, property, receiver) { var base = _superPropBase(target, property); if (!base) return; var desc = Object.getOwnPropertyDescriptor(base, property); if (desc.get) { return desc.get.call(arguments.length < 3 ? target : receiver); } return desc.value; }; } return _get.apply(this, arguments); }
+
+function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; }
 
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
 
@@ -21,6 +25,8 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
 import { APIClient as APIClientSDK } from '@nocobase/sdk';
+import { notification as _notification } from 'antd';
+import React from 'react';
 export var APIClient = /*#__PURE__*/function (_APIClientSDK) {
   _inherits(APIClient, _APIClientSDK);
 
@@ -40,5 +46,39 @@ export var APIClient = /*#__PURE__*/function (_APIClientSDK) {
     return _this;
   }
 
-  return _createClass(APIClient);
+  _createClass(APIClient, [{
+    key: "interceptors",
+    value: function interceptors() {
+      _get(_getPrototypeOf(APIClient.prototype), "interceptors", this).call(this);
+
+      this.notification();
+    }
+  }, {
+    key: "notification",
+    value: function notification() {
+      this.axios.interceptors.response.use(function (response) {
+        return response;
+      }, function (error) {
+        var _error$response, _error$response$data, _error$response2, _error$response2$data, _error$response2$data2, _error$response2$data3;
+
+        var redirectTo = error === null || error === void 0 ? void 0 : (_error$response = error.response) === null || _error$response === void 0 ? void 0 : (_error$response$data = _error$response.data) === null || _error$response$data === void 0 ? void 0 : _error$response$data.redirectTo;
+
+        if (redirectTo) {
+          return window.location.href = redirectTo;
+        }
+
+        _notification.error({
+          message: error === null || error === void 0 ? void 0 : (_error$response2 = error.response) === null || _error$response2 === void 0 ? void 0 : (_error$response2$data = _error$response2.data) === null || _error$response2$data === void 0 ? void 0 : (_error$response2$data2 = _error$response2$data.errors) === null || _error$response2$data2 === void 0 ? void 0 : (_error$response2$data3 = _error$response2$data2.map) === null || _error$response2$data3 === void 0 ? void 0 : _error$response2$data3.call(_error$response2$data2, function (error) {
+            return /*#__PURE__*/React.createElement('div', {
+              children: error.message
+            });
+          })
+        });
+
+        throw error;
+      });
+    }
+  }]);
+
+  return APIClient;
 }(APIClientSDK);

package/es/application/Application.d.ts

@@ -0,0 +1,23 @@
+import { i18n as i18next } from 'i18next';
+import { APIClient } from '../api-client';
+export interface ApplicationOptions {
+    apiClient?: any;
+    i18n?: any;
+    plugins?: any[];
+}
+export declare type PluginCallback = () => Promise<any>;
+export declare class Application {
+    providers: any[];
+    mainComponent: any;
+    apiClient: APIClient;
+    i18n: i18next;
+    plugins: PluginCallback[];
+    constructor(options: ApplicationOptions);
+    use(component: any, props?: any): void;
+    main(mainComponent: any): void;
+    /**
+     * TODO
+     */
+    plugin(plugin: PluginCallback): void;
+    render(): (props?: any) => JSX.Element;
+}

package/es/application/Application.js

@@ -0,0 +1,176 @@
+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."); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+
+import React from 'react';
+import { I18nextProvider } from 'react-i18next';
+import { Link, NavLink } from 'react-router-dom';
+import { ACLProvider, ACLShortcut } from '../acl';
+import { AntdConfigProvider } from '../antd-config-provider';
+import { APIClient, APIClientProvider } from '../api-client';
+import { BlockSchemaComponentProvider } from '../block-provider';
+import { CollectionManagerShortcut } from '../collection-manager';
+import { RemoteDocumentTitleProvider } from '../document-title';
+import { FileStorageShortcut } from '../file-manager';
+import { i18n } from '../i18n';
+import { PluginManagerProvider } from '../plugin-manager';
+import { AdminLayout, AuthLayout, RemoteRouteSwitchProvider, RouteSchemaComponent, RouteSwitch, useRoutes } from '../route-switch';
+import { AntdSchemaComponentProvider, DesignableSwitch, MenuItemInitializers, SchemaComponentProvider } from '../schema-component';
+import { SchemaInitializerProvider } from '../schema-initializer';
+import { BlockTemplateDetails, BlockTemplatePage, SchemaTemplateShortcut } from '../schema-templates';
+import { SystemSettingsProvider, SystemSettingsShortcut } from '../system-settings';
+import { SigninPage, SignupPage } from '../user';
+import { WorkflowPage, WorkflowRouteProvider, WorkflowShortcut } from '../workflow';
+import { compose } from './compose';
+export var Application = /*#__PURE__*/function () {
+  function Application(options) {
+    var _window, _window$location;
+
+    _classCallCheck(this, Application);
+
+    this.providers = [];
+    this.mainComponent = null;
+    this.apiClient = void 0;
+    this.i18n = void 0;
+    this.plugins = [];
+    this.apiClient = new APIClient(_objectSpread({
+      baseURL: process.env.API_BASE_URL,
+      headers: {
+        'X-Hostname': (_window = window) === null || _window === void 0 ? void 0 : (_window$location = _window.location) === null || _window$location === void 0 ? void 0 : _window$location.hostname
+      }
+    }, options.apiClient));
+    this.i18n = options.i18n || i18n;
+    this.use(APIClientProvider, {
+      apiClient: this.apiClient
+    });
+    this.use(I18nextProvider, {
+      i18n: this.i18n
+    });
+    this.use(AntdConfigProvider, {
+      remoteLocale: true
+    });
+    this.use(RemoteRouteSwitchProvider, {
+      components: {
+        AuthLayout: AuthLayout,
+        AdminLayout: AdminLayout,
+        RouteSchemaComponent: RouteSchemaComponent,
+        SigninPage: SigninPage,
+        SignupPage: SignupPage,
+        WorkflowPage: WorkflowPage,
+        BlockTemplatePage: BlockTemplatePage,
+        BlockTemplateDetails: BlockTemplateDetails
+      }
+    });
+    this.use(SystemSettingsProvider);
+    this.use(PluginManagerProvider, {
+      components: {
+        ACLShortcut: ACLShortcut,
+        DesignableSwitch: DesignableSwitch,
+        CollectionManagerShortcut: CollectionManagerShortcut,
+        WorkflowShortcut: WorkflowShortcut,
+        SystemSettingsShortcut: SystemSettingsShortcut,
+        SchemaTemplateShortcut: SchemaTemplateShortcut,
+        FileStorageShortcut: FileStorageShortcut
+      }
+    });
+    this.use(SchemaComponentProvider, {
+      components: {
+        Link: Link,
+        NavLink: NavLink
+      }
+    });
+    this.use(SchemaInitializerProvider, {
+      initializers: {
+        MenuItemInitializers: MenuItemInitializers
+      }
+    });
+    this.use(BlockSchemaComponentProvider);
+    this.use(AntdSchemaComponentProvider);
+    this.use(ACLProvider);
+    this.use(RemoteDocumentTitleProvider);
+    this.use(WorkflowRouteProvider);
+
+    var _iterator = _createForOfIteratorHelper(options.plugins),
+        _step;
+
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var plugin = _step.value;
+
+        var _ref = Array.isArray(plugin) ? plugin : [plugin],
+            _ref2 = _slicedToArray(_ref, 2),
+            component = _ref2[0],
+            props = _ref2[1];
+
+        this.use(component, props);
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+  }
+
+  _createClass(Application, [{
+    key: "use",
+    value: function use(component, props) {
+      this.providers.push(props ? [component, props] : component);
+    }
+  }, {
+    key: "main",
+    value: function main(mainComponent) {
+      this.mainComponent = mainComponent;
+    }
+    /**
+     * TODO
+     */
+
+  }, {
+    key: "plugin",
+    value: function plugin(_plugin) {
+      this.plugins.push(_plugin);
+    }
+  }, {
+    key: "render",
+    value: function render() {
+      return compose.apply(void 0, _toConsumableArray(this.providers))(this.mainComponent || function () {
+        var routes = useRoutes();
+        return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(RouteSwitch, {
+          routes: routes
+        }));
+      });
+    }
+  }]);
+
+  return Application;
+}();

package/es/application/index.d.ts

@@ -1 +1,2 @@
+export * from './Application';
 export * from './compose';

package/es/application/index.js

@@ -1 +1,2 @@
+export * from './Application';
 export * from './compose';

package/es/block-provider/BlockProvider.js

@@ -15,7 +15,7 @@ import { useRequest } from 'ahooks';
 import template from 'lodash/template';
 import React, { createContext, useContext } from 'react';
 import { Link } from 'react-router-dom';
-import { ACLCollectionProvider, TableFieldResource, useAPIClient, useRecord } from '../';
+import { ACLCollectionProvider, TableFieldResource, useAPIClient, useRecord, WithoutTableFieldResource } from '../';
 import { CollectionProvider, useCollection, useCollectionManager } from '../collection-manager';
 import { useRecordIndex } from '../record-provider';
 export var BlockResourceContext = /*#__PURE__*/createContext(null);
@@ -38,7 +38,7 @@ var useAssociation = function useAssociation(props) {
   }
 };
 
-var useReousrce = function useReousrce(props) {
+var useResource = function useResource(props) {
   var block = props.block,
       resource = props.resource,
       useSourceId = props.useSourceId;
@@ -58,9 +58,11 @@ var useReousrce = function useReousrce(props) {
     return new TableFieldResource(options);
   }
 
+  var withoutTableFieldResource = useContext(WithoutTableFieldResource);
+
   var __parent = useContext(BlockRequestContext);
 
-  if ((__parent === null || __parent === void 0 ? void 0 : __parent.block) === 'TableField' && (__parent === null || __parent === void 0 ? void 0 : __parent.resource) instanceof TableFieldResource) {
+  if (!withoutTableFieldResource && (__parent === null || __parent === void 0 ? void 0 : __parent.block) === 'TableField' && (__parent === null || __parent === void 0 ? void 0 : __parent.resource) instanceof TableFieldResource) {
     return __parent.resource;
   }
 
@@ -96,16 +98,27 @@ export var useResourceAction = function useResourceAction(props) {
   });
   var params = useActionParams(props);
 
-  if (appends === null || appends === void 0 ? void 0 : appends.length) {
+  if (!Object.keys(params).includes('appends') && (appends === null || appends === void 0 ? void 0 : appends.length)) {
     params['appends'] = appends;
   }
 
-  var result = useRequest(function (params) {
-    return action ? resource[action](params).then(function (res) {
+  var result = useRequest(function (opts) {
+    if (!action) {
+      return Promise.resolve({});
+    }
+
+    var actionParams = _objectSpread({}, opts);
+
+    if (params.appends) {
+      actionParams.appends = params.appends;
+    }
+
+    return resource[action](actionParams).then(function (res) {
       return res.data;
-    }) : Promise.resolve({});
+    });
   }, _objectSpread(_objectSpread({}, opts), {}, {
-    defaultParams: [params]
+    defaultParams: [params],
+    refreshDeps: [JSON.stringify(params.appends)]
   }));
   return result;
 };
@@ -144,7 +157,7 @@ export var useBlockRequestContext = function useBlockRequestContext() {
 export var BlockProvider = function BlockProvider(props) {
   var collection = props.collection,
       association = props.association;
-  var resource = useReousrce(props);
+  var resource = useResource(props);
   return /*#__PURE__*/React.createElement(MaybeCollectionProvider, {
     collection: collection
   }, /*#__PURE__*/React.createElement(BlockAssociationContext.Provider, {
@@ -169,9 +182,12 @@ export var useFilterByTk = function useFilterByTk() {
       getCollectionField = _useCollectionManager2.getCollectionField;
 
   var assoc = useContext(BlockAssociationContext);
+  var withoutTableFieldResource = useContext(WithoutTableFieldResource);
 
-  if (resource instanceof TableFieldResource || (__parent === null || __parent === void 0 ? void 0 : __parent.block) === 'TableField') {
-    return recordIndex;
+  if (!withoutTableFieldResource) {
+    if (resource instanceof TableFieldResource || (__parent === null || __parent === void 0 ? void 0 : __parent.block) === 'TableField') {
+      return recordIndex;
+    }
   }
 
   if (assoc) {

package/es/block-provider/TableBlockProvider.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 export declare const TableBlockContext: React.Context<any>;
+export declare const useAssociationNames: (collection: any) => any[];
 export declare const TableBlockProvider: (props: any) => JSX.Element;
 export declare const useTableBlockContext: () => any;
 export declare const useTableBlockProps: () => {
@@ -19,5 +20,5 @@ export declare const useTableBlockProps: () => {
     onChange({ current, pageSize }: {
         current: any;
         pageSize: any;
-    }): void;
+    }, filters: any, sorter: any): void;
 };

package/es/block-provider/TableBlockProvider.js

@@ -8,8 +8,24 @@ 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; }
 
-import { useField, useFieldSchema } from '@formily/react';
-import React, { createContext, useContext, useEffect } from 'react';
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+import { createForm } from '@formily/core';
+import { FormContext, Schema, useField, useFieldSchema } from '@formily/react';
+import uniq from 'lodash/uniq';
+import React, { createContext, useContext, useEffect, useMemo } from 'react';
 import { useCollectionManager } from '../collection-manager';
 import { BlockProvider, useBlockRequestContext } from './BlockProvider';
 export var TableBlockContext = /*#__PURE__*/createContext({});
@@ -41,18 +57,48 @@ var InternalTableBlockProvider = function InternalTableBlockProvider(props) {
   }, props.children);
 };
 
-var useAssociationNames = function useAssociationNames(collection) {
-  var _getCollectionFields;
-
+export var useAssociationNames = function useAssociationNames(collection) {
   var _useCollectionManager = useCollectionManager(),
       getCollectionFields = _useCollectionManager.getCollectionFields;
 
-  var names = (_getCollectionFields = getCollectionFields(collection)) === null || _getCollectionFields === void 0 ? void 0 : _getCollectionFields.filter(function (field) {
-    return field.target;
-  }).map(function (field) {
-    return field.name;
-  });
-  return names;
+  var collectionFields = getCollectionFields(collection);
+  var associationFields = new Set();
+
+  var _iterator = _createForOfIteratorHelper(collectionFields),
+      _step;
+
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var collectionField = _step.value;
+
+      if (collectionField.target) {
+        associationFields.add(collectionField.name);
+        var fields = getCollectionFields(collectionField.target);
+
+        var _iterator2 = _createForOfIteratorHelper(fields),
+            _step2;
+
+        try {
+          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+            var field = _step2.value;
+
+            if (field.target) {
+              associationFields.add("".concat(collectionField.name, ".").concat(field.name));
+            }
+          }
+        } catch (err) {
+          _iterator2.e(err);
+        } finally {
+          _iterator2.f();
+        }
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+
   var fieldSchema = useFieldSchema();
   var tableSchema = fieldSchema.reduceProperties(function (buf, schema) {
     if (schema['x-component'] === 'TableV2') {
@@ -60,11 +106,15 @@ var useAssociationNames = function useAssociationNames(collection) {
     }
 
     return buf;
-  }, null);
-  return tableSchema.reduceProperties(function (buf, schema) {
+  }, new Schema({}));
+  return uniq(tableSchema.reduceProperties(function (buf, schema) {
     if (schema['x-component'] === 'TableV2.Column') {
       var s = schema.reduceProperties(function (buf, s) {
-        if (s['x-collection-field'] && names.includes(s.name)) {
+        var _s$name$split = s.name.split('.'),
+            _s$name$split2 = _slicedToArray(_s$name$split, 1),
+            name = _s$name$split2[0];
+
+        if (s['x-collection-field'] && associationFields.has(name)) {
           return s;
         }
 
@@ -72,41 +122,56 @@ var useAssociationNames = function useAssociationNames(collection) {
       }, null);
 
       if (s) {
-        buf.push(s.name);
+        // 关联字段和关联的关联字段
+        var _s$name$split3 = s.name.split('.'),
+            _s$name$split4 = _slicedToArray(_s$name$split3, 1),
+            firstName = _s$name$split4[0];
+
+        if (associationFields.has(s.name)) {
+          buf.push(s.name);
+        } else if (associationFields.has(firstName)) {
+          buf.push(firstName);
+        }
       }
     }
 
     return buf;
-  }, []);
+  }, []));
 };
-
 export var TableBlockProvider = function TableBlockProvider(props) {
   var params = _objectSpread({}, props.params);
 
   var appends = useAssociationNames(props.collection);
+  var form = useMemo(function () {
+    return createForm();
+  }, []);
 
   if (props.dragSort) {
     params['sort'] = ['sort'];
   }
 
-  if (appends === null || appends === void 0 ? void 0 : appends.length) {
+  if (!Object.keys(params).includes('appends')) {
     params['appends'] = appends;
   }
 
-  return /*#__PURE__*/React.createElement(BlockProvider, _objectSpread(_objectSpread({}, props), {}, {
+  return /*#__PURE__*/React.createElement(FormContext.Provider, {
+    value: form
+  }, /*#__PURE__*/React.createElement(BlockProvider, _objectSpread(_objectSpread({}, props), {}, {
     params: params
   }), /*#__PURE__*/React.createElement(InternalTableBlockProvider, _objectSpread(_objectSpread({}, props), {}, {
     params: params
-  })));
+  }))));
 };
 export var useTableBlockContext = function useTableBlockContext() {
   return useContext(TableBlockContext);
 };
 export var useTableBlockProps = function useTableBlockProps() {
-  var _ctx$service6, _ctx$service7, _ctx$params, _ctx$params2, _ctx$params3;
+  var _fieldSchema$parent, _fieldSchema$parent$x, _fieldSchema$parent$x2, _ctx$service6, _ctx$service7, _ctx$params, _ctx$params2, _ctx$params3;
 
   var field = useField();
+  var fieldSchema = useFieldSchema();
   var ctx = useTableBlockContext();
+  var globalSort = (_fieldSchema$parent = fieldSchema.parent) === null || _fieldSchema$parent === void 0 ? void 0 : (_fieldSchema$parent$x = _fieldSchema$parent['x-decorator-props']) === null || _fieldSchema$parent$x === void 0 ? void 0 : (_fieldSchema$parent$x2 = _fieldSchema$parent$x['params']) === null || _fieldSchema$parent$x2 === void 0 ? void 0 : _fieldSchema$parent$x2['sort'];
   useEffect(function () {
     var _ctx$service;
 
@@ -162,14 +227,16 @@ export var useTableBlockProps = function useTableBlockProps() {
         }, _callee);
       }))();
     },
-    onChange: function onChange(_ref2) {
+    onChange: function onChange(_ref2, filters, sorter) {
       var _ctx$service$params;
 
       var current = _ref2.current,
           pageSize = _ref2.pageSize;
+      var sort = sorter.order ? sorter.order === "ascend" ? [sorter.field] : ["-".concat(sorter.field)] : globalSort || null;
       ctx.service.run(_objectSpread(_objectSpread({}, (_ctx$service$params = ctx.service.params) === null || _ctx$service$params === void 0 ? void 0 : _ctx$service$params[0]), {}, {
         page: current,
-        pageSize: pageSize
+        pageSize: pageSize,
+        sort: sort
       }));
     }
   };

package/es/block-provider/TableFieldProvider.d.ts

@@ -22,6 +22,7 @@ export declare class TableFieldResource {
     update(options: any): Promise<void>;
     destroy(options: any): Promise<void>;
 }
+export declare const WithoutTableFieldResource: React.Context<any>;
 export declare const TableFieldProvider: (props: any) => JSX.Element;
 export declare const useTableFieldContext: () => any;
 export declare const useTableFieldProps: () => {

package/es/block-provider/TableFieldProvider.js

@@ -250,10 +250,13 @@ export var TableFieldResource = /*#__PURE__*/function () {
 
   return TableFieldResource;
 }();
+export var WithoutTableFieldResource = /*#__PURE__*/createContext(null);
 export var TableFieldProvider = function TableFieldProvider(props) {
-  return /*#__PURE__*/React.createElement(BlockProvider, _objectSpread({
+  return /*#__PURE__*/React.createElement(WithoutTableFieldResource.Provider, {
+    value: false
+  }, /*#__PURE__*/React.createElement(BlockProvider, _objectSpread({
     block: 'TableField'
-  }, props), /*#__PURE__*/React.createElement(InternalTableFieldProvider, _objectSpread({}, props)));
+  }, props), /*#__PURE__*/React.createElement(InternalTableFieldProvider, _objectSpread({}, props))));
 };
 export var useTableFieldContext = function useTableFieldContext() {
   return useContext(TableFieldContext);