修复字段保存与另存为bug

VIZ.Package.Module/ControlObject/FieldEdit/Edit/ListEdit/CellEdit/IntegerListCellEdit.xaml.cs

@@ -36,7 +36,7 @@ namespace VIZ.Package.Module
             DevExpress.Xpf.Grid.EditGridCellData cellData = e.NewValue as DevExpress.Xpf.Grid.EditGridCellData;
 
             this.IsSendToPreview = false;
-            bool.TryParse(cellData?.Value?.ToString(), out bool value);
+            int.TryParse(cellData?.Value?.ToString(), out int value);
             this.PART_Text.EditValue = value;
             this.IsSendToPreview = true;
         }

VIZ.Package.Module/ControlObject/FieldEdit/ViewModel/FieldEditViewModel.cs

@@ -162,6 +162,8 @@ namespace VIZ.Package.Module
                 return;
             }
 
+            // 更新列表值
+            service.TryUpdateControlFieldListValue();
             // 保存
             this.controlObjectService.SaveControlFields(ApplicationDomainEx.CurrentPage, obj.AllFiledNodes);
         }
@@ -195,18 +197,35 @@ namespace VIZ.Package.Module
                 return;
             }
 
+            // 更新列表值
+            IFieldTreeService service = ApplicationDomainEx.ServiceManager.GetService<IFieldTreeService>(ViewServiceKeys.FIELD_TREE_SERVICE);
+            if (service == null)
+            {
+                DXMessageBox.Show("另存失败！");
+                return;
+            }
+
+            service.TryUpdateControlFieldListValue();
+            // 获取当前打开页的控制对象
+            ControlObjectModel controlObject = service.GetControlObject();
+            if (controlObject == null)
+            {
+                DXMessageBox.Show("另存失败！");
+                return;
+            }
+
             // 另存模板
             if (ApplicationDomainEx.CurrentPage is PageTemplateModel srcTemplate)
             {
                 PageModel page = pageGroupService.AddPage(srcTemplate);
-                this.controlObjectService.CopyControlFields(srcTemplate.TemplateID, page.PageID);
+                this.controlObjectService.SaveControlFields(page.PageID, controlObject.AllFiledNodes);
                 pageGroupService.OpenPage(page);
             }
             // 另存页
             else if (ApplicationDomainEx.CurrentPage is PageModel srcPage)
             {
                 PageModel page = pageGroupService.CopyPage();
-                this.controlObjectService.CopyControlFields(srcPage.PageID, page.PageID);
+                this.controlObjectService.SaveControlFields(page.PageID, controlObject.AllFiledNodes);
                 pageGroupService.OpenPage(page);
             }
         }

VIZ.Package.Module/Page/Group/ViewModel/PageGroupViewModel.cs

@@ -364,14 +364,14 @@ namespace VIZ.Package.Module
             if (this.SelectedPageGroupModel == null)
                 return;
 
-            if (this.SelectedPageGroupModel.SelectedPages == null || this.SelectedPageGroupModel.Pages.Count == 0)
+            if (this.SelectedPageGroupModel.SelectedPages == null || this.SelectedPageGroupModel.SelectedPages.Count == 0)
                 return;
 
             string pageNums = string.Join(" ,", this.SelectedPageGroupModel.SelectedPages.Select(p => p.GetPageNumString()));
             if (DXMessageBox.Show($"是否删除页 [{pageNums}] ?", "提示", MessageBoxButton.YesNo) != MessageBoxResult.Yes)
                 return;
 
-            List<PageModel> pages = this.SelectedPageGroupModel.Pages.ToList();
+            List<PageModel> pages = this.SelectedPageGroupModel.SelectedPages.ToList();
 
             foreach (PageModel page in pages)
             {

VIZ.Package.Service/DB/ControlObject/ControlObjectService.cs

@@ -23,6 +23,16 @@ namespace VIZ.Package.Service
         {
             Guid id = this.GetTemplateIdOrPageId(pageBase);
 
+            this.SaveControlFields(id, fields);
+        }
+
+        /// <summary>
+        /// 保存控制字段
+        /// </summary>
+        /// <param name="id">页或模板ID</param>
+        /// <param name="fields">控制字段</param>
+        public void SaveControlFields(Guid id, IList<ControlFieldNodeModel> fields)
+        {
             ApplicationDomainEx.ProjectDbContext.ControlField.DeleteMany(p => p.PageID == id);
 
             List<ControlFieldEntity> list = new List<ControlFieldEntity>();