zydx-plus 1.32.219 → 1.32.221

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zydx-plus",
-  "version": "1.32.219",
+  "version": "1.32.221",
   "description": "Vue.js",
   "main": "src/index.js",
   "files": [

package/src/components/directSeeding/src/directSeeding.vue

@@ -0,0 +1,146 @@
+<template>
+    <div class="direct" v-show="direct" :style="position"
+         @mousedown="mousedown"
+         @mousemove="mousemove"
+         @mouseup="mouseup"
+         @mouseleave="mousemove">
+        <video ref="video" :style="videoStyle" autoplay playsinline></video>
+    </div>
+    <video ref="video2" autoplay playsinline></video>
+</template>
+
+<script>
+export default {
+    name: "zydx-directSeeding",
+    data() {
+        return {
+            ws: null,
+            lockReconnect: false,
+            x: 0,//left:x
+            y: 0,//top:y
+            width: 230,
+            height: 170,
+            leftOffset: 0,
+            topOffset: 0,
+            isMove: false,
+            direct: false
+        }
+    },
+    mounted() {
+        this.init();
+    },
+    computed: {
+        position() {
+            return `top:${this.y}px;left:${this.x}px;width:${this.width}px;height:${this.height}px;`;
+        },
+        videoStyle() {
+            return `width:${this.width}px;height:${this.height}px;`;
+        }
+    },
+    methods: {
+        init() {
+            let clientWidth = document.documentElement.clientWidth;
+            let clientHeight = document.documentElement.clientHeight;
+            this.x = clientWidth / 2 + this.width;
+            this.y = clientHeight / 2 + this.height;
+        },
+        mousedown(event) {
+            event.preventDefault()
+            //鼠标按下事件
+            this.leftOffset = event.offsetX;
+            this.topOffset = event.offsetY;
+            this.isMove = true;
+        },
+        //鼠标移动
+        mousemove(event) {
+            if (!this.isMove) return;
+            this.x = event.clientX - this.leftOffset;
+            this.y = event.clientY - this.topOffset;
+        },
+        //鼠标抬起
+        mouseup() {
+            this.isMove = false;
+        },
+        open(url) {
+            let that = this
+            that.ws = new WebSocket(url);
+            that.ws.onopen = async function (evt) {
+                await that.seeding()
+            };
+            that.ws.onmessage = function (evt) {
+                console.log("Received Message: " + evt.data);
+            };
+            that.ws.onerror = function (evt) {
+                that.reconnect(url); // 重连
+            };
+            that.ws.onclose = function (evt) {
+                that.reconnect(url); // 重连
+            };
+        },
+        async seeding() {
+            this.direct = true
+            const video = this.$refs.video
+            const video2 = this.$refs.video2
+            const pc1 = new RTCPeerConnection()
+            const localStream = await navigator.mediaDevices.getUserMedia({
+                video: true,
+                audio: true,
+            })
+            video.srcObject = localStream
+            localStream.getTracks().forEach(function (track) {
+                pc1.addTrack(track, localStream)
+            })
+            const offer = await pc1.createOffer()
+            await pc1.setLocalDescription(offer);
+
+            const pc2 = new RTCPeerConnection()
+            pc1.onicecandidate = e => {
+                if (e.candidate) {
+                    // pc2.addIceCandidate(e.candidate);
+                    // // navigator.mediaDevices.getUserMedia({
+                    // //     video: true,
+                    // //     // audio: true,
+                    // // })
+                    // const offerSdp = new RTCSessionDescription({ type: offer.type, sdp: offer.sdp });
+                    // pc2.setRemoteDescription(offerSdp).then(() => {
+                    //     pc2.createAnswer(answer => {
+                    //         pc1.setLocalDescription(answer)
+                    //     });
+                    // });
+                }
+            };
+            // pc2.ontrack = e => {
+            //     if (e && e.streams) {
+            //         video2.srcObject = e.streams[0]
+            //     }
+            // };
+        },
+        send(v) {
+            this.ws.send(JSON.stringify(v));
+        },
+        close(v) {
+            // this.ws.send(JSON.stringify(v));
+            // this.ws.close();
+        },
+        // 重连
+        reconnect(url) {
+            if (this.lockReconnect) return;
+            this.lockReconnect = true;
+            //没连接上会一直重连，设置延迟避免请求过多
+            setTimeout(() => {
+                this.open(url);
+                this.lockReconnect = false;
+            }, 2000);
+        }
+    }
+}
+</script>
+
+<style scoped>
+.direct {
+    position: fixed;
+    top: 0;
+    right: 0;
+    z-index: 999;
+}
+</style>

package/src/components/editor2/src/editor.vue

@@ -18,7 +18,7 @@
                 <editor-content class="editor" :editor="editor" :style="heightStyleCont" />
             </div>
             <div class="editor-but" v-if="butText !== '' && readOnly">
-                <button class="but" @click="complete">{{ butText }}</button>
+                <button class="buts" @click="complete">{{ butText }}</button>
             </div>
             <div class="enclosure" v-if="uploadAttData.length > 0 && enclosureShow">
                 <p :style="enclosureStyle">{{ enclosureText }}</p>

package/src/components/mind/src/mind.vue

@@ -399,22 +399,30 @@ export default {
         // 保存
         preservation() {
             let that = this
-            that.mindMap.export('png', false, '123213', true).then(r => {
-                that.$emit('preservation', {
-                    data: that.mindMap.getData(),
-                    url: r
-                })
+            that.$emit('preservation', {
+                data: that.mindMap.getData(),
+                url: ''
             })
+            // that.mindMap.doExport.png().then((data) => {
+            //     that.$emit('preservation', {
+            //         data: that.mindMap.getData(),
+            //         url: data
+            //     })
+            // })
         },
         getContent() {
             let that = this
             return new Promise((rl,rs) => {
-                that.mindMap.export('png', false, '123213', true).then(r => {
-                    rl({
-                        data: that.mindMap.getData(),
-                        url: r
-                    })
+                rl({
+                    data: that.mindMap.getData(),
+                    url: ''
                 })
+                // that.mindMap.export('png', false, '123213', true).then(r => {
+                //     rl({
+                //         data: that.mindMap.getData(),
+                //         url: r
+                //     })
+                // })
             })
         },
         nodeStyle() {
@@ -646,4 +654,4 @@ export default {
     width: 100%;
     height: 100%;
 }
-</style>
+</style>

package/src/components/tipBox/index.js

@@ -8,7 +8,7 @@ render(divNode, document.body)
 const container = divNode.el
 
 // 导出函数可通过调用 Confirm() 函数动态创建 XtxConfirm 组件
-const Confirm = ({ type, url ,title,radioArr,checkboxArr,submitText,cancelText, promptContent, middle, cancelShow, inputArr }) => {
+const Confirm = ({ type, url ,title,radioArr,checkboxArr,submitText,cancelText,closeShow, promptContent, middle, cancelShow, inputArr }) => {
     // 返回 Promise 对象
     return new Promise((resolve, reject) => {
         // 2. 点击确认按钮，触发resolve同时销毁组件
@@ -45,8 +45,11 @@ const Confirm = ({ type, url ,title,radioArr,checkboxArr,submitText,cancelText,
             render(null, container)
             reject('点击取消')
         }
+        const close = () => {
+            render(null, container)
+        }
         // 1. 创建 XtxConfirm 组件
-        const VNode = createVNode(XtxConfirm, { type, url ,title, submitText, cancelText, promptContent,radioArr,checkboxArr, middle, cancelShow, inputArr, submit, cancel })
+        const VNode = createVNode(XtxConfirm, { type, url ,title, submitText, cancelText, closeShow,promptContent,radioArr,checkboxArr, middle, cancelShow, inputArr, submit, cancel, close })
         render(VNode, container)
     })
 }

package/src/components/tipBox/src/main.vue

@@ -2,6 +2,7 @@
     <div class="hello">
         <div class="tip-popupWindowSearch">
             <div class="tip-box">
+                <img v-if="closeShow" @click="close" class="close" src="data:image/png;base64,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" alt="" />
                 <div>
                     <div class="tip-title" v-html="title"></div>
                 </div>
@@ -10,7 +11,7 @@
                         <div class="tip-title2" v-if="type === 'text'"
                              :style="{'text-align': (middle)? 'center': 'left' }" v-html="promptContent"></div>
                         <div class="tip-img" v-if="type === 'img'">
-                            <img :src="url"/>
+                            <img :src="url" alt=""/>
                         </div>
                         <div v-if="type === 'radio'">
                             <div class="radio-list" v-for="(item,index) in radioArr" :key="index">
@@ -128,6 +129,10 @@ export default {
             type: Boolean,
             default: true
         },
+        closeShow: { //是否显示关闭按钮
+            type: Boolean,
+            default: false
+        },
         inputArr: { // 弹窗的提示标题
             type: Array,
             default: []
@@ -158,6 +163,11 @@ export default {
             type: Function,
             default: () => {
             }
+        },
+        close: {
+            type: Function,
+            default: () => {
+            }
         }
     },
     methods: {

package/src/components/tipBox/src/zydxStyle.css

@@ -18,7 +18,15 @@
     display: flex;
     align-items: center;
 }
-
+.close{
+    position: absolute;
+    top: 5px;
+    right: 5px;
+    z-index: 2;
+    width: 25px;
+    height: 25px;
+    cursor: pointer;
+}
 .tip-box {
     width: 480px;
     padding: 40px 40px;
@@ -29,6 +37,7 @@
     box-sizing: border-box;
     animation: linkDown .3s linear forwards;
     opacity: 0;
+    position: relative;
 }
 
 .tip-boxContent {
@@ -327,4 +336,4 @@
     top: 3px;
     left: 0;
     z-index: 1;
-}
+}

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

@@ -123,6 +123,9 @@
 .choice-span{
     padding-left: 20px;
 }
+.choice-color{
+    color: #00ff00;
+}
 .paper-textarea{
     width: calc(100% - 2em);
     height: 85px;

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

@@ -40,11 +40,11 @@
                    <div class="choice-box" v-for="(ts,ind) in item.testKey">
                        <label>
                            <input class="choice-input" v-if="chooseAnswer" :disabled="disabled" :checked="ts.checked" @change="answerChange($event,item,index)" :type="ques(item.quesType)?'radio':'checkbox'" :name="index" />
-                           <span :class="{'choice-span': chooseAnswer}">{{ ts.index }}. {{ ts.content[0] }}</span>
+                           <span :class="{'choice-span': chooseAnswer,'choice-color': disabled&&ts.checked}">{{ ts.index }}. {{ ts.content[0] }}</span>
                        </label>
                    </div>
                </div>
-               <div class="table" v-if="item.replace&&item.itemList&&collapse&&item.quesType.split('_')[1] === undefined">
+               <div class="table" v-if="item.replace&&item.itemList&&collapse&&item.quesType === '102_1'">
                    <table border="0" cellspacing="0" cellpadding="0">
                        <tr>
                            <td :colspan="item.itemList.length + 1" class="tab-title">选项分布情况统计表</td>
@@ -63,7 +63,7 @@
                        </tr>
                    </table>
                </div>
-               <div class="table" v-if="item.replace&&item.itemList&&collapse&&item.quesType.split('_')[1] === '1'">
+               <div class="table" v-if="item.replace&&collapse&&item.quesType !== '102_1'">
                    <table border="0" cellspacing="0" cellpadding="0">
                        <tr>
                            <td :colspan="5" class="tab-title">答题情况统计表</td>

package/src/components/word2/src/word.vue

@@ -116,7 +116,7 @@ export default {
             for (let i = 0; i < data.length; i++) {
                 let text = data[i].offsetHeight
                 if((this.pHeight + text) > this.max) {
-                    if(data[i].children.length === 0) {
+                    if(data[i].children.length === 0 || data[i].className.indexOf('paper-choice') !== -1) {
                         this.htmlArr.push(this.html)
                         this.pHeight = 0
                         this.html = ''

package/src/index.js

@@ -79,7 +79,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.32.219',
+    version: '1.32.221',
     install,
     Calendar,
     Message,