@nocobase/client 0.11.0-alpha.1 → 0.11.1-alpha.1

package/es/acl/ACLProvider.js

@@ -145,15 +145,17 @@ var getIgnoreScope = function getIgnoreScope() {
 };
 var useAllowedActions = function useAllowedActions() {
   var _result$allowedAction, _result$service, _result$service$data, _result$service$data$;
+  var service = useResourceActionContext();
   var result = useBlockRequestContext() || {
-    service: useResourceActionContext()
+    service: service
   };
   return (_result$allowedAction = result === null || result === void 0 ? void 0 : result.allowedActions) !== null && _result$allowedAction !== void 0 ? _result$allowedAction : result === null || result === void 0 ? void 0 : (_result$service = result.service) === null || _result$service === void 0 ? void 0 : (_result$service$data = _result$service.data) === null || _result$service$data === void 0 ? void 0 : (_result$service$data$ = _result$service$data.meta) === null || _result$service$data$ === void 0 ? void 0 : _result$service$data$.allowedActions;
 };
 var useResourceName = function useResourceName() {
   var _result$props, _result$service2, _result$service2$defa;
+  var service = useResourceActionContext();
   var result = useBlockRequestContext() || {
-    service: useResourceActionContext()
+    service: service
   };
   return (result === null || result === void 0 ? void 0 : (_result$props = result.props) === null || _result$props === void 0 ? void 0 : _result$props.resource) || (result === null || result === void 0 ? void 0 : (_result$service2 = result.service) === null || _result$service2 === void 0 ? void 0 : (_result$service2$defa = _result$service2.defaultRequest) === null || _result$service2$defa === void 0 ? void 0 : _result$service2$defa.resource);
 };
@@ -283,12 +285,6 @@ export var ACLCollectionFieldProvider = function ACLCollectionFieldProvider(prop
   var field = useField();
   var _useACLRoleContext4 = useACLRoleContext(),
     allowAll = _useACLRoleContext4.allowAll;
-  if (allowAll) {
-    return /*#__PURE__*/React.createElement(React.Fragment, null, props.children);
-  }
-  if (!fieldSchema['x-collection-field']) {
-    return /*#__PURE__*/React.createElement(React.Fragment, null, props.children);
-  }
   var _useACLFieldWhitelist = useACLFieldWhitelist(),
     whitelist = _useACLFieldWhitelist.whitelist;
   var allowed = whitelist.length > 0 ? whitelist.includes(fieldSchema.name) : true;
@@ -298,6 +294,12 @@ export var ACLCollectionFieldProvider = function ACLCollectionFieldProvider(prop
       field.display = 'hidden';
     }
   }, [allowed]);
+  if (allowAll) {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, props.children);
+  }
+  if (!fieldSchema['x-collection-field']) {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, props.children);
+  }
   if (!allowed) {
     return null;
   }

package/es/acl/Configuration/MenuConfigure.js

@@ -1,4 +1,9 @@
 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; }
+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) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+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); }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -162,6 +167,20 @@ export var MenuConfigure = function MenuConfigure() {
       return _ref.apply(this, arguments);
     };
   }();
+  var translateTitle = function translateTitle(menus) {
+    return menus.map(function (menu) {
+      var title = t(menu.title);
+      if (menu.children) {
+        return _objectSpread(_objectSpread({}, menu), {}, {
+          title: title,
+          children: translateTitle(menu.children)
+        });
+      }
+      return _objectSpread(_objectSpread({}, menu), {}, {
+        title: title
+      });
+    });
+  };
   return /*#__PURE__*/React.createElement(Table, {
     className: styles,
     loading: loading,
@@ -223,6 +242,6 @@ export var MenuConfigure = function MenuConfigure() {
         });
       }
     }],
-    dataSource: items
+    dataSource: translateTitle(items)
   });
 };

package/es/acl/Configuration/schemas/useRoleResourceValues.d.ts

@@ -1 +1,32 @@
-export declare const useRoleResourceValues: (options: any) => any;
+export declare const useRoleResourceValues: (options: any) => {
+    state: {};
+    setState: import("ahooks/lib/useSetState").SetState<{}>;
+    loading: boolean;
+    data?: {
+        appends: string[];
+        filterByTk: any;
+    };
+    error?: Error;
+    params: any;
+    cancel: () => void;
+    refresh: () => void;
+    refreshAsync: () => Promise<{
+        appends: string[];
+        filterByTk: any;
+    }>;
+    run: (...params: any) => void;
+    runAsync: (...params: any) => Promise<{
+        appends: string[];
+        filterByTk: any;
+    }>;
+    mutate: (data?: {
+        appends: string[];
+        filterByTk: any;
+    } | ((oldData?: {
+        appends: string[];
+        filterByTk: any;
+    }) => {
+        appends: string[];
+        filterByTk: any;
+    })) => void;
+};

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

@@ -3,8 +3,10 @@ import { Result } from 'ahooks/es/useRequest/src/types';
 export declare class APIClient extends APIClientSDK {
     services: Record<string, Result<any, any>>;
     silence: boolean;
+    /** 该值会在 AntdAppProvider 中被重新赋值 */
+    notification: any;
     service(uid: string): Result<any, any>;
     interceptors(): void;
-    notification(): void;
+    useNotificationMiddleware(): void;
     silent(): this;
 }

package/es/api-client/APIClient.js

@@ -14,15 +14,15 @@ function _assertThisInitialized(self) { if (self === void 0) { throw new Referen
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : 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 { notification } from 'antd';
 import React from 'react';
-var handleErrorMessage = function handleErrorMessage(error) {
+var handleErrorMessage = function handleErrorMessage(error, notification) {
   var _error$response;
   var reader = new FileReader();
   reader.readAsText(error === null || error === void 0 ? void 0 : (_error$response = error.response) === null || _error$response === void 0 ? void 0 : _error$response.data, 'utf-8');
   reader.onload = function () {
     var _JSON$parse$errors, _JSON$parse$errors$ma;
-    _notification.error({
+    notification.error({
       message: (_JSON$parse$errors = JSON.parse(reader.result).errors) === null || _JSON$parse$errors === void 0 ? void 0 : (_JSON$parse$errors$ma = _JSON$parse$errors.map) === null || _JSON$parse$errors$ma === void 0 ? void 0 : _JSON$parse$errors$ma.call(_JSON$parse$errors, function (error) {
         return /*#__PURE__*/React.createElement('div', {
           children: error.message
@@ -44,6 +44,8 @@ export var APIClient = /*#__PURE__*/function (_APIClientSDK) {
     _this = _super.call.apply(_super, [this].concat(args));
     _this.services = {};
     _this.silence = false;
+    /** 该值会在 AntdAppProvider 中被重新赋值 */
+    _this.notification = notification;
     return _this;
   }
   _createClass(APIClient, [{
@@ -63,11 +65,11 @@ export var APIClient = /*#__PURE__*/function (_APIClientSDK) {
         return config;
       });
       _get(_getPrototypeOf(APIClient.prototype), "interceptors", this).call(this);
-      this.notification();
+      this.useNotificationMiddleware();
     }
   }, {
-    key: "notification",
-    value: function notification() {
+    key: "useNotificationMiddleware",
+    value: function useNotificationMiddleware() {
       var _this2 = this;
       this.axios.interceptors.response.use(function (response) {
         return response;
@@ -81,7 +83,7 @@ export var APIClient = /*#__PURE__*/function (_APIClientSDK) {
           return window.location.href = redirectTo;
         }
         if ((error === null || error === void 0 ? void 0 : (_error$response3 = error.response) === null || _error$response3 === void 0 ? void 0 : (_error$response3$data = _error$response3.data) === null || _error$response3$data === void 0 ? void 0 : _error$response3$data.type) === 'application/json') {
-          handleErrorMessage(error);
+          handleErrorMessage(error, _this2.notification);
         } else {
           var _error$response4, _error$response4$data, _errs, _errs$map;
           if (errorCache.size > 10) {
@@ -101,7 +103,7 @@ export var APIClient = /*#__PURE__*/function (_APIClientSDK) {
           if (errs.length === 0) {
             throw error;
           }
-          _notification.error({
+          _this2.notification.error({
             message: (_errs = errs) === null || _errs === void 0 ? void 0 : (_errs$map = _errs.map) === null || _errs$map === void 0 ? void 0 : _errs$map.call(_errs, function (error) {
               return /*#__PURE__*/React.createElement('div', {}, error.message);
             })

package/es/api-client/hooks/useRequest.d.ts

@@ -1,6 +1,7 @@
 import { Options } from 'ahooks/es/useRequest/src/types';
 import { AxiosRequestConfig } from 'axios';
 type FunctionService = (...args: any[]) => Promise<any>;
+export type ReturnTypeOfUseRequest<TData = any> = ReturnType<typeof useRequest<TData>>;
 export type ResourceActionOptions<P = any> = {
     resource?: string;
     resourceOf?: any;
@@ -9,5 +10,18 @@ export type ResourceActionOptions<P = any> = {
 };
 export declare function useRequest<P>(service: AxiosRequestConfig<P> | ResourceActionOptions<P> | FunctionService, options?: Options<any, any> & {
     uid?: string;
-}): any;
+}): {
+    state: {};
+    setState: import("ahooks/lib/useSetState").SetState<{}>;
+    loading: boolean;
+    data?: P;
+    error?: Error;
+    params: any;
+    cancel: () => void;
+    refresh: () => void;
+    refreshAsync: () => Promise<P>;
+    run: (...params: any) => void;
+    runAsync: (...params: any) => Promise<P>;
+    mutate: (data?: P | ((oldData?: P) => P)) => void;
+};
 export {};

package/es/api-client/hooks/useRequest.js

@@ -17,9 +17,8 @@ import { merge } from '@formily/shared';
 import { useSetState } from 'ahooks';
 import { default as useReq } from 'ahooks/es/useRequest';
 import cloneDeep from 'lodash/cloneDeep';
-import { useContext } from 'react';
-import { APIClientContext } from '../context';
 import { assign } from './assign';
+import { useAPIClient } from './useAPIClient';
 export function useRequest(service) {
   var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   // 缓存用途
@@ -27,8 +26,8 @@ export function useRequest(service) {
     _useSetState2 = _slicedToArray(_useSetState, 2),
     state = _useSetState2[0],
     setState = _useSetState2[1];
-  var api = useContext(APIClientContext);
-  var tempOptions, tempService;
+  var api = useAPIClient();
+  var tempService;
   if (typeof service === 'function') {
     tempService = service;
   } else {
@@ -67,7 +66,7 @@ export function useRequest(service) {
       };
     }();
   }
-  tempOptions = _objectSpread(_objectSpread({}, options), {}, {
+  var tempOptions = _objectSpread(_objectSpread({}, options), {}, {
     onSuccess: function onSuccess() {
       var _options$onSuccess;
       for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {

package/es/api-client/hooks/useResource.js

@@ -1,6 +1,5 @@
-import { useContext } from 'react';
-import { APIClientContext } from '../context';
+import { useAPIClient } from './useAPIClient';
 export function useResource(name, of) {
-  var apiClient = useContext(APIClientContext);
+  var apiClient = useAPIClient();
   return apiClient.resource(name, of);
 }

package/es/application/hooks/useAppPluginLoad.js

@@ -31,15 +31,16 @@ export function useAppPluginLoad(app) {
               _context.next = 3;
               return app.load();
             case 3:
-              _context.next = 8;
+              _context.next = 9;
               break;
             case 5:
               _context.prev = 5;
               _context.t0 = _context["catch"](0);
+              console.error(_context.t0);
               setError(_context.t0);
-            case 8:
-              setLoading(false);
             case 9:
+              setLoading(false);
+            case 10:
             case "end":
               return _context.stop();
           }

package/es/async-data-provider/index.js

@@ -15,12 +15,12 @@ export var AsyncDataProvider = function AsyncDataProvider(props) {
     request = props.request,
     children = props.children,
     others = _objectWithoutProperties(props, _excluded);
+  var result = useRequest(request, _objectSpread({}, others));
   if (value) {
     return /*#__PURE__*/React.createElement(AsyncDataContext.Provider, {
       value: value
     }, children);
   }
-  var result = useRequest(request, _objectSpread({}, others));
   return /*#__PURE__*/React.createElement(AsyncDataContext.Provider, {
     value: result
   }, children);

package/es/auth/SigninPage.js

@@ -21,7 +21,7 @@ import { Space, Tabs } from 'antd';
 import React, { createContext, createElement, useCallback, useContext, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useNavigate, useSearchParams } from 'react-router-dom';
-import { useAPIClient, useCurrentDocumentTitle, useRequest, useViewport } from '..';
+import { useAPIClient, useCurrentDocumentTitle, useCurrentUserContext, useRequest, useViewport } from '..';
 import { useSigninPageExtension } from './SigninPageExtension';
 var SigninPageContext = /*#__PURE__*/createContext({});
 export var SigninPageProvider = function SigninPageProvider(props) {
@@ -51,6 +51,8 @@ export var useSignIn = function useSignIn(authenticator) {
   var form = useForm();
   var api = useAPIClient();
   var redirect = useRedirect();
+  var _useCurrentUserContex = useCurrentUserContext(),
+    refreshAsync = _useCurrentUserContex.refreshAsync;
   return {
     run: function run() {
       return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
@@ -63,8 +65,11 @@ export var useSignIn = function useSignIn(authenticator) {
               _context.next = 4;
               return api.auth.signIn(form.values, authenticator);
             case 4:
+              _context.next = 6;
+              return refreshAsync();
+            case 6:
               redirect();
-            case 5:
+            case 7:
             case "end":
               return _context.stop();
           }
@@ -132,7 +137,7 @@ export var SigninPage = function SigninPage() {
   }, tabs.length > 1 ? /*#__PURE__*/React.createElement(Tabs, {
     items: tabs.map(function (tab) {
       return {
-        label: tab.tabTitle,
+        label: t(tab.tabTitle),
         key: tab.name,
         children: tab.component
       };

package/es/block-provider/FormBlockProvider.js

@@ -6,8 +6,8 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 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); }
 import { createForm } from '@formily/core';
 import { RecursionField, useField, useFieldSchema } from '@formily/react';
-import { isEmpty } from 'lodash';
 import { Spin } from 'antd';
+import { isEmpty } from 'lodash';
 import React, { createContext, useContext, useEffect, useMemo, useRef } from 'react';
 import { useCollection } from '../collection-manager';
 import { RecordProvider, useRecord } from '../record-provider';
@@ -84,8 +84,15 @@ export var FormBlockProvider = function FormBlockProvider(props) {
   }
   var createFlag = currentCollection.name === ((collection === null || collection === void 0 ? void 0 : collection.name) || collection) && !isEmptyRecord || !currentCollection.name;
   return (detailFlag || createFlag) && /*#__PURE__*/React.createElement(BlockProvider, _objectSpread(_objectSpread({}, props), {}, {
-    block: 'form'
-  }), /*#__PURE__*/React.createElement(InternalFormBlockProvider, _objectSpread({}, props)));
+    block: 'form',
+    params: _objectSpread(_objectSpread({}, props === null || props === void 0 ? void 0 : props.params), {}, {
+      targetCollection: collection
+    })
+  }), /*#__PURE__*/React.createElement(InternalFormBlockProvider, _objectSpread(_objectSpread({}, props), {}, {
+    params: _objectSpread(_objectSpread({}, props === null || props === void 0 ? void 0 : props.params), {}, {
+      targetCollection: collection
+    })
+  })));
 };
 export var useFormBlockContext = function useFormBlockContext() {
   return useContext(FormBlockContext);

package/es/block-provider/GanttBlockProvider.js

@@ -104,7 +104,8 @@ export var useGanttBlockProps = function useGanttBlockProps() {
   var _useCollection = useCollection(),
     getPrimaryKey = _useCollection.getPrimaryKey,
     name = _useCollection.name,
-    template = _useCollection.template;
+    template = _useCollection.template,
+    writableView = _useCollection.writableView;
   var _useACLRoleContext = useACLRoleContext(),
     parseAction = _useACLRoleContext.parseAction;
   var primaryKey = getPrimaryKey();
@@ -116,7 +117,7 @@ export var useGanttBlockProps = function useGanttBlockProps() {
       schema: schema,
       recordPkValue: recordPkValue
     });
-    return template === 'view' || !params;
+    return template === 'view' && !writableView || !params;
   };
   var onExpanderClick = function onExpanderClick(task) {
     var data = ctx.field.data;

package/es/block-provider/TableBlockProvider.js

@@ -23,7 +23,6 @@ import { FormContext, useField, useFieldSchema } from '@formily/react';
 import React, { createContext, useContext, useEffect, useMemo, useState } from 'react';
 import { useCollectionManager } from '../collection-manager';
 import { useFilterBlock } from '../filter-provider/FilterProvider';
-import { useRecord } from '../record-provider';
 import { FixedBlockWrapper, removeNullCondition, SchemaComponentOptions } from '../schema-component';
 import { BlockProvider, RenderChildrenWithAssociationFilter, useBlockRequestContext } from './BlockProvider';
 import { findFilterTargets } from './hooks';
@@ -93,59 +92,9 @@ var InternalTableBlockProvider = function InternalTableBlockProvider(props) {
     }
   }, /*#__PURE__*/React.createElement(RenderChildrenWithAssociationFilter, _objectSpread({}, props))));
 };
-// export const useAssociationNames = (collection) => {
-//   const { getCollectionFields } = useCollectionManager();
-//   const collectionFields = getCollectionFields(collection);
-//   const associationFields = new Set();
-//   for (const collectionField of collectionFields) {
-//     if (collectionField.target) {
-//       associationFields.add(collectionField.name);
-//       const fields = getCollectionFields(collectionField.target);
-//       for (const field of fields) {
-//         if (field.target) {
-//           associationFields.add(`${collectionField.name}.${field.name}`);
-//         }
-//       }
-//     }
-//   }
-//   const fieldSchema = useFieldSchema();
-//   const tableSchema = fieldSchema.reduceProperties((buf, schema) => {
-//     if (schema['x-component'] === 'TableV2') {
-//       return schema;
-//     }
-//     if (schema['x-component'] === 'Gantt') {
-//       return schema.properties?.table;
-//     }
-//     return buf;
-//   }, new Schema({}));
-//   return uniq(
-//     tableSchema.reduceProperties((buf, schema) => {
-//       if (schema['x-component'] === 'TableV2.Column') {
-//         const s = schema.reduceProperties((buf, s) => {
-//           const [name] = (s.name as string).split('.');
-//           if (s['x-collection-field'] && associationFields.has(name)) {
-//             return s;
-//           }
-//           return buf;
-//         }, null);
-//         if (s) {
-//           // 关联字段和关联的关联字段
-//           const [firstName] = s.name.split('.');
-//           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 resourceName = props.resource;
   var params = _objectSpread({}, props.params);
-  var record = useRecord();
   var fieldSchema = useFieldSchema();
   var _useCollectionManager = useCollectionManager(),
     getCollection = _useCollectionManager.getCollection,
@@ -206,6 +155,7 @@ export var useTableBlockProps = function useTableBlockProps() {
     var _ctx$service;
     if (!(ctx !== null && ctx !== void 0 && (_ctx$service = ctx.service) !== null && _ctx$service !== void 0 && _ctx$service.loading)) {
       var _ctx$service2, _ctx$service2$data, _ctx$field, _ctx$field$data, _ctx$service3, _ctx$service3$data, _ctx$service3$data$me, _ctx$service4, _ctx$service4$data, _ctx$service4$data$me, _ctx$service5, _ctx$service5$data, _ctx$service5$data$me;
+      field.value = [];
       field.value = ctx === null || ctx === void 0 ? void 0 : (_ctx$service2 = ctx.service) === null || _ctx$service2 === void 0 ? void 0 : (_ctx$service2$data = _ctx$service2.data) === null || _ctx$service2$data === void 0 ? void 0 : _ctx$service2$data.data;
       field.data = field.data || {};
       field.data.selectedRowKeys = ctx === null || ctx === void 0 ? void 0 : (_ctx$field = ctx.field) === null || _ctx$field === void 0 ? void 0 : (_ctx$field$data = _ctx$field.data) === null || _ctx$field$data === void 0 ? void 0 : _ctx$field$data.selectedRowKeys;

package/es/block-provider/hooks/index.d.ts

@@ -69,11 +69,13 @@ export declare const useDetailsPaginationProps: () => {
 };
 export declare const useAssociationFilterProps: () => {
     /** 渲染 Collapse 的列表数据 */
-    list: any;
+    list: {
+        [key: string]: any;
+    }[];
     onSelected: (value: any) => void;
     handleSearchInput: (e: ChangeEvent<any>) => void;
     params: any;
-    run: any;
+    run: (...params: any) => void;
 };
 export declare const useOptionalFieldList: () => import("../..").FieldOptions[];
 export declare const useAssociationFilterBlockProps: () => {
@@ -88,7 +90,7 @@ export declare const useAssociationFilterBlockProps: () => {
 } | {
     /** 渲染 Collapse 的列表数据 */
     list: any;
-    onSelected: any;
+    onSelected: (value: any) => void;
     handleSearchInput: any;
     params: any;
     run: any;