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

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

@@ -5,56 +5,37 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useRemoteSource = exports.usePageData = exports.useContext = exports.default = exports.Context = void 0;
+var _exportNames = {
+  Context: true,
+  useContext: true,
+  useRemoteSource: true
+};
+exports.useRemoteSource = exports.useContext = exports.default = exports.Context = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _umi = require("umi");
 var _ahooks = require("ahooks");
-var _lodash = require("lodash");
 var _EventBusProvider = require("../EventBusProvider");
 var _RemoteSourceProvider = _interopRequireWildcard(require("../RemoteSourceProvider"));
 var _useTodo3 = _interopRequireDefault(require("../../tools/useTodo"));
-var _dataProcess = require("../../tools/dataProcess");
 var topics = _interopRequireWildcard(require("../../../constants/event-topics"));
+var _usePageDataStore = require("../../tools/usePageDataStore");
+Object.keys(_usePageDataStore).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _usePageDataStore[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _usePageDataStore[key];
+    }
+  });
+});
 var Context = exports.Context = /*#__PURE__*/(0, _react.createContext)(null);
 var useContext = exports.useContext = function useContext() {
   return (0, _react.useContext)(Context);
 };
-var usePageData = exports.usePageData = function usePageData(_) {
-  var _useReactContext = (0, _react.useContext)(_RemoteSourceProvider.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 ((0, _lodash.isNil)(_)) {
-    _pageData = pageData;
-  } else if ((0, _lodash.isFunction)(_)) {
-    _pageData = _(pageData);
-  } else if ((0, _lodash.isArray)(_)) {
-    _pageData = (0, _lodash.reduce)(_, function (r, k) {
-      r.push((0, _lodash.get)(pageData, k));
-      return r;
-    }, []);
-  } else if ((0, _lodash.isObject)(_) && _.id) {
-    var _findNodeAndParent;
-    _pageData = (_findNodeAndParent = (0, _dataProcess.findNodeAndParent)(_.id, pageData)) === null || _findNodeAndParent === void 0 ? void 0 : _findNodeAndParent.node;
-  } else if ((0, _lodash.isString)(_)) {
-    _pageData = (0, _lodash.get)(pageData, _);
-  }
-  return [_pageData, {
-    loading: loading,
-    setPageData: setPageData,
-    back: back,
-    forward: forward,
-    backLength: backLength,
-    forwardLength: forwardLength
-  }];
-};
 var useRemoteSource = exports.useRemoteSource = function useRemoteSource() {
   return (0, _react.useContext)(_RemoteSourceProvider.RemoteSourceContext);
 };
@@ -64,9 +45,10 @@ var _default = exports.default = function _default(_ref) {
     code = _ref.code;
   var eventBus = (0, _EventBusProvider.useLDEventBus)();
   var _useTodo = (0, _useTodo3.default)(),
-    _useTodo2 = (0, _slicedToArray2.default)(_useTodo, 2),
+    _useTodo2 = (0, _slicedToArray2.default)(_useTodo, 3),
     todo = _useTodo2[0],
-    callBehavior = _useTodo2[1];
+    callBehavior = _useTodo2[1],
+    loading = _useTodo2[2];
 
   /**
    * 页面公共资源
@@ -74,7 +56,7 @@ var _default = exports.default = function _default(_ref) {
   var _useSetState = (0, _ahooks.useSetState)(null),
     _useSetState2 = (0, _slicedToArray2.default)(_useSetState, 2),
     pagePublicResource = _useSetState2[0],
-    _setPagePublicResource = _useSetState2[1];
+    setPagePublicResource = _useSetState2[1];
 
   /**
    * 组件列表
@@ -137,13 +119,15 @@ var _default = exports.default = function _default(_ref) {
    */
   var getUrlParams = (0, _ahooks.useMemoizedFn)(function () {});
   var ctx = new Proxy((0, _objectSpread2.default)({
-    _setPagePublicResource: _setPagePublicResource,
     _register: _register,
     _unregister: _unregister,
     pagePublicResource: pagePublicResource,
+    setPagePublicResource: setPagePublicResource,
+    loading: loading,
     history: _umi.history,
     callBehavior: callBehavior,
     topics: topics,
+    PRIMARY_KEY: window.appConfig.constraintKeys.PRIMARY,
     getElementById: getElementById,
     /**
      * @method

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

@@ -16,7 +16,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _ahooks = require("ahooks");
 var _Builder = require("../../../components/Builder");
 var _action2 = require("../../../helper/action");
-var _usePromiseState3 = _interopRequireDefault(require("../tools/usePromiseState"));
+var _usePageDataStore2 = _interopRequireDefault(require("../tools/usePageDataStore"));
 var _dataProcess = require("../tools/dataProcess");
 var _apiUrl = require("../../constants/api-url");
 var _constants = require("../../constants");
@@ -26,15 +26,16 @@ var _default = exports.default = function _default(_ref) {
   var children = _ref.children,
     code = _ref.code,
     runtime = _ref.runtime;
-  var _usePromiseState = (0, _usePromiseState3.default)(null),
-    _usePromiseState2 = (0, _slicedToArray2.default)(_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 = (0, _usePageDataStore2.default)(function (state) {
+      return {
+        initialize: state.initialize,
+        initializeModule: state.initializeModule,
+        reset: state.reset
+      };
+    }),
+    initialize = _usePageDataStore.initialize,
+    initializeModule = _usePageDataStore.initializeModule,
+    reset = _usePageDataStore.reset;
   var _useSetState = (0, _ahooks.useSetState)({}),
     _useSetState2 = (0, _slicedToArray2.default)(_useSetState, 2),
     remoteSource = _useSetState2[0],
@@ -51,6 +52,7 @@ var _default = exports.default = function _default(_ref) {
     }
   }, []);
   (0, _ahooks.useUnmount)(function () {
+    reset();
     setRuntime(prevRuntime.current);
   });
 
@@ -70,6 +72,7 @@ var _default = exports.default = function _default(_ref) {
           setRemoteSource({
             module: data
           });
+          initializeModule(data);
         }
       }
     }),
@@ -145,7 +148,7 @@ var _default = exports.default = function _default(_ref) {
               relationship: data
             }, info)
           });
-          setPageData((0, _dataProcess.decompress)(source));
+          initialize((0, _dataProcess.decompress)(source));
         case 13:
         case "end":
           return _context.stop();
@@ -159,20 +162,13 @@ var _default = exports.default = function _default(_ref) {
     });
   });
   return /*#__PURE__*/_react.default.createElement(RemoteSourceContext.Provider, {
-    value: (0, _objectSpread2.default)((0, _objectSpread2.default)({
-      pageData: pageData
-    }, remoteSource), {}, {
+    value: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, 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.default.createElement(_Builder.LuckDaContext.Provider, {
     value: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, remoteSource.module), {}, {

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

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

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

@@ -22,8 +22,9 @@ var _excluded = ["props", "children"],
 function useCanvasRender(data, deps) {
   var dynamicCompMap = (0, _react.useRef)({});
   var ctx = (0, _ContextProvider.useContext)();
-  var render = (0, _ahooks.useMemoizedFn)(function (_ref) {
-    var props = _ref.props,
+  var render = (0, _ahooks.useMemoizedFn)(function () {
+    var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+      props = _ref.props,
       children = _ref.children,
       childrenMap = (0, _objectWithoutProperties2.default)(_ref, _excluded);
     if (props && !_constants.LC_BUILDIN_UNIT_KEY_LIST.includes(props.id)) {

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

@@ -0,0 +1,181 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useTask = exports.useGet = exports.resetPageData = exports.modifyNode = exports.getSelfAndParent = exports.getLevelNodes = exports.deleteNode = exports.default = exports.addNode = void 0;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+var _react = require("react");
+var _zustand = require("zustand");
+var _immer = require("zustand/middleware/immer");
+var _middleware = require("zustand/middleware");
+var _shallow = require("zustand/react/shallow");
+var _lodash = require("lodash");
+var _dataProcess = require("./dataProcess");
+var _constants = require("../../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 ((0, _typeof2.default)(obj[key]) === 'object' && !Array.isArray(obj[key])) {
+        var result = findNode(obj[key], id);
+        if (result) {
+          return result;
+        }
+      }
+    }
+  }
+  return null;
+};
+var usePageDataStore = (0, _zustand.create)()((0, _immer.immer)((0, _middleware.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;
+      });
+    }
+  };
+})));
+var _default = exports.default = usePageDataStore;
+var resetPageData = exports.resetPageData = function resetPageData(data) {
+  usePageDataStore.setState(function (state) {
+    state.pageData = data || null;
+  });
+};
+var addNode = exports.addNode = function addNode(parentId, id, data) {
+  usePageDataStore.setState(function (state) {
+    if (parentId === _constants.LC_BUILDIN_UNIT_KEY.PAGE_ROOT) {
+      state.pageData.children.push(id);
+      state.pageData[id] = {
+        props: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, 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: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, data), {}, {
+          id: id,
+          parentId: parentId
+        })
+      };
+    }
+  });
+};
+var deleteNode = exports.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];
+  });
+};
+var modifyNode = exports.modifyNode = function modifyNode(id, data) {
+  usePageDataStore.setState(function (state) {
+    if (id === _constants.LC_BUILDIN_UNIT_KEY.PAGE_ROOT) {
+      assign(state.pageData.props, (0, _lodash.omit)(data, ['id', 'parentId', 'component', 'buildIn']));
+      return;
+    }
+    var _ref3 = findNode(state.pageData, id) || {},
+      target = _ref3.target;
+    if (!target) return;
+    (0, _lodash.forOwn)((0, _lodash.omit)(data, ['id', 'parentId', 'component', 'buildIn']), function (_val, _key) {
+      (0, _lodash.set)(target.props, _key, _val);
+    });
+  });
+};
+var useTask = exports.useTask = function useTask(type) {
+  var promiseRef = (0, _react.useRef)(null);
+  var task = (0, _react.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;
+      }
+    });
+  }, []);
+  (0, _react.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;
+};
+var useGet = exports.useGet = function useGet(_) {
+  var result = usePageDataStore((0, _shallow.useShallow)(function (state) {
+    if ((0, _lodash.isNil)(_)) {
+      return state.pageData;
+    } else if ((0, _lodash.isFunction)(_)) {
+      return _(state.pageData);
+    } else if ((0, _lodash.isArray)(_)) {
+      return _.map(function (k) {
+        var _findNode;
+        return k.includes('.') ? (0, _lodash.get)(state.pageData, k) : (_findNode = findNode(state.pageData, k)) === null || _findNode === void 0 ? void 0 : _findNode.target;
+      });
+    } else if ((0, _lodash.isObject)(_) && _.id) {
+      var _findNode2;
+      return _.id === _constants.LC_BUILDIN_UNIT_KEY.PAGE_ROOT ? state.pageData : (_findNode2 = findNode(state.pageData, _.id)) === null || _findNode2 === void 0 ? void 0 : _findNode2.target;
+    } else if ((0, _lodash.isString)(_)) {
+      return (0, _lodash.get)(state.pageData, _);
+    }
+  }));
+  return result;
+};
+var getLevelNodes = exports.getLevelNodes = function getLevelNodes(id) {
+  return (0, _dataProcess.getPathNodesById)(usePageDataStore.getState().pageData, id);
+};
+var getSelfAndParent = exports.getSelfAndParent = function getSelfAndParent(id) {
+  return (0, _dataProcess.findNodeAndParent)(id, usePageDataStore.getState().pageData);
+};

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

@@ -1,41 +1,31 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
 var _ahooks = require("ahooks");
-var _lodash = require("lodash");
 var usePromiseState = function usePromiseState(initialState) {
-  var _useHistoryTravel = (0, _ahooks.useHistoryTravel)(initialState),
-    value = _useHistoryTravel.value,
-    setValue = _useHistoryTravel.setValue,
-    backLength = _useHistoryTravel.backLength,
-    forwardLength = _useHistoryTravel.forwardLength,
-    back = _useHistoryTravel.back,
-    forward = _useHistoryTravel.forward;
+  var _useState = (0, _react.useState)(initialState),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    state = _useState2[0],
+    setState = _useState2[1];
   var promiseRef = (0, _react.useRef)(null);
-  var setStatePromise = (0, _react.useCallback)(function (_value) {
+  var setStatePromise = (0, _react.useCallback)(function (_state) {
     return new Promise(function (resolve) {
       promiseRef.current = resolve;
-      var _valStr = JSON.stringify(_value);
-      if (!(0, _lodash.isEqual)(value, _valStr)) {
-        setValue(_valStr);
-      }
+      setState(_state);
     });
   }, []);
   (0, _ahooks.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];
 };
 var _default = exports.default = usePromiseState;

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

@@ -12,6 +12,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _ahooks = require("ahooks");
 var _antd = require("luck-design/antd");
 var _lodash = require("lodash");
+var _usePageDataStore = _interopRequireDefault(require("./usePageDataStore"));
 var _helper = require("./helper");
 var _apiUrl = require("../../constants/api-url");
 var _excluded = ["datasetCode"];
@@ -32,10 +33,13 @@ var useTodo = function useTodo() {
       behaviorKey: behaviorKey
     }, params), data);
   });
+  var moduleData = (0, _usePageDataStore.default)(function (state) {
+    return state.moduleData;
+  });
   var todo = (0, _ahooks.useMemoizedFn)(function (ctx, actionPool) {
     var argsMap = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
     if ((0, _lodash.isNil)(actionPool)) {
-      return;
+      return Promise.resolve();
     }
     var dsCode = argsMap.datasetCode,
       args = (0, _objectWithoutProperties2.default)(argsMap, _excluded);
@@ -54,21 +58,27 @@ var useTodo = function useTodo() {
             return Promise.resolve(_helper.executeCode.apply(void 0, [ctx, info.code, argsName].concat((0, _toConsumableArray2.default)(_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 = _helper.executeCode.apply(void 0, [ctx, info.code, argsName].concat((0, _toConsumableArray2.default)(_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) {
                 _antd.message.warning('接口重要参数（模块编码或数据集编码）丢失');
                 return;
               }
               return callBehavior({
                 datasetCode: _dscode,
-                moduleCode: moduleCode,
+                moduleCode: _moduleCode,
                 behaviorKey: actionKey
-              }, params, data);
+              }, params, data).then(function (res) {
+                if ((0, _lodash.isFunction)(after)) {
+                  after(ctx, res);
+                }
+              });
             }
           case 'trigger':
             return Promise.resolve();

package/lib/lowcode/painter/DesignOperator.js

@@ -13,7 +13,6 @@ var _ahooks = require("ahooks");
 var _antd = require("luck-design/antd");
 var _utils = require("@luck-design-biz/base/utils");
 var _ContextProvider = require("../engine/provider/ContextProvider");
-var _dataProcess = require("../engine/tools/dataProcess");
 var _constants = require("../constants");
 var _design = _interopRequireDefault(require("./style/design.less"));
 var _MODAL_COMPONENT_ = ['Dialog', 'Drawer'];
@@ -36,10 +35,6 @@ var DesignOperator = function DesignOperator(_ref) {
   var _getDomById, _getDomById2;
   var target = _ref.target;
   var context = (0, _ContextProvider.useContext)();
-  var _usePageData = (0, _ContextProvider.usePageData)(),
-    _usePageData2 = (0, _slicedToArray2.default)(_usePageData, 2),
-    pageData = _usePageData2[0],
-    setPageData = _usePageData2[1].setPageData;
   var size = (0, _ahooks.useSize)(target);
   var _useState = (0, _react.useState)((0, _utils.suid)()),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -71,27 +66,24 @@ var DesignOperator = function DesignOperator(_ref) {
   var handleDelete = (0, _ahooks.useMemoizedFn)(function (_ref2) {
     var id = _ref2.id;
     context.$publisher(context.topics.COMPONENT_DELETE, {
-      id: id,
-      pageData: pageData
+      id: id
     });
   });
   var addComponent = (0, _ahooks.useMemoizedFn)(function (data, targetId) {
-    var json = require("../engine/meta/".concat(data.component.toLowerCase(), ".props.default.json"));
-    var _id = "".concat(data.component.toLowerCase(), "_").concat((0, _utils.suid)());
-    (0, _dataProcess.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((0, _utils.suid)());
+    (0, _ContextProvider.addNode)(targetId, _id, json);
   });
   var acticeProps = (0, _ahooks.useCreation)(function () {
     if (!operatorId.selector) return null;
@@ -198,8 +190,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,
@@ -214,14 +205,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) {
@@ -232,13 +223,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);
       }
-      (0, _dataProcess.deleteById)(pageData, id);
-      setPageData(pageData);
+      (0, _ContextProvider.deleteNode)(id);
     });
     return function () {
       context.$unsubscriber(context.topics.COMPONENT_SETTING_CLICK, csid);