Przeglądaj źródła

水印,背景-样式

liyijie 2 lat temu
rodzic
commit
b8fd5e5b8a

+ 9 - 0
PDF Office/ViewModels/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageBackground/HomePageBackgroundCreateBaseContentViewModel.cs

@@ -39,11 +39,13 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
                 if (value == EnumCreateOrEdit.StatusEdit)
                 {
                     EditBaseVisible = Visibility.Visible;
+                    SelectContentVisibility=Visibility.Collapsed;
                     CreateBaseVisible = Visibility.Collapsed;
                 }
                 else if (value == EnumCreateOrEdit.StatusCreate)
                 {
                     CreateBaseVisible = Visibility.Visible;
+                    SelectContentVisibility=Visibility.Visible;
                     EditBaseVisible = Visibility.Collapsed;
                 }
             }
@@ -93,6 +95,13 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
             set => SetProperty(ref _editBaseVisible, value);
         }
 
+        private Visibility _selectContentVisibility;
+        public Visibility SelectContentVisibility
+        {
+            get => _selectContentVisibility;
+            set => SetProperty(ref _selectContentVisibility, value);
+        }
+
         public EnumColorOrFile CurrentTemplateListMod;
         public DelegateCommand<object> ChangeCreateModCommand { get; set; }
         public DelegateCommand EnterTemplateListCommand { get; set; }

+ 9 - 0
PDF Office/ViewModels/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageWatermark/HomePageWatermarkCreateBaseContentViewModel.cs

@@ -59,11 +59,13 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
                 if (value == EnumCreateOrEdit.StatusEdit)
                 {
                     EditBaseVisible = Visibility.Visible;
+                    SelectContentVisibility = Visibility.Collapsed;
                     CreateBaseVisible = Visibility.Collapsed;
                 }
                 else if (value == EnumCreateOrEdit.StatusCreate)
                 {
                     CreateBaseVisible = Visibility.Visible;
+                    SelectContentVisibility= Visibility.Visible;
                     EditBaseVisible = Visibility.Collapsed;
                 }
             }
@@ -90,6 +92,13 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
             set => SetProperty(ref _editBaseVisible, value);
         }
 
+        private Visibility _selectContentVisibility;
+        public Visibility SelectContentVisibility
+        {
+            get => _selectContentVisibility;
+            set => SetProperty(ref _selectContentVisibility, value);
+        }
+
         public DelegateCommand<object> ChangeCreateModCommand { get; set; }
 
         public DelegateCommand EnterTemplateListCommand { get; set; }

+ 9 - 0
PDF Office/ViewModels/EditTools/Background/BackgroundCreateBaseContentViewModel.cs

@@ -45,11 +45,13 @@ namespace PDF_Office.ViewModels.EditTools.Background
                 if (value == EnumCreateOrEdit.StatusEdit)
                 {
                     EditBaseVisible = Visibility.Visible;
+                    SelectContentVisibility = Visibility.Collapsed;
                     CreateBaseVisible = Visibility.Collapsed;
                 }
                 else if (value == EnumCreateOrEdit.StatusCreate)
                 {
                     CreateBaseVisible = Visibility.Visible;
+                    SelectContentVisibility= Visibility.Visible;
                     EditBaseVisible = Visibility.Collapsed;
                 }
             }
@@ -99,6 +101,13 @@ namespace PDF_Office.ViewModels.EditTools.Background
             set => SetProperty(ref _editBaseVisible, value);
         }
 
+        private Visibility _selectContentVisibility;
+        public Visibility SelectContentVisibility
+        {
+            get => _selectContentVisibility;
+            set => SetProperty(ref _selectContentVisibility, value);
+        }
+
         public EnumColorOrFile CurrentTemplateListMod;
         public DelegateCommand<object> ChangeCreateModCommand { get; set; }
         public DelegateCommand EnterTemplateListCommand { get; set; }

+ 11 - 0
PDF Office/ViewModels/EditTools/Watermark/WatermarkCreateBaseContentViewModel.cs

@@ -62,11 +62,13 @@ namespace PDF_Office.ViewModels.EditTools.Watermark
                 if (value == EnumCreateOrEdit.StatusEdit)
                 {
                     EditBaseVisible = Visibility.Visible;
+                    SelectContentVisibility = Visibility.Collapsed;
                     CreateBaseVisible = Visibility.Collapsed;
                 }
                 else if (value == EnumCreateOrEdit.StatusCreate)
                 {
                     CreateBaseVisible = Visibility.Visible;
+                    SelectContentVisibility = Visibility.Visible;
                     EditBaseVisible = Visibility.Collapsed;
                 }
             }
@@ -93,6 +95,15 @@ namespace PDF_Office.ViewModels.EditTools.Watermark
             set => SetProperty(ref _editBaseVisible, value);
         }
 
+        private Visibility _selectContentVisibility;
+        public Visibility SelectContentVisibility
+        {
+            get => _selectContentVisibility;
+            set => SetProperty(ref _selectContentVisibility, value);
+        }
+
+        
+
         public DelegateCommand<object> ChangeCreateModCommand { get; set; }
 
         public DelegateCommand EnterTemplateListCommand { get; set; }

+ 2 - 2
PDF Office/Views/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageBackground/HomePageBackgroundCreateBaseContent.xaml

@@ -45,10 +45,10 @@
         <ScrollViewer Grid.Row="1">
             <Grid Grid.Row="1">
                 <Grid.RowDefinitions>
-                    <RowDefinition Height="32"></RowDefinition>
+                    <RowDefinition Height="Auto"></RowDefinition>
                     <RowDefinition></RowDefinition>
                 </Grid.RowDefinitions>
-                <Grid Grid.Row="0" Margin="16,0,16,0">
+                <Grid Grid.Row="0" Margin="16,0,16,0" Visibility="{Binding SelectContentVisibility}" Height="32">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition></ColumnDefinition>
                         <ColumnDefinition></ColumnDefinition>

+ 2 - 2
PDF Office/Views/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageWatermark/HomePageWatermarkCreateBaseContent.xaml

@@ -44,10 +44,10 @@
         <ScrollViewer   Grid.Row="1">
         <Grid Grid.Row="1">
             <Grid.RowDefinitions>
-                <RowDefinition Height="32"></RowDefinition>
+                <RowDefinition Height="Auto"></RowDefinition>
                 <RowDefinition></RowDefinition>
             </Grid.RowDefinitions>
-            <Grid Grid.Row="0" Margin="16,0,16,0">
+                <Grid Grid.Row="0" Margin="16,0,16,0" Visibility="{Binding SelectContentVisibility}" Height="32">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition></ColumnDefinition>
                     <ColumnDefinition></ColumnDefinition>

+ 2 - 2
PDF Office/Views/EditTools/Background/BackgroundCreateBaseContent.xaml

@@ -11,7 +11,7 @@
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="40"></RowDefinition>
-            <RowDefinition Height="48"></RowDefinition>
+            <RowDefinition Height="Auto"></RowDefinition>
             <RowDefinition></RowDefinition>
         </Grid.RowDefinitions>
         <Grid Grid.Row="0" Visibility="{Binding CreateBaseVisible, Mode=TwoWay}">
@@ -42,7 +42,7 @@
                 </StackPanel>
             </Button>
         </Grid>
-        <Grid Grid.Row="1" Margin="16,0,16,0">
+        <Grid Grid.Row="1" Margin="16,0,16,0" Visibility="{Binding SelectContentVisibility}" Height="48">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition></ColumnDefinition>
                 <ColumnDefinition></ColumnDefinition>

+ 2 - 2
PDF Office/Views/EditTools/Watermark/WatermarkCreateBaseContent.xaml

@@ -11,7 +11,7 @@
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="40"></RowDefinition>
-            <RowDefinition Height="48"></RowDefinition>
+            <RowDefinition Height="Auto"></RowDefinition>
             <RowDefinition></RowDefinition>
         </Grid.RowDefinitions>
         <Grid Grid.Row="0" Visibility="{Binding CreateBaseVisible, Mode=TwoWay}">
@@ -42,7 +42,7 @@
                 </StackPanel>
             </Button>
         </Grid>
-        <Grid Grid.Row="1" Margin="16,0,16,0">
+        <Grid Grid.Row="1" Margin="16,0,16,0" Visibility="{Binding SelectContentVisibility}" Height="48">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition></ColumnDefinition>
                 <ColumnDefinition></ColumnDefinition>