Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
V
VIZ.Package
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
刘龙飞
VIZ.Package
Commits
eb4161eb
Commit
eb4161eb
authored
Jun 14, 2023
by
wangonghui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
咪咕现场问题修改
parent
2bd1108b
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
29 additions
and
5 deletions
+29
-5
VIZ.Package.Module/Control/Controller/ControlController.cs
+10
-4
VIZ.Package.Module/ControlObject/FieldTree/ViewModel/FieldTreeViewModel.cs
+9
-0
VIZ.Package.Module/Preview/VizPreview/ViewModel/VizPreviewViewModel.cs
+5
-0
VIZ.Package.Service/Viz/VizCommandControlObjectService.cs
+5
-1
No files found.
VIZ.Package.Module/Control/Controller/ControlController.cs
View file @
eb4161eb
...
...
@@ -47,15 +47,19 @@ namespace VIZ.Package.Module
this
.
vizCommandService
.
SetEnabledUpdate
(
conn
,
false
);
try
{
// 清楚板子上的信息
this
.
vizCommandService
.
SetCue
(
conn
,
ApplicationDomainEx
.
CurrentPage
.
ScenePath
);
//调整上包装顺序
this
.
vizCommandService
.
SetObject
(
conn
,
ApplicationDomainEx
.
CurrentPage
.
ScenePath
,
ApplicationDomainEx
.
CurrentPage
.
Layer
);
if
(
obj
!=
null
)
{
this
.
vizCommandControlObjectService
.
SetControlObject
(
conn
,
obj
,
newPageBase
.
GetVizScene
());
this
.
vizCommandControlObjectService
.
SetCustomControlFieldValue
(
conn
,
obj
.
AllFiledNodes
);
}
// 清楚板子上的信息
this
.
vizCommandService
.
SetCue
(
conn
,
ApplicationDomainEx
.
CurrentPage
.
ScenePath
);
this
.
vizCommandService
.
SetObject
(
conn
,
ApplicationDomainEx
.
CurrentPage
.
ScenePath
,
ApplicationDomainEx
.
CurrentPage
.
Layer
);
if
(
view
!=
null
)
{
view
.
TakIn
(
conn
);
...
...
@@ -65,8 +69,10 @@ namespace VIZ.Package.Module
{
log
.
Error
(
ex
);
}
this
.
vizCommandService
.
SetEnabledUpdate
(
conn
,
true
);
this
.
vizCommandService
.
Start
(
conn
,
ApplicationDomainEx
.
CurrentPage
.
Layer
,
ApplicationDomainEx
.
CurrentPage
.
ScenePath
);
this
.
vizCommandService
.
SetEnabledUpdate
(
conn
,
true
);
}
/// <summary>
...
...
VIZ.Package.Module/ControlObject/FieldTree/ViewModel/FieldTreeViewModel.cs
View file @
eb4161eb
...
...
@@ -60,6 +60,12 @@ namespace VIZ.Package.Module
/// </summary>
private
VizCommandControlObjectService
vizCommandControlObjectService
=
new
VizCommandControlObjectService
();
/// <summary>
/// Viz命令服务
/// </summary>
private
VizCommandService
vizCommandService
=
new
VizCommandService
();
/// <summary>
/// 控制对象服务
/// </summary>
...
...
@@ -176,6 +182,9 @@ namespace VIZ.Package.Module
// 将当前值上至预览
this
.
vizCommandControlObjectService
.
SetControlObject
(
ApplicationDomainEx
.
PreviewConn
,
this
.
ControlObject
,
ApplicationDomainEx
.
CurrentPage
.
GetVizScene
());
// this.vizCommandService.SetObject(ApplicationDomainEx.PreviewConn, msg.Page.ScenePath, msg.Page.Layer);
// 插件处理
PageModel
pageModel
=
msg
.
Page
as
PageModel
;
if
(
pageModel
==
null
||
string
.
IsNullOrWhiteSpace
(
pageModel
.
PluginID
))
...
...
VIZ.Package.Module/Preview/VizPreview/ViewModel/VizPreviewViewModel.cs
View file @
eb4161eb
...
...
@@ -592,7 +592,12 @@ namespace VIZ.Package.Module
message
.
Page
=
msg
.
Page
;
ApplicationDomainEx
.
MessageManager
.
Send
(
message
);
});
});
}
...
...
VIZ.Package.Service/Viz/VizCommandControlObjectService.cs
View file @
eb4161eb
...
...
@@ -359,7 +359,11 @@ namespace VIZ.Package.Service
public
void
SetControlObject
(
ConnModel
conn
,
ControlObjectModel
obj
,
VizScene
scene
)
{
StringBuilder
sb
=
new
StringBuilder
();
sb
.
Append
(
$"
{
scene
}
*TREE*
{
obj
.
TreeNodePath
}
*FUNCTION*ControlObject*in SET ON "
);
// sb.Append($"{scene}*TREE*{obj.TreeNodePath}*FUNCTION*ControlObject*in SET ON ");
sb
.
Append
(
$"SCENE*
{
ApplicationDomainEx
.
CurrentPage
.
ScenePath
}
*TREE*
{
obj
.
TreeNodePath
}
*FUNCTION*ControlObject*in SET ON "
);
foreach
(
ControlFieldNodeModel
field
in
obj
.
AllFiledNodes
)
{
// 自定义字段不通过该方法上板
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment