zhangyu il y a 5 ans
Parent
commit
81ced04935
2 fichiers modifiés avec 20 ajouts et 8 suppressions
  1. 7 0
      saga-web-graph/src/items/SImageItem.ts
  2. 13 8
      saga-web-graph/src/items/STextItem.ts

+ 7 - 0
saga-web-graph/src/items/SImageItem.ts

@@ -126,6 +126,13 @@ export class SImageItem extends SObjectItem {
             }
             // @ts-ignore
             painter.drawImage(this.img, -width / 2, -height / 2, width, height);
+            if (this.selected) {
+              painter.pen.lineWidth = painter.toPx(4);
+              painter.pen.lineDash = [painter.toPx(12), painter.toPx(28)];
+              painter.pen.color = new SColor("#c0ccda");
+              painter.brush.color = SColor.Transparent;
+              painter.drawRect(this.boundingRect());
+            }
         } else {
             painter.pen.lineWidth = painter.toPx(1);
             painter.pen.lineDash = [painter.toPx(3), painter.toPx(7)];

+ 13 - 8
saga-web-graph/src/items/STextItem.ts

@@ -7,6 +7,11 @@ import { SGraphItem } from "../SGraphItem";
  *
  * @author  张宇(taohuzy@163.com)
  */
+/**
+ * 文本item
+ *
+ * @author  张宇(taohuzy@163.com)
+ */
 export class STextItem extends SObjectItem {
     /** 文本内容 */
     private _text: string = "";
@@ -39,21 +44,21 @@ export class STextItem extends SObjectItem {
     }
 
     /** 背景色 */
-    private _backgroundColor: string = "#00000000";
-    get backgroundColor(): string {
+    private _backgroundColor: SColor = new SColor("#00000000");
+    get backgroundColor(): SColor {
         return this._backgroundColor;
     }
-    set backgroundColor(v: string) {
+    set backgroundColor(v: SColor) {
         this._backgroundColor = v;
         this.update();
     }
 
     /** 边框色 */
-    private _strokeColor: string = "#00000000";
-    get strokeColor(): string {
+    private _strokeColor: SColor = new SColor("#00000000");
+    get strokeColor(): SColor {
         return this._strokeColor;
     }
-    set strokeColor(v: string) {
+    set strokeColor(v: SColor) {
         this._strokeColor = v;
         this.update();
     }
@@ -103,8 +108,8 @@ export class STextItem extends SObjectItem {
     protected drawShowText(painter: SPainter): void {
         //绘制矩形轮廓
         if (this.showBorder) {
-            painter.brush.color = new SColor(this.backgroundColor);
-            painter.pen.color = new SColor(this.strokeColor);
+            painter.brush.color = this.backgroundColor;
+            painter.pen.color = this.strokeColor;
             painter.drawRect(this.boundingRect());
         }