vue-devui 1.5.14 → 1.5.15

package/vue-devui.es.js

@@ -14638,7 +14638,7 @@ function updateExpandLineCount(expandDom, newExpandDom) {
   const newChangedNumRight = parseInt((curMatches == null ? void 0 : curMatches[4]) || "") + parseInt((newMatches == null ? void 0 : newMatches[4]) || "");
   expandDom.children[1].children[0].innerText = `@@ -${(newMatches == null ? void 0 : newMatches[1]) || 0},${newChangedNumLeft} +${(newMatches == null ? void 0 : newMatches[3]) || 0},${newChangedNumRight} @@`;
 }
-function parseDiffCode(container, code, outputFormat) {
+function parseDiffCode(container, code, outputFormat, isAddCode = false) {
   var _a;
   const diff2HtmlUi = new Diff2HtmlUI(container, code, {
     drawFileList: false,
@@ -14649,7 +14649,7 @@ function parseDiffCode(container, code, outputFormat) {
   });
   if (outputFormat === "side-by-side") {
     let diffHtmlStr = diff2HtmlUi.diffHtml;
-    if (diffHtmlStr.match(EmptyDataLangReg)) {
+    if (diffHtmlStr.match(EmptyDataLangReg) && isAddCode) {
       diffHtmlStr = diffHtmlStr.replace(EmptyDataLangReg, "");
     }
     const trList = diffHtmlStr.match(TableTrReg);
@@ -14683,6 +14683,7 @@ function updateExpandUpDownButton(trNode) {
   trNode.children[0].children[0].innerHTML = AllExpandIcon();
 }
 function updateLineNumberInDatasetForDoubleColumn(trNode, expandThreshold, position, updateExpandButton = false) {
+  var _a, _b;
   let nextL;
   let prevL;
   let nextR;
@@ -14695,9 +14696,9 @@ function updateLineNumberInDatasetForDoubleColumn(trNode, expandThreshold, posit
     prevR = Math.max(nextR - expandThreshold + 1, 1);
   } else if (position === "bottom") {
     const prevLineNode = trNode.previousElementSibling;
-    prevL = parseInt(prevLineNode.children[0].innerText) + 1;
+    prevL = parseInt((_a = prevLineNode == null ? void 0 : prevLineNode.children[0]) == null ? void 0 : _a.innerText) + 1;
     nextL = prevL + expandThreshold - 1;
-    prevR = parseInt(prevLineNode.children[2].innerText) + 1;
+    prevR = parseInt((_b = prevLineNode == null ? void 0 : prevLineNode.children[2]) == null ? void 0 : _b.innerText) + 1;
     nextR = prevR + expandThreshold - 1;
   } else {
     const prevLineNode = trNode.previousElementSibling;
@@ -14713,9 +14714,14 @@ function updateLineNumberInDatasetForDoubleColumn(trNode, expandThreshold, posit
       updateExpandUpDownButton(trNode);
     }
   }
+  if (isNaN(prevL) || isNaN(prevR) || isNaN(nextL) || isNaN(nextR)) {
+    return false;
+  }
   setLineNumberInDataset(trNode, prevL, prevR, nextL, nextR);
+  return true;
 }
 function updateLineNumberInDataset(trNode, expandThreshold, position, updateExpandButton = false) {
+  var _a, _b, _c, _d;
   let nextL;
   let prevL;
   let nextR;
@@ -14728,9 +14734,9 @@ function updateLineNumberInDataset(trNode, expandThreshold, position, updateExpa
     prevR = Math.max(nextR - expandThreshold + 1, 1);
   } else if (position === "bottom") {
     const prevLineNode = trNode.previousElementSibling;
-    prevL = parseInt(prevLineNode.children[0].children[0].innerText) + 1;
+    prevL = parseInt((_b = (_a = prevLineNode == null ? void 0 : prevLineNode.children[0].children) == null ? void 0 : _a[0]) == null ? void 0 : _b.innerText) + 1;
     nextL = prevL + expandThreshold - 1;
-    prevR = parseInt(prevLineNode.children[0].children[1].innerText) + 1;
+    prevR = parseInt((_d = (_c = prevLineNode == null ? void 0 : prevLineNode.children[0].children) == null ? void 0 : _c[1]) == null ? void 0 : _d.innerText) + 1;
     nextR = prevR + expandThreshold - 1;
   } else {
     const prevLineNode = trNode.previousElementSibling;
@@ -14746,7 +14752,11 @@ function updateLineNumberInDataset(trNode, expandThreshold, position, updateExpa
       updateExpandUpDownButton(trNode);
     }
   }
+  if (isNaN(prevL) || isNaN(prevR) || isNaN(nextL) || isNaN(nextR)) {
+    return false;
+  }
   setLineNumberInDataset(trNode, prevL, prevR, nextL, nextR);
+  return true;
 }
 function getLineNumberFromDataset(expandDom, expandThreshold) {
   var _a, _b, _c;
@@ -14924,10 +14934,16 @@ function useCodeReviewExpand(reviewContentRef, props) {
       }
     }
     const loadMoreLine = trNodes[0].cloneNode(true);
-    loadMoreLine.children[0].removeChild(loadMoreLine.children[0].children[0]);
+    if (loadMoreLine.children[0].children[0]) {
+      loadMoreLine.children[0].removeChild(loadMoreLine.children[0].children[0]);
+    }
     loadMoreLine.children[1].innerText = "";
     (_a = trNodes[0].parentElement) == null ? void 0 : _a.appendChild(loadMoreLine);
-    updateLineNumberInDatasetForDoubleColumn(loadMoreLine, expandThreshold.value, "bottom");
+    const res = updateLineNumberInDatasetForDoubleColumn(loadMoreLine, expandThreshold.value, "bottom");
+    if (!res) {
+      loadMoreLine.remove();
+      return;
+    }
     attachExpandUpDownButton(loadMoreLine.children[0], "down");
   };
   const insertIncrementCodeForDoubleColumn = (code, direction, referenceDom) => {
@@ -14939,7 +14955,7 @@ function useCodeReviewExpand(reviewContentRef, props) {
     }
     const prefix = "--- updated_at	Jan 1, 2019, 0:0:0 AM\n+++ updated_at	Jan 1, 2019, 0:0:0 AM\n";
     const container = document.createElement("div");
-    parseDiffCode(container, prefix + code, outputFormat.value);
+    parseDiffCode(container, prefix + code, outputFormat.value, true);
     const trNodes = Array.from(container.querySelectorAll("tr"));
     const expandLine = trNodes.find((element) => {
       var _a;
@@ -15001,10 +15017,16 @@ function useCodeReviewExpand(reviewContentRef, props) {
       }
     }
     const loadMoreLine = trNodes[0].cloneNode(true);
-    loadMoreLine.children[0].removeChild(loadMoreLine.children[0].children[0]);
+    if (loadMoreLine.children[0].children[0]) {
+      loadMoreLine.children[0].removeChild(loadMoreLine.children[0].children[0]);
+    }
     loadMoreLine.children[1].innerText = "";
     (_a = trNodes[0].parentElement) == null ? void 0 : _a.appendChild(loadMoreLine);
-    updateLineNumberInDataset(loadMoreLine, expandThreshold.value, "bottom");
+    const res = updateLineNumberInDataset(loadMoreLine, expandThreshold.value, "bottom");
+    if (!res) {
+      loadMoreLine.remove();
+      return;
+    }
     attachExpandUpDownButton(loadMoreLine.children[0], "down");
   };
   const insertIncrementCode = (code, direction, referenceDom) => {
@@ -15016,7 +15038,7 @@ function useCodeReviewExpand(reviewContentRef, props) {
     }
     const prefix = "--- updated_at	Jan 1, 2019, 0:0:0 AM\n+++ updated_at	Jan 1, 2019, 0:0:0 AM\n";
     const container = document.createElement("div");
-    parseDiffCode(container, prefix + code, outputFormat.value);
+    parseDiffCode(container, prefix + code, outputFormat.value, true);
     const trNodes = Array.from(container.querySelectorAll("tr"));
     const expandLine = trNodes.find((element) => {
       var _a;
@@ -25945,9 +25967,11 @@ var Tooltip = defineComponent({
       onMouseenterOverlay
     } = useTooltip(origin, props);
     const ns2 = useNamespace$1("tooltip");
-    const className2 = computed(() => {
-      return [ns2.b(), ns2.m(placement.value)].join(" ");
-    });
+    const className2 = computed(() => ({
+      [ns2.b()]: true,
+      [ns2.m(placement.value)]: true,
+      [ns2.m("with-content")]: slots.content
+    }));
     provide(POPPER_TRIGGER_TOKEN, origin);
     return () => createVNode(Fragment, null, [createVNode(PopperTrigger, null, {
       default: () => {
@@ -25974,9 +25998,12 @@ var Tooltip = defineComponent({
           "onMouseenter": onMouseenterOverlay,
           "onMouseleave": onMouseleave
         }, {
-          default: () => [createVNode("span", {
-            "innerHTML": content2.value
-          }, null)]
+          default: () => {
+            var _a;
+            return [slots.content ? (_a = slots.content) == null ? void 0 : _a.call(slots) : createVNode("span", {
+              "innerHTML": content2.value
+            }, null)];
+          }
         })]
       })]
     })]);
@@ -30350,6 +30377,10 @@ const menuProps = {
   router: {
     type: Boolean,
     default: false
+  },
+  disableOverflowStyle: {
+    type: Boolean,
+    default: false
   }
 };
 var menu = "";
@@ -30443,7 +30474,7 @@ var Menu = defineComponent({
         const container = overflowContainerElement.children[1];
         const ob = new IntersectionObserver((entries) => {
           entries.forEach((entry) => {
-            if (!entry.isIntersecting) {
+            if (!entry.isIntersecting && !props.disableOverflowStyle) {
               const cloneNode = entry.target.cloneNode(true);
               if (entry.target.classList.contains(`${ns2.b()}-overflow-container`)) {
                 if (flag && entry.target.previousElementSibling && container.children.length) {
@@ -30514,7 +30545,7 @@ var Menu = defineComponent({
         "key": "overflowContainer",
         "title": "...",
         "class": overflowContainerClassName
-      }, null), [[vShow, overflowItemLength.value > 0 && mode.value === "horizontal"]])]);
+      }, null), [[vShow, overflowItemLength.value > 0 && mode.value === "horizontal" && !props.disableOverflowStyle]])]);
     };
   }
 });
@@ -44030,7 +44061,7 @@ const installs = [
   VirtualListInstall
 ];
 var vueDevui = {
-  version: "1.5.14",
+  version: "1.5.15",
   install(app) {
     installs.forEach((p) => app.use(p));
   }