Merge pull request 'baigl' (#54) from baigl into main

Reviewed-on: #54

src/renderer/index.html

@@ -8,7 +8,7 @@
       http-equiv="Content-Security-Policy"
       content="default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' data:"
     /> -->
-    <meta http-equiv="Content-Security-Policy" content="connect-src * blob:; default-src 'self'; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; media-src * blob:;img-src * 'self' data: blob:" />
+    <meta http-equiv="Content-Security-Policy" content="connect-src * blob: data:; default-src 'self'; script-src 'self' 'unsafe-eval' http://www.wiris.net; style-src 'self' 'unsafe-inline' http://www.wiris.net; media-src * blob:;img-src * 'self' data: blob:;font-src 'self' http://www.wiris.net;" />
 
   </head>
 

src/renderer/src/components/tinymce/tinymce.vue

@@ -187,10 +187,10 @@ const init = reactive({
   min_height: props.minHeight,
   draggable_modal: true,
   extended_valid_elements: '*[.*]',
-  // external_plugins: {
+  external_plugins: {
-  //   tiny_mce_wiris: `/tinymce/tool/@wiris/mathtype-tinymce6/plugin.min.js`,
+    tiny_mce_wiris: `/tinymce/tool/@wiris/mathtype-tinymce6/plugin.min.js`,
-  //   //tiny_mce_wiris: `https://www.wiris.net/demo/plugins/tiny_mce/plugin.js`,
+    //tiny_mce_wiris: `https://www.wiris.net/demo/plugins/tiny_mce/plugin.js`,
-  // },
+  },
   
   // setup: function (editor) {
   // },

src/renderer/src/views/profile/components/selectClass.vue

@@ -62,10 +62,18 @@ const handleUserEduStage = (item) => {
         // 默认语文
         userStore.edusubject = '语文'
     }
+    else if(item === '高中' && userStore.edusubject === "道德与法治"){
+        // 默认语文
+        userStore.edusubject = '政治'
+    }
+    else if(item != '高中' && userStore.edusubject === "政治"){
+        // 默认语文
+        userStore.edusubject = '道德与法治'
+    }
 }
 // 选择学科
 const handleUserEduSubject = (item) => {
-    userStore.edusubject = item
+    userStore.edusubject = item;
 }
 onMounted(() => {
     getSubject()