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

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

@@ -36,15 +36,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) {
@@ -54,12 +70,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) {
@@ -72,6 +94,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) {
@@ -86,6 +111,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) {
@@ -94,24 +124,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);
       });
@@ -128,9 +184,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/es/schema-component/common/utils/uitls.d.ts

@@ -6,5 +6,6 @@ declare type VariablesCtx = {
 export declare const useVariablesCtx: () => VariablesCtx;
 export declare const isVariable: (str: unknown) => boolean;
 export declare const parseVariables: (str: string, ctx: VariablesCtx) => any;
+export declare function getInnermostKeyAndValue(obj: any): any;
 export declare const conditionAnalyse: (rules: any, values: any) => boolean;
 export {};

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

@@ -3,21 +3,24 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 import flat from 'flat';
-import _, { every, findIndex, some } from 'lodash';
+import _, { every, findIndex, isArray, some } from 'lodash';
 import moment from 'moment';
+import { useMemo } from 'react';
 import { useCurrentUserContext } from '../../../user';
 import jsonLogic from '../../common/utils/logic';
 export var useVariablesCtx = function useVariablesCtx() {
   var _ref = useCurrentUserContext() || {},
     data = _ref.data;
-  return {
-    $user: (data === null || data === void 0 ? void 0 : data.data) || {},
-    $date: {
-      now: function now() {
-        return moment().toISOString();
+  return useMemo(function () {
+    return {
+      $user: (data === null || data === void 0 ? void 0 : data.data) || {},
+      $date: {
+        now: function now() {
+          return moment().toISOString();
+        }
       }
-    }
-  };
+    };
+  }, [data]);
 };
 export var isVariable = function isVariable(str) {
   var _str$match;
@@ -39,7 +42,7 @@ export var parseVariables = function parseVariables(str, ctx) {
     return str;
   }
 };
-function getInnermostKeyAndValue(obj) {
+export function getInnermostKeyAndValue(obj) {
   if (_typeof(obj) !== 'object' || obj === null) {
     return null;
   }
@@ -57,20 +60,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 = flat.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, flat(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 = isArray(values[targetField[0]]);
+  if (isArrayField && targetField.length > 1) {
+    //对多关系字段
+    return getFieldValue(targetField, values);
+  } else {
+    return flat(values)[match === null || match === void 0 ? void 0 : match[1]];
+  }
 };
 var getTargetField = function getTargetField(obj) {
   var keys = getAllKeys(obj);
@@ -107,10 +133,18 @@ export var conditionAnalyse = function conditionAnalyse(rules, values) {
       return true;
     }
     try {
-      var _flat;
-      var currentValue = targetField.length > 1 ? (_flat = flat(values)) === null || _flat === void 0 ? void 0 : _flat[targetField.join('.')] : values === null || values === void 0 ? void 0 : values[targetField[0]];
-      var result = jsonLogic.apply(_defineProperty({}, operator, [currentValue, value]));
-      return result;
+      var isArrayField = isArray(values[targetField[0]]);
+      if (isArrayField && targetField.length > 1) {
+        //对多关系字段比较
+        var currentValue = getFieldValue(targetField, values);
+        var result = jsonLogic.apply(_defineProperty({}, operator, [currentValue, value]));
+        return result;
+      } else {
+        var _flat;
+        var _currentValue = targetField.length > 1 ? (_flat = flat(values)) === null || _flat === void 0 ? void 0 : _flat[targetField.join('.')] : values === null || values === void 0 ? void 0 : values[targetField[0]];
+        var _result = jsonLogic.apply(_defineProperty({}, operator, [_currentValue, value]));
+        return _result;
+      }
     } catch (error) {
       console.error(error);
     }

package/es/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/es/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/es/schema-component/core/SchemaComponentOptions.js

@@ -4,20 +4,25 @@ 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); }
-import { SchemaExpressionScopeContext, SchemaOptionsContext } from '@formily/react';
+import { ExpressionScope, SchemaComponentsContext, SchemaOptionsContext } from '@formily/react';
 import React, { useContext } from 'react';
-export var SchemaComponentOptions = function SchemaComponentOptions(props) {
-  var inherit = props.inherit;
+var useSchemaOptionsContext = function useSchemaOptionsContext() {
   var options = useContext(SchemaOptionsContext);
-  var expressionScope = useContext(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 || {};
+};
+export 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__*/React.createElement(SchemaOptionsContext.Provider, {
     value: {
       scope: scope,
       components: components
     }
-  }, /*#__PURE__*/React.createElement(SchemaExpressionScopeContext.Provider, {
+  }, /*#__PURE__*/React.createElement(SchemaComponentsContext.Provider, {
+    value: components
+  }, /*#__PURE__*/React.createElement(ExpressionScope, {
     value: scope
-  }, props.children));
+  }, children)));
 };

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

@@ -23,19 +23,30 @@ var randomString = function randomString() {
   return "".concat(prefix).concat(uid());
 };
 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();
   }
 };
 Schema.registerCompiler(Registry.compile);

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

@@ -1,18 +1,46 @@
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 import { Schema, SchemaExpressionScopeContext, SchemaOptionsContext } from '@formily/react';
-import { useContext } from 'react';
+import { useContext, isValidElement } from 'react';
+var compileCache = {};
 export var useCompile = function useCompile() {
   var options = useContext(SchemaOptionsContext);
   var scope = useContext(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__*/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 Schema.compile(source, mergedScope);
+      }
+      try {
+        compileCache[cacheKey] = compileCache[cacheKey] || Schema.compile(source, mergedScope);
+        return compileCache[cacheKey];
+      } catch (e) {
+        console.log('useCompile error', source, e);
+        return Schema.compile(source, mergedScope);
+      }
     }
-    return Schema.compile(source, _objectSpread(_objectSpread(_objectSpread({}, options.scope), scope), ext));
+    // source is: plain object、string、number、boolean、undefined、null
+    return source;
   };
 };

package/es/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;

package/es/schema-component/hooks/useDesignable.js

@@ -99,8 +99,8 @@ export var Designable = /*#__PURE__*/function () {
   _createClass(Designable, [{
     key: "loadAPIClientEvents",
     value: function loadAPIClientEvents() {
+      var _this = this;
       var _this$options = this.options,
-        refresh = _this$options.refresh,
         api = _this$options.api,
         _this$options$t = _this$options.t,
         t = _this$options$t === void 0 ? translate : _this$options$t;
@@ -130,7 +130,8 @@ export var Designable = /*#__PURE__*/function () {
       };
       this.on('insertAdjacent', /*#__PURE__*/function () {
         var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
-          var onSuccess, current, position, schema, wrap, wrapped, removed, schemas;
+          var _res$data;
+          var onSuccess, current, position, schema, wrap, wrapped, removed, schemas, res;
           return _regeneratorRuntime().wrap(function _callee$(_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
@@ -142,7 +143,7 @@ export var Designable = /*#__PURE__*/function () {
                 if ((removed === null || removed === void 0 ? void 0 : removed['x-component']) === 'Grid.Col') {
                   schemas = schemas.concat(updateColumnSize(removed.parent));
                 }
-                refresh();
+                _this.refresh();
                 if (current['x-uid']) {
                   _context.next = 7;
                   break;
@@ -159,30 +160,31 @@ export var Designable = /*#__PURE__*/function () {
                   }
                 });
               case 9:
+                res = _context.sent;
                 if (!schemas.length) {
-                  _context.next = 12;
+                  _context.next = 13;
                   break;
                 }
-                _context.next = 12;
+                _context.next = 13;
                 return api.request({
                   url: "/uiSchemas:batchPatch",
                   method: 'post',
                   data: schemas
                 });
-              case 12:
+              case 13:
                 if (!(removed === null || removed === void 0 ? void 0 : removed['x-uid'])) {
-                  _context.next = 15;
+                  _context.next = 16;
                   break;
                 }
-                _context.next = 15;
+                _context.next = 16;
                 return api.request({
                   url: "/uiSchemas:remove/".concat(removed['x-uid']),
                   method: 'post'
                 });
-              case 15:
-                onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess();
+              case 16:
+                onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess(res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.data);
                 message.success(t('Saved successfully'), 0.2);
-              case 17:
+              case 18:
               case "end":
                 return _context.stop();
             }
@@ -199,7 +201,7 @@ export var Designable = /*#__PURE__*/function () {
             while (1) switch (_context2.prev = _context2.next) {
               case 0:
                 schema = _ref3.schema;
-                refresh();
+                _this.refresh();
                 if (schema === null || schema === void 0 ? void 0 : schema['x-uid']) {
                   _context2.next = 4;
                   break;
@@ -231,7 +233,7 @@ export var Designable = /*#__PURE__*/function () {
             while (1) switch (_context3.prev = _context3.next) {
               case 0:
                 schemas = _ref5.schemas;
-                refresh();
+                _this.refresh();
                 _context3.next = 4;
                 return api.request({
                   url: "/uiSchemas:batchPatch",
@@ -261,7 +263,7 @@ export var Designable = /*#__PURE__*/function () {
                 if ((removed === null || removed === void 0 ? void 0 : removed['x-component']) === 'Grid.Col') {
                   schemas = updateColumnSize(removed.parent);
                 }
-                refresh();
+                _this.refresh();
                 if (removed === null || removed === void 0 ? void 0 : removed['x-uid']) {
                   _context4.next = 6;
                   break;
@@ -327,7 +329,7 @@ export var Designable = /*#__PURE__*/function () {
     key: "emit",
     value: function () {
       var _emit = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(name) {
-        var _this = this;
+        var _this2 = this;
         var _len,
           args,
           _key,
@@ -348,8 +350,8 @@ export var Designable = /*#__PURE__*/function () {
               }
               opts = args[0], others = args.slice(1);
               return _context5.abrupt("return", Promise.all(this.events[name].map(function (fn) {
-                return fn.bind(_this).apply(void 0, [_objectSpread({
-                  current: _this.current
+                return fn.bind(_this2).apply(void 0, [_objectSpread({
+                  current: _this2.current
                 }, opts)].concat(_toConsumableArray(others)));
               })));
             case 5:
@@ -449,7 +451,7 @@ export var Designable = /*#__PURE__*/function () {
           removed = parent;
         }
       }
-      this.emit('remove', {
+      return this.emit('remove', {
         removed: removed
       });
     }
@@ -474,7 +476,7 @@ export var Designable = /*#__PURE__*/function () {
   }, {
     key: "insertBeforeBeginOrAfterEnd",
     value: function insertBeforeBeginOrAfterEnd(schema) {
-      var _this2 = this;
+      var _this3 = this;
       var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       if (!Schema.isSchemaInstance(this.current)) {
         return;
@@ -488,7 +490,7 @@ export var Designable = /*#__PURE__*/function () {
       var fromIndex = 0;
       var toIndex = 0;
       this.current.parent.mapProperties(function (property, key, index) {
-        if (_this2.current.name === key) {
+        if (_this3.current.name === key) {
           toIndex = index;
         }
         if (schema.name === key) {
@@ -503,7 +505,7 @@ export var Designable = /*#__PURE__*/function () {
   }, {
     key: "insertBeforeBegin",
     value: function insertBeforeBegin(schema) {
-      var _this3 = this;
+      var _this4 = this;
       var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       if (!Schema.isSchemaInstance(this.current)) {
         return;
@@ -537,7 +539,7 @@ export var Designable = /*#__PURE__*/function () {
       var order = 0;
       var newOrder = 0;
       this.current.parent.mapProperties(function (property, key) {
-        if (key === _this3.current.name) {
+        if (key === _this4.current.name) {
           newOrder = order;
           start = true;
           ++order;
@@ -546,7 +548,7 @@ export var Designable = /*#__PURE__*/function () {
         ++order;
         if (start) {
           properties[key] = property;
-          _this3.current.parent.removeProperty(key);
+          _this4.current.parent.removeProperty(key);
         }
       });
       this.prepareProperty(schema);
@@ -674,7 +676,7 @@ export var Designable = /*#__PURE__*/function () {
         _splitWrapSchema6 = _slicedToArray(_splitWrapSchema5, 2),
         schema1 = _splitWrapSchema6[0],
         schema2 = _splitWrapSchema6[1];
-      this.emit('insertAdjacent', _objectSpread({
+      return this.emit('insertAdjacent', _objectSpread({
         position: 'beforeEnd',
         schema: schema2,
         wrap: schema1,
@@ -687,7 +689,7 @@ export var Designable = /*#__PURE__*/function () {
   }, {
     key: "insertAfterEnd",
     value: function insertAfterEnd(schema) {
-      var _this4 = this;
+      var _this5 = this;
       var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       if (!Schema.isSchemaInstance(this.current)) {
         return;
@@ -705,15 +707,15 @@ export var Designable = /*#__PURE__*/function () {
       var properties = {};
       this.current.parent.mapProperties(function (property, key) {
         property['x-index'] = order;
-        if (key === _this4.current.name) {
+        if (key === _this5.current.name) {
           ++order;
           newOrder = order;
           start = true;
         }
         ++order;
-        if (start && key !== _this4.current.name) {
+        if (start && key !== _this5.current.name) {
           properties[key] = property;
-          _this4.current.parent.removeProperty(key);
+          _this5.current.parent.removeProperty(key);
         }
       });
       if (Schema.isSchemaInstance(schema)) {