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
4e7aad42
Commit
4e7aad42
authored
Jun 19, 2023
by
李维
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
禁用文字输入组
调整画图题启用和禁止滚动逻辑
parent
56e85259
Changes
7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
30 additions
and
17 deletions
+30
-17
DrawingBoard_DG_FAF.ts
assets/DG_FAF/prefabs/DrawingBoard/DrawingBoard_DG_FAF.ts
+4
-0
DG_FAF.ts
assets/DG_FAF/scene/DG_FAF.ts
+15
-6
main-es2015.js
form/main-es2015.js
+3
-3
main-es2015.js.map
form/main-es2015.js.map
+1
-1
main-es5.js
form/main-es5.js
+5
-5
main-es5.js.map
form/main-es5.js.map
+1
-1
form.component.html
form_angular/src/app/form/form.component.html
+1
-1
No files found.
assets/DG_FAF/prefabs/DrawingBoard/DrawingBoard_DG_FAF.ts
View file @
4e7aad42
...
...
@@ -273,6 +273,8 @@ export default class DrawingBoard extends cc.Component {
const
startPos
=
this
.
pathPointContainer
.
convertToNodeSpaceAR
(
worldPos
);
this
.
touchPointArr
=
[
startPos
];
this
.
pointPicArr
=
[];
this
.
node
.
emit
(
"
onPainting
"
,
true
);
})
this
.
node
.
on
(
cc
.
Node
.
EventType
.
TOUCH_MOVE
,
(
e
)
=>
{
...
...
@@ -316,6 +318,7 @@ export default class DrawingBoard extends cc.Component {
}
this
.
saveUserLine
();
this
.
touchPointArr
=
[];
this
.
node
.
emit
(
"
onPainting
"
,
false
);
})
this
.
node
.
on
(
cc
.
Node
.
EventType
.
TOUCH_CANCEL
,
(
e
)
=>
{
...
...
@@ -324,6 +327,7 @@ export default class DrawingBoard extends cc.Component {
}
this
.
saveUserLine
();
this
.
touchPointArr
=
[];
this
.
node
.
emit
(
"
onPainting
"
,
false
);
})
}
...
...
assets/DG_FAF/scene/DG_FAF.ts
View file @
4e7aad42
...
...
@@ -3270,11 +3270,20 @@ export default class SceneComponent extends MyCocosSceneComponent {
borad
.
emit
(
"
disable
"
);
}
})
this
.
drawingCount
++
;
if
(
this
.
drawingCount
==
1
)
{
// this.drawingCount ++;
// if(this.drawingCount == 1) {
// this.disableScroll()
// }
})
drawingBoard
.
on
(
"
onPainting
"
,
(
state
)
=>
{
if
(
state
)
{
this
.
disableScroll
()
}
else
{
this
.
enableScroll
()
}
})
drawingBoard
.
on
(
"
onPaintingEnd
"
,
()
=>
{
rect
.
zIndex
=
layer_4
;
this
.
allDrawingBoards
.
forEach
(
borad
=>
{
...
...
@@ -3282,10 +3291,10 @@ export default class SceneComponent extends MyCocosSceneComponent {
borad
.
emit
(
"
enable
"
);
}
})
this
.
drawingCount
--
;
if
(
this
.
drawingCount
==
0
)
{
this
.
enableScroll
();
}
//
this.drawingCount --;
//
if(this.drawingCount == 0) {
//
this.enableScroll();
//
}
})
rect
.
addChild
(
drawingBoard
);
...
...
form/main-es2015.js
View file @
4e7aad42
This diff is collapsed.
Click to expand it.
form/main-es2015.js.map
View file @
4e7aad42
This diff is collapsed.
Click to expand it.
form/main-es5.js
View file @
4e7aad42
This diff is collapsed.
Click to expand it.
form/main-es5.js.map
View file @
4e7aad42
This diff is collapsed.
Click to expand it.
form_angular/src/app/form/form.component.html
View file @
4e7aad42
...
...
@@ -93,10 +93,10 @@
<nz-option
[
nzValue
]="
SORT_WORDS
"
nzLabel=
"单词排序"
></nz-option>
<nz-option
[
nzValue
]="
PRONUNCIATION_ASSESSMENT
"
nzLabel=
"语音评测"
></nz-option>
<nz-option
[
nzValue
]="
CONNECTION_CHOICE
"
nzLabel=
"连线选择题"
></nz-option>
<nz-option
[
nzValue
]="
TEXTINPUT_GROUP
"
nzLabel=
"文字输入组"
></nz-option>
<nz-option
[
nzValue
]="
DRAWING
"
nzLabel=
"涂色题"
></nz-option>
<nz-option
[
nzValue
]="
DRAWING_CHECK
"
nzLabel=
"涂色题(评分)"
></nz-option>
<nz-option
[
nzValue
]="
CONNECTION_2LEVEL
"
nzLabel=
"2级连线题"
></nz-option>
<nz-option
[
nzValue
]="
TEXTINPUT_GROUP
"
nzLabel=
"文字输入组"
nzDisabled
></nz-option>
<nz-option
[
nzValue
]="
IMAGE_SELECT
"
nzLabel=
"图片选项"
nzDisabled
></nz-option>
</nz-select>
<label
*
ngIf=
"it.hotZoneType == TEXT_SELECT || it.hotZoneType == MULTIPLE_TEXT_SELECT"
nz-checkbox
[(
ngModel
)]="
it
.
useSelectOptionList
"
(
ngModelChange
)="
handleUserSelectOptionListChange
(
it
)"
style=
"margin-left: 10px;"
>
使用独立选项清单
</label>
...
...
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