Commit d2f3d3d4 authored by 李维's avatar 李维

dev commit

parent 53952614
......@@ -73,7 +73,7 @@
<nz-form-control [nzSpan]="20">
<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;">
<input style="width: 38px" (focus)="selectContent($event)" class="inputBlock" [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.indexOf(currentSet)!=-1}" [maxLength]="1" type="text" nz-input [(ngModel)]="oneGrid.text" (blur)="handeGridChange($event, oneGrid, x, y)" >
</div>
</div>
</nz-form-control>
......
......@@ -105,4 +105,53 @@
cursor: pointer;
color: transparent;
text-shadow: 0 0 0 #000;
&.current {
background-color: #1890ff;
color: #FFF;
}
&.index-1 {
background-color: #702ff4;
}
&.index-2 {
background-color: #702ff4;
}
&.index-3 {
background-color: #702ff4;
}
&.index-4 {
background-color: #702ff4;
}
&.index-5 {
background-color: #702ff4;
}
&.index-6 {
background-color: #702ff4;
}
&.index-7 {
background-color: #702ff4;
}
&.index-8 {
background-color: #702ff4;
}
&.index-9 {
background-color: #702ff4;
}
&.index-10 {
background-color: #702ff4;
}
&.index-11 {
background-color: #702ff4;
}
&.index-12 {
background-color: #702ff4;
}
&.index-13 {
background-color: #702ff4;
}
&.index-14 {
background-color: #702ff4;
}
&.index-15 {
background-color: #702ff4;
}
}
......@@ -240,12 +240,21 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy {
}
}
getDisplayClass(oneGird) {
let obj = {}
if(oneGird.index.indexOf(this.currentSet) != -1) {
obj[`index-${this.currentSet+1}`] = true
}
return obj;
}
handleCurrentIndexChange() {
}
addItem() {
this.dataArray.push({ image_url: "", audio_url: "", text: "", uuid: uuidv4(), direction: "left" })
this.dataArray.push({ image_url: "", audio_url: "", direction: "Across", text: "", uuid: uuidv4()})
this.currentSet = this.dataArray.length-1;
this.saveItem();
}
......
......@@ -1495,7 +1495,7 @@ export class PlayComponent implements OnInit, OnDestroy {
// 切换题目,主要是变蓝/变红输入框
switchQuestion(fromIndex, toIndex) {
this.g_cartoon.pauseAudio("sm_switch")
this.g_cartoon.playAudio("sm_switch")
if(toIndex.toString().indexOf("-") != -1) {
let indexArr = toIndex.split("-")
fromIndex = indexArr[0]
......
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