Merge branch 'master' into bms

king

2021-10-27 bbcb3f45ad0ef4c808bf5a68ec10c0464c094e2f

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

@@ -478,10 +478,12 @@
        />
        <div className={'main-table-box ' + (!actions || actions.length === 0 ? 'no-action' : '')}>
          <MainTable
            BID={BID}
            setting={setting}
            columns={columns}
            MenuID={config.uuid}
            data={this.state.data}
            submit={config.submit}
            fields={config.columns}
            total={this.state.total}
            lineMarks={config.lineMarks}