@ray-js/graffiti 1.1.5-beta.1 → 1.1.6

package/lib/components/index.js

@@ -150,12 +150,8 @@ Component({
     },
     drawData: {
       // 初始绘制数据
-      type: null,
-      observer(newValue) {
-        if (newValue && this.render) {
-          this.render.drawData(newValue);
-        }
-      }
+      type: Array,
+      value: []
     }
   },
   data: {
@@ -178,7 +174,8 @@ Component({
         pixelGap,
         mode,
         scale,
-        isDragging
+        isDragging,
+        drawData
       } = this.data;
       width = getDeviceRealPx(width);
       height = getDeviceRealPx(height);
@@ -219,11 +216,9 @@ Component({
         penColor: this.data.penColor,
         scale: scale,
         isDragging: isDragging,
-        boxRect: rect
+        boxRect: rect,
+        drawData: drawData
       });
-      if (this.data.drawData) {
-        this.render.drawData(this.data.drawData);
-      }
     }
   },
   methods: {

package/lib/components/index.rjs

@@ -17,6 +17,7 @@ export default Render({
     scale,
     isDragging,
     boxRect,
+    drawData,
   }) {
     this.scale = scale || 1;
     this.isDragging = isDragging || false;
@@ -75,6 +76,9 @@ export default Render({
     // 初始化画布, 绘制像素点
     this.createPixel(pixelColor);
 
+    // 初始化传入的绘制数据
+    this.initDrawData(Array.isArray(drawData) ? drawData : []);
+
     this.updateScale(scale);
 
     canvas.addEventListener('touchstart', this.handleTouchstart, false);
@@ -274,8 +278,7 @@ export default Render({
     this.callMethod('genImageData', { base64, gridData: this.gridData });
   },
 
-  drawData(list) {
-    console.log('render drawData', list);
+  initDrawData(list) {
     for (const item of list) {
       this.fillPixel(item.x, item.y, item.color);
     }

package/lib/props.js

@@ -17,6 +17,7 @@ export const defaultProps = {
   clearTrigger: 0,
   scale: 1,
   isDragging: false,
+  drawData: [],
   onStrokeChange: () => null,
   onSaveData: () => null
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/graffiti",
-  "version": "1.1.5-beta.1",
+  "version": "1.1.6",
   "description": "画布涂鸦组件",
   "main": "lib/index",
   "files": [