vue-devui 1.6.28 → 1.6.30

package/editor-md/index.es.js

@@ -1509,13 +1509,26 @@ ToolBarHandler.fullscreen = (editor) => {
 };
 ToolBarHandler.color = () => {
 };
+const GET_CTRL_KEY = () => {
+  var _a;
+  if (typeof window !== "undefined") {
+    return ((_a = navigator == null ? void 0 : navigator.platform) == null ? void 0 : _a.indexOf("Mac")) !== -1 ? "\u2318" : "Ctrl";
+  }
+};
+const GET_ALT_KEY = () => {
+  var _a;
+  if (typeof window !== "undefined") {
+    return ((_a = navigator == null ? void 0 : navigator.platform) == null ? void 0 : _a.indexOf("Mac")) !== -1 ? "\u2325" : "Alt";
+  }
+};
 const DEFAULT_TOOLBARS = {
   undo: {
     id: "undo",
     name: "undo",
     type: "button",
     icon: UNDO_ICON,
-    shortKey: "Ctrl+Z",
+    shortKey: `${GET_CTRL_KEY()}+Z`,
+    shortKeyWithCode: `${GET_CTRL_KEY()}+90`,
     handler: ToolBarHandler.undo
   },
   redo: {
@@ -1523,7 +1536,8 @@ const DEFAULT_TOOLBARS = {
     name: "redo",
     type: "button",
     icon: REDO_ICON,
-    shortKey: "Ctrl+Y",
+    shortKey: `${GET_CTRL_KEY()}+Y`,
+    shortKeyWithCode: `${GET_CTRL_KEY()}+89`,
     handler: ToolBarHandler.redo
   },
   bold: {
@@ -1531,7 +1545,8 @@ const DEFAULT_TOOLBARS = {
     name: "bold",
     type: "button",
     icon: BOLD_ICON,
-    shortKey: "Ctrl+B",
+    shortKey: `${GET_CTRL_KEY()}+B`,
+    shortKeyWithCode: `${GET_CTRL_KEY()}+66`,
     handler: ToolBarHandler.bold
   },
   italic: {
@@ -1539,7 +1554,8 @@ const DEFAULT_TOOLBARS = {
     name: "italic",
     type: "button",
     icon: ITALIC_ICON,
-    shortKey: "Ctrl+I",
+    shortKey: `${GET_CTRL_KEY()}+I`,
+    shortKeyWithCode: `${GET_CTRL_KEY()}+73`,
     handler: ToolBarHandler.italic
   },
   strike: {
@@ -1547,7 +1563,8 @@ const DEFAULT_TOOLBARS = {
     name: "strike",
     type: "button",
     icon: STRIKE_ICON,
-    shortKey: "Ctrl+D",
+    shortKey: `${GET_CTRL_KEY()}+D`,
+    shortKeyWithCode: `${GET_CTRL_KEY()}+68`,
     handler: ToolBarHandler.strike
   },
   h1: {
@@ -1555,7 +1572,8 @@ const DEFAULT_TOOLBARS = {
     name: "h1",
     type: "button",
     icon: H1_ICON,
-    shortKey: "Ctrl+1",
+    shortKey: `${GET_CTRL_KEY()}+1`,
+    shortKeyWithCode: `${GET_CTRL_KEY()}+49`,
     handler: ToolBarHandler.h1
   },
   h2: {
@@ -1563,7 +1581,8 @@ const DEFAULT_TOOLBARS = {
     name: "h2",
     type: "button",
     icon: H2_ICON,
-    shortKey: "Ctrl+2",
+    shortKey: `${GET_CTRL_KEY()}+2`,
+    shortKeyWithCode: `${GET_CTRL_KEY()}+50`,
     handler: ToolBarHandler.h2
   },
   ul: {
@@ -1571,7 +1590,8 @@ const DEFAULT_TOOLBARS = {
     name: "unorderedlist",
     type: "button",
     icon: LIST_UNORDERED_ICON,
-    shortKey: "Ctrl+U",
+    shortKey: `${GET_CTRL_KEY()}+U`,
+    shortKeyWithCode: `${GET_CTRL_KEY()}+85`,
     handler: ToolBarHandler.ul
   },
   ol: {
@@ -1579,7 +1599,8 @@ const DEFAULT_TOOLBARS = {
     name: "orderedlist",
     type: "button",
     icon: LIST_ORDERED_ICON,
-    shortKey: "Ctrl+O",
+    shortKey: `${GET_CTRL_KEY()}+O`,
+    shortKeyWithCode: `${GET_CTRL_KEY()}+79`,
     handler: ToolBarHandler.ol
   },
   checklist: {
@@ -1587,7 +1608,8 @@ const DEFAULT_TOOLBARS = {
     name: "checklist",
     type: "button",
     icon: LIST_CHECK_ICON,
-    shortKey: "Ctrl+Alt+C",
+    shortKey: `${GET_CTRL_KEY()}+${GET_ALT_KEY()}+C`,
+    shortKeyWithCode: `${GET_CTRL_KEY()}+${GET_ALT_KEY()}+67`,
     handler: ToolBarHandler.checkList
   },
   underline: {
@@ -1595,7 +1617,8 @@ const DEFAULT_TOOLBARS = {
     name: "underline",
     type: "button",
     icon: UNDERLINE_ICON,
-    shortKey: "Ctrl+R",
+    shortKey: `${GET_CTRL_KEY()}+R`,
+    shortKeyWithCode: `${GET_CTRL_KEY()}+82`,
     handler: ToolBarHandler.underline
   },
   font: {
@@ -1611,7 +1634,8 @@ const DEFAULT_TOOLBARS = {
     name: "link",
     type: "button",
     icon: LINK_ICON,
-    shortKey: "Ctrl+L",
+    shortKey: `${GET_CTRL_KEY()}+L`,
+    shortKeyWithCode: `${GET_CTRL_KEY()}+76`,
     handler: ToolBarHandler.link
   },
   image: {
@@ -1619,7 +1643,8 @@ const DEFAULT_TOOLBARS = {
     name: "image",
     type: "button",
     icon: IMAGE_ICON,
-    shortKey: "Ctrl+G",
+    shortKey: `${GET_CTRL_KEY()}+G`,
+    shortKeyWithCode: `${GET_CTRL_KEY()}+71`,
     params: { imageUploadToServer: false },
     handler: ToolBarHandler.image
   },
@@ -1629,7 +1654,8 @@ const DEFAULT_TOOLBARS = {
     type: "button",
     icon: FILE_ICON,
     params: {},
-    shortKey: "Ctrl+F",
+    shortKey: `${GET_CTRL_KEY()}+F`,
+    shortKeyWithCode: `${GET_CTRL_KEY()}+70`,
     handler: ToolBarHandler.file
   },
   code: {
@@ -1637,7 +1663,8 @@ const DEFAULT_TOOLBARS = {
     name: "code",
     type: "button",
     icon: CODE_ICON,
-    shortKey: "Ctrl+K",
+    shortKey: `${GET_CTRL_KEY()}+K`,
+    shortKeyWithCode: `${GET_CTRL_KEY()}+75`,
     handler: ToolBarHandler.code
   },
   table: {
@@ -1645,7 +1672,8 @@ const DEFAULT_TOOLBARS = {
     name: "table",
     type: "button",
     icon: TABLE_ICON,
-    shortKey: "Ctrl+Alt+T",
+    shortKey: `${GET_CTRL_KEY()}+${GET_ALT_KEY()}+T`,
+    shortKeyWithCode: `${GET_CTRL_KEY()}+${GET_ALT_KEY()}+84`,
     handler: ToolBarHandler.table
   },
   fullscreen: {
@@ -7477,8 +7505,8 @@ function useEditorMd(props, ctx) {
     const tempToolbars = { ...toolbars, ...customToolbars == null ? void 0 : customToolbars.value };
     for (const key of Object.keys(tempToolbars)) {
       const toolbarItem = tempToolbars[key];
-      if (toolbarItem.shortKey && flatToolbarConfig.includes(toolbarItem.id)) {
-        shortKeys[toolbarItem.shortKey.replace(/\+/g, "-")] = (_a = toolbarItem.handler) == null ? void 0 : _a.bind(null, editorIns, toolbarItem.params);
+      if (toolbarItem.shortKeyWithCode && flatToolbarConfig.includes(toolbarItem.id)) {
+        shortKeys[toolbarItem.shortKeyWithCode.replace(/\+/g, "-")] = (_a = toolbarItem.handler) == null ? void 0 : _a.bind(null, editorIns, toolbarItem.params);
       }
     }
     editorIns.setOption(
@@ -7505,13 +7533,16 @@ function useEditorMd(props, ctx) {
       if (e.ctrlKey) {
         keyCombination += "Ctrl-";
       }
+      if (e.metaKey) {
+        keyCombination += "\u2318-";
+      }
       if (e.altKey) {
-        keyCombination += "Alt-";
+        keyCombination += `${GET_ALT_KEY()}-`;
       }
       if (e.shiftKey) {
         keyCombination += "Shift-";
       }
-      keyCombination += e.key.toUpperCase();
+      keyCombination += e.keyCode;
       if (shortKeys[keyCombination] && typeof shortKeys[keyCombination] === "function") {
         e.preventDefault();
         shortKeys[keyCombination]();
@@ -9141,7 +9172,12 @@ class MDRenderService {
     });
   }
   onIgnoreTagAttr(tag, name, value, isWhiteAttr) {
-    if (!isWhiteAttr && (name === "id" || tag === "span" && name === "style")) {
+    if (!isWhiteAttr && (name === "id" || tag === "span" && name === "style" || tag === "a" && name === "href")) {
+      return name + "=" + value;
+    }
+  }
+  onTagAttr(tag, name, value, isWhiteAttr) {
+    if (isWhiteAttr && (tag === "a" && name === "href")) {
       return name + "=" + value;
     }
   }
@@ -9173,6 +9209,7 @@ class MDRenderService {
     html = filterXSS(html, {
       whiteList: this.xssWhiteList,
       onIgnoreTagAttr: this.onIgnoreTagAttr,
+      onTagAttr: this.onTagAttr,
       css: {
         whiteList: Object.assign({}, this.cssWhiteList, {
           top: true,