From d2392435048a5d75f2d10b4d88a2c8ac29a254f1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 18 六月 2025 22:34:05 +0800
Subject: [PATCH] 2025-06-18

---
 src/tabviews/custom/components/share/normalTable/index.jsx | 1163 +++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 865 insertions(+), 298 deletions(-)

diff --git a/src/tabviews/custom/components/share/normalTable/index.jsx b/src/tabviews/custom/components/share/normalTable/index.jsx
index 255cfa3..4bfb15a 100644
--- a/src/tabviews/custom/components/share/normalTable/index.jsx
+++ b/src/tabviews/custom/components/share/normalTable/index.jsx
@@ -1,29 +1,83 @@
 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, Typography, Icon, Col, Switch } from 'antd'
+import { Table, Typography, Col, Switch, message, Pagination } from 'antd'
+import { CaretRightOutlined, CaretDownOutlined } from '@ant-design/icons'
 
-import { modifyTabview } from '@/store/action'
 import asyncComponent from '@/utils/asyncComponent'
+import { getMark } from '@/utils/utils.js'
 import MKEmitter from '@/utils/events.js'
-import zhCN from '@/locales/zh-CN/main.js'
-import enUS from '@/locales/en-US/main.js'
-import '@/assets/css/table.scss'
+import Encrypts from '@/components/encrypts'
 import './index.scss'
 
 const { Paragraph } = Typography
+const Video = asyncComponent(() => import('@/components/video'))
+const MkIcon = asyncComponent(() => import('@/components/mk-icon'))
+const MkPicture = asyncComponent(() => import('@/components/mkPicture'))
 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%'
+}
+
+// 瀛楁閫忚
+const triggerLink = (e, item, record) => {
+  e.stopPropagation()
+
+  if (item.linkThdMenu) {
+    let __param = {
+      $BID: record.$$uuid
+    }
+
+    if (item.field) {
+      __param.$searchkey = item.field
+      __param.$searchval = record[item.field] || ''
+    }
+
+    Object.keys(record).forEach(key => {
+      if (/^\$/.test(key)) return
+      __param[key] = record[key]
+    })
+
+    let tabmenu = item.linkThdMenu
+
+    tabmenu.param = __param
+
+    MKEmitter.emit('modifyTabs', tabmenu, true)
+  } else if (item.linkurl) {
+    let src = item.linkurl
+
+    if (/@/.test(src)) {
+      src = src.replace(/@id@/ig, record.$$uuid)
+      src = src.replace(/@appkey@/ig, window.GLOB.appkey)
+      src = src.replace(/@userid@/ig, sessionStorage.getItem('UserID'))
+      src = src.replace(/@LoginUID@/ig, sessionStorage.getItem('LoginUID'))
+
+      Object.keys(record).forEach(key => {
+        if (/^\$/.test(key)) return
+        let reg = new RegExp('@' + key + '@', 'ig')
+        src = src.replace(reg, record[key])
+      })
+    }
+
+    window.open(src)
+  }
+}
 
 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))
+    return !is(fromJS(this.props.data), fromJS(nextProps.data)) || this.props.className !== nextProps.className
   }
 
   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 +101,7 @@
           try {
             originVal = parseFloat(originVal)
             contrastVal = parseFloat(contrastVal)
-          } catch {
+          } catch (e) {
             originVal = NaN
           }
   
@@ -58,7 +112,7 @@
           try {
             originVal = parseFloat(originVal)
             contrastVal = parseFloat(contrastVal)
-          } catch {
+          } catch (e) {
             originVal = NaN
           }
   
@@ -75,7 +129,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,86 +148,15 @@
 }
 
 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, ...resProps } = this.props
+    let { col, config, record, className, style, openChange, ...resProps } = this.props
 
     if (!col) return (<td {...resProps} className={className} style={style}/>)
-    
+
     if (col.type === 'text') {
       let content = ''
       if (record[col.field] !== undefined) {
@@ -185,14 +168,41 @@
           content = `${content.substr(0, 4)}-${content.substr(5, 2)}-${content.substr(8, 2)}`
         } else if (col.textFormat === 'YYYY-MM-DD HH:mm:ss' && /^[1-9]\d{3}(-|\/)(0[1-9]|1[0-2])(-|\/)(0[1-9]|[1-2][0-9]|3[0-1]).([0-1][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]/.test(content)) {
           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)}`
+        } else if (col.textFormat === 'encryption') {
+          content = <span>{col.prefix || ''}<Encrypts value={content} />{col.postfix || ''}</span>
         }
-  
-        content = col.prefix + content + col.postfix
+
+        if (col.noValue === 'hide' && content < '1949-10-02') {
+          content = ''
+        }
+
+        if (col.textFormat !== 'encryption') {
+          content = (col.prefix || '') + content + (col.postfix || '')
+        }
       }
 
       if (col.marks) {
-        style = style || {}
-        content = this.getMark(record, col.marks, style, content)
+        style = style ? {...style} : {}
+
+        let mark = getMark(col.marks, record, style)
+
+        if (mark.icon) {
+          if (mark.position === 'front') {
+            content = <span><MkIcon style={mark.innerStyle} type={mark.icon} /> {content}</span>
+          } else {
+            content = <span>{content} <MkIcon style={mark.innerStyle} type={mark.icon} /></span>
+          }
+        } else if (mark.innerStyle) {
+          content = <span style={mark.innerStyle}>{content}</span>
+        } else if (mark.space) {
+          content = <><span dangerouslySetInnerHTML={{__html: mark.space}}></span>{content}</>
+        } else if (mark.point) {
+          if (mark.position === 'front') {
+            content = <>{mark.point}{content}</>
+          } else {
+            content = <>{content}{mark.point}</>
+          }
+        }
       }
       if (col.blur) {
         content = md5(content)
@@ -202,16 +212,26 @@
         resProps.rowSpan = record['$$' + col.field]
       }
 
-      if (col.linkThdMenu || col.linkurl) {
-        content = (
-          <div>
-            <div className="link-menu" onDoubleClick={(e) => this.triggerLink(e, col, record)}></div>
+      if (col.$tree && record.$mk_floor) {
+        className += ' mk-tree-td'
+        if (record.$open) {
+          content = <>
+            <span className="mk-tree-node" style={{width: `calc(var(--tree-node-width) * ${record.$mk_floor})`}}><CaretRightOutlined onClick={(e) => openChange(e, record.$key)} /><CaretDownOutlined onClick={(e) => openChange(e, record.$key)}/></span>
             {content}
-          </div>
-        )
+          </>
+        } else {
+          content = <>
+            <span className="mk-tree-node" style={{width: `calc(var(--tree-node-width) * ${record.$mk_floor})`}}></span>
+            {content}
+          </>
+        }
       }
-
+      
       resProps.children = content
+
+      if (!record.$disabled && (col.linkThdMenu || col.linkurl)) {
+        return (<td {...resProps} className={className + ' clickable'} onClick={(e) => triggerLink(e, col, record)} style={style}/>)
+      }
     } else if (col.type === 'number') {
       let content = ''
       try {
@@ -219,29 +239,59 @@
         if (isNaN(content)) {
           content = ''
         }
-      } catch {
+        if (col.noValue === 'hide' && content === 0) {
+          content = ''
+        }
+      } catch (e) {
         content = ''
       }
 
       if (content !== '') {
-        let decimal = col.decimal || 0
+        if (col.round) {
+          content = Math.round(content * col.round) / col.round
+        }
         if (col.format === 'percent') {
           content = content * 100
-          decimal = decimal > 2 ? decimal - 2 : 0
+          if (!col.round) {
+            content = +content.toFixed(2)
+          }
+        } else if (col.format === 'abs') {
+          content = Math.abs(content)
+        }
+        if (col.round) {
+          content = content.toFixed(col.decimal)
         }
   
-        content = content.toFixed(decimal)
-  
         if (col.format === 'thdSeparator') {
+          content = content + ''
           content = content.replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,')
         }
   
-        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)
+        style = style ? {...style} : {}
+
+        let mark = getMark(col.marks, record, style)
+
+        if (mark.icon) {
+          if (mark.position === 'front') {
+            content = <span><MkIcon style={mark.innerStyle} type={mark.icon} /> {content}</span>
+          } else {
+            content = <span>{content} <MkIcon style={mark.innerStyle} type={mark.icon} /></span>
+          }
+        } else if (mark.innerStyle) {
+          content = <span style={mark.innerStyle}>{content}</span>
+        } else if (mark.space) {
+          content = <><span dangerouslySetInnerHTML={{__html: mark.space}}></span>{content}</>
+        } else if (mark.point) {
+          if (mark.position === 'front') {
+            content = <>{mark.point}{content}</>
+          } else {
+            content = <>{content}{mark.point}</>
+          }
+        }
       }
 
       if (col.blur) {
@@ -252,41 +302,45 @@
         resProps.rowSpan = record['$$' + col.field]
       }
 
-      if (col.linkThdMenu || col.linkurl) {
-        content = (
-          <div>
-            <div className="link-menu" onDoubleClick={(e) => this.triggerLink(e, col, record)}></div>
-            {content}
-          </div>
-        )
-      }
-
       resProps.children = content
+
+      if (!record.$disabled && (col.linkThdMenu || col.linkurl)) {
+        return (<td {...resProps} className={className + ' clickable'} onClick={(e) => triggerLink(e, col, record)} style={style}/>)
+      }
     } else if (col.type === 'picture') {
       let photos = ''
       if (record[col.field]) {
         photos = `${record[col.field]}`
-        photos = photos.split(',')
       }
 
-      let cols = 24 / (col.picSort || 1)
-      let paddingTop = '100%'
+      if (/^data:image/.test(photos)) {
+        photos = [photos]
+      } else {
+        photos = photos.split(',').filter(Boolean)
+      }
 
-      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%'
+      let paddingTop = '100%'
+      let scale = col.scale === 'true'
+
+      if (PicRadio[col.lenWidRadio]) {
+        paddingTop = PicRadio[col.lenWidRadio]
       }
 
       resProps.children = (
         <div>
           {photos.map((url, i) => (
-            <Col key={i} span={cols}>
-              <div className="ant-mk-picture" style={{paddingTop, backgroundImage: `url('${url}')`}}></div>
+            <Col key={i} span={col.span || 24}>
+              <MkPicture lostTip={col.lostTip !== 'false'} style={{paddingTop, backgroundSize: col.backgroundSize || 'cover'}} scale={scale} url={url} urls={photos}/>
             </Col>
           ))}
+        </div>
+      )
+    } else if (col.type === 'video') {
+      let url = record[col.field] || ''
+
+      resProps.children = (
+        <div className="video-wrap">
+          {url ? <Video card={col} value={url}/> : null}
         </div>
       )
     } else if (col.type === 'textarea') {
@@ -296,7 +350,7 @@
       }
 
       if (content) {
-        content = col.prefix + content + col.postfix
+        content = (col.prefix || '') + content + (col.postfix || '')
       }
 
       if (col.blur) {
@@ -328,7 +382,7 @@
         
         try {
           _param = window.btoa(_quary)
-        } catch {
+        } catch (e) {
           _param = window.btoa(window.encodeURIComponent(_quary))
         }
         
@@ -337,10 +391,25 @@
         } else {
           _href += '?' + _param
         }
+      } else if (/@/.test(_href)) {
+        _href = _href.replace(/@id@/ig, record.$$uuid || '')
+        _href = _href.replace(/@appkey@/ig, window.GLOB.appkey)
+        _href = _href.replace(/@userid@/ig, sessionStorage.getItem('UserID'))
+        _href = _href.replace(/@LoginUID@/ig, sessionStorage.getItem('LoginUID'))
+
+        Object.keys(record).forEach(key => {
+          if (/^\$/.test(key)) return
+          let reg = new RegExp('@' + key + '@', 'ig')
+          _href = _href.replace(reg, record[key])
+        })
       }
 
       if (col.blur) {
         content = md5(content)
+      }
+
+      if (_href && /^https/.test(window.location.protocol)) { // https杞崲
+        _href = _href.replace(/^http:/ig, 'https:')
       }
 
       resProps.children = (
@@ -348,13 +417,103 @@
           {content && _href ? <a href={_href} target="_blank" rel="noopener noreferrer">{content}</a> : null }
         </div>
       )
+    } else if (col.type === 'formula') {
+      let content = col.formula
+
+      if (col.eval === 'func') {
+        try {
+          // eslint-disable-next-line
+          let func = new Function('data', col.formula)
+          content = func([record])
+
+          if (col.noValue === 'hide' && content === 0) {
+            content = ''
+          }
+        } catch (e) {
+          console.warn(e)
+          content = ''
+        }
+      } else {
+        if (col.eval === 'false' && col.noValue === 'hide') { // 绌哄�奸殣钘�
+          Object.keys(record).forEach(key => {
+            if (/^\$/.test(key)) return
+            if (record[key]) return
+
+            content = content.replace(new RegExp('[^@]*@' + key + '@', 'ig'), '')
+          })
+        }
+        
+        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)
+
+            if (col.noValue === 'hide' && content === 0) {
+              content = ''
+            }
+          } catch (e) {
+            window.mkInfo(content)
+            console.warn(e)
+            content = ''
+          }
+  
+          if (col.round && typeof(content) === 'number') {
+            content = Math.round(content * col.round) / col.round
+            content = content.toFixed(col.decimal)
+          }
+        }
+      }
+
+      content = content === undefined ? '' : content
+
+      if (col.eval === 'func') {
+        content = <span dangerouslySetInnerHTML={{__html: content}}></span>
+      } else if (content !== '') {
+        content = `${col.prefix || ''}${content}${col.postfix || ''}`
+        if (!col.evalchars || col.evalchars.includes('enter')) {
+          content = content.replace(/\n/ig, '<br/>')
+        }
+        if (!col.evalchars || col.evalchars.includes('space')) {
+          content = content.replace(/\s/ig, '&nbsp;')
+        }
+        content = <span dangerouslySetInnerHTML={{__html: content}}></span>
+      }
+
+      if (col.marks) {
+        style = style ? {...style} : {}
+
+        let mark = getMark(col.marks, record, style)
+
+        if (mark.icon) {
+          if (mark.position === 'front') {
+            content = <span><MkIcon style={mark.innerStyle} type={mark.icon} /> {content}</span>
+          } else {
+            content = <span>{content} <MkIcon style={mark.innerStyle} type={mark.icon} /></span>
+          }
+        } else if (mark.innerStyle) {
+          content = <span style={mark.innerStyle}>{content}</span>
+        } else if (mark.space) {
+          content = <><span dangerouslySetInnerHTML={{__html: mark.space}}></span>{content}</>
+        } else if (mark.point) {
+          if (mark.position === 'front') {
+            content = <>{mark.point}{content}</>
+          } else {
+            content = <>{content}{mark.point}</>
+          }
+        }
+      }
+
+      resProps.children = content
     } else if (col.type === 'custom') {
       style.padding = '0px'
-      resProps.children = (
-        <CardCellComponent data={record} cards={config} elements={col.elements}/>
-      )
-    } else if (col.type === 'action') {
-      style.padding = '0px 5px'
+      if (col.style) {
+        style = {...style, ...col.style}
+      }
+
       resProps.children = (
         <CardCellComponent data={record} cards={config} elements={col.elements}/>
       )
@@ -373,17 +532,18 @@
     columns: PropTypes.array,        // 琛ㄦ牸鍒�
     lineMarks: PropTypes.array,      // 琛屾爣璁�
     fields: PropTypes.array,         // 缁勪欢瀛楁闆�
-    ContainerId: PropTypes.any,      // 鏍囩椤靛灞侷d
-    BData: PropTypes.any,            // 涓昏〃鏁版嵁
     data: PropTypes.any,             // 琛ㄦ牸鏁版嵁
     total: PropTypes.any,            // 鎬绘暟
     loading: PropTypes.bool,         // 琛ㄦ牸鍔犺浇涓�
     refreshdata: PropTypes.func,     // 琛ㄦ牸涓帓搴忓垪銆侀〉鐮佺殑鍙樺寲鏃跺埛鏂�
     chgSelectData: PropTypes.func,   // 鏁版嵁鍒囨崲
+    autoMatic: PropTypes.any,
+    allSearch: PropTypes.any,
+    colsCtrls: PropTypes.any,
+    parCtrl: PropTypes.any
   }
 
   state = {
-    dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
     tableId: '',          // 琛ㄦ牸ID
     selectedRowKeys: [],  // 琛ㄦ牸涓�変腑琛�
     pageIndex: 1,         // 鍒濆椤甸潰绱㈠紩
@@ -392,69 +552,92 @@
     activeIndex: null,    // 鏍囪褰撳墠閫変腑琛�
     rowspans: null,       // 琛屽悎骞跺瓧娈典俊鎭�
     pickup: false,        // 鏀惰捣鏈�夋嫨椤�
-    orderfields: {}       // 鎺掑簭id涓巉ield杞崲
+    orderfields: {},      // 鎺掑簭id涓巉ield杞崲
+    pageOptions: [],
+    allColumns: null,
+    reseting: false,
+    openkeys: []
   }
 
   UNSAFE_componentWillMount () {
-    const { menuType, memberLevel, setting, fields, columns } = this.props
+    const { setting, columns, fields, colsCtrls, data } = this.props
     let radio = 5          // 铏氬寲姣斾緥
     let _format = false    // 鏄惁铏氬寲澶勭悊
     let rowspans = []
     let orderfields = {}
 
-    if (window.GLOB.dataFormat && menuType !== 'HS' && memberLevel) {
+    if (window.GLOB.dataFormat) {
       _format = true
 
-      if (memberLevel >= 30) {
+      if (window.GLOB.memberLevel >= 30) {
         radio = 20
-      } else if (memberLevel >= 20) {
+      } else if (window.GLOB.memberLevel >= 20) {
         radio = 10
       }
     }
 
-    let getColumns = (cols) => {
-      return cols.map(item => {
-        let cell = null
-  
-        if (item.type === 'colspan') {
-          cell = { title: item.label, align: item.Align }
-          cell.children = getColumns(item.subcols)
-        } else {
-          if (item.rowspan === 'true') {
-            rowspans.push(item.field)
-          }
-          if (_format && !Math.floor(Math.random() * radio)) {
-            item.blur = true
-          }
-  
-          if (item.marks && item.marks.length === 0) {
-            item.marks = ''
-          }
+    let _columns = []
 
-          if (item.field) {
-            orderfields[item.uuid] = item.field
-          }
-
-          cell = {
-            align: item.Align,
-            dataIndex: item.uuid,
-            title: item.label,
-            sorter: item.field && item.IsSort === 'true',
-            width: item.Width || 120,
-            onCell: record => ({
-              record,
-              col: item,
-              config: item.type === 'custom' || item.type === 'action' ? {setting, columns: fields} : null,
-              triggerLink: this.triggerLink
-            })
-          }
-        }
+    if (setting.tableMode !== 'fast') {
+      let getColumns = (cols) => {
+        return cols.map(item => {
+          let cell = null
+    
+          if (item.type === 'colspan') {
+            cell = { title: item.label, align: item.Align, $key: item.uuid }
+            cell.children = getColumns(item.subcols)
+          } else {
+            if (item.rowspan === 'true') {
+              rowspans.push(item.field)
+            }
+            if (_format && !Math.floor(Math.random() * radio)) {
+              item.blur = true
+            }
   
-        return cell
+            if (item.field) {
+              orderfields[item.uuid] = item.field
+            } else if (item.sortField) {
+              orderfields[item.uuid] = item.sortField
+            }
+  
+            cell = {
+              $key: item.uuid,
+              align: item.Align,
+              dataIndex: item.uuid,
+              title: item.label,
+              sorter: (item.field || item.sortField) && item.IsSort === 'true',
+              width: item.Width || 120,
+              onCell: record => ({
+                record,
+                col: item,
+                config: item.type === 'custom' ? {setting, columns: fields} : null,
+                openChange: item.$tree ? this.openChange : null,
+              })
+            }
+          }
+    
+          return cell
+        })
+      }
+      _columns = getColumns(columns)
+    } else {
+      let fields = []
+      columns.forEach(item => {
+        if (!item.field || fields.includes(item.field)) return
+        fields.push(item.field)
+
+        _columns.push({
+          $key: item.uuid,
+          align: item.Align,
+          dataIndex: item.field,
+          title: item.label,
+          sorter: item.IsSort === 'true',
+          width: item.Width || 120
+        })
       })
-    }
 
-    let _columns = getColumns(columns)
+      orderfields = null
+    }
 
     if (rowspans.length === 0) {
       rowspans = null
@@ -469,14 +652,33 @@
       return uuid.join('')
     }) ()
 
-    if (setting.borderColor) { // 杈规棰滆壊
-      let style = `#${tableId} table, #${tableId} tr, #${tableId} th, #${tableId} td {border-color: ${setting.borderColor}}`
-      let ele = document.createElement('style')
-      ele.innerHTML = style
-      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)
+    }
+
+    if (setting.maxPageSize) {
+      pageOptions = pageOptions.filter(item => item <= setting.maxPageSize)
+    }
+
+    let allColumns = null
+    if (colsCtrls) {
+      rowspans = null
+      allColumns = [..._columns]
+      _columns = this.getCurColumns(_columns, this.props.allSearch)
+    }
+
+    if (setting.$tree) {
+      this.resetOpenKeys(data)
     }
 
     this.setState({
+      pageSize: setting.pageSize || 10,
+      pageOptions,
+      allColumns,
       columns: _columns,
       rowspans,
       tableId,
@@ -488,8 +690,67 @@
     return !is(fromJS(this.props), fromJS(nextProps)) || !is(fromJS(this.state), fromJS(nextState))
   }
 
+  UNSAFE_componentWillReceiveProps(nextProps) {
+    const { allSearch, parCtrl, setting, data } = this.props
+    const { allColumns } = this.state
+
+    if (allSearch && !is(fromJS(allSearch), fromJS(nextProps.allSearch))) {
+      this.setState({
+        reseting: true,
+        columns: this.getCurColumns(allColumns, nextProps.allSearch)
+      }, () => {
+        this.setState({reseting: false})
+      })
+    } else if (parCtrl && !is(fromJS(this.props.columns), fromJS(nextProps.columns))) {
+      let getColumns = (cols) => {
+        return cols.map(item => {
+          let cell = null
+    
+          if (item.type === 'colspan') {
+            cell = { title: item.label, align: item.Align }
+            cell.children = getColumns(item.subcols)
+          } else {
+            cell = {
+              align: item.Align,
+              dataIndex: item.uuid,
+              title: item.label,
+              sorter: (item.field || item.sortField) && item.IsSort === 'true',
+              width: item.Width || 120,
+              onCell: record => ({
+                record,
+                col: item,
+                config: item.type === 'custom' ? {setting: this.props.setting, columns: this.props.fields} : null,
+                openChange: item.$tree ? this.openChange : null,
+              })
+            }
+          }
+    
+          return cell
+        })
+      }
+
+      this.setState({
+        columns: getColumns(nextProps.columns)
+      })
+    }
+
+    if (setting.$tree && !is(fromJS(data), fromJS(nextProps.data))) {
+      this.resetOpenKeys(nextProps.data)
+    }
+  }
+
   componentDidMount () {
+    const { autoMatic } = this.props
+
+    MKEmitter.addListener('mkCheckAll', this.mkCheckAll)
     MKEmitter.addListener('resetTable', this.resetTable)
+
+    if (autoMatic === true) {
+      MKEmitter.addListener('autoQueryData', this.autoQueryData)
+      MKEmitter.addListener('autoSelectData', this.autoSelectData)
+    }
+
+    MKEmitter.addListener('mkCheckTopLine', this.mkCheckTopLine)
   }
 
   /**
@@ -499,81 +760,273 @@
     this.setState = () => {
       return
     }
+    MKEmitter.removeListener('mkCheckAll', this.mkCheckAll)
     MKEmitter.removeListener('resetTable', this.resetTable)
+    MKEmitter.removeListener('autoQueryData', this.autoQueryData)
+    MKEmitter.removeListener('autoSelectData', this.autoSelectData)
+    MKEmitter.removeListener('mkCheckTopLine', this.mkCheckTopLine)
   }
 
-  // 瀛楁閫忚
-  triggerLink = (e, item, record) => {
-    const { tabviews, MenuID } = this.props
-    e.stopPropagation()
+  resetOpenKeys = (data) => {
+    const { setting } = this.props
 
-    if (item.linkThdMenu) {
-      let tabmenu = item.linkThdMenu
+    if (!data || data.length === 0 || !setting.defOpen) {
+      this.setState({openkeys: []})
+    } else if (setting.defOpen === 'topline') {
+      let keys = []
 
-      tabmenu.param = {
-        searchkey: item.field,
-        searchval: record[item.field] || '',
-        BID: record.$$uuid
-      }
-  
-      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 {
-      let src = item.linkurl
+      if (data[0].$open) {
+        keys = [data[0].$key]
 
-      if (item.linkurl.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
+        data.forEach(item => {
+          if (item.$pkeys && item.$pkeys.length > 1 && item.$pkeys.includes(data[0].$key)) {
+            keys.push(...item.$pkeys)
           }
-          _param.UserID = sessionStorage.getItem('UserID')
-          _param.LoginUID = sessionStorage.getItem('LoginUID')
-          _param.User_Name = sessionStorage.getItem('User_Name')
-          _param.param = dataparam
-          src = _url + window.btoa(window.encodeURIComponent(JSON.stringify(_param)))
-        } catch {
-          console.warn('鑿滃崟鍙傛暟瑙f瀽閿欒锛�')
-        }
+        })
+
+        keys = Array.from(new Set(keys))
       }
 
-      window.open(src)
+      this.setState({openkeys: keys})
+    } else {
+      this.setState({openkeys: data.filter(item => !!item.$open).map(item => item.$key)})
     }
   }
 
-  /**
-   * 
-   */
-  onSelectChange = selectedRowKeys => {
-    const { setting } = this.props
+  openChange = (e, key) => {
+    const { setting, MenuID, data } = this.props
+    const { openkeys, selectedRowKeys } = this.state
+
+    e.stopPropagation()
+
+    let _openkeys = []
+
+    if (openkeys.includes(key)) {
+      _openkeys = openkeys.filter(k => k !== key)
+    } else {
+      _openkeys = [...openkeys, key]
+    }
+
+    if (!setting.tableType || _openkeys.length > openkeys.length) {
+      this.setState({openkeys: _openkeys})
+      return
+    }
+    
+    let newkeys = fromJS(selectedRowKeys).toJS()
+
+    newkeys = newkeys.filter(k => {
+      if (!data[k]) return false
+      if (!data[k].$pkeys) return true
+
+      return data[k].$pkeys.every(key => _openkeys.includes(key))
+    })
+
+    if (newkeys.length === selectedRowKeys.length) {
+      this.setState({openkeys: _openkeys})
+      return
+    }
+
+    let _index = ''
+    if (newkeys.length > 0) {
+      _index = newkeys.slice(-1)[0]
+    }
+
+    this.changedata(_index)
+    
+    this.setState({ openkeys: _openkeys, selectedRowKeys: newkeys, activeIndex: _index !== '' ? _index : null })
+
+    let selects = data.filter((item, _index) => newkeys.includes(_index))
+
+    this.props.chgSelectData(selects)
+
+    if (setting.$hasSyncModule) {
+      MKEmitter.emit('syncBalconyData', MenuID, selects, false)
+    }
+  }
+
+  getCurColumns = (columns, allSearch) => {
+    const { colsCtrls } = this.props
+
+    let values = {}
+    allSearch.forEach(item => {
+      values[item.key] = item.value
+    })
+    let cols = null
+    colsCtrls.some(item => {
+      let originVal = item.field.map(f => values[f] || '').join('')
+      let contrastVal = item.contrastValue
+      let result = false
+
+      if (item.match === '=') {
+        result = originVal === contrastVal
+      } else if (item.match === '!=') {
+        result = originVal !== contrastVal
+      } else if (item.match === 'regexp') {
+        let reg = new RegExp(item.contrastValue, 'ig')
+        result = reg.test(originVal)
+      } else {
+        originVal = isNaN(originVal) ? originVal : +originVal
+        contrastVal = isNaN(contrastVal) ? contrastVal : +contrastVal
+        if (item.match === '>') {
+          result = originVal > contrastVal
+        } else if (item.match === '<') {
+          result = originVal < contrastVal
+        }
+      }
+
+      if (!result) return false
+
+      cols = item.cols
+
+      return true
+    })
+
+    if (cols) {
+      return columns.filter(col => cols.includes(col.$key))
+    }
+
+    return columns
+  }
+
+  autoSelectData = (id, index) => {
+    if (id !== this.props.MenuID) return
+
+    const { pageSize, pageIndex } = this.state
+
+    let i = index - (pageIndex - 1) * pageSize - 1
+
+    if (this.props.data[i]) {
+      this.changeRow(this.props.data[i], i)
+      MKEmitter.emit('autoTransSelectData', this.props.MenuID, this.props.data[i])
+    } else {
+      MKEmitter.emit('autoMaticOver', this.props.MenuID)
+    }
+  }
+
+  autoQueryData = (id, index) => {
+    if (id !== this.props.MenuID) return
+
+    const { total } = this.props
+    const { pageSize } = this.state
+
+    if (index !== 1 && (!total || index > total)) {
+      MKEmitter.emit('autoMaticOver', this.props.MenuID)
+      return
+    }
+
+    console.clear()
+
+    let pageIndex = Math.ceil(index / pageSize)
+
+    this.setState({
+      pageIndex: pageIndex,
+      selectedRowKeys: [],
+      activeIndex: null
+    })
+
+    this.props.refreshdata({pageIndex})
+  }
+
+  mkCheckTopLine = (menuId, id, selected, orikeys) => {
+    const { MenuID, data, setting } = this.props
+
+    if (MenuID !== menuId) return
+    if (!data || data.length === 0) {
+      MKEmitter.emit('resetSelectLine', menuId, '', '')
+      return
+    }
+
+    let index = -1
+    let keys = []
+    let items = []
+
+    if (id) {
+      index = data.findIndex(item => item.$$uuid === id && !item.$disabled)
+    }
+    
+    if (index !== -1) {
+      keys = [index]
+      items = [data[index]]
+    } else if (selected === 'sign') {
+      data.forEach((item, i) => {
+        if (!item.$disabled && item.selected === 'true') {
+          items.push(item)
+          keys.push(i)
+          index = i
+        }
+      })
+    } else if (selected === 'local') {
+      if (orikeys && orikeys.length) {
+        data.forEach((item, i) => {
+          if (!item.$disabled && orikeys.includes(item.$$uuid)) {
+            items.push(item)
+            keys.push(i)
+            index = i
+          }
+        })
+      }
+    } else if (selected !== 'false') {
+      if (!data[0].$disabled) {
+        index = 0
+        keys = [index]
+        items = [data[index]]
+      }
+    }
+
+    if (index === -1) {
+      MKEmitter.emit('resetSelectLine', menuId, '', '')
+      return
+    }
+
+    this.changedata(index)
+    this.setState({ selectedRowKeys: keys, activeIndex: index })
+    this.props.chgSelectData(items)
+
+    if (setting.$hasSyncModule) {
+      MKEmitter.emit('syncBalconyData', MenuID, items, data.length === keys.length)
+    }
+  }
+
+  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(window.GLOB.dict['no_data'] || '鏈幏鍙栧埌鏁版嵁锛�')
+      }
+    } else {
+      this.setState({
+        activeIndex: '',
+        selectedRowKeys: [],
+      })
+
+      this.props.chgSelectData([])
+  
+      MKEmitter.emit('resetSelectLine', MenuID, '', '')
+      MKEmitter.emit('syncBalconyData', MenuID, [], false)
+    }
+  }
+
+  onSelectChange = (selectedRowKeys, e) => {
+    const { setting, MenuID, data } = this.props
+
+    if (this.state.pickup) return
 
     let index = ''
     let _activeIndex = null
     if (selectedRowKeys.length > 0) {
+      selectedRowKeys = selectedRowKeys.filter(key => !data[key].$disabled)
       index = selectedRowKeys.slice(-1)[0]
     }
 
@@ -585,18 +1038,22 @@
 
     this.setState({ selectedRowKeys, activeIndex: _activeIndex })
 
-    let selects = this.props.data.filter((item, _index) => selectedRowKeys.includes(_index))
+    let selects = 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()
 
@@ -621,55 +1078,112 @@
       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) => {
-    const { orderfields } = this.state
+    const { setting } = this.props
+    const { orderfields, pageSize } = this.state
 
+    if (orderfields) {
+      sorter.field = orderfields[sorter.field] || ''
+    }
+
+    if (setting.$tree) {
+      this.setState({
+        pageIndex: 1,
+        selectedRowKeys: [],
+        activeIndex: null,
+        pickup: false
+      })
+  
+      this.props.refreshdata({current: 1, pageSize: pageSize}, sorter)
+    } else {
+      this.setState({
+        pageIndex: pagination.current,
+        pageSize: pagination.pageSize,
+        selectedRowKeys: [],
+        activeIndex: null,
+        pickup: false
+      })
+  
+      this.props.refreshdata(pagination, sorter)
+    }
+  }
+
+  onPaginationChange = (current, pageSize) => {
     this.setState({
-      pageIndex: pagination.current,
-      pageSize: pagination.pageSize,
+      pageIndex: current,
+      pageSize: pageSize,
       selectedRowKeys: [],
-      activeIndex: null,
-      pickup: false
+      activeIndex: null
     })
 
-    sorter.field = orderfields[sorter.field] || ''
-
-    this.props.refreshdata(pagination, filters, sorter)
+    this.props.refreshdata({current: current, pageSize: pageSize, fixed: true}, {})
   }
 
   changedata = (index) => {
-    const { MenuID, data, setting } = this.props
+    const { MenuID, data } = this.props
 
     let _id = ''
     let _data = ''
 
     if (data && data.length > 0 && index !== '') {
-      _id = data[index][setting.primaryKey] || ''
+      _id = data[index].$$uuid || ''
       _data = data[index] || ''
     }
+
+    if (_data && _data.$disabled) return
 
     MKEmitter.emit('resetSelectLine', MenuID, _id, _data)
   }
 
-  resetTable = (id, repage) => {
-    const { MenuID } = this.props
+  resetTable = (id, type, Index) => {
+    const { MenuID, setting, data } = this.props
 
     if (id !== MenuID) return
 
-    if (repage === 'false') {
-      this.setState({
-        selectedRowKeys: [],
-        activeIndex: null,
-        pickup: false
-      })
+    if (type === 'delete') {
+      let selectKeys = fromJS(this.state.selectedRowKeys).toJS()
+      let activeKey = this.state.activeIndex
+
+      let trans = activeKey === Index
+      let _item = null
+      let selects = []
+      
+      if (setting.tableType) {
+        selectKeys = selectKeys.filter(key => key !== Index)
+        selectKeys = selectKeys.map(key => key > Index ? key - 1 : key)
+
+        selects = selectKeys.map(key => data[key]).filter(Boolean)
+
+        activeKey = selectKeys.length ? selectKeys[selectKeys.length - 1] : null
+
+        if (trans && selects.length) {
+          _item = selects[selects.length - 1]
+        }
+      }
+
+      this.setState({ selectedRowKeys: selectKeys, activeIndex: activeKey })
+
+      this.props.chgSelectData(selects)
+
+      if (trans) {
+        MKEmitter.emit('resetSelectLine', MenuID, (_item ? _item.$$uuid : ''), _item)
+      }
+
+      if (setting.$hasSyncModule) {
+        MKEmitter.emit('syncBalconyData', MenuID, selects, data.length === selects.length)
+      }
     } else {
       this.setState({
-        pageIndex: 1,
+        pageIndex: type === 'false' ? this.state.pageIndex : 1,
         selectedRowKeys: [],
         activeIndex: null,
         pickup: false
@@ -741,13 +1255,16 @@
     const { setting } = this.props
 
     if (!setting.doubleClick) return
+    if (record.$disabled) return
 
-    MKEmitter.emit('triggerBtnId', setting.doubleClick, [record])
+    MKEmitter.emit('triggerBtnId', setting.doubleClick, [record], 'linkbtn', (record.$$uuid || '') + (record.$Index || ''))
   }
 
   render() {
     const { setting, statFValue, lineMarks, data } = this.props
-    const { selectedRowKeys, activeIndex, pickup, tableId } = this.state
+    const { selectedRowKeys, activeIndex, pickup, pageOptions, columns, reseting, openkeys } = this.state
+
+    if (reseting) return null
 
     // 璁剧疆琛ㄦ牸閫夋嫨灞炴�э細鍗曢�夈�佸閫夈�佷笉鍙��
     let rowSelection = null
@@ -759,31 +1276,36 @@
       }
     }
 
-    const components = {
+    let components = {
       body: {
-        row: BodyRow,
-        cell: BodyCell
+        row: BodyRow
       }
+    }
+
+    if (setting.tableMode !== 'fast') {
+      components.body.cell = BodyCell
     }
 
     // 鏁版嵁鏀惰捣鏃讹紝杩囨护宸查�夋暟鎹�
     let _data = data || []
 
-    if (pickup) {
-      _data = _data.filter((item, index) => selectedRowKeys.includes(index))
+    if (!setting.$tree) {
+      if (pickup) {
+        _data = _data.filter((item, index) => selectedRowKeys.includes(index))
+      }
+  
+      _data = this.handleRowspan(_data)
     }
-
-    _data = this.handleRowspan(_data)
     
     let _pagination = false
-    if (setting.laypage !== 'false' && setting.laypage !== false) {
+    if (setting.laypage && !setting.$tree) {
       _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']}`
+        showTotal: (total, range) => `${range[0]}-${range[1]} ${window.GLOB.dict['of'] || '鍏�'} ${total} ${window.GLOB.dict['items'] || '鏉�'}`
       }
     }
 
@@ -793,25 +1315,73 @@
       _footer = statFValue.map(f => `${f.label}(鍚堣)锛�${f.value}`).join('锛�')
     }
 
+    let height = setting.height || false
+    if (height) {
+      if (height <= 100) {
+        if (height < 0) {
+          height = `calc(100vh - ${-height}px)`
+        } else {
+          height = height + 'vh'
+        }
+      }
+    }
+    let loading = this.props.loading
+    if (setting.mask === 'hidden') {
+      loading = false
+    }
+
+    let fixed = ''
+    if (setting.colfixed && setting.colfixed.length) {
+      if (setting.colfixed.includes('first')) {
+        fixed = 'mk-fixed-first-col'
+      }
+      if (setting.colfixed.includes('last')) {
+        fixed += ' mk-fixed-last-col'
+      }
+    }
+
+    let style = {
+      '--mk-table-border-color': setting.borderColor || '#e8e8e8',
+      '--mk-table-color': setting.color || 'rgba(0, 0, 0, 0.65)',
+      '--mk-table-font-size': setting.fontSize || '14px',
+      '--mk-table-font-weight': setting.fontWeight || 'normal'
+    }
+
     return (
-      <div className={'normal-custom-table ' + setting.tableHeader} 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
+      <div className={`normal-custom-table ${setting.tableHeader || ''} ${setting.parity === 'true' ? 'mk-parity' : ''} ${height ? 'fixed-table-height' : ''} ${setting.mode || ''} table-vertical-${setting.vertical || 'middle'} table-col-${columns.length} ${fixed} ${setting.empSign === 'hidden' ? 'mk-empty-hide' : ''}`} style={style}>
+        {(setting.tableType === 'radio' || setting.tableType === 'checkbox') && data && data.length > 0 && !setting.$tree ?
+          <Switch title="鏀惰捣" className="main-pickup" checkedChildren={window.GLOB.dict['open'] || '寮�'} unCheckedChildren={window.GLOB.dict['shut'] || '鍏�'} checked={pickup} onChange={this.pickupChange} /> : null
         }
         <Table
           components={components}
           size={setting.size || 'middle'}
           bordered={setting.bordered !== 'false'}
           rowSelection={rowSelection}
-          columns={this.state.columns}
+          columns={columns}
           dataSource={_data}
-          loading={this.props.loading}
-          scroll={{ x: '100%', y: false }}
+          loading={loading}
+          scroll={{ x: '100%', y: height }}
           onRow={(record, index) => {
+            let className = ''
+
+            if (index === activeIndex) {
+              className = ' mk-row-active '
+            }
+
+            if (setting.$tree) {
+              if (record.$open && openkeys.includes(record.$key)) {
+                className += ' mk-tree-open '
+              }
+              if (record.$pkeys && !record.$pkeys.every(key => openkeys.includes(key))) {
+                className += ' mk-tree-hide '
+              }
+            }
+
             return {
-              lineMarks,
+              lineMarks: lineMarks,
               data: record,
-              className: index === activeIndex ? ' mk-row-active ' : '',
+              title: setting.tipField ? record[setting.tipField] : '',
+              className: className,
               onClick: () => {this.changeRow(record, index)},
               onDoubleClick: () => {this.doubleClickLine(record)}
             }
@@ -819,24 +1389,21 @@
           onChange={this.changeTable}
           pagination={_pagination}
         />
+        {setting.laypage && setting.$tree ? <Pagination
+          showSizeChanger
+          className="mk-tree-pagination"
+          onChange={this.onPaginationChange}
+          onShowSizeChange={this.onPaginationChange}
+          current={this.state.pageIndex}
+          pageSize={this.state.pageSize}
+          pageSizeOptions={pageOptions}
+          total={this.props.total || 0}
+          showTotal={(total, range) => `${range[0]}-${range[1]} ${window.GLOB.dict['of'] || '鍏�'} ${total} ${window.GLOB.dict['items'] || '鏉�'}`}
+        /> : null}
         {_footer ? <div className={'normal-table-footer ' + (_pagination ? 'pagination' : '')}>{_footer}</div> : null}
       </div>
     )
   }
 }
 
-const mapStateToProps = (state) => {
-  return {
-    menuType: state.editLevel,
-    tabviews: state.tabviews,
-    memberLevel: state.memberLevel
-  }
-}
-
-const mapDispatchToProps = (dispatch) => {
-  return {
-    modifyTabview: (tabviews) => dispatch(modifyTabview(tabviews))
-  }
-}
-
-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