Browse Source

合并冲突

YaolongHan 6 years ago
parent
commit
2bc7afe9ed

+ 6 - 0
package.json

@@ -10,6 +10,12 @@
         "build": "node build/build.js"
     },
     "dependencies": {
+<<<<<<< HEAD
+=======
+        "@sybotan-web/base": "^2.0.42",
+        "@sybotan-web/draw": "^2.0.49",
+        "@sybotan-web/graphy": "^2.0.57",
+>>>>>>> c764c27108df9d02d952526c79bcabdf4c678a60
         "axios": "^0.18.0",
         "echarts": "^4.1.0",
         "element-ui": "^2.6.1",

+ 4 - 0
src/assets/graphy/SGraphy/newItems/SGraphyCircleItem.ts

@@ -56,7 +56,11 @@ export class SGraphyCircleItem extends SGraphyItem {
      * @param   painter       painter对象
      * @param   rect          绘制区域
      */
+<<<<<<< HEAD
     onDraw(painter: SPainter, rect?: SRect): void {
+=======
+    onDraw(painter: SPainter, rect: SRect): void {
+>>>>>>> c764c27108df9d02d952526c79bcabdf4c678a60
         // painter.pen = new SPen(new SColor("#FF0000"), 22);
         painter.pen.color = this.color;
         painter.brush.color = this.fillColor;

+ 4 - 0
src/assets/graphy/SGraphy/newItems/SGraphyRectItem.ts

@@ -67,7 +67,11 @@ export class SGraphyRectItem extends SGraphyItem {
 	 * @param   painter       painter对象
 	 * @param   rect          绘制区域
 	 */
+<<<<<<< HEAD
   onDraw(painter: SPainter, rect?: SRect): void {
+=======
+  onDraw(painter: SPainter, rect: SRect): void {
+>>>>>>> c764c27108df9d02d952526c79bcabdf4c678a60
     // painter.pen = new SPen(this.color, this.width);
     painter.pen.color = this.color;
     painter.brush.color = this.fillColor;

+ 4 - 0
src/assets/graphy/SGraphy/newItems/SGraphyWallItem.ts

@@ -78,7 +78,11 @@ export class SGraphyWallItem extends SGraphyItem {
 	 * @param   painter       painter对象
 	 * @param   rect          绘制区域
 	 */
+<<<<<<< HEAD
 	onDraw(painter: SPainter, rect?: SRect): void {
+=======
+	onDraw(painter: SPainter, rect: SRect): void {
+>>>>>>> c764c27108df9d02d952526c79bcabdf4c678a60
 		if (this.pointArr.length) {
 			// painter.pen = new SPen(this.color, this.width);
 			painter.pen.color = this.color;