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

lihongji

2024-10-15 224bc6082b06f53755ee7e834d78e17f51cb0fa2

 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelFilter.def

@@ -86,6 +86,16 @@
        Taborder: 6
      ]
    }
    Component ButtonClearFilter id:ButtonClearFilter_414
    {
      #keys: '[414996.1.137702887]'
      BaseType: 'WebButton'
      Properties:
      [
        Label: 'Clear'
        Taborder: 8
      ]
    }
  ]
  Properties:
  [