zydx-plus 1.29.144 → 1.29.145

package/package.json

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

package/src/components/biz_taskInfo/src/bizTaskInfo.vue

@@ -638,7 +638,7 @@
                 let that = this
                 this.taskInfoList.forEach(item => {
                     Object.keys(item).forEach(key=>{
-                        if(!that.keysArr.includes(key)) {
+                        if(!that.keysArr.includes(key) || item[key] == null) {
                             delete item[key];
                         }
                     })
@@ -647,6 +647,7 @@
             },
             dateFormat (date) {
                 if (date != null) {
+                    date = new Date(date)
                     var y = date.getFullYear();
                     var m = date.getMonth() + 1;
                     m = m < 10 ? ('0' + m) : m;

package/src/components/choice/src/choice.vue

@@ -110,14 +110,23 @@ export default {
                     })
                 }
             }else {
-                v.forEach(x => {
-                    arr.push({
-                        type: (x.isRight)? 'correct' : 'interfere',
-                        letter: x.index,
-                        title: (x.isRight)? '正确选项' : '干扰选项',
-                        list: x.content.map(y => ({value: y}))
+                if(this.isShow) {
+                    v.forEach(x => {
+                        arr.push({
+                            type: (x.isRight)? 'correct' : 'interfere',
+                            letter: x.index,
+                            title: (x.isRight)? '正确选项' : '干扰选项',
+                            list: x.content.map(y => ({value: y}))
+                        })
                     })
-                })
+                }else {
+                    v.forEach(x => {
+                        arr.push({
+                            letter: x.index,
+                            value: x.content[0]
+                        })
+                    })
+                }
             }
             return arr
         },

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

@@ -1,5 +1,5 @@
 <template>
-   <div class="drag-pop" :style="position">
+   <div class="drag-pop" :class="{'zin': isMove}" :style="position" :id="id">
        <div class="drag-head" :style="{'background-color':titleColor}">
            <span @mousedown="mousedown"
                  @mousemove="mousemove"
@@ -39,6 +39,7 @@ export default {
             isMove: false,//是否移动标识
             footIsMove: false,//是否移动标识
             direction: '',//移动方向
+            id: '',//id
         }
     },
     props: {
@@ -59,11 +60,23 @@ export default {
             default: true
         }
     },
+    watch: {
+        width: {
+            handler: function (val, oldVal) {
+                this.footRightOffset = val
+            },
+            immediate: true
+        },
+        height: {
+            handler: function (val, oldVal) {
+                this.footDownOffset = val
+            },
+            immediate: true
+        },
+    },
     mounted() {
-        let clientWidth = document.documentElement.clientWidth;
-        let clientHeight = document.documentElement.clientHeight;
-        this.x = clientWidth / 2 - this.footDownOffset / 2;
-        this.y = clientHeight / 2 - this.footRightOffset / 2;
+        this.id = Math.random().toString(36).substr(2);
+        this.init()
     },
     computed: {
         position() {
@@ -71,6 +84,12 @@ export default {
         },
     },
     methods: {
+        init() {
+            let clientWidth = document.documentElement.clientWidth;
+            let clientHeight = document.documentElement.clientHeight;
+            this.x = clientWidth / 2 - this.footRightOffset / 2;
+            this.y = clientHeight / 2 - this.footDownOffset / 2;
+        },
         footDown(event,v) {
             event.preventDefault()
             this.direction = v
@@ -132,11 +151,17 @@ export default {
 </script>
 
 <style scoped>
+.zin{
+    z-index: 1000 !important;
+}
 .drag-cont-slot{
     width: 100%;
     height: 100%;
     overflow: auto;
 }
+.drag-cont-slot::-webkit-scrollbar {
+    display: none;
+}
 .down-text-cont{
     display: inline-block;
 }

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

@@ -1,17 +1,21 @@
 <template>
-    <div class="mind" ref="mind">
+    <div class="mind" :ref="id">
         <div class="table">
-            <button :disabled="retShow" @click="ret">返回</button>
-            <button :disabled="forwardShow" @click="forward">前进</button>
-            <button :disabled="mindShow" @click="addNode">添加节点</button>
-            <button :disabled="mindShow" @click="brotherNode">兄弟节点</button>
-            <button :disabled="mindShow" @click="delNode">删除节点</button>
-            <button :disabled="mindShow" @click="associativeLine">关联线</button>
-            <button :disabled="mindShow" @click="nodeStyle">节点样式</button>
-            <button @click="structure">结构切换</button>
-            <button @click="preservation">保存</button>
+            <div class="table-left" v-if="!readOnly">
+                <button :disabled="retShow" @click="ret">返回</button>
+                <button :disabled="forwardShow" @click="forward">前进</button>
+                <button :disabled="mindShow" @click="addNode">添加节点</button>
+                <button :disabled="mindShow" @click="brotherNode">兄弟节点</button>
+                <button :disabled="mindShow" @click="delNode">删除节点</button>
+                <button :disabled="mindShow" @click="associativeLine">关联线</button>
+                <button :disabled="mindShow" @click="nodeStyle">节点样式</button>
+                <button @click="structure">结构切换</button>
+                <button @click="preservation">保存</button>
+            </div>
+            <button @click="fullTap" v-if="fullShow">全屏</button>
+            <button @click="fullDel" v-else>退出</button>
         </div>
-        <div id="mindMapContainer"></div>
+        <div :id="id" class="mindMapContainer"></div>
         <div class="node-style" ref="nodeStyle" :class="{'node-s': trans, 'node-h': !trans}">
             <div class="style-li">
                 <div class="style-title">文字</div>
@@ -27,9 +31,15 @@
                 </div>
                 <div class="node-but">
                     <button @click="colorTap($event,'color')">颜色</button>
-                    <button :style="{'background-color': (boldAct)? '#549688': '#fff','color': (boldAct)? '#fff': '#333'}" @click="bolds">粗体</button>
-                    <button :style="{'background-color': (italicAct)? '#549688': '#fff','color': (italicAct)? '#fff': '#333'}" @click="italics">斜体</button>
-                    <button :style="{'background-color': (scribeAct)? '#549688': '#fff','color': (scribeAct)? '#fff': '#333'}" @click="scribes">划线</button>
+                    <button :style="{'background-color': (boldAct)? '#549688': '#fff','color': (boldAct)? '#fff': '#333'}"
+                            @click="bolds">粗体
+                    </button>
+                    <button :style="{'background-color': (italicAct)? '#549688': '#fff','color': (italicAct)? '#fff': '#333'}"
+                            @click="italics">斜体
+                    </button>
+                    <button :style="{'background-color': (scribeAct)? '#549688': '#fff','color': (scribeAct)? '#fff': '#333'}"
+                            @click="scribes">划线
+                    </button>
                 </div>
             </div>
             <div class="style-li">
@@ -112,10 +122,11 @@ import "simple-mind-map/dist/simpleMindMap.esm.css";
 MindMap.usePlugin(Drag).usePlugin(AssociativeLine).usePlugin(Export)
 
 export default {
-    components: {Select,Coloring},
+    components: {Select, Coloring},
     name: "zydx-mind",
     data() {
         return {
+            id: '',
             mindMap: null,
             mindShow: false,
             retShow: false,
@@ -189,7 +200,8 @@ export default {
                     "text": "根节点"
                 },
                 "children": []
-            }
+            },
+            fullShow: true
         }
     },
     props: {
@@ -210,7 +222,7 @@ export default {
     watch: {
         readOnly: {
             handler: function (val, oldVal) {
-                this.mindMap?.setMode(val? 'readonly':'edit')
+                this.mindMap?.setMode(val ? 'readonly' : 'edit')
             },
             immediate: true
         },
@@ -222,60 +234,99 @@ export default {
         },
         sizeValue(e) { // 字号
             this.activeNodes.forEach(node => {
-                node.setStyle('fontSize',e)
+                node.setStyle('fontSize', e)
             })
         },
         rowValue(e) { // 行高
             this.activeNodes.forEach(node => {
-                node.setStyle('lineHeight',e)
+                node.setStyle('lineHeight', e)
             })
         },
         styleValue(e) { // 粗斜体
             this.activeNodes.forEach(node => {
-                node.setStyle('borderDasharray',e)
+                node.setStyle('borderDasharray', e)
             })
         },
         widthValue(e) { // 线宽
             this.activeNodes.forEach(node => {
-                node.setStyle('borderWidth',e)
+                node.setStyle('borderWidth', e)
             })
         },
         filletValue(e) { // 圆角
             this.activeNodes.forEach(node => {
-                node.setStyle('borderRadius',e)
+                node.setStyle('borderRadius', e)
             })
         },
         shapeValue(e) { // 形状
             this.activeNodes.forEach(node => {
-                node.setStyle('shape',e)
+                node.setStyle('shape', e)
             })
         },
         lineValue(e) { // 线宽
             this.activeNodes.forEach(node => {
-                node.setStyle('lineWidth',e)
+                node.setStyle('lineWidth', e)
             })
         },
         lineStyleValue(e) { // 线宽
             this.activeNodes.forEach(node => {
-                node.setStyle('lineDasharray',e)
+                node.setStyle('lineDasharray', e)
             })
         },
     },
     mounted() {
-        this.init()
+        this.id = Math.random().toString(36).substr(2)
+        setTimeout(() => {
+            this.init()
+        },0)
+        window.onresize = () => {
+            if (!document.fullscreenElement) {
+                this.fullShow = true
+            }
+            this.mindMap.resize()
+        }
     },
     methods: {
+        fullScreen(element) {
+            if (element.requestFullScreen) {
+                element.requestFullScreen()
+            } else if (element.webkitRequestFullScreen) {
+                element.webkitRequestFullScreen()
+            } else if (element.mozRequestFullScreen) {
+                element.mozRequestFullScreen()
+            }
+        },
+        cancelFullscreen() {
+            if (document.exitFullscreen) {
+                document.exitFullscreen();
+            } else if (document.msExitFullscreen) {
+                document.msExitFullscreen();
+            } else if (document.mozCancelFullScreen) {
+                document.mozCancelFullScreen();
+            } else if (document.webkitExitFullscreen) {
+                document.webkitExitFullscreen();
+            }
+        },
+        fullDel() {
+            this.fullShow = true
+            this.cancelFullscreen()
+        },
+        // 全屏
+        fullTap() {
+            this.fullShow = false
+            this.fullScreen(this.$refs[this.id])
+        },
+        // 初始化
         init() {
             this.mindMap = new MindMap({
-                el: document.getElementById('mindMapContainer'),
+                el: document.getElementById(this.id),
                 enableFreeDrag: false, // 是否开启自由拖拽
                 enableNodeTransitionMove: false, // 是否开启节点过渡动画
                 layout: 'logicalStructure', // 节点布局方式
                 maxHistoryCount: 100, // 最大历史记录数
                 maxNodeCacheCount: 100, // 最大节点缓存数
-                data: Object.keys(this.data).length === 0? this.defaultData: this.data
+                data: Object.keys(this.data).length === 0 ? this.defaultData : this.data
             });
-            this.mindMap.setMode(this.readOnly ? 'readonly':'edit')
+            this.mindMap.setMode(this.readOnly ? 'readonly' : 'edit')
             this.mindMap.on('node_active', (node, activeNodeList) => {
                 this.mindShow = node === null;
             })
@@ -290,19 +341,19 @@ export default {
         scribes() {
             this.scribeAct = !this.scribeAct
             this.activeNodes.forEach(node => {
-                node.setStyle('textDecoration', (!this.scribeAct)? 'none':'underline')
+                node.setStyle('textDecoration', (!this.scribeAct) ? 'none' : 'underline')
             })
         },
         italics() {
             this.italicAct = !this.italicAct
             this.activeNodes.forEach(node => {
-                node.setStyle('fontStyle', (!this.italicAct)? 'normal':'italic')
+                node.setStyle('fontStyle', (!this.italicAct) ? 'normal' : 'italic')
             })
         },
         bolds() {
             this.boldAct = !this.boldAct
             this.activeNodes.forEach(node => {
-                node.setStyle('fontWeight', (!this.boldAct)? 'normal':'bold')
+                node.setStyle('fontWeight', (!this.boldAct) ? 'normal' : 'bold')
             })
         },
         rgba(e) {
@@ -318,10 +369,10 @@ export default {
         empty() {
             this.colorShow = false
         },
-        colorTap(e,i) {
+        colorTap(e, i) {
             this.colorData = {index: i, data: e}
             let parent = this.colorData.data.target.parentNode.offsetTop + 32
-            if(parent > 330) parent = 300
+            if (parent > 330) parent = 300
             this.colorShow = !this.colorShow
             this.top = parent
         },
@@ -332,27 +383,17 @@ export default {
                 layoutList = 'organizationStructure'
             } else if (layout === 'organizationStructure') {
                 layoutList = 'logicalStructure'
-            }else {
+            } else {
                 layoutList = 'mindMap'
             }
             this.mindMap.setLayout(layoutList)
         },
-        removeNode(data) {
-            if(data._node) {
-                delete data._node
-            }
-            if(data.children && data.children.length > 0) {
-                data.children.forEach(item => {
-                     this.removeNode(item)
-                })
-            }
-            return data
-        },
+        // 保存
         preservation() {
             let that = this
-            that.mindMap.export('png',false,'123213', true).then(r => {
+            that.mindMap.export('png', false, '123213', true).then(r => {
                 that.$emit('preservation', {
-                    data: that.removeNode(that.data),
+                    data: that.mindMap.getData(),
                     url: r
                 })
             })
@@ -363,7 +404,7 @@ export default {
             this.trans = !this.trans
             setTimeout(() => {
                 this.$refs.mind.style.overflow = 'visible'
-                if(!this.trans) {
+                if (!this.trans) {
                     this.$refs.nodeStyle.style.display = 'none'
                 }
             }, 250)
@@ -397,13 +438,20 @@ export default {
 </script>
 
 <style scoped>
-.node-s{
+.table-left {
+    display: inline-block;
+    margin-right: 5px;
+}
+
+.node-s {
     animation: nodeShow 0.3s;
     display: block;
 }
-.node-h{
+
+.node-h {
     animation: nodeHide 0.3s;
 }
+
 @keyframes nodeHide {
     0% {
         opacity: 1;
@@ -414,6 +462,7 @@ export default {
         transform: translateX(110%);
     }
 }
+
 @keyframes nodeShow {
     0% {
         opacity: 0;
@@ -428,23 +477,28 @@ export default {
         transform: translateX(0);
     }
 }
-.zIndex{
+
+.zIndex {
     position: relative;
     z-index: 30;
 }
-.zIndex2{
+
+.zIndex2 {
     position: relative;
     z-index: 33;
 }
-.zIndex3{
+
+.zIndex3 {
     position: relative;
     z-index: 32;
 }
-.zIndex4{
+
+.zIndex4 {
     position: relative;
     z-index: 31;
 }
-.backColor{
+
+.backColor {
     width: 93px;
     height: 30px;
     border: 1px solid #ccc;
@@ -454,17 +508,20 @@ export default {
     cursor: pointer;
     background-color: #549688;
 }
-.back-col{
+
+.back-col {
     position: absolute;
     top: 0;
     left: 60px;
     z-index: 40;
 }
-.node-but{
+
+.node-but {
     display: flex;
     padding: 5px 0;
 }
-.node-but button{
+
+.node-but button {
     flex: 1;
     margin-right: 5px;
     background-color: #fff;
@@ -474,20 +531,24 @@ export default {
     cursor: pointer;
     font-size: 12px;
 }
-.node-but button:last-child{
+
+.node-but button:last-child {
     margin: 0;
 }
-.style-title{
+
+.style-title {
     font-size: 16px;
     font-weight: bold;
     padding: 5px 0 10px 0;
 }
+
 .mind {
     width: 100%;
     height: 100%;
     position: relative;
 }
-.table{
+
+.table {
     position: absolute;
     top: 10px;
     left: 30px;
@@ -497,25 +558,30 @@ export default {
     box-shadow: rgba(0, 0, 0, 0.06) 0 2px 16px 0;
     z-index: 10;
 }
-.style-list{
+
+.style-list {
     display: flex;
     padding: 5px 0;
 }
-.node-left{
+
+.node-left {
     display: flex;
     padding-right: 10px;
 }
-.node-left>span{
+
+.node-left > span {
     display: inline-block;
     width: 80px;
     line-height: 32px;
     padding-right: 10px;
     box-sizing: border-box;
 }
-.padd{
+
+.padd {
     padding-right: 0;
 }
-.node-style{
+
+.node-style {
     position: absolute;
     right: 0;
     top: 50%;
@@ -530,7 +596,8 @@ export default {
     margin-top: -270px;
     display: none;
 }
-.table button{
+
+.table button {
     margin-right: 5px;
     background-color: #fff;
     border: 1px solid #ccc;
@@ -539,11 +606,12 @@ export default {
     cursor: pointer;
     font-size: 12px;
 }
-.table button:last-child{
+
+.table button:last-child {
     margin-right: 0;
 }
 
-#mindMapContainer {
+.mindMapContainer {
     width: 100%;
     height: 100%;
 }

package/src/index.js

@@ -69,7 +69,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.29.144',
+    version: '1.29.145',
     install,
     Calendar,
     Message,