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

lihongji

2024-11-11 642ffe272e766efc3fc23f02b324817a94ed6d92

 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlan/Component_MatrixEditor951.def

@@ -44,10 +44,10 @@
          BaseType: 'WebDataExtractor'
          Properties:
          [
            DataType: 'OfflinePlanTable'
            Source: 'dhOfflinePlanTable'
            DataType: 'structured[OfflinePlanRow]'
            Source: 'dhSelectedOfflinePlanRow'
            Taborder: 0
            Transformation: 'OfflinePlanRow'
            Transformation: 'Elements'
          ]
        }
      ]
@@ -71,6 +71,7 @@
          Properties:
          [
            DataType: 'OfflinePlanTable'
            FixedFilter: 'object.IsShow()'
            Source: 'dhOfflinePlanTable'
            Taborder: 0
            Transformation: 'OfflinePlanColumn'