Merge pull request #620 from wallace-yang/main

Feat：快捷键提示支持mac与修复富文本选择字体大小列表文字重叠bug

web/src/config/en.js

@@ -178,6 +178,12 @@ export const backgroundPositionList = [
   }
 ]
 
+const isMac = navigator.platform.toUpperCase().indexOf('MAC') >= 0;
+const ctrl = isMac?'⌘':'Ctrl';
+const enter = isMac?'Return':'Enter';
+const macFn = isMac?'fn + ':'';
+
+
 // 背景图片大小
 export const backgroundSizeList = [
   {
@@ -207,7 +213,7 @@ export const shortcutKeyList = [
       {
         icon: 'iconjiedian',
         name: 'Insert sibling node',
-        value: 'Enter'
+        value: enter
       },
       {
         icon: 'icondodeparent',
@@ -217,17 +223,17 @@ export const shortcutKeyList = [
       {
         icon: 'iconshangyi',
         name: 'Move up node',
-        value: 'Ctrl + ↑'
+        value: `${ctrl} + ↑`
       },
       {
         icon: 'iconxiayi',
         name: 'Move down node',
-        value: 'Ctrl + ↓'
+        value: `${ctrl} + ↓`
       },
       {
         icon: 'icongaikuozonglan',
         name: 'Insert summary',
-        value: 'Ctrl + G'
+        value: `${ctrl} + G`
       },
       {
         icon: 'iconzhankai',
@@ -247,57 +253,57 @@ export const shortcutKeyList = [
       {
         icon: 'iconfuzhi',
         name: 'Copy node',
-        value: 'Ctrl + C'
+        value: `${ctrl} + C`
       },
       {
         icon: 'iconjianqie',
         name: 'Cut node',
-        value: 'Ctrl + X'
+        value: `${ctrl} + X`
       },
       {
         icon: 'iconniantie',
         name: 'Paste node',
-        value: 'Ctrl + V'
+        value: `${ctrl} + V`
       },
       {
         icon: 'iconbianji',
         name: 'Edit node',
-        value: 'F2'
+        value: macFn+'F2'
       },
       {
         icon: 'iconhuanhang',
         name: 'Text Wrap',
-        value: 'Shift + Enter'
+        value: `Shift + ${enter}`
       },
       {
         icon: 'iconhoutui-shi',
         name: 'Undo',
-        value: 'Ctrl + Z'
+        value: `${ctrl} + Z`
       },
       {
         icon: 'iconqianjin1',
         name: 'Redo',
-        value: 'Ctrl + Y'
+        value: `${ctrl} + Y`
       },
       {
         icon: 'iconquanxuan',
         name: 'Select All',
-        value: 'Ctrl + A'
+        value: `${ctrl} + A`
       },
       {
         icon: 'iconquanxuan',
         name: 'Multiple choice',
-        value: 'Right click / Ctrl + Left click'
+        value: `Right click / ${ctrl} + Left click`
       },
       {
         icon: 'iconzhengli',
         name: 'Arrange layout',
-        value: 'Ctrl + L'
+        value: `${ctrl} + L`
       },
       {
         icon: 'iconsousuo',
         name: 'Search and Replace',
-        value: 'Ctrl + F'
+        value: `${ctrl} + F`
       }
     ]
   },
@@ -307,27 +313,27 @@ export const shortcutKeyList = [
       {
         icon: 'iconfangda',
         name: 'Zoom in',
-        value: 'Ctrl + +'
+        value: `${ctrl} + +`
       },
       {
         icon: 'iconsuoxiao',
         name: 'Zoom out',
-        value: 'Ctrl + -'
+        value: `${ctrl} + -`
       },
       {
         icon: 'iconfangda',
         name: 'Zoom in/Zoom out',
-        value: 'Ctrl + Mouse wheel'
+        value: `${ctrl} + Mouse wheel`
       },
       {
         icon: 'icondingwei',
         name: 'Back root node',
-        value: 'Ctrl + Enter'
+        value: `${ctrl} + ${enter}`
       },
       {
         icon: 'iconquanping1',
         name: 'fit canvas',
-        value: 'Ctrl + i'
+        value: `${ctrl} + i`
       }
     ]
   },
@@ -337,7 +343,7 @@ export const shortcutKeyList = [
       {
         icon: 'iconhuanhang',
         name: 'Text Wrap',
-        value: 'Shift + Enter'
+        value: `Shift + ${enter}`
       },
       {
         icon: 'iconshanchu',
@@ -352,7 +358,7 @@ export const shortcutKeyList = [
       {
         icon: 'iconjiedian',
         name: 'Insert sibling node',
-        value: 'Enter'
+        value: enter
       },
       {
         icon: 'icondodeparent',

web/src/config/zh.js

@@ -260,6 +260,11 @@ export const backgroundSizeList = [
 export const store = {
   sidebarZIndex: 1 //侧边栏zIndex
 }
+const isMac = navigator.platform.toUpperCase().indexOf('MAC') >= 0;
+const ctrl = isMac?'⌘':'Ctrl';
+const enter = isMac?'Return':'Enter';
+const macFn = isMac?'fn + ':'';
+
 
 // 快捷键列表
 export const shortcutKeyList = [
@@ -274,7 +279,7 @@ export const shortcutKeyList = [
       {
         icon: 'iconjiedian',
         name: '插入同级节点',
-        value: 'Enter'
+        value: enter
       },
       {
         icon: 'icondodeparent',
@@ -284,17 +289,17 @@ export const shortcutKeyList = [
       {
         icon: 'iconshangyi',
         name: '上移节点',
-        value: 'Ctrl + ↑'
+        value: `${ctrl} + ↑`
       },
       {
         icon: 'iconxiayi',
         name: '下移节点',
-        value: 'Ctrl + ↓'
+        value: `${ctrl} + ↓`
       },
       {
         icon: 'icongaikuozonglan',
         name: '插入概要',
-        value: 'Ctrl + G'
+        value: `${ctrl} + G`
       },
       {
         icon: 'iconzhankai',
@@ -314,57 +319,57 @@ export const shortcutKeyList = [
       {
         icon: 'iconfuzhi',
         name: '复制节点',
-        value: 'Ctrl + C'
+        value: `${ctrl} + C`
       },
       {
         icon: 'iconjianqie',
         name: '剪切节点',
-        value: 'Ctrl + X'
+        value: `${ctrl} + X`
       },
       {
         icon: 'iconniantie',
         name: '粘贴节点',
-        value: 'Ctrl + V'
+        value: `${ctrl} + V`
       },
       {
         icon: 'iconbianji',
         name: '编辑节点',
-        value: 'F2'
+        value: macFn+'F2'
       },
       {
         icon: 'iconhuanhang',
         name: '文本换行',
-        value: 'Shift + Enter'
+        value: `Shift + ${enter}`
       },
       {
         icon: 'iconhoutui-shi',
         name: '回退',
-        value: 'Ctrl + Z'
+        value: `${ctrl} + Z`
       },
       {
         icon: 'iconqianjin1',
         name: '前进',
-        value: 'Ctrl + Y'
+        value: `${ctrl} + Y`
       },
       {
         icon: 'iconquanxuan',
         name: '全选',
-        value: 'Ctrl + A'
+        value: `${ctrl} + A`
       },
       {
         icon: 'iconquanxuan',
         name: '多选',
-        value: '右键 / Ctrl + 左键'
+        value: `右键 / ${ctrl} + 左键`
       },
       {
         icon: 'iconzhengli',
         name: '一键整理布局',
-        value: 'Ctrl + L'
+        value: `${ctrl} + L`
       },
       {
         icon: 'iconsousuo',
         name: '搜索和替换',
-        value: 'Ctrl + F'
+        value: `${ctrl} + F`
       }
     ]
   },
@@ -374,27 +379,27 @@ export const shortcutKeyList = [
       {
         icon: 'iconfangda',
         name: '放大',
-        value: 'Ctrl + +'
+        value: `${ctrl} + +`
       },
       {
         icon: 'iconsuoxiao',
         name: '缩小',
-        value: 'Ctrl + -'
+        value: `${ctrl} + -`
       },
       {
         icon: 'iconfangda',
         name: '放大/缩小',
-        value: 'Ctrl + 鼠标滚动'
+        value: `${ctrl} + 鼠标滚动`
       },
       {
         icon: 'icondingwei',
         name: '回到根节点',
-        value: 'Ctrl + Enter'
+        value: `${ctrl} + ${enter}`
       },
       {
         icon: 'iconquanping1',
         name: '适应画布',
-        value: 'Ctrl + i'
+        value: `${ctrl} + i`
       }
     ]
   },
@@ -404,7 +409,7 @@ export const shortcutKeyList = [
       {
         icon: 'iconhuanhang',
         name: '文本换行',
-        value: 'Shift + Enter'
+        value: `Shift + ${enter}`
       },
       {
         icon: 'iconshanchu',
@@ -419,7 +424,7 @@ export const shortcutKeyList = [
       {
         icon: 'iconjiedian',
         name: '插入同级节点',
-        value: 'Enter'
+        value: enter
       },
       {
         icon: 'icondodeparent',

web/src/pages/Edit/components/RichTextToolbar.vue

@@ -299,7 +299,7 @@ export default {
   }
 
   .fontOptionItem {
-    height: 30px;
+    height: 50px;
     width: 100%;
     display: flex;
     align-items: center;