zydx-plus 1.32.220 → 1.32.222

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zydx-plus",
-  "version": "1.32.220",
+  "version": "1.32.222",
   "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同时销毁组件
@@ -49,7 +49,7 @@ const Confirm = ({ type, url ,title,radioArr,checkboxArr,submitText,cancelText,
             render(null, container)
         }
         // 1. 创建 XtxConfirm 组件
-        const VNode = createVNode(XtxConfirm, { type, url ,title, submitText, cancelText, promptContent,radioArr,checkboxArr, middle, cancelShow, inputArr, submit, cancel, close })
+        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

@@ -129,7 +129,7 @@ export default {
             type: Boolean,
             default: true
         },
-        closeShow: { //是否显示取消按钮
+        closeShow: { //是否显示关闭按钮
             type: Boolean,
             default: false
         },

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

@@ -19,7 +19,7 @@
                                                @click="choiceTap(item,index)"
                                                :disabled="!item.choice"
                                                :style="{border: !item.choice?'1px solid #ccc': '1px solid #000'}">
-                                       {{ choiceState? '选择题目' : item.choice?'撤销选择': '选择题目' }}
+                                       {{ choiceState? choiceText.choice : item.choice?choiceText.cancel: choiceText.choice }}
                                        </button>
                                    </b>
                                    <b :style="{right: -item.right + 'px', top: item.top + 'px'}" v-if="collapse" ref="b">
@@ -40,7 +40,7 @@
                    <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>
@@ -131,6 +131,13 @@ export default {
             type: Boolean,
             default: false
         },
+        choiceText: {
+            type: Object,
+            default: {
+                choice: '选择题目',
+                cancel: '撤销选择'
+            }
+        },
         titleText: {
             type: String,
             default: '材料'

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.220',
+    version: '1.32.222',
     install,
     Calendar,
     Message,