2024-02-23

king

2024-02-23 1b9fd7b9fd872a3f08c7f43bd6e5654225b585c2

2024-02-23

 src/tabviews/zshare/actionList/exceloutbutton/index.jsx

@@ -168,7 +168,7 @@

        Api.genericInterface(param).then(result => {
          if (result.status) {
            this.exportExcel(result.data, result.ErrCode, result.message)
            this.exportExcel(result.data, result.ErrCode, result.message, viewParam.search)
          } else {
            this.execError(result)
          }
@@ -187,7 +187,7 @@

        Api.genericInterface(param).then(result => {
          if (result.status) {
            this.exportExcel(result.data, result.ErrCode, result.message)
            this.exportExcel(result.data, result.ErrCode, result.message, viewParam.search)
          } else {
            this.execError(result)
          }
@@ -226,7 +226,7 @@

        Api.genericInterface(param).then(result => {
          if (result.status) {
            this.exportExcel(result.data, result.ErrCode, result.message)
            this.exportExcel(result.data, result.ErrCode, result.message, viewParam.search)
          } else {
            this.execError(result)
          }
@@ -273,7 +273,7 @@
      
            Api.genericInterface(res).then(result => {
              if (result.status) {
                this.exportExcel(result.data, result.ErrCode, result.message)
                this.exportExcel(result.data, result.ErrCode, result.message, viewParam.search)
              } else {
                this.execError(result)
              }
@@ -353,7 +353,7 @@
              this.getExcelOutDoubleData(viewParam, pageIndex, pageSize, data)
            } else {
              data = data.concat(result.data)
              this.exportExcel(data, result.ErrCode, result.message)
              this.exportExcel(data, result.ErrCode, result.message, viewParam.search)
            }
          } else {
            this.execError(result)
@@ -429,7 +429,7 @@
          this.getExcelOutData(viewParam, pageIndex, pageSize, data)
        } else {
          data = data.concat(result.data)
          this.exportExcel(data, result.ErrCode, result.message)
          this.exportExcel(data, result.ErrCode, result.message, viewParam.search)
        }
      } else {
        this.execError(result)
@@ -443,7 +443,7 @@
  /**
   * @description Excel 生成
   */
  exportExcel = (data, ErrCode, msg) => {
  exportExcel = (data, ErrCode, msg, search) => {
    const { btn } = this.props
    
    let imgCol = false
@@ -486,8 +486,8 @@
    try {
      if (btn.verify.excelHandle === 'true') {
        // eslint-disable-next-line
        let func = new Function('XLSX', 'data', 'columns', 'callback', btn.verify.excel_func)
        func(XLSX, data, columns, (res) => {
        let func = new Function('XLSX', 'data', 'columns', 'searches', 'callback', btn.verify.excel_func)
        func(XLSX, data, columns, search, (res) => {
          res = res || {ErrCode: ErrCode || 'S', message: msg || '导出成功！'}
          this.execSuccess(res)
        })

 src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx

@@ -888,7 +888,7 @@
                </Col> : null}
                <Col span={8}>
                  <Form.Item label={
                    <Tooltip placement="topRight" title="自定义验证Excel格式，可用参数为 XLSX、data、columns、callback。">
                    <Tooltip placement="topRight" title="自定义验证Excel格式，可用参数为 XLSX、workbook、btn、callback。">
                      <QuestionCircleOutlined className="mk-form-tip" />
                      导入格式
                    </Tooltip>

 src/templates/sharecomponent/actioncomponent/verifyexcelout/datasource/index.jsx

@@ -219,7 +219,7 @@
            </Col> : null}
            {btnType !== 'print' ? <Col span={8}>
              <Form.Item label={
                <Tooltip placement="topRight" title="自定义生成Excel，可用参数为 XLSX、data、columns、callback。">
                <Tooltip placement="topRight" title="自定义生成Excel，可用参数为 XLSX、data、columns、searches、callback。">
                  <QuestionCircleOutlined className="mk-form-tip" />
                  导出格式
                </Tooltip>

 src/views/systemfunc/index.jsx

@@ -11,6 +11,7 @@
// import './index.scss'

const Tabview = asyncComponent(() => import('@/components/tabview'))
const ImgScale = asyncComponent(() => import('@/components/imgScale'))

class MkHS extends Component {
  UNSAFE_componentWillMount() {
@@ -63,6 +64,7 @@
          <Tabview key="tabview"/>
          <Header key="header"/>
        </ConfigProvider>
        <ImgScale />
      </div>
    )
  }