Merge branch 'dev' into dev_yy

yanweiyuan3

2023-10-10 d901b1ab0ee0b690f5ac211b9cdb1db3a58bca86

 _Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/_ROOT_Component_FormCapacityAllocationResultsRuleConfiguration.def

@@ -8,6 +8,32 @@
  Children:
  [
    #child: ListCapacityAllocationResultsRuleConfiguration
    Component DataHolderSelectCapacityAllocationResultsRuleConfiguration
    {
      #keys: '[414702.0.390054479]'
      BaseType: 'WebDataHolder'
      Databinding: 'structured[CapacityAllocationResultsRuleConfiguration]*'
      Children:
      [
        Component DataExtractorSelectCapacityAllocationResultsRuleConfiguration
        {
          #keys: '[414702.0.391186862]'
          BaseType: 'WebDataExtractor'
          Properties:
          [
            DataType: 'CapacityAllocationResultsRuleConfiguration'
            ExtractionMode: 'Selected'
            Source: 'ListCapacityAllocationResultsRuleConfiguration'
            Taborder: 0
          ]
        }
      ]
      Properties:
      [
        Taborder: 2
      ]
    }
    #child: PanelImportAndExport
  ]
  Properties:
  [