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

package/es/lowcode/painter/History.js

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

package/es/lowcode/painter/Panel.js

@@ -109,7 +109,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/es/lowcode/painter/Ribbon.js

@@ -7,6 +7,7 @@ import { Icon, Tooltip, Drawer } from 'luck-design/antd';
 import Outline from "./Outline";
 import Components from "./Components";
 import I18n from "./I18n";
+import History from "./History";
 import { formatMessage } from '@luck-design-biz/base/utils';
 import Expect from "./expect";
 import styles from "./style/ribbon.less";
@@ -47,6 +48,12 @@ var _DRAWER_I18N_ = {
   title: '多语言文案管理',
   fix: false
 };
+var _DRAWER_HISTORY_ = {
+  width: 240,
+  key: 'history',
+  title: '版本历史',
+  fix: false
+};
 var Ribbon = function Ribbon() {
   var _useState = useState(null),
     _useState2 = _slicedToArray(_useState, 2),
@@ -106,6 +113,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.createElement(Tooltip, {
+    placement: "right",
+    title: formatMessage({
+      id: 'luckda.lowcode.history',
+      label: _DRAWER_HISTORY_.title
+    })
+  }, /*#__PURE__*/React.createElement(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.createElement(Drawer, _extends({
     title: drawer ? formatMessage({
       id: "luckda.lowcode.".concat(drawer.key),
@@ -150,6 +172,20 @@ var Ribbon = function Ribbon() {
     style: _objectSpread(_objectSpread({}, _DRAWER_PROPS.style), {}, {
       display: (drawer === null || drawer === void 0 ? void 0 : drawer.key) === _DRAWER_I18N_.key ? 'block' : 'none'
     })
-  }), /*#__PURE__*/React.createElement(Expect, null)));
+  }), /*#__PURE__*/React.createElement(Expect, null)), /*#__PURE__*/React.createElement(Drawer, _extends({
+    title: drawer ? 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: _objectSpread(_objectSpread({}, _DRAWER_PROPS.style), {}, {
+      display: (drawer === null || drawer === void 0 ? void 0 : drawer.key) === _DRAWER_HISTORY_.key ? 'block' : 'none'
+    })
+  }), /*#__PURE__*/React.createElement(History, null)));
 };
 export default Ribbon;

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

@@ -1,3 +1,4 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
@@ -5,32 +6,31 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 var _excluded = ["events"],
   _excluded2 = ["events"],
   _excluded3 = ["render"],
-  _excluded4 = ["render"];
-import React, { useState, useRef, useCallback } from 'react';
+  _excluded4 = ["render"],
+  _excluded5 = ["render"];
+import React, { useRef, useState } from 'react';
 import { useCreation, useMemoizedFn } from 'ahooks';
-import { Menu, Dropdown, Button, Tooltip, Icon, Switch } from 'luck-design/antd';
+import { Menu, Dropdown, Button, Tooltip, Icon, Switch, Badge } from 'luck-design/antd';
 import styled from 'styled-components';
 import { isNil, keyBy, keys, omit, reduce } from 'lodash';
 import { useGet } from "../../engine/provider/ContextProvider";
 import { formatMessage } from '@luck-design-biz/base/utils';
 import Collapse from "./Collapse";
-import PopConfirm from "./PopConfirm";
-import FullScreenEditor from "./code-editor/FullScreenEditor";
-import JSEditor from "./code-editor/JSEditor";
-import ActionBindModal from "./ActionBindModal";
+import JSEditor from "../panel-section/JSEditor";
 import { LC_BUILDIN_UNIT_KEY_LIST } from "../../constants";
 var _I18N_PREFIX_ = 'luckda.lowcode.painter.advancePanel';
 var EventItem = styled.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 = useRef(null);
   var value = useGet(isNil(target) ? {
     id: nodeId,
     path: 'props.advance'
@@ -38,7 +38,6 @@ var AdvancePanel = function AdvancePanel(_ref) {
     id: target.ancestorId,
     path: "props.".concat(target.keyPath, ".advance")
   });
-  var editorRef = useRef();
   var _useState = useState((value === null || value === void 0 ? void 0 : value.events) || {}),
     _useState2 = _slicedToArray(_useState, 2),
     events = _useState2[0],
@@ -51,15 +50,12 @@ var AdvancePanel = function AdvancePanel(_ref) {
     var _meta$advance;
     return keyBy((meta === null || meta === void 0 || (_meta$advance = meta.advance) === null || _meta$advance === void 0 ? void 0 : _meta$advance.events) || [], 'key');
   }, [meta]);
-  var _useState5 = useState((value === null || value === void 0 || (_value$render = value.render) === null || _value$render === void 0 ? void 0 : _value$render.code) || _DEFAULT_FUNC_),
-    _useState6 = _slicedToArray(_useState5, 2),
-    editorValue = _useState6[0],
-    setEditorValue = _useState6[1];
   var handleEventClick = useMemoizedFn(function (e) {
     var payload = e.item.props.payload;
     setEvent(_objectSpread(_objectSpread({}, payload), {}, {
       actionPool: null
     }));
+    jseditorTrigger.current.show();
   });
   var handleDeleteEvent = useMemoizedFn(function (ek) {
     var _ref2 = value || {},
@@ -71,32 +67,46 @@ var AdvancePanel = function AdvancePanel(_ref) {
       events: _events
     }));
   });
-  var handleComfirm = useMemoizedFn(function (actionPool) {
+  var handleComfirm = useMemoizedFn(function (_code) {
     var _ref3 = value || {},
       events = _ref3.events,
       rest = _objectWithoutProperties(_ref3, _excluded2);
-    var _events = _objectSpread(_objectSpread({}, events), {}, _defineProperty({}, event.key, actionPool));
+    var _events = _objectSpread(_objectSpread({}, events), {}, _defineProperty({}, event.key, [['coding', {
+      category: 'custom',
+      key: 'coding',
+      code: _code
+    }]]));
     setEvents(_events);
+    setEvent(null);
     onChange(_objectSpread(_objectSpread({}, rest), {}, {
       events: _events
     }));
   });
-  var handleRenderComfirm = useMemoizedFn(function () {
-    var val = editorRef.current.editor.getValue();
+  var handleRenderComfirm = useMemoizedFn(function (_code) {
     var _ref4 = value || {},
       render = _ref4.render,
       rest = _objectWithoutProperties(_ref4, _excluded3);
     onChange(_objectSpread(_objectSpread({}, rest), {}, {
       render: {
         value: isNil(render === null || render === void 0 ? void 0 : render.value) ? true : render.value,
-        code: val
+        code: _code
       }
     }));
   });
-  var handleRenderChange = useMemoizedFn(function (checked) {
+  var handleRenderClear = useMemoizedFn(function (_code) {
     var _ref5 = value || {},
       render = _ref5.render,
       rest = _objectWithoutProperties(_ref5, _excluded4);
+    onChange(_objectSpread(_objectSpread({}, rest), {}, {
+      render: {
+        value: isNil(render === null || render === void 0 ? void 0 : render.value) ? true : render.value
+      }
+    }));
+  });
+  var handleRenderChange = useMemoizedFn(function (checked) {
+    var _ref6 = value || {},
+      render = _ref6.render,
+      rest = _objectWithoutProperties(_ref6, _excluded5);
     onChange(_objectSpread(_objectSpread({}, rest), {}, {
       render: {
         value: checked,
@@ -104,9 +114,6 @@ var AdvancePanel = function AdvancePanel(_ref) {
       }
     }));
   });
-  var handleEditorLayoutChange = function handleEditorLayoutChange(code) {
-    setEditorValue(code);
-  };
   var eventsMenu = useCreation(function () {
     var _meta$advance2;
     return /*#__PURE__*/React.createElement(Menu, {
@@ -114,14 +121,14 @@ var AdvancePanel = function AdvancePanel(_ref) {
       style: {
         fontSize: 12
       }
-    }, reduce((_meta$advance2 = meta.advance) === null || _meta$advance2 === void 0 ? void 0 : _meta$advance2.events, function (ret, event) {
+    }, 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.createElement(Menu.Item, {
-          key: event.key,
-          payload: event
+          key: e.key,
+          payload: e
         }, /*#__PURE__*/React.createElement(Tooltip, {
-          title: event.desc || event.name,
+          title: e.desc || e.name,
           placement: "left",
           getPopupContainer: function getPopupContainer() {
             return document.getElementById('lc-design-workspace');
@@ -131,7 +138,7 @@ var AdvancePanel = function AdvancePanel(_ref) {
             width: '100%',
             fontSize: 12
           }
-        }, event.name))));
+        }, e.name))));
       }
       return ret;
     }, []));
@@ -147,23 +154,21 @@ var AdvancePanel = function AdvancePanel(_ref) {
     },
     suppressIcon: true,
     extraRender: function extraRender() {
-      return /*#__PURE__*/React.createElement(PopConfirm, {
-        placement: "left",
-        title: /*#__PURE__*/React.createElement(FullScreenEditor, {
-          ref: editorRef,
-          EditorComponent: JSEditor,
-          onLayoutChange: handleEditorLayoutChange,
-          width: "600px",
-          height: "400px"
-        }, editorValue),
-        showBtn: true,
-        onConfirm: handleRenderComfirm
-      }, /*#__PURE__*/React.createElement(Icon, {
+      var _value$render, _value$render2, _value$render3;
+      return /*#__PURE__*/React.createElement(JSEditor, {
+        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.createElement(Badge, _extends({
+        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.createElement(Icon, {
         type: "code"
-      }));
+      })));
     }
   }, /*#__PURE__*/React.createElement(Switch, {
-    checked: 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: 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.createElement(Collapse, {
     field: "events",
@@ -185,9 +190,10 @@ var AdvancePanel = function AdvancePanel(_ref) {
     }, /*#__PURE__*/React.createElement(Icon, {
       type: "edit",
       onClick: function onClick() {
-        return setEvent(_objectSpread(_objectSpread({}, metaMap[ek]), {}, {
+        setEvent(_objectSpread(_objectSpread({}, metaMap[ek]), {}, {
           actionPool: events[ek]
         }));
+        jseditorTrigger.current.show();
       }
     })), /*#__PURE__*/React.createElement(Tooltip, {
       title: formatMessage({
@@ -212,13 +218,11 @@ var AdvancePanel = function AdvancePanel(_ref) {
   }, formatMessage({
     id: "".concat(_I18N_PREFIX_, ".addEventAction"),
     label: '添加事件动作'
-  })))), /*#__PURE__*/React.createElement(ActionBindModal, {
-    nodeId: nodeId,
-    event: event,
-    onComfirm: handleComfirm,
-    onClose: function onClose() {
-      return setEvent(null);
-    }
+  })))), /*#__PURE__*/React.createElement(JSEditor, {
+    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
   }));
 };
 export default AdvancePanel;

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

@@ -45,9 +45,16 @@ export default function (_ref) {
             break;
           case 'add':
             {
-              var compName = fromComp.component.toLowerCase();
-              var json = require("../../../engine/meta/".concat(compName, ".props.default.json"));
-              moveNode(null, id, actionSide, "".concat(compName, "_").concat(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/es/lowcode/painter/components/TipIcon.js

@@ -1,16 +1,24 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["title", "type"];
+var _excluded = ["title", "type", "loading", "component"];
 import React from 'react';
 import { Icon, Tooltip } from 'luck-design/antd';
 var TipIcon = function TipIcon(_ref) {
   var title = _ref.title,
     type = _ref.type,
+    loading = _ref.loading,
+    component = _ref.component,
     rest = _objectWithoutProperties(_ref, _excluded);
   return /*#__PURE__*/React.createElement(Tooltip, {
-    title: title
-  }, /*#__PURE__*/React.createElement(Icon, _extends({
-    type: type
+    title: title,
+    getPopupContainer: function getPopupContainer() {
+      return document.getElementById('lc-design-workspace');
+    }
+  }, loading ? /*#__PURE__*/React.createElement(Icon, _extends({
+    type: "loading"
+  }, rest)) : /*#__PURE__*/React.createElement(Icon, _extends({
+    type: type,
+    component: component
   }, rest)));
 };
 export default TipIcon;