소스 검색

Merge branch 'prs_8_32c' into kenric

Kenric Nugteren 5 달 전
부모
커밋
b2e2df90aa
4개의 변경된 파일12개의 추가작업 그리고 13개의 파일을 삭제
  1. 9 10
      prs.desktop/Panels/DataEntry/DataEntryPanel.xaml.cs
  2. 1 1
      prs.desktop/prsdesktop.iss
  3. 1 1
      prs.licensing/PRSLicensing.iss
  4. 1 1
      prs.server/PRSServer.iss

+ 9 - 10
prs.desktop/Panels/DataEntry/DataEntryPanel.xaml.cs

@@ -245,12 +245,6 @@ public partial class DataEntryPanel : UserControl, IBasePanel, IDynamicEditorHos
         Editor.SetValue(Grid.ColumnProperty, 0);
         Editor.SetValue(Grid.ColumnSpanProperty, 4);
 
-        Editor.OnAfterEditorValueChanged += (sender, args) =>
-        {
-            IsChanged = IsChanged || (_entity?.IsChanged() == true || _originalID != _entityID);
-            return null;
-        };
-
         Editor.OnOK += () => { DoSave(false); };
         Editor.OnCancel += () =>
         {
@@ -258,7 +252,10 @@ public partial class DataEntryPanel : UserControl, IBasePanel, IDynamicEditorHos
             Select(_selectedType,_entityID);
         };
         Editor.OnChanged += (sender, args) => IsChanged = true;
-        Editor.OnFormCustomiseEditor += (sender, items, column, editor) =>
+        
+        DetailBorder.Child = Editor;
+        _grid = (DynamicGridUtils.CreateDynamicGrid(typeof(DynamicDataGrid<>), _selectedType) as IDynamicDataGrid)!;
+        _grid.OnCustomiseEditor += (sender, items, column, editor) =>
         {
             if ((editor is BaseCodeEditor be) && editor.Editable.EditorVisible())
             {
@@ -268,9 +265,11 @@ public partial class DataEntryPanel : UserControl, IBasePanel, IDynamicEditorHos
                 };
             }
         };
-        
-        DetailBorder.Child = Editor;
-        _grid = DynamicGridUtils.CreateDynamicGrid(typeof(DynamicDataGrid<>), _selectedType) as IDynamicDataGrid;
+        _grid.OnAfterEditorValueChangedEvent += (sender, args) =>
+        {
+            IsChanged = IsChanged || (_entity?.IsChanged() == true || _originalID != _entityID);
+            return null;
+        };
 
         if (_grid is DynamicDataGrid<JobDocumentSetMileStone> milestoneGrid)
         {

+ 1 - 1
prs.desktop/prsdesktop.iss

@@ -8,7 +8,7 @@
 #define public Dependency_Path_NetCoreCheck "dependencies\"
 
 #define MyAppName "PRS Desktop"
-#define MyAppVersion "8.32b"
+#define MyAppVersion "8.32c"
 #define MyAppPublisher "PRS Digital"
 #define MyAppURL "https://www.prs-software.com.au"
 #define MyAppExeName "PRSDesktop.exe"

+ 1 - 1
prs.licensing/PRSLicensing.iss

@@ -8,7 +8,7 @@
 #define public Dependency_Path_NetCoreCheck "dependencies\"
 
 #define MyAppName "PRS Licensing"
-#define MyAppVersion "8.32b"
+#define MyAppVersion "8.32c"
 #define MyAppPublisher "PRS Digital"
 #define MyAppURL "https://www.prs-software.com.au"
 #define MyAppExeName "PRSLicensing.exe"

+ 1 - 1
prs.server/PRSServer.iss

@@ -8,7 +8,7 @@
 #define public Dependency_Path_NetCoreCheck "dependencies\"
 
 #define MyAppName "PRS Server"
-#define MyAppVersion "8.32b"
+#define MyAppVersion "8.32c"
 #define MyAppPublisher "PRS Digital"
 #define MyAppURL "https://www.prs-software.com.au"
 #define MyAppExeName "PRSServer.exe"