Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
DG_FAF
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
DG_FAF
Commits
7396c13d
Commit
7396c13d
authored
Feb 18, 2023
by
李维
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加热区别名
parent
95f61d6f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
6 deletions
+12
-6
Unit.ts
form_angular/src/app/common/custom-hot-zone/Unit.ts
+1
-0
custom-hot-zone.component.html
...app/common/custom-hot-zone/custom-hot-zone.component.html
+8
-6
custom-hot-zone.component.ts
...c/app/common/custom-hot-zone/custom-hot-zone.component.ts
+3
-0
No files found.
form_angular/src/app/common/custom-hot-zone/Unit.ts
View file @
7396c13d
...
@@ -1964,6 +1964,7 @@ export class HotZoneItem extends MySprite {
...
@@ -1964,6 +1964,7 @@ export class HotZoneItem extends MySprite {
rectFillColor
=
'
#ffffff
'
;
rectFillColor
=
'
#ffffff
'
;
rectEdgeColor
=
'
#1bfff7
'
;
rectEdgeColor
=
'
#1bfff7
'
;
public
itemName
;
private
_itemType
;
private
_itemType
;
private
shapeRect
:
ShapeRect
;
private
shapeRect
:
ShapeRect
;
...
...
form_angular/src/app/common/custom-hot-zone/custom-hot-zone.component.html
View file @
7396c13d
...
@@ -19,9 +19,7 @@
...
@@ -19,9 +19,7 @@
</div>
</div>
</div>
</div>
<div
nz-col
nzSpan=
"5"
nzOffset=
"1"
class=
"img-box"
<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
<div
style=
"margin: auto; padding: 5px; margin-top: 30px; width:90%; border: 2px dashed #ddd; border-radius: 10px"
>
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
style=
"margin-left: 40%;"
>
item-{{i + 1}}
...
@@ -30,17 +28,21 @@
...
@@ -30,17 +28,21 @@
X
X
</button>
</button>
<nz-divider
style=
"margin
-top: 10px
;"
></nz-divider>
<nz-divider
style=
"margin
: 10px 0 5px 0
;"
></nz-divider>
<div
style=
"display: flex; align-items: center; justify-content: start;"
>
<span
style=
"display: inline-block; width: 200px; text-align: right; white-space: nowrap;"
>
热区名(可选):
</span>
<input
type=
"text"
nz-input
[(
ngModel
)]="
it
.
itemName
"
(
blur
)="
saveText
(
it
)"
style=
"margin-left: 20px;"
>
</div>
<div
style=
"margin-
top: -20px; margin-
bottom: 5px"
>
<div
style=
"margin-bottom: 5px"
>
<nz-radio-group
[
ngModel
]="
it
.
itemType
"
(
ngModelChange
)="
radioChange
($
event
,
it
)"
>
<nz-radio-group
[
ngModel
]="
it
.
itemType
"
(
ngModelChange
)="
radioChange
($
event
,
it
)"
>
<label
*
ngIf=
"isHasRect"
nz-radio
nzValue=
"rect"
>
矩形
</label>
<label
*
ngIf=
"isHasRect"
nz-radio
nzValue=
"rect"
>
矩形
</label>
<label
*
ngIf=
"isHasPic"
nz-radio
nzValue=
"pic"
>
图片
</label>
<label
*
ngIf=
"isHasPic"
nz-radio
nzValue=
"pic"
>
图片
</label>
<label
*
ngIf=
"isHasText"
nz-radio
nzValue=
"text"
>
文本
</label>
<label
*
ngIf=
"isHasText"
nz-radio
nzValue=
"text"
>
文本
</label>
</nz-radio-group>
</nz-radio-group>
</div>
</div>
<div
*
ngIf=
"it.itemType == 'pic'"
>
<div
*
ngIf=
"it.itemType == 'pic'"
>
<app-upload-image-with-preview
<app-upload-image-with-preview
[
picUrl
]="
it
?.
pic_url
"
[
picUrl
]="
it
?.
pic_url
"
...
...
form_angular/src/app/common/custom-hot-zone/custom-hot-zone.component.ts
View file @
7396c13d
...
@@ -249,6 +249,7 @@ export class CustomHotZoneComponent implements OnInit, OnDestroy, OnChanges {
...
@@ -249,6 +249,7 @@ export class CustomHotZoneComponent implements OnInit, OnDestroy, OnChanges {
item
.
y
=
this
.
canvasHeight
/
2
;
item
.
y
=
this
.
canvasHeight
/
2
;
item
.
itemType
=
this
.
defaultItemType
;
item
.
itemType
=
this
.
defaultItemType
;
item
.
itemName
=
""
;
if
(
saveData
)
{
if
(
saveData
)
{
...
@@ -449,6 +450,7 @@ export class CustomHotZoneComponent implements OnInit, OnDestroy, OnChanges {
...
@@ -449,6 +450,7 @@ export class CustomHotZoneComponent implements OnInit, OnDestroy, OnChanges {
item
.
pic_url
=
data
.
pic_url
;
item
.
pic_url
=
data
.
pic_url
;
item
.
text
=
data
.
text
;
item
.
text
=
data
.
text
;
item
.
itemType
=
data
.
itemType
;
item
.
itemType
=
data
.
itemType
;
item
.
itemName
=
data
.
itemName
;
this
.
refreshItem
(
item
);
this
.
refreshItem
(
item
);
console
.
log
(
'
item:
'
,
item
);
console
.
log
(
'
item:
'
,
item
);
...
@@ -875,6 +877,7 @@ export class CustomHotZoneComponent implements OnInit, OnDestroy, OnChanges {
...
@@ -875,6 +877,7 @@ export class CustomHotZoneComponent implements OnInit, OnDestroy, OnChanges {
text
:
hotZoneArr
[
i
].
text
,
text
:
hotZoneArr
[
i
].
text
,
audio_url
:
hotZoneArr
[
i
].
audio_url
,
audio_url
:
hotZoneArr
[
i
].
audio_url
,
itemType
:
hotZoneArr
[
i
].
itemType
,
itemType
:
hotZoneArr
[
i
].
itemType
,
itemName
:
hotZoneArr
[
i
].
itemName
,
fontSize
:
this
.
hotZoneFontObj
.
size
,
fontSize
:
this
.
hotZoneFontObj
.
size
,
fontName
:
this
.
hotZoneFontObj
.
name
,
fontName
:
this
.
hotZoneFontObj
.
name
,
fontColor
:
this
.
hotZoneFontObj
.
color
,
fontColor
:
this
.
hotZoneFontObj
.
color
,
...
...
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