Merge branch 'master' into bms

king

2021-01-15 76a4300654a18d228838c3f27455dc8e7a8cd616

 src/tabviews/verupmanage/index.jsx

@@ -9,15 +9,16 @@
import enUS from '@/locales/en-US/main.js'
import Utils from '@/utils/utils.js'
import options from '@/store/options.js'
import asyncComponent from '@/utils/asyncComponent'
import asyncSpinComponent from '@/utils/asyncSpinComponent'
import { verupMainTable, buttonConfig } from './config'
import MKEmitter from '@/utils/events.js'

import TopSearch from './topSearch'
import MainAction from './actionList'
import './index.scss'

const SubTable = asyncSpinComponent(() => import('./subtabtable'))
const MainSearch = asyncComponent(() => import('@/tabviews/zshare/topSearch'))
const MainTable = asyncSpinComponent(() => import('@/tabviews/zshare/normalTable'))

const { TabPane } = Tabs
@@ -90,8 +91,10 @@
            subcols.push(colMap.get(sub))
          }
        })
        _col.subcols = subcols
        _columns.push(_col)
        if (subcols.length > 0) {
          _col.subcols = subcols
          _columns.push(_col)
        }
      } else {
        _columns.push(col)
      }
@@ -455,15 +458,11 @@
  }

  render() {
    const { dict, searchlist, setting, actions, columns, pickup, config, selectedData } = this.state
    const { searchlist, setting, actions, columns, pickup, config, selectedData } = this.state

    return (
      <div className="veruptable" id={this.state.ContainerId}>
        <TopSearch
          dict={dict}
          searchlist={searchlist}
          refreshdata={this.refreshbysearch}
        />
        <MainSearch searchlist={searchlist} menuType="HS" refreshdata={this.refreshbysearch}/>
        <MainAction
          BID=""
          type="main"