2020-08-12

king

2020-08-12 2ed2188bb01fa321177125917102e5f664497d2a

 src/tabviews/zshare/actionList/excelInbutton/excelin/index.jsx

@@ -42,11 +42,16 @@
        const workbook = XLSX.read(result, { type: 'binary' })

        let errors = null
        let sheetName = btn.verify.sheet

        if (!workbook.Sheets.hasOwnProperty(btn.verify.sheet)) {
        if (Object.keys(workbook.Sheets).length === 1) {
          sheetName = Object.keys(workbook.Sheets)[0]
        }

        if (!workbook.Sheets.hasOwnProperty(sheetName)) {
          errors = 'notexit'
        } else if (range === 1) {
          let header = XLSX.utils.sheet_to_json(workbook.Sheets[btn.verify.sheet], {header: columns})[0]
          let header = XLSX.utils.sheet_to_json(workbook.Sheets[sheetName], {header: columns})[0]

          if (!header) {
            errors = 'empty'
@@ -67,11 +72,11 @@
        let data = []

        if (!errors) {
          data = XLSX.utils.sheet_to_json(workbook.Sheets[btn.verify.sheet], {header: columns, range: (range)})
          data = XLSX.utils.sheet_to_json(workbook.Sheets[sheetName], {header: columns, range: (range)})
        }

        // 最终获取到并且格式化后的 json 数据
        this.props.returndata(data, errors)
        this.props.returndata(data, errors, sheetName)
        this.setState({
          excelId: '',
        }, () => {