From 02a05c4e82e74c290e80ae7710fbb394ed7cac7a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 15 四月 2020 12:51:04 +0800
Subject: [PATCH] 2020-04-15
---
src/tabviews/zshare/actionList/index.jsx | 75 ++++++++++++++-----------------------
1 files changed, 29 insertions(+), 46 deletions(-)
diff --git a/src/tabviews/zshare/actionList/index.jsx b/src/tabviews/zshare/actionList/index.jsx
index ab71c63..533eb25 100644
--- a/src/tabviews/zshare/actionList/index.jsx
+++ b/src/tabviews/zshare/actionList/index.jsx
@@ -357,7 +357,8 @@
let param = {
func: 's_PrintTemplateMGetData',
Type: 'Y',
- ID: tempId
+ // ID: tempId, // 娣诲姞妯℃澘鏃讹紝淇濆瓨鍙婃煡璇娇鐢ㄦā鏉垮弬鏁�
+ PrintTempNO: tempId
}
if (window.GLOB.mainSystemApi) { // 浠庡崟鐐圭櫥褰曟湇鍔″櫒鍙栨墦鍗伴厤缃俊鎭�
@@ -2535,56 +2536,38 @@
render() {
const { loadingUuid, btnloading, loadingNumber } = this.state
- if (this.props.setting.actionfixed && this.props.type === 'main') { // 鎸夐挳鏄惁鍥哄畾鍦ㄥご閮�
+ let fixed = this.props.setting.actionfixed && this.props.type === 'main' // 鎸夐挳鏄惁鍥哄畾鍦ㄥご閮�
+
+ let actionlist = <div className="button-list toolbar-button" id={fixed ? this.props.MenuID + 'mainaction' : ''}>
+ {this.props.actions.map((item, index) => {
+ let label = item.label
+ if (loadingUuid === item.uuid && loadingNumber !== '') {
+ label = label + '(' + loadingNumber + ')'
+ }
+
+ return (
+ <Button
+ className={'mk-btn mk-' + item.class}
+ icon={item.icon}
+ key={'action' + index}
+ onClick={() => {this.actionTrigger(item)}}
+ loading={loadingUuid === item.uuid}
+ >{label}</Button>
+ )
+ })}
+ {this.getModels()}
+ {btnloading && <Spin size="large" />}
+ <ExcelIn MenuID={this.props.MenuID} returndata={this.getexceldata} ref="excelIn" />
+ </div>
+
+ if (fixed) {
return (
<Affix offsetTop={48}>
- <div className="button-list toolbar-button" id={this.props.MenuID + 'mainaction'}>
- {this.props.actions.map((item, index) => {
- let label = item.label
- if (loadingUuid === item.uuid && loadingNumber !== '') {
- label = label + '(' + loadingNumber + ')'
- }
-
- return (
- <Button
- className={'mk-btn mk-' + item.class}
- icon={item.icon}
- key={'action' + index}
- onClick={() => {this.actionTrigger(item)}}
- loading={loadingUuid === item.uuid}
- >{label}</Button>
- )
- })}
- {this.getModels()}
- {btnloading && <Spin size="large" />}
- <ExcelIn MenuID={this.props.MenuID} returndata={this.getexceldata} ref="excelIn" />
- </div>
+ {actionlist}
</Affix>
)
} else {
- return (
- <div className="button-list toolbar-button">
- {this.props.actions.map((item, index) => {
- let label = item.label
- if (loadingUuid === item.uuid && loadingNumber !== '') {
- label = label + '(' + loadingNumber + ')'
- }
-
- return (
- <Button
- className={'mk-btn mk-' + item.class}
- icon={item.icon}
- key={'action' + index}
- onClick={() => {this.actionTrigger(item)}}
- loading={loadingUuid === item.uuid}
- >{label}</Button>
- )
- })}
- {this.getModels()}
- {btnloading && <Spin size="large" />}
- <ExcelIn MenuID={this.props.MenuID} returndata={this.getexceldata} ref="excelIn" />
- </div>
- )
+ return actionlist
}
}
}
--
Gitblit v1.8.0