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

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,11 +190,10 @@ 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,
+          deletable: !node || node.props.buildIn !== true,
           detector: null
         });
       } else {
@@ -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);

package/lib/lowcode/painter/DesignToolbar.js

@@ -33,15 +33,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 pageData = (0, _ContextProvider.useGet)();
   var _ref2 = (0, _ContextProvider.useRemoteSource)() || {},
     pageinfo = _ref2.pageinfo;
   var _useState = (0, _react.useState)(null),
@@ -143,9 +135,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: '页面数据错误'
@@ -220,35 +213,6 @@ var DesignToolbar = function DesignToolbar(_ref) {
     type: "mobile"
   })), /*#__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)),
-    onClick: function onClick() {
-      return backLength > 0 && back();
-    }
-  }, /*#__PURE__*/_react.default.createElement("svg", {
-    viewBox: "0 0 1024 1024",
-    width: "20",
-    height: "20",
-    fill: "currentColor",
-    style: {
-      transform: 'rotateY(180deg)'
-    }
-  }, /*#__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)),
-    onClick: function onClick() {
-      return forwardLength > 0 && forward();
-    }
-  }, /*#__PURE__*/_react.default.createElement("svg", {
-    viewBox: "0 0 1024 1024",
-    width: "20",
-    height: "20",
-    fill: "currentColor"
-  }, /*#__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(_antd.Divider, {
-    type: "vertical"
   }), /*#__PURE__*/_react.default.createElement("span", {
     style: {
       width: 'auto',
@@ -320,15 +284,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",
@@ -401,7 +365,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

@@ -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],

package/lib/lowcode/painter/Panel.js

@@ -19,7 +19,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';
@@ -54,10 +53,7 @@ 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 () {
     try {
       return (0, _lodash.isNil)(activeNode) ? null : require("../engine/meta/".concat(activeNode.node.component.toLowerCase(), ".props.json"));
@@ -65,38 +61,41 @@ var Panel = function Panel() {
       return null;
     }
   }, [activeNode]);
-  var handleChange = (0, _ahooks.useMemoizedFn)(function (field, value, repositioning) {
+  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)(pageData, _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)(pageData, _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)(pageData, _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)(pageData, _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 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)(pageData, activeNode.node.id, newNodeData);
-    setPageData(pageData).then(function (newData) {
+    var newValue = (0, _defineProperty2.default)({}, field, value);
+    if (before) {
+      before(handleChange);
+    }
+    task(activeNode.node.id, newValue).then(function (a, b) {
       context.$publisher(context.topics.COMPONENT_MODIFY, {
         id: activeNode.node.id,
-        pageData: newData,
         oldValue: oldValue,
-        newValue: (0, _defineProperty2.default)({}, field, value)
+        newValue: newValue
       });
       if (repositioning) context.$publisher(context.topics.COMPONENT_REPOSITIONING, {
         id: activeNode.node.id
@@ -111,8 +110,7 @@ var Panel = function Panel() {
         return;
       }
       var component = context.componentMap.get(payload.id);
-      var _component$api$getSel2 = component.api.getSelfAndParentLCData(),
-        node = _component$api$getSel2.node;
+      var node = component.api.getSelfData();
       var levelNodes = (0, _lodash.takeRight)(component.api.getLevelNodes(), 4);
       setActiveNode({
         node: node.props,
@@ -135,9 +133,9 @@ 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)),
@@ -184,19 +182,22 @@ 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,
     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,
     meta: meta,
-    value: activeNode === null || activeNode === void 0 ? void 0 : activeNode.node.advance,
     onChange: function onChange(val) {
       return handleChange('advance', val);
     }

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,7 +37,7 @@ 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,
@@ -89,7 +87,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;
       }, []);
@@ -107,27 +105,28 @@ var ActionBindModal = function ActionBindModal(_ref) {
   (0, _ahooks.useUpdateEffect)(function () {
     if (activeKey) {
       var action = get(activeKey);
-      editorRef.current.editor.setValue(action.code);
+      (action === null || action === void 0 ? void 0 : action.code) && editorRef.current.editor.setValue(action.code);
     }
   }, [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 +140,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,
@@ -175,7 +172,7 @@ var ActionBindModal = function ActionBindModal(_ref) {
     },
     title: event === null || event === void 0 ? void 0 : event.name,
     visible: !!event,
-    width: 960,
+    width: "70vw",
     closable: false,
     maskClosable: false,
     getContainer: function getContainer() {
@@ -203,7 +200,16 @@ 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) {
+          setActiveKey('coding');
+          if (!actionPool.has(key)) {
+            set('coding', {
+              category: key,
+              key: 'coding',
+              code: event.func || defaultCode
+            });
+          }
+        }
       }
     }, label, key === category && /*#__PURE__*/_react.default.createElement(_antd.Icon, {
       type: "check",
@@ -278,9 +284,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 +297,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,12 @@ 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,
     onChange = _ref.onChange;
+  var value = (0, _ContextProvider.useGet)({
+    id: nodeId,
+    path: 'props.advance'
+  });
   var _useState = (0, _react.useState)((value === null || value === void 0 ? void 0 : value.events) || {}),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     events = _useState2[0],