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

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

@@ -7,17 +7,20 @@ Object.defineProperty(exports, "__esModule", {
 exports.executeCode = executeCode;
 exports.getCtx = getCtx;
 exports.getFuncBody = getFuncBody;
+exports.getLDMetaAttr = getLDMetaAttr;
 exports.isColor = isColor;
 exports.isPromise = isPromise;
 exports.listReducer = listReducer;
 exports.omitBadProps = omitBadProps;
 exports.parseCSS = parseCSS;
+exports.setLDMetaAttrs = setLDMetaAttrs;
 var _construct2 = _interopRequireDefault(require("@babel/runtime/helpers/construct"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _lodash = require("lodash");
 var _postcss = _interopRequireDefault(require("postcss"));
+var _constants = require("../../constants");
 function isPromise(value) {
   return !!value && (0, _typeof2.default)(value) === 'object' && typeof value.then === 'function';
 }
@@ -161,4 +164,25 @@ function isColor(str) {
   var hexRegex = /^#(?:[A-Fa-f0-9]{3,4}){1,2}$/;
   var rgbaRegex = /^rgba?\(\s*(\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})(,\s*(0|1|0?\.\d+))?\s*\)$/;
   return hexRegex.test(str) || rgbaRegex.test(str);
-}
+}
+function setLDMetaAttrs(data) {
+  var meta = document.querySelector("meta[name=\"".concat(_constants.META_TAG_NAME, "\"]"));
+  if (!meta) {
+    meta = document.createElement('meta');
+  }
+  meta.name = _constants.META_TAG_NAME;
+  meta.content = new URLSearchParams(data).toString().replaceAll('&', ',');
+  document.head.appendChild(meta);
+}
+function getLDMetaAttr(name) {
+  if ((0, _lodash.isNil)(name)) return void 0;
+  var meta = document.querySelector("meta[name=\"".concat(_constants.META_TAG_NAME, "\"]"));
+  var params = new URLSearchParams(meta.content.replaceAll(',', '&'));
+  if ((0, _lodash.isArray)(name)) {
+    return name.map(function (n) {
+      return params.get(n);
+    });
+  }
+  return params.get(name);
+}
+;

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

@@ -106,7 +106,7 @@ var deleteNode = exports.deleteNode = function deleteNode(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']));
+      (0, _lodash.assign)(state.pageData.props, (0, _lodash.omit)(data, ['id', 'parentId', 'component', 'buildIn']));
       return;
     }
     var _ref3 = findNode(state.pageData, id) || {},
@@ -166,7 +166,9 @@ var useGet = exports.useGet = function useGet(_) {
       });
     } 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;
+      var path = _.path;
+      var _target = _.id === _constants.LC_BUILDIN_UNIT_KEY.PAGE_ROOT ? state.pageData : (_findNode2 = findNode(state.pageData, _.id)) === null || _findNode2 === void 0 ? void 0 : _findNode2.target;
+      return (0, _lodash.isNil)(path) ? _target : (0, _lodash.get)(_target, path);
     } else if ((0, _lodash.isString)(_)) {
       return (0, _lodash.get)(state.pageData, _);
     }

package/lib/lowcode/painter/Design.js

@@ -78,15 +78,15 @@ var Design = function Design() {
     onLangChange: handleLangChange
   }), /*#__PURE__*/_react.default.createElement("div", {
     className: _design.default['lc-painter-design-workspace']
-  }, /*#__PURE__*/_react.default.createElement(_DesignOperator.default, {
-    target: simulatorRef
-  }), /*#__PURE__*/_react.default.createElement(_antd.ConfigProvider, {
+  }, /*#__PURE__*/_react.default.createElement(_antd.ConfigProvider, {
     locale: ((_localeInfo$locale = _umi.localeInfo[locale]) === null || _localeInfo$locale === void 0 ? void 0 : _localeInfo$locale.antd) || {}
   }, /*#__PURE__*/_react.default.createElement(_umi.RawIntlProvider, {
     value: intl
   }, /*#__PURE__*/_react.default.createElement(_Page.default, {
     ref: simulatorRef,
     className: _design.default['lc-painter-design-simulator']
-  })))));
+  }, /*#__PURE__*/_react.default.createElement(_DesignOperator.default, {
+    canvas: simulatorRef
+  }))))));
 };
 var _default = exports.default = Design;

package/lib/lowcode/painter/DesignOperator.js

@@ -16,26 +16,26 @@ var _ContextProvider = require("../engine/provider/ContextProvider");
 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;
   return {
     left: "".concat(cellNodeLeft - pageLeft, "px"),
-    top: "".concat(cellNodeTop - pageTop, "px"),
+    top: "".concat(cellNode.offsetTop, "px"),
     width: "".concat(cellNode.offsetWidth, "px"),
     height: "".concat(cellNode.offsetHeight, "px")
   };
 };
 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 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],
@@ -49,18 +49,18 @@ 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) {
@@ -76,9 +76,7 @@ var DesignOperator = function DesignOperator(_ref) {
         context.$publisher(context.topics.COMPONENT_APPEND, {
           id: _id
         });
-        context.$publisher(context.topics.COMPONENT_ACTIVE, {
-          id: _id
-        });
+        handleSelect(_id);
       }
     }).watch();
     var json = require("../engine/meta/".concat(data.component.toLowerCase(), ".props.default.json"));
@@ -87,7 +85,17 @@ var DesignOperator = function DesignOperator(_ref) {
   });
   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", {
@@ -109,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) {
@@ -164,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;
@@ -182,23 +208,34 @@ 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 node = context.componentMap.get(payload.id).api.getSelfData();
-        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();
@@ -206,14 +243,14 @@ var DesignOperator = function DesignOperator(_ref) {
       var toggle = _ref6.toggle,
         id = _ref6.id;
       if (toggle && id !== currentModal.current) {
-        target.current.style.setProperty('overflow', 'hidden');
+        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 if (!toggle) {
-        target.current.style.removeProperty('overflow');
+        canvas.current.style.removeProperty('overflow');
         var _id = id || currentModal.current;
         if (_id) {
           var _modal2 = context.componentMap.get(_id);
@@ -225,7 +262,7 @@ var DesignOperator = function DesignOperator(_ref) {
     var cdid = context.$subscriber(context.topics.COMPONENT_DELETE).on(function (_ref7) {
       var id = _ref7.id;
       if (lastSelectorId.current === id) {
-        context.$publisher(context.topics.COMPONENT_ACTIVE, null);
+        handleSelect();
       }
       (0, _ContextProvider.deleteNode)(id);
     });
@@ -248,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

@@ -25,6 +25,7 @@ var _preview = _interopRequireDefault(require("../preview"));
 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) {
@@ -34,8 +35,6 @@ var DesignToolbar = function DesignToolbar(_ref) {
   var editorRef = (0, _react.useRef)();
   var context = (0, _ContextProvider.useContext)();
   var pageData = (0, _ContextProvider.useGet)();
-  var _ref2 = (0, _ContextProvider.useRemoteSource)() || {},
-    pageinfo = _ref2.pageinfo;
   var _useState = (0, _react.useState)(null),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     langList = _useState2[0],
@@ -72,8 +71,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 () {
@@ -86,7 +85,6 @@ 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) {
@@ -94,7 +92,7 @@ var DesignToolbar = function DesignToolbar(_ref) {
           _context.next = 2;
           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:
           _yield$runAsync = _context.sent;
@@ -126,7 +124,7 @@ var DesignToolbar = function DesignToolbar(_ref) {
       zIndex: 3000,
       onOk: function onOk() {
         return runClearCache({
-          moduleCode: pageinfo.relationship.moduleCode
+          moduleCode: (0, _helper.getLDMetaAttr)('moduleCode')
         });
       }
     });
@@ -146,7 +144,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) {
@@ -176,7 +174,7 @@ var DesignToolbar = function DesignToolbar(_ref) {
         }, _callee2);
       }));
       return function (_x) {
-        return _ref5.apply(this, arguments);
+        return _ref4.apply(this, arguments);
       };
     }(), {
       wait: 500
@@ -221,7 +219,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)({
@@ -335,10 +333,10 @@ var DesignToolbar = function DesignToolbar(_ref) {
           setUserId(void 0);
         }
       }
-    }, userOptions.map(function (_ref6) {
-      var key = _ref6.key,
-        label = _ref6.label,
-        rest = (0, _objectWithoutProperties2.default)(_ref6, _excluded);
+    }, userOptions.map(function (_ref5) {
+      var key = _ref5.key,
+        label = _ref5.label,
+        rest = (0, _objectWithoutProperties2.default)(_ref5, _excluded);
       return /*#__PURE__*/_react.default.createElement(_antd.Select.Option, (0, _extends2.default)({
         key: key,
         value: key
@@ -365,7 +363,8 @@ var DesignToolbar = function DesignToolbar(_ref) {
     }
   }, /*#__PURE__*/_react.default.createElement(_preview.default, {
     code: location.query.code,
-    userId: userId || 'no-user'
+    userId: userId || 'no-user',
+    debug: true
   })));
 };
 var _default = exports.default = DesignToolbar;

package/lib/lowcode/painter/Outline.js

@@ -48,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 () {
@@ -69,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) {