2020-04-15

king

2020-04-15 02a05c4e82e74c290e80ae7710fbb394ed7cac7a

 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,10 +2536,9 @@
  render() {
    const { loadingUuid, btnloading, loadingNumber } = this.state

    if (this.props.setting.actionfixed && this.props.type === 'main') { // 按钮是否固定在头部
      return (
        <Affix offsetTop={48}>
          <div className="button-list toolbar-button" id={this.props.MenuID + 'mainaction'}>
    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 !== '') {
@@ -2559,32 +2559,15 @@
            {btnloading && <Spin size="large" />}
            <ExcelIn MenuID={this.props.MenuID} returndata={this.getexceldata} ref="excelIn" />
          </div>

    if (fixed) {
      return (
        <Affix offsetTop={48}>
          {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
    }
  }
}