|
|
@@ -141,9 +141,34 @@
|
|
|
item.timeList && item.timeList.length > 0 && item.timeList[pItem.sentIndex].ed,
|
|
|
)
|
|
|
"
|
|
|
+ :style="{
|
|
|
+ fontSize: attrib && attrib.pinyin_size ? attrib.pinyin_size : '14px',
|
|
|
+ height:
|
|
|
+ attrib && attrib.pinyin_size
|
|
|
+ ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt'
|
|
|
+ : '22px',
|
|
|
+ }"
|
|
|
>{{ pItem.pinyin }}</span
|
|
|
>
|
|
|
- <span class="NNPE-chs">
|
|
|
+ <span
|
|
|
+ class="NNPE-chs"
|
|
|
+ :style="{
|
|
|
+ fontFamily: pItem.config.fontFamily,
|
|
|
+ height:
|
|
|
+ attrib && attrib.font_size ? attrib.font_size.replace('pt', '') * 1.4 + 'pt' : '28px',
|
|
|
+ fontSize: attrib && attrib.font_size ? attrib.font_size : '20px',
|
|
|
+ lineHeight:
|
|
|
+ attrib && attrib.font_size ? attrib.font_size.replace('pt', '') * 1.4 + 'pt' : '28px',
|
|
|
+ display: 'inline-block',
|
|
|
+ color:
|
|
|
+ paraIndex == pItem.paraIndex &&
|
|
|
+ sentIndex == pItem.sentIndex &&
|
|
|
+ wordIndex == pItem.wordIndex &&
|
|
|
+ attrib
|
|
|
+ ? attrib.topic_color
|
|
|
+ : '',
|
|
|
+ }"
|
|
|
+ >
|
|
|
<template>
|
|
|
<span
|
|
|
v-for="(wItem, wIndex) in pItem.leg"
|
|
|
@@ -167,7 +192,10 @@
|
|
|
"
|
|
|
:style="{
|
|
|
fontFamily: pItem.config.fontFamily,
|
|
|
- height: '28px',
|
|
|
+ height:
|
|
|
+ attrib && attrib.font_size
|
|
|
+ ? attrib.font_size.replace('pt', '') * 1.4 + 'pt'
|
|
|
+ : '28px',
|
|
|
display: 'inline-block',
|
|
|
color:
|
|
|
pItem.chstimeList &&
|
|
|
@@ -177,6 +205,11 @@
|
|
|
attrib
|
|
|
? attrib.topic_color
|
|
|
: '',
|
|
|
+ fontSize: attrib && attrib.font_size ? attrib.font_size : '20px',
|
|
|
+ lineHeight:
|
|
|
+ attrib && attrib.font_size
|
|
|
+ ? attrib.font_size.replace('pt', '') * 1.4 + 'pt'
|
|
|
+ : '28px',
|
|
|
}"
|
|
|
>{{ NumberList.indexOf(pItem.pinyin) == -1 ? pItem.chs[wIndex] : '' }}</span
|
|
|
>
|
|
|
@@ -198,6 +231,13 @@
|
|
|
item.timeList && item.timeList.length > 0 && item.timeList[pItem.sentIndex].ed,
|
|
|
)
|
|
|
"
|
|
|
+ :style="{
|
|
|
+ fontSize: attrib && attrib.pinyin_size ? attrib.pinyin_size : '14px',
|
|
|
+ height:
|
|
|
+ attrib && attrib.pinyin_size
|
|
|
+ ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt'
|
|
|
+ : '22px',
|
|
|
+ }"
|
|
|
>{{ pItem.pinyin }}</span
|
|
|
>
|
|
|
</span>
|
|
|
@@ -216,6 +256,13 @@
|
|
|
)
|
|
|
"
|
|
|
style="text-align: left"
|
|
|
+ :style="{
|
|
|
+ fontSize: attrib && attrib.pinyin_size ? attrib.pinyin_size : '14px',
|
|
|
+ height:
|
|
|
+ attrib && attrib.pinyin_size
|
|
|
+ ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt'
|
|
|
+ : '22px',
|
|
|
+ }"
|
|
|
>{{ item.wordsList[pIndex + 1].pinyin }}</span
|
|
|
>
|
|
|
<span
|
|
|
@@ -241,7 +288,8 @@
|
|
|
"
|
|
|
:style="{
|
|
|
fontFamily: item.wordsList[pIndex + 1].config.fontFamily,
|
|
|
- height: '28px',
|
|
|
+ height:
|
|
|
+ attrib && attrib.font_size ? attrib.font_size.replace('pt', '') * 1.4 + 'pt' : '28px',
|
|
|
display: 'inline-block',
|
|
|
color:
|
|
|
pItem.chstimeList &&
|
|
|
@@ -252,6 +300,9 @@
|
|
|
attrib
|
|
|
? attrib.topic_color
|
|
|
: '',
|
|
|
+ fontSize: attrib && attrib.font_size ? attrib.font_size : '20px',
|
|
|
+ lineHeight:
|
|
|
+ attrib && attrib.font_size ? attrib.font_size.replace('pt', '') * 1.4 + 'pt' : '28px',
|
|
|
}"
|
|
|
>{{
|
|
|
NumberList.indexOf(item.wordsList[pIndex + 1].pinyin) == -1
|
|
|
@@ -273,6 +324,13 @@
|
|
|
)
|
|
|
"
|
|
|
style="text-align: left"
|
|
|
+ :style="{
|
|
|
+ fontSize: attrib && attrib.pinyin_size ? attrib.pinyin_size : '14px',
|
|
|
+ height:
|
|
|
+ attrib && attrib.pinyin_size
|
|
|
+ ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt'
|
|
|
+ : '22px',
|
|
|
+ }"
|
|
|
>{{ item.wordsList[pIndex + 1].pinyin }}</span
|
|
|
>
|
|
|
</span>
|
|
|
@@ -301,6 +359,13 @@
|
|
|
)
|
|
|
"
|
|
|
style="text-align: left"
|
|
|
+ :style="{
|
|
|
+ fontSize: attrib && attrib.pinyin_size ? attrib.pinyin_size : '14px',
|
|
|
+ height:
|
|
|
+ attrib && attrib.pinyin_size
|
|
|
+ ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt'
|
|
|
+ : '22px',
|
|
|
+ }"
|
|
|
>{{ item.wordsList[pIndex + 2].pinyin }}</span
|
|
|
>
|
|
|
<span
|
|
|
@@ -326,7 +391,8 @@
|
|
|
"
|
|
|
:style="{
|
|
|
fontFamily: item.wordsList[pIndex + 2].config.fontFamily,
|
|
|
- height: '28px',
|
|
|
+ height:
|
|
|
+ attrib && attrib.font_size ? attrib.font_size.replace('pt', '') * 1.4 + 'pt' : '28px',
|
|
|
display: 'inline-block',
|
|
|
color:
|
|
|
pItem.chstimeList &&
|
|
|
@@ -337,6 +403,9 @@
|
|
|
attrib
|
|
|
? attrib.topic_color
|
|
|
: '',
|
|
|
+ fontSize: attrib && attrib.font_size ? attrib.font_size : '20px',
|
|
|
+ lineHeight:
|
|
|
+ attrib && attrib.font_size ? attrib.font_size.replace('pt', '') * 1.4 + 'pt' : '28px',
|
|
|
}"
|
|
|
>{{
|
|
|
NumberList.indexOf(item.wordsList[pIndex + 2].pinyin) == -1
|
|
|
@@ -360,6 +429,13 @@
|
|
|
)
|
|
|
"
|
|
|
style="text-align: left"
|
|
|
+ :style="{
|
|
|
+ fontSize: attrib && attrib.pinyin_size ? attrib.pinyin_size : '14px',
|
|
|
+ height:
|
|
|
+ attrib && attrib.pinyin_size
|
|
|
+ ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt'
|
|
|
+ : '22px',
|
|
|
+ }"
|
|
|
>{{ item.wordsList[pIndex + 2].pinyin }}</span
|
|
|
>
|
|
|
</span>
|
|
|
@@ -382,6 +458,11 @@
|
|
|
item.timeList && item.timeList.length > 0 && item.timeList[pItem.sentIndex].ed,
|
|
|
)
|
|
|
"
|
|
|
+ :style="{
|
|
|
+ fontSize: attrib && attrib.pinyin_size ? attrib.pinyin_size : '14px',
|
|
|
+ height:
|
|
|
+ attrib && attrib.pinyin_size ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt' : '22px',
|
|
|
+ }"
|
|
|
>{{ pItem.pinyin }}</span
|
|
|
>
|
|
|
|
|
|
@@ -389,6 +470,22 @@
|
|
|
v-if="pItem.chs != '#'"
|
|
|
class="NNPE-chs"
|
|
|
:class="[pItem.chs != '“' && pItem.padding && config.isShowPY ? 'padding' : '']"
|
|
|
+ :style="{
|
|
|
+ fontFamily: pItem.config.fontFamily,
|
|
|
+ height:
|
|
|
+ attrib && attrib.font_size ? attrib.font_size.replace('pt', '') * 1.4 + 'pt' : '28px',
|
|
|
+ fontSize: attrib && attrib.font_size ? attrib.font_size : '20px',
|
|
|
+ lineHeight:
|
|
|
+ attrib && attrib.font_size ? attrib.font_size.replace('pt', '') * 1.4 + 'pt' : '28px',
|
|
|
+ display: 'inline-block',
|
|
|
+ color:
|
|
|
+ paraIndex == pItem.paraIndex &&
|
|
|
+ sentIndex == pItem.sentIndex &&
|
|
|
+ wordIndex == pItem.wordIndex &&
|
|
|
+ attrib
|
|
|
+ ? attrib.topic_color
|
|
|
+ : '',
|
|
|
+ }"
|
|
|
>
|
|
|
<template>
|
|
|
<span
|
|
|
@@ -413,7 +510,8 @@
|
|
|
"
|
|
|
:style="{
|
|
|
fontFamily: pItem.config.fontFamily,
|
|
|
- height: '28px',
|
|
|
+ height:
|
|
|
+ attrib && attrib.font_size ? attrib.font_size.replace('pt', '') * 1.4 + 'pt' : '28px',
|
|
|
display: 'inline-block',
|
|
|
color:
|
|
|
pItem.chstimeList &&
|
|
|
@@ -423,6 +521,9 @@
|
|
|
attrib
|
|
|
? attrib.topic_color
|
|
|
: '',
|
|
|
+ fontSize: attrib && attrib.font_size ? attrib.font_size : '20px',
|
|
|
+ lineHeight:
|
|
|
+ attrib && attrib.font_size ? attrib.font_size.replace('pt', '') * 1.4 + 'pt' : '28px',
|
|
|
}"
|
|
|
>{{ NumberList.indexOf(pItem.pinyin) == -1 ? pItem.chs[wIndex] : '' }}</span
|
|
|
>
|
|
|
@@ -445,6 +546,11 @@
|
|
|
item.timeList && item.timeList.length > 0 && item.timeList[pItem.sentIndex].ed,
|
|
|
)
|
|
|
"
|
|
|
+ :style="{
|
|
|
+ fontSize: attrib && attrib.pinyin_size ? attrib.pinyin_size : '14px',
|
|
|
+ height:
|
|
|
+ attrib && attrib.pinyin_size ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt' : '22px',
|
|
|
+ }"
|
|
|
>{{ pItem.pinyin }}</span
|
|
|
>
|
|
|
</template>
|
|
|
@@ -1090,6 +1196,7 @@ export default {
|
|
|
|
|
|
.NNPE-words {
|
|
|
float: left;
|
|
|
+ padding-bottom: 5px;
|
|
|
|
|
|
&-box {
|
|
|
float: left;
|
|
|
@@ -1102,7 +1209,7 @@ export default {
|
|
|
font-family: 'League';
|
|
|
font-size: 14px;
|
|
|
font-weight: normal;
|
|
|
- line-height: 22px;
|
|
|
+ line-height: 1.5;
|
|
|
color: #000;
|
|
|
|
|
|
&.noFont {
|
|
|
@@ -1121,7 +1228,7 @@ export default {
|
|
|
&.NNPE-chs {
|
|
|
font-family: '楷体';
|
|
|
font-size: 20px;
|
|
|
- line-height: 28px;
|
|
|
+ line-height: 1.4;
|
|
|
color: #000;
|
|
|
|
|
|
&.active {
|
|
|
@@ -1163,7 +1270,7 @@ export default {
|
|
|
font-family: 'League';
|
|
|
font-size: 14px;
|
|
|
font-weight: normal;
|
|
|
- line-height: 22px;
|
|
|
+ line-height: 1.5;
|
|
|
color: #000;
|
|
|
|
|
|
&.noFont {
|
|
|
@@ -1182,7 +1289,7 @@ export default {
|
|
|
&.NNPE-chs {
|
|
|
font-family: '楷体';
|
|
|
font-size: 20px;
|
|
|
- line-height: 28px;
|
|
|
+ line-height: 1.4;
|
|
|
color: #000;
|
|
|
|
|
|
&.active {
|