Merge branch 'master' into positec

king

2023-08-27 9855c86aa6b84bb1c6c366cf68e0dee45402fe6f

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

@@ -303,6 +303,11 @@
  async loadmainLinedata (id) {
    const { setting, config, search, orderBy, BID, pageIndex, pageSize, BData } = this.state

    if (config.forbidLine) {
      this.reloadtable()
      return
    }
    
    let searches = fromJS(search).toJS()
    if (config.setting.useMSearch) { // 主表搜索条件
      let mainSearch = window.GLOB.SearchBox.get(config.$searchId) || []