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

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

@@ -1,20 +1,88 @@
 "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 = _default;
-var _react = _interopRequireDefault(require("react"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _react = _interopRequireWildcard(require("react"));
 var _TreeDragDropWrapper = _interopRequireDefault(require("./DragDrop/TreeDragDropWrapper"));
+var _antd = require("luck-design/antd");
+var _ContextProvider = require("../../engine/provider/ContextProvider");
+/**
+ * 树节点组件
+ * @param {Object} props - 组件属性
+ * @param {Object} props.item - 代表树节点的对象
+ * @returns {React.Component} 返回包裹在拖拽功能中的节点编辑组件
+ */
 function _default(_ref) {
   var item = _ref.item;
-  var EditorNode = function EditorNode() {
-    return /*#__PURE__*/_react.default.createElement("div", {
-      className: "item"
-    }, item.name);
-  };
   return /*#__PURE__*/_react.default.createElement(_TreeDragDropWrapper.default, {
     item: item
-  }, /*#__PURE__*/_react.default.createElement(EditorNode, null));
-}
+  }, /*#__PURE__*/_react.default.createElement(EditorNode, {
+    item: item
+  }));
+}
+
+/**
+ * 编辑节点组件，提供查看和编辑树节点名称的功能
+ * @param {Object} props - 组件属性
+ * @param {Object} props.item - 代表树节点的对象
+ * @returns {React.Component} 根据编辑状态渲染输入框或仅文本
+ */
+var EditorNode = function EditorNode(_ref2) {
+  var item = _ref2.item;
+  // console.log('item', item)
+  var _useState = (0, _react.useState)(false),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    edited = _useState2[0],
+    setEdited = _useState2[1];
+  var _useState3 = (0, _react.useState)(item.name),
+    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+    editedValue = _useState4[0],
+    setEditedValue = _useState4[1];
+  var inputRef = (0, _react.useRef)(null); // 创建一个 ref 来引用输入框
+
+  var handleDoubleClick = (0, _react.useCallback)(function () {
+    if (!item.buildIn) setEdited(true);
+  }, []);
+  var handleBlur = (0, _react.useCallback)(function () {
+    setEdited(false);
+  }, []);
+  var handPressEnter = (0, _react.useCallback)(function (e) {
+    (0, _ContextProvider.modifyNode)(item.id, {
+      name: e.target.value
+    });
+    setEdited(false);
+  });
+  var handleInputChange = (0, _react.useCallback)(function (e) {
+    setEditedValue(e.target.value);
+  });
+
+  // 使用 useEffect 钩子来处理聚焦逻辑
+  (0, _react.useEffect)(function () {
+    if (edited) {
+      // 如果 edited 为 true，聚焦到输入框
+      inputRef.current && inputRef.current.focus();
+    }
+  }, [edited]); // 依赖 edited 状态变化
+
+  return /*#__PURE__*/_react.default.createElement("div", {
+    className: "item",
+    onDoubleClick: handleDoubleClick
+  }, edited ? /*#__PURE__*/_react.default.createElement("div", {
+    className: "treenode-editor"
+  }, /*#__PURE__*/_react.default.createElement(_antd.Input, {
+    ref: inputRef // 将 ref 应用到 Input 组件
+    ,
+    onChange: handleInputChange,
+    value: editedValue,
+    size: "small",
+    onBlur: handleBlur,
+    onPressEnter: handPressEnter
+  })) : /*#__PURE__*/_react.default.createElement("div", {
+    className: "treenode-info"
+  }, item.name));
+};

package/lib/lowcode/painter/components/code-editor/BaseEditor.js

@@ -11,7 +11,7 @@ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/obje
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
 var monaco = _interopRequireWildcard(require("monaco-editor"));
-var _excluded = ["onChange", "onLayoutChange", "isFullscreen", "style"],
+var _excluded = ["onChange", "isFullscreen", "style", "onLoad"],
   _excluded2 = ["children", "language", "options"];
 /**
  * BaseEditor 组件是一个封装了 monaco 编辑器的 React 组件，支持前向 ref 引用。
@@ -48,9 +48,9 @@ var _excluded = ["onChange", "onLayoutChange", "isFullscreen", "style"],
  */
 var BaseEditor = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   var onChange = _ref.onChange,
-    onLayoutChange = _ref.onLayoutChange,
     isFullscreen = _ref.isFullscreen,
     style = _ref.style,
+    onLoad = _ref.onLoad,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var children = props.children,
     _props$language = props.language,
@@ -60,6 +60,9 @@ var BaseEditor = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     rest = (0, _objectWithoutProperties2.default)(props, _excluded2);
   var editorRef = (0, _react.useRef)(null);
   var editorInstance = (0, _react.useRef)(null);
+  (0, _react.useEffect)(function () {
+    if (onLoad) onLoad();
+  }, []);
 
   // 初始化编辑器实例
   (0, _react.useEffect)(function () {
@@ -87,10 +90,11 @@ var BaseEditor = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
       editorInstance.current.onDidChangeModelContent(function (event) {
         if (onChange) onChange(editorInstance.current.getValue(), event);
       });
-      // 监听布局变化，重新赋值，解决编辑器全屏切换时，编辑器内容不会更新的问题
-      editorInstance.current.onDidLayoutChange(function (event) {
-        if (onLayoutChange) onLayoutChange(editorInstance.current.getValue(), event);
-      });
+
+      // 监听布局变化，重新赋值，解决编辑器全屏切换时，编辑器空白的问题
+      // editorInstance.current.onDidLayoutChange((event) => {
+      //   if (onChange) onChange(editorInstance.current.getValue(), event);
+      // });
     }
     return function () {
       var _editorInstance$curre;

package/lib/lowcode/painter/components/code-editor/DiffEditor.js

@@ -0,0 +1,49 @@
+"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 _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _react = _interopRequireWildcard(require("react"));
+var monaco = _interopRequireWildcard(require("monaco-editor"));
+var _useCombinedRefs = _interopRequireDefault(require("../../../engine/tools/useCombinedRefs"));
+var DiffEditor = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
+  var originalCode = _ref.originalCode,
+    modifiedCode = _ref.modifiedCode,
+    _ref$language = _ref.language,
+    language = _ref$language === void 0 ? 'javascript' : _ref$language,
+    _ref$options = _ref.options,
+    options = _ref$options === void 0 ? {} : _ref$options;
+  var containerRef = (0, _react.useRef)(null);
+  var editorRef = (0, _useCombinedRefs.default)(ref);
+  (0, _react.useEffect)(function () {
+    if (containerRef.current) {
+      editorRef.current = monaco.editor.createDiffEditor(containerRef.current, (0, _objectSpread2.default)({
+        language: language,
+        automaticLayout: true,
+        autoIndent: true,
+        tabSize: 2
+      }, options));
+      editorRef.current.setModel({
+        original: monaco.editor.createModel(originalCode, language),
+        modified: monaco.editor.createModel(modifiedCode, language)
+      });
+    }
+    return function () {
+      if (editorRef.current) {
+        editorRef.current.dispose();
+      }
+    };
+  }, []);
+  return /*#__PURE__*/_react.default.createElement("div", {
+    ref: containerRef,
+    style: {
+      width: '100%',
+      height: '100%'
+    }
+  });
+});
+var _default = exports.default = /*#__PURE__*/(0, _react.memo)(DiffEditor);

package/lib/lowcode/painter/components/field-setting/FieldAttrs.js

@@ -28,11 +28,11 @@ var Wrapper = _styledComponents.default.div.withConfig({
 var Title = _styledComponents.default.p.withConfig({
   displayName: "Title",
   componentId: "luckda-6530__sc-rwt684-1"
-})(["font-weight:700;margin-bottom:8px;color:rgba(0,0,0,0.8);display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;justify-content:space-between;"]);
+})(["font-weight:700;margin-bottom:8px;color:var(--ant-text-color);display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;justify-content:space-between;"]);
 var LeftBox = _styledComponents.default.div.withConfig({
   displayName: "LeftBox",
   componentId: "luckda-6530__sc-rwt684-2"
-})(["width:100%;flex:1;border:1px solid #e5e6e8;border-radius:6px;"]);
+})(["width:100%;flex:1;border:1px solid #e5e6e8;border-radius:6px;overflow:hidden;"]);
 var Option = _styledComponents.default.div.withConfig({
   displayName: "Option",
   componentId: "luckda-6530__sc-rwt684-3"

package/lib/lowcode/painter/components/field-setting/SettingUI.js

@@ -28,6 +28,37 @@ var _apiUrl = require("../../../constants/api-url");
 var _frontRules = require("./meta/frontRules");
 var _constants = require("../../../constants");
 var _I18N_PREFIX_ = 'luckda.lowcode.painter.panel-section.fieldsSetting';
+var _DATA_FORMAT_OPTIONS = [{
+  value: 'YYYY-MM-DD HH:mm:ss',
+  label: '年-月-日 时:分:秒'
+}, {
+  value: 'YYYY-MM-DD HH:mm',
+  label: '年-月-日 时:分'
+}, {
+  value: 'YYYY-MM-DD HH',
+  label: '年-月-日 时'
+}, {
+  value: 'YYYY-MM-DD',
+  label: '年-月-日'
+}, {
+  value: 'YYYY-MM',
+  label: '年-月'
+}, {
+  value: 'YYYY',
+  label: '年'
+}, {
+  value: 'HH:mm:ss',
+  label: '时:分:秒'
+}, {
+  value: 'HH:mm',
+  label: '时:分'
+}, {
+  value: 'mm:ss',
+  label: '分:秒'
+}, {
+  value: 'YYYY-wo',
+  label: '年-周'
+}];
 var _ALIGN_OPTIONS_ = [{
   label: (0, _utils.formatMessage)({
     id: "".concat(_I18N_PREFIX_, ".align.left"),
@@ -407,7 +438,25 @@ var SettingUI = function SettingUI(_ref) {
       id: "".concat(_I18N_PREFIX_, ".readonly"),
       label: '是否只读'
     })
-  }, renderCodeIcon(fieldReadonly, _constants.FIELD_SCOPES.FIELD_READONLY)), !isBatch ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, ['table', 'tableForm'].includes(component) ? /*#__PURE__*/_react.default.createElement(_Collapse.default, {
+  }, renderCodeIcon(fieldReadonly, _constants.FIELD_SCOPES.FIELD_READONLY)), !isBatch ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, ['table', 'tableForm'].includes(component) ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, fieldData.property === 'date' && /*#__PURE__*/_react.default.createElement(_PanelItem.default, {
+    label: (0, _utils.formatMessage)({
+      id: "".concat(_I18N_PREFIX_, ".dateFormat"),
+      label: '日期格式'
+    })
+  }, /*#__PURE__*/_react.default.createElement(_antd.Select, {
+    size: "small",
+    onChange: function onChange(val) {
+      return run('dateFormat', val);
+    },
+    defaultValue: fieldData.dateFormat || 'YYYY-MM-DD HH:mm:ss'
+  }, _DATA_FORMAT_OPTIONS.map(function (opt) {
+    return /*#__PURE__*/_react.default.createElement(_antd.Select.Option, {
+      key: opt.value,
+      value: opt.value
+    }, /*#__PURE__*/_react.default.createElement(_antd.Tooltip, {
+      title: opt.label
+    }, opt.label));
+  }))), /*#__PURE__*/_react.default.createElement(_Collapse.default, {
     label: (0, _utils.formatMessage)({
       id: "".concat(_I18N_PREFIX_, ".render"),
       label: '内容定制渲染'
@@ -417,9 +466,11 @@ var SettingUI = function SettingUI(_ref) {
     onChange: function onChange(val) {
       return run('render', val);
     },
-    mustConfirm: true,
-    defaultCode: _DEFAULT_RENDER_CODE
-  })) : null, /*#__PURE__*/_react.default.createElement(_Collapse.default, {
+    defaultCode: _DEFAULT_RENDER_CODE,
+    onClear: function onClear() {
+      return run('render');
+    }
+  }))) : null, /*#__PURE__*/_react.default.createElement(_Collapse.default, {
     label: (0, _utils.formatMessage)({
       id: "".concat(_I18N_PREFIX_, ".defaultValue"),
       label: '默认值'

package/lib/lowcode/painter/components/field-setting/index.js

@@ -12,9 +12,11 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = _interopRequireDefault(require("react"));
 var _ahooks = require("ahooks");
 var _lodash = require("lodash");
+var _moment = _interopRequireDefault(require("moment"));
 var _ContextProvider = require("../../../engine/provider/ContextProvider");
 var _SettingUI = _interopRequireDefault(require("./SettingUI"));
 var _apiUrl = require("../../../constants/api-url");
+var _RuntimeComp = _interopRequireDefault(require("../../../view/lc-components/JSX/RuntimeComp"));
 var _constants = require("../../../constants");
 var _TRUE_FALSE_ = ['__TRUE__', '__FALSE__'];
 var FieldSetting = function FieldSetting(_ref) {
@@ -199,6 +201,27 @@ var FieldSetting = function FieldSetting(_ref) {
               columns: [fieldData.field],
               force: true
             });
+          } else if ('dateFormat' === key && !fieldData.render) {
+            col.colDef.cellRendererFramework = function (params) {
+              return params.value ? (0, _moment.default)(params.value).format(val) : '';
+            };
+            gridApi.api.refreshCells({
+              columns: [fieldData.field],
+              force: true
+            });
+          } else if ('render' === key) {
+            col.colDef.cellRendererFramework = function (params) {
+              return /*#__PURE__*/_react.default.createElement(_RuntimeComp.default, {
+                value: params.value,
+                data: params.data,
+                rowIndex: params.rowIndex,
+                params: params
+              }, val.replace(/(function\s*\w*\s*)\([^)]*\)(\s*{)/, '$1()$2'));
+            };
+            gridApi.api.refreshCells({
+              columns: [fieldData.field],
+              force: true
+            });
           }
         }
         onChange(newFields);
@@ -234,7 +257,7 @@ var FieldSetting = function FieldSetting(_ref) {
             _context.next = 38;
             break;
           case 5:
-            if (!(key === 'align' || key === 'headerAlign' || key === 'pinned' || key === 'tip' || key === 'render')) {
+            if (!(key === 'align' || key === 'headerAlign' || key === 'pinned' || key === 'tip' || key === 'render' || key === 'dateFormat')) {
               _context.next = 9;
               break;
             }

package/lib/lowcode/painter/components/shortcut-modal/KeyIcon.js

@@ -0,0 +1,18 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _react = _interopRequireDefault(require("react"));
+var _styledComponents = _interopRequireDefault(require("styled-components"));
+var Wrapper = _styledComponents.default.div.withConfig({
+  displayName: "Wrapper",
+  componentId: "luckda-6530__sc-o36flt-0"
+})(["min-width:12px;height:22px;line-height:22px;text-align:center;border:1px solid var(--ant-border-color-base,#d9d9d9);border-radius:3px;padding:0 7px;color:var(--ant-text-color,rgba(0,0,0,0.65));margin:0 2px;"]);
+var KeyIcon = function KeyIcon(_ref) {
+  var children = _ref.children;
+  return /*#__PURE__*/_react.default.createElement(Wrapper, null, children);
+};
+var _default = exports.default = KeyIcon;

package/lib/lowcode/painter/components/shortcut-modal/index.js

@@ -0,0 +1,215 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _react = _interopRequireDefault(require("react"));
+var _ahooks = require("ahooks");
+var _antd = require("luck-design/antd");
+var _styledComponents = _interopRequireDefault(require("styled-components"));
+var _utils = require("@luck-design-biz/base/utils");
+var _KeyIcon = _interopRequireDefault(require("./KeyIcon"));
+var _ContextProvider = require("../../../engine/provider/ContextProvider");
+var Title = _styledComponents.default.div.withConfig({
+  displayName: "Title",
+  componentId: "luckda-6530__sc-hk09ii-0"
+})(["display:flex;align-items:center;justify-content:space-between;border-bottom:1px solid var(--ant-border-color-base,#d9d9d9);margin-bottom:6px;height:32px;font-size:14px;color:var(--ant-text-color,rgba(0,0,0,0.65));"]);
+var Item = _styledComponents.default.div.withConfig({
+  displayName: "Item",
+  componentId: "luckda-6530__sc-hk09ii-1"
+})(["display:flex;flex-wrap:nowrap;align-items:center;justify-content:space-between;color:var(--ant-text-color,rgba(0,0,0,0.65));font-size:12px;min-height:24px;"]);
+var ItemLeft = _styledComponents.default.div.withConfig({
+  displayName: "ItemLeft",
+  componentId: "luckda-6530__sc-hk09ii-2"
+})(["display:flex;align-items:center;height:34px;padding:0 6px;line-height:22px;white-space:nowrap;"]);
+var ItemRight = _styledComponents.default.div.withConfig({
+  displayName: "ItemRight",
+  componentId: "luckda-6530__sc-hk09ii-3"
+})(["display:flex;flex-wrap:wrap;align-items:center;justify-content:flex-end;padding:5px 0;"]);
+var ShortcutModal = function ShortcutModal(_ref) {
+  var target = _ref.target,
+    show = _ref.show,
+    onClose = _ref.onClose;
+  var ctx = (0, _ContextProvider.useContext)();
+  var _useCreation = (0, _ahooks.useCreation)(function () {
+      var isMac = /macintosh|mac os x/i.test(navigator.userAgent);
+      var cKey = isMac ? '⌘' : 'Ctrl';
+      var cKeyAlias = isMac ? 'meta' : 'ctrl';
+      var aKey = isMac ? '⌥' : 'Alt';
+      return {
+        general: [{
+          key: 'save',
+          buttons: [cKey, 'S'],
+          buttonKeys: [cKeyAlias, 's'],
+          label: (0, _utils.formatMessage)({
+            id: 'luckda.lowcode.design.toolbar.shortcut.save',
+            label: '保存'
+          })
+        }, {
+          key: 'preview',
+          buttons: [cKey, 'P'],
+          buttonKeys: [cKeyAlias, 'p'],
+          label: (0, _utils.formatMessage)({
+            id: 'luckda.lowcode.design.toolbar.shortcut.preview',
+            label: '预览调试'
+          })
+        }, {
+          key: 'undo',
+          buttons: [cKey, 'Z'],
+          buttonKeys: [cKeyAlias, 'z'],
+          label: (0, _utils.formatMessage)({
+            id: 'luckda.lowcode.design.toolbar.shortcut.undo',
+            label: '撤销'
+          })
+        }, {
+          key: 'redo',
+          buttons: [cKey, 'Shift', 'Z'],
+          buttonKeys: [cKeyAlias, 'shift', 'z'],
+          label: (0, _utils.formatMessage)({
+            id: 'luckda.lowcode.design.toolbar.shortcut.redo',
+            label: '重做'
+          })
+        }, {
+          key: 'clone',
+          buttons: [cKey, 'C'],
+          buttonKeys: [cKeyAlias, 'c'],
+          label: (0, _utils.formatMessage)({
+            id: 'luckda.lowcode.design.toolbar.shortcut.copy',
+            label: '克隆组件'
+          })
+        }, {
+          key: 'delete',
+          buttons: ['Backspace'],
+          buttonKeys: ['backspace'],
+          label: (0, _utils.formatMessage)({
+            id: 'luckda.lowcode.design.toolbar.shortcut.delete',
+            label: '删除组件'
+          })
+        }],
+        others: [{
+          key: 'selectParent',
+          buttons: ['↑'],
+          buttonKeys: ['uparrow'],
+          label: (0, _utils.formatMessage)({
+            id: 'luckda.lowcode.design.toolbar.shortcut.selectParent',
+            label: '选择父级组件'
+          })
+        }, {
+          key: 'selectChildren',
+          buttons: ['↓'],
+          buttonKeys: ['downarrow'],
+          label: (0, _utils.formatMessage)({
+            id: 'luckda.lowcode.design.toolbar.shortcut.selectChildren',
+            label: '选择子级组件'
+          })
+        }, {
+          key: 'selectLeftBrother',
+          buttons: ['←'],
+          buttonKeys: ['leftarrow'],
+          label: (0, _utils.formatMessage)({
+            id: 'luckda.lowcode.design.toolbar.shortcut.selectLeftBrother',
+            label: '向左选择兄弟组件'
+          })
+        }, {
+          key: 'selectRightBrother',
+          buttons: ['→'],
+          buttonKeys: ['rightarrow'],
+          label: (0, _utils.formatMessage)({
+            id: 'luckda.lowcode.design.toolbar.shortcut.selectRightBrother',
+            label: '向右选择兄弟组件'
+          })
+        }, {
+          key: 'moveLeft',
+          buttons: [aKey, '←'],
+          buttonKeys: ['alt', 'leftarrow'],
+          label: (0, _utils.formatMessage)({
+            id: 'luckda.lowcode.design.toolbar.shortcut.moveLeft',
+            label: '向左移动组件'
+          })
+        }, {
+          key: 'moveRight',
+          buttons: [aKey, '→'],
+          buttonKeys: ['alt', 'rightarrow'],
+          label: (0, _utils.formatMessage)({
+            id: 'luckda.lowcode.design.toolbar.shortcut.moveRight',
+            label: '向右移动组件'
+          })
+        }]
+      };
+    }, []),
+    general = _useCreation.general,
+    others = _useCreation.others;
+  (0, _ahooks.useKeyPress)([].concat((0, _toConsumableArray2.default)(general), (0, _toConsumableArray2.default)(others)).map(function (_ref2) {
+    var buttonKeys = _ref2.buttonKeys;
+    return buttonKeys.join('.');
+  }), function (event, key) {
+    event.preventDefault();
+    event.stopPropagation();
+    ctx.$publisher(ctx.topics.DESIGN_SHORTCUT_EMIT, {
+      event: event,
+      key: key
+    });
+  }, {
+    exactMatch: true,
+    useCapture: true,
+    target: target
+  });
+  return /*#__PURE__*/_react.default.createElement(_antd.Modal, {
+    title: (0, _utils.formatMessage)({
+      id: 'luckda.lowcode.design.toolbar.shortcut',
+      label: '快捷键'
+    }),
+    visible: show,
+    onCancel: onClose,
+    width: 860,
+    footer: null,
+    getContainer: function getContainer() {
+      return document.getElementById('lc-design-workspace');
+    },
+    bodyStyle: {
+      marginTop: 0,
+      maxHeight: '60vh',
+      overflowY: 'auto'
+    }
+  }, /*#__PURE__*/_react.default.createElement(_antd.Row, {
+    gutter: 16
+  }, /*#__PURE__*/_react.default.createElement(_antd.Col, {
+    className: "gutter-row",
+    span: 12
+  }, /*#__PURE__*/_react.default.createElement(Title, null, (0, _utils.formatMessage)({
+    id: 'luckda.lowcode.design.toolbar.shortcut.general',
+    label: '常规操作'
+  })), general.map(function (_ref3) {
+    var key = _ref3.key,
+      buttons = _ref3.buttons,
+      label = _ref3.label;
+    return /*#__PURE__*/_react.default.createElement(Item, {
+      key: key
+    }, /*#__PURE__*/_react.default.createElement(ItemLeft, null, label), /*#__PURE__*/_react.default.createElement(ItemRight, null, buttons.map(function (b) {
+      return /*#__PURE__*/_react.default.createElement(_KeyIcon.default, {
+        key: b
+      }, b);
+    })));
+  })), /*#__PURE__*/_react.default.createElement(_antd.Col, {
+    className: "gutter-row",
+    span: 12
+  }, /*#__PURE__*/_react.default.createElement(Title, null, (0, _utils.formatMessage)({
+    id: 'luckda.lowcode.design.toolbar.shortcut.others',
+    label: '组件选择和移动'
+  })), others.map(function (_ref4) {
+    var key = _ref4.key,
+      buttons = _ref4.buttons,
+      label = _ref4.label;
+    return /*#__PURE__*/_react.default.createElement(Item, {
+      key: key
+    }, /*#__PURE__*/_react.default.createElement(ItemLeft, null, label), /*#__PURE__*/_react.default.createElement(ItemRight, null, buttons.map(function (b) {
+      return /*#__PURE__*/_react.default.createElement(_KeyIcon.default, {
+        key: b
+      }, b);
+    })));
+  }))));
+};
+var _default = exports.default = ShortcutModal;

package/lib/lowcode/painter/panel-section/BlockEditor/index.js

@@ -8,12 +8,7 @@ exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _ahooks = require("ahooks");
 var _antd = require("luck-design/antd");
-var _styledComponents = _interopRequireDefault(require("styled-components"));
-var Paragraph = _antd.Typography.Paragraph;
-var BlockIdSpan = (0, _styledComponents.default)(Paragraph).withConfig({
-  displayName: "BlockIdSpan",
-  componentId: "luckda-6530__sc-gbohir-0"
-})(["display:inline-block;margin:0;color:#595959;text-decoration:var(--ant-primary-color) wavy underline;cursor:copy;padding:0 4px;"]);
+var _utils = require("@luck-design-biz/base/utils");
 var BlockEditor = function BlockEditor(_ref) {
   var blockName = _ref.blockName,
     blockId = _ref.blockId,
@@ -24,25 +19,21 @@ var BlockEditor = function BlockEditor(_ref) {
       blockId: blockId
     });
   });
-  var handleCopyBlockId = (0, _ahooks.useMemoizedFn)(function (e) {
-    e.stopPropagation();
-  });
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("span", {
     onClick: handleClick,
     style: next ? {
       color: 'var(--ant-primary-color)',
       cursor: 'pointer'
     } : {}
-  }, blockName, /*#__PURE__*/_react.default.createElement("span", {
-    onClick: handleCopyBlockId
-  }, /*#__PURE__*/_react.default.createElement(BlockIdSpan, {
-    style: {
-      display: 'inline-block',
-      margin: 0
+  }, blockName, /*#__PURE__*/_react.default.createElement(_antd.Icon, {
+    type: "copy",
+    onClick: function onClick(e) {
+      e.stopPropagation();
+      (0, _utils.copyToClipboard)(blockId);
     },
-    copyable: {
-      text: blockId
+    style: {
+      margin: '0 8px'
     }
-  }, blockId))));
+  })));
 };
 var _default = exports.default = BlockEditor;

package/lib/lowcode/painter/panel-section/BlocksEditor/index.js

@@ -63,7 +63,10 @@ var BlocksEditor = function BlocksEditor(_ref) {
     var _id = "block_".concat((0, _utils.suid)());
     var newData = (0, _lodash.concat)(blocks, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       id: _id,
-      name: _id,
+      name: (0, _utils.formatMessage)({
+        id: "".concat(_I18N_PREFIX_, ".defaultBlock"),
+        label: '默认区块'
+      }),
       type: type,
       serialEffect: 'hidden',
       mode: ['add', 'update', 'edit', 'info']