From d91fa969e6044f6b22554a80c8c0e8aeb22820bb Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 01 八月 2023 09:50:21 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/components/table/edit-table/normalTable/index.jsx | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
index f8bfcf3..4df974a 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
@@ -1675,13 +1675,11 @@
param.func = 'sPC_TableData_InUpDe'
if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
- result.sql = result.sql.replace(/\$@/ig, '/*')
- result.sql = result.sql.replace(/@\$/ig, '*/')
- result.bottom = result.bottom.replace(/\$@/ig, '/*')
- result.bottom = result.bottom.replace(/@\$/ig, '*/')
+ result.sql = result.sql.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
+ result.bottom = result.bottom.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
} else {
- result.sql = result.sql.replace(/@\$|\$@/ig, '')
- result.bottom = result.bottom.replace(/@\$|\$@/ig, '')
+ result.sql = result.sql.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
+ result.bottom = result.bottom.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
}
param.excel_in_type = 'true'
--
Gitblit v1.8.0