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

lihongji

2024-11-13 3d65ee18d645a30e600c9b63f0daefe2fc2b1151

 _Main/UI/MacroPlannerWebApp/Component_FormNewOfflinePlan/Component_matrixeditorContextMenu229.def

@@ -26,6 +26,39 @@
        Title: 'Show/Hide total'
      ]
    }
    Component mResetArchive
    {
      #keys: '[413988.0.1657458774]'
      BaseType: 'WebMenu'
      Properties:
      [
        Image: 'UNDO'
        Taborder: 4
        Title: '重置存档（测试专用）'
      ]
    }
    Component mAttributeConfiguration
    {
      #keys: '[413988.1.49220518]'
      BaseType: 'WebMenu'
      Properties:
      [
        Image: 'ATTRIBUTE'
        Taborder: 5
        Title: '属性配置'
      ]
    }
    Component mAttributeConfirm
    {
      #keys: '[413988.1.51331501]'
      BaseType: 'WebMenu'
      Properties:
      [
        Image: 'EDITOR_ACCESSIBILITY_WORLD'
        Taborder: 6
        Title: '属性确认'
      ]
    }
  ]
  Properties:
  [