From b69b5f6329ca5f87932436b7a6c1ddfc3377e10f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 16 五月 2024 10:56:41 +0800
Subject: [PATCH] 2024-05-16

---
 src/tabviews/zshare/actionList/funczip/index.jsx |   80 ++++++++++++----------------------------
 1 files changed, 24 insertions(+), 56 deletions(-)

diff --git a/src/tabviews/zshare/actionList/funczip/index.jsx b/src/tabviews/zshare/actionList/funczip/index.jsx
index cf511b5..5181920 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 () {
@@ -102,12 +99,15 @@
   /**
    * @description 瑙﹀彂鎸夐挳鎿嶄綔
    */
-  actionTrigger = (triggerId, record, type) => {
-    const { BID, btn, selectedData, setting } = this.props
+  actionTrigger = (triggerId, record, type, lid) => {
+    const { BID, btn, selectedData, setting, LID } = this.props
     const { loading, disabled } = this.state
 
     if (loading || disabled) return
     if (triggerId && btn.uuid !== triggerId) return
+    if (type === 'linkbtn' && !btn.$toolbtn && LID !== lid) return
+
+    let data = record || selectedData || []
 
     if (setting.supModule && !BID) {
       notification.warning({
@@ -116,13 +116,7 @@
         duration: 5
       })
       return
-    } else if (type === 'linkbtn' && !btn.$toolbtn && !is(fromJS(selectedData || []), fromJS(record))) {
-      return
-    }
-
-    let data = record || selectedData || []
-    
-    if (btn.Ot !== 'notRequired' && data.length === 0) {
+    } else if (btn.Ot !== 'notRequired' && data.length === 0) {
       notification.warning({
         top: 92,
         message: '璇烽�夋嫨琛岋紒',
@@ -340,9 +334,7 @@
     const { btn } = this.props
 
     this.setState({
-      loading: false,
-      loadingNumber: '',
-      loadingTotal: ''
+      loading: false
     })
     
     if (btn.execSuccess !== 'never') {
@@ -361,9 +353,7 @@
     const { btn } = this.props
 
     this.setState({
-      loading: false,
-      loadingNumber: '',
-      loadingTotal: ''
+      loading: false
     })
 
     if (res.ErrCode === '01') {
@@ -411,52 +401,30 @@
 
   render() {
     const { btn } = this.props
-    const { loading, disabled, hidden, loadingNumber, loadingTotal } = this.state
+    const { loading, disabled, hidden } = this.state
 
     if (hidden) return null
 
     let label = ''
-    let icon = ''
-    let type = 'link'
-    let className = ''
 
-    if (btn.show === 'button') {
-      label = btn.label
-      icon = btn.icon || ''
-    } else if (btn.show === 'link') {
-      label = <span>{btn.label}{btn.icon ? <MkIcon style={{marginLeft: '8px'}} type={btn.icon}/> : ''}</span>
-      icon = ''
+    if (btn.show === 'link') {
+      label = <span>{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
+      label = !loading ? <MkIcon type={btn.icon} /> : null
     } else {
-      type = ''
-      icon = btn.icon || ''
-      label = btn.label
-      className = 'mk-btn mk-' + btn.class
+      label = <span>{!loading && btn.icon ? <MkIcon style={{marginRight: '8px'}} type={btn.icon} /> : ''}{btn.label}</span>
     }
     
-    if (loadingNumber && !loadingTotal && btn.$toolbtn && (!btn.show || btn.show === 'button')) {
-      label = (loadingNumber && !loadingTotal ? `(${loadingNumber})` : '') + btn.label
-    }
-
     return (
-      <>
-        <Button
-          type={type}
-          title={disabled ? (btn.reason || '') : (btn.show === 'icon' ? btn.label : '')}
-          loading={loading}
-          disabled={disabled}
-          style={btn.style}
-          icon={icon}
-          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}
-      </>
+      <Button
+        type="link"
+        title={disabled ? (btn.reason || '') : (btn.show === 'icon' ? btn.label : '')}
+        loading={loading}
+        disabled={disabled}
+        style={btn.style}
+        className={btn.hover || ''}
+        onClick={(e) => {e.stopPropagation(); this.actionTrigger()}}
+      >{label}</Button>
     )
   }
 }

--
Gitblit v1.8.0