Commit 50c916e7 authored by linzhiguo's avatar linzhiguo

# 修改表单,分组增加纯音频类型

parent 0a6a5509
...@@ -27,6 +27,7 @@ export class Kind{ ...@@ -27,6 +27,7 @@ export class Kind{
is_disturb: boolean; is_disturb: boolean;
is_text : boolean; is_text : boolean;
//star_id : string; //star_id : string;
kind_type : string;
options : Array<Option> = []; options : Array<Option> = [];
} }
......
...@@ -117,32 +117,35 @@ ...@@ -117,32 +117,35 @@
<div style="flex:2"> <div style="flex:2">
类型 类型
</div> </div>
<div style="flex:4"> <div style="flex:8">
<nz-radio-group [(ngModel)]="data.is_text" (ngModelChange)="saveItem()" > <nz-radio-group [(ngModel)]="data.kind_type" (ngModelChange)="saveItem()" >
<label nz-radio [nzValue]="true">文字</label> <label nz-radio [nzValue]="0">文字</label>
<label nz-radio [nzValue]="false">图片</label> <label nz-radio [nzValue]="1">图片</label>
<label nz-radio [nzValue]="2">音频</label>
</nz-radio-group> </nz-radio-group>
</div> </div>
</div> </div>
<div *ngIf="data.is_text != false"> <div *ngIf="data.kind_type != '2'">
<div style="display: flex; margin-bottom: 10px;"> <div *ngIf="data.kind_type == '0'">
<div style="flex:1"> <div style="display: flex; margin-bottom: 10px;">
文字 <div style="flex:1">
文字
</div>
<div style="flex:5">
<input type="text" nz-input placeholder="" [(ngModel)]="data.word" (blur)="saveItem()"/>
</div>
</div> </div>
<div style="flex:5">
<input type="text" nz-input placeholder="" [(ngModel)]="data.word" (blur)="saveItem()"/>
</div>
</div> </div>
</div>
<div *ngIf="data.is_text == false"> <div *ngIf="data.kind_type == '1'">
<div style="display: flex; margin-bottom: 10px;"> <div style="display: flex; margin-bottom: 10px;">
<div style="flex:1"> <div style="flex:1">
图片 图片
</div>
<div style="flex:5">
<app-upload-image-with-preview style="width: 100%;" [picUrl]="data.pic_url" (imageUploaded)="onImageUploadSuccess($event, data, 'pic_url')"></app-upload-image-with-preview>
</div>
</div> </div>
<div style="flex:5">
<app-upload-image-with-preview style="width: 100%;" [picUrl]="data.pic_url" (imageUploaded)="onImageUploadSuccess($event, data, 'pic_url')"></app-upload-image-with-preview>
</div>
</div> </div>
</div> </div>
......
...@@ -107,30 +107,6 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy { ...@@ -107,30 +107,6 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy {
} }
preData(){ preData(){
let options = this.item.options;
if (!options || options.length <= 0)
return;
for(let i = 0; i < options.length; i++){
if (!options[i].is_text != true && !options[i].is_text != false){
options[i].is_text = true;
}
for(let j = 0; j < this.item.kinds; j++){
if (!this.item.kinds[j].is_text != true && !this.item.kinds[j].is_text != false){
this.item.kinds[j].is_text = true;
}
if (options[i].kind_id == this.item.kinds[j].id){
if (!this.item.kinds[j].options){
this.item.kinds[j].options = new Array<Option>();
}
this.item.kinds[j].options.push(options[i]);
break;
}
}
}
this.item.options = null; this.item.options = null;
} }
...@@ -178,6 +154,7 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy { ...@@ -178,6 +154,7 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy {
kind.options = new Array<Option>(); kind.options = new Array<Option>();
kind.is_disturb = false; kind.is_disturb = false;
kind.is_text = true; kind.is_text = true;
kind.kind_type = "0";
kind.id = this.randomChar(); kind.id = this.randomChar();
this.item.kinds.push(kind); this.item.kinds.push(kind);
this.save(); this.save();
......
...@@ -81,16 +81,23 @@ cc.Class({ ...@@ -81,16 +81,23 @@ cc.Class({
for(let k = 0; k < kinds.length; k++){ for(let k = 0; k < kinds.length; k++){
let _kind = {}; let _kind = {};
data[i][j][k] = _kind; data[i][j][k] = _kind;
_kind.text = kinds[k].is_text == false?"":kinds[k].word||""; let k_item = kinds[k];
_kind.pic = kinds[k].is_text == false?kinds[k].pic_url||"":""; _kind.text = "";
_kind.audio = kinds[k].audio_url||""; _kind.pic = "";
if (kinds[i].is_disturb){ _kind.audio = "";
_kind.text = ""; if (!k_item.is_disturb){
_kind.pic = ""; if (k_item.kind_type == "0"){
_kind.audio = ""; _kind.text = k_item.word||"";
}
else if (k_item.kind_type == "1"){
_kind.pic = k_item.pic_url||"";
}
_kind.audio = k_item.audio_url||"";
} }
_kind.options = []; _kind.options = [];
let options = kinds[k].options//this.getArrayByID(res.options, kinds[k].id, 'kind_id'); let options = k_item.options;
for(let m = 0; m < options.length; m++){ for(let m = 0; m < options.length; m++){
let _option = {}; let _option = {};
_kind.options[m] = _option; _kind.options[m] = _option;
......
export const defaultData = export const defaultData =
{"stars":[{"id":"16239922308635wok5p"},{"id":"1623992233278l9trhw"}],"pages":[{"id":"1623992235665ryt80q","star_id":"16239922308635wok5p"},{"id":"1623992246832rwwxwc","star_id":"16239922308635wok5p"},{"id":"1624506193914ksvus9","star_id":"1623992233278l9trhw"}],"kinds":[{"id":"1623981972242lokdmj","word":"aaa","page_id":"1623992235665ryt80q","pic_url":"http://staging-teach.cdn.ireadabc.com/5edde6ded73dc7397b0ad901ff96df12.png","audio_url":"http://staging-teach.cdn.ireadabc.com/dd360bbbcf5817eea26ac5fa3341ef5d.mp3","is_text":false,"options":[{"is_text":true,"word":"aaa1"},{"is_text":true,"word":"a2"}]},{"options":[{"is_text":true,"word":"rrrr"},{"is_text":true,"word":"tewre"},{"is_text":false,"pic_url":"http://staging-teach.cdn.ireadabc.com/5edde6ded73dc7397b0ad901ff96df12.png"}],"is_disturb":false,"is_text":true,"id":"16245126704047qu7b3","page_id":"1623992235665ryt80q","word":"222222"},{"options":[{"is_text":true,"word":"d1dddddddddddddd"},{"is_text":true,"word":"d2"},{"is_text":true,"word":"d3"}],"is_disturb":false,"is_text":true,"id":"1624512683708wxep60","page_id":"1623992246832rwwxwc","word":"","audio_url":"http://staging-teach.cdn.ireadabc.com/738ef124b1882d10b31d59fb2fbd7eb7.mp3"},{"options":[{"is_text":true,"word":"e1"},{"is_text":true,"word":"e2"},{"is_text":true,"word":"e3"}],"is_disturb":false,"is_text":true,"id":"1624512725657lqqj3r","page_id":"1623992246832rwwxwc","word":"eeeeeeeeeeeeeeeeeeeeeeeeeeee"},{"options":[{"is_text":true,"word":"4rt3"},{"is_text":true,"word":"435634"}],"is_disturb":true,"is_text":true,"id":"1624512754647ip8vce","page_id":"1623992246832rwwxwc"},{"options":[{"is_text":true,"word":"r1"},{"is_text":true,"word":"r2"},{"is_text":true,"word":"r3"}],"is_disturb":false,"is_text":true,"id":"16245127738549dpkjr","page_id":"1624506193914ksvus9","word":"rrrrrrrrrrrrrrrr"},{"options":[{"is_text":true,"word":"y1"},{"is_text":true,"word":"y2"},{"is_text":true,"word":"y3"}],"is_disturb":false,"is_text":true,"id":"1624512800217fvnv04","page_id":"1624506193914ksvus9","word":"yyyyyyyyyy"},{"options":[{"is_text":true,"word":"434"},{"is_text":true,"word":"43534"},{"is_text":true,"word":"43543"}],"is_disturb":false,"is_text":true,"id":"1624512822668sab0sk","page_id":"1624506193914ksvus9","word":"weewrwe"},{"options":[{"is_text":true,"word":"eeee"},{"is_text":true,"word":"ert34t"}],"is_disturb":true,"is_text":true,"id":"162451695910372kqqy","page_id":"1624506193914ksvus9","word":"werwrwe"}],"options":null,"audio_url":"http://staging-teach.cdn.ireadabc.com/f228f396d2007fc20ab07763ebeda22e.mp3"} {"stars":[{"id":"16239922308635wok5p"},{"id":"1623992233278l9trhw"}],"pages":[{"id":"1623992235665ryt80q","star_id":"16239922308635wok5p"},{"id":"1623992246832rwwxwc","star_id":"16239922308635wok5p"},{"id":"1624506193914ksvus9","star_id":"1623992233278l9trhw"}],"kinds":[{"id":"1623981972242lokdmj","word":"aaa","page_id":"1623992235665ryt80q","pic_url":"http://staging-teach.cdn.ireadabc.com/5edde6ded73dc7397b0ad901ff96df12.png","audio_url":"http://staging-teach.cdn.ireadabc.com/dd360bbbcf5817eea26ac5fa3341ef5d.mp3","is_text":false,"options":[{"is_text":true,"word":"aaa1"},{"is_text":true,"word":"a2"}],"kind_type":1},{"options":[{"is_text":true,"word":"rrrr"},{"is_text":true,"word":"tewre"},{"is_text":false,"pic_url":"http://staging-teach.cdn.ireadabc.com/5edde6ded73dc7397b0ad901ff96df12.png"}],"is_disturb":false,"is_text":true,"id":"16245126704047qu7b3","page_id":"1623992235665ryt80q","word":"222222","kind_type":0},{"options":[{"is_text":true,"word":"d1dddddddddddddd"},{"is_text":true,"word":"d2"},{"is_text":true,"word":"d3"}],"is_disturb":false,"is_text":true,"id":"1624512683708wxep60","page_id":"1623992246832rwwxwc","word":"","audio_url":"http://staging-teach.cdn.ireadabc.com/738ef124b1882d10b31d59fb2fbd7eb7.mp3","kind_type":2},{"options":[{"is_text":true,"word":"e1"},{"is_text":true,"word":"e2"},{"is_text":true,"word":"e3"}],"is_disturb":false,"is_text":true,"id":"1624512725657lqqj3r","page_id":"1623992246832rwwxwc","word":"eeeeeeeeeeeeeeeeeeeeeeeeeeee","kind_type":0},{"options":[{"is_text":true,"word":"4rt3"},{"is_text":true,"word":"435634"}],"is_disturb":true,"is_text":true,"id":"1624512754647ip8vce","page_id":"1623992246832rwwxwc"},{"options":[{"is_text":true,"word":"r1"},{"is_text":true,"word":"r2"},{"is_text":true,"word":"r3"}],"is_disturb":false,"is_text":true,"id":"16245127738549dpkjr","page_id":"1624506193914ksvus9","word":"rrrrrrrrrrrrrrrr","kind_type":0},{"options":[{"is_text":true,"word":"y1"},{"is_text":true,"word":"y2"},{"is_text":true,"word":"y3"}],"is_disturb":false,"is_text":true,"id":"1624512800217fvnv04","page_id":"1624506193914ksvus9","word":"yyyyyyyyyy","kind_type":0},{"options":[{"is_text":true,"word":"434"},{"is_text":true,"word":"43534"},{"is_text":true,"word":"43543"}],"is_disturb":false,"is_text":true,"id":"1624512822668sab0sk","page_id":"1624506193914ksvus9","word":"weewrwe","kind_type":0},{"options":[{"is_text":true,"word":"eeeee"},{"is_text":true,"word":"ert34t"}],"is_disturb":true,"is_text":true,"id":"162451695910372kqqy","page_id":"1624506193914ksvus9","word":"werwrwe"}],"options":null,"audio_url":"http://staging-teach.cdn.ireadabc.com/f228f396d2007fc20ab07763ebeda22e.mp3"}
export const defaultData1= {
stars:[
[
[
{
text:"aa",
pic:"",
audio:"",
options:[
{text:"a1", pic:"http://staging-teach.cdn.ireadabc.com/5fb60317ade0195d35ad8034d5370a7f.png", audio:"http://staging-teach.cdn.ireadabc.com/f47f1d7b5c160fe1c59500d180346240.mp3"},
{text:"a2", pic:"http://staging-teach.cdn.ireadabc.com/ed94332a503c31e0908bd4c6923a2665.png", audio:""},
{text:"a3", pic:"", audio:""},
]
},
{
text:"bb",
pic:"",
audio:"",
options:[
{text:"b1", pic:"", audio:""},
{text:"b2", pic:"", audio:""},
{text:"b3", pic:"", audio:""},
]
},
{
text:"",
pic:"",
audio:"",
options:[
{text:"c1", pic:"", audio:""},
{text:"c2", pic:"", audio:""},
{text:"c3", pic:"", audio:""},
]
}
],
[
{
text:"ee",
pic:"",
audio:"",
options:[
{text:"e1", pic:"", audio:""},
{text:"e2", pic:"", audio:""},
{text:"e3", pic:"", audio:""},
]
},
{
text:"ff",
pic:"",
audio:"",
options:[
{text:"f1", pic:"", audio:""},
{text:"f2", pic:"", audio:""},
{text:"f3", pic:"", audio:""},
]
},
{
text:"",
pic:"",
audio:"",
options:[
{text:"s1", pic:"", audio:""},
{text:"s2", pic:"", audio:""},
{text:"s3", pic:"", audio:""},
]
}
]
],//0
[
[
{
text:"kk",
pic:"",
audio:"",
options:[
{text:"k1", pic:"http://staging-teach.cdn.ireadabc.com/5fb60317ade0195d35ad8034d5370a7f.png", audio:"http://staging-teach.cdn.ireadabc.com/f47f1d7b5c160fe1c59500d180346240.mp3"},
{text:"k2", pic:"http://staging-teach.cdn.ireadabc.com/ed94332a503c31e0908bd4c6923a2665.png", audio:""},
{text:"k3", pic:"", audio:""},
]
},
{
text:"rr",
pic:"",
audio:"",
options:[
{text:"r1", pic:"", audio:""},
{text:"r2", pic:"", audio:""},
{text:"r3", pic:"", audio:""},
]
},
{
text:"",
pic:"",
audio:"",
options:[
{text:"m1", pic:"", audio:""},
{text:"m2", pic:"", audio:""},
{text:"m3", pic:"", audio:""},
]
}
],
[
{
text:"hh",
pic:"",
audio:"",
options:[
{text:"h1", pic:"", audio:""},
{text:"h2", pic:"", audio:""},
{text:"h3", pic:"", audio:""},
]
},
{
text:"tt",
pic:"",
audio:"",
options:[
{text:"t1", pic:"", audio:""},
{text:"t2", pic:"", audio:""},
{text:"t3", pic:"", audio:""},
]
},
{
text:"",
pic:"",
audio:"",
options:[
{text:"s1", pic:"", audio:""},
{text:"s2", pic:"", audio:""},
{text:"s3", pic:"", audio:""},
]
}
]
],//0
]
}
// export const defaultData = {
// "pic_url": "http://staging-teach.cdn.ireadabc.com/ed94332a503c31e0908bd4c6923a2665.png",
// "pic_url_2": "http://staging-teach.cdn.ireadabc.com/5fb60317ade0195d35ad8034d5370a7f.png",
// "text": "This is a test label.",
// "audio_url": "http://staging-teach.cdn.ireadabc.com/f47f1d7b5c160fe1c59500d180346240.mp3"
// }
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