vue-devui 1.5.14 → 1.5.15-hotfix.1

package/code-review/index.es.js

@@ -4477,7 +4477,7 @@ var lodash = { exports: {} };
         customizer = typeof customizer == "function" ? customizer : undefined$1;
         return baseIsMatch(object, source, getMatchData(source), customizer);
       }
-      function isNaN(value) {
+      function isNaN2(value) {
         return isNumber(value) && value != +value;
       }
       function isNative(value) {
@@ -5551,7 +5551,7 @@ var lodash = { exports: {} };
       lodash2.isMap = isMap;
       lodash2.isMatch = isMatch;
       lodash2.isMatchWith = isMatchWith;
-      lodash2.isNaN = isNaN;
+      lodash2.isNaN = isNaN2;
       lodash2.isNative = isNative;
       lodash2.isNil = isNil;
       lodash2.isNull = isNull;
@@ -6478,7 +6478,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,
@@ -6489,7 +6489,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);
@@ -6502,7 +6502,9 @@ function parseDiffCode(container, code, outputFormat) {
       newTrStr += `<tr>${leftTdList == null ? void 0 : leftTdList.join("")}${rightTdList == null ? void 0 : rightTdList.join("")}</tr>`;
     }
     const tbodyAttr = ((_a = diffHtmlStr.match(TableTbodyAttrReg)) == null ? void 0 : _a[1]) || "";
-    const newDiffHtmlStr = diffHtmlStr.replace(TableTbodyReg, `<tbody ${tbodyAttr}>${newTrStr}</tbody>`);
+    const emptyDiffHtmlStr = diffHtmlStr.replace(TableTbodyReg, `<tbody${tbodyAttr}></tbody>`);
+    const index2 = emptyDiffHtmlStr.indexOf(`<tbody${tbodyAttr}>`);
+    const newDiffHtmlStr = emptyDiffHtmlStr.slice(0, index2) + newTrStr + emptyDiffHtmlStr.slice(index2);
     diff2HtmlUi.diffHtml = newDiffHtmlStr;
   }
   diff2HtmlUi.draw();
@@ -6523,6 +6525,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;
@@ -6535,9 +6538,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;
@@ -6553,9 +6556,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;
@@ -6568,9 +6576,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;
@@ -6586,7 +6594,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;
@@ -6764,10 +6776,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) => {
@@ -6779,7 +6797,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;
@@ -6841,10 +6859,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) => {
@@ -6856,7 +6880,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;