@luck-design-biz/luckda 1.0.2-2 → 1.0.2-20

package/lib/lowcode/painter/History.js

@@ -0,0 +1,308 @@
+"use strict";
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _react = _interopRequireWildcard(require("react"));
+var _ahooks = require("ahooks");
+var _antd = require("luck-design/antd");
+var _luckDesign = require("luck-design");
+var _moment = _interopRequireDefault(require("moment"));
+var _lodash = require("lodash");
+var _base = require("@luck-design-biz/base");
+var _ContextProvider = require("../engine/provider/ContextProvider");
+var _TipIcon = _interopRequireDefault(require("./components/TipIcon"));
+var _DiffEditor = _interopRequireDefault(require("./components/code-editor/DiffEditor"));
+var _utils = require("@luck-design-biz/base/utils");
+var _helper = require("../engine/tools/helper");
+var _dataProcess = require("../engine/tools/dataProcess");
+var _history = _interopRequireDefault(require("./style/history.less"));
+var _apiUrl = require("../constants/api-url");
+var History = function History(_ref) {
+  var form = _ref.form;
+  var ref = (0, _react.useRef)();
+  var editorRef = (0, _react.useRef)();
+  var versionListRef = (0, _react.useRef)(null);
+  var ctx = (0, _ContextProvider.useContext)();
+  var _useState = (0, _react.useState)([]),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    versionList = _useState2[0],
+    setVersionList = _useState2[1];
+  var _useState3 = (0, _react.useState)(null),
+    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+    version = _useState4[0],
+    setVersion = _useState4[1];
+  var _useState5 = (0, _react.useState)(false),
+    _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
+    visible = _useState6[0],
+    setVisible = _useState6[1];
+  var _useInViewport = (0, _ahooks.useInViewport)(ref),
+    _useInViewport2 = (0, _slicedToArray2.default)(_useInViewport, 1),
+    inViewport = _useInViewport2[0];
+  var pageData = (0, _ContextProvider.useGet)();
+  var _useRequest = (0, _ahooks.useRequest)(_apiUrl.fetchHistoryVersionList, {
+      manual: true,
+      onSuccess: function onSuccess(_ref2) {
+        var code = _ref2.code,
+          list = _ref2.list,
+          detail = _ref2.detail;
+        if (code === 1) {
+          versionListRef.current = list.map(function (id) {
+            return detail[id];
+          });
+          setVersionList(versionListRef.current);
+        }
+      }
+    }),
+    loading = _useRequest.loading,
+    runFetchHistoryVersionList = _useRequest.run;
+  var _useRequest2 = (0, _ahooks.useRequest)(_apiUrl.fetchAddHistoryVersion, {
+      manual: true,
+      onSuccess: function onSuccess(_ref3) {
+        var code = _ref3.code;
+        if (code === 1) {
+          setVisible(false);
+          runFetchHistoryVersionList({
+            pageCode: (0, _helper.getLDMetaAttr)('pageCode')
+          });
+        }
+      }
+    }),
+    addLoading = _useRequest2.loading,
+    runFetchAddHistoryVersion = _useRequest2.run;
+  var _useRequest3 = (0, _ahooks.useRequest)(_apiUrl.fetchDelHistoryVersion, {
+      manual: true,
+      onSuccess: function onSuccess(_ref4) {
+        var code = _ref4.code;
+        if (code === 1) {
+          runFetchHistoryVersionList({
+            pageCode: (0, _helper.getLDMetaAttr)('pageCode')
+          });
+        }
+      }
+    }),
+    deleteLoading = _useRequest3.loading,
+    runFetchDelHistoryVersion = _useRequest3.run;
+  var _useRequest4 = (0, _ahooks.useRequest)(_apiUrl.fetchRecoverHistoryVersion, {
+      manual: true,
+      onSuccess: function onSuccess(_ref5) {
+        var code = _ref5.code;
+        return code === 1 && window.location.reload();
+      }
+    }),
+    runFetchRecoverHistoryVersion = _useRequest4.run;
+  var handleSearch = (0, _ahooks.useMemoizedFn)(function (value) {
+    if ((0, _lodash.isNil)(value)) {
+      setVersionList(versionListRef.current);
+    } else {
+      setVersionList(versionListRef.current.filter(function (item) {
+        return JSON.stringify(item).includes(value);
+      }));
+    }
+  });
+  var handleAddVersion = (0, _ahooks.useMemoizedFn)(function () {
+    form.validateFields(function (err, values) {
+      if (!err) {
+        runFetchAddHistoryVersion({
+          pageCode: (0, _helper.getLDMetaAttr)('pageCode'),
+          backupName: values.title,
+          backupNote: values.note
+        });
+      }
+    });
+  });
+  var handleDeleteVersion = (0, _ahooks.useMemoizedFn)(function (item) {
+    (0, _base.recheck)({
+      title: "".concat((0, _utils.formatMessage)({
+        id: 'luckda.lowcode.version.delete',
+        label: '你确定要删除该历史版本吗？'
+      })),
+      checkWords: "".concat(item.backupName, "(").concat(item.backupUserName, ")"),
+      cancelText: (0, _utils.formatMessage)({
+        id: 'app.base.operate.cancel'
+      }),
+      okText: (0, _utils.formatMessage)({
+        id: 'app.base.operate.ok'
+      }),
+      onOk: function onOk() {
+        runFetchDelHistoryVersion({
+          uid: item.id
+        });
+      }
+    });
+  });
+  var handleRecoverVersion = (0, _ahooks.useMemoizedFn)(function () {
+    (0, _base.recheck)({
+      title: "".concat((0, _utils.formatMessage)({
+        id: 'luckda.lowcode.version.confirm.recover',
+        label: '你确定要还原到该历史版本吗？'
+      })),
+      checkWords: "".concat(version.backupName, "(").concat(version.backupUserName, ")"),
+      cancelText: (0, _utils.formatMessage)({
+        id: 'app.base.operate.cancel'
+      }),
+      okText: (0, _utils.formatMessage)({
+        id: 'luckda.lowcode.version.recover',
+        label: '还原版本'
+      }),
+      onOk: function onOk() {
+        return runFetchRecoverHistoryVersion({
+          uid: version.id
+        });
+      }
+    });
+  });
+  var handleUseVersion = (0, _ahooks.useMemoizedFn)(function () {
+    var code = editorRef.current.getModel().modified.getValue();
+    try {
+      var data = JSON.parse(code);
+      (0, _ContextProvider.resetPageData)(data);
+      setVersion(null);
+    } catch (e) {
+      console.error(e);
+      message.warning((0, _utils.formatMessage)({
+        id: 'luckda.lowcode.error.pagedata',
+        label: '页面数据错误'
+      }));
+    }
+  });
+  (0, _react.useEffect)(function () {
+    if (inViewport) {
+      runFetchHistoryVersionList({
+        pageCode: (0, _helper.getLDMetaAttr)('pageCode')
+      });
+    }
+  }, [inViewport]);
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
+    ref: ref,
+    className: _history.default['lc-painter-history']
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    className: _history.default.historyToolbar
+  }, /*#__PURE__*/_react.default.createElement(_antd.Input.Search, {
+    placeholder: (0, _utils.formatMessage)({
+      id: 'luckda.lowcode.version.placeholder.search',
+      label: '请输入查询内容'
+    }),
+    size: "small",
+    onSearch: handleSearch
+  }), /*#__PURE__*/_react.default.createElement(_antd.Button, {
+    type: "primary",
+    icon: "plus",
+    size: "small",
+    style: {
+      marginLeft: '8px',
+      flexShrink: 0
+    },
+    onClick: function onClick() {
+      return setVisible(true);
+    }
+  })), /*#__PURE__*/_react.default.createElement(_antd.Spin, {
+    spinning: loading || deleteLoading
+  }, /*#__PURE__*/_react.default.createElement(_antd.Timeline, null, versionList.map(function (item) {
+    return /*#__PURE__*/_react.default.createElement(_antd.Timeline.Item, {
+      className: _history.default.timelineItem
+    }, /*#__PURE__*/_react.default.createElement("div", {
+      className: _history.default.timelineItemHeader
+    }, /*#__PURE__*/_react.default.createElement("div", null, item.backupName), /*#__PURE__*/_react.default.createElement("div", {
+      className: _history.default.timelineItemActions
+    }, /*#__PURE__*/_react.default.createElement(_TipIcon.default, {
+      title: (0, _utils.formatMessage)({
+        id: 'app.base.operate.delete',
+        label: '删除'
+      }),
+      type: "delete",
+      style: {
+        color: 'var(--luck-color-danger)',
+        marginRight: 8
+      },
+      onClick: function onClick() {
+        return handleDeleteVersion(item);
+      }
+    }), /*#__PURE__*/_react.default.createElement(_TipIcon.default, {
+      title: (0, _utils.formatMessage)({
+        id: 'luckda.lowcode.version.diff',
+        label: '差异比对'
+      }),
+      type: "swap",
+      onClick: function onClick() {
+        ctx.$publisher(ctx.topics.COMPONENT_ACTIVE, null);
+        setVersion(item);
+      }
+    }))), /*#__PURE__*/_react.default.createElement("div", {
+      className: _history.default.timelineItemUser
+    }, /*#__PURE__*/_react.default.createElement(_antd.Avatar, {
+      style: {
+        backgroundColor: 'var(--luck-ant-colorful-primary)',
+        verticalAlign: 'middle',
+        marginRight: '8px'
+      }
+    }, item.backupUserName.slice(-1)), item.backupUserName), /*#__PURE__*/_react.default.createElement("div", {
+      className: _history.default.timelineItemTime
+    }, (0, _moment.default)(item.backupTime).fromNow()));
+  })))), /*#__PURE__*/_react.default.createElement(_luckDesign.LuckModal, {
+    title: "".concat(version === null || version === void 0 ? void 0 : version.backupName, "(").concat(version === null || version === void 0 ? void 0 : version.backupUserName, ") \u21CB \u5F53\u524D\u7248\u672C"),
+    width: "80vw",
+    height: "80vh",
+    visible: !(0, _lodash.isNil)(version),
+    fullScreen: true,
+    getContainer: function getContainer() {
+      return document.getElementById('lc-design-workspace');
+    },
+    okText: (0, _utils.formatMessage)({
+      id: 'luckda.lowcode.version.recover',
+      label: '还原版本'
+    }),
+    cancelText: (0, _utils.formatMessage)({
+      id: 'luckda.lowcode.version.use',
+      label: '使用'
+    }),
+    cancelButtonProps: {
+      onClick: handleUseVersion
+    },
+    onOk: handleRecoverVersion,
+    onClose: function onClose() {
+      return setVersion(null);
+    }
+  }, /*#__PURE__*/_react.default.createElement(_DiffEditor.default, {
+    ref: editorRef,
+    language: "json",
+    originalCode: version ? JSON.stringify((0, _dataProcess.decompress)(version === null || version === void 0 ? void 0 : version.pageData), null, '\t') : '',
+    modifiedCode: JSON.stringify(pageData, null, '\t')
+  })), /*#__PURE__*/_react.default.createElement(_luckDesign.LuckModal, {
+    title: (0, _utils.formatMessage)({
+      id: 'luckda.lowcode.version.add',
+      label: '添加到历史版本'
+    }),
+    size: "small",
+    visible: visible,
+    okButtonProps: {
+      loading: addLoading
+    },
+    onOk: handleAddVersion,
+    onClose: function onClose() {
+      return setVisible(false);
+    }
+  }, /*#__PURE__*/_react.default.createElement(_antd.Form, null, /*#__PURE__*/_react.default.createElement(_antd.Form.Item, null, form.getFieldDecorator('title', {
+    rules: [{
+      required: true
+    }]
+  })( /*#__PURE__*/_react.default.createElement(_antd.Input, {
+    placeholder: (0, _utils.formatMessage)({
+      id: 'luckda.lowcode.version.placeholder.title',
+      label: '请输入版本标题'
+    })
+  }))), /*#__PURE__*/_react.default.createElement(_antd.Form.Item, null, form.getFieldDecorator('note')( /*#__PURE__*/_react.default.createElement(_antd.Input.TextArea, {
+    rows: 6,
+    placeholder: (0, _utils.formatMessage)({
+      id: 'luckda.lowcode.version.placeholder.note',
+      label: '请输入版本描述'
+    })
+  }))))));
+};
+var _default = exports.default = _antd.Form.create({
+  name: 'version_form'
+})(History);

package/lib/lowcode/painter/Panel.js

@@ -117,7 +117,7 @@ var Panel = function Panel() {
         oldValue: oldValue,
         newValue: newValue
       });
-      if (repositioning) context.$publisher(context.topics.COMPONENT_REPOSITIONING, {
+      if (repositioning || field === 'css') context.$publisher(context.topics.COMPONENT_REPOSITIONING, {
         id: _id
       });
     });

package/lib/lowcode/painter/Ribbon.js

@@ -15,6 +15,7 @@ var _antd = require("luck-design/antd");
 var _Outline = _interopRequireDefault(require("./Outline"));
 var _Components = _interopRequireDefault(require("./Components"));
 var _I18n = _interopRequireDefault(require("./I18n"));
+var _History = _interopRequireDefault(require("./History"));
 var _utils = require("@luck-design-biz/base/utils");
 var _expect = _interopRequireDefault(require("./expect"));
 var _ribbon = _interopRequireDefault(require("./style/ribbon.less"));
@@ -55,6 +56,12 @@ var _DRAWER_I18N_ = {
   title: '多语言文案管理',
   fix: false
 };
+var _DRAWER_HISTORY_ = {
+  width: 240,
+  key: 'history',
+  title: '版本历史',
+  fix: false
+};
 var Ribbon = function Ribbon() {
   var _useState = (0, _react.useState)(null),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -114,6 +121,21 @@ var Ribbon = function Ribbon() {
     onClick: function onClick() {
       return setDrawer((drawer === null || drawer === void 0 ? void 0 : drawer.key) === _DRAWER_I18N_.key ? null : _DRAWER_I18N_);
     }
+  })), /*#__PURE__*/_react.default.createElement(_antd.Tooltip, {
+    placement: "right",
+    title: (0, _utils.formatMessage)({
+      id: 'luckda.lowcode.history',
+      label: _DRAWER_HISTORY_.title
+    })
+  }, /*#__PURE__*/_react.default.createElement(_antd.Icon, {
+    type: "history",
+    style: {
+      color: (drawer === null || drawer === void 0 ? void 0 : drawer.key) === _DRAWER_HISTORY_.key && '#1d79f2',
+      fontSize: 20
+    },
+    onClick: function onClick() {
+      return setDrawer((drawer === null || drawer === void 0 ? void 0 : drawer.key) === _DRAWER_HISTORY_.key ? null : _DRAWER_HISTORY_);
+    }
   }))), /*#__PURE__*/_react.default.createElement(_antd.Drawer, (0, _extends2.default)({
     title: drawer ? (0, _utils.formatMessage)({
       id: "luckda.lowcode.".concat(drawer.key),
@@ -158,6 +180,20 @@ var Ribbon = function Ribbon() {
     style: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _DRAWER_PROPS.style), {}, {
       display: (drawer === null || drawer === void 0 ? void 0 : drawer.key) === _DRAWER_I18N_.key ? 'block' : 'none'
     })
-  }), /*#__PURE__*/_react.default.createElement(_expect.default, null)));
+  }), /*#__PURE__*/_react.default.createElement(_expect.default, null)), /*#__PURE__*/_react.default.createElement(_antd.Drawer, (0, _extends2.default)({
+    title: drawer ? (0, _utils.formatMessage)({
+      id: "luckda.lowcode.".concat(drawer.key),
+      label: drawer.title
+    }) : '',
+    width: (drawer === null || drawer === void 0 ? void 0 : drawer.width) || 0,
+    visible: (drawer === null || drawer === void 0 ? void 0 : drawer.key) === _DRAWER_HISTORY_.key,
+    onClose: function onClose() {
+      return setDrawer(null);
+    }
+  }, _DRAWER_PROPS, {
+    style: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _DRAWER_PROPS.style), {}, {
+      display: (drawer === null || drawer === void 0 ? void 0 : drawer.key) === _DRAWER_HISTORY_.key ? 'block' : 'none'
+    })
+  }), /*#__PURE__*/_react.default.createElement(_History.default, null)));
 };
 var _default = exports.default = Ribbon;

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
@@ -18,27 +19,26 @@ var _lodash = require("lodash");
 var _ContextProvider = require("../../engine/provider/ContextProvider");
 var _utils = require("@luck-design-biz/base/utils");
 var _Collapse = _interopRequireDefault(require("./Collapse"));
-var _PopConfirm = _interopRequireDefault(require("./PopConfirm"));
-var _FullScreenEditor = _interopRequireDefault(require("./code-editor/FullScreenEditor"));
-var _JSEditor = _interopRequireDefault(require("./code-editor/JSEditor"));
-var _ActionBindModal = _interopRequireDefault(require("./ActionBindModal"));
+var _JSEditor = _interopRequireDefault(require("../panel-section/JSEditor"));
 var _constants = require("../../constants");
 var _excluded = ["events"],
   _excluded2 = ["events"],
   _excluded3 = ["render"],
-  _excluded4 = ["render"];
+  _excluded4 = ["render"],
+  _excluded5 = ["render"];
 var _I18N_PREFIX_ = 'luckda.lowcode.painter.advancePanel';
 var EventItem = _styledComponents.default.div.withConfig({
   displayName: "EventItem",
   componentId: "luckda-6530__sc-6426fo-0"
-})(["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;}"]);
+})(["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:var(--ant-text-color);cursor:pointer;}i:not(:last-child){margin-right:6px;}"]);
 var _DEFAULT_FUNC_ = 'function isTrue() {\n return true; \n}';
 var AdvancePanel = function AdvancePanel(_ref) {
-  var _value$render, _value$render2;
+  var _value$render4, _Map$get;
   var meta = _ref.meta,
     nodeId = _ref.nodeId,
     target = _ref.target,
     onChange = _ref.onChange;
+  var jseditorTrigger = (0, _react.useRef)(null);
   var value = (0, _ContextProvider.useGet)((0, _lodash.isNil)(target) ? {
     id: nodeId,
     path: 'props.advance'
@@ -46,7 +46,6 @@ var AdvancePanel = function AdvancePanel(_ref) {
     id: target.ancestorId,
     path: "props.".concat(target.keyPath, ".advance")
   });
-  var editorRef = (0, _react.useRef)();
   var _useState = (0, _react.useState)((value === null || value === void 0 ? void 0 : value.events) || {}),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     events = _useState2[0],
@@ -59,15 +58,12 @@ var AdvancePanel = function AdvancePanel(_ref) {
     var _meta$advance;
     return (0, _lodash.keyBy)((meta === null || meta === void 0 || (_meta$advance = meta.advance) === null || _meta$advance === void 0 ? void 0 : _meta$advance.events) || [], 'key');
   }, [meta]);
-  var _useState5 = (0, _react.useState)((value === null || value === void 0 || (_value$render = value.render) === null || _value$render === void 0 ? void 0 : _value$render.code) || _DEFAULT_FUNC_),
-    _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
-    editorValue = _useState6[0],
-    setEditorValue = _useState6[1];
   var handleEventClick = (0, _ahooks.useMemoizedFn)(function (e) {
     var payload = e.item.props.payload;
     setEvent((0, _objectSpread3.default)((0, _objectSpread3.default)({}, payload), {}, {
       actionPool: null
     }));
+    jseditorTrigger.current.show();
   });
   var handleDeleteEvent = (0, _ahooks.useMemoizedFn)(function (ek) {
     var _ref2 = value || {},
@@ -79,32 +75,46 @@ var AdvancePanel = function AdvancePanel(_ref) {
       events: _events
     }));
   });
-  var handleComfirm = (0, _ahooks.useMemoizedFn)(function (actionPool) {
+  var handleComfirm = (0, _ahooks.useMemoizedFn)(function (_code) {
     var _ref3 = value || {},
       events = _ref3.events,
       rest = (0, _objectWithoutProperties2.default)(_ref3, _excluded2);
-    var _events = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, events), {}, (0, _defineProperty2.default)({}, event.key, actionPool));
+    var _events = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, events), {}, (0, _defineProperty2.default)({}, event.key, [['coding', {
+      category: 'custom',
+      key: 'coding',
+      code: _code
+    }]]));
     setEvents(_events);
+    setEvent(null);
     onChange((0, _objectSpread3.default)((0, _objectSpread3.default)({}, rest), {}, {
       events: _events
     }));
   });
-  var handleRenderComfirm = (0, _ahooks.useMemoizedFn)(function () {
-    var val = editorRef.current.editor.getValue();
+  var handleRenderComfirm = (0, _ahooks.useMemoizedFn)(function (_code) {
     var _ref4 = value || {},
       render = _ref4.render,
       rest = (0, _objectWithoutProperties2.default)(_ref4, _excluded3);
     onChange((0, _objectSpread3.default)((0, _objectSpread3.default)({}, rest), {}, {
       render: {
         value: (0, _lodash.isNil)(render === null || render === void 0 ? void 0 : render.value) ? true : render.value,
-        code: val
+        code: _code
       }
     }));
   });
-  var handleRenderChange = (0, _ahooks.useMemoizedFn)(function (checked) {
+  var handleRenderClear = (0, _ahooks.useMemoizedFn)(function (_code) {
     var _ref5 = value || {},
       render = _ref5.render,
       rest = (0, _objectWithoutProperties2.default)(_ref5, _excluded4);
+    onChange((0, _objectSpread3.default)((0, _objectSpread3.default)({}, rest), {}, {
+      render: {
+        value: (0, _lodash.isNil)(render === null || render === void 0 ? void 0 : render.value) ? true : render.value
+      }
+    }));
+  });
+  var handleRenderChange = (0, _ahooks.useMemoizedFn)(function (checked) {
+    var _ref6 = value || {},
+      render = _ref6.render,
+      rest = (0, _objectWithoutProperties2.default)(_ref6, _excluded5);
     onChange((0, _objectSpread3.default)((0, _objectSpread3.default)({}, rest), {}, {
       render: {
         value: checked,
@@ -112,9 +122,6 @@ var AdvancePanel = function AdvancePanel(_ref) {
       }
     }));
   });
-  var handleEditorLayoutChange = function handleEditorLayoutChange(code) {
-    setEditorValue(code);
-  };
   var eventsMenu = (0, _ahooks.useCreation)(function () {
     var _meta$advance2;
     return /*#__PURE__*/_react.default.createElement(_antd.Menu, {
@@ -122,14 +129,14 @@ var AdvancePanel = function AdvancePanel(_ref) {
       style: {
         fontSize: 12
       }
-    }, (0, _lodash.reduce)((_meta$advance2 = meta.advance) === null || _meta$advance2 === void 0 ? void 0 : _meta$advance2.events, function (ret, event) {
+    }, (0, _lodash.reduce)((_meta$advance2 = meta.advance) === null || _meta$advance2 === void 0 ? void 0 : _meta$advance2.events, function (ret, e) {
       var _value$events;
-      if (!(value !== null && value !== void 0 && (_value$events = value.events) !== null && _value$events !== void 0 && _value$events[event.key])) {
+      if (!(value !== null && value !== void 0 && (_value$events = value.events) !== null && _value$events !== void 0 && _value$events[e.key])) {
         ret.push( /*#__PURE__*/_react.default.createElement(_antd.Menu.Item, {
-          key: event.key,
-          payload: event
+          key: e.key,
+          payload: e
         }, /*#__PURE__*/_react.default.createElement(_antd.Tooltip, {
-          title: event.desc || event.name,
+          title: e.desc || e.name,
           placement: "left",
           getPopupContainer: function getPopupContainer() {
             return document.getElementById('lc-design-workspace');
@@ -139,7 +146,7 @@ var AdvancePanel = function AdvancePanel(_ref) {
             width: '100%',
             fontSize: 12
           }
-        }, event.name))));
+        }, e.name))));
       }
       return ret;
     }, []));
@@ -155,23 +162,21 @@ var AdvancePanel = function AdvancePanel(_ref) {
     },
     suppressIcon: true,
     extraRender: function extraRender() {
-      return /*#__PURE__*/_react.default.createElement(_PopConfirm.default, {
-        placement: "left",
-        title: /*#__PURE__*/_react.default.createElement(_FullScreenEditor.default, {
-          ref: editorRef,
-          EditorComponent: _JSEditor.default,
-          onLayoutChange: handleEditorLayoutChange,
-          width: "600px",
-          height: "400px"
-        }, editorValue),
-        showBtn: true,
-        onConfirm: handleRenderComfirm
-      }, /*#__PURE__*/_react.default.createElement(_antd.Icon, {
+      var _value$render, _value$render2, _value$render3;
+      return /*#__PURE__*/_react.default.createElement(_JSEditor.default, {
+        defaultCode: (value === null || value === void 0 || (_value$render = value.render) === null || _value$render === void 0 ? void 0 : _value$render.code) || _DEFAULT_FUNC_,
+        onChange: handleRenderComfirm,
+        onClear: handleRenderClear
+      }, /*#__PURE__*/_react.default.createElement(_antd.Badge, (0, _extends2.default)({
+        dot: value === null || value === void 0 || (_value$render2 = value.render) === null || _value$render2 === void 0 ? void 0 : _value$render2.code
+      }, value !== null && value !== void 0 && (_value$render3 = value.render) !== null && _value$render3 !== void 0 && _value$render3.code ? {
+        color: "lime"
+      } : {}), /*#__PURE__*/_react.default.createElement(_antd.Icon, {
         type: "code"
-      }));
+      })));
     }
   }, /*#__PURE__*/_react.default.createElement(_antd.Switch, {
-    checked: (0, _lodash.isNil)(value === null || value === void 0 || (_value$render2 = value.render) === null || _value$render2 === void 0 ? void 0 : _value$render2.value) ? true : value.render.value,
+    checked: (0, _lodash.isNil)(value === null || value === void 0 || (_value$render4 = value.render) === null || _value$render4 === void 0 ? void 0 : _value$render4.value) ? true : value.render.value,
     onChange: handleRenderChange
   })), /*#__PURE__*/_react.default.createElement(_Collapse.default, {
     field: "events",
@@ -193,9 +198,10 @@ var AdvancePanel = function AdvancePanel(_ref) {
     }, /*#__PURE__*/_react.default.createElement(_antd.Icon, {
       type: "edit",
       onClick: function onClick() {
-        return setEvent((0, _objectSpread3.default)((0, _objectSpread3.default)({}, metaMap[ek]), {}, {
+        setEvent((0, _objectSpread3.default)((0, _objectSpread3.default)({}, metaMap[ek]), {}, {
           actionPool: events[ek]
         }));
+        jseditorTrigger.current.show();
       }
     })), /*#__PURE__*/_react.default.createElement(_antd.Tooltip, {
       title: (0, _utils.formatMessage)({
@@ -220,13 +226,11 @@ var AdvancePanel = function AdvancePanel(_ref) {
   }, (0, _utils.formatMessage)({
     id: "".concat(_I18N_PREFIX_, ".addEventAction"),
     label: '添加事件动作'
-  })))), /*#__PURE__*/_react.default.createElement(_ActionBindModal.default, {
-    nodeId: nodeId,
-    event: event,
-    onComfirm: handleComfirm,
-    onClose: function onClose() {
-      return setEvent(null);
-    }
+  })))), /*#__PURE__*/_react.default.createElement(_JSEditor.default, {
+    trigger: jseditorTrigger,
+    defaultCode: ((_Map$get = new Map(event === null || event === void 0 ? void 0 : event.actionPool).get('coding')) === null || _Map$get === void 0 ? void 0 : _Map$get.code) || (event === null || event === void 0 ? void 0 : event.func),
+    onChange: handleComfirm,
+    showClear: false
   }));
 };
 var _default = exports.default = AdvancePanel;

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

@@ -54,9 +54,16 @@ function _default(_ref) {
             break;
           case 'add':
             {
-              var compName = fromComp.component.toLowerCase();
-              var json = require("../../../engine/meta/".concat(compName, ".props.default.json"));
-              (0, _ContextProvider.moveNode)(null, id, actionSide, "".concat(compName, "_").concat((0, _utils.suid)()), json);
+              ctx.$subscriber(ctx.topics.COMPONENT_ACTIVE).once(function () {
+                var compName = fromComp.component.toLowerCase();
+                var json = require("../../../engine/meta/".concat(compName, ".props.default.json"));
+                ctx.$publisher(ctx.topics.COMPONENT_SETTING_CLICK, {
+                  data: json
+                });
+              }).watch();
+              ctx.$publisher(ctx.topics.COMPONENT_ACTIVE, {
+                target: id
+              });
             }
             break;
         }

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

@@ -9,15 +9,23 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireDefault(require("react"));
 var _antd = require("luck-design/antd");
-var _excluded = ["title", "type"];
+var _excluded = ["title", "type", "loading", "component"];
 var TipIcon = function TipIcon(_ref) {
   var title = _ref.title,
     type = _ref.type,
+    loading = _ref.loading,
+    component = _ref.component,
     rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   return /*#__PURE__*/_react.default.createElement(_antd.Tooltip, {
-    title: title
-  }, /*#__PURE__*/_react.default.createElement(_antd.Icon, (0, _extends2.default)({
-    type: type
+    title: title,
+    getPopupContainer: function getPopupContainer() {
+      return document.getElementById('lc-design-workspace');
+    }
+  }, loading ? /*#__PURE__*/_react.default.createElement(_antd.Icon, (0, _extends2.default)({
+    type: "loading"
+  }, rest)) : /*#__PURE__*/_react.default.createElement(_antd.Icon, (0, _extends2.default)({
+    type: type,
+    component: component
   }, rest)));
 };
 var _default = exports.default = TipIcon;