From 41c28c5c7bb2a211849b62b3681ffb7f77cdfb2b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 16 九月 2024 19:43:38 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/utils/utils-custom.js | 3 ++-
src/tabviews/custom/components/table/edit-table/normalTable/index.jsx | 3 +++
2 files changed, 5 insertions(+), 1 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 6e3aeef..03add13 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
@@ -1210,6 +1210,9 @@
}
if (col.format === 'percent') {
content = content * 100
+ if (!col.round) {
+ content = +content.toFixed(2)
+ }
} else if (col.format === 'abs') {
content = Math.abs(content)
}
diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index 156e414..b95f217 100644
--- a/src/utils/utils-custom.js
+++ b/src/utils/utils-custom.js
@@ -4819,7 +4819,8 @@
`
_tailScript = `${_tailScript}
- select @ErrorCode as ErrorCode,@retmsg as retmsg
+ aaa:
+ select @ErrorCode as ErrorCode,@retmsg as retmsg
`
}
--
Gitblit v1.8.0