Merge branch 'dev'

renhao

2023-10-18 4f426fd0938d68df759fff7570ad6ec2e62bac96

 _Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Component_listContextMenuCapacityAllocationResultsRuleConfiguration.def

@@ -51,6 +51,38 @@
        Title: '全选'
      ]
    }
    Component Menu666
    {
      #keys: '[414702.1.55207187]'
      BaseType: 'WebMenu'
      Properties:
      [
        Separator: true
        Taborder: 7
      ]
    }
    Component MenuAutoCreate
    {
      #keys: '[414702.1.55207442]'
      BaseType: 'WebMenu'
      Properties:
      [
        Image: 'COMPONENT'
        Taborder: 8
        Title: '自动创建规则'
      ]
    }
    Component MenuGenerateByPegging
    {
      #keys: '[414702.1.60885527]'
      BaseType: 'WebMenu'
      Properties:
      [
        Image: 'PODIUM2'
        Taborder: 9
        Title: '通过Pegging生成'
      ]
    }
  ]
  Properties:
  [