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
95f61d6f
Commit
95f61d6f
authored
Feb 17, 2023
by
李维
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
改为原版热区组件
parent
be906b8d
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
438 additions
and
1600 deletions
+438
-1600
defaultData_DG_FAF.ts
assets/DG_FAF/script/defaultData_DG_FAF.ts
+170
-133
custom-hot-zone.component.html
...app/common/custom-hot-zone/custom-hot-zone.component.html
+22
-230
custom-hot-zone.component.scss
...app/common/custom-hot-zone/custom-hot-zone.component.scss
+106
-7
custom-hot-zone.component.ts
...c/app/common/custom-hot-zone/custom-hot-zone.component.ts
+140
-1170
form.component.html
form_angular/src/app/form/form.component.html
+0
-1
form.component.ts
form_angular/src/app/form/form.component.ts
+0
-59
No files found.
assets/DG_FAF/script/defaultData_DG_FAF.ts
View file @
95f61d6f
// export const defaultData = {
// "lineType": "1",
// "circleSize": "1",
// "helpTime": 10,
// "book_id": "1",
// "page_id": "1",
// "part_name": "1",
// "bgItem": {
// "url": "http://staging-teach.cdn.ireadabc.com/5c84b987ea2291c8d6013fffd39dda32.png",
// "rect": {
// "x": 493.97,
// "y": 0,
// "width": 363.05,
// "height": 511
// }
// },
// "hotZoneItemArr": [
// {
// "id": "1676548040151",
// "index": 0,
// "itemType": "rect",
// "fontScale": 1.05546875,
// "imgScale": 1,
// "imgSizeW": 0,
// "imgSizeH": 0,
// "mapScale": 1.05546875,
// "dragDot": {
// "x": 675.5,
// "y": 255.5
// },
// "gIdx": "3",
// "posX": 549.5051029564432,
// "posY": 118.50042461950386,
// "rect": {
// "x": 34.04,
// "y": 97,
// "width": 43,
// "height": 43
// }
// },
// {
// "id": "1676548150769",
// "index": 1,
// "itemType": "rect",
// "fontScale": 1.05546875,
// "imgScale": 1,
// "imgSizeW": 0,
// "imgSizeH": 0,
// "mapScale": 1.05546875,
// "dragDot": {
// "x": 675.5,
// "y": 255.5
// },
// "gIdx": "3",
// "posX": 579.5,
// "posY": 369.5,
// "rect": {
// "x": 59.03,
// "y": 343,
// "width": 53,
// "height": 53
// }
// },
// {
// "id": "1676548154001",
// "index": 2,
// "itemType": "rect",
// "fontScale": 1.05546875,
// "imgScale": 1,
// "imgSizeW": 0,
// "imgSizeH": 0,
// "mapScale": 1.05546875,
// "dragDot": {
// "x": 675.5,
// "y": 255.5
// },
// "gIdx": "3",
// "posX": 804.5,
// "posY": 458.5,
// "rect": {
// "x": 265.03,
// "y": 413,
// "width": 91,
// "height": 91
// }
// },
// {
// "id": "1676548166436",
// "index": 3,
// "itemType": "rect",
// "fontScale": 1.05546875,
// "imgScale": 1,
// "imgSizeW": 0,
// "imgSizeH": 0,
// "mapScale": 1.05546875,
// "dragDot": {
// "x": 675.5,
// "y": 255.5
// },
// "gIdx": "3",
// "posX": 808.5,
// "posY": 47.5,
// "rect": {
// "x": 266.03,
// "y": -1,
// "width": 97,
// "height": 97
// }
// },
// {
// "id": "1676548168636",
// "index": 4,
// "itemType": "rect",
// "fontScale": 1.05546875,
// "imgScale": 1,
// "imgSizeW": 0,
// "imgSizeH": 0,
// "mapScale": 1.05546875,
// "dragDot": {
// "x": 675.5,
// "y": 255.5
// },
// "gIdx": "3",
// "posX": 664.5,
// "posY": 458.5,
// "rect": {
// "x": 125.03,
// "y": 413,
// "width": 91,
// "height": 91
// }
// }
// ],
// "itemCombineGroup": [],
// "typeArr": []
// }
export
const
defaultData
=
{
export
const
defaultData
=
{
"
lineType
"
:
"
1
"
,
bgItem
:
{
"
circleSize
"
:
"
1
"
,
url
:
"
http://staging-teach.cdn.ireadabc.com/b6c249637c2892d75121dbb76717508e.png
"
,
"
helpTime
"
:
10
,
rect
:
{
"
book_id
"
:
"
1
"
,
x
:
316.90215716486904
,
"
page_id
"
:
"
1
"
,
y
:
0
,
"
part_name
"
:
"
1
"
,
width
:
236.19568567026195
,
"
bgItem
"
:
{
height
:
333
,
"
url
"
:
"
http://staging-teach.cdn.ireadabc.com/5c84b987ea2291c8d6013fffd39dda32.png
"
,
},
"
rect
"
:
{
"
x
"
:
493.97
,
"
y
"
:
0
,
"
width
"
:
363.05
,
"
height
"
:
511
}
},
},
"
hotZoneItemArr
"
:
[
hotZoneItemArr
:
[
{
{
"
id
"
:
"
1676548040151
"
,
index
:
0
,
"
index
"
:
0
,
itemType
:
"
rect
"
,
"
itemType
"
:
"
rect
"
,
fontSize
:
50
,
"
fontScale
"
:
1.05546875
,
fontName
:
"
BRLNSR_1
"
,
"
imgScale
"
:
1
,
fontColor
:
"
#8f3758
"
,
"
imgSizeW
"
:
0
,
fontScale
:
0.6796875
,
"
imgSizeH
"
:
0
,
imgScale
:
1
,
"
mapScale
"
:
1.05546875
,
mapScale
:
0.6796875
,
"
dragDot
"
:
{
rect
:
{
x
:
11.6
,
y
:
234
,
width
:
93
,
height
:
93
},
"
x
"
:
675.5
,
},
"
y
"
:
255.5
{
},
index
:
1
,
"
gIdx
"
:
"
3
"
,
itemType
:
"
rect
"
,
"
posX
"
:
549.5051029564432
,
fontSize
:
50
,
"
posY
"
:
118.50042461950386
,
fontName
:
"
BRLNSR_1
"
,
"
rect
"
:
{
fontColor
:
"
#8f3758
"
,
"
x
"
:
34.04
,
fontScale
:
0.6796875
,
"
y
"
:
97
,
imgScale
:
1
,
"
width
"
:
43
,
mapScale
:
0.6796875
,
"
height
"
:
43
rect
:
{
x
:
162.1
,
y
:
26.5
,
width
:
68
,
height
:
68
},
}
},
},
{
"
id
"
:
"
1676548150769
"
,
"
index
"
:
1
,
"
itemType
"
:
"
rect
"
,
"
fontScale
"
:
1.05546875
,
"
imgScale
"
:
1
,
"
imgSizeW
"
:
0
,
"
imgSizeH
"
:
0
,
"
mapScale
"
:
1.05546875
,
"
dragDot
"
:
{
"
x
"
:
675.5
,
"
y
"
:
255.5
},
"
gIdx
"
:
"
3
"
,
"
posX
"
:
579.5
,
"
posY
"
:
369.5
,
"
rect
"
:
{
"
x
"
:
59.03
,
"
y
"
:
343
,
"
width
"
:
53
,
"
height
"
:
53
}
},
{
"
id
"
:
"
1676548154001
"
,
"
index
"
:
2
,
"
itemType
"
:
"
rect
"
,
"
fontScale
"
:
1.05546875
,
"
imgScale
"
:
1
,
"
imgSizeW
"
:
0
,
"
imgSizeH
"
:
0
,
"
mapScale
"
:
1.05546875
,
"
dragDot
"
:
{
"
x
"
:
675.5
,
"
y
"
:
255.5
},
"
gIdx
"
:
"
3
"
,
"
posX
"
:
804.5
,
"
posY
"
:
458.5
,
"
rect
"
:
{
"
x
"
:
265.03
,
"
y
"
:
413
,
"
width
"
:
91
,
"
height
"
:
91
}
},
{
"
id
"
:
"
1676548166436
"
,
"
index
"
:
3
,
"
itemType
"
:
"
rect
"
,
"
fontScale
"
:
1.05546875
,
"
imgScale
"
:
1
,
"
imgSizeW
"
:
0
,
"
imgSizeH
"
:
0
,
"
mapScale
"
:
1.05546875
,
"
dragDot
"
:
{
"
x
"
:
675.5
,
"
y
"
:
255.5
},
"
gIdx
"
:
"
3
"
,
"
posX
"
:
808.5
,
"
posY
"
:
47.5
,
"
rect
"
:
{
"
x
"
:
266.03
,
"
y
"
:
-
1
,
"
width
"
:
97
,
"
height
"
:
97
}
},
{
"
id
"
:
"
1676548168636
"
,
"
index
"
:
4
,
"
itemType
"
:
"
rect
"
,
"
fontScale
"
:
1.05546875
,
"
imgScale
"
:
1
,
"
imgSizeW
"
:
0
,
"
imgSizeH
"
:
0
,
"
mapScale
"
:
1.05546875
,
"
dragDot
"
:
{
"
x
"
:
675.5
,
"
y
"
:
255.5
},
"
gIdx
"
:
"
3
"
,
"
posX
"
:
664.5
,
"
posY
"
:
458.5
,
"
rect
"
:
{
"
x
"
:
125.03
,
"
y
"
:
413
,
"
width
"
:
91
,
"
height
"
:
91
}
}
],
],
"
itemCombineGroup
"
:
[],
itemCombineGroup
:
[],
"
typeArr
"
:
[]
};
}
\ No newline at end of file
form_angular/src/app/common/custom-hot-zone/custom-hot-zone.component.html
View file @
95f61d6f
This diff is collapsed.
Click to expand it.
form_angular/src/app/common/custom-hot-zone/custom-hot-zone.component.scss
View file @
95f61d6f
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
border
:
2px
solid
#ddd
;
border
:
2px
solid
#ddd
;
.preview-box
{
.preview-box
{
margin
:
auto
;
margin
:
auto
;
...
@@ -81,10 +81,6 @@
...
@@ -81,10 +81,6 @@
}
}
}
}
.anima-upload-btn
{
padding
:
10px
;
}
h5
{
h5
{
margin-top
:
1rem
;
margin-top
:
1rem
;
}
}
...
@@ -93,8 +89,8 @@ h5 {
...
@@ -93,8 +89,8 @@ h5 {
@font-face
@font-face
{
{
font-family
:
'ahronbd-
1'
;
font-family
:
'BRLNSR_
1'
;
src
:
url("/assets/font/ahronbd-1.ttf
")
;
src
:
url("/assets/font/BRLNSR_1.TTF
")
;
}
}
...
@@ -109,3 +105,106 @@ h5 {
...
@@ -109,3 +105,106 @@ h5 {
//@import '../../../style/common_mixin';
//
//.p-image-uploader {
// position: relative;
// display: block;
// width: 100%;
// height: 0;
// padding-bottom: 56.25%;
// .p-box {
// position: absolute;
// left: 0;
// top: 0;
// right: 0;
// bottom: 0;
// border: 2px dashed #ddd;
// border-radius: 0.5rem;
// background-color: #fafafa;
// text-align: center;
// color: #aaa;
// .p-upload-icon {
// text-align: center;
// margin: auto;
// .anticon-upload {
// color: #888;
// font-size: 5rem;
// }
// .p-progress-bar {
// position: relative;
// width: 20rem;
// height: 1.5rem;
// border: 1px solid #ccc;
// border-radius: 1rem;
// .p-progress-bg {
// background-color: #1890ff;
// border-radius: 1rem;
// height: 100%;
// }
// .p-progress-value {
// position: absolute;
// top: 0;
// left: 0;
// width: 100%;
// height: 100%;
// text-shadow: 0 0 4px #000;
// color: white;
// text-align: center;
// font-size: 0.9rem;
// line-height: 1.5rem;
// }
// }
// }
// .p-preview {
// width: 100%;
// height: 100%;
// //background-image: url("https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png");
// @include k-img-bg();
// }
// }
//}
//
//.p-btn-delete {
// position: absolute;
// right: -0.5rem;
// top: -0.5rem;
// width: 2rem;
// height: 2rem;
// border: 0.2rem solid white;
// border-radius: 50%;
// font-size: 1.2rem;
// background-color: #fb781a;
// color: white;
// text-align: center;
//}
//
//.p-upload-progress-bg {
// position: absolute;
// width: 100%;
// height: 100%;
// display: flex;
// align-items: center;
// justify-content: center;
// & .i-text {
// position: absolute;
// text-align: center;
// color: white;
// text-shadow: 0 0 2px rgba(0, 0, 0, .85);
// }
// & .i-bg {
// position: absolute;
// left: 0;
// top: 0;
// height: 100%;
// background-color: #27b43f;
// border-radius: 0.5rem;
// }
//}
//
//
//:host ::ng-deep .ant-upload {
// display: block;
//}
form_angular/src/app/common/custom-hot-zone/custom-hot-zone.component.ts
View file @
95f61d6f
This diff is collapsed.
Click to expand it.
form_angular/src/app/form/form.component.html
View file @
95f61d6f
...
@@ -25,7 +25,6 @@
...
@@ -25,7 +25,6 @@
<app-custom-hot-zone
<app-custom-hot-zone
[
bgItem
]="
item
.
bgItem
"
[
bgItem
]="
item
.
bgItem
"
[
hotZoneItemArr
]="
item
.
hotZoneItemArr
"
[
hotZoneItemArr
]="
item
.
hotZoneItemArr
"
[
customTypeGroupArr
]="
customTypeGroupArr
"
(
save
)="
saveHotZone
(
item
,
$
event
)"
(
save
)="
saveHotZone
(
item
,
$
event
)"
>
>
</app-custom-hot-zone>
</app-custom-hot-zone>
...
...
form_angular/src/app/form/form.component.ts
View file @
95f61d6f
...
@@ -26,64 +26,6 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy, AfterViewIni
...
@@ -26,64 +26,6 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy, AfterViewIni
// 储存对象
// 储存对象
item
;
item
;
customTypeGroupArr
=
[
{
name
:
'
连接点
'
,
rect
:
true
,
// isShowPos: true,
isCopy
:
true
,
isShowPos
:
true
,
centerDot
:
true
,
// label: '答案',
},
{
name
:
'
书写区
'
,
rect
:
true
,
isShowPos
:
true
,
isCopy
:
true
,
anima
:
true
,
},
{
name
:
'
画圈区
'
,
rect
:
true
,
isShowPos
:
true
,
isCopy
:
true
,
// anima: true,
},
{
name
:
'
音频区
'
,
rect
:
true
,
audio
:
true
,
isCopy
:
true
,
},
{
name
:
'
标记区
'
,
rect
:
true
,
isShowPos
:
true
,
isCopy
:
true
,
anima
:
true
,
},
{
name
:
'
涂色区
'
,
anima
:
true
,
// pic: true,
// isShowPos: true,
isCopy
:
true
,
},
{
name
:
'
书写图片
'
,
pic
:
true
,
// isShowPos: true,
isCopy
:
true
,
},
{
name
:
'
装饰图片
'
,
pic
:
true
,
// isShowPos: true,
isCopy
:
true
,
},
];
constructor
(
private
appRef
:
ApplicationRef
,
private
changeDetectorRef
:
ChangeDetectorRef
)
{
constructor
(
private
appRef
:
ApplicationRef
,
private
changeDetectorRef
:
ChangeDetectorRef
)
{
}
}
...
@@ -119,7 +61,6 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy, AfterViewIni
...
@@ -119,7 +61,6 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy, AfterViewIni
const
{
bgItem
,
hotZoneItemArr
}
=
e
;
const
{
bgItem
,
hotZoneItemArr
}
=
e
;
group
.
bgItem
=
bgItem
;
group
.
bgItem
=
bgItem
;
group
.
hotZoneItemArr
=
hotZoneItemArr
;
group
.
hotZoneItemArr
=
hotZoneItemArr
;
this
.
item
.
itemCombineGroup
=
[];
this
.
save
();
this
.
save
();
}
}
...
...
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