zydx-plus 1.33.390 → 1.33.392

package/package.json

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

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

@@ -2065,7 +2065,7 @@ let buttonNames = {
                             headLevel: {
                                 default: "demand",
                                 demand: '武术要求',
-                                resourceIndex: '武术任务',
+                                resourceIndex: '任务题目',
                                 review: '武术点评',
                                 guideIndex: '指导意见',
                                 analyse: '武术分析',
@@ -2076,13 +2076,13 @@ let buttonNames = {
                             },
                             otherLevel: {
                                 default: "singletonClass",
-                                singletonClass: this.getCurrentPrefix(item) + '任务',
-                                allClass: this.getPrefix(item) + '任务'
+                                singletonClass: this.getCurrentPrefix(item) + '题目',
+                                allClass: this.getPrefix(item) + '题目'
                             },
                             lowLevel: {
                                 default: "viewResource",
-                                createResource: '创建任务',
-                                viewResource: '任务列表',
+                                createResource: '创建题目',
+                                viewResource: '题目列表',
                                 selectResource: '查找资源',
                             }
                         }
@@ -2174,15 +2174,7 @@ let buttonNames = {
                     }
                 },
                 resource_lesson_guidance: { // 就业指导-指导意见配置项
-                    actionName: '指导意见',
-                    buttonList: {
-                        0: {
-                            headLevel: {
-                                default: "demand",
-                                demand: '指导意见'
-                            }
-                        }
-                    }
+                    actionName: '指导意见'
                 },
                 resource_scene:{
                     actionName: '情景资源',

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

@@ -466,7 +466,7 @@ export default {
   opacity: 0;
 }
 .drag-pop-shadow{
-  box-shadow: 0 0 3px 2px #ccc;
+  box-shadow: 0 0 3px 2px rgba(0,0,0,0.3);
 }
 .trans{
   transition: all .3s;

package/src/components/sketchpad/src/sketchpad.vue

@@ -67,11 +67,13 @@ const clearJson = {
   }
 }
 
+let editorAPP = null;
+
 export default {
   name: "zydx-sketchpad",
   data() {
     return {
-      editor: null
+      // editor: null
     }
   },
   mounted() {
@@ -94,43 +96,43 @@ export default {
   },
   methods: {
     handleMountedEditor(editor) {
-      this.editor = editor
+      editorAPP = editor
       setTimeout(() => {
         document.documentElement.scrollTop = 0
       }, 0)
     },
     setOpacityForNextShapes(opacity){
-      this.editor.setOpacityForNextShapes(opacity)
+      editorAPP.setOpacityForNextShapes(opacity)
     },
     // 清空
     clear() {
-      this.editor.store.loadSnapshot(clearJson)
+      editorAPP.store.loadSnapshot(clearJson)
       this.isFocused()
     },
     // 添加快照
     setSnapshot(v) {
-      this.editor.store.loadSnapshot(v)
+      editorAPP.store.loadSnapshot(v)
       this.isFocused()
     },
     // 获取快照
     getSnapshot() {
-      return this.editor.store.getSnapshot()
+      return editorAPP.store.getSnapshot()
     },
     draw(v) {
       this.styleProps('draw', 'color').defaultValue = v?.color ?? 'black'
       this.styleProps('draw', 'size').defaultValue = v?.size ?? 'm'
       this.styleProps('draw', 'dash').defaultValue = v?.dash ?? 'draw'
       this.styleProps('draw', 'fill').defaultValue = v?.fill ?? 'none'
-      this.editor.setCurrentTool('draw')
+      editorAPP.setCurrentTool('draw')
     },
     select() {
-      this.editor.setCurrentTool('select')
+      editorAPP.setCurrentTool('select')
     },
     hand() {
-      this.editor.setCurrentTool('hand')
+      editorAPP.setCurrentTool('hand')
     },
     eraser() {
-      this.editor.setCurrentTool('eraser')
+      editorAPP.setCurrentTool('eraser')
     },
     arrow(v) {
       // 'none', 'semi', 'solid', 'pattern'
@@ -138,14 +140,14 @@ export default {
       this.styleProps('arrow', 'size').defaultValue = v?.size ?? 'm'
       this.styleProps('arrow', 'dash').defaultValue = v?.dash ?? 'draw'
       this.styleProps('arrow', 'fill').defaultValue = v?.fill ?? 'none'
-      this.editor.setCurrentTool('arrow')
+      editorAPP.setCurrentTool('arrow')
     },
     text(v) {
       this.styleProps('text', 'color').defaultValue = v?.color ?? 'black'
       this.styleProps('text', 'size').defaultValue = v?.size ?? 'm'
       this.styleProps('text', 'font').defaultValue = v?.font ?? 'draw' //['draw', 'sans', 'serif', 'mono']
       this.styleProps('text', 'align').defaultValue = v?.align ?? 'start'
-      this.editor.setCurrentTool('text')
+      editorAPP.setCurrentTool('text')
     },
     note(v) {
       let verticalAlign = ['middle-legacy', 'start-legacy', 'end-legacy']
@@ -158,14 +160,14 @@ export default {
       this.styleProps('note', 'color').defaultValue = v?.color ?? 'black'
       this.styleProps('note', 'size').defaultValue = v?.size ?? 'm'
       this.styleProps('note', 'font').defaultValue = v?.font ?? 'draw' //['draw', 'sans', 'serif', 'mono']
-      this.editor.setCurrentTool('note')
+      editorAPP.setCurrentTool('note')
     },
     line(v) {
       this.styleProps('arrow', 'color').defaultValue = v?.color ?? 'black'
       this.styleProps('arrow', 'size').defaultValue = v?.size ?? 'm'
       this.styleProps('arrow', 'dash').defaultValue = v?.dash ?? 'draw'
       this.styleProps('arrow', 'fill').defaultValue = v?.fill ?? 'none'
-      this.editor.setCurrentTool('line')
+      editorAPP.setCurrentTool('line')
     },
     rectangle(v) {
       this.styleProps('geo', 'geo').defaultValue = 'rectangle'
@@ -173,7 +175,7 @@ export default {
       this.styleProps('geo', 'size').defaultValue = v?.size ?? 'm'
       this.styleProps('geo', 'dash').defaultValue = v?.dash ?? 'draw'
       this.styleProps('geo', 'fill').defaultValue = v?.fill ?? 'none'
-      this.editor.setCurrentTool('geo')
+      editorAPP.setCurrentTool('geo')
     },
     ellipse(v) {
       this.styleProps('geo', 'geo').defaultValue = 'ellipse'
@@ -181,7 +183,7 @@ export default {
       this.styleProps('geo', 'size').defaultValue = v?.size ?? 'm'
       this.styleProps('geo', 'dash').defaultValue = v?.dash ?? 'draw'
       this.styleProps('geo', 'fill').defaultValue = v?.fill ?? 'none'
-      this.editor.setCurrentTool('geo')
+      editorAPP.setCurrentTool('geo')
     },
     triangle(v) {
       this.styleProps('geo', 'geo').defaultValue = 'triangle'
@@ -189,7 +191,7 @@ export default {
       this.styleProps('geo', 'size').defaultValue = v?.size ?? 'm'
       this.styleProps('geo', 'dash').defaultValue = v?.dash ?? 'draw'
       this.styleProps('geo', 'fill').defaultValue = v?.fill ?? 'none'
-      this.editor.setCurrentTool('geo')
+      editorAPP.setCurrentTool('geo')
     },
 
     rhombus(v) {
@@ -198,7 +200,7 @@ export default {
       this.styleProps('geo', 'size').defaultValue = v?.size ?? 'm'
       this.styleProps('geo', 'dash').defaultValue = v?.dash ?? 'draw'
       this.styleProps('geo', 'fill').defaultValue = v?.fill ?? 'none'
-      this.editor.setCurrentTool('geo')
+      editorAPP.setCurrentTool('geo')
     },
     cloud(v) {
       this.styleProps('geo', 'geo').defaultValue = 'cloud'
@@ -206,7 +208,7 @@ export default {
       this.styleProps('geo', 'size').defaultValue = v?.size ?? 'm'
       this.styleProps('geo', 'dash').defaultValue = v?.dash ?? 'draw'
       this.styleProps('geo', 'fill').defaultValue = v?.fill ?? 'none'
-      this.editor.setCurrentTool('geo')
+      editorAPP.setCurrentTool('geo')
     },
     trapezoid(v) {
       this.styleProps('geo', 'geo').defaultValue = 'trapezoid'
@@ -214,7 +216,7 @@ export default {
       this.styleProps('geo', 'size').defaultValue = v?.size ?? 'm'
       this.styleProps('geo', 'dash').defaultValue = v?.dash ?? 'draw'
       this.styleProps('geo', 'fill').defaultValue = v?.fill ?? 'none'
-      this.editor.setCurrentTool('geo')
+      editorAPP.setCurrentTool('geo')
     },
     diamond(v) {
       this.styleProps('geo', 'geo').defaultValue = 'diamond'
@@ -222,7 +224,7 @@ export default {
       this.styleProps('geo', 'size').defaultValue = v?.size ?? 'm'
       this.styleProps('geo', 'dash').defaultValue = v?.dash ?? 'draw'
       this.styleProps('geo', 'fill').defaultValue = v?.fill ?? 'none'
-      this.editor.setCurrentTool('geo')
+      editorAPP.setCurrentTool('geo')
     },
     star(v) {
       this.styleProps('geo', 'geo').defaultValue = 'star'
@@ -230,7 +232,7 @@ export default {
       this.styleProps('geo', 'size').defaultValue = v?.size ?? 'm'
       this.styleProps('geo', 'dash').defaultValue = v?.dash ?? 'draw'
       this.styleProps('geo', 'fill').defaultValue = v?.fill ?? 'none'
-      this.editor.setCurrentTool('geo')
+      editorAPP.setCurrentTool('geo')
     },
 
     xBox(v) {
@@ -239,7 +241,7 @@ export default {
       this.styleProps('geo', 'size').defaultValue = v?.size ?? 'm'
       this.styleProps('geo', 'dash').defaultValue = v?.dash ?? 'draw'
       this.styleProps('geo', 'fill').defaultValue = v?.fill ?? 'none'
-      this.editor.setCurrentTool('geo')
+      editorAPP.setCurrentTool('geo')
     },
     checkBox(v) {
       this.styleProps('geo', 'geo').defaultValue = 'check-box'
@@ -247,7 +249,7 @@ export default {
       this.styleProps('geo', 'size').defaultValue = v?.size ?? 'm'
       this.styleProps('geo', 'dash').defaultValue = v?.dash ?? 'draw'
       this.styleProps('geo', 'fill').defaultValue = v?.fill ?? 'none'
-      this.editor.setCurrentTool('geo')
+      editorAPP.setCurrentTool('geo')
     },
     oval(v) {
       this.styleProps('geo', 'geo').defaultValue = 'oval'
@@ -255,7 +257,7 @@ export default {
       this.styleProps('geo', 'size').defaultValue = v?.size ?? 'm'
       this.styleProps('geo', 'dash').defaultValue = v?.dash ?? 'draw'
       this.styleProps('geo', 'fill').defaultValue = v?.fill ?? 'none'
-      this.editor.setCurrentTool('geo')
+      editorAPP.setCurrentTool('geo')
     },
     arrowLeft(v) {
       this.styleProps('geo', 'geo').defaultValue = 'arrow-left'
@@ -263,7 +265,7 @@ export default {
       this.styleProps('geo', 'size').defaultValue = v?.size ?? 'm'
       this.styleProps('geo', 'dash').defaultValue = v?.dash ?? 'draw'
       this.styleProps('geo', 'fill').defaultValue = v?.fill ?? 'none'
-      this.editor.setCurrentTool('geo')
+      editorAPP.setCurrentTool('geo')
     },
     arrowRight(v) {
       this.styleProps('geo', 'geo').defaultValue = 'arrow-right'
@@ -271,7 +273,7 @@ export default {
       this.styleProps('geo', 'size').defaultValue = v?.size ?? 'm'
       this.styleProps('geo', 'dash').defaultValue = v?.dash ?? 'draw'
       this.styleProps('geo', 'fill').defaultValue = v?.fill ?? 'none'
-      this.editor.setCurrentTool('geo')
+      editorAPP.setCurrentTool('geo')
     },
     arrowUp(v) {
       this.styleProps('geo', 'geo').defaultValue = 'arrow-up'
@@ -279,7 +281,7 @@ export default {
       this.styleProps('geo', 'size').defaultValue = v?.size ?? 'm'
       this.styleProps('geo', 'dash').defaultValue = v?.dash ?? 'draw'
       this.styleProps('geo', 'fill').defaultValue = v?.fill ?? 'none'
-      this.editor.setCurrentTool('geo')
+      editorAPP.setCurrentTool('geo')
     },
     arrowDown(v) {
       this.styleProps('geo', 'geo').defaultValue = 'arrow-down'
@@ -287,7 +289,7 @@ export default {
       this.styleProps('geo', 'size').defaultValue = v?.size ?? 'm'
       this.styleProps('geo', 'dash').defaultValue = v?.dash ?? 'draw'
       this.styleProps('geo', 'fill').defaultValue = v?.fill ?? 'none'
-      this.editor.setCurrentTool('geo')
+      editorAPP.setCurrentTool('geo')
     },
     hexagon(v) {
       this.styleProps('geo', 'geo').defaultValue = 'hexagon'
@@ -295,21 +297,18 @@ export default {
       this.styleProps('geo', 'size').defaultValue = v?.size ?? 'm'
       this.styleProps('geo', 'dash').defaultValue = v?.dash ?? 'draw'
       this.styleProps('geo', 'fill').defaultValue = v?.fill ?? 'none'
-      this.editor.setCurrentTool('geo')
+      editorAPP.setCurrentTool('geo')
     },
     highlight(v) {
       this.styleProps('geo', 'color').defaultValue = v?.color ?? 'black'
       this.styleProps('geo', 'size').defaultValue = v?.size ?? 'm'
       this.styleProps('geo', 'dash').defaultValue = v?.dash ?? 'draw'
       this.styleProps('geo', 'fill').defaultValue = v?.fill ?? 'none'
-      this.editor.setCurrentTool('highlight')
+      editorAPP.setCurrentTool('highlight')
     },
     insertPicture(img){
-      console.log('insertPicture',img)
       const assetId = AssetRecordType.createId()
-      console.log('assetId',assetId)
-      console.log('editor',this.editor)
-      this.editor.createAssets([{
+      editorAPP.createAssets([{
         id: assetId,
         type: 'image',
         typeName: 'asset',
@@ -324,28 +323,31 @@ export default {
         }
       }])
       const imageId = createShapeId()
-      console.log('imageId',imageId)
-      this.editor.createShape({
+      editorAPP.createShape({
+        id: imageId,
         type: 'image',
         x: 200,
         y: 200,
+        isLocked: false,
         props: {
+          w: img.width,
+          h: img.height,
           assetId
         },
       })
 
     },
     laser() {
-      this.editor.setCurrentTool('laser')
+      editorAPP.setCurrentTool('laser')
     },
     undo() {
-      this.editor.undo()
+      editorAPP.undo()
     },
     redo() {
-      this.editor.redo()
+      editorAPP.redo()
     },
     styleProps(t, e) {
-      const style = [...this.editor.styleProps[t]]
+      const style = [...editorAPP.styleProps[t]]
       const index = style.findIndex(item => item[1] === e)
       return style[index][0]
     },
@@ -353,7 +355,7 @@ export default {
     isFocused() {
       const top = document.documentElement.scrollTop
       setTimeout(() => {
-        this.editor.updateInstanceState({isFocused: true})
+        editorAPP.updateInstanceState({isFocused: true})
         document.documentElement.scrollTop = top
       }, 10)
     }

package/src/index.js

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