@luck-design-biz/luckda 0.0.25-1 → 0.0.25-11

package/lib/lowcode/painter/Panel.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
@@ -19,7 +20,6 @@ var _ContextProvider = require("../engine/provider/ContextProvider");
 var _AttrsPanel = _interopRequireDefault(require("./components/AttrsPanel"));
 var _StylePanel = _interopRequireDefault(require("./panel-section/StylePanel"));
 var _AdvancePanel = _interopRequireDefault(require("./components/AdvancePanel"));
-var _dataProcess = require("../engine/tools/dataProcess");
 var _panel = _interopRequireDefault(require("./style/panel.less"));
 var _constants = require("../constants");
 var _I18N_PREFIX_ = 'luckda.lowcode.painter.panel';
@@ -43,6 +43,7 @@ var _TAB_LIST_ = [{
   key: 'advance'
 }];
 var Panel = function Panel() {
+  var _activeNode$$target;
   var activeTabRef = (0, _react.useRef)(null);
   var underLineRef = (0, _react.useRef)(null);
   var _useState = (0, _react.useState)(null),
@@ -54,74 +55,106 @@ var Panel = function Panel() {
     activeTabKey = _useState4[0],
     setActiveTabKey = _useState4[1];
   var context = (0, _ContextProvider.useContext)();
-  var _usePageData = (0, _ContextProvider.usePageData)(),
-    _usePageData2 = (0, _slicedToArray2.default)(_usePageData, 2),
-    pageData = _usePageData2[0],
-    setPageData = _usePageData2[1].setPageData;
+  var task = (0, _ContextProvider.useTask)('modify');
   var meta = (0, _ahooks.useCreation)(function () {
+    if ((0, _lodash.isNil)(activeNode)) return null;
     try {
-      return (0, _lodash.isNil)(activeNode) ? null : require("../engine/meta/".concat(activeNode.node.component.toLowerCase(), ".props.json"));
+      var _meta = require("../engine/meta/".concat(activeNode.node.component.toLowerCase(), ".props.json"));
+      if (!(0, _lodash.isNil)(activeNode === null || activeNode === void 0 ? void 0 : activeNode.$target)) {
+        var setValueKey = function setValueKey(items) {
+          items.forEach(function (item) {
+            if (item.next) {
+              setValueKey(item.next.props);
+            } else if (item.props) {
+              setValueKey(item.props);
+            } else {
+              item.valueKey = "".concat(activeNode.$target.keyPath, ".").concat(item.key);
+            }
+          });
+        };
+        setValueKey(_meta.props);
+      }
+      return _meta;
     } catch (e) {
       return null;
     }
   }, [activeNode]);
-  var handleChange = (0, _ahooks.useMemoizedFn)(function (field, value, repositioning) {
-    var cloneData = (0, _lodash.cloneDeep)(pageData);
+  var handleChange = (0, _ahooks.useMemoizedFn)(function (field, value) {
+    var _ref = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
+      repositioning = _ref.repositioning,
+      before = _ref.before;
     if (field === 'enableHeader') {
       if (value) {
         var headerMeta = require("../engine/meta/pageheader.props.default.json");
-        (0, _dataProcess.add)(cloneData, _constants.LC_BUILDIN_UNIT_KEY.PAGE_ROOT, _constants.LC_BUILDIN_UNIT_KEY.PAGE_HEADER, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, headerMeta), {}, {
+        (0, _ContextProvider.addNode)(_constants.LC_BUILDIN_UNIT_KEY.PAGE_ROOT, _constants.LC_BUILDIN_UNIT_KEY.PAGE_HEADER, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, headerMeta), {}, {
           buildIn: true
         }));
       } else {
-        (0, _dataProcess.deleteById)(cloneData, _constants.LC_BUILDIN_UNIT_KEY.PAGE_HEADER);
+        (0, _ContextProvider.deleteNode)(_constants.LC_BUILDIN_UNIT_KEY.PAGE_HEADER);
       }
     } else if (field === 'enableFooter') {
       if (value) {
         var footerMeta = require("../engine/meta/pagefooter.props.default.json");
-        (0, _dataProcess.add)(cloneData, _constants.LC_BUILDIN_UNIT_KEY.PAGE_ROOT, _constants.LC_BUILDIN_UNIT_KEY.PAGE_FOOTER, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, footerMeta), {}, {
+        (0, _ContextProvider.addNode)(_constants.LC_BUILDIN_UNIT_KEY.PAGE_ROOT, _constants.LC_BUILDIN_UNIT_KEY.PAGE_FOOTER, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, footerMeta), {}, {
           buildIn: true
         }));
       } else {
-        (0, _dataProcess.deleteById)(cloneData, _constants.LC_BUILDIN_UNIT_KEY.PAGE_FOOTER);
+        (0, _ContextProvider.deleteNode)(_constants.LC_BUILDIN_UNIT_KEY.PAGE_FOOTER);
       }
     }
-    var component = context.componentMap.get(activeNode.node.id);
-    var _component$api$getSel = component.api.getSelfAndParentLCData(),
-      node = _component$api$getSel.node;
+    var targetId = (0, _lodash.isNil)(activeNode.$target) ? activeNode.node.id : activeNode.$target.ancestorId;
+    var component = context.componentMap.get(targetId);
+    var node = component.api.getSelfData();
     var oldValue = (0, _defineProperty2.default)({}, field, (0, _lodash.get)(node.props, field));
-    var newNodeData = (0, _lodash.set)(node.props, field, value);
-    (0, _dataProcess.modifyById)(cloneData, activeNode.node.id, newNodeData);
-    setPageData(cloneData).then(function (newData) {
+    var newValue = (0, _defineProperty2.default)({}, field, value);
+    if (before) {
+      before(handleChange);
+    }
+    task(targetId, newValue).then(function () {
       context.$publisher(context.topics.COMPONENT_MODIFY, {
-        id: activeNode.node.id,
-        pageData: (0, _lodash.cloneDeep)(newData),
+        id: targetId,
         oldValue: oldValue,
-        newValue: (0, _defineProperty2.default)({}, field, value)
+        newValue: newValue
       });
       if (repositioning) context.$publisher(context.topics.COMPONENT_REPOSITIONING, {
-        id: activeNode.node.id
+        id: targetId
       });
     });
   });
   (0, _react.useEffect)(function () {
-    var _id = context.$subscriber(context.topics.COMPONENT_ACTIVE).on(function (payload) {
+    var tid = context.$subscriber(context.topics.COMPONENT_ACTIVE).on(function (payload) {
       setActiveTabKey('attrs');
-      if (!payload.id) {
+      if (!payload.target) {
         setActiveNode(null);
         return;
       }
-      var component = context.componentMap.get(payload.id);
-      var _component$api$getSel2 = component.api.getSelfAndParentLCData(),
-        node = _component$api$getSel2.node;
-      var levelNodes = (0, _lodash.takeRight)(component.api.getLevelNodes(), 4);
-      setActiveNode({
-        node: node.props,
-        level: levelNodes
-      });
+      if ((0, _lodash.isString)(payload.target)) {
+        var component = context.componentMap.get(payload.target);
+        var node = component.api.getSelfData();
+        var levelNodes = (0, _lodash.takeRight)(component.api.getLevelNodes(), 4);
+        setActiveNode({
+          node: node.props,
+          level: levelNodes
+        });
+      } else {
+        var _component = payload.target.element.getAttribute('data-__component');
+        var ancestor = context.componentMap.get(payload.target.ancestorId);
+        var _levelNodes = (0, _lodash.takeRight)(ancestor.api.getLevelNodes(), 3);
+        setActiveNode({
+          node: {
+            id: payload.target.id,
+            component: _component
+          },
+          level: [].concat((0, _toConsumableArray2.default)(_levelNodes), [{
+            id: payload.target.id,
+            name: payload.target.label
+          }]),
+          $target: payload.target
+        });
+      }
     }).watch();
     return function () {
-      return context.$unsubscriber(context.topics.COMPONENT_ACTIVE, _id);
+      return context.$unsubscriber(context.topics.COMPONENT_ACTIVE, tid);
     };
   }, []);
   (0, _react.useLayoutEffect)(function () {
@@ -136,16 +169,16 @@ var Panel = function Panel() {
     style: {
       fontSize: 12
     }
-  }, activeNode === null || activeNode === void 0 ? void 0 : activeNode.level.map(function (_ref) {
-    var id = _ref.id,
-      name = _ref.name;
+  }, activeNode === null || activeNode === void 0 ? void 0 : activeNode.level.map(function (_ref2) {
+    var id = _ref2.id,
+      name = _ref2.name;
     return /*#__PURE__*/_react.default.createElement(_antd.Breadcrumb.Item, {
       key: id,
       className: (0, _classnames.default)((0, _defineProperty2.default)({}, _panel.default['active-node-level'], id !== activeNode.node.id)),
       onMouseEnter: function onMouseEnter() {
         if (id === activeNode.node.id) return;
         context.$publisher(context.topics.COMPONENT_HOVER, {
-          id: id
+          target: id
         });
       },
       onMouseLeave: function onMouseLeave() {
@@ -155,7 +188,7 @@ var Panel = function Panel() {
       onClick: function onClick() {
         if (id === activeNode.node.id) return;
         context.$publisher(context.topics.COMPONENT_ACTIVE, {
-          id: id
+          target: id
         });
       }
     }, name);
@@ -185,21 +218,26 @@ var Panel = function Panel() {
     ref: underLineRef,
     className: _panel.default.underline
   })), activeTabKey === _TAB_LIST_[0].key && /*#__PURE__*/_react.default.createElement(_AttrsPanel.default, {
+    key: activeNode === null || activeNode === void 0 ? void 0 : activeNode.node.id,
+    nodeId: activeNode === null || activeNode === void 0 ? void 0 : activeNode.node.id,
+    ancestorId: activeNode === null || activeNode === void 0 || (_activeNode$$target = activeNode.$target) === null || _activeNode$$target === void 0 ? void 0 : _activeNode$$target.ancestorId,
     meta: meta,
-    value: activeNode === null || activeNode === void 0 ? void 0 : activeNode.node,
-    onChange: function onChange(field, value, repositioning) {
-      return handleChange(field, value, repositioning);
+    onChange: function onChange(field, value, params) {
+      return handleChange(field, value, params);
     }
   }), activeTabKey === _TAB_LIST_[1].key && /*#__PURE__*/_react.default.createElement(_StylePanel.default, {
-    value: activeNode === null || activeNode === void 0 ? void 0 : activeNode.node.css,
+    key: activeNode === null || activeNode === void 0 ? void 0 : activeNode.node.id,
+    nodeId: activeNode === null || activeNode === void 0 ? void 0 : activeNode.node.id,
     onChange: function onChange(_, newCss) {
       return handleChange('css', newCss);
     }
   }), activeTabKey === _TAB_LIST_[2].key && /*#__PURE__*/_react.default.createElement(_AdvancePanel.default, {
+    key: activeNode === null || activeNode === void 0 ? void 0 : activeNode.node.id,
+    nodeId: activeNode === null || activeNode === void 0 ? void 0 : activeNode.node.id,
+    target: activeNode === null || activeNode === void 0 ? void 0 : activeNode.$target,
     meta: meta,
-    value: activeNode === null || activeNode === void 0 ? void 0 : activeNode.node.advance,
     onChange: function onChange(val) {
-      return handleChange('advance', val);
+      return handleChange((0, _lodash.isNil)(activeNode.$target) ? 'advance' : "".concat(activeNode.$target.keyPath, ".advance"), val);
     }
   }), /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)(_panel.default['lc-painter-panel-empty'], (0, _defineProperty2.default)({}, _panel.default.hidden, !!activeNode))

package/lib/lowcode/painter/components/ActionBindModal.js

@@ -7,7 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _ahooks = require("ahooks");
@@ -17,7 +16,6 @@ var _lodash = require("lodash");
 var _utils = require("@luck-design-biz/base/utils");
 var _ContextProvider = require("../../engine/provider/ContextProvider");
 var _JSEditor = _interopRequireDefault(require("./code-editor/JSEditor"));
-var _JsonEditor = _interopRequireDefault(require("./code-editor/JsonEditor"));
 var _actionBindModal = _interopRequireDefault(require("../style/action-bind-modal.less"));
 var _I18N_PREFIX_ = 'luckda.lowcode.painter.actionBindModal';
 var _ACTION_CATEGORY_ = [{
@@ -39,10 +37,11 @@ var _ACTION_CATEGORY_ = [{
     label: '自定义动作'
   })
 }];
-var _DEFAULT_JSON_CODE_ = '{"datasetCode": "","params":{},"body":{}}';
+var _DEFAULT_JSON_CODE_ = '{"params":{},"data":{}}';
 var _DEFAULT_JS_CODE_ = 'function todo() {\n\n}';
 var ActionBindModal = function ActionBindModal(_ref) {
-  var event = _ref.event,
+  var nodeId = _ref.nodeId,
+    event = _ref.event,
     _ref$defaultCode = _ref.defaultCode,
     defaultCode = _ref$defaultCode === void 0 ? _DEFAULT_JS_CODE_ : _ref$defaultCode,
     onComfirm = _ref.onComfirm,
@@ -89,7 +88,7 @@ var ActionBindModal = function ActionBindModal(_ref) {
           target = _ref3[1];
         ret.push({
           key: key,
-          label: "".concat(target.api.getSelfAndParentLCData().node.props.name, "(").concat(key, ")")
+          label: "".concat(target.api.getSelfData().props.name, "(").concat(key, ")")
         });
         return ret;
       }, []);
@@ -106,28 +105,30 @@ var ActionBindModal = function ActionBindModal(_ref) {
   }, [category]);
   (0, _ahooks.useUpdateEffect)(function () {
     if (activeKey) {
+      var _editorRef$current;
       var action = get(activeKey);
-      editorRef.current.editor.setValue(action.code);
+      (_editorRef$current = editorRef.current) === null || _editorRef$current === void 0 || _editorRef$current.editor.setValue(action === null || action === void 0 ? void 0 : action.code);
     }
-  }, [activeKey]);
+  }, [category, activeKey]);
   (0, _ahooks.useUpdateEffect)(function () {
     setAll(event === null || event === void 0 ? void 0 : event.actionPool);
   }, [event]);
-  var handleEditorValueChange = (0, _react.useRef)((0, _lodash.debounce)(function (code) {
-    if (latestActiveKey.current) {
-      var action = get(latestActiveKey.current);
-      action.code = code;
-    }
-  }, 400));
+  var _useDebounceFn = (0, _ahooks.useDebounceFn)(function (code) {
+      if (latestActiveKey.current) {
+        var action = get(latestActiveKey.current);
+        action.code = code;
+      }
+    }, {
+      wait: 500
+    }),
+    handleEditorValueChange = _useDebounceFn.run;
   var handleOptionClick = (0, _ahooks.useMemoizedFn)(function (key) {
     setActiveKey(key);
     var action;
     if (actionPool.has(key)) {
       action = get(key);
     } else {
-      var code = category === 'custom' ? event.func || defaultCode : JSON.stringify((0, _objectSpread2.default)({
-        moduleCode: module.moduleCode
-      }, JSON.parse(_DEFAULT_JSON_CODE_)), null, '\t');
+      var code = event.func || (category === 'custom' ? defaultCode : "".concat(defaultCode.slice(0, -1), "\n\treturn ").concat(_DEFAULT_JSON_CODE_, " \n}"));
       action = {
         category: category,
         key: key,
@@ -141,9 +142,7 @@ var ActionBindModal = function ActionBindModal(_ref) {
       if (activeKey !== key) {
         setActiveKey(key);
       }
-      var code = category === 'custom' ? event.func || defaultCode : JSON.stringify((0, _objectSpread2.default)({
-        moduleCode: module.moduleCode
-      }, JSON.parse(_DEFAULT_JSON_CODE_)), null, '\t');
+      var code = event.func || (category === 'custom' ? defaultCode : "".concat(defaultCode.slice(0, -1), "\n\treturn ").concat(_DEFAULT_JSON_CODE_, " \n}"));
       set(key, {
         category: category,
         key: key,
@@ -173,9 +172,9 @@ var ActionBindModal = function ActionBindModal(_ref) {
       marginTop: 0,
       padding: '4px 24px'
     },
-    title: event === null || event === void 0 ? void 0 : event.name,
+    title: "".concat(event === null || event === void 0 ? void 0 : event.name, "(").concat(nodeId, ")"),
     visible: !!event,
-    width: 960,
+    width: "70vw",
     closable: false,
     maskClosable: false,
     getContainer: function getContainer() {
@@ -203,7 +202,19 @@ var ActionBindModal = function ActionBindModal(_ref) {
       className: (0, _classnames.default)((0, _defineProperty2.default)({}, _actionBindModal.default.active, key === category)),
       onClick: function onClick() {
         setCategory(key);
-        setActiveKey(void 0);
+        if ('custom' === key) {
+          var _activeKey = 'coding';
+          setActiveKey(_activeKey);
+          if (!actionPool.has(_activeKey)) {
+            set(_activeKey, {
+              category: key,
+              key: _activeKey,
+              code: event.func || defaultCode
+            });
+          }
+        } else {
+          setActiveKey(void 0);
+        }
       }
     }, label, key === category && /*#__PURE__*/_react.default.createElement(_antd.Icon, {
       type: "check",
@@ -278,9 +289,9 @@ var ActionBindModal = function ActionBindModal(_ref) {
     type: "exclamation-circle"
   }))), /*#__PURE__*/_react.default.createElement("div", {
     className: _actionBindModal.default['code-box']
-  }, activeKey ? /*#__PURE__*/_react.default.createElement(_JsonEditor.default, {
+  }, activeKey ? /*#__PURE__*/_react.default.createElement(_JSEditor.default, {
     ref: editorRef,
-    onChange: handleEditorValueChange.current
+    onChange: handleEditorValueChange
   }) : (0, _utils.formatMessage)({
     id: "".concat(_I18N_PREFIX_, ".noActionSelected"),
     label: '请在右侧选择行为项'
@@ -291,7 +302,7 @@ var ActionBindModal = function ActionBindModal(_ref) {
     className: _actionBindModal.default['code-box']
   }, activeKey ? /*#__PURE__*/_react.default.createElement(_JSEditor.default, {
     ref: editorRef,
-    onChange: handleEditorValueChange.current
+    onChange: handleEditorValueChange
   }) : (0, _utils.formatMessage)({
     id: "".concat(_I18N_PREFIX_, ".noActionSelected"),
     label: '请在右侧选择行为项'

package/lib/lowcode/painter/components/AdvancePanel.js

@@ -15,6 +15,7 @@ var _ahooks = require("ahooks");
 var _antd = require("luck-design/antd");
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 var _lodash = require("lodash");
+var _ContextProvider = require("../../engine/provider/ContextProvider");
 var _utils = require("@luck-design-biz/base/utils");
 var _Collapse = _interopRequireDefault(require("./Collapse"));
 var _ActionBindModal = _interopRequireDefault(require("./ActionBindModal"));
@@ -27,8 +28,16 @@ var EventItem = _styledComponents.default.div.withConfig({
 })(["display:flex;align-items:center;justify-content:space-between;padding:4px 8px;border:1px solid #e5e6e8;border-radius:6px;margin-bottom:6px;font-size:12px;i{color:rgba(0,0,0,0.4);cursor:pointer;}i:not(:last-child){margin-right:6px;}"]);
 var AdvancePanel = function AdvancePanel(_ref) {
   var meta = _ref.meta,
-    value = _ref.value,
+    nodeId = _ref.nodeId,
+    target = _ref.target,
     onChange = _ref.onChange;
+  var value = (0, _ContextProvider.useGet)((0, _lodash.isNil)(target) ? {
+    id: nodeId,
+    path: 'props.advance'
+  } : {
+    id: target.ancestorId,
+    path: "props.".concat(target.keyPath, ".advance")
+  });
   var _useState = (0, _react.useState)((value === null || value === void 0 ? void 0 : value.events) || {}),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     events = _useState2[0],
@@ -74,24 +83,28 @@ var AdvancePanel = function AdvancePanel(_ref) {
       style: {
         fontSize: 12
       }
-    }, (_meta$advance2 = meta.advance) === null || _meta$advance2 === void 0 || (_meta$advance2 = _meta$advance2.events) === null || _meta$advance2 === void 0 ? void 0 : _meta$advance2.map(function (event) {
-      return /*#__PURE__*/_react.default.createElement(_antd.Menu.Item, {
-        key: event.key,
-        payload: event
-      }, /*#__PURE__*/_react.default.createElement(_antd.Tooltip, {
-        title: event.desc || event.name,
-        placement: "left",
-        getPopupContainer: function getPopupContainer() {
-          return document.getElementById('lc-design-workspace');
-        }
-      }, /*#__PURE__*/_react.default.createElement("div", {
-        style: {
-          width: '100%',
-          fontSize: 12
-        }
-      }, event.name)));
-    }));
-  }, []);
+    }, (0, _lodash.reduce)((_meta$advance2 = meta.advance) === null || _meta$advance2 === void 0 ? void 0 : _meta$advance2.events, function (ret, event) {
+      var _value$events;
+      if (!(value !== null && value !== void 0 && (_value$events = value.events) !== null && _value$events !== void 0 && _value$events[event.key])) {
+        ret.push( /*#__PURE__*/_react.default.createElement(_antd.Menu.Item, {
+          key: event.key,
+          payload: event
+        }, /*#__PURE__*/_react.default.createElement(_antd.Tooltip, {
+          title: event.desc || event.name,
+          placement: "left",
+          getPopupContainer: function getPopupContainer() {
+            return document.getElementById('lc-design-workspace');
+          }
+        }, /*#__PURE__*/_react.default.createElement("div", {
+          style: {
+            width: '100%',
+            fontSize: 12
+          }
+        }, event.name))));
+      }
+      return ret;
+    }, []));
+  }, [value]);
   return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_Collapse.default, {
     field: "events",
     label: (0, _utils.formatMessage)({
@@ -102,7 +115,9 @@ var AdvancePanel = function AdvancePanel(_ref) {
       padding: '12px 16px'
     }
   }, (0, _lodash.keys)(events).map(function (ek) {
-    return /*#__PURE__*/_react.default.createElement(EventItem, null, /*#__PURE__*/_react.default.createElement("span", null, metaMap[ek].name), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_antd.Tooltip, {
+    return /*#__PURE__*/_react.default.createElement(EventItem, {
+      key: ek
+    }, /*#__PURE__*/_react.default.createElement("span", null, metaMap[ek].name), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_antd.Tooltip, {
       title: (0, _utils.formatMessage)({
         id: 'luckda.lowcode.painter.edit',
         label: '编辑'
@@ -138,6 +153,7 @@ var AdvancePanel = function AdvancePanel(_ref) {
     id: "".concat(_I18N_PREFIX_, ".addEventAction"),
     label: '添加事件动作'
   })))), /*#__PURE__*/_react.default.createElement(_ActionBindModal.default, {
+    nodeId: nodeId,
     event: event,
     onComfirm: handleComfirm,
     onClose: function onClose() {

package/lib/lowcode/painter/components/AttrsPanel.js

@@ -24,7 +24,8 @@ var _excluded = ["type", "key", "valueKey", "name", "desc", "default", "props",
 var AttrsPanel = function AttrsPanel(_ref) {
   var _nextRef$current2, _nextRef$current3;
   var meta = _ref.meta,
-    value = _ref.value,
+    nodeId = _ref.nodeId,
+    ancestorId = _ref.ancestorId,
     onChange = _ref.onChange;
   var nextRef = (0, _react.useRef)(null);
   var factory = (0, _react.useRef)(new _panelItemFactory.default());
@@ -34,10 +35,18 @@ var AttrsPanel = function AttrsPanel(_ref) {
     _useBoolean2$ = _useBoolean2[1],
     setTrue = _useBoolean2$.setTrue,
     setFalse = _useBoolean2$.setFalse;
-  var context = (0, _ContextProvider.useContext)();
-  var handleChange = (0, _ahooks.useMemoizedFn)(function (field, val, repositioning) {
+  var node = (0, _ContextProvider.useGet)({
+    id: (0, _lodash.isNil)(ancestorId) ? nodeId : ancestorId,
+    path: 'props'
+  });
+  var handleChange = (0, _ahooks.useMemoizedFn)(function (field, val, _ref2) {
     var _nextRef$current;
-    onChange(field, val, repositioning);
+    var repositioning = _ref2.repositioning,
+      before = _ref2.before;
+    onChange(field, val, {
+      repositioning: repositioning,
+      before: before
+    });
     if ((_nextRef$current = nextRef.current) !== null && _nextRef$current !== void 0 && _nextRef$current.autoClose) {
       setFalse();
     }
@@ -52,55 +61,57 @@ var AttrsPanel = function AttrsPanel(_ref) {
     setTrue();
   });
   var renderPanelItems = (0, _ahooks.useMemoizedFn)(function (items, dynamicProps) {
-    var _context$componentMap = context.componentMap.get(value.id).api.getSelfAndParentLCData(),
-      node = _context$componentMap.node;
-    return items.map(function (_ref2) {
-      var type = _ref2.type,
-        key = _ref2.key,
-        valueKey = _ref2.valueKey,
-        name = _ref2.name,
-        desc = _ref2.desc,
-        defaultValue = _ref2.default,
-        props = _ref2.props,
-        wrapper = _ref2.wrapper,
-        wrapperProps = _ref2.wrapperProps,
-        _next2 = _ref2.next,
-        repositioning = _ref2.repositioning,
-        rest = (0, _objectWithoutProperties2.default)(_ref2, _excluded);
+    return items.map(function (_ref3) {
+      var type = _ref3.type,
+        key = _ref3.key,
+        valueKey = _ref3.valueKey,
+        name = _ref3.name,
+        desc = _ref3.desc,
+        defaultValue = _ref3.default,
+        props = _ref3.props,
+        wrapper = _ref3.wrapper,
+        wrapperProps = _ref3.wrapperProps,
+        next = _ref3.next,
+        repositioning = _ref3.repositioning,
+        rest = (0, _objectWithoutProperties2.default)(_ref3, _excluded);
       var Comp = factory.current.getPanelItemFor((0, _lodash.startsWith)(type, '_') ? 'dynamic' : type, type);
+      var _valueKey = (dynamicProps === null || dynamicProps === void 0 ? void 0 : dynamicProps.valueKey) || valueKey;
       if (type === 'group') {
         return /*#__PURE__*/_react.default.createElement(Comp, {
-          nodeId: value.id,
+          nodeId: nodeId,
           key: key,
           field: key,
           label: name,
-          next: _next2 ? function (_dp) {
-            return goNext(_next2, _dp);
+          next: next ? function (_dp) {
+            return goNext(next, _dp);
           } : null,
           defaultCollapsed: defaultValue,
           desc: desc
         }, renderPanelItems(props || [], dynamicProps));
       }
-      var _originalVal = (0, _lodash.get)(node.props, valueKey || key);
+      var _originalVal = (0, _lodash.get)(node, _valueKey || key);
       var comp = Comp && /*#__PURE__*/_react.default.createElement(Comp, (0, _extends2.default)({
-        nodeId: value.id,
+        nodeId: nodeId,
         key: key,
         defaultValue: (0, _lodash.isNil)(_originalVal) ? defaultValue : _originalVal,
-        next: function next(_dp) {
-          return goNext(_next2, _dp);
-        },
-        onChange: function onChange(val) {
-          return handleChange(valueKey || key, val, repositioning);
+        next: next !== null && next !== void 0 && next.props ? function (_dp) {
+          return goNext(next, _dp);
+        } : null,
+        onChange: function onChange(val, before) {
+          return handleChange(_valueKey || key, val, {
+            repositioning: repositioning,
+            before: before
+          });
         },
         size: "small",
-        settings: node.props,
+        settings: node,
         renderPanelItems: renderPanelItems
       }, rest, dynamicProps));
       if (wrapper === 'hidden') return comp;
       var Wrapper = wrapper === 'collapse' ? _Collapse.default : _PanelItem.default;
       return /*#__PURE__*/_react.default.createElement(Wrapper, (0, _extends2.default)({
         key: key,
-        nodeId: value.id,
+        nodeId: nodeId,
         field: key,
         label: name,
         desc: desc
@@ -113,7 +124,7 @@ var AttrsPanel = function AttrsPanel(_ref) {
       return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
     }
     return renderPanelItems(meta.props);
-  }, [value]);
+  }, [nodeId]);
   (0, _react.useEffect)(function () {
     if (!open) {
       nextRef.current = null;
@@ -121,7 +132,7 @@ var AttrsPanel = function AttrsPanel(_ref) {
   }, [open]);
   return /*#__PURE__*/_react.default.createElement("div", {
     id: "lc-painter-panel-attrs-container",
-    className: (0, _classnames.default)(_panelAttrs.default['lc-painter-panel-attrs'], (0, _defineProperty2.default)((0, _defineProperty2.default)({}, _panelAttrs.default.hidden, !value), _panelAttrs.default.showNext, open))
+    className: (0, _classnames.default)(_panelAttrs.default['lc-painter-panel-attrs'], (0, _defineProperty2.default)((0, _defineProperty2.default)({}, _panelAttrs.default.hidden, !nodeId), _panelAttrs.default.showNext, open))
   }, PropsComps, /*#__PURE__*/_react.default.createElement(_antd.Drawer, {
     visible: open,
     width: 320,

package/lib/lowcode/painter/components/DragDrop/DragDropContext.js

@@ -70,7 +70,7 @@ function _default(_ref) {
 }
 function pubEvent(event, eventName, ctx) {
   if (event.active && event.over && event.active.data.current.id !== event.over.data.current.id) {
-    var parentNode = ctx.componentMap.get(event.over.data.current.id).api.getSelfAndParentLCData().parent;
+    var parentNode = ctx.componentMap.get(event.over.data.current.id).api.getSelfAndParentData().parent;
 
     // console.log('event.over.data.current.type', event.over.data.current.type)
     var actionSide = getAction(event.over.data.current.type, event.over.data.current.component.component, event.active.rect.current.translated, event.over.rect, parentNode);

package/lib/lowcode/painter/components/DragDrop/DragDropWrapper.js

@@ -7,9 +7,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = _default;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _react = require("react");
+var _ahooks = require("ahooks");
 var _core = require("@dnd-kit/core");
 var _ContextProvider = require("../../../engine/provider/ContextProvider");
-var _ahooks = require("ahooks");
 var _DragDropContext = require("./DragDropContext");
 var _constants = require("../../../constants");
 function _default(_ref) {
@@ -40,6 +40,9 @@ function _default(_ref) {
       }
     }),
     setDropRef = _useDroppable.setNodeRef;
+  var _memoListeners = (0, _ahooks.useCreation)(function () {
+    return listeners;
+  }, []);
   (0, _react.useEffect)(function () {
     var dom = getTargetDom();
     if (dom) {
@@ -48,7 +51,7 @@ function _default(_ref) {
     }
   }, []);
   var comp = (0, _ahooks.useCreation)(function () {
-    return /*#__PURE__*/(0, _react.cloneElement)(children, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, children.props), listeners), attributes));
+    return /*#__PURE__*/(0, _react.cloneElement)(children, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, children.props), _memoListeners), attributes));
   }, [id, children]);
   return comp;
 }