2022-07-20

king

2022-07-20 ed7d889f7d9dfca77fd7f055ad8d6ec6ad85ae91

 src/tabviews/custom/components/share/normalTable/index.jsx

@@ -135,10 +135,12 @@

        if (mark.icon) {
          if (mark.position === 'front') {
            content = <span><MkIcon style={{color: mark.color}} type={mark.icon} /> {content}</span>
            content = <span><MkIcon style={mark.innerStyle} type={mark.icon} /> {content}</span>
          } else {
            content = <span>{content} <MkIcon style={{color: mark.color}} type={mark.icon} /></span>
            content = <span>{content} <MkIcon style={mark.innerStyle} type={mark.icon} /></span>
          }
        } else if (mark.innerStyle) {
          content = <span style={mark.innerStyle}>{content}</span>
        }
      }
      if (col.blur) {
@@ -195,10 +197,12 @@

        if (mark.icon) {
          if (mark.position === 'front') {
            content = <span><MkIcon style={{color: mark.color}} type={mark.icon} /> {content}</span>
            content = <span><MkIcon style={mark.innerStyle} type={mark.icon} /> {content}</span>
          } else {
            content = <span>{content} <MkIcon style={{color: mark.color}} type={mark.icon} /></span>
            content = <span>{content} <MkIcon style={mark.innerStyle} type={mark.icon} /></span>
          }
        } else if (mark.innerStyle) {
          content = <span style={mark.innerStyle}>{content}</span>
        }
      }

@@ -349,10 +353,12 @@

        if (mark.icon) {
          if (mark.position === 'front') {
            content = <span><MkIcon style={{color: mark.color}} type={mark.icon} /> {content}</span>
            content = <span><MkIcon style={mark.innerStyle} type={mark.icon} /> {content}</span>
          } else {
            content = <span>{content} <MkIcon style={{color: mark.color}} type={mark.icon} /></span>
            content = <span>{content} <MkIcon style={mark.innerStyle} type={mark.icon} /></span>
          }
        } else if (mark.innerStyle) {
          content = <span style={mark.innerStyle}>{content}</span>
        }
      }

@@ -664,6 +670,7 @@
    let index = ''
    let _activeIndex = null
    if (selectedRowKeys.length > 0) {
      selectedRowKeys = selectedRowKeys.filter(key => !data[key].$disabled)
      index = selectedRowKeys.slice(-1)[0]
    }

@@ -675,7 +682,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)
    if (setting.$hasSyncModule) {