Merge branch 'lhd'

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

@@ -83,7 +83,7 @@
         </div>
         <div ref="toolbarMenu" class="toolbar">
           <el-select v-model="itemActive.fontFamily" placeholder="请选择">
-            <el-option v-for="item in fontFamilyList" :key="item.value" :label="item.name" :value="item.value" />
+            <el-option v-for="font in fontList" :key="font.value" :label="font.label" :value="font.value" />
           </el-select>
           <span class="picker-area" :class="['tool-item', itemActive.color ? 'active' : '']">
             <el-color-picker
@@ -135,6 +135,7 @@
 <script>
 // import { publicMethods, reparse } from '@/api/api';
 import { fileUpload } from '@/api/app';
+import { fontList } from '@/common/data';
 
 export default {
   components: {},
@@ -183,6 +184,7 @@ export default {
       ],
       batch: false, // 批量选择flag
       batchList: [], // 批量选择列表
+      fontList,
     };
   },
   // 生命周期 - 创建完成（可以访问当前this实例）

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

@@ -156,7 +156,7 @@
 
       <el-form-item label="语境字体">
         <el-select v-model="property.noitce_family">
-          <el-option v-for="{ value, name } in fontFamilyList" :key="value" :label="name" :value="value" />
+          <el-option v-for="font in fontList" :key="font.value" :label="font.label" :value="font.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="语境字号">
@@ -178,6 +178,7 @@ import { getToken } from '@/utils/auth';
 import { BatchSegContent } from '@/api/article';
 const Base64 = require('js-base64').Base64;
 import { speedRatioList } from '@/views/book/courseware/data/common';
+import { fontList } from '@/common/data';
 
 import {
   getArticleProperty,
@@ -242,6 +243,7 @@ export default {
         //   name: '系统字体',
         // },
       ],
+      fontList,
     };
   },
   computed: {

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

@@ -64,7 +64,7 @@
         </div>
         <div ref="toolbarMenu" class="toolbar">
           <el-select v-model="itemActive.fontFamily" placeholder="请选择">
-            <el-option v-for="item in fontFamilyList" :key="item.value" :label="item.name" :value="item.value" />
+            <el-option v-for="font in fontList" :key="font.value" :label="font.label" :value="font.value" />
           </el-select>
           <span class="picker-area" :class="['tool-item', itemActive.color ? 'active' : '']">
             <el-color-picker
@@ -100,6 +100,7 @@
 <script>
 // import { publicMethods, reparse } from '@/api/api';
 import { fileUpload } from '@/api/app';
+import { fontList } from '@/common/data';
 
 export default {
   components: {},
@@ -146,6 +147,7 @@ export default {
         //   name: '系统字体',
         // },
       ],
+      fontList,
     };
   },
   // 生命周期 - 创建完成（可以访问当前this实例）

src/views/book/courseware/create/components/question/table/Table.vue

@@ -18,7 +18,7 @@
             style="width: 130px"
             @change="BatchSetFormat('fontFamily', data.styles.fontFamily)"
           >
-            <el-option v-for="{ value, label } in fontFamilyList" :key="value" :label="label" :value="value" />
+            <el-option v-for="font in fontList" :key="font.value" :label="font.label" :value="font.value" />
           </el-select>
           <el-select
             v-model="data.styles.fontSize"
@@ -290,10 +290,10 @@ import {
   getTableData,
   getOption,
   tableTypeList,
-  fontFamilyList,
   getAnswerOption,
   fillTypeList,
 } from '@/views/book/courseware/data/table';
+import { fontList } from '@/common/data';
 
 export default {
   name: 'TablePage',
@@ -307,7 +307,7 @@ export default {
       isEnable,
       data: getTableData(),
       tableTypeList,
-      fontFamilyList,
+      fontList,
       multilingualText: '',
       isViewExplanatoryNoteDialog: false,
       oldRichData: {},