Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
YM5-15
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
YM5-15
Commits
2aac7778
Commit
2aac7778
authored
Jun 22, 2020
by
limingzhe
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: custom-hot-zone
parent
3695f7ce
Changes
5
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
2940 additions
and
404 deletions
+2940
-404
Unit.ts
src/app/common/custom-hot-zone/Unit.ts
+2606
-263
custom-hot-zone.component.html
...app/common/custom-hot-zone/custom-hot-zone.component.html
+37
-26
custom-hot-zone.component.scss
...app/common/custom-hot-zone/custom-hot-zone.component.scss
+7
-0
custom-hot-zone.component.ts
src/app/common/custom-hot-zone/custom-hot-zone.component.ts
+287
-114
tsconfig.app.json
tsconfig.app.json
+3
-1
No files found.
src/app/common/custom-hot-zone/Unit.ts
View file @
2aac7778
This diff is collapsed.
Click to expand it.
src/app/common/custom-hot-zone/custom-hot-zone.component.html
View file @
2aac7778
<div
class=
"p-image-children-editor"
>
<h5
style=
"margin-left: 2.5%;"
>
preview:
</h5>
<div
class=
"preview-box"
#
wrap
>
<canvas
id=
"canvas"
#
canvas
></canvas>
</div>
<div
nz-row
nzType=
"flex"
nzAlign=
"middle"
>
<div
nz-col
nzSpan=
"5"
nzOffset=
"1"
>
...
...
@@ -20,39 +17,51 @@
(
imageUploaded
)="
onBackgroundUploadSuccess
($
event
)"
>
</app-upload-image-with-preview>
</div>
</div>
<div
nz-col
nzSpan=
"5"
nzOffset=
"1"
class=
"img-box"
*
ngFor=
"let it of hotZoneArr; let i = index"
>
*
ngFor=
"let it of hotZoneArr; let i = index"
>
<div
style=
"margin: auto; padding: 5px; margin-top: 30px; width:90%; border: 2px dashed #ddd; border-radius: 10px"
>
<span
style=
"margin-left: 40%;"
>
item-{{i + 1}}
</span>
<button
style=
"float: right;"
nz-button
nzType=
"danger"
nzSize=
"small"
(
click
)="
deleteBtnClick
(
i
)"
>
X
</button>
<div
style=
" height: 40px;"
>
<h5>
item-{{i+1}}
<nz-divider
style=
"margin-top: 10px;"
></nz-divider>
<i
style=
"margin-left: 20px; margin-top: 2px; float: right; cursor:pointer"
(
click
)="
deleteItem
($
event
,
i
)"
nz-icon
[
nzTheme
]="'
twotone
'"
[
nzType
]="'
close-circle
'"
[
nzTwotoneColor
]="'#
ff0000
'"
></i>
</h5>
</div>
<div
style=
"margin-top: -20px; margin-bottom: 5px"
>
<nz-radio-group
[
ngModel
]="
it
.
itemType
"
(
ngModelChange
)="
radioChange
($
event
,
it
)"
>
<label
*
ngIf=
"isHasRect"
nz-radio
nzValue=
"rect"
>
矩形
</label>
<label
*
ngIf=
"isHasPic"
nz-radio
nzValue=
"pic"
>
图片
</label>
<label
*
ngIf=
"isHasText"
nz-radio
nzValue=
"text"
>
文本
</label>
</nz-radio-group>
</div>
<!--<div class="img-box-upload">-->
<!--<app-upload-image-with-preview-->
<!--[picUrl]="it.pic_url"-->
<!--(imageUploaded)="onImgUploadSuccessByImg($event, it)">-->
<!--</app-upload-image-with-preview>-->
<!--</div>-->
<div
*
ngIf=
"it.itemType == 'pic'"
>
<app-upload-image-with-preview
[
picUrl
]="
it
?.
pic_url
"
(
imageUploaded
)="
onItemImgUploadSuccess
($
event
,
it
)"
>
</app-upload-image-with-preview>
</div>
<!--<app-audio-recorder-->
<!--[audioUrl]="it.audio_url ? it.audio_url : null "-->
<!--(audioUploaded)="onAudioUploadSuccessByImg($event, it)"-->
<!--></app-audio-recorder>-->
<div
*
ngIf=
"it.itemType == 'text'"
>
<input
type=
"text"
nz-input
[(
ngModel
)]="
it
.
text
"
(
blur
)="
saveText
(
it
)"
>
</div>
<div
style=
"width: 100%; margin-top: 5px;"
>
<app-audio-recorder
[
audioUrl
]="
it
.
audio_url
"
(
audioUploaded
)="
onItemAudioUploadSuccess
($
event
,
it
)"
></app-audio-recorder>
</div>
</div>
</div>
<div
nz-col
nzSpan=
"5"
nzOffset=
"1"
>
...
...
@@ -75,7 +84,7 @@
<div
class=
"save-box"
>
<button
class=
"save-btn"
nz-button
nzType=
"primary"
[
nzSize
]="'
large
'"
nzShape=
"round"
(
click
)="
saveClick
()"
>
(
click
)="
saveClick
()"
>
<i
nz-icon
nzType=
"save"
></i>
Save
</button>
...
...
@@ -83,7 +92,9 @@
</div>
</div>
<label
style=
"opacity: 0; position: absolute; top: 0px; font-family: 'BRLNSR_1'"
>
1
</label>
src/app/common/custom-hot-zone/custom-hot-zone.component.scss
View file @
2aac7778
...
...
@@ -87,6 +87,13 @@ h5 {
@font-face
{
font-family
:
'BRLNSR_1'
;
src
:
url("/assets/font/BRLNSR_1.TTF")
;
}
...
...
src/app/common/custom-hot-zone/custom-hot-zone.component.ts
View file @
2aac7778
This diff is collapsed.
Click to expand it.
tsconfig.app.json
View file @
2aac7778
...
...
@@ -2,7 +2,9 @@
"extends"
:
"./tsconfig.json"
,
"compilerOptions"
:
{
"outDir"
:
"./out-tsc/app"
,
"types"
:
[]
"types"
:
[
"node"
]
},
"files"
:
[
"src/main.ts"
,
...
...
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