@nocobase/client 0.9.4-alpha.2 → 0.10.0-alpha.2

package/lib/schema-component/antd/upload/Upload.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.Upload = void 0;
 var _icons = require("@ant-design/icons");
-var _builtins__ = require("@formily/antd/lib/__builtins__");
+var _builtins__ = require("@formily/antd/esm/__builtins__");
 var _react = require("@formily/react");
 var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));

package/lib/schema-component/antd/upload/shared.d.ts

@@ -1,5 +1,5 @@
-import { UploadChangeParam } from 'antd/lib/upload';
-import { UploadFile } from 'antd/lib/upload/interface';
+import { UploadChangeParam } from 'antd/es/upload';
+import { UploadFile } from 'antd/es/upload/interface';
 import type { IUploadProps, UploadProps } from './type';
 export declare const isImage: (extName: string) => boolean;
 export declare const toMap: (fileList: any) => any;
@@ -26,7 +26,7 @@ export declare const normalizeFileList: (fileList: UploadFile[]) => {
     lastModifiedDate?: Date;
     percent?: number;
     crossOrigin?: "" | "anonymous" | "use-credentials";
-    originFileObj?: import("antd/lib/upload").RcFile;
+    originFileObj?: import("antd/es/upload").RcFile;
     response?: any;
     error?: any;
     linkProps?: any;

package/lib/schema-component/antd/upload/style.less

@@ -40,7 +40,7 @@
     background: rgba(0, 0, 0, 0.5);
   }
   .ant-upload-list-picture-card-container {
-    margin-bottom: 28px;
+    // margin-bottom: 28px;
   }
 }
 
@@ -58,4 +58,3 @@
     padding: 1px;
   }
 }
-

package/lib/schema-component/antd/upload/type.d.ts

@@ -1,5 +1,5 @@
-import type { DraggerProps as AntdDraggerProps, UploadProps as AntdUploadProps } from 'antd/lib/upload';
-import { UploadFile } from 'antd/lib/upload/interface';
+import type { DraggerProps as AntdDraggerProps, UploadProps as AntdUploadProps } from 'antd/es/upload';
+import { UploadFile } from 'antd/es/upload/interface';
 import React from 'react';
 
 export type UploadProps = Omit<AntdUploadProps, 'onChange'> & {

package/lib/schema-component/antd/variable/Input.d.ts

@@ -1,2 +1,2 @@
-/// <reference types="react" />
-export declare function Input(props: any): JSX.Element;
+import React from 'react';
+export declare function Input(props: any): React.JSX.Element;

package/lib/schema-component/antd/variable/Input.js

@@ -9,25 +9,42 @@ var _css = require("@emotion/css");
 var _react = require("@formily/react");
 var _antd = require("antd");
 var _moment = _interopRequireDefault(require("moment"));
-var _react2 = _interopRequireDefault(require("react"));
+var _react2 = _interopRequireWildcard(require("react"));
 var _reactI18next = require("react-i18next");
+var _client = require("@nocobase/utils/client");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _ = require("../..");
 var _XButton = require("./XButton");
-var _templateObject, _templateObject2, _templateObject3;
 var _excluded = ["component"];
+var _templateObject, _templateObject2, _templateObject3;
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 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); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-function _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 _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 _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 _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 _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 var JT_VALUE_RE = /^\s*{{\s*([^{}]+)\s*}}\s*$/;
+var groupClass = (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  width: auto;\n  display: flex !important;\n  .ant-input-disabled {\n    .ant-tag {\n      color: #bfbfbf;\n      border-color: #d9d9d9;\n    }\n  }\n  .ant-input.null-value {\n    width: 4em;\n    min-width: 4em;\n  }\n"])));
+var userSelectNone = (0, _css.css)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  user-select: 'none';\n"])));
 function parseValue(value) {
   if (value == null) {
     return 'null';
@@ -160,23 +177,74 @@ function Input(props) {
     useTypedConstant = props.useTypedConstant,
     style = props.style,
     className = props.className;
-  var parsed = parseValue(value);
+  var parsed = (0, _react2.useMemo)(function () {
+    return parseValue(value);
+  }, [value]);
   var isConstant = typeof parsed === 'string';
   var type = isConstant ? parsed : '';
   var variable = isConstant ? null : parsed;
+  // 当 scope 是一个函数时，可能是一个 hook，所以不能使用 useMemo
   var variableOptions = typeof scope === 'function' ? scope() : scope !== null && scope !== void 0 ? scope : [];
-  var _ref5 = children ? {
-      value: '',
-      label: '{{t("Constant")}}'
-    } : useTypedConstant ? getTypedConstantOption(type, useTypedConstant) : {
-      value: '',
-      label: '{{t("Null")}}',
-      component: ConstantTypes.null.component
-    },
-    ConstantComponent = _ref5.component,
-    constantOption = _objectWithoutProperties(_ref5, _excluded);
-  var options = compile([constantOption].concat(_toConsumableArray(variableOptions)));
-  function onSwitch(next) {
+  var _React$useState = _react2.default.useState(''),
+    _React$useState2 = _slicedToArray(_React$useState, 2),
+    variableText = _React$useState2[0],
+    setVariableText = _React$useState2[1];
+  var _useMemo = (0, _react2.useMemo)(function () {
+      if (children) {
+        return {
+          value: '',
+          label: '{{t("Constant")}}'
+        };
+      }
+      if (useTypedConstant) {
+        return getTypedConstantOption(type, useTypedConstant);
+      }
+      return {
+        value: '',
+        label: '{{t("Null")}}',
+        component: ConstantTypes.null.component
+      };
+    }, [type, useTypedConstant]),
+    ConstantComponent = _useMemo.component,
+    constantOption = _objectWithoutProperties(_useMemo, _excluded);
+  var _React$useState3 = _react2.default.useState(function () {
+      return compile([constantOption].concat(_toConsumableArray(variableOptions)));
+    }),
+    _React$useState4 = _slicedToArray(_React$useState3, 2),
+    options = _React$useState4[0],
+    setOptions = _React$useState4[1];
+  (0, _react2.useEffect)(function () {
+    var newOptions = [constantOption].concat(_toConsumableArray(variableOptions));
+    setOptions(deepCompileLabel(newOptions, compile));
+  }, [variableOptions]);
+  var loadData = /*#__PURE__*/function () {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(selectedOptions) {
+      var option;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            option = selectedOptions[selectedOptions.length - 1];
+            if (!option.loadChildren) {
+              _context.next = 5;
+              break;
+            }
+            _context.next = 4;
+            return option.loadChildren(option);
+          case 4:
+            setOptions(function (prev) {
+              return _toConsumableArray(prev);
+            });
+          case 5:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function loadData(_x2) {
+      return _ref5.apply(this, arguments);
+    };
+  }();
+  var onSwitch = (0, _react2.useCallback)(function (next) {
     if (next[0] === '') {
       if (next[1]) {
         if (next[1] !== type) {
@@ -191,23 +259,97 @@ function Input(props) {
       return;
     }
     onChange("{{".concat(next.join('.'), "}}"));
-  }
-  var variableText = variable === null || variable === void 0 ? void 0 : variable.reduce(function (opts, key, i) {
-    var _ref6, _opts;
-    var option = (_ref6 = i ? (_opts = opts[i - 1]) === null || _opts === void 0 ? void 0 : _opts.children : options) === null || _ref6 === void 0 ? void 0 : _ref6.find(function (item) {
-      return item.value === key;
-    });
-    return option ? opts.concat(option) : opts;
-  }, []).map(function (item) {
-    return item.label;
-  }).join(' / ');
+  }, [type, variable]);
+  (0, _react2.useEffect)(function () {
+    var run = /*#__PURE__*/function () {
+      var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+        var prevOption, labels, _loop, i;
+        return _regeneratorRuntime().wrap(function _callee2$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              if (!(!variable || options.length <= 1)) {
+                _context3.next = 2;
+                break;
+              }
+              return _context3.abrupt("return");
+            case 2:
+              prevOption = null;
+              labels = [];
+              _loop = /*#__PURE__*/_regeneratorRuntime().mark(function _loop() {
+                var key, _prevOption$children;
+                return _regeneratorRuntime().wrap(function _loop$(_context2) {
+                  while (1) switch (_context2.prev = _context2.next) {
+                    case 0:
+                      key = variable[i];
+                      _context2.prev = 1;
+                      if (!(i === 0)) {
+                        _context2.next = 6;
+                        break;
+                      }
+                      prevOption = options.find(function (item) {
+                        return item.value === key;
+                      });
+                      _context2.next = 10;
+                      break;
+                    case 6:
+                      if (!(prevOption.loadChildren && !((_prevOption$children = prevOption.children) === null || _prevOption$children === void 0 ? void 0 : _prevOption$children.length))) {
+                        _context2.next = 9;
+                        break;
+                      }
+                      _context2.next = 9;
+                      return prevOption.loadChildren(prevOption);
+                    case 9:
+                      prevOption = prevOption.children.find(function (item) {
+                        return item.value === key;
+                      });
+                    case 10:
+                      labels.push(prevOption.label);
+                      _context2.next = 16;
+                      break;
+                    case 13:
+                      _context2.prev = 13;
+                      _context2.t0 = _context2["catch"](1);
+                      (0, _client.error)(_context2.t0);
+                    case 16:
+                    case "end":
+                      return _context2.stop();
+                  }
+                }, _loop, null, [[1, 13]]);
+              });
+              i = 0;
+            case 6:
+              if (!(i < variable.length)) {
+                _context3.next = 11;
+                break;
+              }
+              return _context3.delegateYield(_loop(), "t0", 8);
+            case 8:
+              i++;
+              _context3.next = 6;
+              break;
+            case 11:
+              setOptions(_toConsumableArray(options));
+              setVariableText(labels.join(' / '));
+            case 13:
+            case "end":
+              return _context3.stop();
+          }
+        }, _callee2);
+      }));
+      return function run() {
+        return _ref6.apply(this, arguments);
+      };
+    }();
+    // 如果没有这个延迟，会导致选择父节点时不展开子节点
+    setTimeout(run);
+  }, [variable, options.length]);
   var disabled = props.disabled || form.disabled;
   return /*#__PURE__*/_react2.default.createElement(_antd.Input.Group, {
     compact: true,
     style: style,
-    className: (0, _classnames.default)(className, (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n          width: auto;\n          display: flex !important;\n          .ant-input-disabled {\n            .ant-tag {\n              color: #bfbfbf;\n              border-color: #d9d9d9;\n            }\n          }\n          .ant-input.null-value {\n            width: 4em;\n            min-width: 4em;\n          }\n        "]))))
+    className: (0, _classnames.default)(className, groupClass)
   }, variable ? /*#__PURE__*/_react2.default.createElement("div", {
-    className: (0, _css.css)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n            position: relative;\n            line-height: 0;\n\n            &:hover {\n              .ant-select-clear {\n                opacity: 0.8;\n              }\n            }\n\n            .ant-input {\n              overflow: auto;\n              white-space: nowrap;\n              ", "\n\n              .ant-tag {\n                display: inline;\n                line-height: 19px;\n                margin: 0;\n                padding: 2px 7px;\n                border-radius: 10px;\n              }\n            }\n          "])), disabled ? '' : 'padding-right: 28px;')
+    className: (0, _css.css)(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n            position: relative;\n            line-height: 0;\n\n            &:hover {\n              .ant-select-clear {\n                opacity: 0.8;\n              }\n            }\n\n            .ant-input {\n              overflow: auto;\n              white-space: nowrap;\n              ", "\n\n              .ant-tag {\n                display: inline;\n                line-height: 19px;\n                margin: 0;\n                padding: 2px 7px;\n                border-radius: 10px;\n              }\n            }\n          "])), disabled ? '' : 'padding-right: 28px;')
   }, /*#__PURE__*/_react2.default.createElement("div", {
     onInput: function onInput(e) {
       return e.preventDefault();
@@ -228,7 +370,7 @@ function Input(props) {
     contentEditable: false,
     color: "blue"
   }, variableText)), !disabled ? /*#__PURE__*/_react2.default.createElement("span", {
-    className: (0, _css.cx)('ant-select-clear', (0, _css.css)(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n                  user-select: 'none';\n                "])))),
+    className: (0, _css.cx)('ant-select-clear', userSelectNone),
     // eslint-disable-next-line react/no-unknown-property
     unselectable: "on",
     "aria-hidden": true,
@@ -242,8 +384,18 @@ function Input(props) {
     options: options,
     value: variable !== null && variable !== void 0 ? variable : [''].concat(_toConsumableArray(children || !((_constantOption$child = constantOption.children) === null || _constantOption$child === void 0 ? void 0 : _constantOption$child.length) ? [] : [type])),
     onChange: onSwitch,
+    loadData: loadData,
     changeOnSelect: true
   }, button !== null && button !== void 0 ? button : /*#__PURE__*/_react2.default.createElement(_XButton.XButton, {
     type: variable ? 'primary' : 'default'
   })) : null);
+}
+function deepCompileLabel(list, compile) {
+  return list.map(function (item) {
+    var children = item.children ? deepCompileLabel(item.children, compile) : null;
+    return _objectSpread(_objectSpread({}, item), {}, {
+      label: compile(item.label),
+      children: children
+    });
+  });
 }

package/lib/schema-component/antd/variable/JSONInput.d.ts

@@ -1,2 +1,2 @@
-/// <reference types="react" />
-export declare function JSONInput(props: any): JSX.Element;
+import React from 'react';
+export declare function JSONInput(props: any): React.JSX.Element;

package/lib/schema-component/antd/variable/JSONInput.js

@@ -9,7 +9,6 @@ var _react = _interopRequireWildcard(require("react"));
 var _antd = require("antd");
 var _css = require("@emotion/css");
 var _input = require("../input");
-var _reactI18next = require("react-i18next");
 var _VariableSelect = require("./VariableSelect");
 var _templateObject, _templateObject2;
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -31,26 +30,8 @@ function setNativeInputValue(input, value) {
 }
 function JSONInput(props) {
   var inputRef = (0, _react.useRef)(null);
-  var value = props.value,
-    _props$space = props.space,
-    space = _props$space === void 0 ? 2 : _props$space,
-    scope = props.scope;
-  var _useTranslation = (0, _reactI18next.useTranslation)(),
-    t = _useTranslation.t;
+  var scope = props.scope;
   var options = typeof scope === 'function' ? scope() : scope !== null && scope !== void 0 ? scope : [];
-  function onFormat() {
-    if (!inputRef.current) {
-      return;
-    }
-    if (!value) {
-      return;
-    }
-    var textArea = inputRef.current.resizableTextArea.textArea;
-    var nextValue = JSON.stringify(value, null, space);
-    setNativeInputValue(textArea, nextValue);
-    textArea.setSelectionRange(nextValue.length, nextValue.length);
-    textArea.focus();
-  }
   function onInsert(selected) {
     if (!inputRef.current) {
       return;
@@ -69,9 +50,7 @@ function JSONInput(props) {
     ref: inputRef
   })), /*#__PURE__*/_react.default.createElement(_antd.Button.Group, {
     className: (0, _css.css)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n          position: absolute;\n          right: 0;\n          top: 0;\n          .ant-btn-sm {\n            font-size: 85%;\n          }\n        "])))
-  }, /*#__PURE__*/_react.default.createElement(_antd.Button, {
-    onClick: onFormat
-  }, t('Prettify')), /*#__PURE__*/_react.default.createElement(_VariableSelect.VariableSelect, {
+  }, /*#__PURE__*/_react.default.createElement(_VariableSelect.VariableSelect, {
     options: options,
     onInsert: onInsert
   })));

package/lib/schema-component/antd/variable/TextArea.d.ts

@@ -1,5 +1,5 @@
-/// <reference types="react" />
-export declare function TextArea(props: any): JSX.Element;
+import React from 'react';
+export declare function TextArea(props: any): React.JSX.Element;
 export declare namespace TextArea {
     var ReadPretty: (props: any) => JSX.Element;
 }

package/lib/schema-component/antd/variable/VariableSelect.d.ts

@@ -1,2 +1,2 @@
-/// <reference types="react" />
-export declare function VariableSelect(props: any): JSX.Element;
+import React from 'react';
+export declare function VariableSelect(props: any): React.JSX.Element;

package/lib/schema-component/common/dnd-context/index.d.ts

@@ -1,3 +1,3 @@
 import { Props } from '@dnd-kit/core/dist/components/DndContext/DndContext';
 import React from 'react';
-export declare const DndContext: React.MemoExoticComponent<React.FunctionComponent<Props>>;
+export declare const DndContext: React.MemoExoticComponent<import("@formily/react").ReactFC<Props>>;

package/lib/schema-component/common/dnd-context/index.js

@@ -51,6 +51,11 @@ var useDragEnd = function useDragEnd(props) {
       props === null || props === void 0 ? void 0 : (_props$onDragEnd2 = props.onDragEnd) === null || _props$onDragEnd2 === void 0 ? void 0 : _props$onDragEnd2.call(props, event);
       return;
     }
+    if (activeSchema.parent === overSchema && insertAdjacent === 'beforeEnd') {
+      var _props$onDragEnd3;
+      props === null || props === void 0 ? void 0 : (_props$onDragEnd3 = props.onDragEnd) === null || _props$onDragEnd3 === void 0 ? void 0 : _props$onDragEnd3.call(props, event);
+      return;
+    }
     var dn = (0, _hooks.createDesignable)({
       t: t,
       api: api,
@@ -59,20 +64,20 @@ var useDragEnd = function useDragEnd(props) {
     });
     dn.loadAPIClientEvents();
     if (activeSchema.parent === overSchema.parent) {
-      var _props$onDragEnd3;
+      var _props$onDragEnd4;
       dn.insertBeforeBeginOrAfterEnd(activeSchema);
-      props === null || props === void 0 ? void 0 : (_props$onDragEnd3 = props.onDragEnd) === null || _props$onDragEnd3 === void 0 ? void 0 : _props$onDragEnd3.call(props, event);
+      props === null || props === void 0 ? void 0 : (_props$onDragEnd4 = props.onDragEnd) === null || _props$onDragEnd4 === void 0 ? void 0 : _props$onDragEnd4.call(props, event);
       return;
     }
     if (insertAdjacent) {
-      var _props$onDragEnd4;
+      var _props$onDragEnd5;
       dn.insertAdjacent(insertAdjacent, activeSchema, {
         wrap: wrapSchema,
         breakRemoveOn: breakRemoveOn,
         removeParentsIfNoChildren: removeParentsIfNoChildren,
         onSuccess: onSuccess
       });
-      props === null || props === void 0 ? void 0 : (_props$onDragEnd4 = props.onDragEnd) === null || _props$onDragEnd4 === void 0 ? void 0 : _props$onDragEnd4.call(props, event);
+      props === null || props === void 0 ? void 0 : (_props$onDragEnd5 = props.onDragEnd) === null || _props$onDragEnd5 === void 0 ? void 0 : _props$onDragEnd5.call(props, event);
       return;
     }
   };
@@ -108,5 +113,7 @@ var DndContext = (0, _react.observer)(function (props) {
       whiteSpace: 'nowrap'
     }
   }, t('Dragging'))), props.children);
+}, {
+  displayName: 'DndContext'
 });
 exports.DndContext = DndContext;

package/lib/schema-component/common/sortable-item/SortableItem.d.ts

@@ -1,7 +1,14 @@
-import React from 'react';
+import { Schema } from '@formily/react';
+import React, { HTMLAttributes } from 'react';
 export declare const DraggableContext: React.Context<any>;
 export declare const SortableContext: React.Context<any>;
-export declare const SortableProvider: (props: any) => JSX.Element;
+export declare const SortableProvider: (props: any) => React.JSX.Element;
 export declare const Sortable: (props: any) => React.DetailedReactHTMLElement<React.InputHTMLAttributes<HTMLInputElement>, HTMLInputElement>;
-export declare const SortableItem: React.FC<any>;
-export declare const DragHandler: (props: any) => JSX.Element;
+interface SortableItemProps extends HTMLAttributes<HTMLDivElement> {
+    eid?: string;
+    schema?: Schema;
+    removeParentsIfNoChildren?: boolean;
+}
+export declare const SortableItem: React.FC<SortableItemProps>;
+export declare const DragHandler: (props: any) => React.JSX.Element;
+export {};

package/lib/schema-component/common/sortable-item/SortableItem.js

@@ -6,10 +6,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.SortableProvider = exports.SortableItem = exports.SortableContext = exports.Sortable = exports.DraggableContext = exports.DragHandler = void 0;
 var _core = require("@dnd-kit/core");
+var _css = require("@emotion/css");
 var _react = require("@formily/react");
 var _react2 = _interopRequireWildcard(require("react"));
-var _excluded = ["component", "style", "children", "openMode"],
-  _excluded2 = ["schema", "id", "removeParentsIfNoChildren"];
+var _excluded = ["component", "overStyle", "style", "children", "openMode"],
+  _excluded2 = ["schema", "id", "eid", "removeParentsIfNoChildren"];
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 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; }
@@ -44,20 +45,25 @@ var SortableProvider = function SortableProvider(props) {
 };
 exports.SortableProvider = SortableProvider;
 var Sortable = function Sortable(props) {
+  var _draggable$active, _droppable$over;
   var component = props.component,
+    overStyle = props.overStyle,
     style = props.style,
     children = props.children,
     openMode = props.openMode,
     others = _objectWithoutProperties(props, _excluded);
   var _useContext = (0, _react2.useContext)(SortableContext),
+    draggable = _useContext.draggable,
     droppable = _useContext.droppable;
   var isOver = droppable.isOver,
     setNodeRef = droppable.setNodeRef;
   var droppableStyle = _objectSpread({}, style);
-  if (isOver) {
-    droppableStyle['color'] = 'rgba(241, 139, 98, .1)';
+  if (isOver && (draggable === null || draggable === void 0 ? void 0 : (_draggable$active = draggable.active) === null || _draggable$active === void 0 ? void 0 : _draggable$active.id) !== (droppable === null || droppable === void 0 ? void 0 : (_droppable$over = droppable.over) === null || _droppable$over === void 0 ? void 0 : _droppable$over.id)) {
+    droppableStyle[component === 'a' ? 'color' : 'background'] = 'rgba(241, 139, 98, .15)';
+    Object.assign(droppableStyle, overStyle);
   }
   return /*#__PURE__*/_react2.default.createElement(component || 'div', _objectSpread(_objectSpread({}, others), {}, {
+    className: (0, _css.cx)('nb-sortable-designer', props.className),
     ref: setNodeRef,
     style: droppableStyle
   }), children);
@@ -87,6 +93,7 @@ var SortableItem = (0, _react.observer)(function (props) {
   var _useSortableItemProps = useSortableItemProps(props),
     schema = _useSortableItemProps.schema,
     id = _useSortableItemProps.id,
+    eid = _useSortableItemProps.eid,
     removeParentsIfNoChildren = _useSortableItemProps.removeParentsIfNoChildren,
     others = _objectWithoutProperties(_useSortableItemProps, _excluded2);
   return /*#__PURE__*/_react2.default.createElement(SortableProvider, {
@@ -96,7 +103,11 @@ var SortableItem = (0, _react.observer)(function (props) {
       schema: schema,
       removeParentsIfNoChildren: removeParentsIfNoChildren !== null && removeParentsIfNoChildren !== void 0 ? removeParentsIfNoChildren : true
     }
-  }, /*#__PURE__*/_react2.default.createElement(Sortable, _objectSpread({}, others), props.children));
+  }, /*#__PURE__*/_react2.default.createElement(Sortable, _objectSpread({
+    id: eid
+  }, others), props.children));
+}, {
+  displayName: 'SortableItem'
 });
 exports.SortableItem = SortableItem;
 var DragHandler = function DragHandler(props) {