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

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

@@ -5,7 +5,8 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 var _excluded = ["datasetCode"];
 import { useBoolean, useMemoizedFn } from 'ahooks';
 import { message } from 'luck-design/antd';
-import { keys, isNil } from 'lodash';
+import { keys, isNil, isFunction } from 'lodash';
+import usePageDataStore from "./usePageDataStore";
 import { executeCode } from "./helper";
 import { fetchCallBehavior } from "../../constants/api-url";
 var useTodo = function useTodo() {
@@ -25,10 +26,13 @@ var useTodo = function useTodo() {
       behaviorKey: behaviorKey
     }, params), data);
   });
+  var moduleData = usePageDataStore(function (state) {
+    return state.moduleData;
+  });
   var todo = useMemoizedFn(function (ctx, actionPool) {
     var argsMap = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
     if (isNil(actionPool)) {
-      return;
+      return Promise.resolve();
     }
     var dsCode = argsMap.datasetCode,
       args = _objectWithoutProperties(argsMap, _excluded);
@@ -47,21 +51,27 @@ var useTodo = function useTodo() {
             return Promise.resolve(executeCode.apply(void 0, [ctx, info.code, argsName].concat(_toConsumableArray(_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 = executeCode.apply(void 0, [ctx, info.code, argsName].concat(_toConsumableArray(_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) {
                 message.warning('接口重要参数（模块编码或数据集编码）丢失');
                 return;
               }
               return callBehavior({
                 datasetCode: _dscode,
-                moduleCode: moduleCode,
+                moduleCode: _moduleCode,
                 behaviorKey: actionKey
-              }, params, data);
+              }, params, data).then(function (res) {
+                if (isFunction(after)) {
+                  after(ctx, res);
+                }
+              });
             }
           case 'trigger':
             return Promise.resolve();

package/es/lowcode/painter/DesignOperator.js

@@ -5,8 +5,7 @@ import { useEventListener, useSetState, useMemoizedFn, useCreation, useSize, use
 import { Icon, Dropdown, message } from 'luck-design/antd';
 import { reverse } from 'lodash';
 import { suid } from '@luck-design-biz/base/utils';
-import { useContext, usePageData } from "../engine/provider/ContextProvider";
-import { add, deleteById } from "../engine/tools/dataProcess";
+import { useContext, addNode, deleteNode } from "../engine/provider/ContextProvider";
 import { LC_BUILDIN_UNIT_KEY, LC_COMPONENT_UNIT_KEY, LC_COMPONENT_UNIT, CONTAINER_UNITS } from "../constants";
 import styles from "./style/design.less";
 var _MODAL_COMPONENT_ = ['Dialog', 'Drawer'];
@@ -29,10 +28,6 @@ var DesignOperator = function DesignOperator(_ref) {
   var _getDomById, _getDomById2;
   var target = _ref.target;
   var context = useContext();
-  var _usePageData = usePageData(),
-    _usePageData2 = _slicedToArray(_usePageData, 2),
-    pageData = _usePageData2[0],
-    setPageData = _usePageData2[1].setPageData;
   var size = useSize(target);
   var _useState = useState(suid()),
     _useState2 = _slicedToArray(_useState, 2),
@@ -64,27 +59,24 @@ var DesignOperator = function DesignOperator(_ref) {
   var handleDelete = useMemoizedFn(function (_ref2) {
     var id = _ref2.id;
     context.$publisher(context.topics.COMPONENT_DELETE, {
-      id: id,
-      pageData: pageData
+      id: id
     });
   });
   var addComponent = useMemoizedFn(function (data, targetId) {
-    var json = require("../engine/meta/".concat(data.component.toLowerCase(), ".props.default.json"));
-    var _id = "".concat(data.component.toLowerCase(), "_").concat(suid());
-    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(suid());
+    addNode(targetId, _id, json);
   });
   var acticeProps = useCreation(function () {
     if (!operatorId.selector) return null;
@@ -191,11 +183,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 {
@@ -207,14 +198,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) {
@@ -225,13 +216,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);
       }
-      deleteById(pageData, id);
-      setPageData(pageData);
+      deleteNode(id);
     });
     return function () {
       context.$unsubscriber(context.topics.COMPONENT_SETTING_CLICK, csid);

package/es/lowcode/painter/DesignToolbar.js

@@ -12,7 +12,7 @@ import classNames from 'classnames';
 import { useMemoizedFn, useRequest, useDebounceFn, useCookieState } from 'ahooks';
 import { Select, Button, Icon, Divider, Modal, message, Drawer } from 'luck-design/antd';
 import { showPop, formatMessage } from '@luck-design-biz/base/utils';
-import { useContext, usePageData, useRemoteSource } from "../engine/provider/ContextProvider";
+import { useContext, useGet, resetPageData, useRemoteSource } from "../engine/provider/ContextProvider";
 import JsonEditor from "../painter/components/code-editor/JsonEditor";
 import Preview from "../preview";
 import { LC_BUILDIN_UNIT_KEY, COOKIE_VIRTUAL_ACCOUNT_KEY } from "../constants";
@@ -25,15 +25,7 @@ var DesignToolbar = function DesignToolbar(_ref) {
   var location = useLocation();
   var editorRef = useRef();
   var context = useContext();
-  var _usePageData = usePageData(),
-    _usePageData2 = _slicedToArray(_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 = useGet();
   var _ref2 = useRemoteSource() || {},
     pageinfo = _ref2.pageinfo;
   var _useState = useState(null),
@@ -135,9 +127,10 @@ var DesignToolbar = function DesignToolbar(_ref) {
     var code = editorRef.current.editor.getValue();
     try {
       var data = JSON.parse(code);
-      setPageData(data);
+      resetPageData(data);
       setShow(false);
     } catch (e) {
+      console.error(e);
       message.warning(formatMessage({
         id: 'luckda.lowcode.error.pagedata',
         label: '页面数据错误'
@@ -212,35 +205,6 @@ var DesignToolbar = function DesignToolbar(_ref) {
     type: "mobile"
   })), /*#__PURE__*/React.createElement(Divider, {
     type: "vertical"
-  }), /*#__PURE__*/React.createElement("span", {
-    className: classNames(styles['toolbar-item'], _defineProperty({}, styles.disabled, backLength < 1)),
-    onClick: function onClick() {
-      return backLength > 0 && back();
-    }
-  }, /*#__PURE__*/React.createElement("svg", {
-    viewBox: "0 0 1024 1024",
-    width: "20",
-    height: "20",
-    fill: "currentColor",
-    style: {
-      transform: 'rotateY(180deg)'
-    }
-  }, /*#__PURE__*/React.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.createElement("span", {
-    className: classNames(styles['toolbar-item'], _defineProperty({}, styles.disabled, forwardLength < 1)),
-    onClick: function onClick() {
-      return forwardLength > 0 && forward();
-    }
-  }, /*#__PURE__*/React.createElement("svg", {
-    viewBox: "0 0 1024 1024",
-    width: "20",
-    height: "20",
-    fill: "currentColor"
-  }, /*#__PURE__*/React.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.createElement(Divider, {
-    type: "vertical"
   }), /*#__PURE__*/React.createElement("span", {
     style: {
       width: 'auto',
@@ -312,15 +276,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.createElement(JsonEditor, {
-    ref: editorRef
+    ref: editorRef,
+    style: {
+      height: '70vh'
+    }
   }, JSON.stringify(pageData, null, '\t'))), /*#__PURE__*/React.createElement(Drawer, {
     title: /*#__PURE__*/React.createElement("div", {
       id: "preview-drawer-header",
@@ -393,7 +357,8 @@ var DesignToolbar = function DesignToolbar(_ref) {
     }
   }, /*#__PURE__*/React.createElement(Preview, {
     code: location.query.code,
-    userId: userId || 'no-user'
+    userId: userId || 'no-user',
+    debug: true
   })));
 };
 export default DesignToolbar;

package/es/lowcode/painter/Outline.js

@@ -9,7 +9,7 @@ import { uniq, split, reduce } from 'lodash';
 import classNames from 'classnames';
 import { Card, Tree, Icon } from 'luck-design/antd';
 import { formatMessage } from '@luck-design-biz/base/utils';
-import { useContext, usePageData } from "../engine/provider/ContextProvider";
+import { useContext, useGet } from "../engine/provider/ContextProvider";
 import { LC_BUILDIN_UNIT_KEY, LC_BUILDIN_UNIT_KEY_LIST } from "../constants";
 import { getPathById } from "../engine/tools/dataProcess";
 import styles from "./style/outline.less";
@@ -19,9 +19,7 @@ var Outline = function Outline(_ref) {
   var open = _ref.open;
   var clickBySelf = useRef(false);
   var ctx = useContext();
-  var _usePageData = usePageData(),
-    _usePageData2 = _slicedToArray(_usePageData, 1),
-    pageData = _usePageData2[0];
+  var pageData = useGet();
   var _useState = useState(null),
     _useState2 = _slicedToArray(_useState, 2),
     pageAndModal = _useState2[0],

package/es/lowcode/painter/Panel.js

@@ -7,11 +7,10 @@ import { Breadcrumb } from 'luck-design/antd';
 import classNames from 'classnames';
 import { takeRight, isNil, reduce, get, set } from 'lodash';
 import { formatMessage } from '@luck-design-biz/base/utils';
-import { useContext, usePageData } from "../engine/provider/ContextProvider";
+import { useContext, useTask, addNode, deleteNode } from "../engine/provider/ContextProvider";
 import AttrsPanel from "./components/AttrsPanel";
 import StylePanel from "./panel-section/StylePanel";
 import AdvancePanel from "./components/AdvancePanel";
-import { modifyById, add, deleteById } from "../engine/tools/dataProcess";
 import styles from "./style/panel.less";
 import { LC_BUILDIN_UNIT_KEY } from "../constants";
 var _I18N_PREFIX_ = 'luckda.lowcode.painter.panel';
@@ -46,10 +45,7 @@ var Panel = function Panel() {
     activeTabKey = _useState4[0],
     setActiveTabKey = _useState4[1];
   var context = useContext();
-  var _usePageData = usePageData(),
-    _usePageData2 = _slicedToArray(_usePageData, 2),
-    pageData = _usePageData2[0],
-    setPageData = _usePageData2[1].setPageData;
+  var task = useTask('modify');
   var meta = useCreation(function () {
     try {
       return isNil(activeNode) ? null : require("../engine/meta/".concat(activeNode.node.component.toLowerCase(), ".props.json"));
@@ -57,38 +53,41 @@ var Panel = function Panel() {
       return null;
     }
   }, [activeNode]);
-  var handleChange = useMemoizedFn(function (field, value, repositioning) {
+  var handleChange = 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");
-        add(pageData, LC_BUILDIN_UNIT_KEY.PAGE_ROOT, LC_BUILDIN_UNIT_KEY.PAGE_HEADER, _objectSpread(_objectSpread({}, headerMeta), {}, {
+        addNode(LC_BUILDIN_UNIT_KEY.PAGE_ROOT, LC_BUILDIN_UNIT_KEY.PAGE_HEADER, _objectSpread(_objectSpread({}, headerMeta), {}, {
           buildIn: true
         }));
       } else {
-        deleteById(pageData, LC_BUILDIN_UNIT_KEY.PAGE_HEADER);
+        deleteNode(LC_BUILDIN_UNIT_KEY.PAGE_HEADER);
       }
     } else if (field === 'enableFooter') {
       if (value) {
         var footerMeta = require("../engine/meta/pagefooter.props.default.json");
-        add(pageData, LC_BUILDIN_UNIT_KEY.PAGE_ROOT, LC_BUILDIN_UNIT_KEY.PAGE_FOOTER, _objectSpread(_objectSpread({}, footerMeta), {}, {
+        addNode(LC_BUILDIN_UNIT_KEY.PAGE_ROOT, LC_BUILDIN_UNIT_KEY.PAGE_FOOTER, _objectSpread(_objectSpread({}, footerMeta), {}, {
           buildIn: true
         }));
       } else {
-        deleteById(pageData, LC_BUILDIN_UNIT_KEY.PAGE_FOOTER);
+        deleteNode(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 = _defineProperty({}, field, get(node.props, field));
-    var newNodeData = set(node.props, field, value);
-    modifyById(pageData, activeNode.node.id, newNodeData);
-    setPageData(pageData).then(function (newData) {
+    var newValue = _defineProperty({}, 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: _defineProperty({}, field, value)
+        newValue: newValue
       });
       if (repositioning) context.$publisher(context.topics.COMPONENT_REPOSITIONING, {
         id: activeNode.node.id
@@ -103,8 +102,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 = takeRight(component.api.getLevelNodes(), 4);
       setActiveNode({
         node: node.props,
@@ -127,9 +125,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.createElement(Breadcrumb.Item, {
       key: id,
       className: classNames(_defineProperty({}, styles['active-node-level'], id !== activeNode.node.id)),
@@ -176,19 +174,22 @@ var Panel = function Panel() {
     ref: underLineRef,
     className: styles.underline
   })), activeTabKey === _TAB_LIST_[0].key && /*#__PURE__*/React.createElement(AttrsPanel, {
+    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.createElement(StylePanel, {
-    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.createElement(AdvancePanel, {
+    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/es/lowcode/painter/components/ActionBindModal.js

@@ -1,16 +1,14 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React, { useRef, useState } from 'react';
-import { useMemoizedFn, useLatest, useCreation, useMap, useUpdateEffect } from 'ahooks';
+import { useMemoizedFn, useLatest, useCreation, useMap, useUpdateEffect, useDebounceFn } from 'ahooks';
 import { Modal, Icon, Input, Checkbox, Tooltip } from 'luck-design/antd';
 import classNames from 'classnames';
-import { debounce, reduce } from 'lodash';
+import { reduce } from 'lodash';
 import { formatMessage } from '@luck-design-biz/base/utils';
 import { useRemoteSource } from "../../engine/provider/ContextProvider";
 import { useContext } from "../../engine/provider/ContextProvider";
 import JSEditor from "./code-editor/JSEditor";
-import JsonEditor from "./code-editor/JsonEditor";
 import styles from "../style/action-bind-modal.less";
 var _I18N_PREFIX_ = 'luckda.lowcode.painter.actionBindModal';
 var _ACTION_CATEGORY_ = [{
@@ -32,7 +30,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,
@@ -82,7 +80,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;
       }, []);
@@ -100,27 +98,28 @@ var ActionBindModal = function ActionBindModal(_ref) {
   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]);
   useUpdateEffect(function () {
     setAll(event === null || event === void 0 ? void 0 : event.actionPool);
   }, [event]);
-  var handleEditorValueChange = useRef(debounce(function (code) {
-    if (latestActiveKey.current) {
-      var action = get(latestActiveKey.current);
-      action.code = code;
-    }
-  }, 400));
+  var _useDebounceFn = useDebounceFn(function (code) {
+      if (latestActiveKey.current) {
+        var action = get(latestActiveKey.current);
+        action.code = code;
+      }
+    }, {
+      wait: 500
+    }),
+    handleEditorValueChange = _useDebounceFn.run;
   var handleOptionClick = useMemoizedFn(function (key) {
     setActiveKey(key);
     var action;
     if (actionPool.has(key)) {
       action = get(key);
     } else {
-      var code = category === 'custom' ? event.func || defaultCode : JSON.stringify(_objectSpread({
-        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,
@@ -134,9 +133,7 @@ var ActionBindModal = function ActionBindModal(_ref) {
       if (activeKey !== key) {
         setActiveKey(key);
       }
-      var code = category === 'custom' ? event.func || defaultCode : JSON.stringify(_objectSpread({
-        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,
@@ -168,7 +165,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() {
@@ -196,7 +193,16 @@ var ActionBindModal = function ActionBindModal(_ref) {
       className: classNames(_defineProperty({}, styles.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.createElement(Icon, {
       type: "check",
@@ -271,9 +277,9 @@ var ActionBindModal = function ActionBindModal(_ref) {
     type: "exclamation-circle"
   }))), /*#__PURE__*/React.createElement("div", {
     className: styles['code-box']
-  }, activeKey ? /*#__PURE__*/React.createElement(JsonEditor, {
+  }, activeKey ? /*#__PURE__*/React.createElement(JSEditor, {
     ref: editorRef,
-    onChange: handleEditorValueChange.current
+    onChange: handleEditorValueChange
   }) : formatMessage({
     id: "".concat(_I18N_PREFIX_, ".noActionSelected"),
     label: '请在右侧选择行为项'
@@ -284,7 +290,7 @@ var ActionBindModal = function ActionBindModal(_ref) {
     className: styles['code-box']
   }, activeKey ? /*#__PURE__*/React.createElement(JSEditor, {
     ref: editorRef,
-    onChange: handleEditorValueChange.current
+    onChange: handleEditorValueChange
   }) : formatMessage({
     id: "".concat(_I18N_PREFIX_, ".noActionSelected"),
     label: '请在右侧选择行为项'

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

@@ -9,6 +9,7 @@ import { useCreation, useMemoizedFn } from 'ahooks';
 import { Menu, Dropdown, Button, Tooltip, Icon } from 'luck-design/antd';
 import styled from 'styled-components';
 import { keyBy, keys, omit } from 'lodash';
+import { useGet } from "../../engine/provider/ContextProvider";
 import { formatMessage } from '@luck-design-biz/base/utils';
 import Collapse from "./Collapse";
 import ActionBindModal from "./ActionBindModal";
@@ -19,8 +20,12 @@ var EventItem = styled.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 = useGet({
+    id: nodeId,
+    path: 'props.advance'
+  });
   var _useState = useState((value === null || value === void 0 ? void 0 : value.events) || {}),
     _useState2 = _slicedToArray(_useState, 2),
     events = _useState2[0],