Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Z
zeroing-editor
Project
Project
Details
Activity
Releases
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
劳工
zeroing-editor
Commits
55826096
Commit
55826096
authored
Dec 05, 2019
by
rockyl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
标记当前过程
parent
fc6d9569
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
56 additions
and
17 deletions
+56
-17
en.json
src/locales/en.json
+1
-0
zh-CN.json
src/locales/zh-CN.json
+1
-0
behavior.js
src/store/modules/behavior.js
+7
-2
env.js
src/store/modules/env.js
+7
-1
behavior.scss
src/themes/light/behavior.scss
+7
-0
BehaviorEditor.vue
src/views/Editor/behavior-editor/BehaviorEditor.vue
+6
-6
MetaEditorDialog.vue
src/views/Editor/behavior-editor/MetaEditorDialog.vue
+1
-1
ProcessList.vue
src/views/Editor/behavior-editor/ProcessList.vue
+17
-1
BehaviorEditorDialog.vue
src/views/Editor/dialogs/BehaviorEditorDialog.vue
+9
-6
No files found.
src/locales/en.json
View file @
55826096
...
...
@@ -6,6 +6,7 @@
"Still Close"
:
"Still Close"
,
"Save"
:
"Save"
,
"Save And Preview"
:
"Save And Preview"
,
"Save And Close"
:
"Save And Close"
,
"Reset"
:
"Reset"
,
"Copy"
:
"Copy"
,
"Exit"
:
"Exit"
,
...
...
src/locales/zh-CN.json
View file @
55826096
...
...
@@ -6,6 +6,7 @@
"Still Close"
:
"仍然关闭"
,
"Save"
:
"保存"
,
"Save And Preview"
:
"保存并预览"
,
"Save And Close"
:
"保存并关闭"
,
"Reset"
:
"重置"
,
"Copy"
:
"复制"
,
"Exit"
:
"退出"
,
...
...
src/store/modules/behavior.js
View file @
55826096
...
...
@@ -17,6 +17,7 @@ export const behaviorStore = {
originData
:
null
,
originBehaviors
:
null
,
behaviors
:
null
,
currentProcess
:
null
,
processStack
:
[],
editable
:
false
,
...
...
@@ -96,14 +97,18 @@ export const behaviorStore = {
clearProcessStack
(
state
)
{
state
.
processStack
.
splice
(
0
);
updatePropsEditable
(
state
);
state
.
currentProcess
=
null
;
},
pushProcessStack
(
state
,
process
)
{
state
.
processStack
.
push
(
process
);
updatePropsEditable
(
state
);
state
.
currentProcess
=
process
;
console
.
log
(
state
.
currentProcess
);
},
popProcessStack
(
state
,
index
)
{
state
.
processStack
.
splice
(
index
);
updatePropsEditable
(
state
);
state
.
currentProcess
=
state
.
processStack
[
state
.
processStack
.
length
-
1
];
},
setScale
(
state
,
value
)
{
let
scale
=
state
.
drawState
.
boardScale
;
...
...
@@ -173,7 +178,7 @@ export const behaviorStore = {
addProcessMeta
(
commit
,
isInline
,
masterProcess
,
meta
);
return
meta
;
},
addProcessFromPrefab
({
commit
,
state
},
{
masterProcess
,
isInline
,
meta
:
pMeta
}){
addProcessFromPrefab
({
commit
,
state
},
{
masterProcess
,
isInline
,
meta
:
pMeta
})
{
let
meta
=
clonePureObj
(
pMeta
);
meta
.
id
=
generateUUID
();
meta
.
isInline
=
isInline
;
...
...
@@ -189,7 +194,7 @@ function updatePropsEditable(state) {
state
.
editable
=
state
.
processStack
.
filter
(
item
=>
item
.
meta
.
type
===
'builtin'
)
<=
0
;
}
function
addProcessMeta
(
commit
,
isInline
,
masterProcess
,
meta
){
function
addProcessMeta
(
commit
,
isInline
,
masterProcess
,
meta
)
{
if
(
isInline
)
{
if
(
!
masterProcess
.
meta
.
metas
)
{
Vue
.
set
(
masterProcess
.
meta
,
'metas'
,
[]);
...
...
src/store/modules/env.js
View file @
55826096
...
...
@@ -35,8 +35,14 @@ export const envStore = {
return
groupProcesses
(
state
.
processes
,
process
=>
process
.
isPrefab
);
},
builtinProcessTree
:
state
=>
{
const
tree
=
groupProcesses
(
state
.
processes
,
process
=>
!
process
.
isPrefab
);
const
builtin
=
groupProcesses
(
state
.
processes
,
process
=>
!
process
.
isPrefab
);
let
tree
=
[
{
name
:
'builtin'
,
children
:
builtin
,
}
];
const
dividerProcess
=
{
id
:
'divider'
,
name
:
i18n
.
t
(
'Divider'
),
...
...
src/themes/light/behavior.scss
View file @
55826096
...
...
@@ -36,6 +36,13 @@ $dock-pin-width: 9px;
text-overflow
:
ellipsis
;
overflow
:
hidden
;
font-size
:
14px
;
.current-node
{
background-color
:
$--color-text-secondary
;
color
:
$--color-white
;
border-radius
:
5px
;
padding
:
0
2px
;
}
}
.edit-button
{
...
...
src/views/Editor/behavior-editor/BehaviorEditor.vue
View file @
55826096
...
...
@@ -4,20 +4,20 @@
<split-panes
splitpanes-min=
"10"
:splitpanes-size=
"10"
horizontal
>
<process-list
@
edit-meta=
"onEditMeta"
@
delete-meta=
"onDeleteMeta"
:data=
"prefabProcessTree"
class=
"background full-size"
splitpanes-min=
"20"
:splitpanes-size=
"
3
0"
/>
:splitpanes-size=
"
2
0"
/>
<process-list
@
edit-meta=
"onEditMeta"
@
delete-meta=
"onDeleteMeta"
:data=
"normalProcessTree"
class=
"background full-size"
splitpanes-min=
"20"
:splitpanes-size=
"
7
0"
/>
:splitpanes-size=
"
8
0"
/>
</split-panes>
<div
class=
"center full-size background"
splitpanes-min=
"20"
:splitpanes-size=
"70"
>
<edit-path
:processStack=
"processStack"
@
pop=
"onPop"
/>
<div
class=
"operate-bar"
>
<
!--
<
el-button-group>
<
!--
<
div
class=
"operate-bar"
>
<el-button-group>
<el-button
size=
"mini"
icon=
"el-icon-zoom-out"
@
click=
"setScale(-0.1)"
/>
<el-button
size=
"mini"
@
click=
"setScale(0)"
>
1:1
</el-button>
<el-button
size=
"mini"
icon=
"el-icon-zoom-in"
@
click=
"setScale(0.1)"
/>
</el-button-group>
-->
</div>
</el-button-group>
</div>
-->
<board
ref=
"board"
@
select-process-node=
"onSelectProcessNode"
@
edit-process=
"editProcess"
@
edit-meta=
"onEditMeta"
/>
</div>
<div
class=
"properties background full-size"
splitpanes-min=
"20"
:splitpanes-size=
"20"
>
...
...
src/views/Editor/behavior-editor/MetaEditorDialog.vue
View file @
55826096
...
...
@@ -65,7 +65,7 @@
</el-button-group>
<el-button
size=
"mini"
plain
@
click=
"cancel"
>
{{$t('Cancel')}}
</el-button>
<el-button
size=
"mini"
plain
@
click=
"save(true)"
>
{{$t('Save And Preview')}}
</el-button>
<el-button
size=
"mini"
plain
@
click=
"save(false)"
>
{{$t('Save')}}
</el-button>
<el-button
size=
"mini"
type=
"primary"
plain
@
click=
"save(false)"
>
{{$t('Save')}}
</el-button>
</div>
</div>
<props-editor-dialog
ref=
"propsEditorDialog"
/>
...
...
src/views/Editor/behavior-editor/ProcessList.vue
View file @
55826096
...
...
@@ -11,7 +11,7 @@
>
<div
slot-scope=
"
{ node, data }" class="process-tree-node">
<div
class=
"node-name"
>
<span
:draggable=
"draggable(data)"
@
dragstart
.
stop=
"dragProcessStart(data, $event)"
>
{{
data
.
name
}}
</span>
<span
:
class=
"
{'current-node': isCurrentProcess(data)}" :
draggable="draggable(data)" @dragstart.stop="dragProcessStart(data, $event)">
{{
data
.
name
}}
</span>
</div>
<el-dropdown
v-if=
"nodeMenu(data)"
class=
"more-button"
size=
"mini"
trigger=
"click"
...
...
@@ -31,6 +31,8 @@
</
template
>
<
script
>
import
{
mapState
}
from
'vuex'
const
editableIds
=
[
'custom'
,
'divider'
];
export
default
{
...
...
@@ -59,6 +61,13 @@
deep
:
true
}
},
computed
:
{
...
mapState
({
currentProcess
(
state
){
return
state
.
behavior
.
currentProcess
;
}
}),
},
methods
:
{
updateFilter
(){
if
(
this
.
$refs
.
tree
){
...
...
@@ -99,6 +108,13 @@
let
filterDivider
=
data
.
isDivider
!==
true
;
if
(
!
value
)
return
filterDivider
;
return
filterDivider
&&
!
data
.
hasOwnProperty
(
'children'
)
&&
data
.
name
.
toUpperCase
().
indexOf
(
value
.
toUpperCase
())
>=
0
;
},
isCurrentProcess
(
data
){
let
yes
=
this
.
currentProcess
&&
this
.
currentProcess
.
meta
&&
data
.
id
&&
data
.
id
===
this
.
currentProcess
.
meta
.
id
;
if
(
yes
){
console
.
log
();
}
return
yes
;
}
},
...
...
src/views/Editor/dialogs/BehaviorEditorDialog.vue
View file @
55826096
...
...
@@ -4,8 +4,8 @@
:append-to-body=
"true"
custom-class=
"behavior-editor-dialog"
>
<behavior-editor
v-if=
"editorReady"
ref=
"behaviorEditor"
class=
"full-size"
></behavior-editor>
<div
slot=
"footer"
class=
"dialog-footer"
>
<el-button
size=
"mini"
type=
"primary"
@
click=
"onSave(false)"
>
{{
$t
(
'Save
'
)
}}
</el-button>
<el-button
size=
"mini"
type=
"primary"
@
click=
"onSave(
true)"
>
{{
$t
(
'Save And Preview
'
)
}}
</el-button>
<el-button
size=
"mini"
@
click=
"onSave(true)"
>
{{
$t
(
'Save And Preview
'
)
}}
</el-button>
<el-button
size=
"mini"
type=
"primary"
@
click=
"onSave(
false)"
>
{{
$t
(
'Save And Close
'
)
}}
</el-button>
</div>
</el-dialog>
</
template
>
...
...
@@ -15,7 +15,6 @@
import
BehaviorEditor
from
"../behavior-editor/BehaviorEditor"
;
import
events
from
"@/global-events.js"
export
default
{
name
:
"BehaviorEditorDialog"
,
components
:
{
BehaviorEditor
},
...
...
@@ -31,8 +30,8 @@
}),
},
created
(){
events
.
$on
(
'behaviorSave'
,(
isPreview
)
=>
{
created
()
{
events
.
$on
(
'behaviorSave'
,
(
isPreview
)
=>
{
this
.
onSave
(
isPreview
)
});
},
...
...
@@ -48,7 +47,11 @@
},
onSave
(
isPreview
)
{
this
.
behavior_save
();
this
.
$emit
(
'change'
,
isPreview
);
if
(
isPreview
){
this
.
$emit
(
'change'
,
isPreview
);
}
else
{
this
.
visible
=
false
;
}
},
beforeClose
(
done
)
{
this
.
$confirm
(
this
.
$t
(
'Save this behavior before'
),
this
.
$t
(
'Alert'
),
{
...
...
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