Sic-Software
/
Sic06
Archived
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修正Recipe相关控件和对象的命名空间。

This commit is contained in:
DESKTOP-GPE37UV\THINKAPD 2023-03-30 15:12:20 +08:00
parent ef9d21f559
commit 94a3f565cf
67 changed files with 108 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
FrameworkLocal/UIClient/CenterViews/Editors/Recipe/PopSettingDialogViewModel.cs
View File

@ -3,6 +3,7 @@ using RecipeEditorLib.RecipeModel.Params;
using System.Collections.ObjectModel;
using System.Windows;
using System.Windows.Controls;
using MECF.Framework.UI.Client.RecipeEditorLib.RecipeModel.Params;
namespace MECF.Framework.UI.Client.CenterViews.Editors.Recipe
{

2
FrameworkLocal/UIClient/CenterViews/Editors/Recipe/RecipeEditorView.xaml
View File

@ -4,11 +4,11 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="clr-namespace:OpenSEMI.Ctrlib.Controls"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:dgExtension="clr-namespace:RecipeEditorLib.DGExtension"
xmlns:editors="clr-namespace:MECF.Framework.UI.Client.CenterViews.Editors"
xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:micro="clr-namespace:Caliburn.Micro"
xmlns:dgExtension="clr-namespace:MECF.Framework.UI.Client.RecipeEditorLib.DGExtension"
d:DesignHeight="900"
d:DesignWidth="1500"
mc:Ignorable="d">

2
FrameworkLocal/UIClient/CenterViews/Editors/Recipe/RecipeEditorView.xaml.cs
View File

@ -1,6 +1,6 @@
using OpenSEMI.Controls.Controls;
using RecipeEditorLib.DGExtension.CustomColumn;
using System.Windows.Controls;
using MECF.Framework.UI.Client.RecipeEditorLib.DGExtension.CustomColumn;
namespace MECF.Framework.UI.Client.CenterViews.Editors.Recipe
{

1
FrameworkLocal/UIClient/CenterViews/Editors/Recipe/RecipeEditorViewModel.cs
View File

@ -8,7 +8,6 @@ using MECF.Framework.UI.Client.CenterViews.Editors.Sequence;
using MECF.Framework.UI.Client.ClientBase;
using OpenSEMI.ClientBase;
using OpenSEMI.ClientBase.Command;
using RecipeEditorLib.DGExtension.CustomColumn;
using RecipeEditorLib.RecipeModel.Params;
using System;
using System.Collections.Generic;

3
FrameworkLocal/UIClient/CenterViews/Editors/Recipe/RecipeFormatBuilder.cs
View File

@ -9,7 +9,8 @@ using Aitex.Core.RT.Log;
using MECF.Framework.UI.Client.CenterViews.Configs.Roles;
using MECF.Framework.UI.Client.CenterViews.Configs.SystemConfig;
using MECF.Framework.UI.Client.ClientBase;
using RecipeEditorLib.DGExtension.CustomColumn;
using MECF.Framework.UI.Client.RecipeEditorLib.DGExtension.CustomColumn;
using MECF.Framework.UI.Client.RecipeEditorLib.RecipeModel.Params;
using RecipeEditorLib.RecipeModel.Params;
using Sicentury.Core;

3
FrameworkLocal/UIClient/CenterViews/Editors/RecipeConfig/RecipeConfigViewModel.cs
View File

@ -14,10 +14,11 @@ using MECF.Framework.Common.DataCenter;
using MECF.Framework.UI.Client.CenterViews.Editors.Recipe;
using MECF.Framework.UI.Client.CenterViews.Editors.Sequence;
using MECF.Framework.UI.Client.ClientBase;
using MECF.Framework.UI.Client.RecipeEditorLib.DGExtension.CustomColumn;
using MECF.Framework.UI.Client.RecipeEditorLib.RecipeModel;
using MECF.Framework.UI.Client.RecipeEditorLib.RecipeModel.Params;
using OpenSEMI.ClientBase;
using OpenSEMI.ClientBase.Command;
using RecipeEditorLib.DGExtension.CustomColumn;
using RecipeEditorLib.RecipeModel.Params;
using SciChart.Core.Extensions;

2
FrameworkLocal/UIClient/CenterViews/Editors/Sequence/SequenceColumnBuilder.cs
View File

@ -4,7 +4,7 @@ using System.Windows;
using System.Windows.Controls;
using System.Xml;
using MECF.Framework.Common.RecipeCenter;
using RecipeEditorLib.DGExtension.CustomColumn;
using MECF.Framework.UI.Client.RecipeEditorLib.DGExtension.CustomColumn;
namespace MECF.Framework.UI.Client.CenterViews.Editors.Sequence
{

3
FrameworkLocal/UIClient/CenterViews/Editors/Sequence/SequenceData.cs
View File

@ -4,7 +4,8 @@ using System.Collections.ObjectModel;
using System.Text;
using System.Xml;
using Caliburn.Micro.Core;
using RecipeEditorLib.DGExtension.CustomColumn;
using MECF.Framework.UI.Client.RecipeEditorLib.DGExtension.CustomColumn;
using MECF.Framework.UI.Client.RecipeEditorLib.RecipeModel.Params;
using RecipeEditorLib.RecipeModel.Params;
namespace MECF.Framework.UI.Client.CenterViews.Editors.Sequence

2
FrameworkLocal/UIClient/CenterViews/Editors/Sequence/SequenceDataProvider.cs
View File

@ -4,8 +4,8 @@ using System.Linq;
using System.Xml;
using MECF.Framework.Common.Equipment;
using MECF.Framework.Common.RecipeCenter;
using MECF.Framework.UI.Client.RecipeEditorLib.DGExtension.CustomColumn;
using OpenSEMI.ClientBase.ServiceProvider;
using RecipeEditorLib.DGExtension.CustomColumn;
namespace MECF.Framework.UI.Client.CenterViews.Editors.Sequence
{

2
FrameworkLocal/UIClient/CenterViews/Editors/Sequence/SequenceView.xaml
View File

@ -4,11 +4,11 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="clr-namespace:OpenSEMI.Ctrlib.Controls"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:dgExtension="clr-namespace:RecipeEditorLib.DGExtension"
xmlns:editors="clr-namespace:MECF.Framework.UI.Client.CenterViews.Editors"
xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:micro="clr-namespace:Caliburn.Micro"
xmlns:dgExtension="clr-namespace:MECF.Framework.UI.Client.RecipeEditorLib.DGExtension"
d:DesignHeight="450"
d:DesignWidth="1900"
mc:Ignorable="d">

3
FrameworkLocal/UIClient/CenterViews/Editors/Sequence/SequenceViewModel.cs
View File

@ -11,9 +11,10 @@ using Caliburn.Micro;
using Caliburn.Micro.Core;
using MECF.Framework.Common.RecipeCenter;
using MECF.Framework.UI.Client.ClientBase;
using MECF.Framework.UI.Client.RecipeEditorLib.DGExtension.CustomColumn;
using MECF.Framework.UI.Client.RecipeEditorLib.RecipeModel.Params;
using OpenSEMI.ClientBase;
using OpenSEMI.ClientBase.Command;
using RecipeEditorLib.DGExtension.CustomColumn;
using RecipeEditorLib.RecipeModel.Params;
namespace MECF.Framework.UI.Client.CenterViews.Editors.Sequence

8
FrameworkLocal/UIClient/RecipeEditorLib/DGExtension/CustomColumn/CheckBoxColumn.cs
View File

@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace RecipeEditorLib.DGExtension.CustomColumn
namespace MECF.Framework.UI.Client.RecipeEditorLib.DGExtension.CustomColumn
{
public class CheckBoxColumn : EditorDataGridTemplateColumnBase
{

9
FrameworkLocal/UIClient/RecipeEditorLib/DGExtension/CustomColumn/ComboxColumn.cs
View File

@ -1,11 +1,6 @@
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Collections.ObjectModel;
namespace RecipeEditorLib.DGExtension.CustomColumn
namespace MECF.Framework.UI.Client.RecipeEditorLib.DGExtension.CustomColumn
{
public class ComboxColumn : EditorDataGridTemplateColumnBase
{

8
FrameworkLocal/UIClient/RecipeEditorLib/DGExtension/CustomColumn/DoubleColumn.cs
View File

@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace RecipeEditorLib.DGExtension.CustomColumn
namespace MECF.Framework.UI.Client.RecipeEditorLib.DGExtension.CustomColumn
{
public class DoubleColumn : EditorDataGridTemplateColumnBase
{

4
FrameworkLocal/UIClient/RecipeEditorLib/DGExtension/CustomColumn/EditorDataGridTemplateColumnBase.cs
View File

@ -1,9 +1,9 @@
using System;
using System.Windows;
using MECF.Framework.UI.Client.ClientBase;
using RecipeEditorLib.RecipeModel.Params;
using MECF.Framework.UI.Client.RecipeEditorLib.RecipeModel.Params;
namespace RecipeEditorLib.DGExtension.CustomColumn
namespace MECF.Framework.UI.Client.RecipeEditorLib.DGExtension.CustomColumn
{
public class EditorDataGridTemplateColumnBase: ExtendedGrid.Microsoft.Windows.Controls.DataGridTemplateColumn
{

2
FrameworkLocal/UIClient/RecipeEditorLib/DGExtension/CustomColumn/ExpanderColumn.cs
View File

@ -1,7 +1,7 @@
using System.Collections.Generic;
using System.Windows;
namespace RecipeEditorLib.DGExtension.CustomColumn
namespace MECF.Framework.UI.Client.RecipeEditorLib.DGExtension.CustomColumn
{
public class ExpanderColumn : EditorDataGridTemplateColumnBase
{

2
FrameworkLocal/UIClient/RecipeEditorLib/DGExtension/CustomColumn/FlowModeColumn.cs
View File

@ -1,6 +1,6 @@
using System.Collections.ObjectModel;
namespace RecipeEditorLib.DGExtension.CustomColumn
namespace MECF.Framework.UI.Client.RecipeEditorLib.DGExtension.CustomColumn
{
public class FlowModeColumn : ComboxColumn
{

8
FrameworkLocal/UIClient/RecipeEditorLib/DGExtension/CustomColumn/IntColumn.cs
View File

@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace RecipeEditorLib.DGExtension.CustomColumn
namespace MECF.Framework.UI.Client.RecipeEditorLib.DGExtension.CustomColumn
{
public class IntColumn : EditorDataGridTemplateColumnBase
{

9
FrameworkLocal/UIClient/RecipeEditorLib/DGExtension/CustomColumn/LoopComboxColumn.cs
View File

@ -1,11 +1,6 @@
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Collections.ObjectModel;
namespace RecipeEditorLib.DGExtension.CustomColumn
namespace MECF.Framework.UI.Client.RecipeEditorLib.DGExtension.CustomColumn
{
public class LoopComboxColumn : EditorDataGridTemplateColumnBase
{

11
FrameworkLocal/UIClient/RecipeEditorLib/DGExtension/CustomColumn/MultipleSelectColumn.cs
View File

@ -1,12 +1,9 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using RecipeEditorLib.RecipeModel.Params;
using System.Linq;
using MECF.Framework.UI.Client.RecipeEditorLib.RecipeModel.Params;
namespace RecipeEditorLib.DGExtension.CustomColumn
namespace MECF.Framework.UI.Client.RecipeEditorLib.DGExtension.CustomColumn
{
public class MultipleSelectColumn : EditorDataGridTemplateColumnBase
{

8
FrameworkLocal/UIClient/RecipeEditorLib/DGExtension/CustomColumn/NumColumn.cs
View File

@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace RecipeEditorLib.DGExtension.CustomColumn
namespace MECF.Framework.UI.Client.RecipeEditorLib.DGExtension.CustomColumn
{
public class NumColumn : EditorDataGridTemplateColumnBase
{

8
FrameworkLocal/UIClient/RecipeEditorLib/DGExtension/CustomColumn/PopSettingColumn.cs
View File

@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace RecipeEditorLib.DGExtension.CustomColumn
namespace MECF.Framework.UI.Client.RecipeEditorLib.DGExtension.CustomColumn
{
public class PopSettingColumn : EditorDataGridTemplateColumnBase
{

9
FrameworkLocal/UIClient/RecipeEditorLib/DGExtension/CustomColumn/PositionColumn.cs
View File

@ -1,11 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Collections.ObjectModel;
using System.Collections.ObjectModel;
namespace RecipeEditorLib.DGExtension.CustomColumn
namespace MECF.Framework.UI.Client.RecipeEditorLib.DGExtension.CustomColumn
{
public class PositionColumn : EditorDataGridTemplateColumnBase
{

2
FrameworkLocal/UIClient/RecipeEditorLib/DGExtension/CustomColumn/RatioColumn.cs
View File

@ -1,4 +1,4 @@
namespace RecipeEditorLib.DGExtension.CustomColumn
namespace MECF.Framework.UI.Client.RecipeEditorLib.DGExtension.CustomColumn
{
/// <summary>
/// 比例输入列。

8
FrameworkLocal/UIClient/RecipeEditorLib/DGExtension/CustomColumn/RecipeSelectColumn.cs
View File

@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace RecipeEditorLib.DGExtension.CustomColumn
namespace MECF.Framework.UI.Client.RecipeEditorLib.DGExtension.CustomColumn
{
public class RecipeSelectColumn : EditorDataGridTemplateColumnBase
{

8
FrameworkLocal/UIClient/RecipeEditorLib/DGExtension/CustomColumn/StepColumn.cs
View File

@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace RecipeEditorLib.DGExtension.CustomColumn
namespace MECF.Framework.UI.Client.RecipeEditorLib.DGExtension.CustomColumn
{
public class StepColumn : EditorDataGridTemplateColumnBase
{

8
FrameworkLocal/UIClient/RecipeEditorLib/DGExtension/CustomColumn/TextBlockColumn.cs
View File

@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace RecipeEditorLib.DGExtension.CustomColumn
namespace MECF.Framework.UI.Client.RecipeEditorLib.DGExtension.CustomColumn
{
public class TextBlockColumn : EditorDataGridTemplateColumnBase
{

8
FrameworkLocal/UIClient/RecipeEditorLib/DGExtension/CustomColumn/TextBoxColumn.cs
View File

@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace RecipeEditorLib.DGExtension.CustomColumn
namespace MECF.Framework.UI.Client.RecipeEditorLib.DGExtension.CustomColumn
{
public class TextBoxColumn : EditorDataGridTemplateColumnBase
{

8
FrameworkLocal/UIClient/RecipeEditorLib/DGExtension/CustomColumn/TuneColumn.cs
View File

@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace RecipeEditorLib.DGExtension.CustomColumn
namespace MECF.Framework.UI.Client.RecipeEditorLib.DGExtension.CustomColumn
{
public class TuneColumn : EditorDataGridTemplateColumnBase
{

8
FrameworkLocal/UIClient/RecipeEditorLib/DGExtension/CustomColumn/VatColumn.cs
View File

@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace RecipeEditorLib.DGExtension.CustomColumn
namespace MECF.Framework.UI.Client.RecipeEditorLib.DGExtension.CustomColumn
{
public class VatColumn : EditorDataGridTemplateColumnBase
{

2
FrameworkLocal/UIClient/RecipeEditorLib/DGExtension/XDataGrid.cs
View File

@ -4,7 +4,7 @@ using System.Windows;
using System.Windows.Controls;
using System.Windows.Input;
namespace RecipeEditorLib.DGExtension
namespace MECF.Framework.UI.Client.RecipeEditorLib.DGExtension
{
public class XDataGrid : ExtendedGrid.Microsoft.Windows.Controls.DataGrid
{

2
FrameworkLocal/UIClient/RecipeEditorLib/RecipeModel/Params/BoolParam.cs
View File

@ -1,4 +1,4 @@
namespace RecipeEditorLib.RecipeModel.Params
namespace MECF.Framework.UI.Client.RecipeEditorLib.RecipeModel.Params
{
public class BoolParam : ParamBaseWithGenericValue<bool>
{

5
FrameworkLocal/UIClient/RecipeEditorLib/RecipeModel/Params/ComboxParam.cs
View File

@ -1,6 +1,7 @@
using System.Collections.ObjectModel;
using RecipeEditorLib.DGExtension.CustomColumn;
namespace RecipeEditorLib.RecipeModel.Params
using MECF.Framework.UI.Client.RecipeEditorLib.DGExtension.CustomColumn;
namespace MECF.Framework.UI.Client.RecipeEditorLib.RecipeModel.Params
{
public class ComboxParam : ParamBaseWithGenericValue<string>
{

4
FrameworkLocal/UIClient/RecipeEditorLib/RecipeModel/Params/DoubleParam.cs
View File

@ -1,4 +1,6 @@
namespace RecipeEditorLib.RecipeModel.Params
using RecipeEditorLib.RecipeModel.Params;
namespace MECF.Framework.UI.Client.RecipeEditorLib.RecipeModel.Params
{
public class DoubleParam : NumParamBase<double>
{

2
FrameworkLocal/UIClient/RecipeEditorLib/RecipeModel/Params/ExpanderParam.cs
View File

@ -1,4 +1,4 @@
namespace RecipeEditorLib.RecipeModel.Params
namespace MECF.Framework.UI.Client.RecipeEditorLib.RecipeModel.Params
{
public class ExpanderParam : ParamBaseWithGenericValue<object>
{

2
FrameworkLocal/UIClient/RecipeEditorLib/RecipeModel/Params/FlowModeParam.cs
View File

@ -2,7 +2,7 @@
using System.Linq;
using System.Windows;
namespace RecipeEditorLib.RecipeModel.Params
namespace MECF.Framework.UI.Client.RecipeEditorLib.RecipeModel.Params
{
public class FlowModeParam : ComboxParam
{

3
FrameworkLocal/UIClient/RecipeEditorLib/RecipeModel/Params/IParam.cs
View File

@ -1,7 +1,8 @@
using System.Collections.Generic;
using ExtendedGrid.Microsoft.Windows.Controls;
using RecipeEditorLib.RecipeModel.Params;
namespace RecipeEditorLib.RecipeModel.Params
namespace MECF.Framework.UI.Client.RecipeEditorLib.RecipeModel.Params
{
public interface IParam
{

2
FrameworkLocal/UIClient/RecipeEditorLib/RecipeModel/Params/IntParam.cs
View File

@ -1,4 +1,4 @@
namespace RecipeEditorLib.RecipeModel.Params
namespace MECF.Framework.UI.Client.RecipeEditorLib.RecipeModel.Params
{
public class IntParam : NumParamBase<int>
{

5
FrameworkLocal/UIClient/RecipeEditorLib/RecipeModel/Params/LoopComboxParam.cs
View File

@ -1,6 +1,7 @@
using System.Collections.ObjectModel;
using RecipeEditorLib.DGExtension.CustomColumn;
namespace RecipeEditorLib.RecipeModel.Params
using MECF.Framework.UI.Client.RecipeEditorLib.DGExtension.CustomColumn;
namespace MECF.Framework.UI.Client.RecipeEditorLib.RecipeModel.Params
{
public class LoopComboxParam : ParamBaseWithGenericValue<string>
{

12
FrameworkLocal/UIClient/RecipeEditorLib/RecipeModel/Params/MultipleSelectParam.cs
View File

@ -1,13 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Collections.ObjectModel;
using System.Collections.ObjectModel;
using MECF.Framework.UI.Client.RecipeEditorLib.DGExtension.CustomColumn;
using RecipeEditorLib.DGExtension.CustomColumn;
namespace RecipeEditorLib.RecipeModel.Params
namespace MECF.Framework.UI.Client.RecipeEditorLib.RecipeModel.Params
{
public class MultipleSelectParam : Param
{

8
FrameworkLocal/UIClient/RecipeEditorLib/RecipeModel/Params/NumParam.cs
View File

@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace RecipeEditorLib.RecipeModel.Params
namespace MECF.Framework.UI.Client.RecipeEditorLib.RecipeModel.Params
{
public class NumParam : Param
{

2
FrameworkLocal/UIClient/RecipeEditorLib/RecipeModel/Params/NumParamBase.cs
View File

@ -1,6 +1,6 @@
using System.Collections.Generic;
namespace RecipeEditorLib.RecipeModel.Params
namespace MECF.Framework.UI.Client.RecipeEditorLib.RecipeModel.Params
{
public abstract class NumParamBase<TValue> : ParamBaseWithGenericValue<TValue>
{

7
FrameworkLocal/UIClient/RecipeEditorLib/RecipeModel/Params/Param.cs
View File

@ -1,10 +1,11 @@
using Caliburn.Micro.Core;
using System;
using System;
using System.Collections.Generic;
using System.Windows;
using Caliburn.Micro.Core;
using ExtendedGrid.Microsoft.Windows.Controls;
using RecipeEditorLib.RecipeModel.Params;
namespace RecipeEditorLib.RecipeModel.Params
namespace MECF.Framework.UI.Client.RecipeEditorLib.RecipeModel.Params
{
public abstract class Param : PropertyChangedBase, IParam
{

2
FrameworkLocal/UIClient/RecipeEditorLib/RecipeModel/Params/ParamBaseWithGenericValue.cs
View File

@ -1,7 +1,7 @@
using System.Collections.Generic;
using System.ComponentModel;
namespace RecipeEditorLib.RecipeModel.Params
namespace MECF.Framework.UI.Client.RecipeEditorLib.RecipeModel.Params
{
public abstract class ParamBaseWithGenericValue<TValue> : Param
{

2
FrameworkLocal/UIClient/RecipeEditorLib/RecipeModel/Params/PathFileParam.cs
View File

@ -1,6 +1,6 @@
using System;
namespace RecipeEditorLib.RecipeModel.Params
namespace MECF.Framework.UI.Client.RecipeEditorLib.RecipeModel.Params
{
public class PathFileParam : ParamBaseWithGenericValue<string>
{

2
FrameworkLocal/UIClient/RecipeEditorLib/RecipeModel/Params/PopSettingParam.cs
View File

@ -1,4 +1,4 @@
namespace RecipeEditorLib.RecipeModel.Params
namespace MECF.Framework.UI.Client.RecipeEditorLib.RecipeModel.Params
{
public class PopSettingParam : ParamBaseWithGenericValue<string>
{

8
FrameworkLocal/UIClient/RecipeEditorLib/RecipeModel/Params/PositionParam.cs
View File

@ -1,12 +1,10 @@
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using System.Windows;
using MECF.Framework.UI.Client.RecipeEditorLib.DGExtension.CustomColumn;
using System.Collections.ObjectModel;
using RecipeEditorLib.DGExtension.CustomColumn;
namespace RecipeEditorLib.RecipeModel.Params
namespace MECF.Framework.UI.Client.RecipeEditorLib.RecipeModel.Params
{
public class PositionParam : ParamBaseWithGenericValue<string>
{

4
FrameworkLocal/UIClient/RecipeEditorLib/RecipeModel/Params/Sets3RatioParam.cs
View File

@ -1,6 +1,4 @@
using System.Text.RegularExpressions;
namespace RecipeEditorLib.RecipeModel.Params
namespace MECF.Framework.UI.Client.RecipeEditorLib.RecipeModel.Params
{
public class Sets3RatioParam : ParamBaseWithGenericValue<string>
{

2
FrameworkLocal/UIClient/RecipeEditorLib/RecipeModel/Params/StepParam.cs
View File

@ -1,4 +1,4 @@
namespace RecipeEditorLib.RecipeModel.Params
namespace MECF.Framework.UI.Client.RecipeEditorLib.RecipeModel.Params
{
public class StepParam : ParamBaseWithGenericValue<int>
{

4
FrameworkLocal/UIClient/RecipeEditorLib/RecipeModel/Params/StringParam.cs
View File

@ -1,4 +1,6 @@
namespace RecipeEditorLib.RecipeModel.Params
using RecipeEditorLib.RecipeModel.Params;
namespace MECF.Framework.UI.Client.RecipeEditorLib.RecipeModel.Params
{
public class StringParam : ParamBaseWithGenericValue<string>
{

4
FrameworkLocal/UIClient/RecipeEditorLib/RecipeModel/RecipeData.cs
View File

@ -12,7 +12,8 @@ using Aitex.Core.RT.Log;
using Caliburn.Micro.Core;
using MECF.Framework.UI.Client.CenterViews.Configs.Roles;
using MECF.Framework.UI.Client.ClientBase;
using RecipeEditorLib.DGExtension.CustomColumn;
using MECF.Framework.UI.Client.RecipeEditorLib.DGExtension.CustomColumn;
using MECF.Framework.UI.Client.RecipeEditorLib.RecipeModel.Params;
using RecipeEditorLib.RecipeModel.Params;
using Sicentury.Core;
@ -357,7 +358,6 @@ namespace MECF.Framework.UI.Client.RecipeEditorLib.RecipeModel
/// <param name="previousRecipeStep">前序Recipe步骤</param>
/// /// <param name="stepPermission">权限</param>
/// <param name="stepId"></param>
/// <param name="isHideValue">创建Step后是否直接隐藏参数值。</param>
/// <returns></returns>
public RecipeStep CreateStep(ObservableCollection<EditorDataGridTemplateColumnBase> columns,
XmlNode stepNode = null, RecipeStep previousRecipeStep = null,

1
FrameworkLocal/UIClient/RecipeEditorLib/RecipeModel/RecipeStep.cs
View File

@ -2,6 +2,7 @@
using System.Collections.ObjectModel;
using System.ComponentModel;
using System.Linq;
using MECF.Framework.UI.Client.RecipeEditorLib.RecipeModel.Params;
using SciChart.Core.Extensions;
namespace RecipeEditorLib.RecipeModel.Params

1
FrameworkLocal/UIClient/RecipeEditorLib/RecipeModel/RecipeStepCollection.cs
View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.ComponentModel;
using System.Linq;
using MECF.Framework.UI.Client.RecipeEditorLib.RecipeModel.Params;
namespace RecipeEditorLib.RecipeModel.Params
{

1
FrameworkLocal/UIClient/RecipeEditorLib/RecipeModel/RecipeStepValidationInfo.cs
View File

@ -1,5 +1,6 @@

using MECF.Framework.UI.Client.CenterViews.Configs.Roles;
using MECF.Framework.UI.Client.RecipeEditorLib.RecipeModel.Params;
namespace RecipeEditorLib.RecipeModel.Params
{

5
Sic06.sln
View File

@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.31729.503
# Visual Studio Version 17
VisualStudioVersion = 17.5.33502.453
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SicRT", "SicRT\SicRT.csproj", "{5EAFA05F-C2C0-40B3-9C8F-46D8559148D0}"
ProjectSection(ProjectDependencies) = postProject
@ -150,7 +150,6 @@ Global
{A40B734C-F2EC-453C-A5FB-70CD46452BF1}.Release|x86.ActiveCfg = Release|Any CPU
{A40B734C-F2EC-453C-A5FB-70CD46452BF1}.Release|x86.Build.0 = Release|Any CPU
{C842F167-DB8E-4827-ACDD-74215AF5100A}.Debug|Any CPU.ActiveCfg = Debug|x86
{C842F167-DB8E-4827-ACDD-74215AF5100A}.Debug|Any CPU.Build.0 = Debug|x86
{C842F167-DB8E-4827-ACDD-74215AF5100A}.Debug|x86.ActiveCfg = Debug|x86
{C842F167-DB8E-4827-ACDD-74215AF5100A}.Debug|x86.Build.0 = Debug|x86
{C842F167-DB8E-4827-ACDD-74215AF5100A}.Release|Any CPU.ActiveCfg = Release|x86

10
SicUI/Models/PMs/PMCommMonitorView.xaml
View File

@ -5,17 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
xmlns:cal="http://www.caliburn.org"
xmlns:ctrl="http://OpenSEMI.Ctrlib.com/presentation"
xmlns:deviceControl="clr-namespace:Aitex.Core.UI.DeviceControl;assembly=MECF.Framework.UI.Core"
xmlns:control="clr-namespace:Aitex.Core.UI.Control;assembly=MECF.Framework.UI.Core"
xmlns:converters="clr-namespace:Aitex.Core.UI.Converters;assembly=MECF.Framework.UI.Core"
xmlns:controls="clr-namespace:SicUI.Controls"
xmlns:view="clr-namespace:SicUI.Models.PMs"
xmlns:controls1="clr-namespace:OpenSEMI.Ctrlib.Controls;assembly=MECF.Framework.UI.Client"
xmlns:dgExtension="clr-namespace:RecipeEditorLib.DGExtension;assembly=MECF.Framework.UI.Client"
xmlns:editors="clr-namespace:MECF.Framework.UI.Client.CenterViews.Editors;assembly=MECF.Framework.UI.Client"
xmlns:micro="clr-namespace:Caliburn.Micro;assembly=MECF.Framework.UI.Client"
xmlns:OpenSEMI="http://OpenSEMI.Ctrlib.com/presentation"
mc:Ignorable="d"
d:DesignHeight="880" d:DesignWidth="1920" Background="#91b0cd">

1
SicUI/Models/PMs/PMCommMonitorViewModel.cs
View File

@ -7,7 +7,6 @@ using MECF.Framework.Common.OperationCenter;
using MECF.Framework.UI.Client.CenterViews.Editors.Recipe;
using MECF.Framework.UI.Client.CenterViews.Editors.Sequence;
using MECF.Framework.UI.Client.ClientBase;
using RecipeEditorLib.DGExtension.CustomColumn;
using RecipeEditorLib.RecipeModel.Params;
using System;
using System.Collections.Generic;

9
SicUI/Models/PMs/PMHeaterView.xaml
View File

@ -4,19 +4,10 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:OpenSEMI="http://OpenSEMI.Ctrlib.com/presentation"
xmlns:cal="http://www.caliburn.org"
xmlns:control="clr-namespace:Aitex.Core.UI.Control;assembly=MECF.Framework.UI.Core"
xmlns:controls="clr-namespace:SicUI.Controls"
xmlns:controls1="clr-namespace:OpenSEMI.Ctrlib.Controls;assembly=MECF.Framework.UI.Client"
xmlns:converters="clr-namespace:Aitex.Core.UI.Converters;assembly=MECF.Framework.UI.Core"
xmlns:ctrl="http://OpenSEMI.Ctrlib.com/presentation"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:deviceControl="clr-namespace:Aitex.Core.UI.DeviceControl;assembly=MECF.Framework.UI.Core"
xmlns:dgExtension="clr-namespace:RecipeEditorLib.DGExtension;assembly=MECF.Framework.UI.Client"
xmlns:editors="clr-namespace:MECF.Framework.UI.Client.CenterViews.Editors;assembly=MECF.Framework.UI.Client"
xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:micro="clr-namespace:Caliburn.Micro;assembly=MECF.Framework.UI.Client"
xmlns:view="clr-namespace:SicUI.Models.PMs"
d:DesignHeight="880"
d:DesignWidth="1920"
Background="#91b0cd"

1
SicUI/Models/PMs/PMHeaterViewModel.cs
View File

@ -6,7 +6,6 @@ using MECF.Framework.Common.OperationCenter;
using MECF.Framework.UI.Client.CenterViews.Editors.Recipe;
using MECF.Framework.UI.Client.CenterViews.Editors.Sequence;
using MECF.Framework.UI.Client.ClientBase;
using RecipeEditorLib.DGExtension.CustomColumn;
using RecipeEditorLib.RecipeModel.Params;
using System;
using System.Collections.Generic;

1
SicUI/Models/PMs/PMMfcDynamicFlowViewModel.cs
View File

@ -7,7 +7,6 @@ using MECF.Framework.Common.OperationCenter;
using MECF.Framework.UI.Client.CenterViews.Editors.Recipe;
using MECF.Framework.UI.Client.CenterViews.Editors.Sequence;
using MECF.Framework.UI.Client.ClientBase;
using RecipeEditorLib.DGExtension.CustomColumn;
using RecipeEditorLib.RecipeModel.Params;
using System;
using System.Collections.Generic;

13
SicUI/Models/PMs/PMProcessView.xaml
View File

@ -4,19 +4,16 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:cal="http://www.caliburn.org"
xmlns:control="clr-namespace:Aitex.Core.UI.Control;assembly=MECF.Framework.UI.Core"
xmlns:controls="clr-namespace:SicUI.Controls"
xmlns:controls1="clr-namespace:OpenSEMI.Ctrlib.Controls;assembly=MECF.Framework.UI.Client"
xmlns:converter="clr-namespace:SicUI.Converter"
xmlns:ctrl="http://OpenSEMI.Ctrlib.com/presentation"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:deviceControl="clr-namespace:Aitex.Core.UI.DeviceControl;assembly=MECF.Framework.UI.Core"
xmlns:dgExtension="clr-namespace:RecipeEditorLib.DGExtension;assembly=MECF.Framework.UI.Client"
xmlns:editors="clr-namespace:MECF.Framework.UI.Client.CenterViews.Editors;assembly=MECF.Framework.UI.Client"
xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:micro="clr-namespace:Caliburn.Micro;assembly=MECF.Framework.UI.Client"
xmlns:recipeEditors="clr-namespace:SicUI.Models.RecipeEditors"
xmlns:view="clr-namespace:SicUI.Models.PMs"
xmlns:dgExtension1="clr-namespace:MECF.Framework.UI.Client.RecipeEditorLib.DGExtension;assembly=MECF.Framework.UI.Client"
d:DesignHeight="750"
d:DesignWidth="1920"
Background="#91b0cd"
@ -2303,7 +2300,7 @@
<Grid.RowDefinitions>
<RowDefinition />
</Grid.RowDefinitions>
<dgExtension:XDataGrid
<dgExtension1:XDataGrid
x:Name="dgCustom"
Grid.ColumnSpan="2"
Margin="0,0,15,15"
@ -2328,13 +2325,13 @@
VirtualizingPanel.IsVirtualizing="True"
VirtualizingPanel.VirtualizationMode="Recycling">
<dgExtension:XDataGrid.LayoutTransform>
<dgExtension1:XDataGrid.LayoutTransform>
<TransformGroup>
<RotateTransform Angle="-90" />
<ScaleTransform ScaleX="1" ScaleY="-1" />
</TransformGroup>
</dgExtension:XDataGrid.LayoutTransform>
</dgExtension:XDataGrid>
</dgExtension1:XDataGrid.LayoutTransform>
</dgExtension1:XDataGrid>
</Grid>
</TabItem>
</TabControl>

3
SicUI/Models/PMs/PMProcessViewModel.cs
View File

@ -11,14 +11,15 @@ using MECF.Framework.UI.Client.CenterViews.Editors.Sequence;
using MECF.Framework.UI.Client.CenterViews.Editors.Recipe;
using MECF.Framework.UI.Client.ClientBase;
using System.Windows;
using RecipeEditorLib.DGExtension.CustomColumn;
using RecipeEditorLib.RecipeModel.Params;
using System.Windows.Controls;
using Caliburn.Micro.Core;
using System.Windows.Media;
using SicUI.Client;
using System.Windows.Threading;
using MECF.Framework.UI.Client.RecipeEditorLib.DGExtension.CustomColumn;
using MECF.Framework.UI.Client.RecipeEditorLib.RecipeModel;
using MECF.Framework.UI.Client.RecipeEditorLib.RecipeModel.Params;
using SicUI.Controls;
namespace SicUI.Models.PMs

1
SicUI/Models/RecipeEditors/Converters/ParamToCellTooltipConverter.cs
View File

@ -1,6 +1,7 @@
using System;
using System.Globalization;
using System.Windows.Data;
using MECF.Framework.UI.Client.RecipeEditorLib.RecipeModel.Params;
using RecipeEditorLib.RecipeModel.Params;
namespace SicUI.Models.RecipeEditors

1
SicUI/Models/RecipeEditors/Converters/StepNoToCxtMenuTitleConverter.cs
View File

@ -1,6 +1,7 @@
using System;
using System.Globalization;
using System.Windows.Data;
using MECF.Framework.UI.Client.RecipeEditorLib.RecipeModel.Params;
using RecipeEditorLib.RecipeModel.Params;
namespace SicUI.Models.RecipeEditors

18
SicUI/Models/RecipeEditors/RecipeEditorView.xaml
View File

@ -4,7 +4,6 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="clr-namespace:OpenSEMI.Ctrlib.Controls;assembly=MECF.Framework.UI.Client"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:dgExtension="clr-namespace:RecipeEditorLib.DGExtension;assembly=MECF.Framework.UI.Client"
xmlns:editors="clr-namespace:MECF.Framework.UI.Client.CenterViews.Editors;assembly=MECF.Framework.UI.Client"
xmlns:egc="clr-namespace:ExtendedGrid.Microsoft.Windows.Controls;assembly=MECF.Framework.UI.Client"
xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
@ -13,6 +12,7 @@
xmlns:recipeEditors="clr-namespace:SicUI.Models.RecipeEditors"
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
xmlns:dgExtension1="clr-namespace:MECF.Framework.UI.Client.RecipeEditorLib.DGExtension;assembly=MECF.Framework.UI.Client"
d:DesignHeight="900"
d:DesignWidth="1500"
mc:Ignorable="d">
@ -1465,7 +1465,7 @@
<recipeEditors:RecipeStepsCollectionToSelectedItemsConverter x:Key="RecipeStepsCollectionToSelectedItemsConverter" />
</Border.Resources>
<dgExtension:XDataGrid
<dgExtension1:XDataGrid
x:Name="dgCustom"
Width="{Binding ElementName=dgContainer, Path=Height}"
Height="{Binding ElementName=dgContainer, Path=Width}"
@ -1492,17 +1492,17 @@
VerticalScrollBarVisibility="Auto"
VirtualizingPanel.IsVirtualizing="True"
VirtualizingPanel.VirtualizationMode="Recycling">
<dgExtension:XDataGrid.Resources>
<dgExtension1:XDataGrid.Resources>
<recipeEditors:IsDgSelectionCountEqualsOneConverter x:Key="DgSelectionCountEqualsOneConverter" />
<recipeEditors:StepNoToCxtMenuTitleConverter x:Key="StepNoToCxtMenuTitleConverter" />
</dgExtension:XDataGrid.Resources>
<dgExtension:XDataGrid.LayoutTransform>
</dgExtension1:XDataGrid.Resources>
<dgExtension1:XDataGrid.LayoutTransform>
<TransformGroup>
<RotateTransform Angle="-90" />
<ScaleTransform ScaleX="1" ScaleY="-1" />
</TransformGroup>
</dgExtension:XDataGrid.LayoutTransform>
<dgExtension:XDataGrid.RowStyle>
</dgExtension1:XDataGrid.LayoutTransform>
<dgExtension1:XDataGrid.RowStyle>
<Style TargetType="{x:Type egc:DataGridRow}">
<Setter Property="Tag" Value="{Binding DataContext, RelativeSource={RelativeSource FindAncestor, AncestorType=UserControl}}" />
<Setter Property="ContextMenu">
@ -1673,8 +1673,8 @@
</Setter.Value>
</Setter>
</Style>
</dgExtension:XDataGrid.RowStyle>
</dgExtension:XDataGrid>
</dgExtension1:XDataGrid.RowStyle>
</dgExtension1:XDataGrid>
</Border>
</Grid>
</TabItem>

7
SicUI/Models/RecipeEditors/RecipeEditorView.xaml.cs
View File

@ -1,7 +1,8 @@
using System.Linq;
using System.Windows;
using MECF.Framework.UI.Client.RecipeEditorLib.DGExtension.CustomColumn;
using MECF.Framework.UI.Client.RecipeEditorLib.RecipeModel.Params;
using OpenSEMI.Controls.Controls;
using RecipeEditorLib.DGExtension.CustomColumn;
using RecipeEditorLib.RecipeModel.Params;
using DataGridRowEventArgs = ExtendedGrid.Microsoft.Windows.Controls.DataGridRowEventArgs;
using ExDataGridRow = ExtendedGrid.Microsoft.Windows.Controls.DataGridRow;
@ -32,7 +33,7 @@ namespace SicUI.Models.RecipeEditors
_PreColumn.IsColumnSelected = false;
foreach (var item in datagrid.Items)
{
var list = item as System.Collections.ObjectModel.ObservableCollection<RecipeEditorLib.RecipeModel.Params.Param>;
var list = item as System.Collections.ObjectModel.ObservableCollection<Param>;
if (list == null) continue;
foreach (var p in list)
{
@ -45,7 +46,7 @@ namespace SicUI.Models.RecipeEditors
//var jj = datagrid.Items as System.Collections.ObjectModel.ObservableCollection<RecipeEditorLib.RecipeModel.Params.Param>;
foreach (var item in datagrid.Items)
{
var list = item as System.Collections.ObjectModel.ObservableCollection<RecipeEditorLib.RecipeModel.Params.Param>;
var list = item as System.Collections.ObjectModel.ObservableCollection<Param>;
if (list == null) continue;
foreach (var p in list)
{

5
SicUI/Models/RecipeEditors/RecipeEditorViewModel.cs
View File

@ -9,7 +9,6 @@ using MECF.Framework.UI.Client.CenterViews.Editors.Sequence;
using MECF.Framework.UI.Client.ClientBase;
using OpenSEMI.ClientBase;
using OpenSEMI.ClientBase.Command;
using RecipeEditorLib.DGExtension.CustomColumn;
using RecipeEditorLib.RecipeModel.Params;
using System;
using System.Collections.Generic;
@ -27,12 +26,14 @@ using System.Windows.Threading;
using Aitex.Core.Util;
using MECF.Framework.Common.OperationCenter;
using MECF.Framework.UI.Client.CenterViews.Configs.Roles;
using MECF.Framework.UI.Client.RecipeEditorLib.DGExtension;
using MECF.Framework.UI.Client.RecipeEditorLib.DGExtension.CustomColumn;
using MECF.Framework.UI.Client.RecipeEditorLib.RecipeModel;
using MECF.Framework.UI.Client.RecipeEditorLib.RecipeModel.Params;
using Sicentury.Core;
using Action = System.Action;
using DataGridCellEditEndingEventArgs = ExtendedGrid.Microsoft.Windows.Controls.DataGridCellEditEndingEventArgs;
using DataGridRowEventArgs = ExtendedGrid.Microsoft.Windows.Controls.DataGridRowEventArgs;
using RecipeEditorLib.DGExtension;
using Sicentury.Core.Collections;
namespace SicUI.Models.RecipeEditors