duheng
2024-12-20 4c8540a709677e03ffd6918ce9637abab0454a31
界面优化
已修改7个文件
155 ■■■■ 文件已修改
WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/07-PumpChart/01-import/01-excel/ImportPumpPerform2dByExcelDlg.Designer.cs 50 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/07-PumpChart/01-import/02-image/ImportPumpPerform2dByImageDlg.Designer.cs 40 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/15-meter/01-series/AssetsMeterSeriesMgrTreeCtrl.cs 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/16-flowmeter/01-series/AssetsFlowmeterSeriesMgrTreeCtrl.cs 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/01-series/AssetsExchangerSeriesMgrTreeCtrl.cs 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/01-series/AssetsCompressorSeriesMgrTreeCtrl.cs 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/01-series/AssetsCoolingSeriesMgrTreeCtrl.cs 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/07-PumpChart/01-import/01-excel/ImportPumpPerform2dByExcelDlg.Designer.cs
@@ -90,7 +90,7 @@
            dataLayoutControl1.Name = "dataLayoutControl1";
            dataLayoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(859, 142, 650, 400);
            dataLayoutControl1.Root = Root;
            dataLayoutControl1.Size = new Size(808, 563);
            dataLayoutControl1.Size = new Size(956, 585);
            dataLayoutControl1.TabIndex = 0;
            dataLayoutControl1.Text = "dataLayoutControl1";
            // 
@@ -103,7 +103,7 @@
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlGroup1 });
            Root.Name = "Root";
            Root.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            Root.Size = new Size(808, 563);
            Root.Size = new Size(956, 585);
            Root.TextVisible = false;
            // 
            // layoutControlGroup1
@@ -113,14 +113,14 @@
            layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { emptySpaceItem1 });
            layoutControlGroup1.Location = new Point(0, 0);
            layoutControlGroup1.Name = "autoGeneratedGroup0";
            layoutControlGroup1.Size = new Size(808, 563);
            layoutControlGroup1.Size = new Size(956, 585);
            // 
            // emptySpaceItem1
            // 
            emptySpaceItem1.AllowHotTrack = false;
            emptySpaceItem1.Location = new Point(0, 0);
            emptySpaceItem1.Name = "emptySpaceItem1";
            emptySpaceItem1.Size = new Size(808, 563);
            emptySpaceItem1.Size = new Size(956, 585);
            emptySpaceItem1.TextSize = new Size(0, 0);
            // 
            // dxErrorProvider1
@@ -132,7 +132,7 @@
            pumpChartExcelImportCtrl1.Location = new Point(2, 28);
            pumpChartExcelImportCtrl1.Margin = new Padding(1);
            pumpChartExcelImportCtrl1.Name = "pumpChartExcelImportCtrl1";
            pumpChartExcelImportCtrl1.Size = new Size(804, 503);
            pumpChartExcelImportCtrl1.Size = new Size(952, 524);
            pumpChartExcelImportCtrl1.TabIndex = 4;
            // 
            // layoutControl2
@@ -148,7 +148,7 @@
            layoutControl2.Name = "layoutControl2";
            layoutControl2.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(565, 257, 650, 400);
            layoutControl2.Root = layoutControlGroup2;
            layoutControl2.Size = new Size(808, 563);
            layoutControl2.Size = new Size(956, 585);
            layoutControl2.TabIndex = 4;
            layoutControl2.Text = "layoutControl2";
            // 
@@ -158,9 +158,9 @@
            generalOkAndCancelCtrl1.ButtonCancelMinSize = new Size(100, 26);
            generalOkAndCancelCtrl1.ButtonOkMaxSize = new Size(100, 26);
            generalOkAndCancelCtrl1.ButtonOkMinSize = new Size(100, 26);
            generalOkAndCancelCtrl1.Location = new Point(2, 535);
            generalOkAndCancelCtrl1.Location = new Point(2, 556);
            generalOkAndCancelCtrl1.Name = "generalOkAndCancelCtrl1";
            generalOkAndCancelCtrl1.Size = new Size(804, 26);
            generalOkAndCancelCtrl1.Size = new Size(952, 27);
            generalOkAndCancelCtrl1.TabIndex = 6;
            // 
            // btnExcelFilePath
@@ -173,26 +173,26 @@
            editorButtonImageOptions2.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions2.SvgImage");
            editorButtonImageOptions2.SvgImageSize = new Size(14, 14);
            btnExcelFilePath.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "导入文件", "Import", superToolTip1, DevExpress.Utils.ToolTipAnchor.Default), new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "模板下载", "Download", superToolTip2, DevExpress.Utils.ToolTipAnchor.Default) });
            btnExcelFilePath.Size = new Size(211, 22);
            btnExcelFilePath.Size = new Size(262, 22);
            btnExcelFilePath.StyleController = layoutControl2;
            btnExcelFilePath.TabIndex = 0;
            btnExcelFilePath.ButtonClick += btnExcelFilePath_ButtonClick;
            // 
            // textEditName
            // 
            textEditName.Location = new Point(345, 2);
            textEditName.Location = new Point(396, 2);
            textEditName.Margin = new Padding(2);
            textEditName.Name = "textEditName";
            textEditName.Size = new Size(77, 20);
            textEditName.Size = new Size(166, 20);
            textEditName.StyleController = layoutControl2;
            textEditName.TabIndex = 2;
            // 
            // textEditImportance
            // 
            textEditImportance.Location = new Point(490, 2);
            textEditImportance.Location = new Point(630, 2);
            textEditImportance.Margin = new Padding(2);
            textEditImportance.Name = "textEditImportance";
            textEditImportance.Size = new Size(78, 20);
            textEditImportance.Size = new Size(50, 20);
            textEditImportance.StyleController = layoutControl2;
            textEditImportance.TabIndex = 3;
            // 
@@ -203,7 +203,7 @@
            layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem3, layoutControlItem2, layoutControlItem4, emptySpaceItem3, layoutControlItem5 });
            layoutControlGroup2.Name = "Root";
            layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            layoutControlGroup2.Size = new Size(808, 563);
            layoutControlGroup2.Size = new Size(956, 585);
            layoutControlGroup2.TextVisible = false;
            // 
            // layoutControlItem1
@@ -211,7 +211,7 @@
            layoutControlItem1.Control = btnExcelFilePath;
            layoutControlItem1.Location = new Point(0, 0);
            layoutControlItem1.Name = "layoutControlItem1";
            layoutControlItem1.Size = new Size(279, 26);
            layoutControlItem1.Size = new Size(330, 26);
            layoutControlItem1.Text = "文件路径:";
            layoutControlItem1.TextSize = new Size(52, 14);
            // 
@@ -220,42 +220,42 @@
            layoutControlItem3.Control = pumpChartExcelImportCtrl1;
            layoutControlItem3.Location = new Point(0, 26);
            layoutControlItem3.Name = "layoutControlItem3";
            layoutControlItem3.Size = new Size(808, 507);
            layoutControlItem3.Size = new Size(956, 528);
            layoutControlItem3.TextSize = new Size(0, 0);
            layoutControlItem3.TextVisible = false;
            // 
            // layoutControlItem2
            // 
            layoutControlItem2.Control = textEditName;
            layoutControlItem2.Location = new Point(279, 0);
            layoutControlItem2.Location = new Point(330, 0);
            layoutControlItem2.Name = "layoutControlItem2";
            layoutControlItem2.Size = new Size(145, 26);
            layoutControlItem2.Size = new Size(234, 26);
            layoutControlItem2.Text = "名称:";
            layoutControlItem2.TextSize = new Size(52, 14);
            // 
            // layoutControlItem4
            // 
            layoutControlItem4.Control = textEditImportance;
            layoutControlItem4.Location = new Point(424, 0);
            layoutControlItem4.Location = new Point(564, 0);
            layoutControlItem4.Name = "layoutControlItem4";
            layoutControlItem4.Size = new Size(146, 26);
            layoutControlItem4.Size = new Size(118, 26);
            layoutControlItem4.Text = "重要度:";
            layoutControlItem4.TextSize = new Size(52, 14);
            // 
            // emptySpaceItem3
            // 
            emptySpaceItem3.AllowHotTrack = false;
            emptySpaceItem3.Location = new Point(570, 0);
            emptySpaceItem3.Location = new Point(682, 0);
            emptySpaceItem3.Name = "emptySpaceItem3";
            emptySpaceItem3.Size = new Size(238, 26);
            emptySpaceItem3.Size = new Size(274, 26);
            emptySpaceItem3.TextSize = new Size(0, 0);
            // 
            // layoutControlItem5
            // 
            layoutControlItem5.Control = generalOkAndCancelCtrl1;
            layoutControlItem5.Location = new Point(0, 533);
            layoutControlItem5.Location = new Point(0, 554);
            layoutControlItem5.Name = "layoutControlItem5";
            layoutControlItem5.Size = new Size(808, 30);
            layoutControlItem5.Size = new Size(956, 31);
            layoutControlItem5.TextSize = new Size(0, 0);
            layoutControlItem5.TextVisible = false;
            // 
@@ -263,7 +263,7 @@
            // 
            AutoScaleDimensions = new SizeF(7F, 14F);
            AutoScaleMode = AutoScaleMode.Font;
            ClientSize = new Size(808, 563);
            ClientSize = new Size(956, 585);
            Controls.Add(layoutControl2);
            Controls.Add(dataLayoutControl1);
            Name = "ImportPumpPerform2dByExcelDlg";
WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/07-PumpChart/01-import/02-image/ImportPumpPerform2dByImageDlg.Designer.cs
@@ -86,7 +86,7 @@
            layoutControl1.Name = "layoutControl1";
            layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(1228, 230, 650, 400);
            layoutControl1.Root = Root;
            layoutControl1.Size = new Size(1062, 545);
            layoutControl1.Size = new Size(1029, 564);
            layoutControl1.TabIndex = 0;
            layoutControl1.Text = "layoutControl1";
            // 
@@ -99,13 +99,13 @@
            editorButtonImageOptions2.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions2.SvgImage");
            editorButtonImageOptions2.SvgImageSize = new Size(14, 14);
            btnEditPicture.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "导入文件", "Import", superToolTip1, DevExpress.Utils.ToolTipAnchor.Default), new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "模板下载", "Download", superToolTip2, DevExpress.Utils.ToolTipAnchor.Default) });
            btnEditPicture.Size = new Size(315, 22);
            btnEditPicture.Size = new Size(303, 22);
            btnEditPicture.StyleController = layoutControl1;
            btnEditPicture.TabIndex = 0;
            // 
            // textEditImportance
            // 
            textEditImportance.Location = new Point(630, 13);
            textEditImportance.Location = new Point(660, 13);
            textEditImportance.Name = "textEditImportance";
            textEditImportance.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.False;
            textEditImportance.Properties.EditFormat.FormatString = "N0";
@@ -121,9 +121,9 @@
            generalOkAndCancelCtrl1.ButtonCancelMinSize = new Size(100, 26);
            generalOkAndCancelCtrl1.ButtonOkMaxSize = new Size(100, 26);
            generalOkAndCancelCtrl1.ButtonOkMinSize = new Size(100, 26);
            generalOkAndCancelCtrl1.Location = new Point(12, 507);
            generalOkAndCancelCtrl1.Location = new Point(12, 525);
            generalOkAndCancelCtrl1.Name = "generalOkAndCancelCtrl1";
            generalOkAndCancelCtrl1.Size = new Size(1038, 26);
            generalOkAndCancelCtrl1.Size = new Size(1005, 27);
            generalOkAndCancelCtrl1.TabIndex = 4;
            // 
            // panelControl1
@@ -131,7 +131,7 @@
            panelControl1.Controls.Add(pumpChartImageImportCtrl1);
            panelControl1.Location = new Point(12, 38);
            panelControl1.Name = "panelControl1";
            panelControl1.Size = new Size(1038, 465);
            panelControl1.Size = new Size(1005, 483);
            panelControl1.TabIndex = 1;
            // 
            // pumpChartImageImportCtrl1
@@ -140,14 +140,14 @@
            pumpChartImageImportCtrl1.Location = new Point(2, 2);
            pumpChartImageImportCtrl1.Margin = new Padding(2, 2, 2, 2);
            pumpChartImageImportCtrl1.Name = "pumpChartImageImportCtrl1";
            pumpChartImageImportCtrl1.Size = new Size(1034, 461);
            pumpChartImageImportCtrl1.Size = new Size(1001, 479);
            pumpChartImageImportCtrl1.TabIndex = 0;
            // 
            // textEditName
            // 
            textEditName.Location = new Point(459, 12);
            textEditName.Location = new Point(447, 12);
            textEditName.Name = "textEditName";
            textEditName.Size = new Size(103, 20);
            textEditName.Size = new Size(145, 20);
            textEditName.StyleController = layoutControl1;
            textEditName.TabIndex = 2;
            // 
@@ -159,7 +159,7 @@
            Root.GroupBordersVisible = false;
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem2, layoutControlItem5, emptySpaceItem1, layoutControlItem3, layoutControlItem4 });
            Root.Name = "Root";
            Root.Size = new Size(1062, 545);
            Root.Size = new Size(1029, 564);
            Root.TextVisible = false;
            // 
            // layoutControlItem1
@@ -167,16 +167,16 @@
            layoutControlItem1.Control = panelControl1;
            layoutControlItem1.Location = new Point(0, 26);
            layoutControlItem1.Name = "layoutControlItem1";
            layoutControlItem1.Size = new Size(1042, 469);
            layoutControlItem1.Size = new Size(1009, 487);
            layoutControlItem1.TextSize = new Size(0, 0);
            layoutControlItem1.TextVisible = false;
            // 
            // layoutControlItem2
            // 
            layoutControlItem2.Control = generalOkAndCancelCtrl1;
            layoutControlItem2.Location = new Point(0, 495);
            layoutControlItem2.Location = new Point(0, 513);
            layoutControlItem2.Name = "layoutControlItem2";
            layoutControlItem2.Size = new Size(1042, 30);
            layoutControlItem2.Size = new Size(1009, 31);
            layoutControlItem2.TextSize = new Size(0, 0);
            layoutControlItem2.TextVisible = false;
            // 
@@ -184,7 +184,7 @@
            // 
            layoutControlItem5.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
            layoutControlItem5.Control = textEditImportance;
            layoutControlItem5.Location = new Point(554, 0);
            layoutControlItem5.Location = new Point(584, 0);
            layoutControlItem5.MaxSize = new Size(150, 24);
            layoutControlItem5.MinSize = new Size(150, 24);
            layoutControlItem5.Name = "layoutControlItem5";
@@ -196,9 +196,9 @@
            // emptySpaceItem1
            // 
            emptySpaceItem1.AllowHotTrack = false;
            emptySpaceItem1.Location = new Point(704, 0);
            emptySpaceItem1.Location = new Point(734, 0);
            emptySpaceItem1.Name = "emptySpaceItem1";
            emptySpaceItem1.Size = new Size(338, 26);
            emptySpaceItem1.Size = new Size(275, 26);
            emptySpaceItem1.TextSize = new Size(0, 0);
            // 
            // layoutControlItem3
@@ -206,16 +206,16 @@
            layoutControlItem3.Control = btnEditPicture;
            layoutControlItem3.Location = new Point(0, 0);
            layoutControlItem3.Name = "layoutControlItem3";
            layoutControlItem3.Size = new Size(383, 26);
            layoutControlItem3.Size = new Size(371, 26);
            layoutControlItem3.Text = "图片路径:";
            layoutControlItem3.TextSize = new Size(52, 14);
            // 
            // layoutControlItem4
            // 
            layoutControlItem4.Control = textEditName;
            layoutControlItem4.Location = new Point(383, 0);
            layoutControlItem4.Location = new Point(371, 0);
            layoutControlItem4.Name = "layoutControlItem4";
            layoutControlItem4.Size = new Size(171, 26);
            layoutControlItem4.Size = new Size(213, 26);
            layoutControlItem4.Text = "名称:";
            layoutControlItem4.TextSize = new Size(52, 14);
            // 
@@ -227,7 +227,7 @@
            // 
            AutoScaleDimensions = new SizeF(7F, 14F);
            AutoScaleMode = AutoScaleMode.Font;
            ClientSize = new Size(1062, 545);
            ClientSize = new Size(1029, 564);
            Controls.Add(layoutControl1);
            Name = "ImportPumpPerform2dByImageDlg";
            StartPosition = FormStartPosition.CenterParent;
WinFrmUI/HStation.WinFrmUI.Assets.Core/15-meter/01-series/AssetsMeterSeriesMgrTreeCtrl.cs
@@ -14,7 +14,7 @@
    public partial class AssetsMeterSeriesMgrTreeCtrl : DevExpress.XtraEditors.XtraUserControl
    {
        /// <summary>
        ///
        ///
        /// </summary>
        public AssetsMeterSeriesMgrTreeCtrl()
        {
@@ -26,7 +26,6 @@
            this.barBtnDelete.ItemClick += BarBtnDelete_ItemClick;
            this.barBtnInfo.ItemClick += BarBtnInfo_ItemClick;
        }
        /// <summary>
        /// 聚焦改变事件
@@ -89,7 +88,10 @@
        private void treeList1_FocusedNodeChanged(object sender, DevExpress.XtraTreeList.FocusedNodeChangedEventArgs e)
        {
            var vm = this.treeList1.GetDataRecordByNode(e.Node) as AssetsMeterSeriesMgrViewModel;
            this.FocusedChangedEvent?.Invoke(vm.Vmo);
            if (vm != null)
            {
                this.FocusedChangedEvent?.Invoke(vm.Vmo);
            }
        }
        //刷新
@@ -108,6 +110,7 @@
            _calcHitInfo = this.treeList1.CalcHitInfo(e.Location);
            this.popupMenu1.ShowPopup(MousePosition);
        }
        private TreeListHitInfo _calcHitInfo = null;
        //右键菜单弹出前验证
@@ -400,8 +403,6 @@
            be.Properties.AllowDrag = allowDrag;
        }
        #endregion
        #endregion 拖拽
    }
}
WinFrmUI/HStation.WinFrmUI.Assets.Core/16-flowmeter/01-series/AssetsFlowmeterSeriesMgrTreeCtrl.cs
@@ -14,7 +14,7 @@
    public partial class AssetsFlowmeterSeriesMgrTreeCtrl : DevExpress.XtraEditors.XtraUserControl
    {
        /// <summary>
        ///
        ///
        /// </summary>
        public AssetsFlowmeterSeriesMgrTreeCtrl()
        {
@@ -26,7 +26,6 @@
            this.barBtnDelete.ItemClick += BarBtnDelete_ItemClick;
            this.barBtnInfo.ItemClick += BarBtnInfo_ItemClick;
        }
        /// <summary>
        /// 聚焦改变事件
@@ -89,7 +88,10 @@
        private void treeList1_FocusedNodeChanged(object sender, DevExpress.XtraTreeList.FocusedNodeChangedEventArgs e)
        {
            var vm = this.treeList1.GetDataRecordByNode(e.Node) as AssetsFlowmeterSeriesMgrViewModel;
            this.FocusedChangedEvent?.Invoke(vm.Vmo);
            if (vm != null)
            {
                this.FocusedChangedEvent?.Invoke(vm.Vmo);
            }
        }
        //刷新
@@ -108,6 +110,7 @@
            _calcHitInfo = this.treeList1.CalcHitInfo(e.Location);
            this.popupMenu1.ShowPopup(MousePosition);
        }
        private TreeListHitInfo _calcHitInfo = null;
        //右键菜单弹出前验证
@@ -400,8 +403,6 @@
            be.Properties.AllowDrag = allowDrag;
        }
        #endregion
        #endregion 拖拽
    }
}
WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/01-series/AssetsExchangerSeriesMgrTreeCtrl.cs
@@ -14,7 +14,7 @@
    public partial class AssetsExchangerSeriesMgrTreeCtrl : DevExpress.XtraEditors.XtraUserControl
    {
        /// <summary>
        ///
        ///
        /// </summary>
        public AssetsExchangerSeriesMgrTreeCtrl()
        {
@@ -26,7 +26,6 @@
            this.barBtnDelete.ItemClick += BarBtnDelete_ItemClick;
            this.barBtnInfo.ItemClick += BarBtnInfo_ItemClick;
        }
        /// <summary>
        /// 聚焦改变事件
@@ -89,7 +88,10 @@
        private void treeList1_FocusedNodeChanged(object sender, DevExpress.XtraTreeList.FocusedNodeChangedEventArgs e)
        {
            var vm = this.treeList1.GetDataRecordByNode(e.Node) as AssetsExchangerSeriesMgrViewModel;
            this.FocusedChangedEvent?.Invoke(vm.Vmo);
            if (vm != null)
            {
                this.FocusedChangedEvent?.Invoke(vm.Vmo);
            }
        }
        //刷新
@@ -108,6 +110,7 @@
            _calcHitInfo = this.treeList1.CalcHitInfo(e.Location);
            this.popupMenu1.ShowPopup(MousePosition);
        }
        private TreeListHitInfo _calcHitInfo = null;
        //右键菜单弹出前验证
@@ -400,8 +403,6 @@
            be.Properties.AllowDrag = allowDrag;
        }
        #endregion
        #endregion 拖拽
    }
}
WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/01-series/AssetsCompressorSeriesMgrTreeCtrl.cs
@@ -14,7 +14,7 @@
    public partial class AssetsCompressorSeriesMgrTreeCtrl : DevExpress.XtraEditors.XtraUserControl
    {
        /// <summary>
        ///
        ///
        /// </summary>
        public AssetsCompressorSeriesMgrTreeCtrl()
        {
@@ -26,7 +26,6 @@
            this.barBtnDelete.ItemClick += BarBtnDelete_ItemClick;
            this.barBtnInfo.ItemClick += BarBtnInfo_ItemClick;
        }
        /// <summary>
        /// 聚焦改变事件
@@ -89,7 +88,10 @@
        private void treeList1_FocusedNodeChanged(object sender, DevExpress.XtraTreeList.FocusedNodeChangedEventArgs e)
        {
            var vm = this.treeList1.GetDataRecordByNode(e.Node) as AssetsCompressorSeriesMgrViewModel;
            this.FocusedChangedEvent?.Invoke(vm.Vmo);
            if (vm != null)
            {
                this.FocusedChangedEvent?.Invoke(vm.Vmo);
            }
        }
        //刷新
@@ -108,6 +110,7 @@
            _calcHitInfo = this.treeList1.CalcHitInfo(e.Location);
            this.popupMenu1.ShowPopup(MousePosition);
        }
        private TreeListHitInfo _calcHitInfo = null;
        //右键菜单弹出前验证
@@ -400,8 +403,6 @@
            be.Properties.AllowDrag = allowDrag;
        }
        #endregion
        #endregion 拖拽
    }
}
WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/01-series/AssetsCoolingSeriesMgrTreeCtrl.cs
@@ -14,7 +14,7 @@
    public partial class AssetsCoolingSeriesMgrTreeCtrl : DevExpress.XtraEditors.XtraUserControl
    {
        /// <summary>
        ///
        ///
        /// </summary>
        public AssetsCoolingSeriesMgrTreeCtrl()
        {
@@ -26,7 +26,6 @@
            this.barBtnDelete.ItemClick += BarBtnDelete_ItemClick;
            this.barBtnInfo.ItemClick += BarBtnInfo_ItemClick;
        }
        /// <summary>
        /// 聚焦改变事件
@@ -89,7 +88,10 @@
        private void treeList1_FocusedNodeChanged(object sender, DevExpress.XtraTreeList.FocusedNodeChangedEventArgs e)
        {
            var vm = this.treeList1.GetDataRecordByNode(e.Node) as AssetsCoolingSeriesMgrViewModel;
            this.FocusedChangedEvent?.Invoke(vm.Vmo);
            if (vm != null)
            {
                this.FocusedChangedEvent?.Invoke(vm.Vmo);
            }
        }
        //刷新
@@ -108,6 +110,7 @@
            _calcHitInfo = this.treeList1.CalcHitInfo(e.Location);
            this.popupMenu1.ShowPopup(MousePosition);
        }
        private TreeListHitInfo _calcHitInfo = null;
        //右键菜单弹出前验证
@@ -400,8 +403,6 @@
            be.Properties.AllowDrag = allowDrag;
        }
        #endregion
        #endregion 拖拽
    }
}