From d1cd5af5adb53e91efdd278328e1b6f8ad834fb5 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期四, 06 二月 2025 21:11:56 +0800 Subject: [PATCH] Merge branch 'positec' into dms --- src/tabviews/custom/components/share/normalTable/index.jsx | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/tabviews/custom/components/share/normalTable/index.jsx b/src/tabviews/custom/components/share/normalTable/index.jsx index db3be11..4bfb15a 100644 --- a/src/tabviews/custom/components/share/normalTable/index.jsx +++ b/src/tabviews/custom/components/share/normalTable/index.jsx @@ -32,7 +32,7 @@ } if (item.field) { - __param.$searchkey = item.field.toLowerCase() + __param.$searchkey = item.field __param.$searchval = record[item.field] || '' } @@ -927,7 +927,7 @@ this.props.refreshdata({pageIndex}) } - mkCheckTopLine = (menuId, id, selected) => { + mkCheckTopLine = (menuId, id, selected, orikeys) => { const { MenuID, data, setting } = this.props if (MenuID !== menuId) return @@ -955,6 +955,16 @@ index = i } }) + } else if (selected === 'local') { + if (orikeys && orikeys.length) { + data.forEach((item, i) => { + if (!item.$disabled && orikeys.includes(item.$$uuid)) { + items.push(item) + keys.push(i) + index = i + } + }) + } } else if (selected !== 'false') { if (!data[0].$disabled) { index = 0 -- Gitblit v1.8.0