@nocobase/client 0.9.1-alpha.2 → 0.9.2-alpha.1

package/es/schema-settings/DataTemplates/hooks/useCollectionState.js

@@ -0,0 +1,146 @@
+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 _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; }
+import React, { useState } from 'react';
+import { useCollectionManager } from '../../../collection-manager';
+import { useCompile } from '../../../schema-component';
+import { TreeNode } from '../TreeLabel';
+export var useCollectionState = function useCollectionState(currentCollectionName) {
+  var _useCollectionManager = useCollectionManager(),
+    getCollectionFields = _useCollectionManager.getCollectionFields,
+    getAllCollectionsInheritChain = _useCollectionManager.getAllCollectionsInheritChain,
+    getCollection = _useCollectionManager.getCollection,
+    getCollectionFieldsOptions = _useCollectionManager.getCollectionFieldsOptions;
+  var _useState = useState(getCollectionList),
+    _useState2 = _slicedToArray(_useState, 1),
+    collectionList = _useState2[0];
+  var compile = useCompile();
+  function getCollectionList() {
+    var collections = getAllCollectionsInheritChain(currentCollectionName);
+    return collections.map(function (name) {
+      return {
+        label: getCollection(name).title,
+        value: name
+      };
+    });
+  }
+  var getEnableFieldTree = function getEnableFieldTree(collectionName) {
+    if (!collectionName) {
+      return [];
+    }
+    // 过滤掉系统字段
+    var systemKeys = [
+    // 'id',
+    'sort', 'createdById', 'createdBy', 'createdAt', 'updatedById', 'updatedBy', 'updatedAt'];
+    var traverseAssociations = function traverseAssociations(collectionName, _ref) {
+      var prefix = _ref.prefix,
+        maxDepth = _ref.maxDepth,
+        depth = _ref.depth,
+        _ref$exclude = _ref.exclude,
+        exclude = _ref$exclude === void 0 ? [] : _ref$exclude;
+      if (depth > maxDepth) {
+        return [];
+      }
+      return getCollectionFields(collectionName).map(function (field) {
+        var _field$uiSchema;
+        if (!field.target || !field.interface) {
+          return;
+        }
+        if (exclude.includes(field.name)) {
+          return;
+        }
+        var option = {
+          type: 'preloading',
+          tag: compile((_field$uiSchema = field.uiSchema) === null || _field$uiSchema === void 0 ? void 0 : _field$uiSchema.title) || field.name
+        };
+        var value = prefix ? "".concat(prefix, ".").concat(field.name) : field.name;
+        return {
+          title: /*#__PURE__*/React.createElement(TreeNode, option),
+          key: value,
+          children: traverseAssociations(getCollectionFields(field.target), {
+            prefix: value,
+            depth: depth + 1,
+            maxDepth: maxDepth,
+            exclude: exclude
+          })
+        };
+      }).filter(Boolean);
+    };
+    var traverseFields = function traverseFields(collectionName, _ref2) {
+      var _ref2$exclude = _ref2.exclude,
+        exclude = _ref2$exclude === void 0 ? [] : _ref2$exclude,
+        _ref2$depth = _ref2.depth,
+        depth = _ref2$depth === void 0 ? 0 : _ref2$depth,
+        maxDepth = _ref2.maxDepth,
+        _ref2$prefix = _ref2.prefix,
+        prefix = _ref2$prefix === void 0 ? '' : _ref2$prefix;
+      if (depth > maxDepth) {
+        return [];
+      }
+      return getCollectionFields(collectionName).map(function (field) {
+        var _field$uiSchema2;
+        if (exclude.includes(field.name)) {
+          return;
+        }
+        if (!field.interface) {
+          return;
+        }
+        if (['sort', 'password', 'sequence'].includes(field.type)) {
+          return;
+        }
+        var node = {
+          type: 'duplicate',
+          tag: compile((_field$uiSchema2 = field.uiSchema) === null || _field$uiSchema2 === void 0 ? void 0 : _field$uiSchema2.title) || field.name
+        };
+        var option = _objectSpread(_objectSpread({}, node), {}, {
+          title: /*#__PURE__*/React.createElement(TreeNode, node),
+          key: prefix ? "".concat(prefix, ".").concat(field.name) : field.name
+        });
+        // 多对多的只展示关系字段
+        if (['belongsTo', 'belongsToMany'].includes(field.type)) {
+          node['type'] = 'reference';
+          option['type'] = 'reference';
+          option['title'] = /*#__PURE__*/React.createElement(TreeNode, _objectSpread(_objectSpread({}, node), {}, {
+            type: 'reference'
+          }));
+          option['children'] = traverseAssociations(field.target, {
+            depth: depth + 1,
+            maxDepth: maxDepth,
+            prefix: option.key,
+            exclude: systemKeys
+          });
+        } else if (['hasOne', 'hasMany'].includes(field.type)) {
+          option['children'] = traverseFields(field.target, {
+            depth: depth + 1,
+            maxDepth: maxDepth,
+            prefix: option.key,
+            exclude: ['id'].concat(systemKeys)
+          });
+        }
+        return option;
+      }).filter(Boolean);
+    };
+    try {
+      return traverseFields(collectionName, {
+        exclude: ['id'].concat(systemKeys),
+        maxDepth: 3
+      });
+    } catch (error) {
+      console.error(error);
+      return [];
+    }
+  };
+  return {
+    collectionList: collectionList,
+    getEnableFieldTree: getEnableFieldTree
+  };
+};

package/es/schema-settings/DataTemplates/index.d.ts

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

package/es/schema-settings/DataTemplates/index.js

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

package/es/schema-settings/EnableChildCollections/index.js

@@ -1,7 +1,7 @@
+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 _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); }); }; }
-
 import { observer, useForm } from '@formily/react';
 import React from 'react';
 import { action } from '@formily/reactive';
@@ -9,75 +9,65 @@ import { SchemaComponent, useCompile } from '../../schema-component';
 import { useCollectionManager } from '../../collection-manager';
 export var EnableChildCollections = observer(function (props) {
   var useProps = props.useProps;
-
   var _useProps = useProps(),
-      defaultValues = _useProps.defaultValues,
-      collectionName = _useProps.collectionName;
-
+    defaultValues = _useProps.defaultValues,
+    collectionName = _useProps.collectionName;
   var form = useForm();
   var compile = useCompile();
-
   var _useCollectionManager = useCollectionManager(),
-      getChildrenCollections = _useCollectionManager.getChildrenCollections;
-
+    getChildrenCollections = _useCollectionManager.getChildrenCollections;
   var childrenCollections = getChildrenCollections(collectionName);
-
   var useAsyncDataSource = function useAsyncDataSource(service) {
     return function (field, options) {
       field.loading = true;
       service(field, options).then(action.bound(function (data) {
         field.dataSource = data;
         field.loading = false;
-
         if (field.initialValue) {
           field.disabled = true;
         }
       }));
     };
   };
-
   var loadData = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(field) {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(field) {
       var _form$values, _childrenCollections$;
-
       var _form$values$enableCh, childCollections;
-
-      return regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              _form$values$enableCh = (_form$values = form.values) === null || _form$values === void 0 ? void 0 : _form$values.enableChildren, childCollections = _form$values$enableCh.childrenCollections;
-              return _context.abrupt("return", (_childrenCollections$ = childrenCollections.filter(function (v) {
-                return !childCollections.find(function (k) {
-                  return k.collection === v.name;
-                }) || field.initialValue || v.name === field.value;
-              })) === null || _childrenCollections$ === void 0 ? void 0 : _childrenCollections$.map(function (collection) {
-                return {
-                  label: compile(collection.title),
-                  value: collection.name
-                };
-              }));
-
-            case 2:
-            case "end":
-              return _context.stop();
-          }
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _form$values$enableCh = (_form$values = form.values) === null || _form$values === void 0 ? void 0 : _form$values.enableChildren, childCollections = _form$values$enableCh.childrenCollections;
+            return _context.abrupt("return", (_childrenCollections$ = childrenCollections.filter(function (v) {
+              return !childCollections.find(function (k) {
+                return k.collection === v.name;
+              }) || field.initialValue || v.name === field.value;
+            })) === null || _childrenCollections$ === void 0 ? void 0 : _childrenCollections$.map(function (collection) {
+              return {
+                label: compile(collection.title),
+                value: collection.name
+              };
+            }));
+          case 2:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
     }));
-
     return function loadData(_x) {
       return _ref.apply(this, arguments);
     };
   }();
-
   return /*#__PURE__*/React.createElement(SchemaComponent, {
     schema: {
       type: 'object',
       properties: {
         childrenCollections: {
           type: 'array',
-          default: defaultValues,
+          default: defaultValues === null || defaultValues === void 0 ? void 0 : defaultValues.filter(function (v) {
+            return childrenCollections.find(function (k) {
+              return k.name === v.collection;
+            });
+          }),
           'x-component': 'ArrayItems',
           'x-decorator': 'FormItem',
           items: {

package/es/schema-settings/GeneralSchemaDesigner.js

@@ -1,13 +1,11 @@
+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;
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+function _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 _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
-
 import { DragOutlined, MenuOutlined, PlusOutlined } from '@ant-design/icons';
 import { css } from '@emotion/css';
 import { useField, useFieldSchema } from '@formily/react';
@@ -21,22 +19,17 @@ import { SchemaSettings } from './SchemaSettings';
 var titleCss = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  pointer-events: none;\n  position: absolute;\n  font-size: 12px;\n  /* background: #f18b62;\n  color: #fff; */\n  padding: 0;\n  line-height: 16px;\n  height: 16px;\n  border-bottom-right-radius: 2px;\n  border-radius: 2px;\n  top: 2px;\n  left: 2px;\n  .title-tag {\n    padding: 0 3px;\n    border-radius: 2px;\n    background: #f18b62;\n    color: #fff;\n    display: block;\n  }\n"])));
 export var GeneralSchemaDesigner = function GeneralSchemaDesigner(props) {
   var _ctx$renderSchemaInit, _rowCtx$cols;
-
   var disableInitializer = props.disableInitializer,
-      title = props.title,
-      template = props.template,
-      _props$draggable = props.draggable,
-      draggable = _props$draggable === void 0 ? true : _props$draggable;
-
+    title = props.title,
+    template = props.template,
+    _props$draggable = props.draggable,
+    draggable = _props$draggable === void 0 ? true : _props$draggable;
   var _useDesignable = useDesignable(),
-      dn = _useDesignable.dn,
-      designable = _useDesignable.designable;
-
+    dn = _useDesignable.dn,
+    designable = _useDesignable.designable;
   var field = useField();
-
   var _useTranslation = useTranslation(),
-      t = _useTranslation.t;
-
+    t = _useTranslation.t;
   var fieldSchema = useFieldSchema();
   var compile = useCompile();
   var schemaSettingsProps = {
@@ -44,11 +37,9 @@ export var GeneralSchemaDesigner = function GeneralSchemaDesigner(props) {
     field: field,
     fieldSchema: fieldSchema
   };
-
   if (!designable) {
     return null;
   }
-
   var rowCtx = useGridRowContext();
   var ctx = useGridContext();
   var templateName = ['FormItem', 'ReadPrettyFormItem'].includes(template === null || template === void 0 ? void 0 : template.componentName) ? "".concat(template === null || template === void 0 ? void 0 : template.name, " ").concat(t('(Fields only)')) : template === null || template === void 0 ? void 0 : template.name;

package/es/schema-settings/LinkageRules/DynamicComponent.js

@@ -1,65 +1,20 @@
-var _templateObject;
-
+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) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
-
-import { css } from '@emotion/css';
+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); }
 import { createForm, onFieldValueChange } from '@formily/core';
-import { connect, FieldContext, FormContext } from '@formily/react';
+import { FieldContext, FormContext } from '@formily/react';
 import { merge } from '@formily/shared';
-import { Cascader } from 'antd';
 import React, { useContext, useMemo } from 'react';
 import { SchemaComponent } from '../../schema-component/core';
-import { useCompile, useComponent } from '../../schema-component/hooks';
+import { useComponent } from '../../schema-component/hooks';
 import { FilterContext } from './context';
-import { useFilterOptions } from '../../schema-component/antd/filter/useFilterActionProps';
-var VariableCascader = connect(function (props) {
-  var fields = useFilterOptions('users');
-  var compile = useCompile();
-  var value = props.value,
-      _onChange = props.onChange;
-  return /*#__PURE__*/React.createElement(Cascader, {
-    className: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n        width: 160px;\n      "]))),
-    value: value ? value.split('.') : [],
-    fieldNames: {
-      label: 'title',
-      value: 'name',
-      children: 'children'
-    },
-    onChange: function onChange(value) {
-      _onChange(value ? value.join('.') : null);
-    },
-    options: compile([{
-      title: '{{t("Current user")}}',
-      name: 'currentUser',
-      children: fields.filter(function (field) {
-        if (!field.target) {
-          return true;
-        }
-
-        return field.type === 'belongsTo';
-      }).map(function (field) {
-        if (field.children) {
-          field.children = field.children.filter(function (child) {
-            return !child.target;
-          });
-        }
-
-        return field;
-      })
-    }])
-  });
-});
 export var DynamicComponent = function DynamicComponent(props) {
   var _ref = useContext(FilterContext) || {},
-      dynamicComponent = _ref.dynamicComponent,
-      disabled = _ref.disabled;
-
+    dynamicComponent = _ref.dynamicComponent,
+    disabled = _ref.disabled;
   var component = useComponent(dynamicComponent);
   var form = useMemo(function () {
     return createForm({
@@ -70,16 +25,13 @@ export var DynamicComponent = function DynamicComponent(props) {
       effects: function effects() {
         onFieldValueChange('value', function (field) {
           var _props$onChange;
-
           props === null || props === void 0 ? void 0 : (_props$onChange = props.onChange) === null || _props$onChange === void 0 ? void 0 : _props$onChange.call(props, field.value);
         });
       }
     });
   }, [JSON.stringify(props.schema), JSON.stringify(props.value)]);
-
   var renderSchemaComponent = function renderSchemaComponent() {
     var _props$schema;
-
     return /*#__PURE__*/React.createElement(FieldContext.Provider, {
       value: null
     }, /*#__PURE__*/React.createElement(SchemaComponent, {
@@ -96,13 +48,9 @@ export var DynamicComponent = function DynamicComponent(props) {
         'x-read-pretty': false,
         'x-validator': undefined,
         'x-decorator': undefined
-      }),
-      components: {
-        VariableCascader: VariableCascader
-      }
+      })
     }));
   };
-
   return /*#__PURE__*/React.createElement(FormContext.Provider, {
     value: form
   }, component ? /*#__PURE__*/React.createElement(component, {

package/es/schema-settings/LinkageRules/FilterDynamicComponent.js

@@ -3,9 +3,9 @@ import { Variable } from '../../schema-component';
 import { useVariableOptions } from './Variables';
 export function FilterDynamicComponent(props) {
   var value = props.value,
-      onChange = props.onChange,
-      renderSchemaComponent = props.renderSchemaComponent,
-      collectionName = props.collectionName;
+    onChange = props.onChange,
+    renderSchemaComponent = props.renderSchemaComponent,
+    collectionName = props.collectionName;
   var scope = useVariableOptions(collectionName);
   return /*#__PURE__*/React.createElement(Variable.Input, {
     value: value,

package/es/schema-settings/LinkageRules/LinkageRuleAction.js

@@ -1,19 +1,11 @@
-var _templateObject, _templateObject2, _templateObject3;
-
+var _templateObject, _templateObject2, _templateObject3, _templateObject4;
 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 = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
+function _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 _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
-
 import { CloseCircleOutlined } from '@ant-design/icons';
 import { css } from '@emotion/css';
 import { observer } from '@formily/react';
@@ -21,41 +13,41 @@ import { TreeSelect } from '@formily/antd';
 import { Select, Space } from 'antd';
 import React, { useContext, useState } from 'react';
 import { useTranslation } from 'react-i18next';
+import { uid } from '@formily/shared';
 import { useCompile } from '../..';
-import { RemoveActionContext } from './context';
+import { RemoveActionContext, LinkageLogicContext } from './context';
 import { DynamicComponent } from './DynamicComponent';
 import { useValues } from './useValues';
 import { ActionType } from './type';
 import { ValueDynamicComponent } from './ValueDynamicComponent';
 export var FormFieldLinkageRuleAction = observer(function (props) {
   var value = props.value,
-      options = props.options,
-      collectionName = props.collectionName;
-
+    options = props.options,
+    collectionName = props.collectionName;
   var _useTranslation = useTranslation(),
-      t = _useTranslation.t;
-
+    t = _useTranslation.t;
   var compile = useCompile();
   var remove = useContext(RemoveActionContext);
-
   var _useValues = useValues(options),
-      schema = _useValues.schema,
-      fields = _useValues.fields,
-      operator = _useValues.operator,
-      setDataIndex = _useValues.setDataIndex,
-      setOperator = _useValues.setOperator,
-      setValue = _useValues.setValue,
-      fieldValue = _useValues.value,
-      operators = _useValues.operators;
-
-  return /*#__PURE__*/React.createElement("div", {
+    schema = _useValues.schema,
+    fields = _useValues.fields,
+    operator = _useValues.operator,
+    setDataIndex = _useValues.setDataIndex,
+    setOperator = _useValues.setOperator,
+    setValue = _useValues.setValue,
+    fieldValue = _useValues.value,
+    operators = _useValues.operators;
+  return /*#__PURE__*/React.createElement(LinkageLogicContext.Provider, {
+    value: uid()
+  }, /*#__PURE__*/React.createElement("div", {
     style: {
       marginBottom: 8
-    }
+    },
+    className: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n          .ant-space {\n            display: inline-block;\n          }\n        "])))
   }, /*#__PURE__*/React.createElement(Space, {
-    className: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n          .ant-space-item {\n            max-width: 95%;\n          }\n        "])))
+    className: css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n            .ant-space {\n              display: inline-block;\n            }\n            .ant-space-item {\n              max-width: 95%;\n              display: inline-block;\n              margin: 2px;\n              vertical-align: top;\n            }\n          "])))
   }, /*#__PURE__*/React.createElement(TreeSelect, {
-    className: css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n            min-width: 160px;\n          "]))),
+    className: css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n              min-width: 160px;\n            "]))),
     fieldNames: {
       label: 'title',
       value: 'name',
@@ -67,13 +59,12 @@ export var FormFieldLinkageRuleAction = observer(function (props) {
     allowClear: true,
     treeData: compile(fields),
     onChange: function onChange(value) {
-      console.log(value);
       setDataIndex(value);
     },
     placeholder: t('Select Field')
   }), /*#__PURE__*/React.createElement(Select, {
     value: operator,
-    className: css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n            min-width: 120px;\n          "]))),
+    className: css(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n              min-width: 120px;\n            "]))),
     options: compile(operators),
     onChange: function onChange(value) {
       setOperator(value);
@@ -91,30 +82,24 @@ export var FormFieldLinkageRuleAction = observer(function (props) {
     style: {
       color: '#bfbfbf'
     }
-  }))));
+  })))));
 });
 export var FormButtonLinkageRuleAction = observer(function (props) {
   var value = props.value,
-      options = props.options;
-
+    options = props.options;
   var _useTranslation2 = useTranslation(),
-      t = _useTranslation2.t;
-
+    t = _useTranslation2.t;
   var compile = useCompile();
-
   var _useState = useState(false),
-      _useState2 = _slicedToArray(_useState, 2),
-      editFalg = _useState2[0],
-      setEditFlag = _useState2[1];
-
+    _useState2 = _slicedToArray(_useState, 2),
+    editFalg = _useState2[0],
+    setEditFlag = _useState2[1];
   var remove = useContext(RemoveActionContext);
-
   var _useValues2 = useValues(options),
-      schema = _useValues2.schema,
-      operator = _useValues2.operator,
-      setOperator = _useValues2.setOperator,
-      setValue = _useValues2.setValue;
-
+    schema = _useValues2.schema,
+    operator = _useValues2.operator,
+    setOperator = _useValues2.setOperator,
+    setValue = _useValues2.setValue;
   var operators = [{
     label: t('Visible'),
     value: ActionType.Visible,