2019-12-18

king

2019-12-18 1a14ff6035932eadfb6ef7970e3adb24b4e158a6

 src/templates/comtableconfig/colspanform/index.jsx

@@ -1,6 +1,6 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { Form, Row, Col, Input, notification, InputNumber, Select, Radio } from 'antd'
import { Form, Row, Col, Input, InputNumber, Select, Radio } from 'antd'
import TransferForm from '../transferform'
import './index.scss'

@@ -21,17 +21,10 @@
      this.props.form.validateFieldsAndScroll((err, values) => {
        if (!err) {
          let targetKeys = this.refs['column-transfer'].state.targetKeys
          if (targetKeys.length === 0) {
            notification.warning({
              top: 92,
              message: '请添加显示列',
              duration: 10
            })
            return
          }
          delete values.type

          let subfield = [] // 用于查看合并列字段
          delete values.type // 删除type，此处值为'合并列'文字

          let subfield = []  // 用于查看合并列字段
          this.props.columns.forEach(col => {
            if (col.field && targetKeys.includes(col.uuid)) {
              subfield.push(col.field)