zydx-plus 1.35.470 → 1.35.472

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zydx-plus",
-  "version": "1.35.470",
+  "version": "1.35.472",
   "description": "Vue.js",
   "main": "src/index.js",
   "files": [
@@ -49,7 +49,8 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "tldraw": "^2.0.2",
-    "@tldraw/editor": "^2.0.2"
+    "@tldraw/editor": "^2.0.2",
+    "buffer": "^5.7.1"
   },
   "peerDependencies": {
     "vue": "^3.2.13"

package/src/components/seek/src/word.css

@@ -161,10 +161,10 @@ input[name='check'] {
     left: 0;
 }
 .subject-but{
-    position: relative;
+    display: inline-block;
+    float: right;
 }
 .subject-but b{
-    position: absolute;
     z-index: 1;
     display: flex;
 }

package/src/components/seek/src/word.vue

@@ -9,9 +9,9 @@
             <span :style="{'font-weight': titleCrude?700:'normal'}">{{ item.order ? item.order : index + 1 }}{{ item.order === ' ' ? '' : '.' }}<em
                 v-html="item.title"></em><em v-if="scoreShow">({{ item.score }}分)</em>
                                <i class="subject-but" ref="subject">
-                                 <b :style="{right: -item.right + 'px', top: item.top + 'px'}" ref="b">
+                                 <!-- <b :style="{right: -item.right + 'px', top: item.top + 'px'}" ref="b"> -->
                                        <button class="but" :disabled="it.disabled" v-for="(it) in item.customBut" :class="{'buts-actives theme-text': it.active&&it.butStart,'buts-disabled': it.disabled}" @click="customButTap(it,item)">{{ it.active? it.nameActive: it.name }}</button>
-                                   </b>
+                                   <!-- </b> -->
                                </i>
                            </span>
           </div>
@@ -181,9 +181,11 @@ export default {
       })
       if( copy.length && this.value.length) {
         copy.forEach((item, index) => {
-          if(item.resourceId===this.value[index].resourceId){
-            this.value[index].open = item.open
-            this.value[index].customBut[0].active = item.open
+          if(this.value[index]){
+            if(item.resourceId===this.value[index].resourceId){
+              this.value[index].open = item.open
+              this.value[index].customBut[0].active = item.open
+            }
           }
         })
       }

package/src/components/sketchpad/src/sketchpad.vue

@@ -8,6 +8,11 @@ import {createElement} from 'react'
 import {createRoot} from 'react-dom/client'
 import {AssetRecordType,createShapeId, Tldraw, FileHelpers} from 'tldraw'
 import 'tldraw/tldraw.css'
+import * as buffer from "buffer"; //引入buffer
+
+if (typeof window.Buffer === "undefined") { // 判断当前环境是否有Buffer对象
+  window.Buffer = buffer.Buffer; // Buffer对象不存在则创建导入的buffer
+}
 
 const clearJson = {
   store: {
@@ -102,27 +107,27 @@ export default {
     }, null))
   },
   methods: {
-     exportImg() {
-       return new Promise((rl,ri) => {
-         editorAPP.getSvg([...editorAPP.getCurrentPageShapeIds()],{}).then(r => {
-           const s = new XMLSerializer().serializeToString(r);
-           const src = `data:image/svg+xml;base64,${window.btoa(s)}`;
-           const img = new Image(); // 创建图片容器承载过渡
-           img.src = src;
-           img.onload = () => {
-             // ↓ 第二部分
-             const canvas = document.createElement('canvas');
-             canvas.width = img.width;
-             canvas.height = img.height;
-             const context = canvas.getContext('2d');
-             context.drawImage(img, 0, 0);
-             const ImgBase64 = canvas.toDataURL('image/png');
-             let blob = this.dataURLtoBlob(ImgBase64);
-             let file = new File([blob], `${new Date().getTime()}.png`, {lastModified: Date.now()});
-             rl(file)
-           }
-         })
-       })
+    exportImg() {
+      return new Promise((rl,ri) => {
+        editorAPP.getSvg([...editorAPP.getCurrentPageShapeIds()],{}).then(r => {
+          const s = new XMLSerializer().serializeToString(r);
+          const src = `data:image/svg+xml;base64,${Buffer.from(s).toString('base64')}`;
+          const img = new Image(); // 创建图片容器承载过渡
+          img.src = src;
+          img.onload = () => {
+            // ↓ 第二部分
+            const canvas = document.createElement('canvas');
+            canvas.width = img.width;
+            canvas.height = img.height;
+            const context = canvas.getContext('2d');
+            context.drawImage(img, 0, 0);
+            const ImgBase64 = canvas.toDataURL('image/png');
+            let blob = this.dataURLtoBlob(ImgBase64);
+            let file = new File([blob], `${new Date().getTime()}.png`, {lastModified: Date.now()});
+            rl(file)
+          }
+        })
+      })
     },
     dataURLtoBlob(dataurl) {
       let arr = dataurl.split(',');
@@ -390,7 +395,6 @@ export default {
     },
     styleProps(t, e) {
       const style = [...editorAPP.styleProps[t]]
-      console.log(style)
       const index = style.findIndex(item => item[1] === e)
       return style[index][0]
     },

package/src/index.js

@@ -87,7 +87,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.35.470',
+    version: '1.35.472',
     install,
     Calendar,
     Message,