From 9282e645d0205f85bf0d424a0b2f5c42c2aae1d9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 21 五月 2025 11:40:32 +0800
Subject: [PATCH] 2025-05-21

---
 src/tabviews/custom/components/table/edit-table/normalTable/index.jsx | 2927 +++++++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 2,414 insertions(+), 513 deletions(-)

diff --git a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
index fe08fdc..8415ed3 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
@@ -1,23 +1,617 @@
 import React, {Component} from 'react'
 import PropTypes from 'prop-types'
 import { is, fromJS } from 'immutable'
-import { Table, Typography, Switch, Modal, Input, InputNumber, Tooltip, Button, notification, message } from 'antd'
-import { ExclamationCircleOutlined, EditOutlined, PlusOutlined } from '@ant-design/icons'
+import { Table, Typography, Modal, Input, InputNumber, Switch, Button, notification, message, Select, DatePicker } from 'antd'
+import { EditOutlined, QuestionCircleOutlined } from '@ant-design/icons'
 import moment from 'moment'
+import md5 from 'md5'
 
 import Api from '@/api'
 import asyncComponent from '@/utils/asyncComponent'
 import Utils, { getEditTableSql, 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'
-import '@/assets/css/table.scss'
+import Encrypts from '@/components/encrypts'
 import './index.scss'
 
 const { Paragraph } = Typography
-const { confirm } = Modal
+const MkIcon = asyncComponent(() => import('@/components/mk-icon'))
+const MKPopSelect = asyncComponent(() => import('./mkPopSelect'))
 const CardCellComponent = asyncComponent(() => import('@/tabviews/custom/components/card/cardcellList'))
+
+class MkSwitch extends Component {
+  static propTpyes = {
+    defaultValue: PropTypes.any,
+    config: PropTypes.object,
+    onChange: PropTypes.func
+  }
+
+  state = {
+    status: false
+  }
+
+  node = null
+
+  UNSAFE_componentWillMount () {
+    const { defaultValue, config } = this.props
+    
+    let status = false
+
+    if (defaultValue === config.openVal) {
+      status = true
+    }
+    
+    this.setState({status})
+  }
+
+  changeStatus = (val) => {
+    const { config, lineId } = this.props
+
+    this.setState({ status: val })
+
+    let values = {[config.field]: val ? config.openVal : config.closeVal}
+    
+    this.props.onChange(values, '')
+
+    this.node.blur()
+    
+    if (/\$noAct/.test(config.enter)) return
+
+    if (/\$next/.test(config.enter)) {
+      MKEmitter.emit('nextLine' + config.tableId, lineId, config.enter.replace('$next_', ''))
+    } else {
+      MKEmitter.emit('setFocus' + config.tableId, lineId, config.enter)
+    }
+  }
+
+  onFocus = () => {
+    const { config, lineId } = this.props
+
+    if (!config.$ctrl) return
+
+    MKEmitter.emit('colFocus' + config.tableId, lineId, config.uuid)
+  }
+
+  onBlur = () => {
+    const { config, lineId } = this.props
+
+    if (config.$ctrl) {
+      MKEmitter.emit('colBlur' + config.tableId, lineId, config.uuid)
+    }
+  }
+
+  render() {
+    const { config } = this.props
+    const { status } = this.state
+
+    return (
+      <Switch
+        ref={ref => this.node = ref}
+        checkedChildren={config.openText}
+        checked={status}
+        onFocus={this.onFocus}
+        onBlur={this.onBlur}
+        unCheckedChildren={config.closeText}
+        onChange={this.changeStatus}
+      />
+    )
+  }
+}
+
+class MkDatePicker extends Component {
+  static propTpyes = {
+    defaultValue: PropTypes.any,
+    config: PropTypes.object,
+    onChange: PropTypes.func
+  }
+  
+  state = {
+    value: null,
+    open: false
+  }
+
+  UNSAFE_componentWillMount () {
+    const { defaultValue } = this.props
+    
+    let _value = defaultValue || null
+    if (_value) {
+      _value = moment(_value, 'YYYY-MM-DD HH:mm:ss')
+    }
+    
+    this.setState({value: _value})
+  }
+
+  componentDidMount() {
+    const { config, autoFocus, lineId } = this.props
+
+    if (autoFocus === true) {
+      this.setState({open: true})
+
+      if (config.$ctrl) {
+        MKEmitter.emit('colFocus' + config.tableId, lineId, config.uuid)
+      }
+    }
+
+    MKEmitter.addListener('setFocus' + config.tableId, this.setFocus)
+  }
+
+  componentWillUnmount () {
+    this.setState = () => {
+      return
+    }
+
+    MKEmitter.removeListener('setFocus' + this.props.config.tableId, this.setFocus)
+  }
+
+  setFocus = (lId, colId) => {
+    const { config, lineId } = this.props
+
+    if (lId !== lineId || config.uuid !== colId) return
+
+    this.setState({open: true})
+
+    if (config.$ctrl) {
+      MKEmitter.emit('colFocus' + config.tableId, lineId, config.uuid)
+    }
+  }
+
+  onOpenChange = (open) => {
+    const { config, lineId } = this.props
+
+    this.setState({open})
+
+    if (!open) {
+      this.props.onBlur && this.props.onBlur()
+    }
+
+    if (!config.$ctrl) return
+
+    if (open) {
+      MKEmitter.emit('colFocus' + config.tableId, lineId, config.uuid)
+    } else {
+      MKEmitter.emit('colBlur' + config.tableId, lineId, config.uuid)
+    }
+  }
+
+  onChange = (val) => {
+    const { config, lineId } = this.props
+
+    let _val = val ? moment(val).format(config.format) : ''
+
+    if (config.precision === 'hour') {
+      _val = _val + ':00:00'
+    } else if (config.precision === 'minute') {
+      _val = _val + ':00'
+    }
+
+    let values = {[config.field]: _val}
+
+    this.props.onChange(values)
+
+    if (/\$noAct/.test(config.enter)) return
+
+    if (/\$next/.test(config.enter)) {
+      MKEmitter.emit('nextLine' + config.tableId, lineId, config.enter.replace('$next_', ''))
+    } else {
+      MKEmitter.emit('setFocus' + config.tableId, lineId, config.enter)
+    }
+  }
+
+  render() {
+    const { config } = this.props
+    const { value, open } = this.state
+
+    return (
+      <DatePicker dropdownClassName={'mk-date-picker ' + config.precision} showTime={config.format !== 'YYYY-MM-DD'} format={config.format} open={open} defaultValue={value} onChange={this.onChange} onOpenChange={this.onOpenChange}/>
+    )
+  }
+}
+
+class MkSelect extends Component {
+  static propTpyes = {
+    defaultValue: PropTypes.any,
+    lineId: PropTypes.string,
+    config: PropTypes.object,
+    onChange: PropTypes.func,
+  }
+  
+  state = {
+    value: ''
+  }
+
+  node = null
+
+  UNSAFE_componentWillMount() {
+    const { defaultValue } = this.props
+
+    this.setState({value: defaultValue})
+  }
+
+  componentDidMount() {
+    const { config, autoFocus, lineId } = this.props
+
+    if (autoFocus) {
+      let node = document.getElementById(config.uuid + lineId)
+      node && node.click()
+    }
+    MKEmitter.addListener('setFocus' + config.tableId, this.setFocus)
+  }
+
+  UNSAFE_componentWillReceiveProps(nextProps) {
+    if (nextProps.defaultValue !== this.props.defaultValue) {
+      this.setState({value: nextProps.defaultValue})
+    }
+  }
+
+  componentWillUnmount () {
+    this.setState = () => {
+      return
+    }
+
+    MKEmitter.removeListener('setFocus' + this.props.config.tableId, this.setFocus)
+  }
+
+  setFocus = (lId, colId) => {
+    const { config, lineId } = this.props
+
+    if (lId !== lineId || config.uuid !== colId) return
+
+    let node = document.getElementById(config.uuid + lineId)
+    node && node.click()
+  }
+
+  onSelectChange = (val, option) => {
+    const { config, lineId } = this.props
+
+    let values = {}
+    let _option = config.options.filter(m => m.key === option.key)[0]
+
+    if (_option) {
+      if (config.linkSubField) {
+        config.linkSubField.forEach((m, i) => {
+          values[m] = _option[m] !== undefined ? _option[m] : ''
+        })
+      }
+
+      values[config.field] = val
+    }
+
+    this.setState({value: val})
+
+    this.props.onChange(values, val)
+
+    if (config.enter === '$noActX') return
+
+    this.node.blur()
+    
+    if (/\$noAct/.test(config.enter)) return
+
+    setTimeout(() => {
+      if (/\$next/.test(config.enter)) {
+        MKEmitter.emit('nextLine' + config.tableId, lineId, config.enter.replace('$next_', ''))
+      } else {
+        MKEmitter.emit('setFocus' + config.tableId, lineId, config.enter)
+      }
+    }, 100)
+  }
+
+  onFocus = () => {
+    const { config, lineId } = this.props
+
+    if (!config.$ctrl) return
+
+    MKEmitter.emit('colFocus' + config.tableId, lineId, config.uuid)
+  }
+
+  onBlur = () => {
+    const { config, lineId } = this.props
+
+    if (config.$ctrl) {
+      MKEmitter.emit('colBlur' + config.tableId, lineId, config.uuid, true)
+    }
+
+    setTimeout(() => {
+      this.props.onBlur && this.props.onBlur()
+    }, 10)
+  }
+
+  render() {
+    const { config, lineId } = this.props
+    const { value } = this.state
+
+    return (
+      <Select
+        showSearch
+        dropdownClassName="edit-table-dropdown"
+        dropdownMatchSelectWidth={config.dropdown === 'fixed'}
+        value={value}
+        id={config.uuid + lineId}
+        ref={ref => this.node = ref}
+        onFocus={this.onFocus}
+        onBlur={this.onBlur}
+        filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
+        onSelect={this.onSelectChange}
+      >
+        {config.options.map(item => (<Select.Option key={item.key} disabled={item.$disabled} value={item.value}>{item.label}</Select.Option>))}
+      </Select>
+    )
+  }
+}
+
+class MkInput extends Component {
+  static propTpyes = {
+    defaultValue: PropTypes.any,
+    lineId: PropTypes.string,
+    config: PropTypes.object,
+    onChange: PropTypes.func
+  }
+  
+  state = {
+    value: null,
+    err: null
+  }
+
+  node = null
+
+  UNSAFE_componentWillMount() {
+    const { defaultValue } = this.props
+
+    this.setState({value: defaultValue})
+  }
+
+  componentDidMount() {
+    const { config, autoFocus } = this.props
+
+    if (autoFocus) {
+      this.node.select()
+    }
+    MKEmitter.addListener('setFocus' + config.tableId, this.setFocus)
+  }
+
+  UNSAFE_componentWillReceiveProps(nextProps) {
+    if (nextProps.defaultValue !== this.props.defaultValue) {
+      this.setState({value: nextProps.defaultValue})
+    }
+  }
+
+  componentWillUnmount () {
+    this.setState = () => {
+      return
+    }
+
+    MKEmitter.removeListener('setFocus' + this.props.config.tableId, this.setFocus)
+  }
+
+  setFocus = (lId, colId) => {
+    const { config, lineId } = this.props
+
+    if (lId !== lineId || config.uuid !== colId) return
+
+    this.node.select()
+  }
+
+  onChange = (val) => {
+    this.setState({value: val})
+  }
+
+  onFocus = () => {
+    const { config, lineId } = this.props
+
+    if (!config.$ctrl) return
+
+    MKEmitter.emit('colFocus' + config.tableId, lineId, config.uuid)
+  }
+
+  enterPress = () => {
+    const { config, lineId } = this.props
+
+    this.node.blur()
+    
+    if (/\$noAct/.test(config.enter)) return
+
+    if (/\$next/.test(config.enter)) {
+      MKEmitter.emit('nextLine' + config.tableId, lineId, config.enter.replace('$next_', ''))
+    } else {
+      MKEmitter.emit('setFocus' + config.tableId, lineId, config.enter)
+    }
+  }
+
+  onBlur = () => {
+    const { config, lineId } = this.props
+    const { value } = this.state
+    
+    let err = null
+
+    if (config.required === 'true' && !value) {
+      err = '璇峰~鍐�' + config.label
+    }
+
+    this.setState({err})
+
+    this.props.onChange({[config.field]: value})
+
+    if (config.$ctrl) {
+      MKEmitter.emit('colBlur' + config.tableId, lineId, config.uuid)
+    }
+
+    this.props.onBlur && this.props.onBlur()
+  }
+
+  render() {
+    const { value, err } = this.state
+
+    return (
+      <Input
+        title={err}
+        className={err ? 'has-error' : ''}
+        ref={ref => this.node = ref}
+        value={value}
+        onChange={(e) => this.onChange(e.target.value)}
+        onPressEnter={this.enterPress}
+        onFocus={this.onFocus}
+        onBlur={this.onBlur}
+      />
+    )
+  }
+}
+
+class MkInputNumber extends Component {
+  static propTpyes = {
+    defaultValue: PropTypes.any,
+    lineId: PropTypes.string,
+    config: PropTypes.object,
+    onChange: PropTypes.func
+  }
+  
+  state = {
+    value: null,
+    err: null,
+    clear: false
+  }
+
+  node = null
+
+  UNSAFE_componentWillMount() {
+    const { defaultValue } = this.props
+
+    this.setState({value: defaultValue})
+  }
+
+  componentDidMount() {
+    const { config, autoFocus } = this.props
+
+    if (autoFocus) {
+      this.node.focus()
+    }
+    MKEmitter.addListener('setFocus' + config.tableId, this.setFocus)
+  }
+
+  UNSAFE_componentWillReceiveProps(nextProps) {
+    if (nextProps.defaultValue !== this.props.defaultValue) {
+      this.setState({value: nextProps.defaultValue})
+    }
+  }
+
+  componentWillUnmount () {
+    this.setState = () => {
+      return
+    }
+
+    MKEmitter.removeListener('setFocus' + this.props.config.tableId, this.setFocus)
+  }
+
+  setFocus = (lId, colId) => {
+    const { config, lineId } = this.props
+
+    if (lId !== lineId || config.uuid !== colId) return
+
+    this.node.focus()
+  }
+
+  onChange = (val) => {
+    const { config } = this.props
+
+    this.setState({value: val})
+
+    if (config.clearField && val && !this.state.clear) {
+      this.setState({clear: true})
+
+      this.props.onChange({[config.clearField]: ''})
+    }
+  }
+
+  onFocus = () => {
+    const { config, lineId } = this.props
+
+    this.setState({clear: false})
+
+    if (!config.$ctrl) return
+
+    MKEmitter.emit('colFocus' + config.tableId, lineId, config.uuid)
+  }
+
+  enterPress = () => {
+    const { config, lineId } = this.props
+
+    this.node.blur()
+    
+    if (/\$noAct/.test(config.enter)) return
+
+    setTimeout(() => {
+      if (/\$next/.test(config.enter)) {
+        MKEmitter.emit('nextLine' + config.tableId, lineId, config.enter.replace('$next_', ''))
+      } else {
+        MKEmitter.emit('setFocus' + config.tableId, lineId, config.enter)
+      }
+    }, 10)
+  }
+
+  onBlur = () => {
+    const { config, lineId } = this.props
+
+    if (config.$ctrl) {
+      MKEmitter.emit('colBlur' + config.tableId, lineId, config.uuid)
+    }
+
+    setTimeout(() => {
+      let err = null
+      let value = this.state.value
+
+      if (config.noValue === 'hide' && !value) {
+        value = 0
+      }
+
+      if (config.required === 'true' && !value) {
+        err = `${config.label}涓嶅彲涓�${config.noValue === 'hide' ? '绌�' : '0'}`
+      } else {
+        if (typeof(config.max) === 'number' && value > config.max) {
+          err = config.label + '鏈�澶т负' + config.max
+        } else if (typeof(config.min) === 'number' && value < config.min) {
+          err = config.label + '鏈�灏忎负' + config.min
+        }
+      }
+
+      this.setState({err})
+
+      this.props.onChange({[config.field]: value})
+
+      this.props.onBlur && this.props.onBlur()
+    }, 5)
+  }
+
+  render() {
+    const { config } = this.props
+    const { value, err } = this.state
+
+    if (!config.decimal && config.decimal !== 0) {
+      return (
+        <InputNumber
+          title={err}
+          className={err ? 'has-error' : ''}
+          ref={ref => this.node = ref}
+          value={value}
+          onChange={(value) => this.onChange(value)}
+          onPressEnter={this.enterPress}
+          onFocus={this.onFocus}
+          onBlur={this.onBlur}
+        />
+      )
+    } else {
+      return (
+        <InputNumber
+          title={err}
+          className={err ? 'has-error' : ''}
+          ref={ref => this.node = ref}
+          precision={config.decimal}
+          value={value}
+          onChange={(value) => this.onChange(value)}
+          onPressEnter={this.enterPress}
+          onFocus={this.onFocus}
+          onBlur={this.onBlur}
+        />
+      )
+    }
+  }
+}
 
 class BodyRow extends React.Component {
   shouldComponentUpdate (nextProps, nextState) {
@@ -97,18 +691,19 @@
 
 class BodyCell extends React.Component {
   state = {
-    editing: false,
-    err: null
+    editing: false
+  }
+
+  componentDidMount() {
+    const { col } = this.props
+
+    if (col && col.editable === 'true') {
+      MKEmitter.addListener('setFocus' + col.tableId, this.setFocus)
+    }
   }
 
   shouldComponentUpdate (nextProps, nextState) {
-    return !is(fromJS(this.props.record), fromJS(nextProps.record)) ||
-      nextState.editing !== this.state.editing ||
-      nextState.err !== this.state.err
-  }
-
-  componentDidMount () {
-    MKEmitter.addListener('tdFocus', this.tdFocus)
+    return !is(fromJS(this.props.record), fromJS(nextProps.record)) || !is(fromJS(this.state), fromJS(nextState))
   }
 
   /**
@@ -118,95 +713,44 @@
     this.setState = () => {
       return
     }
-    MKEmitter.removeListener('tdFocus', this.tdFocus)
-  }
-
-  tdFocus = (id) => {
-    const { col, record } = this.props
-
-    if (id !== col.uuid + record.$Index) return
-    this.focus()
-  }
-
-  enterPress = () => {
-    const { col, record } = this.props
-    const { value } = this.state
-
-    this.setState({editing: false})
-    setTimeout(() => {
-      if (col.enter === '$next') {
-        MKEmitter.emit('nextLine', col, record.$Index)
-      } else {
-        MKEmitter.emit('tdFocus', col.enter + record.$Index)
-      }
-    }, 50)
-
-    if (value !== record[col.field]) {
-      MKEmitter.emit('changeRecord', col.tableId, {...record, [col.field]: value})
+    if (this.props.col) {
+      MKEmitter.removeListener('setFocus' + this.props.col.tableId, this.setFocus)
     }
+  }
+
+  setFocus = (lId, colId) => {
+    const { col, record } = this.props
+
+    if (lId !== record.$$uuid || col.uuid !== colId) return
+    if (col.ctrlField && col.ctrlValue.includes(record[col.ctrlField] + '')) return
+
+    this.setState({editing: true})
   }
 
   focus = () => {
     const { col, record } = this.props
 
-    let err = null
-    let val = record[col.field] !== undefined ? record[col.field] : ''
+    if (col.ctrlField && col.ctrlValue.includes(record[col.ctrlField] + '')) return
 
-    if (col.type === 'number') {
-      val = +val
-      if (isNaN(val)) {
-        val = 0
-      }
-      if (typeof(col.max) === 'number' && val > col.max) {
-        err = col.label + '鏈�澶т负' + col.max
-      } else if (typeof(col.min) === 'number' && val < col.min) {
-        err = col.label + '鏈�灏忎负' + col.min
-      }
-    } else if (col.required === 'true' && !val) {
-      err = '璇峰~鍐�' + col.label
-    }
-
-    this.setState({editing: true, value: val, err}, () => {
-      let node = document.getElementById(col.uuid + record.$Index)
-      node && node.select()
-    })
+    this.setState({editing: true})
   }
 
-  onBlur = () => {
+  onColChange = (values) => {
     const { col, record } = this.props
-    const { value } = this.state
 
-    this.setState({editing: false})
-
-    if (value !== record[col.field]) {
-      MKEmitter.emit('changeRecord', col.tableId, {...record, [col.field]: value})
-    }
-  }
-  
-  onChange = (val) => {
-    const { col } = this.props
-    
-    let err = null
-
-    if (col.type === 'number') {
-      val = +val
-      if (isNaN(val)) {
-        val = 0
-      }
-      if (typeof(col.max) === 'number' && val > col.max) {
-        err = col.label + '鏈�澶т负' + col.max
-      } else if (typeof(col.min) === 'number' && val < col.min) {
-        err = col.label + '鏈�灏忎负' + col.min
-      }
-    } else if (col.required === 'true' && !val) {
-      err = '璇峰~鍐�' + col.label
-    }
-    this.setState({value: val, err})
+    MKEmitter.emit('changeRecord' + col.tableId, {...record, ...values})
   }
 
   render() {
-    let { col, config, record, style, className } = this.props
-    const { editing, value, err } = this.state
+    let { col, record, style, className, ...resProps } = this.props
+    const { editing } = this.state
+
+    if (!col) return (<td {...resProps} className={className} style={style}/>)
+
+    let disabled = false
+    if (col.ctrlField) {
+      disabled = col.ctrlValue.includes(record[col.ctrlField] + '')
+    }
 
     let children = null
     if (col.type === 'text') {
@@ -215,38 +759,97 @@
         content = `${record[col.field]}`
       }
 
+      if (col.editType === 'select' && col.showValue !== 'value' && col.options.length > 0) {
+        content = col.map.get(content) || content
+      } else if (col.editType === 'switch') {
+        if (content === col.openVal) {
+          content = col.openText
+        } else if (content === col.closeVal) {
+          content = col.closeText
+        }
+      } else if (col.editType === 'popSelect') {
+        if (col.showField) {
+          content = record[col.showField] || content
+        }
+      }
+
       if (content !== '') {
         if (col.textFormat === 'YYYY-MM-DD' && /^[1-9]\d{3}(-|\/)(0[1-9]|1[0-2])(-|\/)(0[1-9]|[1-2][0-9]|3[0-1])/.test(content)) {
           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) {
-        let mark = getMark(col.marks, record, style)
+        style = style ? {...style} : {}
 
-        style = mark.style
+        let mark = getMark(col.marks, record, style)
 
         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>
+        } 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.editable === 'true') {
-        if (editing) {
-          return (<td className="editing_table_cell">
-            <Input id={col.uuid + record.$Index} defaultValue={value} onChange={(e) => this.onChange(e.target.value)} onPressEnter={this.enterPress} onBlur={this.onBlur}/>
-            {err ? <Tooltip title={err}><ExclamationCircleOutlined /></Tooltip> : null}
+      if (col.editable === 'true' && !disabled) {
+        if (col.editType === 'switch') {
+          let _value = record[col.field] !== undefined ? record[col.field] : ''
+          return (<td onClick={(e) => e.stopPropagation()} className="editing_table_cell">
+            <MkSwitch config={col} lineId={record.$$uuid} defaultValue={_value} onChange={this.onColChange}/>
           </td>)
+        } else if (editing) {
+          let _value = record[col.field] !== undefined ? record[col.field] : ''
+
+          if (!col.editType || col.editType === 'text') {
+            return (<td onClick={(e) => e.stopPropagation()} className="editing_table_cell">
+              <MkInput config={col} lineId={record.$$uuid} defaultValue={_value} autoFocus={true} onChange={this.onColChange} onBlur={() => this.setState({editing: false})}/>
+            </td>)
+          } else if (col.editType === 'date') {
+            return (<td onClick={(e) => e.stopPropagation()} className="editing_table_cell">
+              <MkDatePicker config={col} lineId={record.$$uuid} defaultValue={_value || null} autoFocus={true} onChange={this.onColChange} onBlur={() => this.setState({editing: false})}/>
+            </td>)
+          } else if (col.editType === 'popSelect') {
+            let showValue = ''
+            if (col.showField) {
+              showValue = record[col.showField] || ''
+            }
+
+            return (<td onClick={(e) => e.stopPropagation()} className="editing_table_cell">
+              <MKPopSelect config={col} lineId={record.$$uuid} defaultValue={_value} showValue={showValue} BID={record.$$BID} autoFocus={true} onChange={this.onColChange} onBlur={() => this.setState({editing: false})}/>
+            </td>)
+          } else {
+            return (<td onClick={(e) => e.stopPropagation()} className="editing_table_cell">
+              <MkSelect config={col} lineId={record.$$uuid} defaultValue={_value} autoFocus={true} onChange={this.onColChange} onBlur={() => this.setState({editing: false})}/>
+            </td>)
+          }
         } else {
-          return (<td className={className + ' pointer'} style={style}><div className="mk-mask" onClick={this.focus}></div>{content}</td>)
+          return (<td onClick={(e) => e.stopPropagation()} className={className + ' pointer'} style={style}>
+            <div className="mk-mask" id={col.uuid + record.$$uuid} onClick={this.focus}></div>{content}
+          </td>)
         }
       } else {
         children = content
@@ -258,48 +861,74 @@
         if (isNaN(content)) {
           content = ''
         }
+        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) {
-        let mark = getMark(col.marks, record, style)
+        style = style ? {...style} : {}
 
-        style = mark.style
+        let mark = getMark(col.marks, record, style)
 
         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>
+        } 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.editable === 'true') {
+      if (col.editable === 'true' && !disabled) {
         if (editing) {
-          return (<td className="editing_table_cell">
-            <InputNumber id={col.uuid + record.$Index} defaultValue={value} onChange={(val) => this.onChange(val)} onPressEnter={this.enterPress} onBlur={this.onBlur}/>
-            {err ? <Tooltip title={err}><ExclamationCircleOutlined /></Tooltip> : null}
+          let val = record[col.field] !== undefined ? record[col.field] : ''
+          if (col.noValue === 'hide' && val === 0) {
+            val = ''
+          }
+          return (<td onClick={(e) => e.stopPropagation()} className="editing_table_cell">
+            <MkInputNumber config={col} lineId={record.$$uuid} defaultValue={val} autoFocus={true} onChange={this.onColChange} onBlur={() => this.setState({editing: false})}/>
           </td>)
         } else {
-          return (<td className={className + ' pointer'} style={style}><div className="mk-mask" onClick={this.focus}></div>{content}</td>)
+          return (<td onClick={(e) => e.stopPropagation()} className={className + ' pointer'} style={style}>
+            <div className="mk-mask" id={col.uuid + record.$$uuid} onClick={this.focus}></div>{content}
+          </td>)
         }
       } else {
         children = content
@@ -311,7 +940,7 @@
       }
 
       if (content) {
-        content = col.prefix + content + col.postfix
+        content = (col.prefix || '') + content + (col.postfix || '')
       }
 
       children = (
@@ -321,41 +950,87 @@
       )
     } 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') {
+      if (col.eval === 'func') {
         try {
           // eslint-disable-next-line
-          content = eval(content)
+          let func = new Function('data', col.formula)
+          content = func([record])
         } 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)
+          } catch (e) {
+            window.mkInfo(content)
+            console.warn(e)
+            content = ''
+          }
         }
       }
 
       content = content === undefined ? '' : content
 
-      if (content !== '') {
-        content = `${col.prefix || ''}${content}${col.postfix || ''}`
+      if (col.noValue === 'hide' && content === 0) {
+        content = ''
+      }
 
-        if (col.eval === 'false') {
-          content = content.replace(/\n/ig, '<br/>').replace(/\s/ig, '&nbsp;')
-          content = <span dangerouslySetInnerHTML={{__html: content}}></span>
+      if (col.round && typeof(content) === 'number') {
+        content = Math.round(content * col.round) / col.round
+        content = content.toFixed(col.decimal)
+      }
+
+      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) {
-        let mark = getMark(col.marks, record, style)
+        style = style ? {...style} : {}
 
-        style = mark.style
+        let mark = getMark(col.marks, record, style)
 
         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>
+        } 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}</>
           }
         }
       }
@@ -368,17 +1043,7 @@
       }
 
       children = (
-        <CardCellComponent data={record} cards={config} elements={col.elements}/>
-      )
-    } else if (col.type === 'action') {
-      style.padding = '0px 5px'
-      children = (
-        <CardCellComponent data={record} cards={config} elements={col.elements}/>
-      )
-    } else if (col.type === 'operation') {
-      style.padding = '0px 5px'
-      children = (
-        <Button type="link" style={{color: 'rgb(255, 77, 79)', backgroundColor: 'transparent'}} onClick={() => MKEmitter.emit('delRecord', col.tableId, {...record})}>鍒犻櫎</Button>
+        <CardCellComponent data={record} cards={col.config} elements={col.elements}/>
       )
     }
 
@@ -386,119 +1051,472 @@
   }
 }
 
+class BodyAllCell extends React.Component {
+  state = {}
+
+  shouldComponentUpdate (nextProps, nextState) {
+    return !is(fromJS(this.props.record), fromJS(nextProps.record)) || !is(fromJS(this.state), fromJS(nextState))
+  }
+
+  /**
+   * @description 缁勪欢閿�姣侊紝娓呴櫎state鏇存柊锛屾竻闄ゅ揩鎹烽敭璁剧疆
+   */
+  componentWillUnmount () {
+    this.setState = () => {
+      return
+    }
+  }
+
+  onColChange = (values) => {
+    const { col, record } = this.props
+
+    MKEmitter.emit('changeRecord' + col.tableId, {...record, ...values})
+  }
+
+  render() {
+    let { col, record, style, className, ...resProps } = this.props
+
+    if (!col) return (<td {...resProps} className={className} style={style}/>)
+
+    let disabled = false
+    let editable = false
+    if (col.ctrlField) {
+      disabled = col.ctrlValue.includes(record[col.ctrlField] + '')
+    }
+
+    let children = null
+    if (col.type === 'text') {
+      if (col.editable === 'true' && !disabled) {
+        editable = true
+        let _value = record[col.field] !== undefined ? record[col.field] : ''
+        
+        if (!col.editType || col.editType === 'text') {
+          children = (
+            <MkInput config={col} lineId={record.$$uuid} defaultValue={_value} autoFocus={false} onChange={this.onColChange}/>
+          )
+        } else if (col.editType === 'switch') {
+          children = (
+            <MkSwitch config={col} lineId={record.$$uuid} defaultValue={_value} onChange={this.onColChange}/>
+          )
+        } else if (col.editType === 'date') {
+          children = (
+            <MkDatePicker config={col} lineId={record.$$uuid} defaultValue={_value || null} autoFocus={false} onChange={this.onColChange}/>
+          )
+        } else if (col.editType === 'popSelect') {
+          let showValue = ''
+          if (col.showField) {
+            showValue = record[col.showField] || ''
+          }
+          
+          children = (
+            <MKPopSelect config={col} lineId={record.$$uuid} defaultValue={_value} showValue={showValue} BID={record.$$BID} autoFocus={false} onChange={this.onColChange}/>
+          )
+        } else {
+          children = (
+            <MkSelect config={col} lineId={record.$$uuid} defaultValue={_value} autoFocus={false} onChange={this.onColChange} />
+          )
+        }
+      } else {
+        let content = ''
+        if (record[col.field] !== undefined) {
+          content = `${record[col.field]}`
+        }
+
+        if (col.editType === 'select' && col.showValue !== 'value' && col.options.length > 0) {
+          content = col.map.get(content) || content
+        } else if (col.editType === 'switch') {
+          if (content === col.openVal) {
+            content = col.openText
+          } else if (content === col.closeVal) {
+            content = col.closeText
+          }
+        } else if (col.editType === 'popSelect') {
+          if (col.showField) {
+            content = record[col.showField] || content
+          }
+        }
+
+        if (content !== '') {
+          if (col.textFormat === 'YYYY-MM-DD' && /^[1-9]\d{3}(-|\/)(0[1-9]|1[0-2])(-|\/)(0[1-9]|[1-2][0-9]|3[0-1])/.test(content)) {
+            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>
+          }
+
+          if (col.noValue === 'hide' && content < '1949-10-02') {
+            content = ''
+          }
+
+          if (col.textFormat !== 'encryption') {
+            content = (col.prefix || '') + content + (col.postfix || '')
+          }
+        }
+
+        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}</>
+            }
+          }
+        }
+
+        if (col.editable === 'true' && disabled) {
+          content = <span style={{display: 'inline-block', padding: '0 6px'}}>{content}</span>
+        }
+
+        children = content
+      }
+    } else if (col.type === 'number') {
+      if (col.editable === 'true' && !disabled) {
+        editable = true
+        let _value = record[col.field] !== undefined ? record[col.field] : ''
+
+        if (col.noValue === 'hide' && _value === 0) {
+          _value = ''
+        }
+
+        children = (
+          <MkInputNumber config={col} lineId={record.$$uuid} defaultValue={_value} autoFocus={false} onChange={this.onColChange}/>
+        )
+      } else {
+        let content = ''
+        try {
+          content = parseFloat(record[col.field])
+          if (isNaN(content)) {
+            content = ''
+          }
+          if (col.noValue === 'hide' && content === 0) {
+            content = ''
+          }
+        } catch (e) {
+          content = ''
+        }
+
+        if (content !== '') {
+          if (col.round) {
+            content = Math.round(content * col.round) / col.round
+          }
+          if (col.format === 'percent') {
+            content = content * 100
+            if (!col.round) {
+              content = +content.toFixed(2)
+            }
+          } else if (col.format === 'abs') {
+            content = Math.abs(content)
+          }
+          if (col.round) {
+            content = content.toFixed(col.decimal)
+          }
+    
+          if (col.format === 'thdSeparator') {
+            content = content + ''
+            content = content.replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,')
+          }
+    
+          content = (col.prefix || '') + content + (col.postfix || '')
+        }
+
+        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}</>
+            }
+          }
+        }
+
+        if (col.editable === 'true' && disabled) {
+          content = <span style={{display: 'inline-block', padding: '0 6px'}}>{content}</span>
+        }
+
+        children = content
+      }
+    } else if (col.type === 'textarea') {
+      let content = ''
+      if (record[col.field] !== undefined) {
+        content = `${record[col.field]}`
+      }
+
+      if (content) {
+        content = (col.prefix || '') + content + (col.postfix || '')
+      }
+
+      children = (
+        <div>
+          {content ? <Paragraph copyable ellipsis={{ rows: 3, expandable: true }}>{content}</Paragraph> : 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])
+        } 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)
+          } catch (e) {
+            window.mkInfo(content)
+            console.warn(e)
+            content = ''
+          }
+        }
+      }
+
+      content = content === undefined ? '' : content
+
+      if (col.noValue === 'hide' && content === 0) {
+        content = ''
+      }
+
+      if (col.round && typeof(content) === 'number') {
+        content = Math.round(content * col.round) / col.round
+        content = content.toFixed(col.decimal)
+      }
+
+      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}</>
+          }
+        }
+      }
+
+      children = content
+    } else if (col.type === 'custom') {
+      style.padding = '0px'
+      if (col.style) {
+        style = {...style, ...col.style}
+      }
+
+      children = (
+        <CardCellComponent data={record} cards={col.config} elements={col.elements}/>
+      )
+    }
+
+    if (editable) {
+      return (<td onClick={(e) => e.stopPropagation()} className={'editing_all_table_cell ' + className} style={style}>{children}</td>)
+    }
+
+    return (<td className={'editing_all_table_cell ' + className} style={style}>{children}</td>)
+  }
+}
+
 class NormalTable extends Component {
   static propTpyes = {
-    statFValue: PropTypes.any,       // 鍚堣瀛楁鏁版嵁
     MenuID: PropTypes.string,        // 鑿滃崟Id
-    setting: PropTypes.object,       // 琛ㄦ牸鍏ㄥ眬璁剧疆锛歵ableType锛堣〃鏍兼槸鍚﹀彲閫夈�佸崟閫夈�佸閫夛級銆乧olumnfixed锛堝垪鍥哄畾锛夈�乤ctionfixed锛堟寜閽浐瀹氾級
+    setting: PropTypes.object,       // 琛ㄦ牸鍏ㄥ眬璁剧疆锛歵ableType锛堣〃鏍兼槸鍚﹀彲閫夈�佸崟閫夈�佸閫夛級銆乤ctionfixed锛堟寜閽浐瀹氾級
     columns: PropTypes.array,        // 琛ㄦ牸鍒�
     lineMarks: PropTypes.any,        // 琛屾爣璁�
     fields: PropTypes.array,         // 缁勪欢瀛楁闆�
     BID: PropTypes.any,              // 涓昏〃ID
-    data: PropTypes.any,             // 琛ㄦ牸鏁版嵁
     total: PropTypes.any,            // 鎬绘暟
     loading: PropTypes.bool,         // 琛ㄦ牸鍔犺浇涓�
     refreshdata: PropTypes.func,     // 琛ㄦ牸涓帓搴忓垪銆侀〉鐮佺殑鍙樺寲鏃跺埛鏂�
+    chgSelectData: PropTypes.func,
+    allSearch: PropTypes.any,
+    colsCtrls: PropTypes.any
   }
 
   state = {
-    dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
-    data: [],
     edData: [],
-    edColumns: [],
+    selectedRowKeys: [],  // 琛ㄦ牸涓�変腑琛�
     tableId: '',          // 琛ㄦ牸ID
     pageIndex: 1,         // 鍒濆椤甸潰绱㈠紩
     pageSize: 10,         // 姣忛〉鏁版嵁鏉℃暟
     columns: null,        // 鏄剧ず鍒�
-    fields: [],
-    pickup: false,        // 鏀惰捣鏈�夋嫨椤�
+    forms: [],
     orderfields: {},      // 鎺掑簭id涓巉ield杞崲
     loading: false,
-    editable: 'false',
-    pageOptions: []
+    pageOptions: [],
+    deForms: null,
+    visible: false,
+    midData: null,
+    allColumns: null,
+    checkForms: [],
+    allForms: [],
+    reseting: false,
+    dict: window.GLOB.dict
   }
 
+  timer = null
+  focusId = ''
+  blurId = ''
+  colId = ''
+
   UNSAFE_componentWillMount () {
-    const { setting, fields, columns, data } = this.props
+    const { setting, fields, columns, BID, colsCtrls } = this.props
     let orderfields = {}
-    let initEditLine = null
-    let edColumns = []
-    let tableId = (() => {
-      let uuid = []
-      let _options = 'abcdefghigklmnopqrstuv'
-      for (let i = 0; i < 19; i++) {
-        uuid.push(_options.substr(Math.floor(Math.random() * 0x20), 1))
-      }
-      return uuid.join('')
-    }) ()
 
     let _columns = []
-    columns.forEach(item => {
-      if (item.Hide === 'true') return
-      if (item.type === 'index') {
-        item.field = '$Index'
-        item.type = 'text'
-      }
+    let deForms = []
+    let _forms = {}
+    let hasBid = false
+    let checkForms = []
+    let allForms = []
 
-      item.tableId = tableId
+    let getColumns = (cols, sk) => {
+      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, sk || item.uuid)
+        } else {
+          if (item.editable === 'true') {
+            _forms[item.field] = item
 
-      if (!initEditLine && item.editable === 'true') {
-        initEditLine = item
-      }
+            allForms.push({uuid: sk || item.uuid, field: item.field})
+            checkForms.push(item.field)
 
-      if (item.marks && item.marks.length === 0) {
-        item.marks = ''
-      }
+            if (item.type === 'text' && item.editType === 'select') {
+              if (item.resourceType === '1') {
+                let _option = Utils.getSelectQueryOptions(item)
+  
+                if (/@BID@/ig.test(_option.sql) && setting.supModule) {
+                  hasBid = true
+                }
+        
+                item.base_sql = _option.sql
+                item.arr_field = _option.field
+        
+                deForms.push(item)
+              }
+            }
+          }
+    
+          if (item.field) {
+            orderfields[item.uuid] = item.field
+          } else if (item.sortField) {
+            orderfields[item.uuid] = item.sortField
+          }
 
-      if (item.field) {
-        orderfields[item.uuid] = item.field
-      }
-
-      let _item = {
-        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,
-        })
-      }
-
-      if (item.type !== 'action') {
-        let _copy = fromJS(_item).toJS()
-        _copy.sorter = false
-
-        if (item.editable === 'true') {
-          _copy.title = <span>{item.label}<EditOutlined className="system-color" style={{position: 'absolute', bottom: 0, right: 0}}/></span>
+          cell = {
+            align: item.Align,
+            dataIndex: item.uuid,
+            title: item.editable === 'true' ? <span>{item.label}<EditOutlined className="system-color mk-edit-sign"/></span> : item.label,
+            sorter: (item.field || item.sortField) && item.IsSort === 'true',
+            width: item.Width || 120,
+            $key: item.uuid,
+            onCell: record => ({
+              record,
+              col: item
+            })
+          }
         }
-        edColumns.push(_copy)
-      }
-      _columns.push(_item)
-    })
-
-    if (setting.delable !== 'false') {
-      edColumns.push({
-        align: 'center',
-        dataIndex: 'mkoperation',
-        title: '鎿嶄綔',
-        sorter: false,
-        width: 100,
-        onCell: record => ({
-          record,
-          col: {type: 'operation', tableId: tableId},
-        })
+  
+        return cell
       })
     }
 
-    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)
-    }
+    _columns = getColumns(columns)
+
+    let forms = []
+    fields.forEach(item => {
+      if (item.field === setting.primaryKey) return
+
+      if (_forms[item.field]) {
+        let _item = {..._forms[item.field]}
+        if (_item.editType === 'date') {
+          _item.datatype = _item.declareType || 'datetime'
+        } else {
+          _item.datatype = item.datatype
+        }
+        if (_item.type === 'number' && item.type === 'number') {
+          _item.decimal = item.decimal || 0
+        }
+
+        forms.push(_item)
+      } else {
+        forms.push({...item, $sort: 999})
+      }
+    })
+
+    forms.sort((a, b) => a.$sort - b.$sort)
 
     let size = (setting.pageSize || 10) + ''
     let pageOptions = ['10', '25', '50', '100', '500', '1000']
@@ -508,16 +1526,40 @@
       pageOptions = pageOptions.sort((a, b) => a - b)
     }
 
+    if (setting.maxPageSize) {
+      pageOptions = pageOptions.filter(item => item <= setting.maxPageSize)
+    }
+
+    let allColumns = null
+    if (colsCtrls) {
+      allColumns = [..._columns]
+      checkForms = []
+      _columns = this.getCurColumns(_columns, this.props.allSearch, allForms, checkForms)
+    } else {
+      allForms = null
+    }
+
+    checkForms = Array.from(new Set(checkForms))
+
     this.setState({
+      forms,
+      allForms,
+      allColumns,
+      checkForms,
       pageSize: setting.pageSize || 10,
       pageOptions,
-      data,
       columns: _columns,
-      edColumns,
-      tableId,
+      tableId: setting.tableId,
       orderfields,
-      initEditLine,
-      editable: setting.editable
+      deForms: hasBid ? deForms : null
+    }, () => {
+      if (deForms.length > 0 && (!hasBid || BID)) {
+        if (window.backend && window.GLOB.CacheData.has('sql_' + deForms[0].uuid)) {
+          this.improveBackActionForm(deForms, BID)
+        } else {
+          this.improveActionForm(deForms, BID)
+        }
+      }
     })
   }
 
@@ -525,96 +1567,708 @@
     return !is(fromJS(this.props), fromJS(nextProps)) || !is(fromJS(this.state), fromJS(nextState))
   }
 
+  UNSAFE_componentWillReceiveProps(nextProps) {
+    const { BID, parCtrl } = this.props
+    const { deForms } = this.state
+
+    if (deForms && nextProps.BID !== BID) {
+      if (window.backend && window.GLOB.CacheData.has('sql_' + deForms[0].uuid)) {
+        this.improveBackActionForm(deForms, nextProps.BID)
+      } else {
+        this.improveActionForm(deForms, nextProps.BID)
+      }
+    }
+    if (parCtrl && !is(fromJS(this.props.columns), fromJS(nextProps.columns))) {
+      let getColumns = (cols, sk) => {
+        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, sk || item.uuid)
+          } else {
+            cell = {
+              align: item.Align,
+              dataIndex: item.uuid,
+              title: item.editable === 'true' ? <span>{item.label}<EditOutlined className="system-color mk-edit-sign"/></span> : item.label,
+              sorter: (item.field || item.sortField) && item.IsSort === 'true',
+              width: item.Width || 120,
+              $key: item.uuid,
+              onCell: record => ({
+                record,
+                col: item
+              })
+            }
+          }
+    
+          return cell
+        })
+      }
+  
+      let _columns = getColumns(nextProps.columns)
+
+      this.setState({
+        columns: _columns
+      })
+    }
+  }
+
   componentDidMount () {
-    const { fields, columns } = this.props
-    const { data, editable } = this.state
-
-    let _fields = []
-
-    let fieldType = {}
-    fields.forEach(item => {
-      fieldType[item.field] = item.datatype
-    })
-
-    columns.forEach(col => {
-      if (!col.field || col.type === 'index') return
-
-      _fields.push({...col, datatype: fieldType[col.field] || 'Nvarchar(50)'})
-    })
-
-    this.setState({
-      fields: _fields,
-    })
-
-    if (editable === 'true' && data && data.length > 0) {
-      setTimeout(() => {
-        this.pickupChange()
-      }, 200)
+    const { setting } = this.props
+    const { tableId } = this.state
+    
+    if (setting.commit === 'change') {
+      MKEmitter.addListener('colBlur' + tableId, this.colBlur)
+      MKEmitter.addListener('colFocus' + tableId, this.colFocus)
     }
 
-    MKEmitter.addListener('nextLine', this.nextLine)
-    MKEmitter.addListener('delRecord', this.delRecord)
     MKEmitter.addListener('resetTable', this.resetTable)
-    MKEmitter.addListener('changeRecord', this.changeRecord)
+    MKEmitter.addListener('nextLine' + tableId, this.nextLine)
+    MKEmitter.addListener('addRecord' + tableId, this.plusLine)
+    MKEmitter.addListener('delRecord' + tableId, this.delRecord)
+    MKEmitter.addListener('transferData' + tableId, this.transferData)
+    MKEmitter.addListener('changeRecord' + tableId, this.changeRecord)
   }
 
   /**
    * @description 缁勪欢閿�姣侊紝娓呴櫎state鏇存柊
    */
   componentWillUnmount () {
+    const { tableId } = this.state
+
     this.setState = () => {
       return
     }
-    MKEmitter.removeListener('nextLine', this.nextLine)
-    MKEmitter.removeListener('delRecord', this.delRecord)
+
     MKEmitter.removeListener('resetTable', this.resetTable)
-    MKEmitter.removeListener('changeRecord', this.changeRecord)
+    MKEmitter.removeListener('colBlur' + tableId, this.colBlur)
+    MKEmitter.removeListener('colFocus' + tableId, this.colFocus)
+    MKEmitter.removeListener('nextLine' + tableId, this.nextLine)
+    MKEmitter.removeListener('addRecord' + tableId, this.plusLine)
+    MKEmitter.removeListener('delRecord' + tableId, this.delRecord)
+    MKEmitter.removeListener('transferData' + tableId, this.transferData)
+    MKEmitter.removeListener('changeRecord' + tableId, this.changeRecord)
   }
 
-  UNSAFE_componentWillReceiveProps(nextProps) {
-    if (!is(fromJS(this.props.data), fromJS(nextProps.data))) {
-      this.setState({data: nextProps.data || []})
-      if (this.state.editable === 'true') {
-        setTimeout(() => {
-          this.pickupChange()
-        }, 200)
+  colBlur = (lineId, colId, defer) => {
+    if (defer && this.focusId === lineId && this.colId !== colId) {
+      return
+    }
+    
+    this.blurId = lineId
+    this.focusId = ''
+
+    this.timer && clearTimeout(this.timer)
+
+    this.timer = setTimeout(() => {
+      if (!this.focusId || this.focusId !== this.blurId) {
+        this.checkLine()
+      }
+    }, 150)
+  }
+
+  colFocus = (lineId, colId) => {
+    this.focusId = lineId
+    this.colId = colId
+  }
+
+  checkLine = () => {
+    const { edData, forms, checkForms, dict } = this.state
+
+    let data = edData.filter(item => item.$$uuid === this.blurId)[0]
+
+    if (!data) return
+
+    let record = fromJS(data).toJS()
+
+    let value = ''
+    Object.keys(record).sort().forEach(key => {
+      if (/^\$/.test(key)) return
+      value += record[key]
+    })
+
+    if (record.$sign === md5(value)) return
+
+    let err = ''
+    forms.forEach(col => {
+      let check = true
+      if (col.editable !== 'true' || !checkForms.includes(col.field)) {
+        check = false
+      }
+      if (col.ctrlField && col.ctrlValue.includes(record[col.ctrlField] + '')) {
+        check = false
+      }
+
+      if (!check) {
+        if (col.type === 'number') {
+          record[col.field] = +record[col.field]
+          if (isNaN(record[col.field])) {
+            record[col.field] = 0
+          }
+        } else {
+          record[col.field] = record[col.field] !== undefined ? (record[col.field] + '') : ''
+        }
+        return
+      }
+
+      if (err) return
+
+      if (col.type === 'text') {
+        let val = record[col.field] !== undefined ? (record[col.field] + '') : ''
+        if (col.required === 'true' && !val) {
+          err = `${col.label}${dict['not_empty'] || '涓嶅彲涓虹┖'}`
+        } else if (col.datatype === 'datetime' && !val) {
+          val = '1949-10-01'
+        }
+        record[col.field] = val
+      } else if (col.type === 'number') {
+        let val = record[col.field]
+
+        if (col.required === 'true' && !val) {
+          err = `${col.label}${col.noValue === 'hide' ? (dict['not_empty'] || '涓嶅彲涓虹┖') : dict['not_zero'] || '涓嶅彲涓�0'}`
+        } else if (col.noValue === 'hide' && !val) {
+          if (col.clearField && checkForms.includes(col.clearField) && !record[col.clearField]) {
+            err = `${dict['input_tip'] || '璇峰~鍐� '}${col.label} ${dict['or'] || '鎴�'} ${col.clearName}`
+          }
+          val = 0
+        } else if (!val && val !== 0) {
+          err = `${col.label}${dict['not_empty'] || '涓嶅彲涓虹┖'}`
+        } else {
+          val = +val
+          if (isNaN(val)) {
+            err = `${col.label} ${dict['data_format'] || '鏁版嵁鏍煎紡閿欒'}`
+            return
+          }
+  
+          val = +val.toFixed(col.decimal || 0)
+          
+          if (typeof(col.max) === 'number' && val > col.max) {
+            err = `${col.label}${dict['max_limit'] || ' 涓嶅彲澶т簬 '}${col.max}`
+          } else if (typeof(col.min) === 'number' && val < col.min) {
+            err = `${col.label}${dict['less_limit'] || ' 涓嶅彲灏忎簬 '}${col.min}`
+          }
+        }
+
+        record[col.field] = val
+      }
+    })
+
+    if (err) {
+      message.warning(err)
+      return
+    }
+
+    this.submit(record)
+  }
+
+  getCurColumns = (columns, allSearch, allForms, checkForms) => {
+    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) {
+      allForms.forEach(item => {
+        if (cols.includes(item.uuid)) {
+          checkForms.push(item.field)
+        }
+      })
+
+      return columns.filter(col => cols.includes(col.$key))
+    }
+
+    allForms.forEach(item => {
+      checkForms.push(item.field)
+    })
+
+    return columns
+  }
+
+  transferData = (data, type) => {
+    const { edData, tableId } = this.state
+
+    if (type === 'clear') {
+      this.setState({edData: [], midData: []})
+      return
+    } else if (type === 'delete') {
+
+    } else if (type === 'line') {
+      let value = ''
+      Object.keys(data).sort().forEach(key => {
+        if (/^\$/.test(key)) return
+        value += data[key]
+      })
+      data.$sign = md5(value)
+    } else {
+      data.forEach(item => {
+        let value = ''
+        Object.keys(item).sort().forEach(key => {
+          if (/^\$/.test(key)) return
+          value += item[key]
+        })
+        item.$sign = md5(value)
+      })
+    }
+
+    if (type === 'delete') {
+      let _edData = this.state.edData.filter(item => item.$$uuid !== data)
+
+      this.setState({edData: _edData, reseting: true}, () => {
+        this.setState({reseting: false})
+
+        if (this.focusId) {
+          setTimeout(() => {
+            MKEmitter.emit('setFocus' + tableId, this.focusId, this.colId)
+          }, 10)
+        }
+      })
+    } else if (type === 'line') {
+      let _edData = this.state.edData.map(item => {
+        if (item.$$uuid === data.$$uuid) {
+          return data
+        } else {
+          return item
+        }
+      })
+
+      this.setState({edData: _edData, reseting: true}, () => {
+        this.setState({reseting: false})
+
+        if (this.focusId) {
+          setTimeout(() => {
+            MKEmitter.emit('setFocus' + tableId, this.focusId, this.colId)
+          }, 10)
+        }
+      })
+    } else {
+      let index = edData.findIndex(item => !item.$origin && !item.$forbid)
+
+      if (index > -1) {
+        this.setState({visible: true, midData: data})
+      } else {
+        this.updateMutil(data)
       }
     }
   }
-  
-  nextLine = (col, index) => {
-    const { setting } = this.props
-    const { edData, initEditLine, tableId } = this.state
 
-    if (col.tableId !== tableId) return
+  updateMutil = (data) => {
+    const { setting, colsCtrls, allSearch } = this.props
+    const { allColumns, allForms } = this.state
 
-    index = +index
+    if (colsCtrls) {
+      let checkForms = []
+      let columns = this.getCurColumns(allColumns, allSearch, allForms, checkForms)
 
-    if (index < edData.length && initEditLine) {
-      MKEmitter.emit('tdFocus', initEditLine.uuid + (index + 1))
-    } else if (col.footEnter === 'add' && setting.addable === 'true') {
+      checkForms = Array.from(new Set(checkForms))
+
+      this.setState({
+        checkForms,
+        columns: columns,
+        reseting: true,
+        edData: data,
+        visible: false,
+        midData: null
+      }, () => {
+        this.setState({
+          reseting: false
+        })
+      })
+
+      return
+    }
+
+    if (setting.editType === 'multi' && data.length > 0) {
+      this.setState({edData: data, visible: false, midData: null, reseting: true}, () => {
+        this.setState({reseting: false})
+      })
+    } else {
+      this.setState({edData: data, visible: false, midData: null})
+    }
+
+    if (setting.addable && data.length === 0) {
       setTimeout(() => {
-        this.plusLine(initEditLine)
-      }, 10)
-    } else if (col.footEnter === 'sub') {
-      setTimeout(() => {
-        this.checkData()
+        this.plusLine()
       }, 10)
     }
   }
 
-  plusLine = (initEditLine) => {
-    const { edData, fields } = this.state
+  improveActionForm = (deForms, BID) => {
+    let deffers = []
+    let mainItems = []  // 浜戠鎴栧崟鐐规暟鎹�
+    let localItems = [] // 鏈湴鏁版嵁
+    let debug = window.GLOB.debugger === true
+    let _sql = `Declare @mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20)  select @mk_departmentcode='${sessionStorage.getItem('departmentcode') || ''}',@mk_organization='${sessionStorage.getItem('organization') || ''}',@mk_user_type='${sessionStorage.getItem('mk_user_type') || ''}'\n`
+    let _sso = _sql
 
-    let item = {...edData[edData.length - 1]}
+    deForms.forEach(item => {
+      if (item.database === 'sso') {
+        let sql = _sso + item.base_sql
+        _sso = ''
 
-    item.key = item.key + 1
-    item.$$uuid = '$new'
-    item.$Index = item.key + 1 + ''
+        sql = sql.replace(/@BID@/ig, `'${BID}'`)
 
-    fields.forEach(col => {
-      item[col.field] = item[col.field] !== undefined ? item[col.field] : ''
+        if (debug) {
+          window.mkInfo(sql)
+        }
 
+        sql = sql.replace(/%/ig, ' mpercent ')
+
+        mainItems.push(`select '${item.uuid}' as obj_name,'${item.arr_field}' as arr_field,'${window.btoa(window.encodeURIComponent(sql))}' as LText`)
+      } else {
+        let sql = _sql + item.base_sql
+        _sql = ''
+
+        sql = sql.replace(/@BID@/ig, `'${BID}'`)
+
+        if (debug) {
+          window.mkInfo(sql)
+        }
+
+        sql = sql.replace(/%/ig, ' mpercent ')
+        
+        localItems.push(`select '${item.uuid}' as obj_name,'${item.arr_field}' as arr_field,'${window.btoa(window.encodeURIComponent(sql))}' as LText`)
+      }
+    })
+
+    // 鏈湴璇锋眰
+    let param = {
+      func: 'sPC_Get_SelectedList',
+      LText: localItems.join(' union all '),
+      obj_name: '',
+      arr_field: '',
+      table_type: 'Y',
+      BID: BID || ''
+    }
+
+    if (param.LText) {
+      if (window.GLOB.execType === 'x') {
+        param.exec_type = 'x'
+      }
+      
+      param.LText = Utils.formatOptions(param.LText, param.exec_type)
+      param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
+      param.secretkey = Utils.encrypt(window.GLOB.execType === 'x' ? '' : param.LText, param.timestamp)
+
+      deffers.push(
+        new Promise(resolve => {
+          Api.getSystemCacheConfig(param, false).then(res => {
+            if (!res.status && res.ErrCode !== '-2') {
+              notification.warning({
+                top: 92,
+                message: res.message,
+                duration: 5
+              })
+            }
+            resolve(res)
+          })
+        })
+      )
+    }
+
+    // 绯荤粺璇锋眰
+    let mainparam = {
+      func: 'sPC_Get_SelectedList',
+      LText: mainItems.join(' union all '),
+      obj_name: '',
+      arr_field: '',
+      table_type: 'Y',
+      BID: BID || ''
+    }
+
+    if (mainparam.LText) {
+      if (window.GLOB.execType === 'x') {
+        mainparam.exec_type = 'x'
+      }
+
+      mainparam.LText = Utils.formatOptions(mainparam.LText, mainparam.exec_type)
+      mainparam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
+      mainparam.secretkey = Utils.encrypt(window.GLOB.execType === 'x' ? '' : mainparam.LText, mainparam.timestamp)
+
+      if (window.GLOB.mainSystemApi) {
+        mainparam.rduri = window.GLOB.mainSystemApi
+      }
+
+      deffers.push(
+        new Promise(resolve => {
+          Api.getSystemCacheConfig(mainparam, false).then(res => {
+            if (!res.status && res.ErrCode !== '-2') {
+              notification.warning({
+                top: 92,
+                message: res.message,
+                duration: 5
+              })
+            }
+            resolve(res)
+          })
+        })
+      )
+    }
+
+    Promise.all(deffers).then(response => {
+      let result = {...response[0], ...(response[1] || {})}
+
+      delete result.ErrCode
+      delete result.ErrMesg
+      delete result.message
+      delete result.status
+
+      this.resetFormList(result)
+    })
+  }
+
+  improveBackActionForm = (deForms, BID) => {
+    let sysvals = {
+      mk_departmentcode: sessionStorage.getItem('departmentcode') || '',
+      mk_organization: sessionStorage.getItem('organization') || '',
+      mk_user_type: sessionStorage.getItem('mk_user_type') || '',
+      bid: BID || '',
+      datam: sessionStorage.getItem('dataM') === 'true' ? 'Y' : '',
+      datam_begin: sessionStorage.getItem('dataM') === 'true' ? 'Y' : '',
+      datam_end: sessionStorage.getItem('dataM') === 'true' ? 'Y' : ''
+    }
+    if (window.GLOB.externalDatabase !== null) {
+      sysvals.db = window.GLOB.externalDatabase
+    }
+
+    let deffers = []
+    let mainItems = []  // 浜戠鎴栧崟鐐规暟鎹�
+    let localItems = [] // 鏈湴鏁版嵁
+
+    deForms.forEach(item => {
+      let ex = window.GLOB.CacheData.get('sql_' + item.uuid)
+      
+      if (!ex) return
+      
+      let exps = []
+      ex.reps.forEach(n => {
+        let key = n.toLowerCase()
+        if (sysvals.hasOwnProperty(key)) {
+          exps.push({
+            key: n,
+            value: sysvals[key]
+          })
+        }
+      })
+
+      let cell = {
+        id: ex.id,
+        menuname: item.label + '锛堣〃鍗曪級',
+        exps: exps,
+        md5_id: ''
+      }
+
+      if (item.database === 'sso' && window.GLOB.mainSystemApi) {
+        mainItems.push(cell)
+      } else {
+        localItems.push(cell)
+      }
+    })
+
+    if (localItems.length) {
+      deffers.push({
+        $backend: true,
+        $type: 's_Get_SelectedList',
+        data: localItems
+      })
+    }
+
+    if (mainItems.length) {
+      deffers.push({
+        $backend: true,
+        $type: 's_Get_SelectedList',
+        data: mainItems,
+        rduri: window.GLOB.mainSystemApi
+      })
+    }
+
+    if (!deffers.length) return
+
+    deffers = deffers.map(item => {
+      return new Promise(resolve => {
+        Api.getSystemCacheConfig(item, false).then(res => {
+          if (!res.status && res.ErrCode !== '-2') {
+            notification.warning({
+              top: 92,
+              message: res.message,
+              duration: 5
+            })
+          }
+          resolve(res)
+        })
+      })
+    })
+
+    Promise.all(deffers).then(response => {
+      let result = {...response[0], ...(response[1] || {})}
+
+      delete result.ErrCode
+      delete result.ErrMesg
+      delete result.message
+      delete result.status
+
+      this.props.columns.forEach(item => {
+        if (item.arr_field && result[item.field]) {
+          result[item.uuid] = result[item.field]
+        }
+      })
+
+      this.resetFormList(result)
+    })
+  }
+
+  resetFormList = (result) => {
+    const { columns, edData } = this.state
+
+    let _edColumns = []
+
+    let reCols = {}
+    this.props.columns.forEach(item => {
+      if (item.resourceType === '1' && result[item.uuid] && result[item.uuid].length > 0) {
+        let options = []
+        let all = false
+        result[item.uuid].forEach(cell => {
+          let _cell = {key: Utils.getuuid()}
+
+          _cell.value = cell[item.valueField]
+          _cell.label = cell[item.valueText]
+
+          if (!_cell.label && _cell.label !== 0) {
+            if (!all) {
+              _cell.label = '鍏ㄩ儴'
+              all = true
+            } else {
+              return
+            }
+          }
+
+          if (item.map.has(_cell.value)) return
+          item.map.set(_cell.value, _cell.label)
+
+          if (item.linkSubField) {
+            item.linkSubField.forEach(m => {
+              _cell[m] = cell[m] === undefined ? '' : cell[m]
+            })
+          }
+
+          if (item.disableField && cell[item.disableField] && /^true$/ig.test(cell[item.disableField])) {
+            _cell.$disabled = true
+          }
+  
+          options.push(_cell)
+        })
+
+        item.options = options
+
+        reCols[item.uuid] = fromJS(item).toJS()
+      }
+    })
+
+    _edColumns = columns.map(item => {
+      if (reCols[item.dataIndex]) {
+        item.onCell = record => ({
+          record,
+          col: reCols[item.dataIndex]
+        })
+      }
+
+      return item
+    })
+
+    let _cols = this.state.allColumns
+    if (_cols) {
+      _cols = _cols.map(item => {
+        if (reCols[item.dataIndex]) {
+          item.onCell = record => ({
+            record,
+            col: reCols[item.dataIndex]
+          })
+        }
+  
+        return item
+      })
+    }
+
+    this.setState({columns: [], edData: [], allColumns: _cols}, () => {
+      this.setState({columns: _edColumns, edData: edData})
+    })
+  }
+  
+  nextLine = (lineId, colId) => {
+    const { setting } = this.props
+    const { edData, tableId } = this.state
+
+    let index = edData.findIndex(item => item.$$uuid === lineId)
+    let next = edData[index + 1] || null
+    
+    if (next) {
+      MKEmitter.emit('setFocus' + tableId, next.$$uuid, colId)
+    } else if (setting.addable) {
+      setTimeout(() => {
+        this.plusLine(colId)
+      }, 10)
+    } else if (edData[index] && (setting.commit === 'all' || setting.commit === 'amend')) {
+      setTimeout(() => {
+        this.submit()
+      }, 10)
+    }
+  }
+
+  plusLine = (colId, lineId) => {
+    const { BID } = this.props
+    const { forms, tableId } = this.state
+
+    let edData = fromJS(this.state.edData).toJS()
+    let item = edData.length > 0 ? {...edData[edData.length - 1]} : {}
+    let index = null
+    
+    if (lineId) {
+      index = edData.findIndex(item => lineId === item.$$uuid)
+      index = index === -1 ? null : index
+      
+      if (index !== null) {
+        item = {...edData[index]}
+      }
+    }
+
+    item.key = edData.length
+    item.$$uuid = Utils.getguid()
+    item.$type = 'add'
+    item.$forbid = true
+    item.$Index = ''
+    item.$$BID = BID || ''
+
+    forms.forEach(col => {
       if (col.initval !== '$copy') {
         item[col.field] = col.initval
       }
@@ -624,107 +2278,150 @@
           item[col.field] = 0
         }
       }
+      if (item[col.field] === undefined) {
+        item[col.field] = ''
+      }
     })
 
-    this.setState({edData: [...edData, item]}, () => {
-      MKEmitter.emit('tdFocus', initEditLine.uuid + item.$Index)
+    let value = ''
+    Object.keys(item).sort().forEach(key => {
+      if (/^\$/.test(key)) return
+      value += item[key]
+    })
+    item.$sign = md5(value)
+
+    if (index === null) {
+      edData.push(item)
+    } else {
+      edData.splice(index, 0, item)
+    }
+
+    this.setState({edData: edData}, () => {
+      if (colId) {
+        MKEmitter.emit('setFocus' + tableId, item.$$uuid, colId)
+      }
     })
   }
 
-  delRecord = (id, record) => {
-    const { tableId, edData } = this.state
+  delRecord = (record) => {
+    const { setting } = this.props
+    const { edData } = this.state
 
-    if (id !== tableId) return
+    if (record.$type === 'add') {
+      let _data = edData.filter(item => item.$$uuid !== record.$$uuid)
+      this.setState({edData: _data})
+    } else {
+      let _data = fromJS(edData).toJS().map(item => {
+        if (item.$$uuid === record.$$uuid) {
+          item.$deleted = true
+          item.$origin = false
+          item.$type = 'del'
 
-    let _data = []
+          record.$deleted = true
+          record.$origin = false
+          record.$type = 'del'
+        }
 
-    if (record.$$uuid === '$new') {
-      _data = edData.filter(item => item.$Index !== record.$Index)
-      _data = _data.map((item, index) => {
-        item.key = index
-        item.$Index = 1 + index + ''
         return item
       })
-    } else {
-      _data = edData.map(item => {
-        if (item.$Index === record.$Index) {
-          record.$deleted = true
-          return record
-        } else {
-          return item
+
+      this.setState({edData: _data}, () => {
+        if (setting.commit === 'change') {
+          this.submit(record)
         }
       })
     }
-
-    this.setState({edData: _data})
   }
 
-  changeRecord = (id, record) => {
-    const { tableId } = this.state
+  changeRecord = (record) => {
+    const { setting } = this.props
+    const { edData } = this.state
 
-    if (id !== tableId) return
+    let data = edData.filter(item => item.$$uuid === record.$$uuid)[0]
 
-    let _data = this.state.edData.map(item => {
-      if (item.$Index === record.$Index) {
+    if (!data) return
+    
+    if (is(fromJS(data), fromJS(record))) return
+
+    delete record.$forbid
+
+    let value = ''
+    Object.keys(record).sort().forEach(key => {
+      if (/^\$/.test(key)) return
+      value += record[key]
+    })
+
+    let sign = md5(value)
+
+    if (record.$sign === sign) {
+      record.$origin = true
+      record.$lock = false
+    } else {
+      record.$origin = false
+      record.$lock = true
+    }
+
+    let _data = edData.map(item => {
+      if (item.$$uuid === record.$$uuid) {
         return record
       } else {
         return item
       }
     })
 
-    this.setState({edData: _data})
-  }
-
-  addLine = () => {
-    const { BID } = this.props
-    const { edData, fields } = this.state
-
-    let item = {}
-    if (edData.length > 0) {
-      item = {...edData[edData.length - 1]}
-      item.key = item.key + 1
-      item.$$uuid = '$new'
-      item.$Index = item.key + 1 + ''
-    } else {
-      item.key = 0
-      item.$$uuid = '$new'
-      item.$Index = item.key + 1 + ''
-      item.$$BID = BID || ''
-    }
-
-    fields.forEach(col => {
-      item[col.field] = item[col.field] !== undefined ? item[col.field] : ''
-
-      if (col.initval !== '$copy') {
-        item[col.field] = col.initval
-      }
-      if (col.type === 'number') {
-        item[col.field] = +item[col.field]
-        if (isNaN(item[col.field])) {
-          item[col.field] = 0
-        }
+    this.setState({edData: _data}, () => {
+      if (setting.tableType && setting.hasAction && this.state.selectedRowKeys.includes(record.$$uuid)) {
+        this.selectdata(this.state.selectedRowKeys)
       }
     })
-
-    this.setState({edData: [...edData, item]})
   }
 
   checkData = () => {
-    const { edData, fields } = this.state
+    const { setting } = this.props
+    const { edData, forms, checkForms, selectedRowKeys, dict } = this.state
 
-    if (edData.length === 0) {
+    let data = fromJS(edData).toJS()
+
+    data = data.filter(item => !item.$forbid)
+
+    if (setting.commit === 'amend') {
+      data = data.filter(item => !item.$origin)
+    } else if (setting.commit === 'check') {
+      data = data.filter(item => selectedRowKeys.includes(item.$$uuid))
+
+      if (data.length === 0) {
+        notification.warning({
+          top: 92,
+          message: dict['select_row'] || '璇烽�夋嫨闇�瑕佹彁浜ょ殑鏁版嵁锛�',
+          duration: 5
+        })
+        return null
+      }
+    }
+
+    if (data.length === 0) {
       notification.warning({
         top: 92,
-        message: '鎻愪氦鏁版嵁涓嶅彲涓虹┖锛�',
+        message: dict['un_modified'] || '鏁版嵁鏈慨鏀癸紝涓嶅彲鎻愪氦锛�',
         duration: 5
       })
-      return
+      return null
     }
+
     let err = ''
-    let data = fromJS(edData).toJS().map(item => {
+    let Index = 1
+    data = data.map(item => {
       let line = []
-      fields.forEach(col => {
-        if (col.editable !== 'true' || item.$deleted) {
+      forms.forEach(col => {
+        let check = true
+        if (col.editable !== 'true' || item.$deleted || !checkForms.includes(col.field)) {
+          check = false
+        }
+        if (col.ctrlField && col.ctrlValue.includes(item[col.ctrlField] + '')) {
+          check = false
+        }
+
+        if (!check) {
           if (col.type === 'number') {
             item[col.field] = +item[col.field]
             if (isNaN(item[col.field])) {
@@ -735,30 +2432,44 @@
           }
           return
         }
+
         if (col.type === 'text') {
           let val = item[col.field] !== undefined ? (item[col.field] + '') : ''
           if (col.required === 'true' && !val) {
-            line.push(`${col.label}涓嶅彲涓虹┖`)
+            line.push(`${col.label}${dict['not_empty'] || '涓嶅彲涓虹┖'}`)
+          } else if (col.datatype === 'datetime' && !val) {
+            val = '1949-10-01'
           }
           item[col.field] = val
         } else if (col.type === 'number') {
           let val = item[col.field]
-          if (!val && val !== 0) {
-            line.push(`${col.label}涓嶅彲涓虹┖`)
+          if (col.required === 'true' && !val) {
+            err = `${col.label}${col.noValue === 'hide' ? (dict['not_empty'] || '涓嶅彲涓虹┖') : dict['not_zero'] || '涓嶅彲涓�0'}`
+          } else if (col.noValue === 'hide' && !val) {
+            if (col.clearField && checkForms.includes(col.clearField) && !item[col.clearField]) {
+              let msg = `${dict['input_tip'] || '璇峰~鍐� '}${col.label} ${dict['or'] || '鎴�'} ${col.clearName}`
+              if (!line.includes(msg)) {
+                line.push(msg)
+              }
+            }
+            val = 0
+          } else if (!val && val !== 0) {
+            line.push(`${col.label}${dict['not_empty'] || '涓嶅彲涓虹┖'}`)
             return
-          }
-          val = +val
-          if (isNaN(val)) {
-            line.push(`${col.label}鏁版嵁鏍煎紡閿欒`)
-            return
-          }
-
-          val = +val.toFixed(col.decimal || 0)
-          
-          if (typeof(col.max) === 'number' && val > col.max) {
-            line.push(`${col.label}涓嶅彲澶т簬${col.max}`)
-          } else if (typeof(col.min) === 'number' && val < col.min) {
-            line.push(`${col.label}涓嶅彲灏忎簬${col.min}`)
+          } else {
+            val = +val
+            if (isNaN(val)) {
+              line.push(`${col.label} ${dict['data_format'] || '鏁版嵁鏍煎紡閿欒'}`)
+              return
+            }
+  
+            val = +val.toFixed(col.decimal || 0)
+            
+            if (typeof(col.max) === 'number' && val > col.max) {
+              line.push(`${col.label}${dict['max_limit'] || ' 涓嶅彲澶т簬 '}${col.max}`)
+            } else if (typeof(col.min) === 'number' && val < col.min) {
+              line.push(`${col.label}${dict['less_limit'] || ' 涓嶅彲灏忎簬 '}${col.min}`)
+            }
           }
 
           item[col.field] = val
@@ -766,7 +2477,10 @@
       })
 
       if (line.length > 0) {
-        err += `绗�${item.$Index}琛岋細` + line.join('锛�') + '锛�'
+        err += (dict['line'] ? `${dict['line']} ${Index}锛歚 : `绗�${Index}琛岋細`) + line.join('锛�') + '锛�'
+      }
+      if (!item.$deleted) {
+        Index++
       }
 
       return item
@@ -778,45 +2492,68 @@
         message: err,
         duration: 5
       })
-    } else {
-      this.submit(data)
+
+      return null
     }
+
+    return data
   }
 
-  submit = (data) => {
-    const { submit, BID } = this.props
-    const { fields } = this.state
+  submit = (record) => {
+    const { submit, BID, setting } = this.props
+    const { forms, dict } = this.state
 
-    let result = getEditTableSql(submit, data, fields)
+    this.setState({visible: false, midData: null})
 
-    let param = {
-      excel_in: result.lines,
-      BID: BID || ''
+    if (setting.supModule && !BID) {
+      notification.warning({
+        top: 92,
+        message: setting.supModTip || dict['sup_key_req'] || '闇�瑕佷笂绾т富閿�硷紒',
+        duration: 5
+      })
+
+      return
     }
+
+    let data = null
+    if (record) {
+      data = [record]
+    } else {
+      data = this.checkData()
+    }
+
+    if (!data) return
 
     this.setState({
       loading: true
     })
 
-    if (submit.intertype === 'system') { // 绯荤粺瀛樺偍杩囩▼
+    if (submit.intertype === 'system' && window.backend && window.GLOB.CacheData.has('sql_submit_' + submit.$menuId)) {
+      let ex = window.GLOB.CacheData.get('sql_submit_' + submit.$menuId)
+      let param = this.getExps(ex, submit, data, forms)
+
+      Api.genericInterface(param).then((res) => {
+        if (res.status) {
+          this.execSuccess(res, record)
+        } else {
+          this.execError(res, record)
+        }
+      }, (error) => {
+        if (error && error.ErrCode === 'LoginError') return
+
+        this.execError({})
+      })
+    } else if (submit.intertype === 'system') { // 绯荤粺瀛樺偍杩囩▼
+      let result = getEditTableSql(submit, data, forms, setting)
+      let param = {}
+
       param.func = 'sPC_TableData_InUpDe'
+      param.BID = BID || ''
       
-      if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
-        result.sql = result.sql.replace(/\$@/ig, '/*')
-        result.sql = result.sql.replace(/@\$/ig, '*/')
-        result.bottom = result.bottom.replace(/\$@/ig, '/*')
-        result.bottom = result.bottom.replace(/@\$/ig, '*/')
-      } else {
-        result.sql = result.sql.replace(/@\$|\$@/ig, '')
-        result.bottom = result.bottom.replace(/@\$|\$@/ig, '')
-      }
-      
-      param.excel_in_type = 'true'
-      param.LText1 = Utils.formatOptions(result.insert)
-      param.LText2 = Utils.formatOptions(result.bottom)
-      param.LText = Utils.formatOptions(result.sql)
+      param.exec_type = window.GLOB.execType || 'y'
+      param.LText = Utils.formatOptions(result.sql, param.exec_type)
       param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
-      param.secretkey = Utils.encrypt(param.LText, param.timestamp)
+      param.secretkey = Utils.encrypt('', param.timestamp)
 
       param.menuname = submit.logLabel
 
@@ -826,80 +2563,199 @@
 
       Api.genericInterface(param).then((res) => {
         if (res.status) {
-          this.execSuccess(res)
+          this.execSuccess(res, record)
         } else {
-          this.execError(res)
+          this.execError(res, record)
         }
-      }, () => {
+      }, (error) => {
+        if (error && error.ErrCode === 'LoginError') return
+
         this.execError({})
       })
     } else if (submit.intertype === 'inner' && submit.innerFunc) { // 鑷畾涔夊瓨鍌ㄨ繃绋�
+      let result = getEditTableSql(submit, data, forms, setting)
+      let param = {}
+
       param.func = submit.innerFunc
+      param.BID = BID || ''
+      param.excel_in = result.lines
+
+      if (submit.recordUser === 'true') {
+        param.username = sessionStorage.getItem('User_Name') || ''
+        param.fullname = sessionStorage.getItem('Full_Name') || ''
+      }
 
       Api.genericInterface(param).then((res) => {
         if (res.status) {
-          this.execSuccess(res)
+          this.execSuccess(res, record)
         } else {
-          this.execError(res)
+          this.execError(res, record)
         }
-      }, () => {
+      }, (error) => {
+        if (error && error.ErrCode === 'LoginError') return
+
         this.execError({})
       })
     }
   }
 
-  execSuccess = (res) => {
+  getExps = (ex, btn, data, forms) => {
+    const { BID } = this.props
+
+    let exps = []
+    let values = {
+      time_id: Utils.getguid(),
+      roleid: sessionStorage.getItem('role_id') || '',
+      mk_departmentcode: sessionStorage.getItem('departmentcode') || '',
+      mk_organization: sessionStorage.getItem('organization') || '',
+      mk_user_type: sessionStorage.getItem('mk_user_type') || '',
+      mk_nation: sessionStorage.getItem('nation') || '',
+      mk_province: sessionStorage.getItem('province') || '',
+      mk_city: sessionStorage.getItem('city') || '',
+      mk_district: sessionStorage.getItem('district') || '',
+      mk_address: sessionStorage.getItem('address') || '',
+      bid: BID || '',
+      typename: 'admin',
+      datam: sessionStorage.getItem('dataM') === 'true' ? 'Y' : '',
+      datam_begin: sessionStorage.getItem('dataM') === 'true' ? 'Y' : '',
+      datam_end: sessionStorage.getItem('dataM') === 'true' ? 'Y' : '',
+    }
+
+    if (window.GLOB.externalDatabase !== null) {
+      values.db = window.GLOB.externalDatabase
+    }
+
+    let lines = data.map(item => {
+      let vals = []
+      forms.forEach(col => {
+        if (typeof(item[col.field]) === 'number') {
+          vals.push(item[col.field] + '')
+        } else {
+          vals.push(item[col.field])
+        }
+      })
+  
+      vals.push(item.$$uuid)
+      vals.push(item.$type || 'upt')
+      vals.push(BID)
+  
+      return vals
+    })
+
+    ex.reps.forEach(n => {
+      let key = n.toLowerCase()
+      if (values.hasOwnProperty(key)) {
+        exps.push({
+          key: n,
+          value: values[key]
+        })
+      }
+    })
+
+    exps.push({
+      key: 'mk_excel_data',
+      value: lines
+    })
+
+    let md5_id = ''
+    if (window.GLOB.probation) {
+      md5_id = md5(ex.id + JSON.stringify(exps) + Math.floor(new Date().getTime() / 600000))
+      md5_id = moment().format('YYYYMMDDHHmmss') + md5_id.slice(-18)
+    }
+
+    return {
+      $backend: true,
+      $type: 's_TableData_InUpDe',
+      data: [{
+        id: ex.id,
+        menuname: btn.logLabel || '',
+        exps: exps,
+        md5_id: md5_id
+      }]
+    }
+  }
+
+  execSuccess = (res, record) => {
     const { submit } = this.props
+    const { edData, dict } = this.state
 
     if (res && res.ErrCode === 'S') { // 鎵ц鎴愬姛
       notification.success({
         top: 92,
-        message: res.ErrMesg || this.state.dict['main.action.confirm.success'],
+        message: res.message || dict['exc_success'] || '鎵ц鎴愬姛',
         duration: submit.stime ? submit.stime : 2
       })
     } else if (res && res.ErrCode === 'Y') { // 鎵ц鎴愬姛
       Modal.success({
-        title: res.ErrMesg || this.state.dict['main.action.confirm.success']
+        title: res.message || dict['exc_success'] || '鎵ц鎴愬姛',
+        okText: dict['got_it'] || '鐭ラ亾浜�'
       })
     } else if (res && res.ErrCode === '-1') { // 瀹屾垚鍚庝笉鎻愮ず
 
     }
 
+    let _edData = fromJS(edData).toJS()
+
+    _edData = _edData.filter(item => {
+      if (item.$deleted) return false
+
+      if (!item.$forbid) {
+        item.$type = 'upt'
+        item.$origin = true
+        item.$lock = false
+      }
+
+      let value = ''
+      Object.keys(item).sort().forEach(key => {
+        if (/^\$/.test(key)) return
+        value += item[key]
+      })
+
+      item.$sign = md5(value)
+
+      return true
+    })
+
     this.setState({
-      loading: false
+      loading: false,
+      edData: _edData
     })
 
     if (submit.closetab === 'true') {
       MKEmitter.emit('popclose')
     }
+
     if (submit.execSuccess !== 'never') {
-      this.repick()
-      MKEmitter.emit('refreshByButtonResult', submit.$menuId, submit.execSuccess, submit)
+      MKEmitter.emit('refreshByButtonResult', submit.$menuId, submit.execSuccess, submit, '', record ? [record] : null)
     }
+
+    submit.syncComponentId && MKEmitter.emit('reloadData', submit.syncComponentId)
   }
 
-  execError = (res) => {
+  execError = (res, record) => {
     const { submit } = this.props
+    const { dict } = this.state
 
     if (res.ErrCode === 'E') {
       Modal.error({
-        title: res.message || res.ErrMesg,
+        title: res.message || dict['exc_fail'] || '鎵ц澶辫触锛�',
+        okText: dict['got_it'] || '鐭ラ亾浜�'
       })
     } else if (res.ErrCode === 'N') {
       notification.error({
         top: 92,
-        message: res.message || res.ErrMesg,
+        message: res.message || dict['exc_fail'] || '鎵ц澶辫触锛�',
         duration: submit.ntime ? submit.ntime : 10
       })
     } else if (res.ErrCode === 'F') {
       notification.error({
         className: 'notification-custom-error',
         top: 92,
-        message: res.message || res.ErrMesg,
+        message: res.message || dict['exc_fail'] || '鎵ц澶辫触锛�',
         duration: submit.ftime ? submit.ftime : 10
       })
     } else if (res.ErrCode === 'NM') {
-      message.error(res.message || res.ErrMesg)
+      message.error(res.message || dict['exc_fail'] || '鎵ц澶辫触锛�')
     }
     
     this.setState({
@@ -907,23 +2763,77 @@
     })
 
     if (submit.execError !== 'never') {
-      this.repick()
-      MKEmitter.emit('refreshByButtonResult', submit.$menuId, submit.execError, submit)
+      MKEmitter.emit('refreshByButtonResult', submit.$menuId, submit.execError, submit, '', record ? [record] : null)
     }
   }
 
-  repick = () => {
-    const { data } = this.state
+  /**
+   * @description 閫変腑琛�
+   */
+  onSelectChange = selectedRowKeys => {
+    this.setState({ selectedRowKeys })
 
-    this.setState({
-      data: [],
-      edData: [],
-      pickup: false,
-    }, () => {
-      this.setState({
-        data: data,
-      })
-    })
+    let activeId = ''
+    if (selectedRowKeys.length > 0) {
+      activeId = selectedRowKeys.slice(-1)[0]
+    }
+    this.changedata(activeId)
+    this.selectdata(selectedRowKeys)
+  }
+
+  /**
+   * @description 鐐瑰嚮鏁磋锛岃Е鍙戝垏鎹紝 鍒ゆ柇鏄惁鍙�夛紝鍗曢�夋垨澶氶�夛紝杩涜瀵瑰簲鎿嶄綔
+   */
+  changeRow = (id) => {
+    const { setting } = this.props
+
+    if (!setting.tableType) return
+    
+    let newkeys = fromJS(this.state.selectedRowKeys).toJS()
+
+    let activeId = ''
+    if (setting.tableType === 'radio') {
+      activeId = id
+      newkeys = [id]
+      this.setState({ selectedRowKeys: newkeys })
+    } else {
+      if (newkeys.includes(id)) {
+        newkeys = newkeys.filter(item => item !== id)
+
+        if (newkeys.length > 0) {
+          activeId = newkeys.slice(-1)[0]
+        }
+      } else {
+        activeId = id
+        newkeys.push(id)
+      }
+
+      this.setState({ selectedRowKeys: newkeys })
+    }
+
+    this.changedata(activeId)
+    this.selectdata(newkeys)
+  }
+
+  changedata = (id) => {
+    const { MenuID } = this.props
+    const { edData } = this.state
+
+    let _data = ''
+
+    if (id) {
+      _data = edData.filter(item => item.$$uuid === id)[0] || ''
+    }
+
+    MKEmitter.emit('resetSelectLine', MenuID, id, _data)
+  }
+
+  selectdata = (keys) => {
+    const { edData } = this.state
+
+    let _data = edData.filter(item => keys.includes(item.$$uuid))
+
+    this.props.chgSelectData(_data)
   }
 
   changeTable = (pagination, filters, sorter) => {
@@ -931,7 +2841,8 @@
 
     this.setState({
       pageIndex: pagination.current,
-      pageSize: pagination.pageSize
+      pageSize: pagination.pageSize,
+      selectedRowKeys: [],
     })
 
     sorter.field = orderfields[sorter.field] || ''
@@ -944,128 +2855,118 @@
 
     if (id !== MenuID) return
 
-    if (repage !== 'false') {
+    if (repage === 'false') {
       this.setState({
-        pageIndex: 1
-      })
-    }
-  }
-
-  pickupChange = () => {
-    const { submit } = this.props
-    const { data } = this.state
-
-    let pickup = !this.state.pickup
-
-    if (!submit.sheet) {
-      notification.warning({
-        top: 92,
-        message: '鎻愪氦鎸夐挳灏氭湭璁剧疆锛屼笉鍙紪杈戯紒',
-        duration: 5
-      })
-      return
-    }
-
-    if (!pickup && !is(fromJS(data), fromJS(this.state.edData))) {
-      const _this = this
-      confirm({
-        title: '鏁版嵁宸蹭慨鏀癸紝纭畾鏀惧純淇濆瓨鍚楋紵',
-        onOk() {
-          _this.setState({
-            data: [],
-            edData: [],
-            pickup
-          }, () => {
-            _this.setState({
-              data: data,
-              edData: pickup ? fromJS(data).toJS() : []
-            })
-          })
-        },
-        onCancel() {}
+        selectedRowKeys: [],
       })
     } else {
       this.setState({
-        data: [],
-        edData: [],
-        pickup,
-        loading: false,
-        editable: 'false'
-      }, () => {
-        this.setState({
-          data: data,
-          edData: pickup ? fromJS(data).toJS() : []
-        })
+        pageIndex: 1,
+        selectedRowKeys: [],
       })
     }
   }
 
   render() {
-    const { setting, statFValue, lineMarks, submit } = this.props
-    const { pickup, tableId, data, edData, columns, edColumns, loading, pageOptions } = this.state
+    const { setting, lineMarks, submit } = this.props
+    const { edData, columns, loading, pageOptions, selectedRowKeys, visible, midData, reseting, dict } = this.state
+
+    if (reseting) return null
 
     const components = {
       body: {
         row: BodyRow,
-        cell: BodyCell
+        cell: setting.editType !== 'multi' ? BodyCell : BodyAllCell
       }
     }
 
-    // 鏁版嵁鏀惰捣鏃讹紝杩囨护宸查�夋暟鎹�
-    let _data = data
-    let _columns = columns
+    let _data = edData.filter(item => !item.$deleted)
 
-    if (pickup) {
-      _data = edData
-      _data = _data.filter(item => !item.$deleted)
-      _columns = edColumns
+    // 璁剧疆琛ㄦ牸閫夋嫨灞炴�э細鍗曢�夈�佸閫夈�佷笉鍙��
+    let rowSelection = null
+    if (setting.tableType) {
+      rowSelection = {
+        selectedRowKeys,
+        type: (setting.tableType === 'radio') ? 'radio' : 'checkbox',
+        onChange: this.onSelectChange
+      }
     }
 
     let _pagination = false
-    if (!pickup && setting.laypage !== 'false' && setting.laypage !== false) {
+    if (setting.laypage) {
       _pagination = {
         current: this.state.pageIndex,
         pageSize: this.state.pageSize,
         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]} ${dict['of'] || '鍏�'} ${total} ${dict['items'] || '鏉�'}`
       }
     }
 
-    let _footer = ''
-
-    if (!pickup && statFValue && statFValue.length > 0) {
-      _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 height = setting.height || false
+    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={`edit-custom-table ${pickup ? 'editable' : ''} ${setting.tableHeader || ''} ${height ? 'fixed-height' : ''} ${setting.mode || ''}`} id={tableId}>
-        <Switch title="缂栬緫" className="main-pickup" checkedChildren="寮�" unCheckedChildren="鍏�" checked={pickup} onChange={this.pickupChange} />
-        {pickup ? <Button style={submit.style} onClick={() => setTimeout(() => {this.checkData()}, 10)} loading={loading} className="submit-table" type="link">鎻愪氦</Button> : null}
-        <Table
-          components={components}
-          style={setting.style}
-          size={setting.size || 'middle'}
-          bordered={setting.bordered !== 'false'}
-          columns={_columns}
-          dataSource={_data}
-          loading={this.props.loading}
-          scroll={{ x: '100%', y: height }}
-          onRow={(record, index) => {
-            return {
-              lineMarks,
-              data: record
-            }
-          }}
-          onChange={this.changeTable}
-          pagination={_pagination}
-        />
-        {_footer ? <div className={'normal-table-footer ' + (_pagination ? 'pagination' : '')}>{_footer}</div> : null}
-        {pickup && setting.addable === 'true' ? <Button onClick={this.addLine} style={{display: 'block', width: '100%', color: '#26C281', border: '1px solid #dddddd', borderRadius: 0}} type="link"><PlusOutlined /></Button> : null}
-      </div>
+      <>
+        {setting.hasSubmit && edData.length > 0 ? <div className="edit-custom-table-btn-wrap" style={submit.wrapStyle}>
+          <Button style={submit.style} onClick={() => setTimeout(() => {this.submit()}, 10)} loading={loading} className="submit-table" type="link">{dict['submit'] || '鎻愪氦'}</Button>
+        </div> : null}
+        <div className={`edit-custom-table ${setting.tableHeader || ''} ${setting.parity === 'true' ? 'mk-parity' : ''} ${height ? 'fixed-table-height' : ''} ${setting.mode || ''} table-vertical-${setting.vertical || ''} mk-edit-${setting.editType || 'simple'} ${setting.empSign === 'hidden' ? 'mk-empty-hide' : ''}`} style={style}>
+          <Table
+            rowKey="$$uuid"
+            components={components}
+            size={setting.size || 'middle'}
+            bordered={setting.bordered !== 'false'}
+            rowSelection={rowSelection}
+            columns={columns}
+            dataSource={_data}
+            loading={this.props.loading}
+            scroll={{ x: '100%', y: height }}
+            onRow={(record, index) => {
+              return {
+                lineMarks,
+                title: setting.tipField ? record[setting.tipField] : '',
+                data: record,
+                onClick: () => {this.changeRow(record.$$uuid)},
+              }
+            }}
+            onChange={this.changeTable}
+            pagination={_pagination}
+          />
+          {setting.hasSubmit && _data.length > 10 ? <Button style={submit.style} onClick={() => setTimeout(() => {this.submit()}, 10)} loading={loading} className="submit-footer-table" type="link">{dict['submit'] || '鎻愪氦'}</Button> : null}
+        </div>
+        <Modal
+          className="mk-user-confirm"
+          visible={visible}
+          width={450}
+          maskClosable={false}
+          closable={false}
+          footer={[
+            <Button key="cancel" onClick={() => { this.setState({ visible: false, midData: null }) }}>{dict['cancel'] || '鍙栨秷'}</Button>,
+            <Button key="refresh" className="table-refresh" onClick={() => { midData && this.updateMutil(midData) }}>{dict['refresh'] || '鍒锋柊琛ㄦ牸'}</Button>,
+            <Button key="confirm" type="primary" onClick={() => setTimeout(() => {this.submit()}, 10)}>{dict['submit'] || '鎻愪氦鏁版嵁'}</Button>
+          ]}
+          destroyOnClose
+        >
+          <div><QuestionCircleOutlined />{dict['data_not_sub'] || '琛ㄦ牸涓湁鏁版嵁灏氭湭鎻愪氦'}</div>
+        </Modal>
+      </>
     )
   }
 }

--
Gitblit v1.8.0