Commit 4e7aad42 authored by 李维's avatar 李维

禁用文字输入组

调整画图题启用和禁止滚动逻辑
parent 56e85259
...@@ -273,6 +273,8 @@ export default class DrawingBoard extends cc.Component { ...@@ -273,6 +273,8 @@ export default class DrawingBoard extends cc.Component {
const startPos = this.pathPointContainer.convertToNodeSpaceAR(worldPos); const startPos = this.pathPointContainer.convertToNodeSpaceAR(worldPos);
this.touchPointArr = [startPos]; this.touchPointArr = [startPos];
this.pointPicArr = []; this.pointPicArr = [];
this.node.emit("onPainting", true);
}) })
this.node.on(cc.Node.EventType.TOUCH_MOVE, (e) => { this.node.on(cc.Node.EventType.TOUCH_MOVE, (e) => {
...@@ -316,6 +318,7 @@ export default class DrawingBoard extends cc.Component { ...@@ -316,6 +318,7 @@ export default class DrawingBoard extends cc.Component {
} }
this.saveUserLine(); this.saveUserLine();
this.touchPointArr = []; this.touchPointArr = [];
this.node.emit("onPainting", false);
}) })
this.node.on(cc.Node.EventType.TOUCH_CANCEL, (e) => { this.node.on(cc.Node.EventType.TOUCH_CANCEL, (e) => {
...@@ -324,6 +327,7 @@ export default class DrawingBoard extends cc.Component { ...@@ -324,6 +327,7 @@ export default class DrawingBoard extends cc.Component {
} }
this.saveUserLine(); this.saveUserLine();
this.touchPointArr = []; this.touchPointArr = [];
this.node.emit("onPainting", false);
}) })
} }
......
...@@ -3270,11 +3270,20 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -3270,11 +3270,20 @@ export default class SceneComponent extends MyCocosSceneComponent {
borad.emit("disable"); borad.emit("disable");
} }
}) })
this.drawingCount ++; // this.drawingCount ++;
if(this.drawingCount == 1) { // if(this.drawingCount == 1) {
// this.disableScroll()
// }
})
drawingBoard.on("onPainting", (state)=>{
if(state) {
this.disableScroll() this.disableScroll()
} else {
this.enableScroll()
} }
}) })
drawingBoard.on("onPaintingEnd", ()=>{ drawingBoard.on("onPaintingEnd", ()=>{
rect.zIndex = layer_4; rect.zIndex = layer_4;
this.allDrawingBoards.forEach(borad => { this.allDrawingBoards.forEach(borad => {
...@@ -3282,10 +3291,10 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -3282,10 +3291,10 @@ export default class SceneComponent extends MyCocosSceneComponent {
borad.emit("enable"); borad.emit("enable");
} }
}) })
this.drawingCount --; // this.drawingCount --;
if(this.drawingCount == 0) { // if(this.drawingCount == 0) {
this.enableScroll(); // this.enableScroll();
} // }
}) })
rect.addChild(drawingBoard); rect.addChild(drawingBoard);
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -93,10 +93,10 @@ ...@@ -93,10 +93,10 @@
<nz-option [nzValue]="SORT_WORDS" nzLabel="单词排序"></nz-option> <nz-option [nzValue]="SORT_WORDS" nzLabel="单词排序"></nz-option>
<nz-option [nzValue]="PRONUNCIATION_ASSESSMENT" nzLabel="语音评测"></nz-option> <nz-option [nzValue]="PRONUNCIATION_ASSESSMENT" nzLabel="语音评测"></nz-option>
<nz-option [nzValue]="CONNECTION_CHOICE" 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" nzLabel="涂色题"></nz-option>
<nz-option [nzValue]="DRAWING_CHECK" nzLabel="涂色题(评分)"></nz-option> <nz-option [nzValue]="DRAWING_CHECK" nzLabel="涂色题(评分)"></nz-option>
<nz-option [nzValue]="CONNECTION_2LEVEL" nzLabel="2级连线题"></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-option [nzValue]="IMAGE_SELECT" nzLabel="图片选项" nzDisabled></nz-option>
</nz-select> </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> <label *ngIf="it.hotZoneType == TEXT_SELECT || it.hotZoneType == MULTIPLE_TEXT_SELECT" nz-checkbox [(ngModel)]="it.useSelectOptionList" (ngModelChange)="handleUserSelectOptionListChange(it)" style="margin-left: 10px;">使用独立选项清单</label>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment