From f08871fe7d148d667f2f11f80f64de71a0d9504c Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期一, 15 六月 2026 18:19:37 +0800
Subject: [PATCH] 优化标准老化界面
---
Plugin.DOControl/DataModal.xaml | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/Plugin.DOControl/DataModal.xaml b/Plugin.DOControl/DataModal.xaml
index 1edace3..16952b4 100644
--- a/Plugin.DOControl/DataModal.xaml
+++ b/Plugin.DOControl/DataModal.xaml
@@ -6,13 +6,24 @@
xmlns:local="clr-namespace:Plugin.DOControl"
xmlns:pw="https://opensource.panuon.com/wpf"
xmlns:pu="https://opensource.panuon.com/wpf-ui"
- xmlns:dp="clr-namespace:HMI.UI.DpUtil;assembly=HMI.UI"
+ xmlns:dp="clr-namespace:HMI.UI.DpUtil;assembly=HMI.UI"
+ xmlns:sys="clr-namespace:System;assembly=mscorlib"
+ xmlns:ety="clr-namespace:Plugin.DOControl.Entity"
mc:Ignorable="d"
Title="Form"
SizeToContent="Height"
Width="600"
WindowStartupLocation="CenterOwner"
Style="{StaticResource ModalWindow}">
+ <Window.Resources>
+ <ObjectDataProvider x:Key="enumValues"
+ MethodName="GetValues"
+ ObjectType="{x:Type sys:Enum}">
+ <ObjectDataProvider.MethodParameters>
+ <x:Type TypeName="ety:ControlType"/>
+ </ObjectDataProvider.MethodParameters>
+ </ObjectDataProvider>
+ </Window.Resources>
<Grid Margin="10">
<StackPanel x:Name="formPanel">
<pu:FormGroup x:Name="FgGroup"
@@ -69,15 +80,17 @@
Style="{StaticResource InputFormGroupStyle}"
dp:FormGroupHelper.IsRequired="True"
GroupName="MyFormGroup">
- <ComboBox x:Name="CbControlType" Style="{StaticResource FormComboxStyle}" SelectedValuePath="Content">
- <ComboBoxItem>0</ComboBoxItem>
+ <ComboBox x:Name="CbControlType" Style="{StaticResource FormComboxStyle}"
+ ItemsSource="{Binding Source={StaticResource enumValues}}"
+ SelectedValuePath="Content">
+ <!--<ComboBoxItem>0</ComboBoxItem>
<ComboBoxItem>1</ComboBoxItem>
<ComboBoxItem>2</ComboBoxItem>
<ComboBoxItem>3</ComboBoxItem>
- <ComboBoxItem>4</ComboBoxItem>
+ <ComboBoxItem>4</ComboBoxItem>
<ComboBoxItem>5</ComboBoxItem>
<ComboBoxItem>6</ComboBoxItem>
- <ComboBoxItem>7</ComboBoxItem>
+ <ComboBoxItem>7</ComboBoxItem>-->
</ComboBox>
</pu:FormGroup>
</StackPanel>
--
Gitblit v1.9.1