Merge branch 'beta' of https://git.cocorobo.cn/CocoRoboLabs/pbl-teacher-table into beta

package-lock.json

@@ -15,6 +15,7 @@
         "clipboard": "^2.0.10",
         "cocoroboworkpc": "file:",
         "dayjs": "^1.11.7",
+        "docx-preview": "^0.3.2",
         "docxtemplater": "^3.50.0",
         "docxtemplater-image-module-free": "^1.1.1",
         "echarts": "^5.4.2",
@@ -33,7 +34,7 @@
         "jquery": "^3.6.0",
         "js-audio-recorder": "^1.0.7",
         "js-pinyin": "^0.1.9",
-        "jsmind": "^0.4.8",
+        "jsmind": "^0.4.11",
         "jspdf": "^2.5.1",
         "jszip": "^3.10.1",
         "lamejs": "^1.2.1",
@@ -55,6 +56,7 @@
         "vue": "^2.5.2",
         "vue-audio-better": "^3.0.1",
         "vue-cookies": "^1.7.4",
+        "vue-demi": "^0.14.6",
         "vue-markdown": "^2.2.4",
         "vue-pdf": "^4.2.0",
         "vue-router": "^3.0.1",
@@ -5293,6 +5295,14 @@
         "buffer-indexof": "^1.0.0"
       }
     },
+    "node_modules/docx-preview": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmmirror.com/docx-preview/-/docx-preview-0.3.2.tgz",
+      "integrity": "sha512-YRsyiiejdauCQ2boKNHKjJMiIhOCXs643+NCHnmbCM31e7JWqmPiobtzlmHOnv4i+ft9w+ajPEK1hK7VymyRXQ==",
+      "dependencies": {
+        "jszip": ">=3.0.0"
+      }
+    },
     "node_modules/docxtemplater": {
       "version": "3.50.0",
       "resolved": "https://registry.npmmirror.com/docxtemplater/-/docxtemplater-3.50.0.tgz",
@@ -8256,9 +8266,9 @@
       }
     },
     "node_modules/jsmind": {
-      "version": "0.4.8",
-      "resolved": "https://registry.npmmirror.com/jsmind/-/jsmind-0.4.8.tgz",
-      "integrity": "sha512-+wt82K5D+Ilngo2afcWyZurI6J9xJsUsp+RO+vjeu+MVcDPkAeZKGcHfomCnKwjcupWSp0MOlNB6H3cSUg9bXQ=="
+      "version": "0.4.11",
+      "resolved": "https://registry.npmmirror.com/jsmind/-/jsmind-0.4.11.tgz",
+      "integrity": "sha512-Tyy1U2S7rP/O2WUcjegWuO+S2EYcVM7QVuXkHMnVXZ97BiehmXuepQvJctpWT7bvtgJUIyLWaYxrQoyStE1CXQ=="
     },
     "node_modules/json-loader": {
       "version": "0.5.7",
@@ -17512,7 +17522,6 @@
       "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.10.tgz",
       "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
       "hasInstallScript": true,
-      "peer": true,
       "bin": {
         "vue-demi-fix": "bin/vue-demi-fix.js",
         "vue-demi-switch": "bin/vue-demi-switch.js"
@@ -21884,7 +21893,7 @@
       "version": "file:",
       "requires": {
         "@vue-office/docx": "^1.6.2",
-        "@vue/composition-api": "*",
+        "@vue/composition-api": "^1.7.2",
         "autoprefixer": "^7.1.2",
         "axios": "^0.21.1",
         "babel-core": "^6.22.1",
@@ -21902,6 +21911,7 @@
         "copy-webpack-plugin": "^4.0.1",
         "css-loader": "^0.28.0",
         "dayjs": "^1.11.7",
+        "docx-preview": "^0.3.2",
         "docxtemplater": "^3.50.0",
         "docxtemplater-image-module-free": "^1.1.1",
         "echarts": "^5.4.2",
@@ -21924,7 +21934,7 @@
         "jquery": "^3.6.0",
         "js-audio-recorder": "^1.0.7",
         "js-pinyin": "^0.1.9",
-        "jsmind": "^0.4.8",
+        "jsmind": "0.4.11",
         "jspdf": "^2.5.1",
         "jszip": "^3.10.1",
         "lamejs": "^1.2.1",
@@ -21960,6 +21970,7 @@
         "vue": "^2.5.2",
         "vue-audio-better": "^3.0.1",
         "vue-cookies": "^1.7.4",
+        "vue-demi": "^0.14.6",
         "vue-loader": "^13.3.0",
         "vue-markdown": "^2.2.4",
         "vue-pdf": "^4.2.0",
@@ -26419,6 +26430,14 @@
             "buffer-indexof": "^1.0.0"
           }
         },
+        "docx-preview": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmmirror.com/docx-preview/-/docx-preview-0.3.2.tgz",
+          "integrity": "sha512-YRsyiiejdauCQ2boKNHKjJMiIhOCXs643+NCHnmbCM31e7JWqmPiobtzlmHOnv4i+ft9w+ajPEK1hK7VymyRXQ==",
+          "requires": {
+            "jszip": ">=3.0.0"
+          }
+        },
         "docxtemplater": {
           "version": "3.50.0",
           "resolved": "https://registry.npmmirror.com/docxtemplater/-/docxtemplater-3.50.0.tgz",
@@ -28786,9 +28805,9 @@
           "dev": true
         },
         "jsmind": {
-          "version": "0.4.8",
-          "resolved": "https://registry.npmmirror.com/jsmind/-/jsmind-0.4.8.tgz",
-          "integrity": "sha512-+wt82K5D+Ilngo2afcWyZurI6J9xJsUsp+RO+vjeu+MVcDPkAeZKGcHfomCnKwjcupWSp0MOlNB6H3cSUg9bXQ=="
+          "version": "0.4.11",
+          "resolved": "https://registry.npmmirror.com/jsmind/-/jsmind-0.4.11.tgz",
+          "integrity": "sha512-Tyy1U2S7rP/O2WUcjegWuO+S2EYcVM7QVuXkHMnVXZ97BiehmXuepQvJctpWT7bvtgJUIyLWaYxrQoyStE1CXQ=="
         },
         "json-loader": {
           "version": "0.5.7",
@@ -36329,7 +36348,6 @@
           "version": "0.14.10",
           "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.10.tgz",
           "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
-          "peer": true,
           "requires": {}
         },
         "vue-hot-reload-api": {
@@ -39710,6 +39728,14 @@
         "buffer-indexof": "^1.0.0"
       }
     },
+    "docx-preview": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmmirror.com/docx-preview/-/docx-preview-0.3.2.tgz",
+      "integrity": "sha512-YRsyiiejdauCQ2boKNHKjJMiIhOCXs643+NCHnmbCM31e7JWqmPiobtzlmHOnv4i+ft9w+ajPEK1hK7VymyRXQ==",
+      "requires": {
+        "jszip": ">=3.0.0"
+      }
+    },
     "docxtemplater": {
       "version": "3.50.0",
       "resolved": "https://registry.npmmirror.com/docxtemplater/-/docxtemplater-3.50.0.tgz",
@@ -42077,9 +42103,9 @@
       "dev": true
     },
     "jsmind": {
-      "version": "0.4.8",
-      "resolved": "https://registry.npmmirror.com/jsmind/-/jsmind-0.4.8.tgz",
-      "integrity": "sha512-+wt82K5D+Ilngo2afcWyZurI6J9xJsUsp+RO+vjeu+MVcDPkAeZKGcHfomCnKwjcupWSp0MOlNB6H3cSUg9bXQ=="
+      "version": "0.4.11",
+      "resolved": "https://registry.npmmirror.com/jsmind/-/jsmind-0.4.11.tgz",
+      "integrity": "sha512-Tyy1U2S7rP/O2WUcjegWuO+S2EYcVM7QVuXkHMnVXZ97BiehmXuepQvJctpWT7bvtgJUIyLWaYxrQoyStE1CXQ=="
     },
     "json-loader": {
       "version": "0.5.7",
@@ -49620,7 +49646,6 @@
       "version": "0.14.10",
       "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.10.tgz",
       "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
-      "peer": true,
       "requires": {}
     },
     "vue-hot-reload-api": {

package.json

@@ -36,7 +36,7 @@
     "jquery": "^3.6.0",
     "js-audio-recorder": "^1.0.7",
     "js-pinyin": "^0.1.9",
-    "jsmind": "^0.4.8",
+    "jsmind": "^0.4.11",
     "jspdf": "^2.5.1",
     "jszip": "^3.10.1",
     "lamejs": "^1.2.1",

src/components/pages/aiAddCourse/jsmind2.vue

@@ -9,12 +9,11 @@
 </template>
 
 <script>
+import jsMind from "jsmind";
 import "jsmind/style/jsmind.css";
-import jsMind from "jsmind/js/jsmind.js";
-window.jsMind = jsMind;
 
-require("jsmind/js/jsmind.draggable.js");
-require("jsmind/js/jsmind.screenshot.js");
+
+
 export default {
   props: {
     showBar: {

src/components/tools/jsmind.vue

@@ -4,6 +4,8 @@
     <div class="noMind" v-if="mindV">
       <img src="../../assets/nominddata.png" alt />
     </div>
+    <el-button @click="zoomIn" size="medium" :disabled="isZoomIn">放大</el-button>
+      <el-button @click="zoomOut" size="medium" :disabled="isZoomOut" class="pad">缩小</el-button>
     <!-- <div class="jsmind_toolbar" v-if="showBar">
       <el-upload
         class="pad"
@@ -108,12 +110,12 @@
 </template>
 
 <script>
+import jsMind from "jsmind";
 import "jsmind/style/jsmind.css";
-import jsMind from "jsmind/js/jsmind.js";
-window.jsMind = jsMind;
 
-require("jsmind/js/jsmind.draggable.js");
-require("jsmind/js/jsmind.screenshot.js");
+
+
+
 export default {
   props: {
     showBar: {

src/components/tools/jsmind2.vue

@@ -9,12 +9,11 @@
 </template>
 
 <script>
+
+import jsMind from "jsmind";
 import "jsmind/style/jsmind.css";
-import jsMind from "jsmind/js/jsmind.js";
-window.jsMind = jsMind;
 
-require("jsmind/js/jsmind.draggable.js");
-require("jsmind/js/jsmind.screenshot.js");
+
 export default {
   props: {
     showBar: {