Ver Fonte

阿拉伯字体

natasha há 1 ano atrás
pai
commit
703e6f9b01

+ 2 - 2
src/components/Adult/Preview.vue

@@ -1314,7 +1314,7 @@ export default {
                   ? "#bd8865"
                   : "#e35454",
               fontFamily:
-                "Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif",
+                "Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, sans-serif, alabo",
               fontSize: "16px",
               fontWeight: "bold"
             });
@@ -1345,7 +1345,7 @@ export default {
             this.$set(item.l_title_detail, "config", {
               fontColor: "#000000",
               fontFamily:
-                "Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif",
+                "Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, sans-serif, alabo",
               fontSize: "16px"
             });
           }

+ 58 - 52
src/components/Adult/common/SegwordConfig.vue

@@ -5,11 +5,11 @@
       class="adult-book-input-item"
       v-if="
         curQue &&
-        type != 'sentence_segtemp_chs' &&
-        type != 'sort_chs' &&
-        type != 'sentence_listen_read_chs' &&
-        type!=='adultinput' &&
-        type!=='NewWord_chs'
+          type != 'sentence_segtemp_chs' &&
+          type != 'sort_chs' &&
+          type != 'sentence_listen_read_chs' &&
+          type !== 'adultinput' &&
+          type !== 'NewWord_chs'
       "
       style="margin-top: 10px"
     >
@@ -29,9 +29,9 @@
       class="adult-book-input-item"
       v-if="
         curQue &&
-        type != 'sentence_segtemp_chs' &&
-        type != 'sort_chs' &&
-        type != 'sentence_listen_read_chs'
+          type != 'sentence_segtemp_chs' &&
+          type != 'sort_chs' &&
+          type != 'sentence_listen_read_chs'
       "
     >
       <span class="adult-book-lable">字体:</span>
@@ -49,7 +49,7 @@
       </el-radio-group>
     </div>
     <el-table :data="data" border style="width: 75%">
-      <el-table-column prop="chs" label="词" width="120"> 
+      <el-table-column prop="chs" label="词" width="120">
         <template slot-scope="scope">
           <div class="adult-book-input-item">
             <el-input
@@ -61,7 +61,7 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="拼音" width="220" v-if="type!=='adultinput'">
+      <el-table-column label="拼音" width="220" v-if="type !== 'adultinput'">
         <template slot-scope="scope">
           <div class="adult-book-input-item">
             <el-input
@@ -79,13 +79,13 @@
       </el-table-column>
       <el-table-column
         label="配置"
-        v-if="
-          type != 'sort_chs' &&
-          type != 'sentence_listen_read_chs' 
-        "
+        v-if="type != 'sort_chs' && type != 'sentence_listen_read_chs'"
       >
         <template slot-scope="scope">
-          <div class="adult-book-input-item" v-if="type!=='adultinput'&&type!=='NewWord_chs'">
+          <div
+            class="adult-book-input-item"
+            v-if="type !== 'adultinput' && type !== 'NewWord_chs'"
+          >
             <span class="adult-book-lable">字的大小:</span>
             <el-radio-group v-model="scope.row.fontSize">
               <el-radio label="12px">12px</el-radio>
@@ -125,7 +125,10 @@
               </el-radio>
             </el-radio-group>
           </div>
-          <div class="adult-book-input-item" v-if="type!=='adultinput'&&type!=='NewWord_chs'">
+          <div
+            class="adult-book-input-item"
+            v-if="type !== 'adultinput' && type !== 'NewWord_chs'"
+          >
             <span class="adult-book-lable">设置下划线:</span>
             <el-checkbox v-model="scope.row.underLine">显示下划线</el-checkbox>
           </div>
@@ -133,12 +136,12 @@
             class="adult-book-input-item"
             v-if="
               type != 'sentence_segtemp_chs' &&
-              type != 'dialogue_answer_chs' &&
-              type != 'sentence_input_chs' &&
-              type != 'sentence_judge_chs' &&
-              type != 'sentence_record_chs' &&
-              type != 'sentence_input_record_chs' &&
-              type != 'sentence_listen_read_chs'
+                type != 'dialogue_answer_chs' &&
+                type != 'sentence_input_chs' &&
+                type != 'sentence_judge_chs' &&
+                type != 'sentence_record_chs' &&
+                type != 'sentence_input_record_chs' &&
+                type != 'sentence_listen_read_chs'
             "
           >
             <span class="adult-book-lable">设置间距:</span>
@@ -152,20 +155,22 @@
               </el-checkbox>
             </el-checkbox-group>
           </div>
-          <template v-if="type==='dialogue_answer_chs'">
+          <template v-if="type === 'dialogue_answer_chs'">
             <div class="adult-book-input-item">
-                <span class="adult-book-lable">对齐方式:</span>
-                <el-radio-group
-                    v-model="scope.row.DiaTextAlign"
-                >
-                    <el-radio label="left">左对齐</el-radio>
-                    <el-radio label="center">居中对齐</el-radio>
-                    <el-radio label="right">右对齐</el-radio>
-                </el-radio-group>
+              <span class="adult-book-lable">对齐方式:</span>
+              <el-radio-group v-model="scope.row.DiaTextAlign">
+                <el-radio label="left">左对齐</el-radio>
+                <el-radio label="center">居中对齐</el-radio>
+                <el-radio label="right">右对齐</el-radio>
+              </el-radio-group>
             </div>
             <div class="adult-book-input-item">
-                <span class="adult-book-lable">横线长度:</span>
-                <el-input type="number" v-model="scope.row.DiaInputLength" style="width:150px"></el-input>
+              <span class="adult-book-lable">横线长度:</span>
+              <el-input
+                type="number"
+                v-model="scope.row.DiaInputLength"
+                style="width:150px"
+              ></el-input>
             </div>
           </template>
         </template>
@@ -185,41 +190,42 @@ export default {
       colorList: [
         {
           value: "#000",
-          name: "黑色",
+          name: "黑色"
         },
         {
           value: "sub",
-          name: "主题色",
-        },
+          name: "主题色"
+        }
       ],
       paddingList: [
         {
           value: "left",
-          name: "要左边距",
+          name: "要左边距"
         },
         {
           value: "right",
-          name: "要右边距",
-        },
+          name: "要右边距"
+        }
       ],
       fontFamilyList: [
         {
           value: "FZJCGFKTK",
-          name: "使用中文字体",
+          name: "使用中文字体"
         },
         {
           value: "Sans-GBNPC",
-          name: "使用拼音字体",
+          name: "使用拼音字体"
         },
         {
           value: "robot",
-          name: "使用英文字体",
+          name: "使用英文字体"
         },
         {
-          value: "Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif",
-          name: "系统字体",
-        },
-      ],
+          value:
+            "Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, sans-serif, alabo",
+          name: "系统字体"
+        }
+      ]
     };
   },
   computed: {},
@@ -234,15 +240,15 @@ export default {
       item.pinyin = result;
     },
     changeResetFontsize(value) {
-      this.data.forEach((item) => {
+      this.data.forEach(item => {
         item.fontSize = value;
       });
     },
     changeResetFontfamily(value) {
-      this.data.forEach((item) => {
+      this.data.forEach(item => {
         item.fontFamily = value;
       });
-    },
+    }
   },
   //生命周期 - 创建完成(可以访问当前this实例)
   created() {},
@@ -263,10 +269,10 @@ export default {
   updated() {}, //生命周期 - 更新之后
   beforeDestroy() {}, //生命周期 - 销毁之前
   destroyed() {}, //生命周期 - 销毁完成
-  activated() {}, //如果页面有keep-alive缓存功能,这个函数会触发
+  activated() {} //如果页面有keep-alive缓存功能,这个函数会触发
 };
 </script>
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 //@import url(); 引入公共css类
 .adult-book-input-item {
   display: flex;
@@ -305,4 +311,4 @@ export default {
   border-radius: 100%;
   display: block;
 }
-</style>
+</style>

+ 66 - 57
src/components/Adult/common/SentenceSegTemp.vue

@@ -18,7 +18,7 @@
           </el-option>
         </el-select>
       </div>
-      <div class="adult-book-input-item" v-if="type!=='config_table'">
+      <div class="adult-book-input-item" v-if="type !== 'config_table'">
         <el-button type="primary" size="small" @click="setConfig" style="margin"
           >功能设置</el-button
         >
@@ -48,11 +48,11 @@
       </div>
     </div>
     <div class="adult-book-input-item">
-        <span class="adult-book-lable">句子缩进:</span>
-        <el-radio-group v-model="detail.textindent">
-            <el-radio :label="true">是</el-radio>
-            <el-radio :label="false">否</el-radio>
-        </el-radio-group>
+      <span class="adult-book-lable">句子缩进:</span>
+      <el-radio-group v-model="detail.textindent">
+        <el-radio :label="true">是</el-radio>
+        <el-radio :label="false">否</el-radio>
+      </el-radio-group>
     </div>
     <div
       class="sentence-option"
@@ -81,7 +81,12 @@
         >
       </div>
       <template>
-        <SentenceSegwordChs :curQue="dItem" :segModel="segModel" name="元素" :type="type" />
+        <SentenceSegwordChs
+          :curQue="dItem"
+          :segModel="segModel"
+          name="元素"
+          :type="type"
+        />
         <div class="adult-book-input-item" style="margin-top: 10px">
           <span class="adult-book-lable">图片:</span>
           <Upload
@@ -98,7 +103,7 @@
           <span class="adult-book-lable">字体:</span>
           <el-radio-group
             v-model="dItem.config.fontFamily"
-            @input="(value) => changefontFamily(value, dItem)"
+            @input="value => changefontFamily(value, dItem)"
           >
             <el-radio
               v-for="(item, index) in fontFamilyList"
@@ -113,7 +118,7 @@
           <span class="adult-book-lable">字的大小:</span>
           <el-radio-group
             v-model="dItem.config.fontSize"
-            @input="(value) => changefontSize(value, dItem)"
+            @input="value => changefontSize(value, dItem)"
           >
             <el-radio label="12px">12px</el-radio>
             <el-radio label="16px">16px</el-radio>
@@ -155,8 +160,7 @@
         </div>
         <div class="adult-book-input-item">
           <span class="adult-book-lable">输入内容:</span>
-          <el-radio-group v-model="dItem.config.conAlign"
-            >     
+          <el-radio-group v-model="dItem.config.conAlign">
             <el-radio label="left">左对齐</el-radio>
             <el-radio label="center">居中对齐</el-radio>
           </el-radio-group>
@@ -207,82 +211,83 @@ export default {
       inputLegOptions: [
         {
           name: "系统默认值",
-          value: -1,
+          value: -1
         },
         {
           name: "约1个汉字的宽度",
-          value: 1,
+          value: 1
         },
         {
           name: "约2个汉字的宽度",
-          value: 2,
+          value: 2
         },
         {
           name: "约3个汉字的宽度",
-          value: 3,
+          value: 3
         },
         {
           name: "约4个汉字的宽度",
-          value: 4,
+          value: 4
         },
         {
           name: "约5个汉字的宽度",
-          value: 5,
-        },
+          value: 5
+        }
       ],
       colorList: [
         {
           value: "#000",
-          name: "黑色",
+          name: "黑色"
         },
         {
           value: "sub",
-          name: "辅助色",
+          name: "辅助色"
         },
         {
           value: "#FF8730",
-          name: "橙色",
+          name: "橙色"
         },
         {
           value: "#3CB4E7",
-          name: "蓝色",
+          name: "蓝色"
         },
         {
           value: "#ED5050",
-          name: "浅红色",
+          name: "浅红色"
         },
         {
           value: "#FF3F3F",
-          name: "红色",
-        },
+          name: "红色"
+        }
       ],
       paddingList: [
         {
           value: "left",
-          name: "要左边距",
+          name: "要左边距"
         },
         {
           value: "right",
-          name: "要右边距",
-        },
+          name: "要右边距"
+        }
       ],
       fontFamilyList: [
         {
           value: "FZJCGFKTK",
-          name: "使用中文字体",
+          name: "使用中文字体"
         },
         {
           value: "Sans-GBNPC",
-          name: "使用拼音字体",
+          name: "使用拼音字体"
         },
         {
           value: "robot",
-          name: "使用英文字体",
+          name: "使用英文字体"
         },
         {
-          value: "Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif",
-          name: "系统字体",
-        },
+          value:
+            "Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, sans-serif, alabo",
+          name: "系统字体"
+        }
       ],
       configVisible: false,
       items: null,
@@ -291,25 +296,25 @@ export default {
           {
             type: "sentence_record_mini_chs",
             name: "录音控件-mini",
-            isFn: false,
+            isFn: false
           },
           {
             type: "sentence_record_normal_chs",
             name: "录音控件-normal",
-            isFn: false,
+            isFn: false
           },
           {
             type: "sentence_record_pro_chs",
             name: "录音控件-pro",
-            isFn: false,
+            isFn: false
           },
           {
             type: "sentence_record_promax_chs",
             name: "录音控件-promax",
-            isFn: false,
-          },
-        ],
-      },
+            isFn: false
+          }
+        ]
+      }
     };
   },
   computed: {},
@@ -317,13 +322,13 @@ export default {
   //方法集合
   methods: {
     changefontFamily(value, dItem) {
-    //   if (value == "FZJCGFKTK") {
-    //     dItem.config.fontSize = "16px";
-    //   } else if (value == "Sans-GBNPC") {
-    //     dItem.config.fontSize = "16px";
-    //   } else if (value == "robot") {
-    //     dItem.config.fontSize = "16px";
-    //   }
+      //   if (value == "FZJCGFKTK") {
+      //     dItem.config.fontSize = "16px";
+      //   } else if (value == "Sans-GBNPC") {
+      //     dItem.config.fontSize = "16px";
+      //   } else if (value == "robot") {
+      //     dItem.config.fontSize = "16px";
+      //   }
       if (dItem && dItem.wordsList && dItem.wordsList.length > 0) {
         dItem.wordsList.forEach((item, index) => {
           item.fontFamily = value;
@@ -350,8 +355,8 @@ export default {
           fontColor: "#000",
           fontFamily: "FZJCGFKTK",
           wordPadding: [],
-          conAlign: 'center'
-        },
+          conAlign: "center"
+        }
       };
       this.detail.detail.push(JSON.parse(JSON.stringify(obj)));
     },
@@ -365,7 +370,11 @@ export default {
         this.detail.detail.splice(index + 1, 1);
       }
       if (type == "down" && index < this.detail.detail.length - 1) {
-        this.detail.detail[index] = this.detail.detail.splice(index + 1, 1, this.detail.detail[index])[0]
+        this.detail.detail[index] = this.detail.detail.splice(
+          index + 1,
+          1,
+          this.detail.detail[index]
+        )[0];
       }
     },
     //功能设置
@@ -380,12 +389,12 @@ export default {
     timuchangeImage(fileList, duration, index) {
       const articleImgList = JSON.parse(JSON.stringify(fileList));
       const articleImgRes = [];
-      articleImgList.forEach((item) => {
+      articleImgList.forEach(item => {
         if (item.response) {
           const obj = {
             name: item.name,
             url: item.response.file_info_list[0].file_url,
-            id: "[FID##" + item.response.file_info_list[0].file_id + "##FID]",
+            id: "[FID##" + item.response.file_info_list[0].file_id + "##FID]"
           };
           articleImgRes.push(obj);
         }
@@ -394,7 +403,7 @@ export default {
       this.detail.detail[index].img_list = JSON.parse(
         JSON.stringify(articleImgRes)
       );
-    },
+    }
   },
   //生命周期 - 创建完成(可以访问当前this实例)
   created() {},
@@ -408,10 +417,10 @@ export default {
   updated() {}, //生命周期 - 更新之后
   beforeDestroy() {}, //生命周期 - 销毁之前
   destroyed() {}, //生命周期 - 销毁完成
-  activated() {}, //如果页面有keep-alive缓存功能,这个函数会触发
+  activated() {} //如果页面有keep-alive缓存功能,这个函数会触发
 };
 </script>
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 //@import url(); 引入公共css类
 .sentence-option {
   border: 1px #ccc solid;
@@ -460,4 +469,4 @@ export default {
   display: flex;
   justify-content: space-between;
 }
-</style>
+</style>

+ 1 - 1
src/components/Adult/inputModules/ArticleTemChs/components/SegbywordChs.vue

@@ -238,7 +238,7 @@ export default {
         },
         {
           value:
-            "Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif",
+            "Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, sans-serif, alabo",
           name: "系统字体"
         }
       ]

+ 1 - 1
src/components/Adult/inputModules/DialogueArticleChs/components/SegbywordChs.vue

@@ -226,7 +226,7 @@ export default {
         },
         {
           value:
-            "Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif",
+            "Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, sans-serif, alabo",
           name: "系统字体"
         }
       ]

+ 36 - 35
src/components/Adult/preview/Notes.vue

@@ -2,21 +2,19 @@
   <div class="NPC-zhedie">
     <div class="topTitle">
       <div class="NPC-top-left">
-        <template v-if="curQue.conDetail&&curQue.conDetail.sentence">
-            <div class="item-intro">
-                <OneSentenceTemp
-                    :detail="curQue.conDetail"
-                    :TaskModel="TaskModel"
-                    :Bookanswer="[]"
-                    :correctAnswer="[]"
-                    :isInput="
-                        false
-                    "
-                    :fn_check_list="[]"
-                    :pyNumber="0"
-                    :record_check="[]"
-                />
-            </div>
+        <template v-if="curQue.conDetail && curQue.conDetail.sentence">
+          <div class="item-intro">
+            <OneSentenceTemp
+              :detail="curQue.conDetail"
+              :TaskModel="TaskModel"
+              :Bookanswer="[]"
+              :correctAnswer="[]"
+              :isInput="false"
+              :fn_check_list="[]"
+              :pyNumber="0"
+              :record_check="[]"
+            />
+          </div>
         </template>
         <span class="NPC-topTitle-text" v-else>{{ curQue.title }}</span>
       </div>
@@ -69,13 +67,15 @@ export default {
     WordPhraseDetail,
     OneSentenceTemp
   },
-  props: ["curQue","TaskModel"],
+  props: ["curQue", "TaskModel"],
   data() {
     //这里存放数据
     return {
-      wordShow: this.curQue.hasOwnProperty("isWordShow")?this.curQue.isWordShow:true,
+      wordShow: this.curQue.hasOwnProperty("isWordShow")
+        ? this.curQue.isWordShow
+        : true,
       chsFhList: [",", "。", "“", ":", "》", "?", "!", ";"],
-      titleChsFhList:[",", "”","。",":", "》", "?", "!", ";"],
+      titleChsFhList: [",", "”", "。", ":", "》", "?", "!", ";"]
     };
   },
   //计算属性 类似于data概念
@@ -94,26 +94,27 @@ export default {
       } else {
         sItem.isShow = true;
       }
-    },
+    }
   },
   //生命周期 - 创建完成(可以访问当前this实例)
   created() {
-    if(this.curQue.hasOwnProperty("conDetail")){
-        if (this.curQue.conDetail.wordsList.length > 0) {
-            this.curQue.conDetail.wordsList.forEach((sItem, sIndex) => {
-                this.mergeWordSymbol(sItem);
-                sItem.fontColor='rgba(255, 255, 255, 1)'
-                sItem.fontSize = '16px'
-                sItem.fontWeight = 'bold'
-            });
-        } 
-        this.$set(this.curQue.conDetail, "config", {
-            fontColor:'#fff',
-            fontFamily: 'Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif',
-            fontSize: '16px',
-            fontWeight: 'bold'
+    if (this.curQue.hasOwnProperty("conDetail")) {
+      if (this.curQue.conDetail.wordsList.length > 0) {
+        this.curQue.conDetail.wordsList.forEach((sItem, sIndex) => {
+          this.mergeWordSymbol(sItem);
+          sItem.fontColor = "rgba(255, 255, 255, 1)";
+          sItem.fontSize = "16px";
+          sItem.fontWeight = "bold";
         });
       }
+      this.$set(this.curQue.conDetail, "config", {
+        fontColor: "#fff",
+        fontFamily:
+          "Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, sans-serif, alabo",
+        fontSize: "16px",
+        fontWeight: "bold"
+      });
+    }
   },
   //生命周期 - 挂载完成(可以访问DOM元素)
   mounted() {},
@@ -130,7 +131,7 @@ export default {
   //生命周期-销毁完成
   destoryed() {},
   //如果页面有keep-alive缓存功能,这个函数会触发
-  activated() {},
+  activated() {}
 };
 </script>
 <style lang="scss" scoped>
@@ -312,4 +313,4 @@ export default {
     padding: 4px 0;
   }
 }
-</style>
+</style>

+ 3 - 3
src/components/Adult/preview/PreviewDialogueNPC.vue

@@ -1088,7 +1088,7 @@ export default {
                   ? "#bd8865"
                   : "#e35454",
               fontFamily:
-                "Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif",
+                "Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, sans-serif, alabo",
               fontSize: "16px",
               fontWeight: "bold"
             });
@@ -1104,7 +1104,7 @@ export default {
             this.$set(item.f_title_detail, "config", {
               fontColor: "#000000",
               fontFamily:
-                "Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif",
+                "Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, sans-seri, alabo",
               fontSize: "16px"
             });
           }
@@ -1119,7 +1119,7 @@ export default {
             this.$set(item.l_title_detail, "config", {
               fontColor: "#000000",
               fontFamily:
-                "Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif",
+                "Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, sans-serif,alabo",
               fontSize: "16px"
             });
           }

+ 1 - 1
src/components/Adult/preview/WordPhrase.vue

@@ -584,7 +584,7 @@ export default {
         this.$set(this.curQue.conDetail, "config", {
           fontColor: "#fff",
           fontFamily:
-            "Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif",
+            "Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, sans-serif, alabo",
           fontSize: "16px",
           fontWeight: "bold"
         });