Merge branch 'master' into positec

king

2023-06-01 2a3629979d1bc6d0a6c90e481ac93eabd2bfefd1

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

@@ -396,18 +396,6 @@
   * 含有初始不加载的页面，修改设置
   */
  refreshbysearch = (searches) => {
    const { setting } = this.state

    if (setting.onload === 'false') {
      this.setState({
        pageIndex: 1,
        search: searches,
        setting: {...setting, onload: 'true'}
      }, () => {
        this.loadmaindata()
        this.getStatFieldsValue()
      })
    } else {
      this.setState({
        pageIndex: 1,
        search: searches
@@ -415,7 +403,6 @@
        this.loadmaindata(true, 'true')
        this.getStatFieldsValue()
      })
    }
  }

  /**