vue-devui 1.6.24 → 1.6.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-devui",
-  "version": "1.6.24",
+  "version": "1.6.26",
   "license": "MIT",
   "description": "DevUI components based on Vite and Vue3",
   "keywords": [

package/types/code-review/src/composables/use-code-review-line-selection.d.ts

@@ -1,5 +1,8 @@
 import type { Ref } from 'vue';
 import type { CodeReviewProps } from '../code-review-types';
-export declare function useCodeReviewLineSelection(reviewContentRef: Ref<HTMLElement>, props: CodeReviewProps, mouseMoveCb: () => void, mouseupCb: () => void): {
+export declare function useCodeReviewLineSelection(reviewContentRef: Ref<HTMLElement>, props: CodeReviewProps, afterMouseup: (lineNumbers: {
+    lefts: number[];
+    rights: number[];
+}) => void): {
     onMousedown: (e: MouseEvent) => void;
 };

package/types/code-review/src/utils.d.ts

@@ -19,3 +19,7 @@ export declare function addCommentToPageForDoubleColumn(lineHost: HTMLElement, c
 export declare function findReferenceDomForSingleColumn(parentNode: HTMLElement, lineNumber: number, lineSide: LineSide): HTMLTableRowElement | undefined;
 export declare function findReferenceDomForDoubleColumn(parentNode: HTMLElement, lineNumber: number, lineSide: LineSide): HTMLTableRowElement | undefined;
 export declare function findParentTrNode(node: HTMLElement | null): any;
+export declare function getLineNumbers(trNodes: HTMLElement[], outputFormat: OutputFormat, side: LineSide): {
+    lefts: number[];
+    rights: number[];
+};

package/vue-devui.es.js

@@ -17523,6 +17523,36 @@ function findParentTrNode(node) {
   }
   return findParentTrNode(node.parentElement);
 }
+function getFullNumberList(min, max) {
+  return Array.from({ length: max - min + 1 }, (_, i) => i + min);
+}
+function getLineNumbers(trNodes, outputFormat, side) {
+  var _a, _b;
+  const leftNumbers = [];
+  const rightNumbers = [];
+  for (let i = 0; i < trNodes.length; i++) {
+    const itemTrNode = trNodes[i];
+    if (outputFormat === "line-by-line") {
+      const lineNumberTdNode = Array.from(itemTrNode.children)[0];
+      const leftLineNumber = parseInt((_a = lineNumberTdNode.children[0]) == null ? void 0 : _a.innerText);
+      const rightLineNumber = parseInt((_b = lineNumberTdNode.children[1]) == null ? void 0 : _b.innerText);
+      leftLineNumber && leftNumbers.push(leftLineNumber);
+      rightLineNumber && rightNumbers.push(leftLineNumber);
+    } else {
+      const tdNodes = Array.from(itemTrNode.children);
+      const lineNumberTdNode = tdNodes[side === "left" ? 0 : 2];
+      if (lineNumberTdNode && notEmptyNode(lineNumberTdNode)) {
+        const lineNumber = parseInt(lineNumberTdNode.innerText);
+        if (lineNumber) {
+          side === "left" ? leftNumbers.push(lineNumber) : rightNumbers.push(lineNumber);
+        }
+      }
+    }
+  }
+  const lefts = leftNumbers.length ? getFullNumberList(leftNumbers[0], leftNumbers[leftNumbers.length - 1]) : leftNumbers;
+  const rights = rightNumbers.length ? getFullNumberList(rightNumbers[0], rightNumbers[rightNumbers.length - 1]) : rightNumbers;
+  return { lefts, rights };
+}
 function useCodeReviewExpand(reviewContentRef, props) {
   const { outputFormat, expandThreshold, expandLoader } = toRefs(props);
   const processSideBySide = () => {
@@ -17750,7 +17780,7 @@ function useCodeReviewFold(props, ctx2) {
   });
   return { isFold, toggleFold };
 }
-function useCodeReviewLineSelection(reviewContentRef, props, mouseMoveCb, mouseupCb) {
+function useCodeReviewLineSelection(reviewContentRef, props, afterMouseup) {
   const ns2 = useNamespace$1("code-review");
   let dragging = false;
   let startTrNode;
@@ -17758,6 +17788,7 @@ function useCodeReviewLineSelection(reviewContentRef, props, mouseMoveCb, mouseu
   let isClickedLeft;
   let shouldClear;
   let isMouseMoved;
+  let checkedTrNodes = [];
   const onMousedown2 = (e) => {
     if (e.button === 0) {
       const composedPath = e.composedPath();
@@ -17822,7 +17853,6 @@ function useCodeReviewLineSelection(reviewContentRef, props, mouseMoveCb, mouseu
     if (endIndex === -1) {
       return;
     }
-    mouseMoveCb();
     if (startIndex > endIndex) {
       [startIndex, endIndex] = [endIndex, startIndex];
     }
@@ -17834,9 +17864,11 @@ function useCodeReviewLineSelection(reviewContentRef, props, mouseMoveCb, mouseu
     } else {
       position = "right";
     }
+    checkedTrNodes = [];
     for (let i = 0; i < trNodes.length; i++) {
       if (i >= startIndex && i <= endIndex) {
         toggleCommentCheckedClass(trNodes[i], true, position);
+        checkedTrNodes.push(trNodes[i]);
       } else {
         toggleCommentCheckedClass(trNodes[i], false, position);
       }
@@ -17845,7 +17877,7 @@ function useCodeReviewLineSelection(reviewContentRef, props, mouseMoveCb, mouseu
   function onMouseup() {
     dragging = false;
     if (isMouseMoved) {
-      mouseupCb();
+      afterMouseup(getLineNumbers(checkedTrNodes, props.outputFormat, isClickedLeft ? "left" : "right"));
     }
     document.removeEventListener("mouseup", onMouseup);
     document.removeEventListener("mousemove", onMousemove);
@@ -17884,7 +17916,7 @@ function useCodeReviewLineSelection(reviewContentRef, props, mouseMoveCb, mouseu
 function useCodeReviewComment(reviewContentRef, props, ctx2) {
   const { outputFormat, allowComment, allowChecked } = toRefs(props);
   const ns2 = useNamespace$1("code-review");
-  const { onMousedown: onMousedown2 } = useCodeReviewLineSelection(reviewContentRef, props, updateLineNumbers, afterCheckLines);
+  const { onMousedown: onMousedown2 } = useCodeReviewLineSelection(reviewContentRef, props, afterMouseup);
   const commentLeft = ref(-100);
   const commentTop = ref(-100);
   let currentLeftLineNumber = -1;
@@ -17987,24 +18019,6 @@ function useCodeReviewComment(reviewContentRef, props, ctx2) {
       resetLeftTop();
     }
   };
-  const getLineNumbers = (currentNumber, currentNumbers) => {
-    if (currentNumber === -1) {
-      return currentNumbers;
-    }
-    if (currentNumbers.length === 0) {
-      return [currentNumber];
-    }
-    const numbers = [...currentNumbers];
-    let max = Math.max(...numbers);
-    let min = Math.min(...numbers);
-    if (currentNumber < min) {
-      min = currentNumber;
-    }
-    if (currentNumber > max) {
-      max = currentNumber;
-    }
-    return Array.from({ length: max - min + 1 }, (_, i) => i + min);
-  };
   const getCommonClassAndJudge = () => {
     const checkedLine = [currentLeftLineNumbers, currentRightLineNumbers];
     return {
@@ -18071,9 +18085,9 @@ function useCodeReviewComment(reviewContentRef, props, ctx2) {
     }
     getDoubleCheckedLineCode(shouldRenderClass);
   }
-  function updateLineNumbers() {
-    currentLeftLineNumbers = currentLeftLineNumber === -1 ? currentLeftLineNumbers : getLineNumbers(currentLeftLineNumber, currentLeftLineNumbers);
-    currentRightLineNumbers = currentRightLineNumber === -1 ? currentRightLineNumbers : getLineNumbers(currentRightLineNumber, currentRightLineNumbers);
+  function updateLineNumbers({ lefts, rights }) {
+    currentLeftLineNumbers = lefts;
+    currentRightLineNumbers = rights;
     getCheckedLineCode(false);
     afterCheckLinesEmitData = {
       left: currentLeftLineNumber,
@@ -18086,6 +18100,8 @@ function useCodeReviewComment(reviewContentRef, props, ctx2) {
     };
   }
   const updateCheckedLineClass = () => {
+    const lineClassName = props.outputFormat === "line-by-line" ? ".d2h-code-linenumber" : ".d2h-code-side-linenumber";
+    allTrNodes = reviewContentRef.value.querySelectorAll(lineClassName);
     getCheckedLineCode(true);
   };
   const resetCommentClass = () => {
@@ -18122,6 +18138,10 @@ function useCodeReviewComment(reviewContentRef, props, ctx2) {
   function afterCheckLines() {
     ctx2.emit("afterCheckLines", afterCheckLinesEmitData);
   }
+  function afterMouseup(lineNumbers) {
+    updateLineNumbers(lineNumbers);
+    afterCheckLines();
+  }
   const onCommentIconClick = (e) => {
     if (e) {
       const composedPath = e.composedPath();
@@ -54285,7 +54305,7 @@ const installs = [
   VirtualListInstall
 ];
 var vueDevui = {
-  version: "1.6.24",
+  version: "1.6.26",
   install(app) {
     installs.forEach((p) => app.use(p));
   }