From 48720932d6e13e8bf831c79be432f2d7e7abee09 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 25 三月 2025 10:12:51 +0800
Subject: [PATCH] 2025-03-25
---
src/views/transystem/index.jsx | 42 +++++++++++++++++++++++++++++++-----------
1 files changed, 31 insertions(+), 11 deletions(-)
diff --git a/src/views/transystem/index.jsx b/src/views/transystem/index.jsx
index f03e854..9cb08e9 100644
--- a/src/views/transystem/index.jsx
+++ b/src/views/transystem/index.jsx
@@ -40,6 +40,11 @@
if (list.rows) {
list = list.rows
+ list = list.map(item => {
+ item.Sort = +item.Sort
+ return item
+ })
+ list.sort((a, b) => a.Sort - b.Sort)
}
result = []
@@ -81,7 +86,7 @@
}
}
- cell.dataSource = cell.dataSource.replace(/@userid[^0-9a-z_@]/ig, '@UserID@')
+ cell.dataSource = cell.dataSource.replace(/@userid[^0-9a-z_@]/ig, (w) => w.replace(/@UserID/i, '@UserID@'))
if (item.multiple === 'true') {
cell.type = 'multiselect'
@@ -216,9 +221,13 @@
tb += ` where ${data.AppendWhere.replace(/^\s*\(|\)\s*$/g, '')}`
}
- tb = tb.replace(/@ID[^0-9a-z_@]/ig, '@ID@')
- tb = tb.replace(/@BID[^0-9a-z_@]/ig, '@BID@')
- tb = tb.replace(/@userid[^0-9a-z_@]/ig, '@UserID@')
+ tb = tb.replace(/@ID[^0-9a-z_@]/ig, (w) => w.replace(/@ID/i, '@ID@'))
+ tb = tb.replace(/@BID[^0-9a-z_@]/ig, (w) => w.replace(/@BID/i, '@BID@'))
+ tb = tb.replace(/@userid[^0-9a-z_@]/ig, (w) => w.replace(/@UserID/i, '@UserID@'))
+
+ tb = tb.replace(/@ID@\s+nvarchar\(/ig, '@ID nvarchar(')
+ tb = tb.replace(/@BID@\s+nvarchar\(/ig, '@BID nvarchar(')
+ tb = tb.replace(/@userid@\s+nvarchar\(/ig, '@UserID nvarchar(')
result = {
tableName: '@db@' + data.TableName,
@@ -242,7 +251,11 @@
if (list.rows) {
list = list.rows
- list.reverse()
+ list = list.map(item => {
+ item.Sort = +item.Sort
+ return item
+ })
+ list.sort((a, b) => a.Sort - b.Sort)
}
result = []
@@ -282,7 +295,11 @@
if (list.rows) {
list = list.rows
- list.reverse()
+ list = list.map(item => {
+ item.Sort = +item.Sort
+ return item
+ })
+ list.sort((a, b) => a.Sort - b.Sort)
}
result = []
@@ -408,7 +425,7 @@
}
}
- cell.dataSource = cell.dataSource.replace(/@userid[^0-9a-z_@]/ig, '@UserID@')
+ cell.dataSource = cell.dataSource.replace(/@userid[^0-9a-z_@]/ig, (w) => w.replace(/@UserID/i, '@UserID@'))
if (item.Multi === 'true') {
cell.type = 'multiselect'
@@ -435,10 +452,13 @@
return w
})
- result = result.replace(/@ID[^0-9a-z_@]/ig, '@ID@')
- result = result.replace(/@BID[^0-9a-z_@]/ig, '@BID@')
- result = result.replace(/@userid[^0-9a-z_@]/ig, '@UserID@')
- // result = result.replace(/\n+/g, '\n')
+ result = result.replace(/@ID[^0-9a-z_@]/ig, (w) => w.replace(/@ID/i, '@ID@'))
+ result = result.replace(/@BID[^0-9a-z_@]/ig, (w) => w.replace(/@BID/i, '@BID@'))
+ result = result.replace(/@userid[^0-9a-z_@]/ig, (w) => w.replace(/@UserID/i, '@UserID@'))
+
+ result = result.replace(/@ID@\s+nvarchar\(/ig, '@ID nvarchar(')
+ result = result.replace(/@BID@\s+nvarchar\(/ig, '@BID nvarchar(')
+ result = result.replace(/@userid@\s+nvarchar\(/ig, '@UserID nvarchar(')
}
this.setState({value: result})
--
Gitblit v1.8.0