Merge branch 'master' of http://60.205.254.193:3000/GCLS/eep_page

src/components/RichText.vue

@@ -93,7 +93,7 @@ export default {
       type: [String, Boolean],
       /* eslint-disable max-len */
       default:
-        'fontselect fontsizeselect forecolor backcolor lineheight paragraphSpacing letterSpacing indent outdent customUnderline bold italic strikethrough alignleft aligncenter alignright bullist numlist dotEmphasis image media link blockquote hr mathjax fullwidthspace',
+        'fontselect fontsizeselect forecolor backcolor lineheight paragraphSpacing letterSpacing fullwidthspace indent outdent customUnderline bold italic strikethrough alignleft aligncenter alignright bullist numlist dotEmphasis image media link blockquote hr mathjax',
     },
     wordlimitNum: {
       type: [Number, Boolean],
@@ -512,12 +512,12 @@ export default {
           // 注册自定义全角空格图标
           editor.ui.registry.addIcon(
             'fullwidthspace',
-            `<svg t="1783668748484" class="icon" viewBox="0 0 1120 724" version="1.1" p-id="2060" width="18" height="18"><path d="M511.7 283.9c-123 0-223.6 101.1-223.6 224.8s100.5 224.8 223.6 224.8 223.6-101.1 223.6-224.8-100.6-224.8-223.6-224.8z m0 74.9c82.8 0 149.1 66.6 149.1 149.9s-66.3 149.9-149.1 149.9S362.6 592 362.6 508.7s66.3-149.9 149.1-149.9z" p-id="2061"></path><path d="M886.5 137.4v748.1H138.4V137.4h748.1m73.9-73.8H64.7v895.7h895.7V63.6z m0 0" p-id="2062"></path></svg>`,
+            `<svg t="1783668748484" class="icon" viewBox="0 0 1200 724" version="1.1" p-id="2060" width="20" height="20"><path d="M511.7 283.9c-123 0-223.6 101.1-223.6 224.8s100.5 224.8 223.6 224.8 223.6-101.1 223.6-224.8-100.6-224.8-223.6-224.8z m0 74.9c82.8 0 149.1 66.6 149.1 149.9s-66.3 149.9-149.1 149.9S362.6 592 362.6 508.7s66.3-149.9 149.1-149.9z" p-id="2061"></path><path d="M886.5 137.4v748.1H138.4V137.4h748.1m73.9-73.8H64.7v895.7h895.7V63.6z m0 0" p-id="2062"></path></svg>`,
           );
           // 添加全角空格快捷方式
           editor.ui.registry.addButton('fullwidthspace', {
             icon: 'fullwidthspace',
-            tooltip: '插入全角空格',
+            tooltip: '缩进1格',
             onAction: () => {
               // \u3000 = 全角空格
               editor.insertContent('\u3000');

src/views/book/courseware/create/components/question/article/Article.vue

@@ -637,6 +637,7 @@ export default {
         is_custom_fc: 'false',
         is_vocabulary_pinyin_lt: 'true',
         is_fill_punctuation_mark: 'true',
+        is_fill_space: 'true',
       })
         .then((res) => {
           this.loading = false;
@@ -782,6 +783,7 @@ export default {
         is_custom_fc: 'true',
         is_vocabulary_pinyin_lt: 'true',
         is_fill_punctuation_mark: 'true',
+        is_fill_space: 'true',
         fc_paragraph_list: saveArr,
       }).then((res) => {
         if (res.status === 1) {

src/views/book/courseware/create/components/question/dialogue_article/Article.vue

@@ -998,6 +998,7 @@ export default {
         is_custom_fc: 'false',
         is_vocabulary_pinyin_lt: 'true',
         is_fill_punctuation_mark: 'true',
+        is_fill_space: 'true',
       })
         .then((res) => {
           this.loading = false;
@@ -1216,6 +1217,7 @@ export default {
         is_vocabulary_pinyin_lt: 'true',
         is_fill_punctuation_mark: 'true',
         fc_paragraph_list: saveArr,
+        is_fill_space: 'true',
       }).then((res) => {
         if (res.status === 1) {
           res.paragraph_list.forEach((item, index) => {

src/views/book/courseware/create/components/question/image_text/ImageText.vue

@@ -662,6 +662,7 @@ export default {
         is_custom_fc: 'true',
         is_vocabulary_pinyin_lt: 'true',
         is_fill_punctuation_mark: 'true',
+        is_fill_space: 'true',
         fc_paragraph_list: fc_list,
       }).then((res) => {
         if (res.status === 1) {
@@ -848,6 +849,7 @@ export default {
         is_custom_fc: 'false',
         is_vocabulary_pinyin_lt: 'true',
         is_fill_punctuation_mark: 'true',
+        is_fill_space: 'true',
       })
         .then((res) => {
           this.loading = false;

src/views/book/courseware/preview/components/article/components/Strockplay.vue

@@ -1,7 +1,7 @@
 <!--  -->
 <template>
   <div class="strockplayInner" :class="className">
-    <div v-if="playStorkes" class="strock-play-box" @click="playHanzi">
+    <div v-if="playStorkes" class="eep-strock-play-box" @click="playHanzi">
       <!-- <img class="strock-play" src="../../assets/common/strock-play.png"> -->
     </div>
     <div :id="targetDiv" :class="wordNum == '2' ? 'morewords' : ''" class="character-target-div"></div>

src/views/book/courseware/preview/components/article/components/Strockplayredline.vue

@@ -4,7 +4,7 @@
     <div
       v-if="playStorkes"
       :class="[
-        'strock-play-box',
+        'eep-strock-play-box',
         themeColor == 'green'
           ? 'green-border'
           : themeColor == 'red'
@@ -103,7 +103,7 @@ export default {
   background-size: 100% 100%;
 }
 
-.strock-play-box {
+.eep-strock-play-box {
   position: absolute;
   top: 0;
   right: 0;

src/views/book/courseware/preview/components/article/components/Strockred.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="strockredBox">
     <div class="strockred">
-      <div v-if="1 == 2" class="strock-play-box" @click="resetHanzi">
+      <div v-if="1 == 2" class="eep-strock-play-box" @click="resetHanzi">
         <!-- <img src="../../assets/common/strock-play.png" class="strock-play" /> -->
       </div>
       <div :id="targetDiv" :class="wordNum == '2' ? 'character-target-div_220' : ''" class="character-target-div"></div>

src/views/book/courseware/preview/components/character_base/components/Strockplayredline.vue

@@ -4,7 +4,7 @@
     class="strockplay-redInner"
     :style="{ borderColor: playColor, borderWidth: bgType === 'none' ? '0px' : '1px' }"
   >
-    <div v-if="playStorkes" :class="['strock-play-box']" :style="{ color: playColor }" @click="playHanzi">
+    <div v-if="playStorkes" :class="['eep-strock-play-box']" :style="{ color: playColor }" @click="playHanzi">
       <SvgIcon icon-class="hanzi-strock-play" class="strock-play-btn" />
     </div>
     <div class="character-target-box">
@@ -140,7 +140,7 @@ export default {
   color: #dedede;
 }
 
-.strock-play-box {
+.eep-strock-play-box {
   position: absolute;
   top: 0;
   right: 0;

src/views/book/courseware/preview/components/newWord_template/components/Strockplayredline.vue

@@ -19,7 +19,7 @@
       <svg-icon
         v-if="playStorkes"
         icon-class="play-stroke-icon"
-        :class-name="tianColor ? 'strock-play-red' : 'strock-play-box'"
+        :class-name="tianColor ? 'strock-play-red' : 'eep-strock-play-box'"
         :style="{ color: playColor ? playColor : '' }"
         @click="playHanzi"
       />
@@ -182,7 +182,7 @@ export default {
 }
 
 .strockplayRedInner {
-  .strock-play-box {
+  .eep-strock-play-box {
     position: absolute;
     top: -2px;
     right: -2px;

src/views/book/courseware/preview/components/new_word/NewWordPreview.vue

@@ -7,7 +7,7 @@
     />
 
     <main v-if="data" ref="newWordMain" class="main">
-      <div class="NPC-zhedie" :style="{ width: width + 'px' }">
+      <div class="EEP-zhedie" :style="{ width: width + 'px' }">
         <!-- :style="{
             backgroundColor:
               data.unified_attrib && data.unified_attrib.topic_color ? data.unified_attrib.topic_color : '',
@@ -2064,7 +2064,7 @@ export default {
 .newWord-preview {
   @include preview-base;
 
-  .NPC-zhedie {
+  .EEP-zhedie {
     // width: 1000px;
 
     // width: 780px;
@@ -2576,7 +2576,7 @@ export default {
             width: 40px;
             height: 40px;
 
-            .strock-play-box,
+            .eep-strock-play-box,
             .playStorkes-btn {
               z-index: 2 !important; // 1时点不了 所以只能为2
               width: 9px !important;
@@ -2855,7 +2855,7 @@ export default {
   }
 }
 
-.NPC-zhedie {
+.EEP-zhedie {
   .topTitle {
     display: flex;
     justify-content: space-between;

src/views/book/courseware/preview/components/new_word/components/Strockplay.vue

@@ -1,6 +1,11 @@
 <template>
   <div class="strockplayInner" :class="className">
-    <div v-if="playStorkes" class="strock-play-box" :style="{ width: palyWidth, height: palyWidth }" @click="playHanzi">
+    <div
+      v-if="playStorkes"
+      class="eep-strock-play-box"
+      :style="{ width: palyWidth, height: palyWidth }"
+      @click="playHanzi"
+    >
       <svg-icon
         v-if="playStorkes"
         icon-class="playStorkes"
@@ -105,7 +110,7 @@ export default {
   height: 100%; // 480px
   margin: 0 auto;
 
-  .strock-play-box {
+  .eep-strock-play-box {
     position: absolute;
     top: 0;
     right: 0;

src/views/book/courseware/preview/components/new_word/components/Strockplayredline.vue

@@ -1,7 +1,7 @@
 <!--  -->
 <template>
   <div class="strockplay-redInner">
-    <div v-if="playStorkes" :class="['strock-play-box']" @click="playHanzi">
+    <div v-if="playStorkes" :class="['eep-strock-play-box']" @click="playHanzi">
       <SvgIcon
         icon-class="hanzi-strock-play"
         class="strock-play-btn"
@@ -121,7 +121,7 @@ export default {
   color: #dedede;
 }
 
-.strock-play-box {
+.eep-strock-play-box {
   position: absolute;
   top: 0;
   right: 0;

src/views/book/courseware/preview/components/new_word/components/writeTableZoom.vue

@@ -707,7 +707,7 @@ export default {
         width: 98px;
         height: 98px;
 
-        :deep .strock-play-box {
+        :deep .eep-strock-play-box {
           width: 18px !important;
           height: 18px !important;
         }
@@ -721,7 +721,7 @@ export default {
           width: 62px;
           height: 62px;
 
-          :deep .strock-play-box {
+          :deep .eep-strock-play-box {
             width: 11px !important;
             height: 11px !important;
           }

src/views/book/courseware/preview/components/notes/NotesPreview.vue

@@ -7,7 +7,7 @@
     />
 
     <div class="main">
-      <div class="NPC-zhedie">
+      <div class="EEP-zhedie">
         <!-- :style="{
             backgroundColor:
               data.unified_attrib && data.unified_attrib.topic_color ? data.unified_attrib.topic_color : '',
@@ -272,7 +272,7 @@ export default {
 .notes-preview {
   @include preview-base;
 
-  .NPC-zhedie {
+  .EEP-zhedie {
     // margin-bottom: 24px;
 
     .topTitle-note {