zydx-plus 1.33.370 → 1.33.372

package/package.json

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

package/src/components/biz_header/src/button_name.js

@@ -1672,6 +1672,31 @@ let buttonNames = {
                         }
                     }
                 },
+                action_scene: {
+                    actionName: '情景学习',
+                    buttonList: {
+                        0: {
+                            headLevel: {
+                                default: "demand",
+                                demand: '学习要求',
+                                singletonClass: this.getCurrentPrefix(item) + '学习',
+                                allClass: this.getPrefix(item) + '情况',
+                            },
+                            otherLevel: {
+                                default: "singletonClass",
+                                singletonClass: this.getCurrentPrefix(item) + '学习',
+                                allClass: this.getPrefix(item) + '情况',
+                            },
+                            lowLevel: {
+                                default: "singletonClass",
+                                singletonClass: '学习任务',
+                                score: '学习成绩',
+                                analysis: '统计分析',
+                                power: '学习动力'
+                            },
+                        }
+                    }
+                },
                 action_lesson056: {
                     actionName: '讲给他人',
                     buttonList: {

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

@@ -114,8 +114,10 @@
 import Select from '../../select/src/select.vue'
 import Coloring from '../../coloring/src/coloring.vue'
 import MindMap from "simple-mind-map";
+import TouchEvent from 'simple-mind-map/src/plugins/TouchEvent.js'
 import AssociativeLine from 'simple-mind-map/src/plugins/AssociativeLine.js'
 MindMap.usePlugin(AssociativeLine)
+MindMap.usePlugin(TouchEvent)
 
 export default {
     components: {Select, Coloring},
@@ -197,7 +199,8 @@ export default {
                 },
                 "children": []
             },
-            fullShow: true
+            fullShow: true,
+            layoutList: ''
         }
     },
     props: {
@@ -228,11 +231,12 @@ export default {
             immediate: true
         },
         data: {
-            handler: function (val, oldVal) {
+            handler: function (val) {
                 if(Object.keys(val).length === 0) {
                     this.mindMap?.setData(this.defaultData)
                 }else {
-                    this.mindMap?.setData(val)
+                    this.mindMap?.setData(this.msgFun(val))
+                  this.mindMap?.setLayout(val.layoutList || 'logicalStructure')
                 }
             },
             immediate: true
@@ -281,8 +285,8 @@ export default {
     mounted() {
         this.id = this.randomId()
         setTimeout(() => {
-            this.init()
-        }, 0)
+          this.init()
+        },0)
         window.onresize = () => {
             if (!document.fullscreenElement) {
                 this.fullShow = true
@@ -296,13 +300,13 @@ export default {
             return id.replace(/[0-9]/g, '')
         },
         fullScreen(element) {
-            if (element.requestFullScreen) {
-                element.requestFullScreen()
-            } else if (element.webkitRequestFullScreen) {
-                element.webkitRequestFullScreen()
-            } else if (element.mozRequestFullScreen) {
-                element.mozRequestFullScreen()
-            }
+          if (element.requestFullScreen) {
+            element.requestFullScreen()
+          } else if (element.webkitRequestFullScreen) {
+            element.webkitRequestFullScreen()
+          } else if (element.mozRequestFullScreen) {
+            element.mozRequestFullScreen()
+          }
         },
         cancelFullscreen() {
             if (document.exitFullscreen) {
@@ -324,6 +328,13 @@ export default {
             this.fullShow = false
             this.fullScreen(this.$refs[this.id])
         },
+        msgFun(e) {
+           if(e.msg) {
+             return Object.keys(e.msg).length === 0 ? this.defaultData : e.msg
+           }else {
+             return Object.keys(e).length === 0 ? this.defaultData : e
+           }
+        },
         // 初始化
         init() {
             const that = this
@@ -331,13 +342,13 @@ export default {
                 el: document.getElementById(that.id),
                 enableFreeDrag: false, // 是否开启自由拖拽
                 enableNodeTransitionMove: false, // 是否开启节点过渡动画
-                layout: 'logicalStructure', // 节点布局方式
+                layout: that.data.layoutList || 'logicalStructure', // 节点布局方式
                 maxHistoryCount: 100, // 最大历史记录数
                 maxNodeCacheCount: 100, // 最大节点缓存数
-                data: Object.keys(that.data).length === 0 ? that.defaultData : that.data
+                data: that.msgFun(that.data)
             });
             this.mindMap.setMode(this.readOnly ? 'readonly' : 'edit')
-            this.mindMap.on('node_active', (node, activeNodeList) => {
+            this.mindMap.on('node_active', (node) => {
                 this.mindShow = node === null;
             })
             this.mindMap.on('back_forward', (index, len) => {
@@ -393,22 +404,25 @@ export default {
             this.top = parent
         },
         structure() {
-            let layoutList = 'logicalStructure'
+            this.layoutList = 'logicalStructure'
             const layout = this.mindMap.getLayout()
             if (layout === 'mindMap') {
-                layoutList = 'organizationStructure'
+              this.layoutList = 'organizationStructure'
             } else if (layout === 'organizationStructure') {
-                layoutList = 'logicalStructure'
+              this.layoutList = 'logicalStructure'
             } else {
-                layoutList = 'mindMap'
+              this.layoutList = 'mindMap'
             }
-            this.mindMap.setLayout(layoutList)
+            this.mindMap.setLayout(this.layoutList)
         },
         // 保存
         preservation() {
             let that = this
             that.$emit('preservation', {
-                data: that.mindMap.getData(),
+                data: {
+                  msg: that.mindMap.getData(),
+                  layoutList: this.layoutList
+                },
                 url: ''
             })
             // that.mindMap.doExport.png().then((data) => {

package/src/index.js

@@ -83,7 +83,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.33.370',
+    version: '1.33.372',
     install,
     Calendar,
     Message,