Przeglądaj źródła

添加重命名限制(手动没复现)

cxs 2 miesięcy temu
rodzic
commit
50d316d8b8

+ 0 - 19
OTSIncAReportApp/OTSIncAReportApp.csproj

@@ -622,12 +622,6 @@
     <Compile Include="1-UI\OTSReportExport\RuleGroupSelector.Designer.cs">
       <DependentUpon>RuleGroupSelector.cs</DependentUpon>
     </Compile>
-    <Compile Include="1-UI\OTSReportExport\RuleSelector.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="1-UI\OTSReportExport\RuleSelector.Designer.cs">
-      <DependentUpon>RuleSelector.cs</DependentUpon>
-    </Compile>
     <Compile Include="1-UI\OTSReportExport\XtraReport_yb6156.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -926,12 +920,6 @@
     <Compile Include="1-UI\OTSReportExport\OTSReport_Export.Designer.cs">
       <DependentUpon>OTSReport_Export.cs</DependentUpon>
     </Compile>
-    <Compile Include="1-UI\OTSReportExport\OTSReport_GetEChartImage.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="1-UI\OTSReportExport\OTSReport_GetEChartImage.Designer.cs">
-      <DependentUpon>OTSReport_GetEChartImage.cs</DependentUpon>
-    </Compile>
     <Compile Include="1-UI\OTSRibbon\OTSRibbonFun.cs" />
     <Compile Include="1-UI\OTSDisplaySourceGridData\OTSSampleReportInfo\OTSSampleReportInfo.cs" />
     <Compile Include="1-UI\OTSReportExport\INCA\OTSReport_Template_INCA.cs">
@@ -1039,9 +1027,6 @@
     <EmbeddedResource Include="1-UI\OTSReportExport\RuleGroupSelector.resx">
       <DependentUpon>RuleGroupSelector.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="1-UI\OTSReportExport\RuleSelector.resx">
-      <DependentUpon>RuleSelector.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="1-UI\OTSReportExport\XtraReport_yb6156.resx">
       <DependentUpon>XtraReport_yb6156.cs</DependentUpon>
     </EmbeddedResource>
@@ -1124,9 +1109,6 @@
     <EmbeddedResource Include="1-UI\OTSReportExport\OTSReport_Export.resx">
       <DependentUpon>OTSReport_Export.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="1-UI\OTSReportExport\OTSReport_GetEChartImage.resx">
-      <DependentUpon>OTSReport_GetEChartImage.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="1-UI\OTSReportExport\Cleanness\OTSReport_Template_CleannessA.resx">
       <DependentUpon>OTSReport_Template_CleannessA.cs</DependentUpon>
     </EmbeddedResource>
@@ -1690,7 +1672,6 @@
     <EmbeddedResource Include="Help.resx">
       <DependentUpon>Help.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Properties\licenses.licx" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>

+ 5 - 0
OTSPartA_STDEditor/UI/STDRuleslist.cs

@@ -595,6 +595,11 @@ namespace OTSPartA_STDEditor
                     e.CancelEdit=true;
                     return;
                 }
+                if (e.Label == "Default")
+                {
+                    e.CancelEdit = true;
+                    return;
+                }
                 if (e.Label != null && e.Label != "")
                 {
                     if (m_MainForm._sTDEditor.GroupIdDictionaryFromName.ContainsKey(e.Label))