@luck-design-biz/luckda 0.0.25-4 → 0.0.25-7

package/es/lowcode/engine/meta/form.props.json

@@ -38,7 +38,7 @@
           {
             "key": "saveTitle",
             "name": "保存按钮标题",
-            "type": "string",
+            "type": "_I18nInput",
             "default": "保存"
           },
           {
@@ -125,7 +125,7 @@
         {
           "key": "name",
           "name": "区块名称",
-          "type": "string"
+          "type": "_I18nInput"
         },
         {
           "key": "serial",
@@ -543,7 +543,7 @@
               {
                 "key": "zipName",
                 "name": "压缩包命名",
-                "type": "string"
+                "type": "_I18nInput"
               },
               {
                 "key": "uploadUrl",

package/es/lowcode/engine/meta/table.props.json

@@ -66,7 +66,7 @@
               "moreText": "操作",
               "todoList": []
             },
-            "defaultCode": "function todo(instance) { \n \n}",
+            "defaultCode": "function todo() { \n \n}",
             "wrapper": "collapse"
           },
           {
@@ -115,7 +115,7 @@
               "moreText": "更多操作",
               "todoList": []
             },
-            "defaultCode": "function onActionClick(data) {\n\n}",
+            "defaultCode": "function onActionClick(data, rowIndex, params) {\n\n}",
             "wrapper": "collapse",
             "wrapperProps": {
               "suppressIcon": true
@@ -383,13 +383,13 @@
         "key": "onMount",
         "name": "组件首次渲染时",
         "desc": "在组件首次渲染时，执行方法",
-        "func": "(params, instance)=>{\n\t\n}"
+        "func": "(params)=>{\n\t\n}"
       },
       {
         "key": "onUnmount",
         "name": "组件卸载时",
         "desc": "在组件卸载时，执行方法。",
-        "func": "(instance)=>{\n\t\n}"
+        "func": "()=>{\n\t\n}"
       },
       {
         "key": "onRowClick",

package/es/lowcode/engine/meta/tree.props.default.json

@@ -18,6 +18,7 @@
   "showIcon": true,
   "treeNodeIcon": [],
   "showRootAdd": true,
+  "onlyRoot": false,
   "rootAddSetting": {},
   "actions": {
     "todoList": []

package/es/lowcode/engine/meta/tree.props.json

@@ -170,6 +170,13 @@
                 "type": "switch",
                 "default": true
               },
+              {
+                "key": "onlyRoot",
+                "name": "根节点唯一",
+                "desc": "树组件仅一个根节点，如数据根节点数大于0，则不允许根节点新增",
+                "type": "switch",
+                "default": false
+              },
               {
                 "key": "rootAddSetting",
                 "name": "根节点配置",

package/es/lowcode/engine/provider/ContextProvider/index.js

@@ -3,62 +3,28 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React, { createContext, useContext as useReactContext, useRef } from 'react';
 import { history } from 'umi';
 import { useMemoizedFn, useSetState } from 'ahooks';
-import { get, isNil, isArray, isFunction, isObject, isString, reduce } from 'lodash';
 import { useLDEventBus } from "../EventBusProvider";
 import RemoteSourceProvider, { RemoteSourceContext } from "../RemoteSourceProvider";
 import useTodo from "../../tools/useTodo";
-import { findNodeAndParent } from "../../tools/dataProcess";
 import * as topics from "../../../constants/event-topics";
 export var Context = /*#__PURE__*/createContext(null);
 export var useContext = function useContext() {
   return useReactContext(Context);
 };
-export var usePageData = function usePageData(_) {
-  var _useReactContext = useReactContext(RemoteSourceContext),
-    pageData = _useReactContext.pageData,
-    loading = _useReactContext.loading,
-    setPageData = _useReactContext.setPageData,
-    back = _useReactContext.back,
-    forward = _useReactContext.forward,
-    backLength = _useReactContext.backLength,
-    forwardLength = _useReactContext.forwardLength;
-  var _pageData;
-  if (isNil(_)) {
-    _pageData = pageData;
-  } else if (isFunction(_)) {
-    _pageData = _(pageData);
-  } else if (isArray(_)) {
-    _pageData = reduce(_, function (r, k) {
-      r.push(get(pageData, k));
-      return r;
-    }, []);
-  } else if (isObject(_) && _.id) {
-    var _findNodeAndParent;
-    _pageData = (_findNodeAndParent = findNodeAndParent(_.id, pageData)) === null || _findNodeAndParent === void 0 ? void 0 : _findNodeAndParent.node;
-  } else if (isString(_)) {
-    _pageData = get(pageData, _);
-  }
-  return [_pageData, {
-    loading: loading,
-    setPageData: setPageData,
-    back: back,
-    forward: forward,
-    backLength: backLength,
-    forwardLength: forwardLength
-  }];
-};
 export var useRemoteSource = function useRemoteSource() {
   return useReactContext(RemoteSourceContext);
 };
+export * from "../../tools/usePageDataStore";
 var PRIVATE_KEYS = ['componentList', 'componentMap'];
 export default (function (_ref) {
   var children = _ref.children,
     code = _ref.code;
   var eventBus = useLDEventBus();
   var _useTodo = useTodo(),
-    _useTodo2 = _slicedToArray(_useTodo, 2),
+    _useTodo2 = _slicedToArray(_useTodo, 3),
     todo = _useTodo2[0],
-    callBehavior = _useTodo2[1];
+    callBehavior = _useTodo2[1],
+    loading = _useTodo2[2];
 
   /**
    * 页面公共资源
@@ -66,7 +32,7 @@ export default (function (_ref) {
   var _useSetState = useSetState(null),
     _useSetState2 = _slicedToArray(_useSetState, 2),
     pagePublicResource = _useSetState2[0],
-    _setPagePublicResource = _useSetState2[1];
+    setPagePublicResource = _useSetState2[1];
 
   /**
    * 组件列表
@@ -129,13 +95,15 @@ export default (function (_ref) {
    */
   var getUrlParams = useMemoizedFn(function () {});
   var ctx = new Proxy(_objectSpread({
-    _setPagePublicResource: _setPagePublicResource,
     _register: _register,
     _unregister: _unregister,
     pagePublicResource: pagePublicResource,
+    setPagePublicResource: setPagePublicResource,
+    loading: loading,
     history: history,
     callBehavior: callBehavior,
     topics: topics,
+    PRIMARY_KEY: window.appConfig.constraintKeys.PRIMARY,
     getElementById: getElementById,
     /**
      * @method

package/es/lowcode/engine/provider/RemoteSourceProvider.js

@@ -9,7 +9,7 @@ import React, { createContext, useRef } from 'react';
 import { useRequest, useSetState, useAsyncEffect, useMemoizedFn, useCookieState, useCreation, useUnmount } from 'ahooks';
 import { LuckDaContext } from "../../../components/Builder";
 import { doAction as doActionUtils } from "../../../helper/action";
-import usePromiseState from "../tools/usePromiseState";
+import usePageDataStore from "../tools/usePageDataStore";
 import { decompress } from "../tools/dataProcess";
 import { fetchPageData, fetchDesignModlueData, fetchPreviewModlueData, fetchModlueData, fetchAllDataset, fetchAllSerials } from "../../constants/api-url";
 import { RUNTIME, COOKIE_RUNTIME_KEY, DATA_MODEL_CODE_KEY } from "../../constants";
@@ -18,15 +18,16 @@ export default (function (_ref) {
   var children = _ref.children,
     code = _ref.code,
     runtime = _ref.runtime;
-  var _usePromiseState = usePromiseState(null),
-    _usePromiseState2 = _slicedToArray(_usePromiseState, 3),
-    pageData = _usePromiseState2[0],
-    setPageData = _usePromiseState2[1],
-    _usePromiseState2$ = _usePromiseState2[2],
-    back = _usePromiseState2$.back,
-    forward = _usePromiseState2$.forward,
-    backLength = _usePromiseState2$.backLength,
-    forwardLength = _usePromiseState2$.forwardLength;
+  var _usePageDataStore = usePageDataStore(function (state) {
+      return {
+        initialize: state.initialize,
+        initializeModule: state.initializeModule,
+        reset: state.reset
+      };
+    }),
+    initialize = _usePageDataStore.initialize,
+    initializeModule = _usePageDataStore.initializeModule,
+    reset = _usePageDataStore.reset;
   var _useSetState = useSetState({}),
     _useSetState2 = _slicedToArray(_useSetState, 2),
     remoteSource = _useSetState2[0],
@@ -43,6 +44,7 @@ export default (function (_ref) {
     }
   }, []);
   useUnmount(function () {
+    reset();
     setRuntime(prevRuntime.current);
   });
 
@@ -62,6 +64,7 @@ export default (function (_ref) {
           setRemoteSource({
             module: data
           });
+          initializeModule(data);
         }
       }
     }),
@@ -137,7 +140,7 @@ export default (function (_ref) {
               relationship: data
             }, info)
           });
-          setPageData(decompress(source));
+          initialize(decompress(source));
         case 13:
         case "end":
           return _context.stop();
@@ -151,20 +154,13 @@ export default (function (_ref) {
     });
   });
   return /*#__PURE__*/React.createElement(RemoteSourceContext.Provider, {
-    value: _objectSpread(_objectSpread({
-      pageData: pageData
-    }, remoteSource), {}, {
+    value: _objectSpread(_objectSpread({}, remoteSource), {}, {
       loading: fetchPageDataLoading || fetchModlueDataLoading,
       fetchAllDatasetLoading: fetchAllDatasetLoading,
       fetchAllSerialsLoading: fetchAllSerialsLoading,
       refreshModlueData: refreshModlueData,
       refreshDataset: refreshDataset,
-      refreshSerials: refreshSerials,
-      setPageData: setPageData,
-      back: back,
-      forward: forward,
-      backLength: backLength,
-      forwardLength: forwardLength
+      refreshSerials: refreshSerials
     })
   }, /*#__PURE__*/React.createElement(LuckDaContext.Provider, {
     value: _objectSpread(_objectSpread({}, remoteSource.module), {}, {

package/es/lowcode/engine/tools/helper.js

@@ -96,9 +96,8 @@ export function listReducer(state, action) {
   }
 }
 export function getCtx(context) {
-  return omitBy(context, function (_, key) {
-    return startsWith(key, '_');
-  });
+  return context;
+  // return omitBy(context, (_, key) => startsWith(key, '_'));
 }
 export function getFuncBody(funcCode) {
   var regex = /{([\s\S]*?)}(?![\s\S]*})/;

package/es/lowcode/engine/tools/useCanvasRender.js

@@ -13,8 +13,9 @@ import { LC_BUILDIN_UNIT_KEY_LIST } from "../../constants";
 export default function useCanvasRender(data, deps) {
   var dynamicCompMap = useRef({});
   var ctx = useContext();
-  var render = useMemoizedFn(function (_ref) {
-    var props = _ref.props,
+  var render = useMemoizedFn(function () {
+    var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+      props = _ref.props,
       children = _ref.children,
       childrenMap = _objectWithoutProperties(_ref, _excluded);
     if (props && !LC_BUILDIN_UNIT_KEY_LIST.includes(props.id)) {

package/es/lowcode/engine/tools/usePageDataStore.js

@@ -0,0 +1,174 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _typeof from "@babel/runtime/helpers/esm/typeof";
+import { useRef, useEffect, useCallback } from 'react';
+import { create } from 'zustand';
+import { immer } from 'zustand/middleware/immer';
+import { subscribeWithSelector } from 'zustand/middleware';
+import { useShallow } from 'zustand/react/shallow';
+import { isObject, isArray, isNil, isFunction, isString, get, set as _set, forOwn, omit } from 'lodash';
+import { getPathNodesById, findNodeAndParent } from "./dataProcess";
+import { LC_BUILDIN_UNIT_KEY } from "../../constants";
+var findNode = function findNode(obj, id) {
+  for (var key in obj) {
+    if (!['props', 'children'].includes(key)) {
+      if (key === id) {
+        return {
+          target: obj[key],
+          parent: obj
+        };
+      }
+      if (_typeof(obj[key]) === 'object' && !Array.isArray(obj[key])) {
+        var result = findNode(obj[key], id);
+        if (result) {
+          return result;
+        }
+      }
+    }
+  }
+  return null;
+};
+var usePageDataStore = create()(immer(subscribeWithSelector(function (set) {
+  return {
+    pageData: null,
+    moduleData: null,
+    initialize: function initialize(data) {
+      return set(function (state) {
+        state.pageData = data;
+      });
+    },
+    initializeModule: function initializeModule(data) {
+      return set(function (state) {
+        state.moduleData = data;
+      });
+    },
+    reset: function reset(data) {
+      return set(function (state) {
+        state.pageData = data || null;
+      });
+    }
+  };
+})));
+export default usePageDataStore;
+export var resetPageData = function resetPageData(data) {
+  usePageDataStore.setState(function (state) {
+    state.pageData = data || null;
+  });
+};
+export var addNode = function addNode(parentId, id, data) {
+  usePageDataStore.setState(function (state) {
+    if (parentId === LC_BUILDIN_UNIT_KEY.PAGE_ROOT) {
+      state.pageData.children.push(id);
+      state.pageData[id] = {
+        props: _objectSpread(_objectSpread({}, data), {}, {
+          id: id,
+          parentId: parentId
+        })
+      };
+      return;
+    }
+    var _ref = findNode(state.pageData, parentId) || {},
+      target = _ref.target;
+    if (!target) return;
+    if (!target.hasOwnProperty('children')) {
+      target.children = [];
+    }
+    if (!target.children.includes(id)) {
+      target.children.push(id);
+      target[id] = {
+        props: _objectSpread(_objectSpread({}, data), {}, {
+          id: id,
+          parentId: parentId
+        })
+      };
+    }
+  });
+};
+export var deleteNode = function deleteNode(id) {
+  usePageDataStore.setState(function (state) {
+    var _parent$children;
+    var _ref2 = findNode(state.pageData, id) || {},
+      parent = _ref2.parent;
+    if (!parent || !((_parent$children = parent.children) !== null && _parent$children !== void 0 && _parent$children.length)) return;
+    parent.children.splice(parent.children.indexOf(id), 1);
+    if (parent.children.length === 0) {
+      delete parent['children'];
+    }
+    delete parent[id];
+  });
+};
+export var modifyNode = function modifyNode(id, data) {
+  usePageDataStore.setState(function (state) {
+    if (id === LC_BUILDIN_UNIT_KEY.PAGE_ROOT) {
+      assign(state.pageData.props, omit(data, ['id', 'parentId', 'component', 'buildIn']));
+      return;
+    }
+    var _ref3 = findNode(state.pageData, id) || {},
+      target = _ref3.target;
+    if (!target) return;
+    forOwn(omit(data, ['id', 'parentId', 'component', 'buildIn']), function (_val, _key) {
+      _set(target.props, _key, _val);
+    });
+  });
+};
+export var useTask = function useTask(type) {
+  var promiseRef = useRef(null);
+  var task = useCallback(function () {
+    for (var _len = arguments.length, args = new Array(_len), _key2 = 0; _key2 < _len; _key2++) {
+      args[_key2] = arguments[_key2];
+    }
+    return new Promise(function (resolve) {
+      promiseRef.current = resolve;
+      switch (type) {
+        case 'add':
+          addNode.apply(void 0, args);
+          break;
+        case 'update':
+        case 'modify':
+          modifyNode.apply(void 0, args);
+          break;
+        case 'delete':
+          deleteNode.apply(void 0, args);
+          break;
+        default:
+          break;
+      }
+    });
+  }, []);
+  useEffect(function () {
+    var unsub = usePageDataStore.subscribe(function (state, prevState) {
+      if (!promiseRef.current) {
+        return;
+      }
+      promiseRef.current(state.pageData, prevState.pageData);
+      promiseRef.current = null;
+    });
+    return unsub;
+  }, []);
+  return task;
+};
+export var useGet = function useGet(_) {
+  var result = usePageDataStore(useShallow(function (state) {
+    if (isNil(_)) {
+      return state.pageData;
+    } else if (isFunction(_)) {
+      return _(state.pageData);
+    } else if (isArray(_)) {
+      return _.map(function (k) {
+        var _findNode;
+        return k.includes('.') ? get(state.pageData, k) : (_findNode = findNode(state.pageData, k)) === null || _findNode === void 0 ? void 0 : _findNode.target;
+      });
+    } else if (isObject(_) && _.id) {
+      var _findNode2;
+      return _.id === LC_BUILDIN_UNIT_KEY.PAGE_ROOT ? state.pageData : (_findNode2 = findNode(state.pageData, _.id)) === null || _findNode2 === void 0 ? void 0 : _findNode2.target;
+    } else if (isString(_)) {
+      return get(state.pageData, _);
+    }
+  }));
+  return result;
+};
+export var getLevelNodes = function getLevelNodes(id) {
+  return getPathNodesById(usePageDataStore.getState().pageData, id);
+};
+export var getSelfAndParent = function getSelfAndParent(id) {
+  return findNodeAndParent(id, usePageDataStore.getState().pageData);
+};

package/es/lowcode/engine/tools/usePromiseState.js

@@ -1,35 +1,24 @@
-import { useRef, useCallback } from 'react';
-import { useHistoryTravel, useUpdateLayoutEffect } from 'ahooks';
-import { isEqual } from 'lodash';
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import { useRef, useState, useCallback } from 'react';
+import { useUpdateLayoutEffect } from 'ahooks';
 var usePromiseState = function usePromiseState(initialState) {
-  var _useHistoryTravel = useHistoryTravel(initialState),
-    value = _useHistoryTravel.value,
-    setValue = _useHistoryTravel.setValue,
-    backLength = _useHistoryTravel.backLength,
-    forwardLength = _useHistoryTravel.forwardLength,
-    back = _useHistoryTravel.back,
-    forward = _useHistoryTravel.forward;
+  var _useState = useState(initialState),
+    _useState2 = _slicedToArray(_useState, 2),
+    state = _useState2[0],
+    setState = _useState2[1];
   var promiseRef = useRef(null);
-  var setStatePromise = useCallback(function (_value) {
+  var setStatePromise = useCallback(function (_state) {
     return new Promise(function (resolve) {
       promiseRef.current = resolve;
-      var _valStr = JSON.stringify(_value);
-      if (!isEqual(value, _valStr)) {
-        setValue(_valStr);
-      }
+      setState(_state);
     });
   }, []);
   useUpdateLayoutEffect(function () {
     if (promiseRef.current) {
-      promiseRef.current(JSON.parse(value));
+      promiseRef.current(state);
       promiseRef.current = null;
     }
-  }, [value]);
-  return [JSON.parse(value), setStatePromise, {
-    backLength: backLength - 1,
-    forwardLength: forwardLength,
-    back: back,
-    forward: forward
-  }];
+  }, [state]);
+  return [state, setStatePromise];
 };
 export default usePromiseState;

package/es/lowcode/engine/tools/useTodo.js

@@ -5,7 +5,8 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 var _excluded = ["datasetCode"];
 import { useBoolean, useMemoizedFn } from 'ahooks';
 import { message } from 'luck-design/antd';
-import { keys, isNil } from 'lodash';
+import { keys, isNil, isFunction } from 'lodash';
+import usePageDataStore from "./usePageDataStore";
 import { executeCode } from "./helper";
 import { fetchCallBehavior } from "../../constants/api-url";
 var useTodo = function useTodo() {
@@ -25,10 +26,13 @@ var useTodo = function useTodo() {
       behaviorKey: behaviorKey
     }, params), data);
   });
+  var moduleData = usePageDataStore(function (state) {
+    return state.moduleData;
+  });
   var todo = useMemoizedFn(function (ctx, actionPool) {
     var argsMap = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
     if (isNil(actionPool)) {
-      return;
+      return Promise.resolve();
     }
     var dsCode = argsMap.datasetCode,
       args = _objectWithoutProperties(argsMap, _excluded);
@@ -47,21 +51,27 @@ var useTodo = function useTodo() {
             return Promise.resolve(executeCode.apply(void 0, [ctx, info.code, argsName].concat(_toConsumableArray(_args))));
           case 'page-action':
             {
-              var _JSON$parse = JSON.parse(info.code || '{}'),
-                moduleCode = _JSON$parse.moduleCode,
-                datasetCode = _JSON$parse.datasetCode,
-                params = _JSON$parse.params,
-                data = _JSON$parse.data;
+              var _ref4 = executeCode.apply(void 0, [ctx, info.code, argsName].concat(_toConsumableArray(_args))) || {},
+                moduleCode = _ref4.moduleCode,
+                datasetCode = _ref4.datasetCode,
+                params = _ref4.params,
+                data = _ref4.data,
+                after = _ref4.after;
+              var _moduleCode = moduleCode || moduleData.moduleCode;
               var _dscode = datasetCode || dsCode;
-              if (!moduleCode || !_dscode) {
+              if (!_moduleCode || !_dscode) {
                 message.warning('接口重要参数（模块编码或数据集编码）丢失');
                 return;
               }
               return callBehavior({
                 datasetCode: _dscode,
-                moduleCode: moduleCode,
+                moduleCode: _moduleCode,
                 behaviorKey: actionKey
-              }, params, data);
+              }, params, data).then(function (res) {
+                if (isFunction(after)) {
+                  after(ctx, res);
+                }
+              });
             }
           case 'trigger':
             return Promise.resolve();

package/es/lowcode/painter/DesignOperator.js

@@ -5,8 +5,7 @@ import { useEventListener, useSetState, useMemoizedFn, useCreation, useSize, use
 import { Icon, Dropdown, message } from 'luck-design/antd';
 import { reverse } from 'lodash';
 import { suid } from '@luck-design-biz/base/utils';
-import { useContext, usePageData } from "../engine/provider/ContextProvider";
-import { add, deleteById } from "../engine/tools/dataProcess";
+import { useContext, addNode, deleteNode } from "../engine/provider/ContextProvider";
 import { LC_BUILDIN_UNIT_KEY, LC_COMPONENT_UNIT_KEY, LC_COMPONENT_UNIT, CONTAINER_UNITS } from "../constants";
 import styles from "./style/design.less";
 var _MODAL_COMPONENT_ = ['Dialog', 'Drawer'];
@@ -29,10 +28,6 @@ var DesignOperator = function DesignOperator(_ref) {
   var _getDomById, _getDomById2;
   var target = _ref.target;
   var context = useContext();
-  var _usePageData = usePageData(),
-    _usePageData2 = _slicedToArray(_usePageData, 2),
-    pageData = _usePageData2[0],
-    setPageData = _usePageData2[1].setPageData;
   var size = useSize(target);
   var _useState = useState(suid()),
     _useState2 = _slicedToArray(_useState, 2),
@@ -64,27 +59,24 @@ var DesignOperator = function DesignOperator(_ref) {
   var handleDelete = useMemoizedFn(function (_ref2) {
     var id = _ref2.id;
     context.$publisher(context.topics.COMPONENT_DELETE, {
-      id: id,
-      pageData: pageData
+      id: id
     });
   });
   var addComponent = useMemoizedFn(function (data, targetId) {
-    var json = require("../engine/meta/".concat(data.component.toLowerCase(), ".props.default.json"));
-    var _id = "".concat(data.component.toLowerCase(), "_").concat(suid());
-    add(pageData, targetId, _id, json);
     context.$subscriber(context.topics.COMPONENT_MOUNT).once(function (_ref3) {
       var mountCompId = _ref3.id;
       if (mountCompId === _id) {
         context.$publisher(context.topics.COMPONENT_APPEND, {
-          id: _id,
-          pageData: pageData
+          id: _id
         });
         context.$publisher(context.topics.COMPONENT_ACTIVE, {
           id: _id
         });
       }
     }).watch();
-    setPageData(pageData);
+    var json = require("../engine/meta/".concat(data.component.toLowerCase(), ".props.default.json"));
+    var _id = "".concat(data.component.toLowerCase(), "_").concat(suid());
+    addNode(targetId, _id, json);
   });
   var acticeProps = useCreation(function () {
     if (!operatorId.selector) return null;
@@ -191,8 +183,7 @@ var DesignOperator = function DesignOperator(_ref) {
     }).watch();
     var acid = context.$subscriber(context.topics.COMPONENT_ACTIVE).on(function (payload) {
       if (payload.id) {
-        var _context$componentMap2 = context.componentMap.get(payload.id).api.getSelfAndParentLCData(),
-          node = _context$componentMap2.node;
+        var node = context.componentMap.get(payload.id).api.getSelfData();
         setOperatorId({
           selector: payload.id,
           deletable: node.props.buildIn !== true,
@@ -207,14 +198,14 @@ var DesignOperator = function DesignOperator(_ref) {
     var cmtid = context.$subscriber(context.topics.COMPONENT_MODAL_TOGGLE).on(function (_ref6) {
       var toggle = _ref6.toggle,
         id = _ref6.id;
-      if (toggle) {
+      if (toggle && id !== currentModal.current) {
         target.current.style.setProperty('overflow', 'hidden');
         var _modal = context.componentMap.get(id);
         var _prevModal = currentModal.current ? context.componentMap.get(currentModal.current) : null;
         _prevModal === null || _prevModal === void 0 || _prevModal.api.doClose();
         _modal.api.doOpen();
         currentModal.current = id;
-      } else {
+      } else if (!toggle) {
         target.current.style.removeProperty('overflow');
         var _id = id || currentModal.current;
         if (_id) {
@@ -225,13 +216,11 @@ var DesignOperator = function DesignOperator(_ref) {
       }
     }).watch();
     var cdid = context.$subscriber(context.topics.COMPONENT_DELETE).on(function (_ref7) {
-      var id = _ref7.id,
-        pageData = _ref7.pageData;
+      var id = _ref7.id;
       if (lastSelectorId.current === id) {
         context.$publisher(context.topics.COMPONENT_ACTIVE, null);
       }
-      deleteById(pageData, id);
-      setPageData(pageData);
+      deleteNode(id);
     });
     return function () {
       context.$unsubscriber(context.topics.COMPONENT_SETTING_CLICK, csid);