@nocobase/client 0.12.0-alpha.2 → 0.12.0-alpha.4

package/es/schema-settings/SchemaSettings.js

@@ -1,5 +1,5 @@
 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); }
-var _templateObject, _templateObject2, _templateObject3, _templateObject4;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6;
 var _excluded = ["children", "fieldSchema"],
   _excluded2 = ["title", "dn"],
   _excluded3 = ["title", "options", "value", "onChange", "openOnHover", "onClick"],
@@ -8,7 +8,6 @@ var _excluded = ["children", "fieldSchema"],
   _excluded6 = ["schema"],
   _excluded7 = ["title", "onSubmit", "initialValues", "initialSchema", "schema", "modalTip", "components"],
   _excluded8 = ["hidden", "title", "components", "scope", "effects", "schema", "onSubmit", "asyncGetInitialValues", "initialValues", "width"];
-function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 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 _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."); }
@@ -17,6 +16,7 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 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); }); }; }
+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); }
@@ -43,7 +43,7 @@ import React, { createContext, useCallback, useContext, useMemo, useState,
 useTransition as useReactTransition } from 'react';
 import { createPortal } from 'react-dom';
 import { useTranslation } from 'react-i18next';
-import { ActionContextProvider, APIClientProvider, CollectionManagerContext, CollectionProvider, createDesignable, findFormBlock, FormDialog, FormProvider, RemoteSchemaComponent, SchemaComponent, SchemaComponentContext, SchemaComponentOptions, useAPIClient, useBlockRequestContext, useCollection, useCollectionManager, useCompile, useDesignable, useFilterBlock, useGlobalTheme, useLinkageCollectionFilterOptions } from '..';
+import { ActionContextProvider, APIClientProvider, CollectionManagerContext, CollectionProvider, createDesignable, findFormBlock, FormDialog, FormProvider, RemoteSchemaComponent, SchemaComponent, SchemaComponentContext, SchemaComponentOptions, useAPIClient, useBlockRequestContext, useCollection, useCollectionManager, useCompile, useDesignable, useFilterBlock, useGlobalTheme, useLinkageCollectionFilterOptions, useSortFields, useActionContext } from '..';
 import { useTableBlockContext } from '../block-provider';
 import { findFilterTargets, updateFilterTargets } from '../block-provider/hooks';
 import { getSupportFieldsByAssociation, getSupportFieldsByForeignKey, isSameCollection, useSupportedBlocks } from '../filter-provider/utils';
@@ -111,6 +111,7 @@ export var SchemaSettings = function SchemaSettings(props) {
       onOpenChange: function onOpenChange(open) {
         changeMenu(open);
       },
+      overlayClassName: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n          .ant-dropdown-menu-item-group-list {\n            max-height: 300px;\n            overflow-y: auto;\n          }\n        "]))),
       menu: {
         items: items
       }
@@ -799,7 +800,7 @@ SchemaSettings.CascaderItem = function (props) {
       display: 'flex',
       justifyContent: 'space-between'
     }
-  }, title, /*#__PURE__*/React.createElement(Cascader, {
+  }, title, /*#__PURE__*/React.createElement(Cascader, _objectSpread({
     bordered: false,
     defaultValue: value,
     onChange: onChange,
@@ -808,7 +809,7 @@ SchemaSettings.CascaderItem = function (props) {
       textAlign: 'right',
       minWidth: 100
     }
-  })));
+  }, props))));
 };
 SchemaSettings.SwitchItem = function SwitchItem(props) {
   var title = props.title,
@@ -1045,9 +1046,7 @@ SchemaSettings.ModalItem = function ModalItem(props) {
                   components: options.components
                 }, /*#__PURE__*/React.createElement(FormLayout, {
                   layout: 'vertical',
-                  style: {
-                    minWidth: 520
-                  }
+                  className: css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n                        // screen > 576px\n                        @media (min-width: 576px) {\n                          min-width: 520px;\n                        }\n\n                        // screen <= 576px\n                        @media (max-width: 576px) {\n                          min-width: 320px;\n                        }\n                      "])))
                 }, /*#__PURE__*/React.createElement(APIClientProvider, {
                   apiClient: apiClient
                 }, /*#__PURE__*/React.createElement(SchemaComponent, {
@@ -1460,7 +1459,7 @@ SchemaSettings.DataFormat = function DateFormatConfig(props) {
           'x-decorator': 'FormItem',
           'x-decorator-props': {},
           'x-component-props': {
-            className: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n                  .ant-radio-wrapper {\n                    display: flex;\n                    margin: 5px 0px;\n                  }\n                "]))),
+            className: css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n                  .ant-radio-wrapper {\n                    display: flex;\n                    margin: 5px 0px;\n                  }\n                "]))),
             defaultValue: 'dddd',
             formats: ['MMMMM Do YYYY', 'YYYY-MM-DD', 'MM/DD/YY', 'YYYY/MM/DD', 'DD/MM/YYYY']
           },
@@ -1509,10 +1508,10 @@ SchemaSettings.DataFormat = function DateFormatConfig(props) {
           'x-component': ExpiresRadio,
           'x-decorator': 'FormItem',
           'x-decorator-props': {
-            className: css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n                  margin-bottom: 0px;\n                "])))
+            className: css(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n                  margin-bottom: 0px;\n                "])))
           },
           'x-component-props': {
-            className: css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n                  color: red;\n                  .ant-radio-wrapper {\n                    display: flex;\n                    margin: 5px 0px;\n                  }\n                "]))),
+            className: css(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n                  color: red;\n                  .ant-radio-wrapper {\n                    display: flex;\n                    margin: 5px 0px;\n                  }\n                "]))),
             defaultValue: 'h:mm a',
             formats: ['hh:mm:ss a', 'HH:mm:ss'],
             timeFormat: true
@@ -1551,7 +1550,7 @@ SchemaSettings.DataFormat = function DateFormatConfig(props) {
     }
   });
 };
-var defaultInputStyle = css(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  & > .nb-form-item {\n    flex: 1;\n  }\n"])));
+var defaultInputStyle = css(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n  & > .nb-form-item {\n    flex: 1;\n  }\n"])));
 export var findParentFieldSchema = function findParentFieldSchema(fieldSchema) {
   var parent = fieldSchema.parent;
   while (parent) {
@@ -1562,7 +1561,7 @@ export var findParentFieldSchema = function findParentFieldSchema(fieldSchema) {
   }
 };
 SchemaSettings.DefaultValue = function DefaultValueConfigure(props) {
-  var _props$fieldSchema;
+  var _props$fieldSchema, _actionCtx$fieldSchem;
   var variablesCtx = useVariablesCtx();
   var currentSchema = useFieldSchema();
   var fieldSchema = (_props$fieldSchema = props === null || props === void 0 ? void 0 : props.fieldSchema) !== null && _props$fieldSchema !== void 0 ? _props$fieldSchema : currentSchema;
@@ -1571,6 +1570,7 @@ SchemaSettings.DefaultValue = function DefaultValueConfigure(props) {
     dn = _useDesignable7.dn;
   var _useTranslation12 = useTranslation(),
     t = _useTranslation12.t;
+  var actionCtx = useActionContext();
   var targetField;
   var _useCollection2 = useCollection(),
     getField = _useCollection2.getField;
@@ -1585,7 +1585,7 @@ SchemaSettings.DefaultValue = function DefaultValueConfigure(props) {
   var parentFieldSchema = (collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) === 'm2o' && findParentFieldSchema(fieldSchema);
   var parentCollectionField = parentFieldSchema && getCollectionJoinField(parentFieldSchema === null || parentFieldSchema === void 0 ? void 0 : parentFieldSchema['x-collection-field']);
   var tableCtx = useTableBlockContext();
-  var isAllowContextVariable = (collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) === 'm2m' || (parentCollectionField === null || parentCollectionField === void 0 ? void 0 : parentCollectionField.type) === 'hasMany' && (collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) === 'm2o';
+  var isAllowContexVariable = (actionCtx === null || actionCtx === void 0 ? void 0 : (_actionCtx$fieldSchem = actionCtx.fieldSchema) === null || _actionCtx$fieldSchem === void 0 ? void 0 : _actionCtx$fieldSchem['x-action']) === 'customize:create' && ((collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) === 'm2m' || (parentCollectionField === null || parentCollectionField === void 0 ? void 0 : parentCollectionField.type) === 'hasMany' && (collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) === 'm2o');
   return /*#__PURE__*/React.createElement(SchemaSettings.ModalItem, {
     title: t('Set default value'),
     components: {
@@ -1603,7 +1603,7 @@ SchemaSettings.DefaultValue = function DefaultValueConfigure(props) {
           'x-component': 'VariableInput',
           'x-component-props': _objectSpread(_objectSpread({}, (fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-component-props']) || {}), {}, {
             collectionField: collectionField,
-            contextCollectionName: isAllowContextVariable && tableCtx.collection,
+            contextCollectionName: isAllowContexVariable && tableCtx.collection,
             schema: collectionField === null || collectionField === void 0 ? void 0 : collectionField.uiSchema,
             className: defaultInputStyle,
             renderSchemaComponent: function Com(props) {
@@ -1614,10 +1614,11 @@ SchemaSettings.DefaultValue = function DefaultValueConfigure(props) {
               s['x-read-pretty'] = false;
               s['x-disabled'] = false;
               var schema = _objectSpread(_objectSpread({}, s || {}), {}, {
+                'x-decorator': 'FormItem',
                 'x-component-props': _objectSpread(_objectSpread({}, s['x-component-props']), {}, {
                   collectionName: collectionField === null || collectionField === void 0 ? void 0 : collectionField.collectionName,
                   targetField: targetField,
-                  onChange: props.onChange,
+                  onChange: (collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) !== 'richText' ? props.onChange : null,
                   defaultValue: getFieldDefaultValue(s, collectionField),
                   style: {
                     width: '100%',
@@ -1651,9 +1652,121 @@ SchemaSettings.DefaultValue = function DefaultValueConfigure(props) {
     }
   });
 };
+SchemaSettings.SortingRule = function SortRuleConfigure(props) {
+  var _props$fieldSchema2, _fieldSchema$xCompon8, _fieldSchema$xCompon9, _fieldSchema$xCompon10;
+  var field = useField();
+  var _useDesignable8 = useDesignable(),
+    dn = _useDesignable8.dn;
+  var _useTranslation13 = useTranslation(),
+    t = _useTranslation13.t;
+  var currentSchema = useFieldSchema();
+  var _useCollection3 = useCollection(),
+    getField = _useCollection3.getField;
+  var _useCollectionManager7 = useCollectionManager(),
+    getCollectionJoinField = _useCollectionManager7.getCollectionJoinField;
+  var fieldSchema = (_props$fieldSchema2 = props === null || props === void 0 ? void 0 : props.fieldSchema) !== null && _props$fieldSchema2 !== void 0 ? _props$fieldSchema2 : currentSchema;
+  var collectionField = getField(fieldSchema['name']) || getCollectionJoinField(fieldSchema['x-collection-field']);
+  var sortFields = useSortFields(collectionField === null || collectionField === void 0 ? void 0 : collectionField.target);
+  var defaultSort = ((_fieldSchema$xCompon8 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon8 === void 0 ? void 0 : (_fieldSchema$xCompon9 = _fieldSchema$xCompon8.service) === null || _fieldSchema$xCompon9 === void 0 ? void 0 : (_fieldSchema$xCompon10 = _fieldSchema$xCompon9.params) === null || _fieldSchema$xCompon10 === void 0 ? void 0 : _fieldSchema$xCompon10.sort) || [];
+  var sort = defaultSort === null || defaultSort === void 0 ? void 0 : defaultSort.map(function (item) {
+    return item !== null && item !== void 0 && item.startsWith('-') ? {
+      field: item.substring(1),
+      direction: 'desc'
+    } : {
+      field: item,
+      direction: 'asc'
+    };
+  });
+  return /*#__PURE__*/React.createElement(SchemaSettings.ModalItem, {
+    title: t('Set default sorting rules'),
+    components: {
+      ArrayItems: ArrayItems
+    },
+    schema: {
+      type: 'object',
+      title: t('Set default sorting rules'),
+      properties: {
+        sort: {
+          type: 'array',
+          default: sort,
+          'x-component': 'ArrayItems',
+          'x-decorator': 'FormItem',
+          items: {
+            type: 'object',
+            properties: {
+              space: {
+                type: 'void',
+                'x-component': 'Space',
+                properties: {
+                  sort: {
+                    type: 'void',
+                    'x-decorator': 'FormItem',
+                    'x-component': 'ArrayItems.SortHandle'
+                  },
+                  field: {
+                    type: 'string',
+                    enum: sortFields,
+                    required: true,
+                    'x-decorator': 'FormItem',
+                    'x-component': 'Select',
+                    'x-component-props': {
+                      style: {
+                        width: 260
+                      }
+                    }
+                  },
+                  direction: {
+                    type: 'string',
+                    'x-decorator': 'FormItem',
+                    'x-component': 'Radio.Group',
+                    'x-component-props': {
+                      optionType: 'button'
+                    },
+                    enum: [{
+                      label: t('ASC'),
+                      value: 'asc'
+                    }, {
+                      label: t('DESC'),
+                      value: 'desc'
+                    }]
+                  },
+                  remove: {
+                    type: 'void',
+                    'x-decorator': 'FormItem',
+                    'x-component': 'ArrayItems.Remove'
+                  }
+                }
+              }
+            }
+          },
+          properties: {
+            add: {
+              type: 'void',
+              title: t('Add sort field'),
+              'x-component': 'ArrayItems.Addition'
+            }
+          }
+        }
+      }
+    },
+    onSubmit: function onSubmit(_ref5) {
+      var _props$onSubmitCallBa, _schema9;
+      var sort = _ref5.sort;
+      var sortArr = sort.map(function (item) {
+        return item.direction === 'desc' ? "-".concat(item.field) : item.field;
+      });
+      _.set(field.componentProps, 'service.params.sort', sortArr);
+      props === null || props === void 0 ? void 0 : (_props$onSubmitCallBa = props.onSubmitCallBack) === null || _props$onSubmitCallBa === void 0 ? void 0 : _props$onSubmitCallBa.call(props, sortArr);
+      fieldSchema['x-component-props'] = field.componentProps;
+      dn.emit('patch', {
+        schema: (_schema9 = {}, _defineProperty(_schema9, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema9, 'x-component-props', field.componentProps), _schema9)
+      });
+    }
+  });
+};
 // 是否显示默认值配置项
 export var isShowDefaultValue = function isShowDefaultValue(collectionField, getInterface) {
-  return !['o2o', 'oho', 'obo', 'o2m', 'attachment', 'expression'].includes(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) && !isSystemField(collectionField, getInterface);
+  return !['o2o', 'oho', 'obo', 'o2m', 'attachment', 'expression', 'point', 'lineString', 'circle', 'polygon'].includes(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) && !isSystemField(collectionField, getInterface);
 };
 // 是否是系统字段
 export var isSystemField = function isSystemField(collectionField, getInterface) {
@@ -1661,6 +1774,6 @@ export var isSystemField = function isSystemField(collectionField, getInterface)
   return (i === null || i === void 0 ? void 0 : i.group) === 'systemInfo';
 };
 export var isPatternDisabled = function isPatternDisabled(fieldSchema) {
-  var _fieldSchema$xCompon8;
-  return (fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon8 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon8 === void 0 ? void 0 : _fieldSchema$xCompon8['pattern-disable']) == true;
+  var _fieldSchema$xCompon11;
+  return (fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon11 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon11 === void 0 ? void 0 : _fieldSchema$xCompon11['pattern-disable']) == true;
 };

package/es/schema-settings/VariableInput/VariableInput.js

@@ -1,6 +1,6 @@
 import React, { useMemo } from 'react';
 import { useCompile, Variable } from '../../schema-component';
-import { useContextAssociationFields } from './hooks/useContextAssociationFields';
+import { useContextAssociationFields, useIsSameOrChildCollection } from './hooks/useContextAssociationFields';
 import { useUserVariable } from './hooks/useUserVariable';
 export var VariableInput = function VariableInput(props) {
   var value = props.value,
@@ -19,8 +19,11 @@ export var VariableInput = function VariableInput(props) {
   var contextVariable = useContextAssociationFields({
     schema: schema,
     maxDepth: 2,
-    contextCollectionName: contextCollectionName
+    contextCollectionName: contextCollectionName,
+    collectionField: collectionField
   });
+  var getIsSameOrChildCollection = useIsSameOrChildCollection();
+  var isAllowTableContext = getIsSameOrChildCollection(contextCollectionName, collectionField === null || collectionField === void 0 ? void 0 : collectionField.target);
   var scope = useMemo(function () {
     var data = [compile({
       label: "{{t(\"Date variables\")}}",
@@ -47,7 +50,7 @@ export var VariableInput = function VariableInput(props) {
     onChange: onChange,
     scope: scope,
     style: style,
-    changeOnSelect: contextCollectionName !== null
+    changeOnSelect: isAllowTableContext
   }, /*#__PURE__*/React.createElement(RenderSchemaComponent, {
     value: value,
     onChange: onChange

package/es/schema-settings/VariableInput/hooks/useContextAssociationFields.d.ts

@@ -1,6 +1,9 @@
+import { CollectionFieldOptions } from '../../../collection-manager';
 import { Option } from '../type';
-export declare const useContextAssociationFields: ({ schema, maxDepth, contextCollectionName, }: {
+export declare const useIsSameOrChildCollection: () => (contextCollection: any, targetCollection: any) => boolean;
+export declare const useContextAssociationFields: ({ schema, maxDepth, contextCollectionName, collectionField, }: {
     schema: any;
     maxDepth?: number;
     contextCollectionName: string;
+    collectionField: CollectionFieldOptions;
 }) => Option;

package/es/schema-settings/VariableInput/hooks/useContextAssociationFields.js

@@ -1,21 +1,35 @@
 import { error } from '@nocobase/utils/client';
 import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
+import { useCollectionManager } from '../../../collection-manager';
 import { useCompile, useGetFilterOptions } from '../../../schema-component';
-var getChildren = function getChildren(options, _ref) {
+export var useIsSameOrChildCollection = function useIsSameOrChildCollection() {
+  var _useCollectionManager = useCollectionManager(),
+    getChildrenCollections = _useCollectionManager.getChildrenCollections;
+  return function (contextCollection, targetCollection) {
+    if (contextCollection === targetCollection) {
+      return true;
+    }
+    var childrens = getChildrenCollections(targetCollection);
+    return childrens === null || childrens === void 0 ? void 0 : childrens.some(function (v) {
+      return v.name === contextCollection;
+    });
+  };
+};
+var getChildren = function getChildren(options, _ref, collectionField, getIsSameOrChildCollection) {
   var schema = _ref.schema,
     depth = _ref.depth,
     maxDepth = _ref.maxDepth,
     loadChildren = _ref.loadChildren,
     compile = _ref.compile;
   var result = options.map(function (option) {
+    var disabled = !getIsSameOrChildCollection(option.target, collectionField === null || collectionField === void 0 ? void 0 : collectionField.target);
     if (!option.target) {
       return {
         key: option.name,
         value: option.name,
         label: compile(option.title),
-        // TODO: 现在是通过组件的名称来过滤能够被选择的选项，这样的坏处是不够精确，后续可以优化
-        //   disabled: schema?.['x-component'] !== option.schema?.['x-component'],
+        disabled: disabled,
         isLeaf: true,
         depth: depth
       };
@@ -27,6 +41,7 @@ var getChildren = function getChildren(options, _ref) {
       key: option.name,
       value: option.name,
       label: compile(option.title),
+      disabled: disabled,
       isLeaf: true,
       field: option,
       depth: depth,
@@ -39,11 +54,13 @@ export var useContextAssociationFields = function useContextAssociationFields(_r
   var schema = _ref2.schema,
     _ref2$maxDepth = _ref2.maxDepth,
     maxDepth = _ref2$maxDepth === void 0 ? 3 : _ref2$maxDepth,
-    contextCollectionName = _ref2.contextCollectionName;
+    contextCollectionName = _ref2.contextCollectionName,
+    collectionField = _ref2.collectionField;
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
   var compile = useCompile();
   var getFilterOptions = useGetFilterOptions();
+  var getIsSameOrChildCollection = useIsSameOrChildCollection();
   var loadChildren = function loadChildren(option) {
     var _option$field;
     if (!((_option$field = option.field) !== null && _option$field !== void 0 && _option$field.target)) {
@@ -65,7 +82,7 @@ export var useContextAssociationFields = function useContextAssociationFields(_r
           maxDepth: maxDepth,
           loadChildren: loadChildren,
           compile: compile
-        }) || [];
+        }, collectionField, getIsSameOrChildCollection) || [];
         if (children.length === 0) {
           option.disabled = true;
           option.children = [];

package/es/schema-templates/SchemaTemplateManagerProvider.js

@@ -24,6 +24,7 @@ import { cloneDeep } from 'lodash';
 import React, { createContext, useContext, useMemo } from 'react';
 import { useAPIClient, useRequest } from '../api-client';
 import { Plugin } from '../application/Plugin';
+import { useCollectionManager } from '../collection-manager';
 import { BlockTemplate } from './BlockTemplate';
 export var SchemaTemplateManagerContext = /*#__PURE__*/createContext({});
 export var SchemaTemplateManagerProvider = function SchemaTemplateManagerProvider(props) {
@@ -55,6 +56,8 @@ export var useSchemaTemplate = function useSchemaTemplate() {
   }, [schemaId, templateKey]);
 };
 export var useSchemaTemplateManager = function useSchemaTemplateManager() {
+  var _useCollectionManager = useCollectionManager(),
+    getInheritCollections = _useCollectionManager.getInheritCollections;
   var _useContext = useContext(SchemaTemplateManagerContext),
     refresh = _useContext.refresh,
     _useContext$templates = _useContext.templates,
@@ -185,8 +188,10 @@ export var useSchemaTemplateManager = function useSchemaTemplateManager() {
     getTemplatesByCollection: function getTemplatesByCollection(collectionName) {
       var _templates$filter;
       var resourceName = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
+      var parentCollections = getInheritCollections(collectionName);
+      var totalCollections = parentCollections.concat([collectionName]);
       var items = templates === null || templates === void 0 ? void 0 : (_templates$filter = templates.filter) === null || _templates$filter === void 0 ? void 0 : _templates$filter.call(templates, function (template) {
-        return template.collectionName === collectionName;
+        return totalCollections.includes(template.collectionName);
       });
       return items || [];
     },

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

@@ -37,7 +37,7 @@ function useRequest(service) {
   var tempService;
   if (typeof service === 'function') {
     tempService = service;
-  } else {
+  } else if (service) {
     tempService = /*#__PURE__*/function () {
       var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
         var params,
@@ -72,6 +72,21 @@ function useRequest(service) {
         return _ref.apply(this, arguments);
       };
     }();
+  } else {
+    tempService = /*#__PURE__*/function () {
+      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2);
+      }));
+      return function tempService() {
+        return _ref2.apply(this, arguments);
+      };
+    }();
   }
   var tempOptions = _objectSpread(_objectSpread({}, options), {}, {
     onSuccess: function onSuccess() {

package/lib/block-provider/BlockProvider.js

@@ -75,6 +75,8 @@ var useResource = function useResource(props) {
   var association = useAssociation(props);
   var sourceId = useSourceId === null || useSourceId === void 0 ? void 0 : useSourceId();
   var field = (0, _react.useField)();
+  var withoutTableFieldResource = (0, _react2.useContext)(_.WithoutTableFieldResource);
+  var __parent = (0, _react2.useContext)(BlockRequestContext);
   if (block === 'TableField') {
     var _record$__parent;
     var options = {
@@ -85,8 +87,6 @@ var useResource = function useResource(props) {
     };
     return new _.TableFieldResource(options);
   }
-  var withoutTableFieldResource = (0, _react2.useContext)(_.WithoutTableFieldResource);
-  var __parent = (0, _react2.useContext)(BlockRequestContext);
   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;
   }