From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/tabviews/zshare/normalTable/index.jsx |   61 +++++++++---------------------
 1 files changed, 18 insertions(+), 43 deletions(-)

diff --git a/src/tabviews/zshare/normalTable/index.jsx b/src/tabviews/zshare/normalTable/index.jsx
index 9c42ac2..555c45c 100644
--- a/src/tabviews/zshare/normalTable/index.jsx
+++ b/src/tabviews/zshare/normalTable/index.jsx
@@ -1,7 +1,6 @@
 import React, {Component} from 'react'
 import PropTypes from 'prop-types'
 import md5 from 'md5'
-import { connect } from 'react-redux'
 import { is, fromJS } from 'immutable'
 import { Table, Affix, Typography } from 'antd'
 
@@ -61,7 +60,7 @@
   }
 
   UNSAFE_componentWillMount () {
-    const { menuType, memberLevel, pageSize, setting } = this.props
+    const { pageSize, setting } = this.props
     let columns = fromJS(this.props.columns).toJS()
     let lineMarks = []
     let _columns = []
@@ -105,12 +104,12 @@
         _columns.push(cell)
       })
     } else {
-      if (window.GLOB.dataFormat && menuType !== 'HS' && memberLevel) {
+      if (window.GLOB.dataFormat && !window.GLOB.mkHS) {
         _format = true
   
-        if (memberLevel >= 30) {
+        if (window.GLOB.memberLevel >= 30) {
           radio = 20
-        } else if (memberLevel >= 20) {
+        } else if (window.GLOB.memberLevel >= 20) {
           radio = 10
         }
       }
@@ -401,40 +400,30 @@
     let icon = ''
 
     marks.some(mark => {
-      let originVal = record[mark.field] + ''
+      let originVal = record[mark.field]
       let contrastVal = ''
       if (mark.contrastType === 'static') {
-        contrastVal = mark.contrastValue + ''
+        contrastVal = mark.contrastValue
       } else {
-        contrastVal = record[mark.contrastField] + ''
+        contrastVal = record[mark.contrastField]
       }
+
+      if (originVal === undefined || contrastVal === undefined) return false
 
       if (mark.match === '=') {
         className = originVal === contrastVal ? mark.color[1] : ''
       } else if (mark.match === '!=') {
         className = originVal !== contrastVal ? mark.color[1] : ''
       } else if (mark.match === 'like') {
+        originVal = originVal + ''
+        contrastVal = contrastVal + ''
         className = originVal.indexOf(contrastVal) > -1 ? mark.color[1] : ''
       } else if (mark.match === '>') {
-        try {
-          originVal = parseFloat(originVal)
-          contrastVal = parseFloat(contrastVal)
-        } catch (e) {
-          originVal = NaN
-        }
-
-        if (!isNaN(originVal) && !isNaN(contrastVal) && originVal > contrastVal) {
+        if (parseFloat(originVal) > parseFloat(contrastVal)) {
           className = mark.color[1]
         }
       } else if (mark.match === '<') {
-        try {
-          originVal = parseFloat(originVal)
-          contrastVal = parseFloat(contrastVal)
-        } catch (e) {
-          originVal = NaN
-        }
-
-        if (!isNaN(originVal) && !isNaN(contrastVal) && originVal < contrastVal) {
+        if (parseFloat(originVal) < parseFloat(contrastVal)) {
           className = mark.color[1]
         }
       }
@@ -749,7 +738,6 @@
                   btn={btn}
                   BID={record.$$BID}
                   disabled={record.$disabled}
-                  lineId={record.$$key || ''}
                   selectedData={[record]}
                   BData={this.props.BData}
                   setting={this.props.setting}
@@ -764,7 +752,6 @@
                   btn={btn}
                   BID={record.$$BID}
                   disabled={record.$disabled}
-                  lineId={record.$$key || ''}
                   selectedData={[record]}
                   BData={this.props.BData}
                   setting={this.props.setting}
@@ -776,7 +763,6 @@
                   key={btn.uuid}
                   btn={btn}
                   disabled={record.$disabled}
-                  lineId={record.$$key || ''}
                   selectedData={[record]}
                   BData={this.props.BData}
                   MenuID={this.props.MenuID}
@@ -789,7 +775,6 @@
                   key={btn.uuid}
                   btn={btn}
                   disabled={record.$disabled}
-                  lineId={record.$$key || ''}
                   selectedData={[record]}
                   BData={this.props.BData}
                   setting={this.props.setting}
@@ -1049,11 +1034,12 @@
    * 
    */
   onSelectChange = selectedRowKeys => {
-    const { setting } = this.props
+    const { setting, data } = this.props
 
     let index = ''
     let _activeIndex = null
     if (selectedRowKeys.length > 0) {
+      selectedRowKeys = selectedRowKeys.filter(key => !data[key].$disabled)
       index = selectedRowKeys.slice(-1)[0]
     }
 
@@ -1065,7 +1051,7 @@
 
     this.setState({ selectedRowKeys, activeIndex: _activeIndex })
 
-    let selects = this.props.data.filter((item, _index) => selectedRowKeys.includes(_index) && !item.$disabled)
+    let selects = data.filter((item, _index) => selectedRowKeys.includes(_index) && !item.$disabled)
 
     this.props.chgSelectData(selects)
   }
@@ -1210,7 +1196,7 @@
     if (!setting.doubleClick) return
     if (record.$disabled) return
 
-    MKEmitter.emit('triggerBtnId', setting.doubleClick, [record])
+    MKEmitter.emit('triggerBtnId', setting.doubleClick, [record], 'linkbtn')
   }
 
   render() {
@@ -1397,15 +1383,4 @@
   }
 }
 
-const mapStateToProps = (state) => {
-  return {
-    menuType: state.editLevel,
-    memberLevel: state.memberLevel
-  }
-}
-
-const mapDispatchToProps = () => {
-  return {}
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(NormalTable)
\ No newline at end of file
+export default NormalTable
\ No newline at end of file

--
Gitblit v1.8.0