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

package/es/acl/ACLProvider.js

@@ -158,11 +158,11 @@ var getIgnoreScope = function getIgnoreScope() {
   return ignoreScope;
 };
 var useAllowedActions = function useAllowedActions() {
-  var _result$service, _result$service$data, _result$service$data$;
+  var _result$allowedAction, _result$service, _result$service$data, _result$service$data$;
   var result = useBlockRequestContext() || {
     service: useResourceActionContext()
   };
-  return 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;
+  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;

package/es/acl/Configuration/RoleConfigure.js

@@ -26,19 +26,20 @@ var SnippetCheckboxGroup = connect(function (props) {
     },
     value: props.value,
     onChange: function onChange(values) {
+      var snippets = ['ui.*', 'pm', 'pm.*', 'app'];
+      var disallowSnippets = snippets.map(function (key) {
+        return "!".concat(key);
+      });
       var value = uniq([].concat(_toConsumableArray(props.value || []), _toConsumableArray(values))).filter(function (key) {
-        return key && !['!ui.*', '!pm', '!pm.*'].includes(key);
+        return key && !disallowSnippets.includes(key);
       }).map(function (key) {
-        if (!['ui.*', 'pm', 'pm.*'].includes(key)) {
-          return key;
-        }
-        if (values === null || values === void 0 ? void 0 : values.includes(key)) {
+        if (!snippets.includes(key) || (values === null || values === void 0 ? void 0 : values.includes(key))) {
           return key;
         }
         return "!".concat(key);
       });
-      for (var _i = 0, _arr = ['ui.*', 'pm', 'pm.*']; _i < _arr.length; _i++) {
-        var key = _arr[_i];
+      for (var _i = 0, _snippets = snippets; _i < _snippets.length; _i++) {
+        var key = _snippets[_i];
         if (!value.includes(key) && !value.includes("!".concat(key))) {
           value.push("!".concat(key));
         }
@@ -63,7 +64,13 @@ var SnippetCheckboxGroup = connect(function (props) {
     }
   }, /*#__PURE__*/React.createElement(Checkbox, {
     value: "pm.*"
-  }, t('Allows to configure plugins'))));
+  }, t('Allows to configure plugins'))), /*#__PURE__*/React.createElement("div", {
+    style: {
+      marginTop: 8
+    }
+  }, /*#__PURE__*/React.createElement(Checkbox, {
+    value: "app"
+  }, t('Allows to clear cache, reboot application'))));
 });
 export var RoleConfigure = function RoleConfigure() {
   var _useContext = useContext(PermissionContext),

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

@@ -2,7 +2,9 @@ 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>>;
+    silence: boolean;
     service(uid: string): Result<any, any>;
     interceptors(): void;
     notification(): void;
+    silent(): this;
 }

package/es/api-client/APIClient.js

@@ -42,6 +42,7 @@ export var APIClient = /*#__PURE__*/function (_APIClientSDK) {
     }
     _this = _super.call.apply(_super, [this].concat(args));
     _this.services = {};
+    _this.silence = false;
     return _this;
   }
   _createClass(APIClient, [{
@@ -66,10 +67,14 @@ export var APIClient = /*#__PURE__*/function (_APIClientSDK) {
   }, {
     key: "notification",
     value: function notification() {
+      var _this2 = this;
       this.axios.interceptors.response.use(function (response) {
         return response;
       }, function (error) {
         var _error$response2, _error$response2$data, _error$response3, _error$response3$data;
+        if (_this2.silence) {
+          throw error;
+        }
         var redirectTo = 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$data.redirectTo;
         if (redirectTo) {
           return window.location.href = redirectTo;
@@ -89,6 +94,12 @@ export var APIClient = /*#__PURE__*/function (_APIClientSDK) {
         throw error;
       });
     }
+  }, {
+    key: "silent",
+    value: function silent() {
+      this.silence = true;
+      return this;
+    }
   }]);
   return APIClient;
 }(APIClientSDK);

package/es/block-provider/BlockProvider.js

@@ -4,6 +4,12 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 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; }
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
+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 _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 _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 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); }); }; }
@@ -15,9 +21,10 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 import { css } from '@emotion/css';
 import { RecursionField, useField, useFieldSchema } from '@formily/react';
 import { useRequest } from 'ahooks';
+import merge from 'deepmerge';
 import { Col, Row } from 'antd';
 import template from 'lodash/template';
-import React, { createContext, useContext } from 'react';
+import React, { createContext, useContext, useEffect, useRef, useState } from 'react';
 import { Link } from 'react-router-dom';
 import { ACLCollectionProvider, TableFieldResource, WithoutTableFieldResource, useAPIClient, useActionContext, useDesignable, useRecord } from '../';
 import { CollectionProvider, useCollection, useCollectionManager } from '../collection-manager';
@@ -46,15 +53,19 @@ var useResource = function useResource(props) {
     useSourceId = props.useSourceId;
   var record = useRecord();
   var api = useAPIClient();
+  var _useActionContext = useActionContext(),
+    fieldSchema = _useActionContext.fieldSchema;
+  var isCreateAction = (fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-action']) === 'create';
   var association = useAssociation(props);
   var sourceId = useSourceId === null || useSourceId === void 0 ? void 0 : useSourceId();
   var field = useField();
   if (block === 'TableField') {
+    var _record$__parent;
     var options = {
       field: field,
       api: api,
       resource: resource,
-      sourceId: sourceId || record[(association === null || association === void 0 ? void 0 : association.sourceKey) || 'id']
+      sourceId: !isCreateAction ? sourceId || record[(association === null || association === void 0 ? void 0 : association.sourceKey) || 'id'] || (record === null || record === void 0 ? void 0 : (_record$__parent = record.__parent) === null || _record$__parent === void 0 ? void 0 : _record$__parent[(association === null || association === void 0 ? void 0 : association.sourceKey) || 'id']) : undefined
     };
     return new TableFieldResource(options);
   }
@@ -83,22 +94,26 @@ export var useResourceAction = function useResourceAction(props) {
    */
   var resource = props.resource,
     action = props.action,
-    tableFieldName = props.fieldName;
+    tableFieldName = props.fieldName,
+    _props$runWhenParamsC = props.runWhenParamsChanged,
+    runWhenParamsChanged = _props$runWhenParamsC === void 0 ? false : _props$runWhenParamsC;
   var _useCollection = useCollection(),
     fields = _useCollection.fields;
-  var appends = fields === null || fields === void 0 ? void 0 : fields.filter(function (field) {
-    return field.target;
-  }).map(function (field) {
-    return field.name;
-  });
   var params = useActionParams(props);
   var api = useAPIClient();
   var fieldSchema = useFieldSchema();
-  var _useActionContext = useActionContext(),
-    snapshot = _useActionContext.snapshot;
+  var _useActionContext2 = useActionContext(),
+    snapshot = _useActionContext2.snapshot;
   var record = useRecord();
-  if (!Object.keys(params).includes('appends') && (appends === null || appends === void 0 ? void 0 : appends.length)) {
-    params['appends'] = appends;
+  if (!Reflect.has(params, 'appends')) {
+    var appends = fields === null || fields === void 0 ? void 0 : fields.filter(function (field) {
+      return field.target;
+    }).map(function (field) {
+      return field.name;
+    });
+    if (appends === null || appends === void 0 ? void 0 : appends.length) {
+      params['appends'] = appends;
+    }
   }
   var result = useRequest(snapshot ? /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
     var _record$tableFieldNam;
@@ -117,8 +132,8 @@ export var useResourceAction = function useResourceAction(props) {
     if (!action) {
       return Promise.resolve({});
     }
-    var actionParams = _objectSpread({}, opts);
-    if (params.appends) {
+    var actionParams = _objectSpread(_objectSpread({}, params), opts);
+    if (params === null || params === void 0 ? void 0 : params.appends) {
       actionParams.appends = params.appends;
     }
     return resource[action](actionParams).then(function (res) {
@@ -133,8 +148,20 @@ export var useResourceAction = function useResourceAction(props) {
       }
     },
     defaultParams: [params],
-    refreshDeps: [JSON.stringify(params.appends)]
+    refreshDeps: [runWhenParamsChanged ? null : JSON.stringify(params.appends)]
   }));
+  // automatic run service when params has changed
+  var firstRun = useRef(false);
+  useEffect(function () {
+    if (!runWhenParamsChanged) {
+      return;
+    }
+    if (firstRun.current) {
+      var _result$params;
+      result === null || result === void 0 ? void 0 : result.run(_objectSpread(_objectSpread({}, result === null || result === void 0 ? void 0 : (_result$params = result.params) === null || _result$params === void 0 ? void 0 : _result$params[0]), params));
+    }
+    firstRun.current = true;
+  }, [JSON.stringify(params), runWhenParamsChanged]);
   return result;
 };
 export var MaybeCollectionProvider = function MaybeCollectionProvider(props) {
@@ -144,14 +171,28 @@ export var MaybeCollectionProvider = function MaybeCollectionProvider(props) {
   }, /*#__PURE__*/React.createElement(ACLCollectionProvider, null, props.children)) : /*#__PURE__*/React.createElement(React.Fragment, null, props.children);
 };
 var BlockRequestProvider = function BlockRequestProvider(props) {
+  var _service$data, _service$data$meta;
   var field = useField();
   var resource = useBlockResource();
+  var _useState = useState({}),
+    _useState2 = _slicedToArray(_useState, 2),
+    allowedActions = _useState2[0],
+    setAllowedActions = _useState2[1];
   var service = useResourceAction(_objectSpread(_objectSpread({}, props), {}, {
     resource: resource
   }), _objectSpread({}, props.requestOptions));
+  // Infinite scroll support
+  var serviceAllowedActions = service === null || service === void 0 ? void 0 : (_service$data = service.data) === null || _service$data === void 0 ? void 0 : (_service$data$meta = _service$data.meta) === null || _service$data$meta === void 0 ? void 0 : _service$data$meta.allowedActions;
+  useEffect(function () {
+    if (!serviceAllowedActions) return;
+    setAllowedActions(function (last) {
+      return merge(last, serviceAllowedActions !== null && serviceAllowedActions !== void 0 ? serviceAllowedActions : {});
+    });
+  }, [serviceAllowedActions]);
   var __parent = useContext(BlockRequestContext);
   return /*#__PURE__*/React.createElement(BlockRequestContext.Provider, {
     value: {
+      allowedActions: allowedActions,
       block: props.block,
       props: props,
       field: field,
@@ -258,9 +299,9 @@ export var useSourceIdFromParentRecord = function useSourceIdFromParentRecord()
     getCollectionField = _useCollectionManager4.getCollectionField;
   var assoc = useContext(BlockAssociationContext);
   if (assoc) {
-    var _record$__parent;
+    var _record$__parent2;
     var association = getCollectionField(assoc);
-    return record === null || record === void 0 ? void 0 : (_record$__parent = record.__parent) === null || _record$__parent === void 0 ? void 0 : _record$__parent[association.sourceKey || 'id'];
+    return record === null || record === void 0 ? void 0 : (_record$__parent2 = record.__parent) === null || _record$__parent2 === void 0 ? void 0 : _record$__parent2[association.sourceKey || 'id'];
   }
 };
 export var useParamsFromRecord = function useParamsFromRecord() {

package/es/block-provider/hooks/index.js

@@ -1,4 +1,3 @@
-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(_e) { throw _e; }, 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(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 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 _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); }
@@ -17,7 +16,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 import { Schema, SchemaExpressionScopeContext, useField, useFieldSchema, useForm } from '@formily/react';
 import { parse } from '@nocobase/utils/client';
 import { Modal, message } from 'antd';
-import { cloneDeep } from 'lodash';
+import { cloneDeep, uniq } from 'lodash';
 import get from 'lodash/get';
 import omit from 'lodash/omit';
 import { useContext, useEffect } from 'react';
@@ -32,6 +31,7 @@ import { transformToFilter } from '../../filter-provider/utils';
 import { useRecord } from '../../record-provider';
 import { removeNullCondition, useActionContext, useCompile } from '../../schema-component';
 import { BulkEditFormItemValueType } from '../../schema-initializer/components';
+import { useSchemaTemplateManager } from '../../schema-templates';
 import { useCurrentUserContext } from '../../user';
 import { useBlockRequestContext, useFilterByTk } from '../BlockProvider';
 import { useDetailsBlockContext } from '../DetailsBlockProvider';
@@ -195,7 +195,7 @@ export var useCreateActionProps = function useCreateActionProps() {
               _context2.next = 7;
               return form.submit();
             case 7:
-              values = getFormValues(filterByTk, field, form, fieldNames, getField, resource);
+              values = getFormValues(filterByTk, field, form, fieldNames, getField, resource); // const values = omitBy(formValues, (value) => isEqual(JSON.stringify(value), '[{}]'));
               if (addChild) {
                 treeParentField = getTreeParentField();
                 values[(_treeParentField$name = treeParentField === null || treeParentField === void 0 ? void 0 : treeParentField.name) !== null && _treeParentField$name !== void 0 ? _treeParentField$name : 'parent'] = currentRecord;
@@ -338,13 +338,14 @@ export var useAssociationCreateActionProps = function useAssociationCreateAction
               return _context3.abrupt("return");
             case 20:
               message.success(compile(onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage));
-              _context3.next = 26;
+              _context3.next = 27;
               break;
             case 23:
               _context3.prev = 23;
               _context3.t0 = _context3["catch"](11);
+              actionField.data.data = null;
               actionField.data.loading = false;
-            case 26:
+            case 27:
             case "end":
               return _context3.stop();
           }
@@ -1521,74 +1522,70 @@ export var useAssociationFilterBlockProps = function useAssociationFilterBlockPr
     labelKey: labelKey
   };
 };
+var getTemplateSchema = function getTemplateSchema(schema) {
+  var conf = {
+    url: "/uiSchemas:getJsonSchema/".concat(schema === null || schema === void 0 ? void 0 : schema.uid)
+  };
+  var _useRequest3 = useRequest(conf, {
+      manual: true
+    }),
+    data = _useRequest3.data,
+    loading = _useRequest3.loading,
+    run = _useRequest3.run;
+  if (loading) {}
+  useEffect(function () {
+    if (schema === null || schema === void 0 ? void 0 : schema.uid) {
+      run();
+    }
+  }, [schema === null || schema === void 0 ? void 0 : schema.uid]);
+  return (schema === null || schema === void 0 ? void 0 : schema.uid) ? new Schema(data === null || data === void 0 ? void 0 : data.data) : null;
+};
 export var useAssociationNames = function useAssociationNames(collection) {
+  var _templateSchema$xCom;
   var _useCollectionManager2 = useCollectionManager(),
-    getCollectionFields = _useCollectionManager2.getCollectionFields,
     getCollectionJoinField = _useCollectionManager2.getCollectionJoinField;
-  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 _useSchemaTemplateMan = useSchemaTemplateManager(),
+    getTemplateById = _useSchemaTemplateMan.getTemplateById;
   var fieldSchema = useFieldSchema();
   var associationValues = [];
   var formSchema = fieldSchema.reduceProperties(function (buf, schema) {
-    if (['FormV2', 'Details'].includes(schema['x-component'])) {
+    if (['FormV2', 'Details', 'List', 'GridCard'].includes(schema['x-component'])) {
       return schema;
     }
     return buf;
   }, new Schema({}));
+  var templateSchema = formSchema.reduceProperties(function (buf, schema) {
+    if (schema['x-component'] === 'BlockTemplate') {
+      return schema;
+    }
+    return buf;
+  }, null);
   var getAssociationAppends = function getAssociationAppends(schema) {
     var arr = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-    return schema.reduceProperties(function (buf, s) {
+    var data = schema.reduceProperties(function (buf, s) {
       var collectionfield = s['x-collection-field'] && getCollectionJoinField(s['x-collection-field']);
-      if (collectionfield && ['createdBy', 'updatedBy', 'o2m', 'obo', 'oho', 'm2o', 'm2m'].includes(collectionfield.interface)) {
+      if (collectionfield && ['hasOne', 'hasMany', 'belongsTo', 'belongsToMany'].includes(collectionfield.type) && s['x-component'] !== 'TableField') {
         var _s$xComponentProps;
+        buf.push(s.name);
         if (['Nester', 'SubTable'].includes((_s$xComponentProps = s['x-component-props']) === null || _s$xComponentProps === void 0 ? void 0 : _s$xComponentProps.mode)) {
           associationValues.push(s.name);
         }
-        buf.push(s.name);
-        if (s['x-component-props'].mode === 'Nester' || s['x-component'] === 'TableField') {
+        if (s['x-component-props'].mode === 'Nester') {
           return getAssociationAppends(s, buf);
         }
         return buf;
       } else {
-        if (s['x-component'] === 'Grid' || s['x-component'] === 'TableV2') {
+        if (s['x-component'] === 'Grid.Row') {
           var _buf$concat;
           var kk = buf === null || buf === void 0 ? void 0 : (_buf$concat = buf.concat) === null || _buf$concat === void 0 ? void 0 : _buf$concat.call(buf);
           return getNesterAppends(s, kk || []);
         } else {
           var _s$xComponent;
-          return !((_s$xComponent = s['x-component']) === null || _s$xComponent === void 0 ? void 0 : _s$xComponent.includes('Action.')) && getAssociationAppends(s, buf);
+          return !((_s$xComponent = s['x-component']) === null || _s$xComponent === void 0 ? void 0 : _s$xComponent.includes('Action.')) && s['x-component'] !== 'TableField' ? getAssociationAppends(s, buf) : buf;
         }
       }
     }, arr);
+    return data || [];
   };
   function flattenNestedList(nestedList) {
     var flattenedList = [];
@@ -1597,17 +1594,26 @@ export var useAssociationNames = function useAssociationNames(collection) {
         if (Array.isArray(list[i])) {
           "".concat(prefix) !== "".concat(list[i][0]) && flattenHelper(list[i], "".concat(prefix, ".").concat(list[i][0]));
         } else {
-          var str = prefix.replaceAll("".concat(list[i]), '').replace('..', '.').trim();
-          !list.includes(str) && flattenedList.push("".concat(str).concat(list[i]));
+          var searchTerm = ".".concat(list[i]);
+          var lastIndex = prefix.lastIndexOf(searchTerm);
+          var str = '';
+          if (lastIndex !== -1) {
+            str = prefix.slice(0, lastIndex) + prefix.slice(lastIndex + searchTerm.length);
+          }
+          if (!str) {
+            !list.includes(str) && flattenedList.push("".concat(list[i]));
+          } else {
+            !list.includes(str) ? flattenedList.push("".concat(str, ".").concat(list[i])) : flattenedList.push(str);
+          }
         }
       }
     }
     for (var i = 0; i < nestedList.length; i++) {
       flattenHelper(nestedList[i], nestedList[i][0]);
     }
-    return flattenedList.filter(function (obj) {
-      return !obj.startsWith('.');
-    });
+    return uniq(flattenedList.filter(function (obj) {
+      return !(obj === null || obj === void 0 ? void 0 : obj.startsWith('.'));
+    }));
   }
   var getNesterAppends = function getNesterAppends(gridSchema, data) {
     gridSchema.reduceProperties(function (buf, s) {
@@ -1618,15 +1624,30 @@ export var useAssociationNames = function useAssociationNames(collection) {
       return g.length;
     });
   };
-  var data = getAssociationAppends(formSchema);
-  var associations = data.filter(function (g) {
-    return g.length;
-  });
-  var appends = flattenNestedList(associations);
-  return {
-    appends: appends,
-    updateAssociationValues: appends.filter(function (v) {
-      return associationValues.includes(v);
-    })
-  };
+  var template = getTemplateById(templateSchema === null || templateSchema === void 0 ? void 0 : (_templateSchema$xCom = templateSchema['x-component-props']) === null || _templateSchema$xCom === void 0 ? void 0 : _templateSchema$xCom.templateId);
+  var schema = getTemplateSchema(template);
+  if (schema) {
+    var associations = getAssociationAppends(schema);
+    var appends = flattenNestedList(associations);
+    return {
+      appends: appends,
+      updateAssociationValues: appends.filter(function (item) {
+        return associationValues.some(function (suffix) {
+          return item.endsWith(suffix);
+        });
+      })
+    };
+  }
+  if (!schema) {
+    var _associations = getAssociationAppends(formSchema);
+    var _appends = flattenNestedList(_associations);
+    return {
+      appends: _appends,
+      updateAssociationValues: _appends.filter(function (item) {
+        return associationValues.some(function (suffix) {
+          return item.endsWith(suffix);
+        });
+      })
+    };
+  }
 };

package/es/collection-manager/CollectionField.js

@@ -1,9 +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 _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); }
 import { connect, useField, useFieldSchema } from '@formily/react';
 import { merge } from '@formily/shared';
 import { concat } from 'lodash';
@@ -68,7 +68,7 @@ var InternalField = function InternalField(props) {
   if (!uiSchema) {
     return null;
   }
-  return /*#__PURE__*/React.createElement(Component, props, props.children);
+  return /*#__PURE__*/React.createElement(Component, _objectSpread({}, props));
 };
 export var InternalFallbackField = function InternalFallbackField() {
   var _fieldSchema$xCompon, _fieldSchema$xCompon2, _fieldSchema$xCompon3;
@@ -99,7 +99,7 @@ var DeletedField = function DeletedField() {
     style: {
       color: '#ccc'
     }
-  }, t('The field has bee deleted'));
+  }, t('The field has been deleted'));
 };
 export var CollectionField = connect(function (props) {
   var _fieldSchema$xCompon4;

package/es/collection-manager/CollectionFieldProvider.js

@@ -6,7 +6,8 @@ export var CollectionFieldProvider = function CollectionFieldProvider(props) {
   var name = props.name,
     field = props.field,
     children = props.children,
-    fallback = props.fallback;
+    _props$fallback = props.fallback,
+    fallback = _props$fallback === void 0 ? null : _props$fallback;
   var fieldSchema = useFieldSchema();
   var _useCollection = useCollection(),
     getField = _useCollection.getField;

package/es/collection-manager/Configuration/AddFieldAction.js

@@ -15,7 +15,7 @@ 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 { PlusOutlined } from '@ant-design/icons';
 import { ArrayTable } from '@formily/antd';
-import { useForm, useField } from '@formily/react';
+import { useField, useForm } from '@formily/react';
 import { uid } from '@formily/shared';
 import { Button, Dropdown, Menu } from 'antd';
 import { cloneDeep } from 'lodash';
@@ -24,10 +24,10 @@ import { useTranslation } from 'react-i18next';
 import { useRequest } from '../../api-client';
 import { RecordProvider, useRecord } from '../../record-provider';
 import { ActionContext, SchemaComponent, useActionContext, useCompile } from '../../schema-component';
+import { useResourceActionContext, useResourceContext } from '../ResourceActionProvider';
 import { useCancelAction } from '../action-hooks';
 import { useCollectionManager } from '../hooks';
 import { useOptions } from '../hooks/useOptions';
-import { useResourceActionContext, useResourceContext } from '../ResourceActionProvider';
 import * as components from './components';
 import { getOptions } from './interfaces';
 var getSchema = function getSchema(schema, record, compile) {
@@ -292,7 +292,7 @@ export var AddFieldAction = function AddFieldAction(props) {
         key: option.label,
         title: compile(option.label)
       }, option.children.filter(function (child) {
-        return !['o2o', 'subTable'].includes(child.name);
+        return !['o2o', 'subTable', 'linkTo'].includes(child.name);
       }).map(function (child) {
         return /*#__PURE__*/React.createElement(Menu.Item, {
           key: child.name,

package/es/collection-manager/Configuration/CollectionFields.d.ts

@@ -1,2 +1,2 @@
 export declare const isTitleField: (field: any) => boolean;
-export declare const CollectionFields: (props: any) => JSX.Element;
+export declare const CollectionFields: () => JSX.Element;

package/es/collection-manager/Configuration/CollectionFields.js

@@ -67,7 +67,6 @@ var CurrentFields = function CurrentFields(props) {
     loadingRecord = _React$useState2[0],
     setLoadingRecord = _React$useState2[1];
   var _useCollectionManager2 = useCollectionManager(),
-    updateCollection = _useCollectionManager2.updateCollection,
     refreshCM = _useCollectionManager2.refreshCM;
   var columns = [{
     dataIndex: ['uiSchema', 'title'],
@@ -192,7 +191,6 @@ var InheritFields = function InheritFields(props) {
   var _useTranslation2 = useTranslation(),
     t = _useTranslation2.t;
   var _useCollectionManager4 = useCollectionManager(),
-    updateCollection = _useCollectionManager4.updateCollection,
     refreshCM = _useCollectionManager4.refreshCM;
   var columns = [{
     dataIndex: ['uiSchema', 'title'],
@@ -286,7 +284,7 @@ var InheritFields = function InheritFields(props) {
     })
   });
 };
-export var CollectionFields = function CollectionFields(props) {
+export var CollectionFields = function CollectionFields() {
   var compile = useCompile();
   var field = useField();
   var _useRecord3 = useRecord(),