zydx-plus 1.30.176 → 1.31.177

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zydx-plus",
-  "version": "1.30.176",
+  "version": "1.31.177",
   "description": "Vue.js",
   "main": "src/index.js",
   "files": [
@@ -40,7 +40,8 @@
     "@tiptap/extension-link": "^2.0.3",
     "@vue-office/docx": "^1.1.3",
     "@vue-office/excel": "^1.1.3",
-    "fabric": "^5.3.0"
+    "fabric": "^5.3.0",
+    "js-export-word": "^1.0.5"
   },
   "peerDependencies": {
     "vue": "^3.2.13"

package/src/components/dragPopup/src/dragPopup.vue

@@ -101,7 +101,7 @@ export default {
             return `transform: translate(${this.x}px, ${this.y}px);width:${this.footRightOffset}px;height:${this.footDownOffset}px;`;
         },
     },
-    emits: ['dragStatus','close'],
+    emits: ['dragStatus','close','enlarge'],
     methods: {
         disconnect() {
             this.$emit('dragStatus')
@@ -149,6 +149,7 @@ export default {
             this.isMove = false;
         },
         enlarge() {
+            let state = false
             let clientWidth = document.documentElement.clientWidth;
             let clientHeight = document.documentElement.clientHeight;
             if(clientWidth === this.footRightOffset && clientHeight === this.footDownOffset) {
@@ -156,12 +157,15 @@ export default {
                 this.y = clientHeight / 2 - this.height / 2;
                 this.footDownOffset = this.height;
                 this.footRightOffset = this.width;
+                state = false
             }else {
                 this.x = 0;
                 this.y = 0;
                 this.footDownOffset = clientHeight;
                 this.footRightOffset = clientWidth;
+                state = true
             }
+            this.$emit('enlarge', state)
         },
         close() {
             this.isMove = false

package/src/components/editor/src/butJson.js

@@ -116,7 +116,7 @@ function numSort(editor) {
     let num = 1
     const data = editor.getJSON().content
     data.forEach((item, index) => {
-        const id = item.attrs.signId
+        const id = item.attrs === undefined? null :item.attrs.signId
         if(id) {
             let arr = item.attrs.signId.split('-')[1]
             num = Number(arr) + 1 > num ? Number(arr) + 1 : num

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

@@ -88,6 +88,8 @@
 }
 .subject-title{
     flex: 1;
+    text-indent: 2em;
+    position: relative;
 }
 .subject-title label{
     display: flex;
@@ -138,5 +140,13 @@
 input[name='check'] {
     width: 15px;
     height: 15px;
-    margin: 5px 5px 0 0;
+    position: absolute;
+    top: 5px;
+    left: 0;
+}
+.subject-but{
+    position: absolute;
+    bottom: 2px;
+    right: 0;
+    z-index: 1;
 }

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

@@ -1,17 +1,24 @@
 <template>
    <div :class="{paper: borderShow}">
        <div class="parer-cont" ref="parer">
-           <div class="paper-choice" :class="{'array-ch': !styleText(item.testKey)}" v-for="(item,index) in data">
+           <div class="paper-choice" :class="{'array-ch': !styleText(item.testKey)}" v-for="(item,index) in value">
                <div class="subject">
                    <div class="subject-title">
                        <label>
                            <input v-if="multipleShow" type="checkbox" :checked="item.checked" @change="checkboxChange($event,index)" name="check" />
                            <span>{{ item.order }}.<em v-html="item.title"></em></span>
                        </label>
-                   </div>
-                   <div class="subject-but" v-if="butShow">
-                       <button class="but" @click="modify(item)">修改</button>
-                       <button class="but" @click="del(item)">删除</button>
+                       <div class="subject-but">
+                           <button class="but" v-if="butShow" @click="modify(item)">修改</button>
+                           <button class="but" v-if="butShow" @click="del(item)">删除</button>
+                           <button class="but" v-if="replace" @click="replaceTap(item,index)">替换题目</button>
+                           <button class="but" v-if="choice"
+                                   @click="choiceTap(item,index)"
+                                   :disabled="!item.choice"
+                                   :style="{border: !item.choice?'1px solid #ccc': '1px solid #000'}">
+                               {{ choiceState? '选择题目' : item.choice?'撤销选择': '选择题目' }}
+                           </button>
+                       </div>
                    </div>
                </div>
                <div class="choice" v-if="item.testKey">
@@ -33,8 +40,9 @@ export default {
     name: "zydx-seek",
     data() {
         return {
-            value: this.data,
-            multipleShow: this.multiple
+            value: [],
+            multipleShow: this.multiple,
+            choiceState: true
         }
     },
     props: {
@@ -57,14 +65,26 @@ export default {
         borderShow: {
             type: Boolean,
             default: true
+        },
+        replace: {
+            type: Boolean,
+            default: false
+        },
+        choice: {
+            type: Boolean,
+            default: false
         }
     },
     watch: {
         data: {
             handler: function (val, oldVal) {
                 this.value = val
+                this.value.map((item,index) => {
+                    item.choice = true
+                    return item
+                })
             },
-            deep: true
+            immediate: true,
         },
         multiple: {
             handler: function (val, oldVal) {
@@ -73,7 +93,7 @@ export default {
             deep: true
         }
     },
-    emits: ['change','modify','del','changeAll'],
+    emits: ['change','modify','del','changeAll','replaceData','choiceData'],
     methods: {
         checkboxChange(e,index) {
             this.value[index].checked = e.target.checked
@@ -102,6 +122,24 @@ export default {
             }
             return false
         },
+        replaceTap(v,i) {
+            this.$emit('replaceData', {
+                data: v,
+                index: i
+            })
+        },
+        choiceTap(v,i) {
+            this.value.map((item,index) => {
+                item.choice = !this.choiceState;
+                return item
+            })
+            this.value[i].choice = true
+            this.choiceState = !this.choiceState
+            this.$emit('choiceData', {
+                data: v,
+                index: i
+            })
+        }
     }
 }
 </script>

package/src/components/word2/index.js

@@ -0,0 +1,6 @@
+import main from './src/word';
+
+main.install = function(Vue) {
+    Vue.component(main.name, main);
+};
+export default main;

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

@@ -0,0 +1,24 @@
+.page-cont{
+    width: 794px;
+    margin: 0 auto;
+    position: relative;
+}
+.page-cont-html{
+    width: 100%;
+    height: 1123px;
+    padding: 100px;
+    background-color: #fff;
+    box-sizing: border-box;
+    position: relative;
+    box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+    margin: 20px 0;
+}
+.page-cont-num{
+    position: absolute;
+    bottom: 25px;
+    left: 50%;
+    z-index: 1;
+    font-size: 14px;
+    transform: translateX(-50%);
+    color: #999;
+}

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

@@ -0,0 +1,91 @@
+<template>
+    <div class="word-cont">
+        <div class="word-slot" :style="page?style:{}" id="test">
+            <slot></slot>
+        </div>
+        <div class="word-page" v-if="page">
+            <div class="page-cont" v-for="(item,index) in htmlArr">
+                <div class="page-cont-html" v-html="item"></div>
+                <div class="page-cont-num">{{ index + 1 }}/{{ htmlArr.length }}</div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import exportWord from 'js-export-word'
+
+export default {
+    name: "zydx-paper",
+    data() {
+        return {
+            htmlArr: []
+        }
+    },
+    props: {
+        page: {
+            type: Boolean,
+            default: false
+        },
+        fileName: {
+            type: String,
+            default: '试卷'
+        }
+    },
+    computed: {
+        style() {
+            return {
+                position: 'fixed',
+                top: '-9999px',
+                left: 0,
+                zIndex: -1,
+                opacity: 0
+            }
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.init()
+        })
+    },
+    methods: {
+        init() {
+            const slot = this.$slots.default()[0]
+            let max = 1123
+            let pHeight = 0
+            let html = ''
+            for (let i = 0; i < slot.children.length; i++) {
+                const data = document.getElementsByClassName(slot.children[i].props.class)
+                let text = data[0].offsetHeight
+                if((pHeight + text) > max) {
+                    this.htmlArr.push(html)
+                    pHeight = 0
+                    html = ''
+                }
+                pHeight += text
+                html += data[0].outerHTML
+                if(i === slot.children.length - 1) {
+                    this.htmlArr.push(html)
+                    pHeight = 0
+                    html = ''
+                    break
+                }
+            }
+        },
+        exportToWord() {
+            const wrap = document.getElementById('test')
+            const config = {
+                addStyle: true, // 是否导出样式，默认为true，此操作会将所有样式转换成行内样式导出
+                fileName: this.fileName, // 导出文件名
+                // toImg:['.need-to-img','.bg-danger'], // 页面哪些部分需要转化成图片，例如echart图表之类
+                success() {
+                    console.log('导出成功')
+                } // 完成之后回调，一般页面篇幅比较大，时间比较长
+            }
+            exportWord(wrap, config)
+        }
+    }
+}
+</script>
+
+<style scoped src="./word.css"></style>

package/src/index.js

@@ -30,6 +30,7 @@ import word from './components/word/index';
 import sketchpad from './components/sketchpad/index';
 import pictureViewer from './components/pictureViewer/index';
 import lessonTemplate from './components/lesson_template/index';
+import paper from './components/word2/index';
 
 const components = [
     Calendar,
@@ -61,7 +62,8 @@ const components = [
     word,
     sketchpad,
     pictureViewer,
-    lessonTemplate
+    lessonTemplate,
+    paper
 ];
 
 function install(app) {
@@ -73,7 +75,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.30.176',
+    version: '1.31.177',
     install,
     Calendar,
     Message,
@@ -106,6 +108,7 @@ export default {
     word,
     sketchpad,
     pictureViewer,
-    lessonTemplate
+    lessonTemplate,
+    paper
 };