From 46aa44856bcb0e262d98918e06b4f83d2c11777a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 15 四月 2023 14:32:02 +0800
Subject: [PATCH] 2023-04-15
---
src/tabviews/zshare/actionList/normalbutton/index.jsx | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index 65f734e..4de4e94 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -890,15 +890,16 @@
}
})
+ let _data = {}
if (data) {
Object.keys(data).forEach(key => {
- data[key.toLowerCase()] = data[key]
+ _data[key.toLowerCase()] = data[key]
})
}
// 娣诲姞鏁版嵁涓瓧娈碉紝琛ㄥ崟鍊间紭鍏�(鎸夐挳涓嶉�夎鎴栧琛屾嫾鎺ユ椂璺宠繃)
if (data && btn.Ot !== 'notRequired' && columns && columns.length > 0) {
- datavars = {...data, ...datavars}
+ datavars = {..._data, ...datavars}
const setField = (col) => {
if (!col.field) return
@@ -2430,9 +2431,23 @@
MKEmitter.emit('popclose')
} else if (btn.execError !== 'never') {
MKEmitter.emit('refreshByButtonResult', btn.$menuId, btn.execError, btn, '', this.state.selines)
- } else if (btn.OpenType === 'form' && btn.formType !== 'counter') {
+ }
+ if (btn.OpenType === 'form') {
let data = this.props.selectedData && this.props.selectedData[0] ? this.props.selectedData[0] : null
- this.setState({check: data && data[btn.field] === btn.openVal})
+
+ if (btn.formType === 'counter') {
+ let count = 0
+ if (data && data[btn.field]) {
+ count = +data[btn.field]
+ if (isNaN(count)) {
+ count = 0
+ }
+ }
+
+ this.setState({count: count })
+ } else {
+ this.setState({check: data && data[btn.field] === btn.openVal})
+ }
}
if (window.GLOB.breakpoint) {
--
Gitblit v1.8.0