From c1f9e05741e64087ebbfa5e1185bfd0beeb4eeb5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 07 一月 2022 17:50:18 +0800
Subject: [PATCH] 2022-01-07

---
 src/tabviews/custom/components/share/normalTable/index.jsx |  408 ++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 243 insertions(+), 165 deletions(-)

diff --git a/src/tabviews/custom/components/share/normalTable/index.jsx b/src/tabviews/custom/components/share/normalTable/index.jsx
index 65f1256..4a50717 100644
--- a/src/tabviews/custom/components/share/normalTable/index.jsx
+++ b/src/tabviews/custom/components/share/normalTable/index.jsx
@@ -3,10 +3,11 @@
 import md5 from 'md5'
 import { connect } from 'react-redux'
 import { is, fromJS } from 'immutable'
-import { Table, Typography, Icon, Col, Switch } from 'antd'
+import { Table, Typography, Col, Switch, message } from 'antd'
 
-import { modifyTabview } from '@/store/action'
 import asyncComponent from '@/utils/asyncComponent'
+import { getMark } from '@/utils/utils.js'
+import MkIcon from '@/components/mk-icon'
 import MKEmitter from '@/utils/events.js'
 import zhCN from '@/locales/zh-CN/main.js'
 import enUS from '@/locales/en-US/main.js'
@@ -15,7 +16,11 @@
 
 const { Paragraph } = Typography
 const CardCellComponent = asyncComponent(() => import('@/tabviews/custom/components/card/cardcellList'))
-
+const PicRadio = {
+  '4:3': '75%', '3:2': '66.67%', '16:9': '56.25%', '2:1': '50%', '3:1': '33.33%', '4:1': '25%',
+  '5:1': '20%', '6:1': '16.67%', '7:1': '14.29%', '8:1': '12.5%', '9:1': '11.11%',
+  '10:1': '10%', '3:4': '133.33%', '2:3': '150%', '9:16': '177.78%'
+}
 class BodyRow extends React.Component {
   shouldComponentUpdate (nextProps, nextState) {
     return !is(fromJS(this.props.data), fromJS(nextProps.data)) || !is(fromJS(this.props.className), fromJS(nextProps.className))
@@ -24,6 +29,10 @@
   render() {
     let { lineMarks, onDoubleClick, data, className, ...resProps } = this.props
     let style = {}
+
+    if (data && data.$disabled) {
+      className = className + ' mk-disabled '
+    }
 
     if (lineMarks && lineMarks.length > 0) {
       lineMarks.some(mark => {
@@ -47,7 +56,7 @@
           try {
             originVal = parseFloat(originVal)
             contrastVal = parseFloat(contrastVal)
-          } catch {
+          } catch (e) {
             originVal = NaN
           }
   
@@ -58,7 +67,7 @@
           try {
             originVal = parseFloat(originVal)
             contrastVal = parseFloat(contrastVal)
-          } catch {
+          } catch (e) {
             originVal = NaN
           }
   
@@ -75,7 +84,7 @@
             if (mark.fontColor) {
               style.color = mark.fontColor
             }
-            className += className + ' background'
+            className = className + ' background'
           } else if (mark.signType[0] === 'underline') {
             style.textDecoration = 'underline'
             style.color = mark.color
@@ -94,83 +103,12 @@
 }
 
 class BodyCell extends React.Component {
-  getMark = (record, marks, style, content) => {
-    marks.some(mark => {
-      let originVal = record[mark.field[0]] + ''
-      let contrastVal = ''
-      let result = false
-
-      if (mark.field[1] === 'static') {
-        contrastVal = mark.contrastValue + ''
-      } else {
-        contrastVal = record[mark.field[2]] + ''
-      }
-
-      if (mark.match === '=') {
-        result = originVal === contrastVal
-      } else if (mark.match === '!=') {
-        result = originVal !== contrastVal
-      } else if (mark.match === 'like') {
-        result = originVal.indexOf(contrastVal) > -1
-      } else if (mark.match === '>') {
-        try {
-          originVal = parseFloat(originVal)
-          contrastVal = parseFloat(contrastVal)
-        } catch {
-          originVal = NaN
-        }
-
-        if (!isNaN(originVal) && !isNaN(contrastVal) && originVal > contrastVal) {
-          result = true
-        }
-      } else if (mark.match === '<') {
-        try {
-          originVal = parseFloat(originVal)
-          contrastVal = parseFloat(contrastVal)
-        } catch {
-          originVal = NaN
-        }
-
-        if (!isNaN(originVal) && !isNaN(contrastVal) && originVal < contrastVal) {
-          result = true
-        }
-      }
-
-      if (result) {
-        if (mark.signType[0] === 'font') {
-          style.color = mark.color
-        } else if (mark.signType[0] === 'background') {
-          style.background = mark.color
-          if (mark.fontColor) {
-            style.color = mark.fontColor
-          }
-        } else if (mark.signType[0] === 'underline') {
-          style.textDecoration = 'underline'
-          style.color = mark.color
-        } else if (mark.signType[0] === 'line-through') {
-          style.textDecoration = 'line-through'
-          style.color = mark.color
-        } else if (mark.signType[0] === 'icon') {
-          let icon = (<Icon style={{color: mark.color}} type={mark.signType[3]} />)
-          if (mark.signType[1] === 'front') {
-            content = <span>{icon} {content}</span>
-          } else {
-            content = <span>{content} {icon}</span>
-          }
-        }
-      }
-      return result
-    })
-
-    return content
-  }
-
   shouldComponentUpdate (nextProps, nextState) {
     return !nextProps.record || !is(fromJS(this.props.record), fromJS(nextProps.record))
   }
 
   render() {
-    let { col, config, record, className, style, triggerLink, updateStatus, ...resProps } = this.props
+    let { col, config, record, className, style, triggerLink, ...resProps } = this.props
 
     if (!col) return (<td {...resProps} className={className} style={style}/>)
     
@@ -187,12 +125,21 @@
           content = `${content.substr(0, 4)}-${content.substr(5, 2)}-${content.substr(8, 2)} ${content.substr(11, 2)}:${content.substr(14, 2)}:${content.substr(17, 2)}`
         }
   
-        content = col.prefix + content + col.postfix
+        content = (col.prefix || '') + content + (col.postfix || '')
       }
 
       if (col.marks) {
-        style = style || {}
-        content = this.getMark(record, col.marks, style, content)
+        let mark = getMark(col.marks, record, style)
+
+        style = mark.style
+
+        if (mark.icon) {
+          if (mark.position === 'front') {
+            content = <span><MkIcon style={{color: mark.color}} type={mark.icon} /> {content}</span>
+          } else {
+            content = <span>{content} <MkIcon style={{color: mark.color}} type={mark.icon} /></span>
+          }
+        }
       }
       if (col.blur) {
         content = md5(content)
@@ -201,11 +148,11 @@
       if (col.rowspan === 'true') {
         resProps.rowSpan = record['$$' + col.field]
       }
-
-      if (col.linkThdMenu || col.linkurl) {
+      
+      if (!record.$disabled && (col.linkThdMenu || col.linkurl)) {
         content = (
           <div>
-            <div className="link-menu" onDoubleClick={(e) => this.triggerLink(e, col, record)}></div>
+            <div className="link-menu" onDoubleClick={(e) => triggerLink(e, col, record)}></div>
             {content}
           </div>
         )
@@ -219,7 +166,7 @@
         if (isNaN(content)) {
           content = ''
         }
-      } catch {
+      } catch (e) {
         content = ''
       }
 
@@ -228,6 +175,8 @@
         if (col.format === 'percent') {
           content = content * 100
           decimal = decimal > 2 ? decimal - 2 : 0
+        } else if (col.format === 'abs') {
+          content = Math.abs(content)
         }
   
         content = content.toFixed(decimal)
@@ -240,18 +189,31 @@
       }
 
       if (col.marks) {
-        style = style || {}
-        content = this.getMark(record, col.marks, style, content)
+        let mark = getMark(col.marks, record, style)
+
+        style = mark.style
+
+        if (mark.icon) {
+          if (mark.position === 'front') {
+            content = <span><MkIcon style={{color: mark.color}} type={mark.icon} /> {content}</span>
+          } else {
+            content = <span>{content} <MkIcon style={{color: mark.color}} type={mark.icon} /></span>
+          }
+        }
       }
 
       if (col.blur) {
         content = md5(content)
       }
 
-      if (col.linkThdMenu || col.linkurl) {
+      if (col.rowspan === 'true') {
+        resProps.rowSpan = record['$$' + col.field]
+      }
+
+      if (!record.$disabled && (col.linkThdMenu || col.linkurl)) {
         content = (
           <div>
-            <div className="link-menu" onDoubleClick={(e) => this.triggerLink(e, col, record)}></div>
+            <div className="link-menu" onDoubleClick={(e) => triggerLink(e, col, record)}></div>
             {content}
           </div>
         )
@@ -267,20 +229,20 @@
 
       let cols = 24 / (col.picSort || 1)
       let paddingTop = '100%'
+      let scale = col.scale === 'true'
 
-      if (col.lenWidRadio === '16:9') {
-        paddingTop = '56.25%'
-      } else if (col.lenWidRadio === '3:2') {
-        paddingTop = '66.67%'
-      } else if (col.lenWidRadio === '4:3') {
-        paddingTop = '75%'
+      if (PicRadio[col.lenWidRadio]) {
+        paddingTop = PicRadio[col.lenWidRadio]
       }
 
       resProps.children = (
         <div>
-          {photos.map((url, i) => (
+          {photos && photos.map((url, i) => (
             <Col key={i} span={cols}>
-              <div className="ant-mk-picture" style={{paddingTop, backgroundImage: `url('${url}')`}}></div>
+              <div className={'ant-mk-picture' + (scale ? ' scale' : '')} onClick={() => {
+                if (!scale) return
+                MKEmitter.emit('mkImageScale', url, photos)
+              }} style={{paddingTop, backgroundImage: `url('${url}')`}}></div>
             </Col>
           ))}
         </div>
@@ -324,7 +286,7 @@
         
         try {
           _param = window.btoa(_quary)
-        } catch {
+        } catch (e) {
           _param = window.btoa(window.encodeURIComponent(_quary))
         }
         
@@ -339,20 +301,70 @@
         content = md5(content)
       }
 
+      if (_href && /^https/.test(window.location.protocol)) { // https杞崲
+        _href = _href.replace(/^http:/ig, 'https:')
+      }
+
       resProps.children = (
         <div>
           {content && _href ? <a href={_href} target="_blank" rel="noopener noreferrer">{content}</a> : null }
         </div>
       )
+    } else if (col.type === 'formula') {
+      let content = col.formula
+      Object.keys(record).forEach(key => {
+        let reg = new RegExp('@' + key + '@', 'ig')
+        content = content.replace(reg, record[key])
+      })
+
+      if (col.eval !== 'false') {
+        try {
+          // eslint-disable-next-line
+          content = eval(content)
+        } catch (e) {
+          content = ''
+        }
+      }
+
+      content = content === undefined ? '' : content
+
+      if (content !== '') {
+        content = `${col.prefix || ''}${content}${col.postfix || ''}`
+
+        if (col.eval === 'false') {
+          content = content.replace(/\n/ig, '<br/>').replace(/\s/ig, '&nbsp;')
+          content = <span dangerouslySetInnerHTML={{__html: content}}></span>
+        }
+      }
+
+      if (col.marks) {
+        let mark = getMark(col.marks, record, style)
+
+        style = mark.style
+
+        if (mark.icon) {
+          if (mark.position === 'front') {
+            content = <span><MkIcon style={{color: mark.color}} type={mark.icon} /> {content}</span>
+          } else {
+            content = <span>{content} <MkIcon style={{color: mark.color}} type={mark.icon} /></span>
+          }
+        }
+      }
+
+      resProps.children = content
     } else if (col.type === 'custom') {
       style.padding = '0px'
+      if (col.style) {
+        style = {...style, ...col.style}
+      }
+
       resProps.children = (
-        <CardCellComponent data={record} cards={config} elements={col.elements} updateStatus={this.props.updateStatus}/>
+        <CardCellComponent data={record} cards={config} elements={col.elements}/>
       )
     } else if (col.type === 'action') {
       style.padding = '0px 5px'
       resProps.children = (
-        <CardCellComponent data={record} cards={config} elements={col.elements} updateStatus={this.props.updateStatus}/>
+        <CardCellComponent data={record} cards={config} elements={col.elements}/>
       )
     }
 
@@ -376,7 +388,6 @@
     loading: PropTypes.bool,         // 琛ㄦ牸鍔犺浇涓�
     refreshdata: PropTypes.func,     // 琛ㄦ牸涓帓搴忓垪銆侀〉鐮佺殑鍙樺寲鏃跺埛鏂�
     chgSelectData: PropTypes.func,   // 鏁版嵁鍒囨崲
-    refreshbyaction: PropTypes.func, // 鎸夐挳鎵ц瀹屾垚鍚庡埛鏂�
   }
 
   state = {
@@ -389,7 +400,8 @@
     activeIndex: null,    // 鏍囪褰撳墠閫変腑琛�
     rowspans: null,       // 琛屽悎骞跺瓧娈典俊鎭�
     pickup: false,        // 鏀惰捣鏈�夋嫨椤�
-    orderfields: {}       // 鎺掑簭id涓巉ield杞崲
+    orderfields: {},      // 鎺掑簭id涓巉ield杞崲
+    pageOptions: []
   }
 
   UNSAFE_componentWillMount () {
@@ -420,7 +432,10 @@
           if (item.rowspan === 'true') {
             rowspans.push(item.field)
           }
-          if (_format && !Math.floor(Math.random() * radio)) {
+          if (item.type === 'index') {
+            item.field = '$Index'
+            item.type = 'text'
+          } else if (_format && !Math.floor(Math.random() * radio)) {
             item.blur = true
           }
   
@@ -442,8 +457,7 @@
               record,
               col: item,
               config: item.type === 'custom' || item.type === 'action' ? {setting, columns: fields} : null,
-              triggerLink: this.triggerLink,
-              updateStatus: this.updateStatus
+              triggerLink: this.triggerLink
             })
           }
         }
@@ -474,7 +488,17 @@
       document.getElementsByTagName('head')[0].appendChild(ele)
     }
 
+    let size = (setting.pageSize || 10) + ''
+    let pageOptions = ['10', '25', '50', '100', '500', '1000']
+
+    if (!pageOptions.includes(size)) {
+      pageOptions.push(size)
+      pageOptions = pageOptions.sort((a, b) => a - b)
+    }
+
     this.setState({
+      pageSize: setting.pageSize || 10,
+      pageOptions,
       columns: _columns,
       rowspans,
       tableId,
@@ -487,6 +511,8 @@
   }
 
   componentDidMount () {
+    MKEmitter.addListener('mkCheckTopLine', this.mkCheckTopLine)
+    MKEmitter.addListener('mkCheckAll', this.mkCheckAll)
     MKEmitter.addListener('resetTable', this.resetTable)
   }
 
@@ -497,72 +523,113 @@
     this.setState = () => {
       return
     }
+    MKEmitter.removeListener('mkCheckTopLine', this.mkCheckTopLine)
+    MKEmitter.removeListener('mkCheckAll', this.mkCheckAll)
     MKEmitter.removeListener('resetTable', this.resetTable)
   }
 
-  updateStatus = (type, positon, btn) => {
-    if (type === 'refresh') {
-      this.props.refreshbyaction(positon, btn)
+  mkCheckTopLine = (menuId) => {
+    const { MenuID, data, setting } = this.props
+
+    if (MenuID !== menuId || !data || data.length === 0) return
+    if (data[0].$disabled) return
+
+    this.changedata(0)
+    this.setState({ selectedRowKeys: [0], activeIndex: 0 })
+    this.props.chgSelectData([data[0]])
+
+    if (setting.$hasSyncModule) {
+      MKEmitter.emit('syncBalconyData', MenuID, [data[0]], data.length === 1)
+    }
+  }
+
+  mkCheckAll = (menuId, checked) => {
+    const { MenuID, data } = this.props
+
+    if (MenuID !== menuId) return
+
+    if (checked) {
+      this.setState({
+        activeIndex: '',
+        selectedRowKeys: data.map((item, index) => index)
+      })
+
+      this.props.chgSelectData(data)
+
+      MKEmitter.emit('resetSelectLine', MenuID, '', '')
+      MKEmitter.emit('syncBalconyData', MenuID, data, data.length > 0)
+      if (data.length === 0) {
+        message.warning('鏈幏鍙栧埌鏁版嵁锛�')
+      }
+    } else {
+      this.setState({
+        activeIndex: '',
+        selectedRowKeys: [],
+      })
+
+      this.props.chgSelectData([])
+  
+      MKEmitter.emit('resetSelectLine', MenuID, '', '')
+      MKEmitter.emit('syncBalconyData', MenuID, [], false)
     }
   }
 
   // 瀛楁閫忚
   triggerLink = (e, item, record) => {
-    const { tabviews, MenuID } = this.props
     e.stopPropagation()
+
+    let __param = {
+      $searchkey: item.field,
+      $searchval: record[item.field] || '',
+      $BID: record.$$uuid
+    }
+
+    if (item.linkfields && item.linkfields.length > 0) {
+      item.linkfields.forEach(field => {
+        __param[field] = record[field] || ''
+      })
+    }
 
     if (item.linkThdMenu) {
       let tabmenu = item.linkThdMenu
 
-      tabmenu.param = {
-        searchkey: item.field,
-        searchval: record[item.field] || '',
-        BID: record.$$uuid
+      tabmenu.param = __param
+
+      if (['linkage_navigation', 'linkage', 'menu_board'].includes(window.GLOB.navBar)) {
+        MKEmitter.emit('modifyTabs', tabmenu, 'replace')
+      } else {
+        MKEmitter.emit('modifyTabs', tabmenu, 'plus', true)
       }
-  
-      tabmenu.selected = true
-  
-      let index = 0
-      let isexit = false
-      let tabs = tabviews.map((tab, i) => {
-        tab.selected = false
-  
-        if (tab.MenuID === MenuID) {
-          index = i
-        } else if (tab.MenuID === tabmenu.MenuID) {
-          tab.param = tabmenu.param
-          tab.selected = true
-          isexit = true
-        }
-  
-        return tab
-      })
-  
-      if (!isexit) {
-        tabs.splice(index + 1, 0, tabmenu)
-      }
-  
-      this.props.modifyTabview(tabs)
-    } else {
+    } else if (item.linkurl) {
       let src = item.linkurl
 
-      if (item.linkurl.indexOf('paramsmain/') > -1) {
+      if (src.indexOf('paramsmain/') > -1) {
         try {
           let _url = item.linkurl.split('paramsmain/')[0] + 'paramsmain/'
           let _param = JSON.parse(window.decodeURIComponent(window.atob(item.linkurl.split('paramsmain/')[1])))
-          let dataparam = {
-            searchkey: item.field,
-            searchval: record[item.field] || '',
-            BID: record.$$uuid
-          }
           _param.UserID = sessionStorage.getItem('UserID')
           _param.LoginUID = sessionStorage.getItem('LoginUID')
           _param.User_Name = sessionStorage.getItem('User_Name')
-          _param.param = dataparam
+          _param.param = __param
           src = _url + window.btoa(window.encodeURIComponent(JSON.stringify(_param)))
-        } catch {
+        } catch (e) {
           console.warn('鑿滃崟鍙傛暟瑙f瀽閿欒锛�')
         }
+      } else {
+        let con = '?'
+
+        if (/\?/ig.test(src)) {
+          con = '&'
+        }
+
+        if (item.linkfields && item.linkfields.length > 0) {
+          item.linkfields.forEach(field => {
+            if (field.toLowerCase() === 'id') return
+            con += `${field}=${record[field] || ''}&`
+          })
+        }
+        
+        src = src + `${con}id=${record.$$uuid}&appkey=${window.GLOB.appkey}&userid=${sessionStorage.getItem('UserID')}&LoginUID=${sessionStorage.getItem('LoginUID') || ''}`
       }
 
       window.open(src)
@@ -573,7 +640,7 @@
    * 
    */
   onSelectChange = selectedRowKeys => {
-    const { setting } = this.props
+    const { setting, MenuID, data } = this.props
 
     let index = ''
     let _activeIndex = null
@@ -581,7 +648,7 @@
       index = selectedRowKeys.slice(-1)[0]
     }
 
-    if (setting.tableType === 'checkbox') {
+    if (setting.tableType === 'checkbox' || setting.tableType === 'radio') {
       _activeIndex = index === '' ? null : index
     }
 
@@ -589,25 +656,29 @@
 
     this.setState({ selectedRowKeys, activeIndex: _activeIndex })
 
-    let selects = this.props.data.filter((item, _index) => selectedRowKeys.includes(_index))
+    let selects = this.props.data.filter((item, _index) => selectedRowKeys.includes(_index) && !item.$disabled)
 
     this.props.chgSelectData(selects)
+    if (setting.$hasSyncModule) {
+      MKEmitter.emit('syncBalconyData', MenuID, selects, data.length === selects.length)
+    }
   }
 
   /**
    * @description 鐐瑰嚮鏁磋锛岃Е鍙戝垏鎹紝 鍒ゆ柇鏄惁鍙�夛紝鍗曢�夋垨澶氶�夛紝杩涜瀵瑰簲鎿嶄綔
    */
   changeRow = (record, index) => {
-    const { setting } = this.props
+    const { setting, MenuID, data } = this.props
 
     if (!setting.tableType || this.state.pickup) return
+    if (record.$disabled) return
     
     let newkeys = fromJS(this.state.selectedRowKeys).toJS()
 
     if (setting.tableType === 'radio') {
       newkeys = [index]
       this.changedata(index)
-      this.setState({ selectedRowKeys: newkeys })
+      this.setState({ selectedRowKeys: newkeys, activeIndex: index })
     } else {
       let _index = ''
       if (newkeys.includes(index)) {
@@ -625,9 +696,13 @@
       this.setState({ selectedRowKeys: newkeys, activeIndex: _index !== '' ? _index : null })
     }
 
-    let selects = this.props.data.filter((item, _index) => newkeys.includes(_index))
+    let selects = this.props.data.filter((item, _index) => newkeys.includes(_index) && !item.$disabled)
     
     this.props.chgSelectData(selects)
+
+    if (setting.$hasSyncModule) {
+      MKEmitter.emit('syncBalconyData', MenuID, selects, data.length === selects.length)
+    }
   }
 
   changeTable = (pagination, filters, sorter) => {
@@ -656,6 +731,8 @@
       _id = data[index][setting.primaryKey] || ''
       _data = data[index] || ''
     }
+
+    if (_data && _data.$disabled) return
 
     MKEmitter.emit('resetSelectLine', MenuID, _id, _data)
   }
@@ -697,13 +774,13 @@
         let preItem = data[index - 1]
         rowspans.forEach((cell, i) => {
           if (i === 0) {
-            if ((item[cell] || item[cell] === 0) && preItem[cell] === item[cell]) {
+            if (preItem[cell] === item[cell]) {
               item['$' + cell] = preItem['$' + cell] + 1
             } else {
               item['$' + cell] = 1
             }
           } else {
-            if ((item[cell] || item[cell] === 0) && preItem[cell] === item[cell]) {
+            if (preItem[cell] === item[cell]) {
               item['$' + cell] = preItem['$' + cell] + 1
             } else {
               item['$' + cell] = 1
@@ -745,13 +822,14 @@
     const { setting } = this.props
 
     if (!setting.doubleClick) return
+    if (record.$disabled) return
 
     MKEmitter.emit('triggerBtnId', setting.doubleClick, [record])
   }
 
   render() {
     const { setting, statFValue, lineMarks, data } = this.props
-    const { selectedRowKeys, activeIndex, pickup, tableId } = this.state
+    const { selectedRowKeys, activeIndex, pickup, tableId, pageOptions } = this.state
 
     // 璁剧疆琛ㄦ牸閫夋嫨灞炴�э細鍗曢�夈�佸閫夈�佷笉鍙��
     let rowSelection = null
@@ -784,7 +862,7 @@
       _pagination = {
         current: this.state.pageIndex,
         pageSize: this.state.pageSize,
-        pageSizeOptions: ['10', '25', '50', '100', '500', '1000'],
+        pageSizeOptions: pageOptions,
         showSizeChanger: true,
         total: this.props.total || 0,
         showTotal: (total, range) => `${range[0]}-${range[1]} ${this.state.dict['main.pagination.of']} ${total} ${this.state.dict['main.pagination.items']}`
@@ -797,20 +875,23 @@
       _footer = statFValue.map(f => `${f.label}(鍚堣)锛�${f.value}`).join('锛�')
     }
 
+    let height = setting.height || false
+
     return (
-      <div className={'normal-custom-table ' + setting.tableHeader} id={tableId}>
+      <div className={`normal-custom-table ${setting.tableHeader || ''} ${height ? 'fixed-height' : ''} ${setting.mode || ''}`} id={tableId}>
         {(setting.tableType === 'radio' || setting.tableType === 'checkbox') && data && data.length > 0 ?
-          <Switch title="鏀惰捣" className="main-pickup" checkedChildren="寮�" unCheckedChildren="鍏�" defaultChecked={pickup} onChange={this.pickupChange} /> : null
+          <Switch title="鏀惰捣" className="main-pickup" checkedChildren="寮�" unCheckedChildren="鍏�" checked={pickup} onChange={this.pickupChange} /> : null
         }
         <Table
-          size="middle"
           components={components}
+          style={setting.style}
+          size={setting.size || 'middle'}
           bordered={setting.bordered !== 'false'}
           rowSelection={rowSelection}
           columns={this.state.columns}
           dataSource={_data}
           loading={this.props.loading}
-          scroll={{ x: '100%', y: false }}
+          scroll={{ x: '100%', y: height }}
           onRow={(record, index) => {
             return {
               lineMarks,
@@ -832,15 +913,12 @@
 const mapStateToProps = (state) => {
   return {
     menuType: state.editLevel,
-    tabviews: state.tabviews,
     memberLevel: state.memberLevel
   }
 }
 
-const mapDispatchToProps = (dispatch) => {
-  return {
-    modifyTabview: (tabviews) => dispatch(modifyTabview(tabviews))
-  }
+const mapDispatchToProps = () => {
+  return {}
 }
 
 export default connect(mapStateToProps, mapDispatchToProps)(NormalTable)
\ No newline at end of file

--
Gitblit v1.8.0