Merge branch 'develop'

king

2023-06-01 9f02620e3dca6395caaccca5feb43122099129d1

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

@@ -475,18 +475,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
@@ -494,7 +482,6 @@
        this.loadmaindata(true, 'true')
        this.getStatFieldsValue()
      })
    }
  }

  /**