~jinfei/pc-plat.git

			@@ -1,24 +1,602 @@
			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, Select } from 'antd'
			import { ExclamationCircleOutlined, EditOutlined, PlusOutlined, PlusCircleOutlined, DeleteOutlined } 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 CusSwitch from './cusSwitch'
			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 = {
			autoFocus: PropTypes.bool,
			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)
			}

			this.props.onBlur && this.props.onBlur()
			}

			render() {
			const { config, autoFocus } = this.props
			const { status } = this.state

			return (
			<Switch
			ref={ref => this.node = ref}
			checkedChildren={config.openText}
			checked={status}
			autoFocus={autoFocus}
			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
			} 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

			return (
			<InputNumber
			title={err}
			className={err ? 'has-error' : ''}
			ref={ref => this.node = ref}
			precision={config.decimal \|\| 0}
			value={value}
			onChange={(value) => this.onChange(value)}
			onPressEnter={this.enterPress}
			onFocus={this.onFocus}
			onBlur={this.onBlur}
			/>
			)
			}
			}

			class BodyRow extends React.Component {
			shouldComponentUpdate (nextProps, nextState) {
			@@ -98,18 +676,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))
			}

			/**
			@@ -119,181 +698,43 @@
			this.setState = () => {
			return
			}
			MKEmitter.removeListener('tdFocus', this.tdFocus)
			}

			tdFocus = (id) => {
			const { col, record } = this.props

			if (id !== col.uuid + record.$$uuid) return

			if (col.ctrlField && col.ctrlValue.includes(record[col.ctrlField])) 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.$$uuid)
			} else if (col.enter === '$sub') {
			MKEmitter.emit('subLine', col, record)
			} else if (col.enter !== '$noAct') {
			MKEmitter.emit('tdFocus', col.enter + record.$$uuid)
			}
			}, 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

			if (col.editType === 'switch' \|\| col.editType === 'select') {
			this.setState({editing: true}, () => {
			let node = document.getElementById(col.uuid + record.$$uuid)
			node && node.click()
			})
			} else {
			let err = null
			let val = record[col.field] !== undefined ? record[col.field] : ''

			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.$$uuid)
			node && node.select()
			})
			}
			if (col.ctrlField && col.ctrlValue.includes(record[col.ctrlField] + '')) return

			this.setState({editing: true})
			}

			onBlur = () => {
			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})
			}

			onSwitchChange = (val, label) => {
			onColChange = (values) => {
			const { col, record } = this.props

			this.setState({editing: false})

			setTimeout(() => {
			if (col.enter === '$next') {
			MKEmitter.emit('nextLine', col, record.$$uuid)
			} else if (col.enter === '$sub') {
			MKEmitter.emit('subLine', col, record)
			} else if (col.enter !== '$noAct') {
			MKEmitter.emit('tdFocus', col.enter + record.$$uuid)
			}
			}, 50)

			let values = {}
			if (col.editField) {
			values[col.field] = label
			values[col.editField] = val
			} else {
			values[col.field] = val
			}

			MKEmitter.emit('changeRecord', col.tableId, {...record, ...values})
			}

			onSelectChange = (val, option) => {
			const { col, record } = this.props

			let values = {}
			let _option = col.options.filter(m => m.key === option.key)[0]

			if (_option) {
			if (col.linkSubField) {
			col.linkSubField.forEach(m => {
			values[m] = _option[m] !== undefined ? _option[m] : ''
			})
			}

			if (col.editField) {
			values[col.field] = _option.label
			values[col.editField] = val
			} else {
			values[col.field] = val
			}
			}

			this.setState({editing: false})

			setTimeout(() => {
			if (col.enter === '$next') {
			MKEmitter.emit('nextLine', col, record.$$uuid)
			} else if (col.enter === '$sub') {
			MKEmitter.emit('subLine', col, record)
			} else if (col.enter !== '$noAct') {
			MKEmitter.emit('tdFocus', col.enter + record.$$uuid)
			}
			}, 50)

			MKEmitter.emit('changeRecord', col.tableId, {...record, ...values})
			}

			switchBlur = () => {
			setTimeout(() => {
			this.setState({editing: false})
			}, 10)
			MKEmitter.emit('changeRecord' + col.tableId, {...record, ...values})
			}

			render() {
			let { col, config, record, style, className, ...resProps } = this.props
			const { editing, value, err } = this.state
			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])
			disabled = col.ctrlValue.includes(record[col.ctrlField] + '')
			}

			let children = null
			@@ -301,6 +742,20 @@
			let content = ''
			if (record[col.field] !== undefined) {
			content = `${record[col.field]}`
			}

			if (col.editType === 'select' && col.options.length > 0) {
			content = col.map.get(content) \|\| content
			} else if (col.editType === 'switch') {
			if (content === config.openVal) {
			content = config.openText
			} else if (content === config.closeVal) {
			content = config.closeText
			}
			} else if (col.editType === 'popSelect') {
			if (col.showField) {
			content = record[col.showField] \|\| content
			}
			}

			if (content !== '') {
			@@ -312,15 +767,19 @@
			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) {
			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') {
			@@ -330,53 +789,50 @@
			}
			} 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) {
			if (editing) {
			let _value = record[col.field] !== undefined ? record[col.field] : ''

			if (!col.editType \|\| col.editType === 'text') {
			return (<td className="editing_table_cell">
			<Input id={col.uuid + record.$$uuid} defaultValue={value} onChange={(e) => this.onChange(e.target.value)} onPressEnter={this.enterPress} onBlur={this.onBlur}/>
			{err ? <Tooltip title={err}><ExclamationCircleOutlined /></Tooltip> : null}
			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 === 'switch') {
			let _value = ''
			if (col.editField) {
			_value = record[col.editField] !== undefined ? record[col.editField] : ''
			} else {
			_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} 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 className="editing_table_cell">
			<CusSwitch config={col} defaultValue={_value} autoFocus={true} onChange={this.onSwitchChange} onBlur={this.switchBlur}/>

			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 {
			let _value = ''
			if (col.editField) {
			_value = record[col.editField] !== undefined ? record[col.editField] : ''
			} else {
			_value = record[col.field] !== undefined ? record[col.field] : ''
			}
			return (<td className="editing_table_cell">
			<Select
			showSearch
			defaultValue={_value}
			dropdownClassName="edit-table-dropdown"
			dropdownMatchSelectWidth={col.dropdown === 'fixed'}
			id={col.uuid + record.$$uuid}
			onBlur={() => this.setState({editing: false})}
			filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
			onSelect={this.onSelectChange}
			>
			{col.options.map((item, i) => (<Select.Option key={item.key} disabled={item.$disabled} value={item.value}>{item.label}</Select.Option>))}
			</Select>
			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}>
			{col.addable ? <PlusCircleOutlined onClick={() => MKEmitter.emit('addRecord', col.tableId, {...record})} className="mk-editable mk-plus"/> : null}
			<div className="mk-mask" onClick={this.focus}></div>{content}
			{col.delable ? <DeleteOutlined onClick={() => MKEmitter.emit('delRecord', col.tableId, {...record})} className="mk-editable mk-del"/> : null}
			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 {
			@@ -387,6 +843,9 @@
			try {
			content = parseFloat(record[col.field])
			if (isNaN(content)) {
			content = ''
			}
			if (col.noValue === 'hide' && content === 0) {
			content = ''
			}
			} catch (e) {
			@@ -414,9 +873,9 @@
			}

			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') {
			@@ -426,20 +885,29 @@
			}
			} 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) {
			if (editing) {
			return (<td className="editing_table_cell">
			<InputNumber id={col.uuid + record.$$uuid} 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}>
			{col.addable ? <PlusCircleOutlined onClick={() => MKEmitter.emit('addRecord', col.tableId, {...record})} className="mk-editable mk-plus"/> : null}
			<div className="mk-mask" onClick={this.focus}></div>{content}
			{col.delable ? <DeleteOutlined onClick={() => MKEmitter.emit('delRecord', col.tableId, {...record})} className="mk-editable mk-del"/> : null}
			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 {
			@@ -462,35 +930,57 @@
			)
			} 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 {
			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) {
			console.info(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, ' ')
			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 \|\| ''}`
			content = content.replace(/\n/ig, '<br/>').replace(/\s/ig, ' ')
			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') {
			@@ -500,6 +990,14 @@
			}
			} 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}</>
			}
			}
			}

			@@ -513,38 +1011,17 @@
			children = (
			<CardCellComponent data={record} cards={config} elements={col.elements}/>
			)
			} else if (col.type === 'action') {
			style.padding = '0px'
			if (col.style) {
			style = {...style, ...col.style}
			}
			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>
			)
			}

			return (<td className={className} style={style}>{col.addable ? <PlusCircleOutlined onClick={() => MKEmitter.emit('addRecord', col.tableId, {...record})} className="mk-editable mk-plus"/> : null}{children}{col.delable ? <DeleteOutlined onClick={() => MKEmitter.emit('delRecord', col.tableId, {...record})} className="mk-editable mk-del"/> : null}</td>)
			// return (<td className={className} style={style}>{children}</td>)
			return (<td className={className} style={style}>{children}</td>)
			}
			}

			class BodyAllCell extends React.Component {
			state = {
			err: null
			}
			state = {}

			shouldComponentUpdate (nextProps, nextState) {
			return !is(fromJS(this.props.record), fromJS(nextProps.record)) \|\|
			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))
			}

			/**
			@@ -554,188 +1031,75 @@
			this.setState = () => {
			return
			}
			MKEmitter.removeListener('tdFocus', this.tdFocus)
			}

			tdFocus = (id) => {
			onColChange = (values) => {
			const { col, record } = this.props

			if (id !== col.uuid + record.$$uuid) return
			this.focus()
			}

			enterPress = () => {
			const { col, record } = this.props

			setTimeout(() => {
			if (col.enter === '$next') {
			MKEmitter.emit('nextLine', col, record.$$uuid)
			} else if (col.enter === '$sub') {
			MKEmitter.emit('subLine', col, record)
			} else if (col.enter !== '$noAct') {
			MKEmitter.emit('tdFocus', col.enter + record.$$uuid)
			}
			}, 50)
			}

			focus = () => {
			const { col, record } = this.props

			if (col.editType === 'switch' \|\| col.editType === 'select') {
			let node = document.getElementById(col.uuid + record.$$uuid)
			node && node.click()
			} else {
			let err = null
			let val = record[col.field] !== undefined ? record[col.field] : ''

			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({err}, () => {
			let node = document.getElementById(col.uuid + record.$$uuid)
			node && node.select()
			})
			}
			}

			onChange = (val) => {
			const { col, record } = 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({err})
			MKEmitter.emit('changeRecord', col.tableId, {...record, [col.field]: val})
			}

			onSwitchChange = (val, label) => {
			const { col, record } = this.props

			setTimeout(() => {
			if (col.enter === '$next') {
			MKEmitter.emit('nextLine', col, record.$$uuid)
			} else if (col.enter === '$sub') {
			MKEmitter.emit('subLine', col, record)
			} else if (col.enter !== '$noAct') {
			MKEmitter.emit('tdFocus', col.enter + record.$$uuid)
			}
			}, 50)

			let values = {}
			if (col.editField) {
			values[col.field] = label
			values[col.editField] = val
			} else {
			values[col.field] = val
			}

			MKEmitter.emit('changeRecord', col.tableId, {...record, ...values})
			}

			onSelectChange = (val, option) => {
			const { col, record } = this.props

			let values = {}
			let _option = col.options.filter(m => m.key === option.key)[0]

			if (_option) {
			if (col.linkSubField) {
			col.linkSubField.forEach(m => {
			values[m] = _option[m] !== undefined ? _option[m] : ''
			})
			}

			if (col.editField) {
			values[col.field] = _option.label
			values[col.editField] = val
			} else {
			values[col.field] = val
			}
			}

			setTimeout(() => {
			if (col.enter === '$next') {
			MKEmitter.emit('nextLine', col, record.$$uuid)
			} else if (col.enter === '$sub') {
			MKEmitter.emit('subLine', col, record)
			} else if (col.enter !== '$noAct') {
			MKEmitter.emit('tdFocus', col.enter + record.$$uuid)
			}
			}, 50)

			MKEmitter.emit('changeRecord', col.tableId, {...record, ...values})
			MKEmitter.emit('changeRecord' + col.tableId, {...record, ...values})
			}

			render() {
			let { col, config, record, style, className } = this.props
			const { err } = this.state
			let { col, config, 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])
			disabled = col.ctrlValue.includes(record[col.ctrlField] + '')
			}

			let children = null
			if (col.type === 'text') {
			if (col.editable === 'true' && !disabled) {
			let _value = ''
			if (col.editField) {
			_value = record[col.editField] !== undefined ? record[col.editField] : ''
			} else {
			_value = record[col.field] !== undefined ? record[col.field] : ''
			}
			editable = true
			let _value = record[col.field] !== undefined ? record[col.field] : ''

			if (!col.editType \|\| col.editType === 'text') {
			children = (<>
			<Input id={col.uuid + record.$$uuid} defaultValue={_value} onChange={(e) => this.onChange(e.target.value)} onPressEnter={this.enterPress} onBlur={this.onBlur}/>
			{err ? <Tooltip title={err}><ExclamationCircleOutlined /></Tooltip> : null}
			</>)
			children = (
			<MkInput config={col} lineId={record.$$uuid} defaultValue={_value} autoFocus={false} onChange={this.onColChange}/>
			)
			} else if (col.editType === 'switch') {
			children = (
			<CusSwitch config={col} autoFocus={false} defaultValue={_value} onChange={this.onSwitchChange} onBlur={() => {}}/>
			<MkSwitch config={col} lineId={record.$$uuid} defaultValue={_value} autoFocus={false} 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 = (<>
			<Select
			showSearch
			dropdownClassName="edit-table-dropdown"
			dropdownMatchSelectWidth={col.dropdown === 'fixed'}
			defaultValue={_value}
			id={col.uuid + record.$$uuid}
			filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
			onSelect={this.onSelectChange}
			>
			{col.options.map((item, i) => (<Select.Option key={item.key} disabled={item.$disabled} value={item.value}>{item.label}</Select.Option>))}
			</Select>
			</>)
			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.options.length > 0) {
			content = col.map.get(content) \|\| content
			} else if (col.editType === 'switch') {
			if (content === config.openVal) {
			content = config.openText
			} else if (content === config.closeVal) {
			content = config.closeText
			}
			} else if (col.editType === 'popSelect') {
			if (col.showField) {
			content = record[col.showField] \|\| content
			}
			}

			if (content !== '') {
			@@ -747,15 +1111,19 @@
			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) {
			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') {
			@@ -765,22 +1133,43 @@
			}
			} 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] : ''
			children = (<>
			<InputNumber id={col.uuid + record.$$uuid} defaultValue={_value} onChange={(val) => this.onChange(val)} onPressEnter={this.enterPress}/>
			{err ? <Tooltip title={err}><ExclamationCircleOutlined /></Tooltip> : null}
			</>)

			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) {
			@@ -808,9 +1197,9 @@
			}

			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') {
			@@ -820,8 +1209,21 @@
			}
			} 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') {
			@@ -841,35 +1243,57 @@
			)
			} 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 {
			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) {
			console.info(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, ' ')
			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 \|\| ''}`
			content = content.replace(/\n/ig, '<br/>').replace(/\s/ig, ' ')
			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') {
			@@ -879,6 +1303,14 @@
			}
			} 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}</>
			}
			}
			}

			@@ -892,20 +1324,18 @@
			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>
			)
			}

			return (<td className={'editing_all_table_cell ' + className} style={style}>{col.addable ? <PlusCircleOutlined onClick={() => MKEmitter.emit('addRecord', col.tableId, {...record})} className="mk-editable mk-plus"/> : null}{children}{col.delable ? <DeleteOutlined onClick={() => MKEmitter.emit('delRecord', col.tableId, {...record})} className="mk-editable mk-del"/> : null}</td>)
			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, // 表格全局设置：tableType（表格是否可选、单选、多选）、actionfixed（按钮固定）
			columns: PropTypes.array, // 表格列
			@@ -915,85 +1345,122 @@
			total: PropTypes.any, // 总数
			loading: PropTypes.bool, // 表格加载中
			refreshdata: PropTypes.func, // 表格中排序列、页码的变化时刷新
			changeLock: 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, // 显示列
			forms: [],
			pickup: false, // 收起未选择项
			orderfields: {}, // 排序id与field转换
			loading: false,
			editable: false,
			pageOptions: []
			pageOptions: [],
			deForms: null,
			visible: false,
			midData: null,
			allColumns: null,
			checkForms: [],
			allForms: [],
			reseting: false
			}

			timer = null
			focusId = ''
			blurId = ''
			colId = ''

			UNSAFE_componentWillMount () {
			const { setting, fields, columns } = this.props
			const { setting, fields, columns, BID, colsCtrls } = this.props
			let orderfields = {}
			let initEditLine = null
			let edColumns = []

			let _columns = []
			let deForms = []
			let _forms = {}
			let hasBid = false
			let index = 0
			let checkForms = []
			let allForms = []

			let getColumns = (cols) => {
			let getColumns = (cols, sk) => {
			return cols.map(item => {
			let cell = null

			if (item.type === 'colspan') {
			cell = { title: item.label, align: item.Align }
			cell.children = getColumns(item.subcols)
			cell = { title: item.label, align: item.Align, $key: item.uuid }
			cell.children = getColumns(item.subcols, sk \|\| item.uuid)
			} else {
			if (item.editable === 'true') {
			item.$sort = index
			index++
			_forms[item.field] = item
			if (!initEditLine) {
			initEditLine = item
			}

			allForms.push({uuid: sk \|\| item.uuid, field: item.field})
			checkForms.push(item.field)

			if (item.ctrlField) {
			item.ctrlValue = item.ctrlValue.split(',')
			}
			}

			if (item.type === 'text' && item.editable === 'true' && item.editType === 'select' && item.resourceType === '1') {
			let _option = Utils.getSelectQueryOptions(item)

			if (window.GLOB.debugger === true \|\| window.debugger === true) {
			console.info(_option.sql)

			if (item.type === 'number' && item.clearField) {
			fields.forEach(cell => {
			if (cell.field === item.clearField) {
			item.clearName = cell.label
			}
			})
			} else if (item.type === 'text' && item.editType === 'select') {
			item.map = new Map()
			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)
			} else {
			item.options.forEach(cell => {
			item.map.set(cell.value, cell.label)
			})
			}
			} else if (item.type === 'text' && item.editType === 'date') {
			item.format = 'YYYY-MM-DD'

			if (item.precision === 'hour') {
			item.format = 'YYYY-MM-DD HH'
			} else if (item.precision === 'minute') {
			item.format = 'YYYY-MM-DD HH:mm'
			} else if (item.precision === 'second') {
			item.format = 'YYYY-MM-DD HH:mm:ss'
			}
			}

			item.base_sql = window.btoa(window.encodeURIComponent(_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
			}

			cell = {
			align: item.Align,
			dataIndex: item.uuid,
			title: item.label,
			sorter: !!(item.field && item.IsSort === 'true'),
			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,
			$type: item.type,
			$key: item.uuid,
			onCell: record => ({
			record,
			col: item,
			config: item.type === 'custom' \|\| item.type === 'action' ? {setting, columns: fields} : null,
			config: item.type === 'custom' ? {setting, columns: fields} : null,
			})
			}
			}
			@@ -1001,6 +1468,7 @@
			return cell
			})
			}

			_columns = getColumns(columns)

			let forms = []
			@@ -1008,37 +1476,20 @@
			if (item.field === setting.primaryKey) return

			if (_forms[item.field]) {
			forms.push({..._forms[item.field], datatype: item.datatype})
			let _item = {..._forms[item.field]}
			if (_item.editType === 'date') {
			_item.datatype = _item.declareType \|\| 'datetime'
			} else {
			_item.datatype = item.datatype
			}

			forms.push(_item)
			} else {
			forms.push(item)
			forms.push({...item, $sort: 999})
			}
			})

			_columns.forEach(item => {
			if (item.$type === 'action') return

			let _copy = fromJS(item).toJS()
			_copy.sorter = false

			if (item.editable === 'true') {
			_copy.title = <span>{item.label}<EditOutlined className="system-color mk-edit-sign"/></span>
			}
			edColumns.push(_copy)
			})

			if (setting.delable !== 'false' && setting.operType !== 'buoyMode') {
			edColumns.push({
			align: 'center',
			dataIndex: 'mkoperation',
			title: '操作',
			sorter: false,
			width: 100,
			onCell: record => ({
			record,
			col: {type: 'operation', tableId: setting.tableId},
			})
			})
			}
			forms.sort((a, b) => a.$sort - b.$sort)

			let size = (setting.pageSize \|\| 10) + ''
			let pageOptions = ['10', '25', '50', '100', '500', '1000']
			@@ -1048,26 +1499,36 @@
			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,
			columns: _columns,
			edColumns,
			tableId: setting.tableId,
			orderfields,
			initEditLine,
			editable: setting.editable === 'true'
			deForms: hasBid ? deForms : null
			}, () => {
			if (deForms.length > 0) {
			this.improveActionForm(deForms)
			if (deForms.length > 0 && (!hasBid \|\| BID)) {
			this.improveActionForm(deForms, BID)
			}

			const element = document.getElementById(setting.tableId)
			element && element.style.setProperty('--mk-table-border-color', setting.borderColor \|\| '#e8e8e8')
			element && element.style.setProperty('--mk-table-color', setting.color \|\| 'rgba(0, 0, 0, 0.65)')
			element && element.style.setProperty('--mk-table-font-size', setting.fontSize \|\| '14px')
			element && element.style.setProperty('--mk-table-font-weight', setting.fontWeight \|\| 'normal')
			})
			}

			@@ -1075,51 +1536,251 @@
			return !is(fromJS(this.props), fromJS(nextProps)) \|\| !is(fromJS(this.state), fromJS(nextState))
			}

			UNSAFE_componentWillReceiveProps(nextProps) {
			const { BID } = this.props
			const { deForms } = this.state

			if (deForms && nextProps.BID !== BID) {
			this.improveActionForm(deForms, nextProps.BID)
			}
			}

			componentDidMount () {
			MKEmitter.addListener('subLine', this.subLine)
			MKEmitter.addListener('nextLine', this.nextLine)
			MKEmitter.addListener('addRecord', this.addLine)
			MKEmitter.addListener('delRecord', this.delRecord)
			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('resetTable', this.resetTable)
			MKEmitter.addListener('transferData', this.transferData)
			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('subLine', this.subLine)
			MKEmitter.removeListener('nextLine', this.nextLine)
			MKEmitter.removeListener('addRecord', this.addLine)
			MKEmitter.removeListener('delRecord', this.delRecord)

			MKEmitter.removeListener('resetTable', this.resetTable)
			MKEmitter.removeListener('transferData', this.transferData)
			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)
			}

			transferData = (menuid, data, type) => {
			if (menuid !== this.props.MenuID) return
			colBlur = (lineId, colId, defer) => {
			if (defer && this.focusId === lineId && this.colId !== colId) {
			return
			}

			this.blurId = lineId
			this.focusId = ''

			if (type !== 'line') {
			this.setState({data: data \|\| []})
			this.timer && clearTimeout(this.timer)

			if (this.state.editable && !this.state.pickup) {
			setTimeout(() => {
			this.pickupChange()
			}, 200)
			this.timer = setTimeout(() => {
			if (!this.focusId \|\| this.focusId !== this.blurId) {
			this.checkLine()
			}
			} else if (type === 'line' && data.$$uuid) {
			let _data = this.state.data.map(item => {
			if (item.$$uuid === data.$$uuid) {
			return data
			}, 150)
			}

			colFocus = (lineId, colId) => {
			this.focusId = lineId
			this.colId = colId
			}

			checkLine = () => {
			const { edData, forms, checkForms } = 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 {
			return item
			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}不可为空`
			} 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.noValue === 'hide' && !val) {
			if (col.clearField && checkForms.includes(col.clearField) && !record[col.clearField]) {
			err = `请填写 ${col.label} 或 ${col.clearName}`
			}
			val = 0
			} else if (!val && val !== 0) {
			err = `${col.label}不可为空`
			} else {
			val = +val
			if (isNaN(val)) {
			err = `${col.label}数据格式错误`
			return
			}

			val = +val.toFixed(col.decimal \|\| 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}`
			}
			}

			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 === '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
			@@ -1128,24 +1789,102 @@
			}
			})

			this.setState({edData: _edData, data: _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 {
			let index = edData.findIndex(item => !item.$origin && !item.$forbid)

			if (index > -1) {
			this.setState({visible: true, midData: data})
			} else {
			this.updateMutil(data)
			}
			}
			this.setState({editable: false})
			}

			improveActionForm = (deForms) => {
			const { BID, setting } = this.props
			updateMutil = (data) => {
			const { setting, colsCtrls, allSearch } = this.props
			const { allColumns, allForms } = this.state

			if (colsCtrls) {
			let checkForms = []
			let columns = this.getCurColumns(allColumns, allSearch, allForms, checkForms)

			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()
			}, 10)
			}
			}

			improveActionForm = (deForms, BID) => {
			let deffers = []
			let mainItems = [] // 云端或单点数据
			let localItems = [] // 本地数据
			let cache = setting.cache !== 'false'
			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

			deForms.forEach(item => {
			if (item.database === 'sso') {
			mainItems.push(`select '${item.uuid}' as obj_name,'${item.arr_field}' as arr_field,'${item.base_sql}' as LText`)
			let sql = _sso + item.base_sql
			_sso = ''

			sql = sql.replace(/@BID@/ig, `'${BID}'`)

			if (debug) {
			console.info(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 {
			localItems.push(`select '${item.uuid}' as obj_name,'${item.arr_field}' as arr_field,'${item.base_sql}' as LText`)
			let sql = _sql + item.base_sql
			_sql = ''

			sql = sql.replace(/@BID@/ig, `'${BID}'`)

			if (debug) {
			console.info(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`)
			}
			})

			@@ -1160,13 +1899,17 @@
			}

			if (param.LText) {
			param.LText = Utils.formatOptions(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(param.LText, param.timestamp)
			param.secretkey = Utils.encrypt(window.GLOB.execType === 'x' ? '' : param.LText, param.timestamp)

			deffers.push(
			new Promise(resolve => {
			Api.getSystemCacheConfig(param, cache).then(res => {
			Api.getSystemCacheConfig(param, false).then(res => {
			if (!res.status) {
			notification.warning({
			top: 92,
			@@ -1191,9 +1934,13 @@
			}

			if (mainparam.LText) {
			mainparam.LText = Utils.formatOptions(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(mainparam.LText, mainparam.timestamp)
			mainparam.secretkey = Utils.encrypt(window.GLOB.execType === 'x' ? '' : mainparam.LText, mainparam.timestamp)

			if (window.GLOB.mainSystemApi) {
			mainparam.rduri = window.GLOB.mainSystemApi
			@@ -1201,7 +1948,7 @@

			deffers.push(
			new Promise(resolve => {
			Api.getSystemCacheConfig(mainparam, cache).then(res => {
			Api.getSystemCacheConfig(mainparam, false).then(res => {
			if (!res.status) {
			notification.warning({
			top: 92,
			@@ -1228,16 +1975,14 @@
			}

			resetFormList = (result) => {
			const { columns } = this.props
			const { edColumns } = this.state
			const { columns, edData } = this.state

			let _edColumns = []

			let reCols = {}
			columns.forEach(item => {
			this.props.columns.forEach(item => {
			if (item.resourceType === '1' && result[item.uuid] && result[item.uuid].length > 0) {
			let options = []
			let _map = new Map()
			let all = false
			result[item.uuid].forEach(cell => {
			let _cell = {key: Utils.getuuid()}
			@@ -1254,8 +1999,8 @@
			}
			}

			if (_map.has(_cell.value)) return
			_map.set(_cell.value, 0)
			if (item.map.has(_cell.value)) return
			item.map.set(_cell.value, _cell.label)

			if (item.linkSubField) {
			item.linkSubField.forEach(m => {
			@@ -1272,11 +2017,11 @@

			item.options = options

			reCols[item.uuid] = item
			reCols[item.uuid] = fromJS(item).toJS()
			}
			})

			_edColumns = edColumns.map(item => {
			_edColumns = columns.map(item => {
			if (reCols[item.dataIndex]) {
			item.onCell = record => ({
			record,
			@@ -1287,118 +2032,68 @@
			return item
			})

			if (this.state.pickup) {
			this.setState({
			pickup: false
			}, () => {
			this.setState({pickup: true, edColumns: _edColumns})
			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
			})
			} else {
			this.setState({edColumns: _edColumns})
			}

			this.setState({columns: [], edData: [], allColumns: _cols}, () => {
			this.setState({columns: _edColumns, edData: edData})
			})
			}

			nextLine = (col, uuid) => {
			nextLine = (lineId, colId) => {
			const { setting } = this.props
			const { edData, initEditLine, tableId } = this.state
			const { edData, tableId } = this.state

			if (col.tableId !== tableId) return

			let index = edData.findIndex(item => item.$$uuid === uuid)
			let index = edData.findIndex(item => item.$$uuid === lineId)
			let next = edData[index + 1] \|\| null

			if (next && initEditLine) {
			MKEmitter.emit('tdFocus', initEditLine.uuid + next.$$uuid)
			} else if (setting.addable === 'true') {

			if (next) {
			MKEmitter.emit('setFocus' + tableId, next.$$uuid, colId)
			} else if (setting.addable) {
			setTimeout(() => {
			this.plusLine()
			this.plusLine(colId)
			}, 10)
			} else if (edData[index]) {
			} else if (edData[index] && (setting.commit === 'all' \|\| setting.commit === 'amend')) {
			setTimeout(() => {
			this.subLine(col, edData[index])
			this.submit()
			}, 10)
			}
			}

			subLine = (col, record) => {
			const { tableId, forms, edData } = this.state
			plusLine = (colId, lineId) => {
			const { BID } = this.props
			const { forms, tableId } = this.state

			if (col && col.tableId !== tableId) return

			if (edData.filter(item => !item.$origin).length > 1) {
			setTimeout(() => {
			this.submit(edData)
			}, 10)
			return
			}

			setTimeout(() => {
			let item = fromJS(record).toJS()
			let line = []
			forms.forEach(col => {
			if (col.editable !== 'true' \|\| item.$deleted) {
			if (col.type === 'number') {
			item[col.field] = +item[col.field]
			if (isNaN(item[col.field])) {
			item[col.field] = 0
			}
			} else {
			item[col.field] = item[col.field] !== undefined ? (item[col.field] + '') : ''
			}
			return
			}
			if (col.type === 'text') {
			let val = item[col.field] !== undefined ? (item[col.field] + '') : ''
			if (col.required === 'true' && !val) {
			line.push(`${col.label}不可为空`)
			}
			item[col.field] = val
			} else if (col.type === 'number') {
			let val = item[col.field]
			if (!val && val !== 0) {
			line.push(`${col.label}不可为空`)
			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}`)
			}

			item[col.field] = val
			}
			})

			let err = line.join('，')

			if (err) {
			notification.warning({
			top: 92,
			message: err,
			duration: 5
			})
			} else {
			this.submit([item], 'simple')
			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]}
			}
			}, 10)
			}
			}

			plusLine = () => {
			const { edData, forms, initEditLine } = this.state

			let item = {...edData[edData.length - 1]}

			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') {
			@@ -1415,144 +2110,145 @@
			}
			})

			this.setState({edData: [...edData, item]}, () => {
			MKEmitter.emit('tdFocus', initEditLine.uuid + item.$$uuid)
			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) => {
			delRecord = (record) => {
			const { setting } = this.props
			const { tableId, edData } = this.state

			if (id !== tableId) return

			let _data = []
			const { edData } = this.state

			if (record.$type === 'add') {
			_data = edData.filter(item => item.$$uuid !== record.$$uuid)
			let _data = edData.filter(item => item.$$uuid !== record.$$uuid)
			this.setState({edData: _data})
			} else {
			_data = edData.map(item => {
			let _data = fromJS(edData).toJS().map(item => {
			if (item.$$uuid === record.$$uuid) {
			item.$deleted = true
			item.$origin = false
			item.$type = 'del'

			record.$deleted = true
			record.$origin = false
			record.$type = 'del'
			return record
			} else {
			return item
			}

			return item
			})

			if (setting.commit === 'simple' && record.$deleted) {
			this.subLine(null, record)
			}
			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 (!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) {
			record.$origin = false
			return record
			} else {
			return item
			}
			})

			this.setState({edData: _data})
			}

			addLine = (id, record) => {
			const { BID } = this.props
			const { edData, forms, tableId } = this.state

			if (id) {
			if (id !== tableId) return
			let _edData = fromJS(edData).toJS()
			let index = _edData.findIndex(item => record.$$uuid === item.$$uuid)

			let item = {}

			item.$$uuid = Utils.getguid()
			item.$type = 'add'
			item.$Index = ''
			item.$$BID = BID \|\| ''

			forms.forEach(col => {
			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
			}
			}

			if (item[col.field] === undefined) {
			item[col.field] = ''
			}
			})

			_edData.splice(index, 0, item)

			this.setState({edData: _edData})
			} else {
			let item = {}
			if (edData.length > 0) {
			item = {...edData[edData.length - 1]}
			item.$$uuid = Utils.getguid()
			item.$type = 'add'
			item.$Index = ''
			} else {
			item.$$uuid = Utils.getguid()
			item.$type = 'add'
			item.$Index = ''
			item.$$BID = BID \|\| ''
			this.setState({edData: _data}, () => {
			if (setting.tableType && setting.hasAction && this.state.selectedRowKeys.includes(record.$$uuid)) {
			this.selectdata(this.state.selectedRowKeys)
			}

			forms.forEach(col => {
			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
			}
			}

			if (item[col.field] === undefined) {
			item[col.field] = ''
			}
			})

			this.setState({edData: [...edData, item]})
			}
			})
			}

			checkData = () => {
			const { edData, forms } = this.state
			const { setting } = this.props
			const { edData, forms, checkForms, selectedRowKeys } = 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: '请选择需要提交的数据！',
			duration: 5
			})
			return null
			}
			}

			if (data.length === 0) {
			notification.warning({
			top: 92,
			message: '提交数据不可为空！',
			message: '数据未修改，不可提交！',
			duration: 5
			})
			return
			return null
			}

			let err = ''
			let Index = 1
			let data = fromJS(edData).toJS().map(item => {
			data = data.map(item => {
			let line = []
			forms.forEach(col => {
			if (col.editable !== 'true' \|\| item.$deleted) {
			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])) {
			@@ -1563,30 +2259,42 @@
			}
			return
			}

			if (col.type === 'text') {
			let val = item[col.field] !== undefined ? (item[col.field] + '') : ''
			if (col.required === 'true' && !val) {
			line.push(`${col.label}不可为空`)
			} 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) {
			if (col.noValue === 'hide' && !val) {
			if (col.clearField && checkForms.includes(col.clearField) && !item[col.clearField]) {
			let msg = `请填写 ${col.label} 或 ${col.clearName}`
			if (!line.includes(msg)) {
			line.push(msg)
			}
			}
			val = 0
			} else if (!val && val !== 0) {
			line.push(`${col.label}不可为空`)
			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}数据格式错误`)
			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}`)
			}
			}

			item[col.field] = val
			@@ -1609,27 +2317,37 @@
			message: err,
			duration: 5
			})
			} else {
			this.submit(data)

			return null
			}

			return data
			}

			submit = (data, type) => {
			submit = (record) => {
			const { submit, BID, setting } = this.props
			const { forms } = this.state

			if (type !== 'simple' && (setting.commit === 'change' \|\| setting.commit === 'simple')) {
			data = data.filter(item => !item.$origin)
			}
			this.setState({visible: false, midData: null})

			if (data.length === 0) {
			if (setting.supModule && !BID) {
			notification.warning({
			top: 92,
			message: '数据未修改，不可提交！',
			message: '需要上级主键值！',
			duration: 5
			})

			return
			}

			let data = null
			if (record) {
			data = [record]
			} else {
			data = this.checkData()
			}

			if (!data) return

			let result = getEditTableSql(submit, data, forms)

			@@ -1645,22 +2363,12 @@
			if (submit.intertype === 'system') { // 系统存储过程
			param.func = 'sPC_TableData_InUpDe'

			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)
			delete param.excel_in

			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

			@@ -1670,111 +2378,115 @@

			Api.genericInterface(param).then((res) => {
			if (res.status) {
			if (type === 'simple') {
			this.updataLine(data[0])
			this.execSuccess(res, type)
			} else {
			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) { // 自定义存储过程
			param.func = submit.innerFunc

			if (submit.recordUser === 'true') {
			param.username = sessionStorage.getItem('User_Name') \|\| ''
			param.fullname = sessionStorage.getItem('Full_Name') \|\| ''
			}

			Api.genericInterface(param).then((res) => {
			if (res.status) {
			if (type === 'simple') {
			this.updataLine(data[0])
			this.execSuccess(res, type)
			} else {
			this.execSuccess(res)
			}
			this.execSuccess(res, record)
			} else {
			this.execError(res)
			this.execError(res, record)
			}
			}, () => {
			}, (error) => {
			if (error && error.ErrCode === 'LoginError') return

			this.execError({})
			})
			}
			}

			updataLine = (item) => {
			if (item.$type === 'del') {
			let _data = this.state.edData.filter(m => m.$$uuid !== item.$$uuid)

			this.setState({edData: _data})
			} else {
			let _data = this.state.edData.map(m => {
			if (m.$$uuid === item.$$uuid) {
			item.$origin = true
			return item
			}
			return m
			})

			this.setState({edData: _data})
			}
			MKEmitter.emit('reloadData', this.props.MenuID, item.$$uuid, item)
			}

			execSuccess = (res, type) => {
			execSuccess = (res, record) => {
			const { submit } = this.props
			const { edData } = this.state

			if (res && res.ErrCode === 'S') { // 执行成功
			notification.success({
			top: 92,
			message: res.ErrMesg \|\| this.state.dict['main.action.confirm.success'],
			message: res.message \|\| '执行成功',
			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 \|\| '执行成功'
			})
			} else if (res && res.ErrCode === '-1') { // 完成后不提示

			}

			this.setState({
			loading: false
			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
			})

			if (type === 'simple') return
			this.setState({
			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

			if (res.ErrCode === 'E') {
			Modal.error({
			title: res.message \|\| res.ErrMesg,
			title: res.message \|\| '执行失败！',
			})
			} else if (res.ErrCode === 'N') {
			notification.error({
			top: 92,
			message: res.message \|\| res.ErrMesg,
			message: res.message \|\| '执行失败！',
			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 \|\| '执行失败！',
			duration: submit.ftime ? submit.ftime : 10
			})
			} else if (res.ErrCode === 'NM') {
			message.error(res.message \|\| res.ErrMesg)
			message.error(res.message \|\| '执行失败！')
			}

			this.setState({
			@@ -1782,33 +2494,12 @@
			})

			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 { setting } = this.props
			const { data } = this.state

			if (setting.submittal === 'true') {
			this.setState({editable: true})
			}

			this.props.changeLock(false)
			this.setState({
			data: [],
			edData: [],
			pickup: false,
			}, () => {
			this.setState({
			data: data,
			})
			})
			}

			/**
			*
			* @description 选中行
			*/
			onSelectChange = selectedRowKeys => {
			this.setState({ selectedRowKeys })
			@@ -1824,28 +2515,28 @@
			/**
			* @description 点击整行，触发切换，判断是否可选，单选或多选，进行对应操作
			*/
			changeRow = (index) => {
			changeRow = (id) => {
			const { setting } = this.props

			if (!setting.tableType \|\| this.state.pickup) return
			if (!setting.tableType) return

			let newkeys = fromJS(this.state.selectedRowKeys).toJS()

			let activeId = ''
			if (setting.tableType === 'radio') {
			activeId = index
			newkeys = [index]
			activeId = id
			newkeys = [id]
			this.setState({ selectedRowKeys: newkeys })
			} else {
			if (newkeys.includes(index)) {
			newkeys = newkeys.filter(item => item !== index)
			if (newkeys.includes(id)) {
			newkeys = newkeys.filter(item => item !== id)

			if (newkeys.length > 0) {
			activeId = newkeys.slice(-1)[0]
			}
			} else {
			activeId = index
			newkeys.push(index)
			activeId = id
			newkeys.push(id)
			}

			this.setState({ selectedRowKeys: newkeys })
			@@ -1857,21 +2548,21 @@

			changedata = (id) => {
			const { MenuID } = this.props
			const { data } = this.state
			const { edData } = this.state

			let _data = ''

			if (id) {
			_data = data.filter(item => item.$$uuid === id)[0] \|\| ''
			_data = edData.filter(item => item.$$uuid === id)[0] \|\| ''
			}

			MKEmitter.emit('resetSelectLine', MenuID, id, _data)
			}

			selectdata = (keys) => {
			const { data } = this.state
			const { edData } = this.state

			let _data = data.filter(item => keys.includes(item.$$uuid))
			let _data = edData.filter(item => keys.includes(item.$$uuid))

			this.props.chgSelectData(_data)
			}
			@@ -1907,96 +2598,24 @@
			}
			}

			pickupChange = () => {
			const { submit, MenuID, setting } = this.props
			const { data } = this.state

			let pickup = !this.state.pickup

			if (!submit.sheet) {
			notification.warning({
			top: 92,
			message: '提交按钮尚未设置，不可编辑！',
			duration: 5
			})
			return
			}

			if (!pickup && this.state.edData.filter(item => !item.$origin).length > 0) {
			const _this = this
			confirm({
			title: '数据已修改，确定放弃保存吗？',
			onOk() {
			_this.setState({
			data: [],
			edData: [],
			pickup
			}, () => {
			_this.setState({
			data: data,
			edData: pickup ? fromJS(data).toJS() : []
			})
			})
			},
			onCancel() {}
			})
			} else {
			pickup && MKEmitter.emit('resetSelectLine', MenuID, '', '')
			pickup && this.props.chgSelectData([])
			let keys = this.state.selectedRowKeys
			this.setState({
			data: [],
			edData: [],
			selectedRowKeys: [],
			pickup,
			loading: false,
			editable: false
			}, () => {
			if (pickup && setting.tableType === 'checkbox' && keys.length > 0) {
			this.setState({
			data: data,
			edData: fromJS(data).toJS().filter(item => {
			item.$origin = false

			return keys.includes(item.$$uuid)
			})
			})
			} else {
			this.setState({
			data: data,
			edData: pickup ? fromJS(data).toJS() : []
			})
			}
			})

			}
			this.props.changeLock(pickup)
			}

			render() {
			const { setting, statFValue, lineMarks, submit } = this.props
			const { pickup, tableId, data, edData, columns, edColumns, loading, pageOptions, selectedRowKeys } = this.state
			const { setting, lineMarks, submit } = this.props
			const { edData, columns, loading, pageOptions, selectedRowKeys, visible, midData, reseting } = this.state

			if (reseting) return null

			const components = {
			body: {
			row: BodyRow,
			cell: setting.editType !== 'multi' \|\| !pickup ? BodyCell : BodyAllCell
			cell: setting.editType !== 'multi' ? BodyCell : BodyAllCell
			}
			}

			// 数据收起时，过滤已选数据
			let _data = data
			let _columns = columns

			if (pickup) {
			_data = edData
			_data = _data.filter(item => !item.$deleted)
			_columns = edColumns
			}
			let _data = edData.filter(item => !item.$deleted)

			// 设置表格选择属性：单选、多选、不可选
			let rowSelection = null
			if (setting.tableType && !pickup) {
			if (setting.tableType) {
			rowSelection = {
			selectedRowKeys,
			type: (setting.tableType === 'radio') ? 'radio' : 'checkbox',
			@@ -2005,7 +2624,7 @@
			}

			let _pagination = false
			if (!pickup && setting.laypage !== 'false' && setting.laypage !== false) {
			if (setting.laypage) {
			_pagination = {
			current: this.state.pageIndex,
			pageSize: this.state.pageSize,
			@@ -2016,38 +2635,38 @@
			}
			}

			let _footer = ''

			if (!pickup && statFValue && statFValue.length > 0) {
			_footer = statFValue.map(f => `${f.label}(合计)：${f.value}`).join('；')
			let height = setting.height \|\| false
			if (height && height <= 100) {
			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 (
			<>
			{submit.hasAction && pickup ? <div className="edit-custom-table-leftbtn-wrap">
			<Button style={submit.style} onClick={() => setTimeout(() => {this.checkData()}, 10)} loading={loading} className="submit-table" type="link">提交</Button>
			{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">提交</Button>
			</div> : null}
			<div className="edit-custom-table-btn-wrap" style={submit.wrapStyle}>
			{!submit.hasAction && pickup ? <Button style={submit.style} onClick={() => setTimeout(() => {this.checkData()}, 10)} loading={loading} className="submit-table" type="link">提交</Button> : null}
			{setting.switchable !== 'false' ? <Switch title="编辑" className="main-pickup" checkedChildren="开" unCheckedChildren="关" disabled={loading \|\| this.props.loading} checked={pickup} onChange={this.pickupChange} /> : null}
			</div>
			<div className={`edit-custom-table ${pickup ? 'editable' : ''} ${setting.tableHeader \|\| ''} ${setting.operType \|\| ''} ${height ? 'fixed-height' : ''} ${setting.mode \|\| ''} table-vertical-${setting.vertical \|\| ''} mk-edit-${setting.editType \|\| 'simple'}`} id={tableId}>
			<div className={`edit-custom-table ${setting.tableHeader \|\| ''} ${setting.parity === 'true' ? 'mk-parity' : ''} ${height ? 'fixed-height' : ''} ${setting.mode \|\| ''} table-vertical-${setting.vertical \|\| ''} mk-edit-${setting.editType \|\| 'simple'}`} style={style}>
			<Table
			rowKey="$$uuid"
			components={components}
			// style={setting.style}
			size={setting.size \|\| 'middle'}
			bordered={setting.bordered !== 'false'}
			rowSelection={rowSelection}
			columns={_columns}
			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)},
			}
			@@ -2055,10 +2674,23 @@
			onChange={this.changeTable}
			pagination={_pagination}
			/>
			{_footer ? <div className={'normal-table-footer ' + (_pagination ? 'pagination' : '')}>{_footer}</div> : null}
			{pickup && setting.addable === 'true' ? <Button className="mk-add-line" onClick={() => this.addLine()} disabled={this.props.loading} type="link"><PlusOutlined /></Button> : null}
			{pickup && _data.length > 10 ? <Button style={submit.style} onClick={() => setTimeout(() => {this.checkData()}, 10)} loading={loading} className="submit-footer-table" type="link">提交</Button> : null}
			{setting.hasSubmit && _data.length > 10 ? <Button style={submit.style} onClick={() => setTimeout(() => {this.submit()}, 10)} loading={loading} className="submit-footer-table" type="link">提交</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 }) }}>取消</Button>,
			<Button key="refresh" className="table-refresh" onClick={() => { midData && this.updateMutil(midData) }}>刷新表格</Button>,
			<Button key="confirm" type="primary" onClick={() => setTimeout(() => {this.submit()}, 10)}>提交数据</Button>
			]}
			destroyOnClose
			>
			<div><QuestionCircleOutlined />表格中有数据尚未提交</div>
			</Modal>
			</>
			)
			}