fix(*): bugs

ctank · May 25, 2019 · 0dfd0d2 · 0dfd0d2
1 parent b8cb1a1
commit 0dfd0d2
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 17 deletions.
diff --git a/dist/js/bpd-core.js b/dist/js/bpd-core.js
diff --git a/dist/js/bpd-core.umd.js b/dist/js/bpd-core.umd.js
diff --git a/src/draw/draw.js b/src/draw/draw.js
@@ -35,11 +35,10 @@ class Draw extends Operation {
     this.init()
   }
   init() {
-    if (!this.options.readonly) {
-      this.$container
-        .off('mousemove.operate')
-        .on('mousemove.operate', this.move.bind(this))
-    }
+    this.$container
+      .off('mousemove.operate')
+      .on('mousemove.operate', this.move.bind(this))
+
     // 创建图形
     eventBus.on('shape.create', this.createShapeData.bind(this))
     // 渲染图形
@@ -191,7 +190,7 @@ class Draw extends Operation {
       left = 0
     }
 
-    $layout.offset({ top, left })
+    $layout.css({ top, left })
   }
   /**
    * 渲染页面

diff --git a/src/draw/operation.js b/src/draw/operation.js
@@ -67,7 +67,7 @@ class Operation {
         $container
       )
 
-      if (shapeData != null) {
+      if (shapeData != null && !this.options.readonly) {
         eventBus.trigger('hand.destroy')
 
         data.element = shapeData.element

diff --git a/src/features/hand/hand.js b/src/features/hand/hand.js
@@ -26,7 +26,7 @@ class Hand {
       .off('touchstart.hand mousedown.hand')
       .on('touchstart.hand mousedown.hand', e => {
         const $layout = this.$container.find('.bpd-layout')
-        const layoutPos = $layout.offset()
+        const layoutPos = $layout.position()
         const mousePos = {
           x: 0,
           y: 0
@@ -75,7 +75,7 @@ class Hand {
           left = -pageStyle.width + window.innerWidth
         }
 
-        $layout.offset({ top, left })
+        $layout.css({ top, left })
       }
     })
   }

diff --git a/src/main.js b/src/main.js
@@ -443,11 +443,13 @@ class BPDCore {
    * 激活选择模式
    */
   activateSelect() {
-    eventBus.trigger('hand.destroy')
-    eventBus.trigger('shape.multiSelect', {
-      state: this.draw.state
-    })
-    this.draw.changeState('multiSelect')
+    if (!this.options.readonly) {
+      eventBus.trigger('hand.destroy')
+      eventBus.trigger('shape.multiSelect', {
+        state: this.draw.state
+      })
+      this.draw.changeState('multiSelect')
+    }
   }
 
   /**

diff --git a/static/index.html b/static/index.html
@@ -53,7 +53,7 @@
   </head>
 
   <body>
-    <div id="canvas"></div>
+    <div id="canvas" style="margin: 50px"></div>
 
     <span class="createNode-box1">
       <button class="createNode" draggable="true" shapeName="startEvent">