Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
PU-17
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
template admin
PU-17
Commits
b258fe65
You need to sign in or sign up before continuing.
Commit
b258fe65
authored
Jul 03, 2020
by
Chen Jiping
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
调整结束画面及色板处理
parent
1f09942a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
3 deletions
+15
-3
form.component.html
src/app/form/form.component.html
+1
-1
form.component.ts
src/app/form/form.component.ts
+7
-2
play.component.ts
src/app/play/play.component.ts
+7
-0
No files found.
src/app/form/form.component.html
View file @
b258fe65
...
...
@@ -43,7 +43,7 @@
<nz-input-group
[
nzSize
]="'
large
'"
>
<div
nz-row
[
nzGutter
]="
8
"
>
<div
nz-col
nzSpan=
"5"
>
<nz-select
[(
ngModel
)]="
curPic
"
style=
"width: 110px;"
id=
"type"
nzPlaceHolder=
"picurte"
(
ngModelChange
)="
onChangeColor
($
event
)"
>
<nz-select
[(
ngModel
)]="
curPic
Url
"
style=
"width: 110px;"
id=
"type"
nzPlaceHolder=
"picurte"
(
ngModelChange
)="
onChangeColor
($
event
)"
>
<nz-option
[
nzValue
]="
option
.
picUrl
"
[
nzLabel
]="'图片
-
'
+
(
i
+
1
)
"
*
ngFor=
"let option of item.picArr;let i = index"
>
</nz-option>
</nz-select>
...
...
src/app/form/form.component.ts
View file @
b258fe65
...
...
@@ -18,6 +18,8 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy {
curPic
;
curPicUrl
;
color
=
"
#f3440d
"
;
colorArr
=
[];
...
...
@@ -212,15 +214,16 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy {
onChangeColor
(
event
){
this
.
curPic
=
null
;
this
.
curPicUrl
=
null
;
for
(
let
i
=
0
;
i
<
this
.
item
.
picArr
.
length
;
++
i
){
let
pic
=
this
.
item
.
picArr
[
i
];
let
picUrl
=
pic
.
picUrl
;
if
(
event
===
picUrl
){
this
.
curPic
=
this
.
item
.
picArr
[
i
];
this
.
color
=
pic
.
color
;
this
.
curPicUrl
=
picUrl
;
break
;
}
}
...
...
@@ -230,6 +233,8 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy {
if
(
this
.
curPic
){
this
.
curPic
.
color
=
this
.
color
;
this
.
save
();
this
.
curPic
=
null
;
this
.
curPicUrl
=
null
;
}
}
}
...
...
src/app/play/play.component.ts
View file @
b258fe65
...
...
@@ -899,5 +899,12 @@ export class PlayComponent implements OnInit, OnDestroy {
//显示花瓣
petal
.
showPetal
({
x
:
0
,
y
:
0
,
width
:
this
.
canvasWidth
,
height
:
this
.
canvasHeight
},
this
.
mapScale
,
100
);
setTimeout
(()
=>
{
petal
.
stop
(()
=>
{
this
.
canTouch
=
true
;
})
},
3000
);
}
}
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