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

lihongji

2024-10-15 224bc6082b06f53755ee7e834d78e17f51cb0fa2

 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelRibbon504#801.def

@@ -18,10 +18,10 @@
          BaseType: 'WebDataExtractor'
          Properties:
          [
            DataType: 'structured[OfflinePlanTableInfo]'
            Source: 'dhOfflinePlanTables'
            DataType: 'RecycleBin'
            Source: 'RecycleBin'
            Taborder: 0
            Transformation: 'Elements'
            Transformation: 'OfflinePlanTableInfo'
          ]
        }
      ]
@@ -55,10 +55,10 @@
          BaseType: 'WebDataExtractor'
          Properties:
          [
            DataType: 'structured[OfflinePlanTableInfo]'
            Source: 'dhOfflinePlanTables'
            DataType: 'RecycleBin'
            Source: 'RecycleBin'
            Taborder: 0
            Transformation: 'Elements'
            Transformation: 'OfflinePlanTableInfo'
          ]
        }
      ]
@@ -69,31 +69,6 @@
        Taborder: 1
      ]
    }
    Component dhOfflinePlanTables
    {
      #keys: '[414996.1.103241339]'
      BaseType: 'WebDataHolder'
      Databinding: 'structured[OfflinePlanTableInfo]*'
      Children:
      [
        Component deOfflinePlanTables
        {
          #keys: '[414996.1.124700546]'
          BaseType: 'WebDataExtractor'
          Properties:
          [
            DataType: 'RecycleBin'
            Source: 'RecycleBin'
            Taborder: 0
            Transformation: 'OfflinePlanTableInfo'
          ]
        }
      ]
      Properties:
      [
        Taborder: 4
      ]
    }
    Component bExport
    {
      #keys: '[414996.1.104721685]'
@@ -101,7 +76,7 @@
      Properties:
      [
        Image: 'EXPORT1'
        Taborder: 5
        Taborder: 3
      ]
    }
    Component dhXMLDataListener
@@ -127,17 +102,7 @@
      ]
      Properties:
      [
        Taborder: 6
      ]
    }
    Component ButtonRibbon
    {
      #keys: '[414996.1.125429607]'
      BaseType: 'WebButton'
      Properties:
      [
        Label: '刷新下拉框'
        Taborder: 3
        Taborder: 4
      ]
    }
  ]