From 8a1ee7d651500f848a3c2f05c7fe3be2b7114a43 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 10 四月 2024 00:47:56 +0800
Subject: [PATCH] 2024-04-10
---
src/tabviews/zshare/actionList/normalbutton/index.jsx | 49 +++++++++++++++++++------------------------------
1 files changed, 19 insertions(+), 30 deletions(-)
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index 1f42b73..30564b9 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -756,6 +756,9 @@
param.username = sessionStorage.getItem('User_Name') || ''
param.fullname = sessionStorage.getItem('Full_Name') || ''
}
+ if (btn.dataM === 'true') {
+ param.dataM = sessionStorage.getItem('dataM') === 'true' ? 'Y' : ''
+ }
let primaryId = ''
@@ -797,6 +800,9 @@
if (btn.recordUser === 'true') {
param.username = sessionStorage.getItem('User_Name') || ''
param.fullname = sessionStorage.getItem('Full_Name') || ''
+ }
+ if (btn.dataM === 'true') {
+ param.dataM = sessionStorage.getItem('dataM') === 'true' ? 'Y' : ''
}
let primaryId = setting.primaryKey ? cell[setting.primaryKey] || '' : ''
@@ -2345,9 +2351,9 @@
tabId = btn.refreshTab[btn.refreshTab.length - 1]
}
- if (btn.formCache === 'clear') { // 娓呴櫎琛ㄥ崟缂撳瓨
- window.GLOB.CacheMap = new Map()
- }
+ // if (btn.formCache === 'clear') { // 娓呴櫎琛ㄥ崟缂撳瓨
+ // window.GLOB.CacheMap = new Map()
+ // }
if (tabId && btn.$MenuID === tabId) { // 鍒锋柊褰撳墠鑿滃崟鏃讹紝鍋滄鍏朵粬鎿嶄綔
MKEmitter.emit('reloadMenuView', tabId, 'table')
@@ -3199,7 +3205,7 @@
}
modelconfirm = () => {
- const { btn, BID } = this.props
+ const { BID } = this.props
const { btnconfig, selines } = this.state
let _this = this
@@ -3344,7 +3350,7 @@
this.execSubmit(selines, () => {}, result)
} else {
confirm({
- title: btn.tipTitle || '纭畾瑕佹墽琛屽悧?',
+ title: btnconfig.setting.tipTitle || '纭畾瑕佹墽琛屽悧?',
onOk() {
return new Promise(resolve => {
_this.execSubmit(selines, resolve, result)
@@ -3543,42 +3549,25 @@
}
let label = ''
- let icon = ''
- let type = 'link'
- let className = ''
- if (btn.show === 'button') {
- label = name || btn.label
- icon = btn.icon || ''
- } else if (btn.show === 'link') {
- label = <span>{name || btn.label}{btn.icon ? <MkIcon style={{marginLeft: '8px'}} type={btn.icon}/> : ''}</span>
- icon = ''
+ if (btn.show === 'link') {
+ label = <span>{name || btn.label}{btn.icon ? <MkIcon style={{marginLeft: '8px'}} type={btn.icon} /> : ''}</span>
} else if (btn.show === 'icon') {
- icon = btn.icon || ''
- } else if (!btn.$toolbtn) {
- icon = btn.icon || ''
- label = btn.label
- className = 'mk-btn mk-' + (btn.class || 'unset')
+ label = !loading ? <MkIcon type={btn.icon} /> : null
+ } else if (btn.$toolbtn) {
+ label = <span>{!loading && btn.icon ? <MkIcon style={{marginRight: '8px'}} type={btn.icon} /> : ''}{loadingNumber && !loadingTotal ? `(${loadingNumber})` : ''}{btn.label}</span>
} else {
- type = ''
- icon = btn.icon || ''
- label = btn.label
- className = 'mk-btn mk-' + (btn.class || 'unset')
- }
-
- if (loadingNumber && btn.progress !== 'progressbar' && btn.$toolbtn && (!btn.show || btn.show === 'button')) {
- label = (loadingNumber ? `(${loadingNumber})` : '') + btn.label
+ label = <span>{!loading && btn.icon ? <MkIcon style={{marginRight: '8px'}} type={btn.icon} /> : ''}{name || btn.label}</span>
}
let BTN = <Button
- type={type}
- icon={icon}
+ type="link"
id={'button' + btn.uuid}
title={disabled ? (btn.reason || '') : (btn.show === 'icon' ? btn.label : '')}
loading={loading}
disabled={disabled}
style={btn.style}
- className={className}
+ className={btn.$toolbtn ? (btn.hover || '') : ''}
onClick={(e) => {e.stopPropagation(); this.actionTrigger()}}
>{label}</Button>
--
Gitblit v1.8.0