From b5fd20aa2c1ce63b9151e2a93702f59cfe493368 Mon Sep 17 00:00:00 2001
From: Tsanie <lchen@foresightintelligence.com>
Date: Mon, 29 Jan 2024 09:29:37 +0800
Subject: [PATCH] Grid.removeItem issue

---
 lib/ui/grid/grid.d.ts  | 3 ++-
 lib/ui/grid/grid.js    | 5 +++--
 lib/utility/strings.js | 8 +++++++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/lib/ui/grid/grid.d.ts b/lib/ui/grid/grid.d.ts
index 58bb419..f439b19 100644
--- a/lib/ui/grid/grid.d.ts
+++ b/lib/ui/grid/grid.d.ts
@@ -257,8 +257,9 @@ export class Grid {
      * 添加行数据
      * @param item 待添加的行数据值
      * @param index 待添加的行索引
+     * @returns 返回已添加的行数据
      */
-    addItem(item: GridItem, index?: number): void;
+    addItem(item: GridItem, index?: number): GridItem;
     /**
      * 删除行数据
      * @param index 待删除的行索引
diff --git a/lib/ui/grid/grid.js b/lib/ui/grid/grid.js
index b574835..2da38df 100644
--- a/lib/ui/grid/grid.js
+++ b/lib/ui/grid/grid.js
@@ -200,6 +200,7 @@ export class Grid {
             }
         }
         this.reload();
+        return item;
     }
 
     removeItem(index) {
@@ -213,11 +214,11 @@ export class Grid {
         if (this._var.colAttrs.__filtered === true) {
             this._var.source.splice(it.__index, 1);
         }
-        for (let i = it.__index + 1; i < this._var.source.length; --i) {
+        for (let i = it.__index; i < this._var.source.length; ++i) {
             this._var.source[i].__index -= 1;
         }
         this.reload();
-        return item;
+        return it.values;
     }
 
     _refreshSource(list) {
diff --git a/lib/utility/strings.js b/lib/utility/strings.js
index 8ab6464..3371e86 100644
--- a/lib/utility/strings.js
+++ b/lib/utility/strings.js
@@ -45,8 +45,14 @@ export function formatUrl(msg) {
             }
         }
 
+        let path;
+        if (typeof consts !== 'undefined') {
+            path = consts.path;
+        } else if (typeof _network !== 'undefined') {
+            path = _network.root;
+        }
         for (let r of rs) {
-            msg = msg.replaceAll(r, '<a target="_blank" href="' + r + '"><svg><use xlink:href="' + ((typeof consts !== 'undefined' && consts.path) || '') + 'fonts/fa-regular.svg#link"></use></svg></a>');
+            msg = msg.replaceAll(r, `<a target="_blank" href="${r}"><svg><use xlink:href="${path || ''}fonts/fa-regular.svg#link"></use></svg></a>`);
         }
     }