add tooltip for hotkey

ly525
1 parent a968260f
Showing 3 changed files with 18 additions and 14 deletions
front-end/h5/src/components/core/editor/index.js
front-end/h5/src/locales/lang/en-US.js
front-end/h5/src/locales/lang/zh-CN.js
@@ -47,13 +47,15 @@ const fixedTools = [
     i18nTooltip: 'editor.fixedTool.undo',
     'icon': 'mail-reply',
     'action': () => undoRedoHistory.undo(),
-    'hotkey': 'ctrl&z,⌘&z'
+    'hotkey': 'ctrl&z,⌘&z',
+    'hotkeyTooltip': '(ctrl+z)'
   },
   {
     i18nTooltip: 'editor.fixedTool.redo',
     'icon': 'mail-forward',
     'action': () => undoRedoHistory.redo(),
-    'hotkey': 'ctrl&y,⌘&u'
+    'hotkey': 'ctrl&y,⌘&u',
+    'hotkeyTooltip': '(ctrl+y)'
   },
   {
     i18nTooltip: 'editor.fixedTool.preview',
@@ -77,13 +79,15 @@ const fixedTools = [
     i18nTooltip: 'editor.fixedTool.zoomOut',
     'icon': 'plus',
     'action': function () { this.scaleRate += 0.25 },
-    'hotkey': 'ctrl&=,⌘&='
+    'hotkey': 'ctrl&=,⌘&=',
+    'hotkeyTooltip': '(ctrl +)'
   },
   {
     i18nTooltip: 'editor.fixedTool.zoomIn',
     'icon': 'minus',
     'action': function () { this.scaleRate -= 0.25 },
-    'hotkey': 'ctrl&-,⌘&-'
+    'hotkey': 'ctrl&-,⌘&-',
+    'hotkeyTooltip': '(ctrl -)'
   },
   {
     i18nTooltip: 'editor.fixedTool.issues',
@@ -340,7 +344,7 @@ export default {
             <a-button-group style={{ display: 'flex', flexDirection: 'column' }}>
               {
                 fixedTools.map(tool => (
-                  <a-tooltip effect="dark" placement="left" title={this.$t(tool.i18nTooltip)}>
+                  <a-tooltip effect="dark" placement="left" title={this.$t(tool.i18nTooltip, { hotkey: tool.hotkeyTooltip })}>
                     <a-button block class="transparent-bg" type="link" size="small" style={{ height: '40px', color: '#000' }} onClick={() => tool.action && tool.action.call(this) } disabled={!!tool.disabled}>
                       { tool.icon ? <i class={['shortcut-icon', 'fa', `fa-${tool.icon}`]} aria-hidden='true'/> : (tool.text || this.$t(tool.i18nTooltip)) }
                     </a-button>
@@ -64,13 +64,13 @@ export default {
       }
     },
     fixedTool: {
-      undo: 'Undo',
-      redo: 'Redo',
+      undo: 'Undo{hotkey}',
+      redo: 'Redo{hotkey}',
       preview: 'Preview',
       copyCurrentPage: 'CopyCurrentPage',
       importPSD: 'Import PSD',
-      zoomIn: 'Zoom In',
-      zoomOut: 'Zoom Out',
+      zoomIn: 'Zoom In{hotkey}',
+      zoomOut: 'Zoom Out{hotkey}',
       issues: 'Issues'
     },
     editPanel: {
@@ -2,7 +2,7 @@
  * @Author: ly525
  * @Date: 2019-11-24 18:51:58
  * @LastEditors: ly525
- * @LastEditTime: 2019-12-08 16:15:35
+ * @LastEditTime: 2020-04-18 00:30:40
  * @FilePath: /luban-h5/front-end/h5/src/locales/lang/zh-CN.js
  * @Github: https://github.com/ly525/luban-h5
  * @Description: Do not edit
@@ -73,13 +73,13 @@ export default {
       }
     },
     fixedTool: {
-      undo: '撤销',
-      redo: '重做',
+      undo: '撤销{hotkey}',
+      redo: '重做{hotkey}',
       preview: '预览',
       copyCurrentPage: '复制当前页面',
       importPSD: '导入PSD',
-      zoomIn: '缩小',
-      zoomOut: '放大',
+      zoomIn: '缩小{hotkey}',
+      zoomOut: '放大{hotkey}',
       issues: '常见问题'
     },
     editPanel: {