vue-devui 1.6.28 → 1.6.29

package/types/editor-md/src/toolbar-config.d.ts

@@ -8,11 +8,14 @@ export interface IToolbarItemConfig {
     template?: any;
     component?: any;
     shortKey?: string;
+    shortKeyWithCode?: string;
     params?: {
         [key: string]: any;
     };
     handler?(editor?: any, params?: any): void;
 }
+export declare const GET_CTRL_KEY: () => "⌘" | "Ctrl" | undefined;
+export declare const GET_ALT_KEY: () => "Alt" | "⌥" | undefined;
 export declare const DEFAULT_TOOLBARS: Record<string, IToolbarItemConfig>;
 export declare const DEFAULT_TOOLBAR_CONFIG: (string | string[])[];
 export declare const FONT_COLORS: string[];

package/types/git-graph/src/git-graph.d.ts

@@ -1,2 +1,3 @@
+import './git-graph.scss';
 declare const _default: import("vue").DefineSetupFnComponent<Record<string, any>, {}, {}, Record<string, any> & {}, import("vue").PublicProps>;
 export default _default;

package/vue-devui.es.js

@@ -17542,7 +17542,8 @@ function parseCodeToSingle(container, code, options) {
   diff2HtmlUi.draw();
 }
 function generateNumberTdObj(tdNodes) {
-  const lineNumber = parseInt(tdNodes[0].innerText) || -1;
+  var _a;
+  const lineNumber = ((_a = tdNodes[0]) == null ? void 0 : _a.innerText) ? parseInt(tdNodes[0].innerText) : -1;
   if (lineNumber !== -1) {
     return { [lineNumber]: tdNodes };
   }
@@ -35516,13 +35517,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: {
@@ -35530,7 +35544,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: {
@@ -35538,7 +35553,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: {
@@ -35546,7 +35562,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: {
@@ -35554,7 +35571,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: {
@@ -35562,7 +35580,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: {
@@ -35570,7 +35589,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: {
@@ -35578,7 +35598,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: {
@@ -35586,7 +35607,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: {
@@ -35594,7 +35616,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: {
@@ -35602,7 +35625,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: {
@@ -35618,7 +35642,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: {
@@ -35626,7 +35651,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
   },
@@ -35636,7 +35662,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: {
@@ -35644,7 +35671,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: {
@@ -35652,7 +35680,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: {
@@ -36046,8 +36075,8 @@ function useEditorMd(props, ctx2) {
     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(
@@ -36074,13 +36103,16 @@ function useEditorMd(props, ctx2) {
       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]();
@@ -37922,10 +37954,10 @@ class GitGraph$1 {
     this.graphHeight = this.element.getBoundingClientRect().height;
     this.graphWidth = this.element.getBoundingClientRect().width;
     const ch = Math.max(this.graphHeight, this.offsetY + this.unitTime * this.mtime + 150);
-    Math.max(this.graphWidth, this.offsetX + this.unitSpace * this.mspace + 300);
+    const cw = Math.max(this.graphWidth, this.offsetX + this.unitSpace * this.mspace + 500);
     this.svg = document.createElementNS("http://www.w3.org/2000/svg", "svg");
     this.svg.setAttribute("height", ch + "");
-    this.svg.setAttribute("width", "100%");
+    this.svg.setAttribute("width", cw + "");
     (_a = this.element) == null ? void 0 : _a.appendChild(this.svg);
     this.barHeight = Math.max(this.graphHeight, this.unitTime * this.commits.length + 320);
     const _ref = this.commits;
@@ -38061,7 +38093,7 @@ class GitGraph$1 {
   }
   drawDot(x, y, commit) {
     const options = this.options;
-    const isdark = this.isDark;
+    this.isDark;
     const circle = document.createElementNS("http://www.w3.org/2000/svg", "circle");
     const attrs = {
       cx: x,
@@ -38069,7 +38101,7 @@ class GitGraph$1 {
       r: 4,
       fill: "#fff",
       strokeWidth: 1,
-      stroke: this.colors[commit.space],
+      stroke: this.colors[commit.space % 20],
       style: "cursor: pointer;"
     };
     this.setNodeAttr(circle, attrs);
@@ -38092,7 +38124,7 @@ class GitGraph$1 {
     img.appendChild(authorText);
     this.svg.appendChild(img);
     if (!this.messageBoxWidth) {
-      this.messageBoxWidth = this.svg.getBoundingClientRect.width - (avatar_box_x + 40);
+      this.messageBoxWidth = this.svg.getBoundingClientRect().width - (avatar_box_x + 40);
     }
     let route = ["M", avatar_box_x + 15, avatar_box_y - 20, "L", avatar_box_x + 15, avatar_box_y];
     const line1 = document.createElementNS("http://www.w3.org/2000/svg", "path");
@@ -38116,16 +38148,25 @@ class GitGraph$1 {
     if (commit.author.name.length > this.maxNameLength) {
       commit.author.name = commit.author.name.substr(0, this.maxNameLength) + "...";
     }
-    const commitText = document.createElementNS("http://www.w3.org/2000/svg", "text");
+    const commitText = document.createElementNS("http://www.w3.org/2000/svg", "foreignObject");
     const commitAttrs = {
       x: avatar_box_x + 40,
-      y: y + 4,
+      y: y - 8,
       "text-anchor": "start",
       style: "cursor: pointer;text-anchor: start;",
-      fill: isdark ? "#e8e8e8" : "#2e2e2e",
-      "font-size": 14
+      width: this.messageBoxWidth,
+      height: 20
     };
     this.setNodeAttr(commitText, commitAttrs);
+    const textArr = {
+      style: "width: 100%; height: 20px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis;",
+      title: commit.message
+    };
+    const text = document.createElement("div");
+    this.setNodeAttr(text, textArr);
+    text.innerText = commit.message.replace(/\n/g, " ");
+    commitText.appendChild(text);
+    this.svg.appendChild(commitText);
     const tspan = document.createElementNS("http://www.w3.org/2000/svg", "tspan");
     tspan.appendChild(document.createTextNode(commit.message.replace(/\n/g, " ")));
     commitText.appendChild(tspan);
@@ -38159,9 +38200,9 @@ class GitGraph$1 {
       parentX1 = this.offsetX + this.unitSpace * (this.mspace - parentCommit.space);
       parentX2 = this.offsetX + this.unitSpace * (this.mspace - parent[1]);
       if (parentCommit.space <= commit.space) {
-        color2 = this.colors[commit.space];
+        color2 = this.colors[commit.space % 20];
       } else {
-        color2 = this.colors[parentCommit.space];
+        color2 = this.colors[parentCommit.space % 20];
       }
       if (parent[1] === commit.space) {
         offset2 = [0, 5];
@@ -38251,14 +38292,14 @@ class GitGraph$1 {
       ];
       const rectAttrs = {
         fill: this.isDark ? "#4C4C4C" : "#fff",
-        stroke: this.colors[commit.space],
+        stroke: this.colors[commit.space % 20],
         "stroke-width": "1px",
         d: path.join(" "),
         transform: `matrix(1,0,0,1,-${textbox.width + 26},0)`
       };
       const newAttrs = {
         transform: `matrix(1,0,0,1,-${textbox.width + 26},0)`,
-        fill: this.colors[commit.space]
+        fill: this.colors[commit.space % 20]
       };
       this.setNodeAttr(text, newAttrs);
       this.setNodeAttr(rect, rectAttrs);
@@ -38449,6 +38490,7 @@ function useGitGraph(props, ctx2, isDark) {
     initGraph
   };
 }
+var gitGraph = "";
 var GitGraph = defineComponent({
   name: "DGitGraph",
   props: gitGraphProps,
@@ -54406,7 +54448,7 @@ const installs = [
   VirtualListInstall
 ];
 var vueDevui = {
-  version: "1.6.28",
+  version: "1.6.29",
   install(app) {
     installs.forEach((p) => app.use(p));
   }