|
@@ -145,6 +145,26 @@ export class SBaseTextEdit extends SGraphEdit {
|
|
|
this.update();
|
|
|
}
|
|
|
|
|
|
+ /** 文本外圈颜色 */
|
|
|
+ private _fontStrokeColor: SColor = SColor.Transparent;
|
|
|
+ get fontStrokeColor(): SColor {
|
|
|
+ return this._fontStrokeColor;
|
|
|
+ }
|
|
|
+ set fontStrokeColor(v: SColor) {
|
|
|
+ this._fontStrokeColor = v;
|
|
|
+ this.update();
|
|
|
+ }
|
|
|
+
|
|
|
+ /** 文本外圈颜色 */
|
|
|
+ private _fontStrokeWidth: number = 1;
|
|
|
+ get fontStrokeWidth(): number {
|
|
|
+ return this._fontStrokeWidth;
|
|
|
+ }
|
|
|
+ set fontStrokeWidth(v: number) {
|
|
|
+ this._fontStrokeWidth = v;
|
|
|
+ this.update();
|
|
|
+ }
|
|
|
+
|
|
|
/** 字体 */
|
|
|
private _font: SFont = new SFont("sans-serif", 12);
|
|
|
get font(): SFont {
|
|
@@ -254,6 +274,16 @@ export class SBaseTextEdit extends SGraphEdit {
|
|
|
if (data.style.default.color) {
|
|
|
this.color = new SColor(data.style.default.color);
|
|
|
}
|
|
|
+ // 设置文本外圈颜色
|
|
|
+ if (data.style.default.fontStrokeColor) {
|
|
|
+ this.fontStrokeColor = new SColor(
|
|
|
+ data.style.default.fontStrokeColor
|
|
|
+ );
|
|
|
+ }
|
|
|
+ // 设置文本外圈宽度
|
|
|
+ if (data.style.default.fontStrokeWidth) {
|
|
|
+ this.fontStrokeWidth = data.style.default.fontStrokeWidth;
|
|
|
+ }
|
|
|
// 设置字体大小
|
|
|
if (data.style.default.font) {
|
|
|
this.font = new SFont("sans-serif", data.style.default.font);
|
|
@@ -350,7 +380,8 @@ export class SBaseTextEdit extends SGraphEdit {
|
|
|
|
|
|
//绘制文本
|
|
|
painter.brush.color = new SColor(this.color);
|
|
|
- painter.pen.color = new SColor(this.color);
|
|
|
+ painter.pen.color = this.fontStrokeColor;
|
|
|
+ painter.pen.lineWidth = this.fontStrokeWidth;
|
|
|
painter.shadow.shadowColor = SColor.Transparent;
|
|
|
painter.font = this.font;
|
|
|
this._textArr.forEach((text: string, index: number) => {
|
|
@@ -420,6 +451,8 @@ export class SBaseTextEdit extends SGraphEdit {
|
|
|
this.data.style.default.zorder = this.zOrder;
|
|
|
this.data.style.default.text = this.text;
|
|
|
this.data.style.default.color = this.color.value;
|
|
|
+ this.data.style.default.fontStrokeColor = this.fontStrokeColor.value;
|
|
|
+ this.data.style.default.fontStrokeWidth = this.fontStrokeWidth;
|
|
|
this.data.style.default.font = this.font.size;
|
|
|
this.data.style.default.lineWidth = this.lineWidth;
|
|
|
this.data.style.default.backgroundColor = this.backgroundColor.value;
|