Commit e7037bdb authored by Chen Jiping's avatar Chen Jiping

修改字体;调整表格不能实时刷新的问题

parent 461b9995
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
<nz-form-label [nzSpan]="6" nzFor="it.word_audio_url">单词字组(组合)</nz-form-label> <nz-form-label [nzSpan]="6" nzFor="it.word_audio_url">单词字组(组合)</nz-form-label>
<nz-form-control [nzSpan]="6"> <nz-form-control [nzSpan]="6">
<button nz-button nzType="dashed" class="add-btn" id="add-btn" <button nz-button nzType="dashed" class="add-btn" id="add-btn"
(click)="addLetterItem(it)"> (click)="addLetterItem(it.letters)">
<i nz-icon nzType="plus-circle" nzTheme="outline"></i>添加 <i nz-icon nzType="plus-circle" nzTheme="outline"></i>添加
</button> </button>
</nz-form-control> </nz-form-control>
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr *ngFor="let data of lettersTable.data;let j = index"> <tr *ngFor="let data of it.letters;let j = index">
<td>{{j+1}}</td> <td>{{j+1}}</td>
<td><input type="text" nz-input placeholder="请录入字母(组合)" [(ngModel)]="data.letter_val" (blur)="saveItem()"></td> <td><input type="text" nz-input placeholder="请录入字母(组合)" [(ngModel)]="data.letter_val" (blur)="saveItem()"></td>
<td> <td>
......
...@@ -127,10 +127,11 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy { ...@@ -127,10 +127,11 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy {
this.saveItem(); this.saveItem();
} }
addLetterItem(wordItem){ addLetterItem(letters){
let letter = this.letterData(); let letter = this.letterData();
wordItem.letters.push(letter);
letters.push(letter);
this.save(); this.save();
} }
......
...@@ -21,4 +21,10 @@ ...@@ -21,4 +21,10 @@
{ {
font-family: 'GOTHICB'; font-family: 'GOTHICB';
src: url("../../assets/font/GOTHICB.TTF") ; src: url("../../assets/font/GOTHICB.TTF") ;
} }
\ No newline at end of file
@font-face
{
font-family: 'MMTextBookBold';
src: url("../../assets/font/MMTextBookBold.otf") ;
}
...@@ -491,12 +491,16 @@ export class PlayComponent implements OnInit, OnDestroy { ...@@ -491,12 +491,16 @@ export class PlayComponent implements OnInit, OnDestroy {
addUrlToAudioObj(key, url = null, vlomue = 1, loop = false, callback = null) { addUrlToAudioObj(key, url = null, vlomue = 1, loop = false, callback = null) {
console.log('add audio', key);
if(!key){
return;
}
const audioObj = this.audioObj; const audioObj = this.audioObj;
if (url == null) { if (url == null) {
url = key; url = key;
} }
console.log('add audio', key);
this.rawAudios.set(key, url); this.rawAudios.set(key, url);
const audio = new Audio(); const audio = new Audio();
...@@ -537,8 +541,27 @@ export class PlayComponent implements OnInit, OnDestroy { ...@@ -537,8 +541,27 @@ export class PlayComponent implements OnInit, OnDestroy {
if (!this.data.pic_url) { if (!this.data.pic_url) {
this.data.pic_url = 'assets/play/default/pic.jpg'; this.data.pic_url = 'assets/play/default/pic.jpg';
} }
if (!this.data.wordArr) {
this.data.wordArr = this.getDefaultWordArr();
}
if(!this.data.titleArr){
this.data.titleArr = this.getDefaultTitleArr() ;
}
console.log('data', this.data);
} }
getDefaultWordArr() {
let arr = [];
return arr;
}
getDefaultTitleArr() {
let arr = [];
return arr;
}
/** /**
* 添加预加载图片 * 添加预加载图片
...@@ -722,7 +745,7 @@ export class PlayComponent implements OnInit, OnDestroy { ...@@ -722,7 +745,7 @@ export class PlayComponent implements OnInit, OnDestroy {
letter_spr.text = letter.letter_val; letter_spr.text = letter.letter_val;
letter_spr.textAlign = 'center'; letter_spr.textAlign = 'center';
letter_spr.fontSize = 60; letter_spr.fontSize = 60;
letter_spr.fontName = 'GOTHICB'; letter_spr.fontName = 'MMTextBookBold';
letter_spr.fontColor = this.getColor(colorId); letter_spr.fontColor = this.getColor(colorId);
//设置不显示 //设置不显示
letter_spr.alpha=0; letter_spr.alpha=0;
...@@ -737,7 +760,7 @@ export class PlayComponent implements OnInit, OnDestroy { ...@@ -737,7 +760,7 @@ export class PlayComponent implements OnInit, OnDestroy {
totalWidth += letter_spr.width; totalWidth += letter_spr.width;
if((i + 1) < word_content.letters.length){ if((i + 1) < word_content.letters.length){
totalWidth += 5; totalWidth += 0;
} }
//设置单词未加截完 //设置单词未加截完
...@@ -757,7 +780,7 @@ export class PlayComponent implements OnInit, OnDestroy { ...@@ -757,7 +780,7 @@ export class PlayComponent implements OnInit, OnDestroy {
startX = letter_spr_arr[i].width/2; startX = letter_spr_arr[i].width/2;
} }
else{ else{
temp_startX += letter_spr_arr[i-1].width + 5; temp_startX += letter_spr_arr[i-1].width + 0;
startX = temp_startX + letter_spr_arr[i].width/2; startX = temp_startX + letter_spr_arr[i].width/2;
} }
......
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