2021-09-01

king

2021-09-01 c29a1e1c8278a25b83b6158c2d426aa26c427569

 src/tabviews/custom/index.jsx

@@ -812,13 +812,13 @@
    return components.map(component => {
      if (component.type === 'tabs') {
        component.subtabs = component.subtabs.map(tab => {
          tab.components = this.formatSetting(tab.components, [], [], inherit, regs, balMap)
          tab.components = this.formatSetting(tab.components, null, null, inherit, regs, balMap)
          tab = {...tab, ...inherit}
          return tab
        })
        return component
      } else if (component.type === 'group') {
        component.components = this.formatSetting(component.components, [], [], inherit, regs, balMap)
        component.components = this.formatSetting(component.components, null, null, inherit, regs, balMap)
        component = {...component, ...inherit}
        return component
      }
@@ -882,7 +882,7 @@
      // floor    组件的层级
      // dataName 系统生成的数据源名称
      // pageable 是否分页，组件属性，不分页的组件才可以统一查询
      if (component.floor === 1 && component.dataName && (!component.pageable || (component.pageable && !component.setting.laypage)) && component.setting.onload === 'true' && component.setting.sync === 'true') {
      if (params && component.dataName && (!component.pageable || (component.pageable && !component.setting.laypage)) && component.setting.onload === 'true' && component.setting.sync === 'true') {
        let searchlist = []
        if (component.search && component.search.length > 0) {
          searchlist = Utils.initMainSearch(component.search)
@@ -900,7 +900,7 @@
          component.setting.sync = 'false'
          component.setting.onload = 'false'
        } else {
          params.push(getStructDefaultParam(component, searchlist))
          params.push(getStructDefaultParam(component, searchlist, params.length === 0))
        }
      } else if (component.floor === 1) {
        component.setting.sync = 'false'