Merge remote-tracking branch 'origin/dev' into dev

lihongji

2024-11-13 3d65ee18d645a30e600c9b63f0daefe2fc2b1151

 _Main/UI/MacroPlannerWebApp/Component_FormEnginePipelineReport/Component_PanelExport#570.def

@@ -11,10 +11,31 @@
      BaseType: 'WebButton'
      Properties:
      [
        Image: 'IMPORT1'
        Image: 'EXPORT1'
        Label: '导出'
        Taborder: 1
      ]
    }
    Component ButtonSearch id:ButtonSearch_88
    {
      #keys: '[415136.0.972181163]'
      BaseType: 'WebButton'
      Properties:
      [
        Image: 'VIEW'
        Taborder: 0
      ]
    }
    Component bRefresh id:bRefresh_765
    {
      #keys: '[415136.0.1153803836]'
      BaseType: 'WebButton'
      Properties:
      [
        Image: 'REFRESH'
        Taborder: 2
      ]
    }
  ]
  Properties:
  [