2020-12-04

king

2020-12-04 3659f0773a14b54c18ed0af8b64de4afe8227489

 src/tabviews/custom/components/table/normal-table/index.jsx

@@ -34,7 +34,6 @@
    searchlist: null,     // 搜索条件
    actions: null,        // 按钮集
    columns: null,        // 显示列
    logcolumns: null,     // 日志中显示的列信息 (增加至全部列，除去合并列)
    arr_field: '',        // 使用 sPC_Get_TableData 时的查询字段集
    setting: null,        // 页面全局设置：数据源、按钮及显示列固定、主键等
    data: null,           // 列表数据集
@@ -83,8 +82,6 @@
          }
          return item
        })
      } else if (column.type === 'colspan') {
        column.unfold = 'true'
      } else if (column.type === 'action') {
        column.operations = column.elements
      }
@@ -458,10 +455,10 @@

  render() {
    const { MenuName } = this.props
    const { BID, setting, searchlist, pageSize, actions, columns, pickup, config, selectedData } = this.state
    const { BID, setting, searchlist, pageSize, actions, config, columns, pickup, selectedData } = this.state

    return (
      <div className="commontable">
      <div className="custom-normal-table">
        {searchlist && searchlist.length > 0 ?
          <MainSearch
            BID={BID}
@@ -476,11 +473,11 @@
            BID={BID}
            setting={setting}
            actions={actions}
            columns={config.columns}
            MenuName={MenuName}
            dict={this.state.dict}
            MenuID={this.props.MenuID}
            selectedData={selectedData}
            logcolumns={this.state.logcolumns}
            refreshdata={this.refreshbyaction}
            getexceloutparam={this.getexceloutparam}
          />
@@ -493,18 +490,17 @@
            tableId="mainTable"
            BID={BID}
            pickup={pickup}
            config={config}
            setting={setting}
            columns={columns}
            MenuName={MenuName}
            pageSize={pageSize}
            dict={this.state.dict}
            data={this.state.data}
            fields={config.columns}
            total={this.state.total}
            MenuID={this.props.MenuID}
            loading={this.state.loading}
            refreshdata={this.refreshbytable}
            logcolumns={this.state.logcolumns}
            statFValue={this.state.statFValue}
            handleTableId={this.handleTableId}
            refreshbyaction={this.refreshbyaction}