@luck-design-biz/luckda 0.0.25-2 → 0.0.25-21

package/lib/lowcode/painter/DesignOperator.js

@@ -13,15 +13,14 @@ 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'];
-var getOperatorStyle = function getOperatorStyle(page, cellNode) {
+var getOperatorStyle = function getOperatorStyle(canvas, cellNode) {
   if (!cellNode) return {};
-  var _page$getBoundingClie = page.getBoundingClientRect(),
-    pageLeft = _page$getBoundingClie.left,
-    pageTop = _page$getBoundingClie.top;
+  var _canvas$getBoundingCl = canvas.getBoundingClientRect(),
+    pageLeft = _canvas$getBoundingCl.left,
+    pageTop = _canvas$getBoundingCl.top;
   var _cellNode$getBounding = cellNode.getBoundingClientRect(),
     cellNodeLeft = _cellNode$getBounding.left,
     cellNodeTop = _cellNode$getBounding.top;
@@ -33,14 +32,10 @@ var getOperatorStyle = function getOperatorStyle(page, cellNode) {
   };
 };
 var DesignOperator = function DesignOperator(_ref) {
-  var _getDomById, _getDomById2;
-  var target = _ref.target;
+  var _getElement, _getElement2;
+  var canvas = _ref.canvas;
   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 size = (0, _ahooks.useSize)(canvas);
   var _useState = (0, _react.useState)((0, _utils.suid)()),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     positionKey = _useState2[0],
@@ -54,48 +49,53 @@ var DesignOperator = function DesignOperator(_ref) {
     setOperatorId = _useSetState2[1];
   var lastSelectorId = (0, _ahooks.useLatest)(operatorId.selector);
   var currentModal = (0, _react.useRef)(null);
-  var getDomById = (0, _ahooks.useMemoizedFn)(function (id) {
+  var getElement = (0, _ahooks.useMemoizedFn)(function (_target) {
     var _context$componentMap;
-    return (_context$componentMap = context.componentMap.get(id)) === null || _context$componentMap === void 0 ? void 0 : _context$componentMap.api.getSelfDom();
+    return (0, _lodash.isString)(_target) ? (_context$componentMap = context.componentMap.get(_target)) === null || _context$componentMap === void 0 ? void 0 : _context$componentMap.api.getSelfDom() : _target;
   });
-  var handleSelect = (0, _ahooks.useMemoizedFn)(function (_key) {
-    context.$publisher(context.topics.COMPONENT_ACTIVE, _key ? {
-      id: _key
+  var handleSelect = (0, _ahooks.useMemoizedFn)(function (_target) {
+    context.$publisher(context.topics.COMPONENT_ACTIVE, _target ? {
+      target: _target
     } : null);
   });
-  var handleHover = (0, _ahooks.useMemoizedFn)(function (_key) {
-    context.$publisher(context.topics.COMPONENT_HOVER, _key ? {
-      id: _key
+  var handleHover = (0, _ahooks.useMemoizedFn)(function (_target) {
+    context.$publisher(context.topics.COMPONENT_HOVER, _target ? {
+      target: _target
     } : null);
   });
   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
-        });
-        context.$publisher(context.topics.COMPONENT_ACTIVE, {
           id: _id
         });
+        handleSelect(_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;
-    var levelNodes = context.componentMap.get(operatorId.selector).api.getLevelNodes();
+    var _id = (0, _lodash.isNil)(operatorId.selectorTarget) ? operatorId.selector : operatorId.selectorTarget.ancestorId;
+    var levelNodes = context.componentMap.get(_id).api.getLevelNodes();
+    if (operatorId.selectorTarget) {
+      var _operatorId$selectorT = operatorId.selectorTarget,
+        id = _operatorId$selectorT.id,
+        label = _operatorId$selectorT.label;
+      levelNodes.push({
+        id: id,
+        name: label
+      });
+    }
     return {
       props: (0, _lodash.last)(levelNodes),
       menu: /*#__PURE__*/_react.default.createElement("div", {
@@ -117,50 +117,70 @@ var DesignOperator = function DesignOperator(_ref) {
       }))
     };
   }, [operatorId.selector]);
-  var lastDetectorNode = (0, _ahooks.useCreation)(function () {
-    return operatorId.detector ? (0, _lodash.last)(context.componentMap.get(operatorId.detector).api.getLevelNodes()) : null;
+  var lastDetectorName = (0, _ahooks.useCreation)(function () {
+    var _last;
+    return operatorId.detector && (0, _lodash.isString)(operatorId.detector) ? (_last = (0, _lodash.last)(context.componentMap.get(operatorId.detector).api.getLevelNodes())) === null || _last === void 0 ? void 0 : _last.name : void 0;
   }, [operatorId.detector]);
   (0, _ahooks.useEventListener)('mousemove', function (event) {
     var elem = event.target;
+    var targetFormItem = elem.closest("[".concat(_constants.LC_COMPONENT_UNIT_KEY, "=\"").concat(_constants.LC_FORMITEM_UNIT, "\"]"));
+    if (targetFormItem) {
+      handleHover(targetFormItem);
+      return;
+    }
     var targetCell = elem.closest("[".concat(_constants.LC_COMPONENT_UNIT_KEY, "=\"").concat(_constants.LC_COMPONENT_UNIT, "\"]"));
     var targetCellId = targetCell === null || targetCell === void 0 ? void 0 : targetCell.id;
     if (targetCellId && targetCellId !== operatorId.detector && targetCellId !== operatorId.selector) {
-      setOperatorId({
-        detector: targetCellId
-      });
-      context.$publisher(context.topics.COMPONENT_HOVER, {
-        id: targetCellId
-      });
+      handleHover(targetCellId);
     } else if (!targetCell || targetCellId === operatorId.selector) {
-      setOperatorId({
-        detector: null
-      });
-      context.$publisher(context.topics.COMPONENT_HOVER, null);
+      handleHover();
     }
   }, {
-    target: target
+    target: canvas
   });
   (0, _ahooks.useEventListener)('mouseleave', function () {
     if (operatorId.detector) {
-      setOperatorId({
-        detector: null
-      });
-      context.$publisher(context.topics.COMPONENT_HOVER, null);
+      handleHover();
     }
   }, {
-    target: target
+    target: canvas
   });
   (0, _ahooks.useEventListener)('click', function (event) {
     var elem = event.target;
+    var targetFormItem = elem.closest("[".concat(_constants.LC_COMPONENT_UNIT_KEY, "=\"").concat(_constants.LC_FORMITEM_UNIT, "\"]"));
+    if (targetFormItem) {
+      var _fieldName = targetFormItem.getAttribute('data-__field');
+      var _fieldLabel = targetFormItem.getAttribute('data-__label');
+      var _masterId = targetFormItem.getAttribute('data-__master');
+      var _ancestorId = targetFormItem.closest("[".concat(_constants.LC_COMPONENT_UNIT_KEY, "=\"").concat(_constants.LC_COMPONENT_UNIT, "\"]")).getAttribute('id');
+      var _ancestor = context.componentMap.get(_ancestorId);
+      var ancestorData = _ancestor.api.getSelfData();
+      var blockIndex = ancestorData.props.blocks.findIndex(function (b) {
+        return b.id === _masterId;
+      });
+      var fieldIndex = ancestorData.props.blocks[blockIndex].fields.findIndex(function (f) {
+        return f.field === _fieldName;
+      });
+      var _target = {
+        element: targetFormItem,
+        id: "".concat(_ancestorId, ".").concat(_masterId, ".").concat(_fieldName),
+        field: _fieldName,
+        label: _fieldLabel,
+        masterId: _masterId,
+        ancestorId: _ancestorId,
+        keyPath: "blocks[".concat(blockIndex, "].fields[").concat(fieldIndex, "]")
+      };
+      handleHover();
+      handleSelect(_target);
+      return;
+    }
     var targetCell = elem.closest("[".concat(_constants.LC_COMPONENT_UNIT_KEY, "=\"").concat(_constants.LC_COMPONENT_UNIT, "\"]"));
     var targetCellId = targetCell === null || targetCell === void 0 ? void 0 : targetCell.id;
     if (!targetCellId || targetCellId === operatorId.selector) return;
-    context.$publisher(context.topics.COMPONENT_HOVER, null);
-    context.$publisher(context.topics.COMPONENT_ACTIVE, {
-      id: targetCell.id
-    });
+    handleHover();
+    handleSelect(targetCell.id);
   }, {
-    target: target
+    target: canvas
   });
   (0, _react.useEffect)(function () {
     var csid = context.$subscriber(context.topics.COMPONENT_SETTING_CLICK).on(function (_ref4) {
@@ -172,9 +192,7 @@ var DesignOperator = function DesignOperator(_ref) {
             toggle: true,
             id: compId
           });
-          context.$publisher(context.topics.COMPONENT_ACTIVE, {
-            id: compId
-          });
+          handleSelect(compId);
         }).watch();
         addComponent(data, _constants.LC_BUILDIN_UNIT_KEY.PAGE_ROOT);
         return;
@@ -190,39 +208,49 @@ var DesignOperator = function DesignOperator(_ref) {
       addComponent(data, lastSelectorId.current);
     }).watch();
     var hcid = context.$subscriber(context.topics.COMPONENT_HOVER).on(function (payload) {
-      if (payload.id) setOperatorId({
-        detector: payload.id
+      if (payload.target) setOperatorId({
+        detector: payload.target
       });else setOperatorId({
         detector: null
       });
     }).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;
-        setOperatorId({
-          selector: payload.id,
-          deletable: node.props.buildIn !== true,
-          detector: null
-        });
+      if (payload.target) {
+        if ((0, _lodash.isString)(payload.target)) {
+          var node = context.componentMap.get(payload.target).api.getSelfData();
+          setOperatorId({
+            selector: payload.target,
+            selectorTarget: null,
+            deletable: !node || node.props.buildIn !== true,
+            detector: null
+          });
+        } else {
+          setOperatorId({
+            selector: payload.target.id,
+            selectorTarget: payload.target,
+            deletable: false,
+            detector: null
+          });
+        }
       } else {
         setOperatorId({
-          selector: null
+          selector: null,
+          selectorTarget: null
         });
       }
     }).watch();
     var cmtid = context.$subscriber(context.topics.COMPONENT_MODAL_TOGGLE).on(function (_ref6) {
       var toggle = _ref6.toggle,
         id = _ref6.id;
-      if (toggle) {
-        target.current.style.setProperty('overflow', 'hidden');
+      if (toggle && id !== currentModal.current) {
+        canvas.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 {
-        target.current.style.removeProperty('overflow');
+      } else if (!toggle) {
+        canvas.current.style.removeProperty('overflow');
         var _id = id || currentModal.current;
         if (_id) {
           var _modal2 = context.componentMap.get(_id);
@@ -232,13 +260,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);
+        handleSelect();
       }
-      (0, _dataProcess.deleteById)(pageData, id);
-      setPageData(pageData);
+      (0, _ContextProvider.deleteNode)(id);
     });
     return function () {
       context.$unsubscriber(context.topics.COMPONENT_SETTING_CLICK, csid);
@@ -259,22 +285,22 @@ var DesignOperator = function DesignOperator(_ref) {
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, operatorId.detector && /*#__PURE__*/_react.default.createElement("div", {
     id: "lc-detector",
     className: _design.default['lc-painter-design-detector'],
-    style: getOperatorStyle(target.current, getDomById(operatorId.detector), 'detector', operatorId.detector)
+    style: getOperatorStyle(canvas.current, getElement(operatorId.detector))
   }, /*#__PURE__*/_react.default.createElement("span", {
     className: _design.default['lc-painter-design-detector-name'],
     style: {
-      top: ((_getDomById = getDomById(operatorId.detector)) === null || _getDomById === void 0 ? void 0 : _getDomById.offsetTop) < 23 ? 0 : '-23px'
+      top: ((_getElement = getElement(operatorId.detector)) === null || _getElement === void 0 ? void 0 : _getElement.offsetTop) < 23 ? 0 : '-23px'
     }
-  }, lastDetectorNode ? "".concat(lastDetectorNode.name, "(").concat(operatorId.detector, ")") : null)), operatorId.selector && /*#__PURE__*/_react.default.createElement("div", {
+  }, lastDetectorName ? "".concat(lastDetectorName, "(").concat(operatorId.detector, ")") : null)), operatorId.selector && /*#__PURE__*/_react.default.createElement("div", {
     id: "lc-selector",
     key: "".concat((size === null || size === void 0 ? void 0 : size.width) || 0, "-").concat((size === null || size === void 0 ? void 0 : size.height) || 0, "-").concat(positionKey),
     className: _design.default['lc-painter-design-selector'],
-    style: getOperatorStyle(target.current, getDomById(operatorId.selector), 'selector', operatorId.selector)
+    style: getOperatorStyle(canvas.current, getElement((0, _lodash.isNil)(operatorId.selectorTarget) ? operatorId.selector : operatorId.selectorTarget.element))
   }, acticeProps && /*#__PURE__*/_react.default.createElement("div", {
     className: _design.default['lc-borders-actions'],
     style: acticeProps.props.id === _constants.LC_BUILDIN_UNIT_KEY.PAGE_ROOT ? {
       top: 0
-    } : ((_getDomById2 = getDomById(operatorId.selector)) === null || _getDomById2 === void 0 ? void 0 : _getDomById2.offsetTop) < 23 ? {
+    } : ((_getElement2 = getElement((0, _lodash.isNil)(operatorId.selectorTarget) ? operatorId.selector : operatorId.selectorTarget.element)) === null || _getElement2 === void 0 ? void 0 : _getElement2.offsetTop) < 23 ? {
       bottom: '-23px'
     } : {
       top: '-23px'

package/lib/lowcode/painter/DesignToolbar.js

@@ -21,10 +21,11 @@ var _antd = require("luck-design/antd");
 var _utils = require("@luck-design-biz/base/utils");
 var _ContextProvider = require("../engine/provider/ContextProvider");
 var _JsonEditor = _interopRequireDefault(require("../painter/components/code-editor/JsonEditor"));
-var _preview = _interopRequireDefault(require("../preview"));
+var _PreviewIframe = _interopRequireDefault(require("./components/PreviewIframe"));
 var _constants = require("../constants");
 var _design = _interopRequireDefault(require("./style/design.less"));
 var _apiUrl = require("../constants/api-url");
+var _helper = require("../engine/tools/helper");
 var _services = require("@luck-design-biz/base/lib/sys/services");
 var _excluded = ["key", "label"];
 var DesignToolbar = function DesignToolbar(_ref) {
@@ -33,17 +34,7 @@ var DesignToolbar = function DesignToolbar(_ref) {
   var location = (0, _umi.useLocation)();
   var editorRef = (0, _react.useRef)();
   var context = (0, _ContextProvider.useContext)();
-  var _usePageData = (0, _ContextProvider.usePageData)(),
-    _usePageData2 = (0, _slicedToArray2.default)(_usePageData, 2),
-    pageData = _usePageData2[0],
-    _usePageData2$ = _usePageData2[1],
-    setPageData = _usePageData2$.setPageData,
-    back = _usePageData2$.back,
-    forward = _usePageData2$.forward,
-    backLength = _usePageData2$.backLength,
-    forwardLength = _usePageData2$.forwardLength;
-  var _ref2 = (0, _ContextProvider.useRemoteSource)() || {},
-    pageinfo = _ref2.pageinfo;
+  var pageData = (0, _ContextProvider.useGet)();
   var _useState = (0, _react.useState)(null),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     langList = _useState2[0],
@@ -64,6 +55,18 @@ var DesignToolbar = function DesignToolbar(_ref) {
     _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
     userOptions = _useState10[0],
     setUserOptions = _useState10[1];
+  var _useTemporalStore = (0, _ContextProvider.useTemporalStore)(function (state) {
+      return {
+        undo: state.undo,
+        redo: state.redo,
+        pastStates: state.pastStates,
+        futureStates: state.futureStates
+      };
+    }),
+    canUndo = _useTemporalStore.canUndo,
+    canRedo = _useTemporalStore.canRedo,
+    undo = _useTemporalStore.undo,
+    redo = _useTemporalStore.redo;
   var _useCookieState = (0, _ahooks.useCookieState)(_constants.COOKIE_VIRTUAL_ACCOUNT_KEY),
     _useCookieState2 = (0, _slicedToArray2.default)(_useCookieState, 2),
     userId = _useCookieState2[0],
@@ -72,7 +75,7 @@ var DesignToolbar = function DesignToolbar(_ref) {
       manual: true
     }),
     clearCacheLoading = _useRequest.loading,
-    runClearCache = _useRequest.run;
+    runClearCache = _useRequest.runAsync;
   var _useRequest2 = (0, _ahooks.useRequest)(_apiUrl.fetchUpdatePageData, {
       manual: true,
       debounceWait: 300
@@ -80,8 +83,8 @@ var DesignToolbar = function DesignToolbar(_ref) {
     updatePageDataLoading = _useRequest2.loading,
     runAsync = _useRequest2.runAsync;
   (0, _react.useEffect)(function () {
-    var topicId = context.$subscriber(context.topics.LANG_SETTING_SELECT).on(function (_ref3) {
-      var _langList = _ref3.langList;
+    var topicId = context.$subscriber(context.topics.LANG_SETTING_SELECT).on(function (_ref2) {
+      var _langList = _ref2.langList;
       return setLangList(_langList);
     }).watch();
     return function () {
@@ -94,25 +97,43 @@ var DesignToolbar = function DesignToolbar(_ref) {
     }
   }, [showPreview]);
   var handleSave = (0, _ahooks.useMemoizedFn)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
-    var _pageinfo$relationshi;
     var _yield$runAsync, code;
     return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          _context.next = 2;
+          _antd.message.loading({
+            content: (0, _utils.formatMessage)({
+              id: 'luckda.lowcode.design.toolbar.save.on',
+              label: '保存中...'
+            }),
+            key: 'saveLoading'
+          });
+          _context.next = 3;
           return runAsync({
             pageData: JSON.stringify(pageData),
-            pageCode: pageinfo === null || pageinfo === void 0 || (_pageinfo$relationshi = pageinfo.relationship) === null || _pageinfo$relationshi === void 0 ? void 0 : _pageinfo$relationshi.pageCode
+            pageCode: (0, _helper.getLDMetaAttr)('pageCode')
           });
-        case 2:
+        case 3:
           _yield$runAsync = _context.sent;
           code = _yield$runAsync.code;
           if (code === 1) {
-            (0, _utils.showPop)((0, _utils.formatMessage)({
-              id: 'app.base.tip.operate.success'
-            }), null, 'success');
+            _antd.message.success({
+              content: (0, _utils.formatMessage)({
+                id: 'luckda.lowcode.design.toolbar.save.success',
+                label: '保存成功'
+              }),
+              key: 'saveLoading'
+            });
+          } else {
+            _antd.message.error({
+              content: (0, _utils.formatMessage)({
+                id: 'luckda.lowcode.design.toolbar.save.error',
+                label: '保存失败'
+              }),
+              key: 'saveLoading'
+            });
           }
-        case 5:
+        case 6:
         case "end":
           return _context.stop();
       }
@@ -134,7 +155,7 @@ var DesignToolbar = function DesignToolbar(_ref) {
       zIndex: 3000,
       onOk: function onOk() {
         return runClearCache({
-          moduleCode: pageinfo.relationship.moduleCode
+          moduleCode: (0, _helper.getLDMetaAttr)('moduleCode')
         });
       }
     });
@@ -143,9 +164,10 @@ var DesignToolbar = function DesignToolbar(_ref) {
     var code = editorRef.current.editor.getValue();
     try {
       var data = JSON.parse(code);
-      setPageData(data);
+      (0, _ContextProvider.resetPageData)(data);
       setShow(false);
     } catch (e) {
+      console.error(e);
       _antd.message.warning((0, _utils.formatMessage)({
         id: 'luckda.lowcode.error.pagedata',
         label: '页面数据错误'
@@ -153,7 +175,7 @@ var DesignToolbar = function DesignToolbar(_ref) {
     }
   });
   var _useDebounceFn = (0, _ahooks.useDebounceFn)( /*#__PURE__*/function () {
-      var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(value) {
+      var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(value) {
         var _yield$readAllUser, code, list, detail;
         return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
@@ -183,7 +205,7 @@ var DesignToolbar = function DesignToolbar(_ref) {
         }, _callee2);
       }));
       return function (_x) {
-        return _ref5.apply(this, arguments);
+        return _ref4.apply(this, arguments);
       };
     }(), {
       wait: 500
@@ -221,9 +243,9 @@ var DesignToolbar = function DesignToolbar(_ref) {
   })), /*#__PURE__*/_react.default.createElement(_antd.Divider, {
     type: "vertical"
   }), /*#__PURE__*/_react.default.createElement("span", {
-    className: (0, _classnames.default)(_design.default['toolbar-item'], (0, _defineProperty2.default)({}, _design.default.disabled, backLength < 1)),
+    className: (0, _classnames.default)(_design.default['toolbar-item'], (0, _defineProperty2.default)({}, _design.default.disabled, !canUndo)),
     onClick: function onClick() {
-      return backLength > 0 && back();
+      return canUndo && undo();
     }
   }, /*#__PURE__*/_react.default.createElement("svg", {
     viewBox: "0 0 1024 1024",
@@ -236,9 +258,9 @@ var DesignToolbar = function DesignToolbar(_ref) {
   }, /*#__PURE__*/_react.default.createElement("path", {
     d: "M946.8 420L651.9 125.1c-19.5-19.5-52.7-5.7-52.7 21.8v174c-79.3-1.8-501.8 14.9-532.3 569.6-0.9 17.2 22.1 24.3 30.6 9.3C255 621 396.6 553.3 599.1 561.5v175.2c0 27.5 33.3 41.3 52.8 21.9l294.8-294.9c12.1-12.1 12.1-31.6 0.1-43.7z"
   }))), /*#__PURE__*/_react.default.createElement("span", {
-    className: (0, _classnames.default)(_design.default['toolbar-item'], (0, _defineProperty2.default)({}, _design.default.disabled, forwardLength < 1)),
+    className: (0, _classnames.default)(_design.default['toolbar-item'], (0, _defineProperty2.default)({}, _design.default.disabled, !canRedo)),
     onClick: function onClick() {
-      return forwardLength > 0 && forward();
+      return canRedo && redo();
     }
   }, /*#__PURE__*/_react.default.createElement("svg", {
     viewBox: "0 0 1024 1024",
@@ -257,7 +279,7 @@ var DesignToolbar = function DesignToolbar(_ref) {
     className: _design.default['toolbar-item'],
     onClick: function onClick() {
       context.$publisher(context.topics.COMPONENT_ACTIVE, {
-        id: _constants.LC_BUILDIN_UNIT_KEY.PAGE_ROOT
+        target: _constants.LC_BUILDIN_UNIT_KEY.PAGE_ROOT
       });
     }
   }, (0, _utils.formatMessage)({
@@ -271,7 +293,7 @@ var DesignToolbar = function DesignToolbar(_ref) {
       fontSize: 12,
       margin: '0 4px 0 2px'
     },
-    loading: clearCacheLoading,
+    disabled: clearCacheLoading,
     onClick: handleClearCache
   }, (0, _utils.formatMessage)({
     id: 'luckda.lowcode.design.toolbar.clear',
@@ -282,18 +304,33 @@ var DesignToolbar = function DesignToolbar(_ref) {
       fontSize: 12,
       margin: '0 4px 0 2px'
     },
-    onClick: function onClick() {
-      return setShowPreview(true);
-    }
+    disabled: updatePageDataLoading,
+    onClick: /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3() {
+      return (0, _regeneratorRuntime2.default)().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            _context3.next = 2;
+            return handleSave();
+          case 2:
+            context.$publisher(context.topics.COMPONENT_ACTIVE, null);
+            setShowPreview(true);
+          case 4:
+          case "end":
+            return _context3.stop();
+        }
+      }, _callee3);
+    }))
   }, (0, _utils.formatMessage)({
     id: 'luckda.lowcode.design.toolbar.preview',
     label: '预览'
   })), /*#__PURE__*/_react.default.createElement(_antd.Button, {
     size: "small",
     type: "primary",
+    disabled: updatePageDataLoading,
     style: {
       fontSize: 12,
-      padding: '0 7px 0 0'
+      padding: '0 7px 0 0',
+      marginLeft: 2
     }
   }, /*#__PURE__*/_react.default.createElement("div", {
     style: {
@@ -312,7 +349,7 @@ var DesignToolbar = function DesignToolbar(_ref) {
       return setShow(true);
     }
   }, /*#__PURE__*/_react.default.createElement(_antd.Icon, {
-    type: updatePageDataLoading ? 'loading' : 'eye'
+    type: "eye"
   })))), /*#__PURE__*/_react.default.createElement(_antd.Modal, {
     visible: show,
     width: 1024,
@@ -320,15 +357,15 @@ var DesignToolbar = function DesignToolbar(_ref) {
       return document.getElementById('lc-design-workspace');
     },
     zIndex: 3000,
-    bodyStyle: {
-      height: '70vh'
-    },
     onOk: handleOk,
     onCancel: function onCancel() {
       return setShow(false);
     }
   }, /*#__PURE__*/_react.default.createElement(_JsonEditor.default, {
-    ref: editorRef
+    ref: editorRef,
+    style: {
+      height: '70vh'
+    }
   }, JSON.stringify(pageData, null, '\t'))), /*#__PURE__*/_react.default.createElement(_antd.Drawer, {
     title: /*#__PURE__*/_react.default.createElement("div", {
       id: "preview-drawer-header",
@@ -382,8 +419,9 @@ var DesignToolbar = function DesignToolbar(_ref) {
     })))),
     placement: "bottom",
     height: "94vh",
-    footer: false,
-    zIndex: 3000,
+    footer: false
+    // zIndex={3000}
+    ,
     headerStyle: {
       padding: '0 48px 0 24px'
     },
@@ -399,7 +437,7 @@ var DesignToolbar = function DesignToolbar(_ref) {
     getContainer: function getContainer() {
       return document.getElementById('lc-design-workspace');
     }
-  }, /*#__PURE__*/_react.default.createElement(_preview.default, {
+  }, /*#__PURE__*/_react.default.createElement(_PreviewIframe.default, {
     code: location.query.code,
     userId: userId || 'no-user'
   })));

package/lib/lowcode/painter/Outline.js

@@ -27,9 +27,7 @@ var Outline = function Outline(_ref) {
   var open = _ref.open;
   var clickBySelf = (0, _react.useRef)(false);
   var ctx = (0, _ContextProvider.useContext)();
-  var _usePageData = (0, _ContextProvider.usePageData)(),
-    _usePageData2 = (0, _slicedToArray2.default)(_usePageData, 1),
-    pageData = _usePageData2[0];
+  var pageData = (0, _ContextProvider.useGet)();
   var _useState = (0, _react.useState)(null),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     pageAndModal = _useState2[0],
@@ -50,18 +48,22 @@ var Outline = function Outline(_ref) {
   var lastPageExpandedKeysRef = (0, _ahooks.useLatest)(pageExpandedKeys);
   (0, _react.useEffect)(function () {
     var _id = ctx.$subscriber(ctx.topics.COMPONENT_ACTIVE).on(function (payload) {
-      setSelectedKey(payload.id);
+      if (!(0, _lodash.isString)(payload.target)) {
+        setSelectedKey(null);
+        return;
+      }
+      setSelectedKey(payload.target);
       if (clickBySelf.current) {
         clickBySelf.current = false;
         return;
       }
-      var _split = (0, _lodash.split)((0, _dataProcess.getPathById)(pageData, payload.id), '/'),
+      var _split = (0, _lodash.split)((0, _dataProcess.getPathById)(pageData, payload.target), '/'),
         _split2 = (0, _slicedToArray2.default)(_split, 1),
         _root = _split2[0];
       if (!_constants.LC_BUILDIN_UNIT_KEY_LIST.includes(_root)) {
-        setModalExpandedKeys((0, _lodash.uniq)([].concat((0, _toConsumableArray2.default)(latestModalExpandedKeysRef.current), (0, _toConsumableArray2.default)((0, _lodash.split)((0, _dataProcess.getPathById)(pageData, payload.id), '/')))));
+        setModalExpandedKeys((0, _lodash.uniq)([].concat((0, _toConsumableArray2.default)(latestModalExpandedKeysRef.current), (0, _toConsumableArray2.default)((0, _lodash.split)((0, _dataProcess.getPathById)(pageData, payload.target), '/')))));
       } else {
-        setPageExpandedKeys((0, _lodash.uniq)([].concat((0, _toConsumableArray2.default)(lastPageExpandedKeysRef.current), (0, _toConsumableArray2.default)((0, _lodash.split)((0, _dataProcess.getPathById)(pageData, payload.id), '/')))));
+        setPageExpandedKeys((0, _lodash.uniq)([].concat((0, _toConsumableArray2.default)(lastPageExpandedKeysRef.current), (0, _toConsumableArray2.default)((0, _lodash.split)((0, _dataProcess.getPathById)(pageData, payload.target), '/')))));
       }
     }).watch();
     return function () {
@@ -71,7 +73,7 @@ var Outline = function Outline(_ref) {
   var handleSelect = (0, _ahooks.useMemoizedFn)(function (_key) {
     clickBySelf.current = true;
     ctx.$publisher(ctx.topics.COMPONENT_ACTIVE, _key ? {
-      id: _key
+      target: _key
     } : null);
   });
   var render = (0, _ahooks.useMemoizedFn)(function (_ref2) {