From eed5279d84fd59bc32f060a31b4006590cee4320 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 一月 2024 17:01:59 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/zshare/actionList/funczip/index.jsx | 22 +++++-----------------
1 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/src/tabviews/zshare/actionList/funczip/index.jsx b/src/tabviews/zshare/actionList/funczip/index.jsx
index cf511b5..e308d90 100644
--- a/src/tabviews/zshare/actionList/funczip/index.jsx
+++ b/src/tabviews/zshare/actionList/funczip/index.jsx
@@ -1,7 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Button, Modal, notification, message, Progress } from 'antd'
+import { Button, Modal, notification, message } from 'antd'
import JSZip from 'jszip'
import { saveAs } from 'file-saver'
@@ -10,7 +10,7 @@
import MKEmitter from '@/utils/events.js'
import MkIcon from '@/components/mk-icon'
-import './index.scss'
+// import './index.scss'
class FuncZip extends Component {
static propTpyes = {
@@ -21,10 +21,7 @@
state = {
loading: false,
disabled: false,
- loadingNumber: '',
- loadingTotal: '',
hidden: false,
- visible: false
}
UNSAFE_componentWillMount () {
@@ -340,9 +337,7 @@
const { btn } = this.props
this.setState({
- loading: false,
- loadingNumber: '',
- loadingTotal: ''
+ loading: false
})
if (btn.execSuccess !== 'never') {
@@ -361,9 +356,7 @@
const { btn } = this.props
this.setState({
- loading: false,
- loadingNumber: '',
- loadingTotal: ''
+ loading: false
})
if (res.ErrCode === '01') {
@@ -411,7 +404,7 @@
render() {
const { btn } = this.props
- const { loading, disabled, hidden, loadingNumber, loadingTotal } = this.state
+ const { loading, disabled, hidden } = this.state
if (hidden) return null
@@ -439,10 +432,6 @@
className = 'mk-btn mk-' + btn.class
}
- if (loadingNumber && !loadingTotal && btn.$toolbtn && (!btn.show || btn.show === 'button')) {
- label = (loadingNumber && !loadingTotal ? `(${loadingNumber})` : '') + btn.label
- }
-
return (
<>
<Button
@@ -455,7 +444,6 @@
className={className}
onClick={(e) => {e.stopPropagation(); this.actionTrigger()}}
>{label}</Button>
- {loadingTotal ? <Progress className="mk-button-progress" percent={(loadingTotal - loadingNumber) / loadingTotal * 100} size="small" showInfo={false} /> : null}
</>
)
}
--
Gitblit v1.8.0