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

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"];
+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);
@@ -84,20 +90,24 @@ var useSortableItemId = function useSortableItemId(props) {
   return field.address.toString();
 };
 var SortableItem = (0, _react.observer)(function (props) {
-  var _others$removeParents;
   var _useSortableItemProps = useSortableItemProps(props),
     schema = _useSortableItemProps.schema,
     id = _useSortableItemProps.id,
+    eid = _useSortableItemProps.eid,
+    removeParentsIfNoChildren = _useSortableItemProps.removeParentsIfNoChildren,
     others = _objectWithoutProperties(_useSortableItemProps, _excluded2);
-  var removeParentsIfNoChildren = (_others$removeParents = others.removeParentsIfNoChildren) !== null && _others$removeParents !== void 0 ? _others$removeParents : true;
   return /*#__PURE__*/_react2.default.createElement(SortableProvider, {
     id: id,
     data: {
       insertAdjacent: 'afterEnd',
       schema: schema,
-      removeParentsIfNoChildren: removeParentsIfNoChildren
+      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) {

package/lib/schema-component/common/utils/logic.js

@@ -38,15 +38,31 @@ http://ricostacruz.com/cheatsheets/umdjs.html
     }
     return a;
   }
+  function areArraysEqual(arr1, arr2) {
+    return JSON.stringify(arr1) === JSON.stringify(arr2);
+  }
   var jsonLogic = {};
   var operations = {
     $is: function $is(a, b) {
       return a === b;
     },
     $match: function $match(a, b) {
+      if (Array.isArray(a) && Array.isArray(b) && a.some(function (element) {
+        return Array.isArray(element);
+      })) {
+        return a.some(function (subArray) {
+          return (subArray === null || subArray === void 0 ? void 0 : subArray.length) === b.length && (subArray === null || subArray === void 0 ? void 0 : subArray.every(function (element, index) {
+            return element === b[index];
+          }));
+        });
+      }
       return JSON.stringify(a) === JSON.stringify(b);
     },
     $eq: function $eq(a, b) {
+      if (Array.isArray(a) && Array.isArray(b)) return areArraysEqual(a, b);
+      if (Array.isArray(a)) {
+        return a.includes(b);
+      }
       return a === b;
     },
     $ne: function $ne(a, b) {
@@ -56,12 +72,18 @@ http://ricostacruz.com/cheatsheets/umdjs.html
       return a !== b;
     },
     $gt: function $gt(a, b) {
+      if (Array.isArray(a)) return a.some(function (k) {
+        return k > b;
+      });
       return a > b;
     },
     $gte: function $gte(a, b) {
       return a >= b;
     },
     $lt: function $lt(a, b, c) {
+      if (Array.isArray(a)) return a.some(function (k) {
+        return k < b;
+      });
       return c === undefined ? a < b : a < b && b < c;
     },
     $lte: function $lte(a, b, c) {
@@ -74,6 +96,9 @@ http://ricostacruz.com/cheatsheets/umdjs.html
       return jsonLogic.truthy(a);
     },
     $empty: function $empty(a) {
+      if (Array.isArray(a)) return a.some(function (k) {
+        return !jsonLogic.truthy(k);
+      });
       return !jsonLogic.truthy(a);
     },
     $notExists: function $notExists(a) {
@@ -88,6 +113,11 @@ http://ricostacruz.com/cheatsheets/umdjs.html
     },
     $in: function $in(a, b) {
       if (!b || typeof b.indexOf === 'undefined') return false;
+      if (Array.isArray(a) && Array.isArray(b)) {
+        return b.some(function (elementB) {
+          return a.includes(elementB);
+        });
+      }
       return b.indexOf(a) !== -1;
     },
     $notIn: function $notIn(a, b) {
@@ -96,24 +126,50 @@ http://ricostacruz.com/cheatsheets/umdjs.html
     },
     $includes: function $includes(a, b) {
       if (!a || typeof a.indexOf === 'undefined') return false;
+      if (Array.isArray(a)) return a.some(function (element) {
+        return element === null || element === void 0 ? void 0 : element.includes(b);
+      });
       return a.indexOf(b) !== -1;
     },
     $notIncludes: function $notIncludes(a, b) {
       if (!a || typeof a.indexOf === 'undefined') return false;
+      if (Array.isArray(a)) return !a.some(function (element) {
+        return element.includes(b);
+      });
       return !(a.indexOf(b) !== -1);
     },
     $anyOf: function $anyOf(a, b) {
       if (a.length === 0) {
         return false;
       }
-      return b.every(function (item) {
-        return a.includes(item);
+      if (Array.isArray(a) && Array.isArray(b) && a.some(function (element) {
+        return Array.isArray(element);
+      })) {
+        return a.some(function (subArray) {
+          return subArray.some(function (element) {
+            return b.includes(element);
+          });
+        });
+      }
+      return a.some(function (element) {
+        return b.includes(element);
       });
     },
     $noneOf: function $noneOf(a, b) {
       if (a.length === 0) {
         return true;
       }
+      if (Array.isArray(a) && Array.isArray(b) && a.some(function (element) {
+        return Array.isArray(element);
+      })) {
+        return a.some(function (subArray) {
+          return subArray.every(function (element) {
+            return !b.some(function (bElement) {
+              return element.includes(bElement);
+            });
+          });
+        });
+      }
       return b.some(function (item) {
         return !a.includes(item);
       });
@@ -130,9 +186,15 @@ http://ricostacruz.com/cheatsheets/umdjs.html
       return false;
     },
     $isTruly: function $isTruly(a) {
+      if (Array.isArray(a)) return a.some(function (k) {
+        return k === true || k === 1;
+      });
       return a === true || a === 1;
     },
     $isFalsy: function $isFalsy(a) {
+      if (Array.isArray(a)) return a.some(function (k) {
+        return !jsonLogic.truthy(k);
+      });
       return !jsonLogic.truthy(a);
     },
     cat: function cat() {

package/lib/schema-component/common/utils/uitls.js

@@ -7,6 +7,7 @@ exports.useVariablesCtx = exports.parseVariables = exports.isVariable = exports.
 var _flat2 = _interopRequireDefault(require("flat"));
 var _lodash = _interopRequireWildcard(require("lodash"));
 var _moment = _interopRequireDefault(require("moment"));
+var _react = require("react");
 var _user = require("../../../user");
 var _logic = _interopRequireDefault(require("../../common/utils/logic"));
 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); }
@@ -19,14 +20,16 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 var useVariablesCtx = function useVariablesCtx() {
   var _ref = (0, _user.useCurrentUserContext)() || {},
     data = _ref.data;
-  return {
-    $user: (data === null || data === void 0 ? void 0 : data.data) || {},
-    $date: {
-      now: function now() {
-        return (0, _moment.default)().toISOString();
+  return (0, _react.useMemo)(function () {
+    return {
+      $user: (data === null || data === void 0 ? void 0 : data.data) || {},
+      $date: {
+        now: function now() {
+          return (0, _moment.default)().toISOString();
+        }
       }
-    }
-  };
+    };
+  }, [data]);
 };
 exports.useVariablesCtx = useVariablesCtx;
 var isVariable = function isVariable(str) {
@@ -69,20 +72,43 @@ function getInnermostKeyAndValue(obj) {
   }
   return null;
 }
+var getFieldValue = function getFieldValue(fieldPath, values) {
+  var v = fieldPath[0];
+  var h = fieldPath[1];
+  var regex = new RegExp('^' + v + '\\..+\\.' + h + '$'); // 构建匹配的正则表达式
+  var matchedValues = [];
+  var data = _flat2.default.flatten(values, {
+    maxDepth: 3
+  });
+  for (var key in data) {
+    if (regex.test(key)) {
+      matchedValues.push(data[key]);
+    }
+  }
+  return matchedValues;
+};
 var getValue = function getValue(str, values) {
   var _str$match3;
   var regex = /{{(.*?)}}/;
   var matches = str === null || str === void 0 ? void 0 : (_str$match3 = str.match) === null || _str$match3 === void 0 ? void 0 : _str$match3.call(str, regex);
   if (matches) {
-    return getVariableValue(str, (0, _flat2.default)(values));
+    return getVariableValue(str, values);
   } else {
     return str;
   }
 };
 var getVariableValue = function getVariableValue(str, values) {
+  var _match$;
   var regex = /{{[^.]+\.([^}]+)}}/;
   var match = regex.exec(str);
-  return values[match === null || match === void 0 ? void 0 : match[1]];
+  var targetField = (match === null || match === void 0 ? void 0 : (_match$ = match[1]) === null || _match$ === void 0 ? void 0 : _match$.split('.')) || [];
+  var isArrayField = (0, _lodash.isArray)(values[targetField[0]]);
+  if (isArrayField && targetField.length > 1) {
+    //对多关系字段
+    return getFieldValue(targetField, values);
+  } else {
+    return (0, _flat2.default)(values)[match === null || match === void 0 ? void 0 : match[1]];
+  }
 };
 var getTargetField = function getTargetField(obj) {
   var keys = getAllKeys(obj);
@@ -119,10 +145,18 @@ var conditionAnalyse = function conditionAnalyse(rules, values) {
       return true;
     }
     try {
-      var _flat;
-      var currentValue = targetField.length > 1 ? (_flat = (0, _flat2.default)(values)) === null || _flat === void 0 ? void 0 : _flat[targetField.join('.')] : values === null || values === void 0 ? void 0 : values[targetField[0]];
-      var result = _logic.default.apply(_defineProperty({}, operator, [currentValue, value]));
-      return result;
+      var isArrayField = (0, _lodash.isArray)(values[targetField[0]]);
+      if (isArrayField && targetField.length > 1) {
+        //对多关系字段比较
+        var currentValue = getFieldValue(targetField, values);
+        var result = _logic.default.apply(_defineProperty({}, operator, [currentValue, value]));
+        return result;
+      } else {
+        var _flat;
+        var _currentValue = targetField.length > 1 ? (_flat = (0, _flat2.default)(values)) === null || _flat === void 0 ? void 0 : _flat[targetField.join('.')] : values === null || values === void 0 ? void 0 : values[targetField[0]];
+        var _result = _logic.default.apply(_defineProperty({}, operator, [_currentValue, value]));
+        return _result;
+      }
     } catch (error) {
       console.error(error);
     }

package/lib/schema-component/core/DesignableSwitch.d.ts

@@ -1 +1,2 @@
-export declare const DesignableSwitch: () => JSX.Element;
+import React from 'react';
+export declare const DesignableSwitch: () => React.JSX.Element;

package/lib/schema-component/core/SchemaComponent.d.ts

@@ -1,4 +1,5 @@
 import { IRecursionFieldProps, ISchemaFieldProps } from '@formily/react';
+import React from 'react';
 export declare const SchemaComponent: (props: (ISchemaFieldProps | IRecursionFieldProps) & {
     memoized?: boolean;
-}) => JSX.Element;
+}) => React.JSX.Element;

package/lib/schema-component/core/SchemaComponentOptions.js

@@ -14,19 +14,24 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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); }
-var SchemaComponentOptions = function SchemaComponentOptions(props) {
-  var inherit = props.inherit;
+var useSchemaOptionsContext = function useSchemaOptionsContext() {
   var options = (0, _react2.useContext)(_react.SchemaOptionsContext);
-  var expressionScope = (0, _react2.useContext)(_react.SchemaExpressionScopeContext);
-  var scope = _objectSpread(_objectSpread(_objectSpread({}, options === null || options === void 0 ? void 0 : options.scope), expressionScope), props.scope);
-  var components = _objectSpread(_objectSpread({}, options === null || options === void 0 ? void 0 : options.components), props.components);
+  return options || {};
+};
+var SchemaComponentOptions = function SchemaComponentOptions(props) {
+  var children = props.children;
+  var options = useSchemaOptionsContext();
+  var components = _objectSpread(_objectSpread({}, options.components), props.components);
+  var scope = _objectSpread(_objectSpread({}, options.scope), props.scope);
   return /*#__PURE__*/_react2.default.createElement(_react.SchemaOptionsContext.Provider, {
     value: {
       scope: scope,
       components: components
     }
-  }, /*#__PURE__*/_react2.default.createElement(_react.SchemaExpressionScopeContext.Provider, {
+  }, /*#__PURE__*/_react2.default.createElement(_react.SchemaComponentsContext.Provider, {
+    value: components
+  }, /*#__PURE__*/_react2.default.createElement(_react.ExpressionScope, {
     value: scope
-  }, props.children));
+  }, children)));
 };
 exports.SchemaComponentOptions = SchemaComponentOptions;

package/lib/schema-component/core/SchemaComponentProvider.js

@@ -31,19 +31,30 @@ var randomString = function randomString() {
   return "".concat(prefix).concat((0, _shared.uid)());
 };
 _react.Schema.silent(true);
+var results = {};
 var Registry = {
   silent: true,
   compile: function compile(expression) {
     var scope = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-    if (Registry.silent) {
-      try {
+    var fn = function fn() {
+      if (Registry.silent) {
+        try {
+          return new Function('$root', "with($root) { return (".concat(expression, "); }"))(scope);
+        } catch (_unused) {
+          return "{{".concat(expression, "}}");
+        }
+      } else {
         return new Function('$root', "with($root) { return (".concat(expression, "); }"))(scope);
-      } catch (_unused) {
-        return "{{".concat(expression, "}}");
       }
-    } else {
-      return new Function('$root', "with($root) { return (".concat(expression, "); }"))(scope);
+    };
+    if (results[expression]) {
+      return results[expression];
     }
+    if (expression.trim().startsWith('t(')) {
+      results[expression] = fn();
+      return results[expression];
+    }
+    return fn();
   }
 };
 _react.Schema.registerCompiler(Registry.compile);

package/lib/schema-component/hooks/useCompile.js

@@ -6,20 +6,48 @@ Object.defineProperty(exports, "__esModule", {
 exports.useCompile = void 0;
 var _react = require("@formily/react");
 var _react2 = require("react");
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+var compileCache = {};
 var useCompile = function useCompile() {
   var options = (0, _react2.useContext)(_react.SchemaOptionsContext);
   var scope = (0, _react2.useContext)(_react.SchemaExpressionScopeContext);
   return function (source, ext) {
-    if (!source) {
-      return source;
+    var shouldCompile = false;
+    var cacheKey;
+    // source is i18n, for example: {{ t('Add new') }}
+    if (typeof source === 'string' && source.startsWith('{{')) {
+      shouldCompile = true;
+      cacheKey = source;
+    }
+    // source is Component Object, for example: { 'x-component': "Cascader", type: "array", title: "所属地区(行政区划)" }
+    if (source && _typeof(source) === 'object' && ! /*#__PURE__*/(0, _react2.isValidElement)(source)) {
+      shouldCompile = true;
+      cacheKey = JSON.stringify(source);
+    }
+    // source is Array, for example: [{ 'title': "{{ ('Admin')}}", name: 'admin' }, { 'title': "{{ ('Root')}}", name: 'root' }]
+    if (Array.isArray(source)) {
+      shouldCompile = true;
+    }
+    if (shouldCompile) {
+      var mergedScope = _objectSpread(_objectSpread(_objectSpread({}, options.scope), scope), ext);
+      if (!cacheKey) {
+        return _react.Schema.compile(source, mergedScope);
+      }
+      try {
+        compileCache[cacheKey] = compileCache[cacheKey] || _react.Schema.compile(source, mergedScope);
+        return compileCache[cacheKey];
+      } catch (e) {
+        console.log('useCompile error', source, e);
+        return _react.Schema.compile(source, mergedScope);
+      }
     }
-    return _react.Schema.compile(source, _objectSpread(_objectSpread(_objectSpread({}, options.scope), scope), ext));
+    // source is: plain object、string、number、boolean、undefined、null
+    return source;
   };
 };
 exports.useCompile = useCompile;

package/lib/schema-component/hooks/useDesignable.d.ts

@@ -1,4 +1,5 @@
 import { ISchema, Schema } from '@formily/react';
+import React from 'react';
 import { APIClient } from '../../api-client';
 interface CreateDesignableProps {
     current: Schema;
@@ -39,9 +40,9 @@ export declare class Designable {
     emit(name: 'insertAdjacent' | 'remove' | 'error' | 'patch' | 'batchPatch', ...args: any[]): Promise<any>;
     parentsIn(schema: Schema): boolean;
     refresh(): void;
-    insertAdjacent(position: Position, schema: ISchema, options?: InsertAdjacentOptions): void;
+    insertAdjacent(position: Position, schema: ISchema, options?: InsertAdjacentOptions): void | Promise<any>;
     recursiveRemoveIfNoChildren(schema?: Schema, options?: RecursiveRemoveOptions): Schema<any, any, any, any, any, any, any, any, any>;
-    remove(schema?: Schema, options?: RemoveOptions): void;
+    remove(schema?: Schema, options?: RemoveOptions): Promise<any>;
     removeWithoutEmit(schema?: Schema, options?: RemoveOptions): Schema<any, any, any, any, any, any, any, any, any>;
     insertBeforeBeginOrAfterEnd(schema: ISchema, options?: InsertAdjacentOptions): void;
     /**
@@ -61,7 +62,7 @@ export declare class Designable {
      * @param schema
      * @returns
      */
-    insertBeforeEnd(schema: ISchema, options?: InsertAdjacentOptions): void;
+    insertBeforeEnd(schema: ISchema, options?: InsertAdjacentOptions): Promise<any>;
     /**
      * After the current schema itself.
      */
@@ -73,7 +74,7 @@ export declare function useDesignable(): {
     reset: () => void;
     refresh: () => void;
     setDesignable: (value: boolean) => void;
-    DesignableBar: () => JSX.Element;
+    DesignableBar: () => React.JSX.Element;
     findComponent(component: any): any;
     on: any;
     patch: (key: ISchema | string, value?: any) => void;