natasha 1 тиждень тому
батько
коміт
f42b354bc7

+ 8 - 0
src/views/book/courseware/preview/components/new_word/NewWordPreview.vue

@@ -242,6 +242,10 @@
                             data.unified_attrib && data.unified_attrib.pinyin_size
                               ? data.unified_attrib.pinyin_size
                               : '',
+                          lineHeight:
+                            data.unified_attrib && data.unified_attrib.font_size
+                              ? data.unified_attrib.font_size.replace('pt', '') * 1.5 + 'pt'
+                              : '',
                         }"
                         v-html="sItem.pinyin"
                       >
@@ -281,6 +285,10 @@
                             data.unified_attrib && data.unified_attrib.pinyin_size
                               ? data.unified_attrib.pinyin_size
                               : '',
+                          lineHeight:
+                            data.unified_attrib && data.unified_attrib.font_size
+                              ? data.unified_attrib.font_size.replace('pt', '') * 1.5 + 'pt'
+                              : '',
                         }"
                         v-html="sItem.pinyin"
                       >

+ 34 - 1
src/views/book/courseware/preview/components/notes/NotesPreview.vue

@@ -39,12 +39,29 @@
                 <div class="NPC-notes-con-box">
                   <template v-if="isEnable(data.property.view_pinyin)">
                     <p class="pinyin-text">
-                      <span v-if="data.property.pinyin_position === 'top'" class="pinyin" v-html="item.pinyin"> </span>
+                      <span
+                        v-if="data.property.pinyin_position === 'top'"
+                        class="pinyin"
+                        v-html="item.pinyin"
+                        :style="{
+                          fontSize:
+                            data.unified_attrib && data.unified_attrib.pinyin_size
+                              ? data.unified_attrib.pinyin_size
+                              : '',
+                        }"
+                      >
+                      </span>
                       <span>
                         <span
                           v-if="data.property.pinyin_position === 'front'"
                           v-html="item.pinyin"
                           class="pinyin pinyin-front"
+                          :style="{
+                            fontSize:
+                              data.unified_attrib && data.unified_attrib.pinyin_size
+                                ? data.unified_attrib.pinyin_size
+                                : '',
+                          }"
                         ></span
                         ><span
                           class="NPC-notes-con-text"
@@ -54,18 +71,32 @@
                               data.unified_attrib && data.unified_attrib.topic_color
                                 ? data.unified_attrib.topic_color
                                 : '',
+                            fontSize:
+                              data.unified_attrib && data.unified_attrib.font_size ? data.unified_attrib.font_size : '',
                           }"
                         ></span
                         ><span
                           v-if="data.property.pinyin_position === 'back'"
                           v-html="item.pinyin"
                           class="pinyin pinyin-back"
+                          :style="{
+                            fontSize:
+                              data.unified_attrib && data.unified_attrib.pinyin_size
+                                ? data.unified_attrib.pinyin_size
+                                : '',
+                          }"
                         ></span>
                       </span>
                       <span
                         v-if="data.property.pinyin_position === 'bottom'"
                         class="pinyin"
                         v-html="item.pinyin"
+                        :style="{
+                          fontSize:
+                            data.unified_attrib && data.unified_attrib.pinyin_size
+                              ? data.unified_attrib.pinyin_size
+                              : '',
+                        }"
                       ></span>
                     </p>
                   </template>
@@ -77,6 +108,8 @@
                     :style="{
                       color:
                         data.unified_attrib && data.unified_attrib.topic_color ? data.unified_attrib.topic_color : '',
+                      fontSize:
+                        data.unified_attrib && data.unified_attrib.font_size ? data.unified_attrib.font_size : '',
                     }"
                   ></span>
                   <span class="multilingual" v-if="showLang">