Commit 92947c0f authored by 李维's avatar 李维

Bug fix

parent 4eec376a
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
<nz-form-control [nzSpan]="20"> <nz-form-control [nzSpan]="20">
<div *ngFor="let oneRow of grid; let x = index" class="clearfix"> <div *ngFor="let oneRow of grid; let x = index" class="clearfix">
<div *ngFor="let oneGrid of oneRow; let y = index" style="float: left; padding: 2px;"> <div *ngFor="let oneGrid of oneRow; let y = index" style="float: left; padding: 2px;">
<input style="width: 38px" (focus)="selectContent($event)" class="inputBlock" [class]="{current: oneGrid.index.indexOf(currentSet)!=-1}" [maxLength]="1" type="text" nz-input [(ngModel)]="oneGrid.text" (blur)="handeGridChange($event, oneGrid, x, y)" > <input style="width: 38px" (focus)="selectContent($event)" class="inputBlock" [class]="{current: oneGrid.index && oneGrid.index.indexOf(currentSet)!=-1}" [maxLength]="1" type="text" nz-input [(ngModel)]="oneGrid.text" (blur)="handeGridChange($event, oneGrid, x, y)" >
</div> </div>
</div> </div>
</nz-form-control> </nz-form-control>
......
...@@ -144,7 +144,7 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy { ...@@ -144,7 +144,7 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy {
for(let i=0; i<row; i++) { for(let i=0; i<row; i++) {
_grid[i] = []; _grid[i] = [];
for(let j=0; j<col; j++) { for(let j=0; j<col; j++) {
_grid[i].push({index: -1, text: ""}); _grid[i].push({index: [], text: ""});
} }
} }
...@@ -292,7 +292,7 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy { ...@@ -292,7 +292,7 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy {
this.grid.forEach(row=>{ this.grid.forEach(row=>{
row.forEach(item => { row.forEach(item => {
if(this.checkIndex(item.index, this.currentSet)) { if(this.checkIndex(item.index, this.currentSet)) {
item.index = -1; item.index = [];
item.text = ""; item.text = "";
} }
}); });
......
...@@ -365,6 +365,12 @@ export class PlayComponent implements OnInit, OnDestroy { ...@@ -365,6 +365,12 @@ export class PlayComponent implements OnInit, OnDestroy {
}) })
questionText.ref.text = "a fish whose head look like those of a horse" questionText.ref.text = "a fish whose head look like those of a horse"
if(questionText.ref.width > 1440) {
questionText.ref.setScaleXY(this.g_mapScale * 1440/questionText.ref.width);
} else {
questionText.ref.setScaleXY(this.g_mapScale);
}
element.out = (callback)=> { element.out = (callback)=> {
return tweenChange(element.ref, {y: -1000}, 1, ()=>{ return tweenChange(element.ref, {y: -1000}, 1, ()=>{
callback && callback() callback && callback()
......
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