From f2acacad2b7ff966165a05df708f844f0a96be66 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 22 十月 2024 17:03:25 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/table/edit-table/normalTable/index.jsx | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 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 d5c4720..03add13 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
@@ -877,6 +877,9 @@
}
if (col.format === 'percent') {
content = content * 100
+ if (!col.round) {
+ content = +content.toFixed(2)
+ }
} else if (col.format === 'abs') {
content = Math.abs(content)
}
@@ -1207,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)
}
@@ -2062,8 +2068,8 @@
let cell = {
id: ex.id,
- exps: exps,
menuname: item.label + '锛堣〃鍗曪級',
+ exps: exps,
md5_id: ''
}
@@ -2077,6 +2083,7 @@
if (localItems.length) {
deffers.push({
$backend: true,
+ $type: 's_Get_SelectedList',
data: localItems
})
}
@@ -2084,6 +2091,7 @@
if (mainItems.length) {
deffers.push({
$backend: true,
+ $type: 's_Get_SelectedList',
data: mainItems,
rduri: window.GLOB.mainSystemApi
})
@@ -2632,10 +2640,11 @@
return {
$backend: true,
+ $type: 's_TableData_InUpDe',
data: [{
id: ex.id,
- exps: exps,
menuname: btn.logLabel || '',
+ exps: exps,
md5_id: md5_id
}]
}
--
Gitblit v1.8.0