Explorar el Código

Merge branch 'master' of http://39.106.8.246:3003/web/persagy-web

haojianlong hace 4 años
padre
commit
82e0dec2bb

+ 2 - 2
persagy-web-big-edit/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@persagy-web/big-edit",
-    "version": "2.2.4",
+    "version": "2.2.5",
     "description": "博锐尚格二维图形编辑器。",
     "main": "lib/index.js",
     "types": "lib/index.d.js",
@@ -41,7 +41,7 @@
     },
     "dependencies": {
         "@persagy-web/graph": "2.2.22",
-        "@persagy-web/edit": "2.2.2",
+        "@persagy-web/edit": "2.2.4",
         "@types/uuid": "^8.0.0",
         "crypto-js": "^4.0.0",
         "axios": "^0.20.0"

+ 3 - 2
persagy-web-big-edit/src/items/SBaseEquipment.ts

@@ -56,6 +56,7 @@ export class SBaseEquipment extends SBaseIconTextEdit {
         return this._infoPointList
     } // get infoPointList()
 
+    defaultUrl:string = '';
     /** 图得url */
     _url: string = '';
     set url(val) {
@@ -132,7 +133,7 @@ export class SBaseEquipment extends SBaseIconTextEdit {
         }
 
         this.showAnchor = false;
-        this.url = this.legendData.style.default.base64Url ? this.legendData.style.default.base64Url : this.legendData.style.default.url
+        // this.url = this.legendData.style.default.base64Url ? this.legendData.style.default.base64Url : this.legendData.style.default.url
         this.anotherMsg = this.legendData.properties.anotherMsg ? this.legendData.properties.anotherMsg : '';
         this.x = this.legendData.pos.x;
         this.y = this.legendData.pos.y;
@@ -250,7 +251,7 @@ export class SBaseEquipment extends SBaseIconTextEdit {
             this.legendData.properties.infoPointList = infoPoinList;
             this.legendData.properties.anotherMsg = this.anotherMsg;
             this.legendData.style.default.base64Url = "";
-            this.legendData.style.default.url = this.url;
+            this.legendData.style.default.url = this.defaultUrl;
             return this.legendData
         }
     }

+ 1 - 1
persagy-web-edit/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@persagy-web/edit",
-    "version": "2.2.3",
+    "version": "2.2.4",
     "description": "博锐尚格二维图形编辑器。",
     "main": "lib/index.js",
     "types": "lib/index.d.js",

+ 5 - 3
persagy-web-edit/src/items/SBaseImageEdit.ts

@@ -53,8 +53,10 @@ export class SBaseImageEdit extends SGraphEdit {
             this.update();
         }
 
-
     } // Set data
+
+    // default url key
+    defaultUrl:string = '';
     /** 起始锚点 */
     startItem: SGraphItem | null = null;
     /** 结束锚点 */
@@ -254,7 +256,7 @@ export class SBaseImageEdit extends SGraphEdit {
 
             // 图片url
             if (data.style.default.url) {
-                this.url = data.style.default.url;
+                this.defaultUrl = data.style.default.url;
             }
 
             // 线宽
@@ -300,7 +302,7 @@ export class SBaseImageEdit extends SGraphEdit {
         this.data.pos.x = this.pos.x;
         this.data.pos.y = this.pos.y;
         this.data.style.default.zorder = this.zOrder;
-        this.data.style.default.url = this.url;
+        this.data.style.default.url = this.defaultUrl;
         this.data.style.default.lineWidth = this.lineWidth;
         this.data.style.default.strokeColor = this.strokeColor.value;
         this.data.style.default.lineStyle = this.lineStyle;

+ 87 - 0
persagy-web-graph/src/items/SGraphBaseCircle.ts

@@ -0,0 +1,87 @@
+/*
+ * *********************************************************************************************************************
+ *
+ *          !!
+ *        .F88X
+ *        X8888Y
+ *      .}888888N;
+ *        i888888N;        .:!              .I$WI:
+ *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
+ *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
+ *            +888888N;  .8888888Y                                  "&&8Y.}8,
+ *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
+ *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
+ *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
+ *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
+ *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
+ *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
+ *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
+ *      .:R888888I
+ *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
+ *        ~8888'
+ *        .!88~                                                                     All rights reserved.
+ *
+ * *********************************************************************************************************************
+ */
+
+/**
+ * 圆
+ *
+ *  @author  韩耀龙 <han_yao_long@163.com>
+ */
+import { SGraphStyleItem, SGraphItem, SLineStyle } from "./../"
+import { SPainter, SPoint } from "@persagy-web/draw";
+
+export class SGraphBaseCircle extends SGraphStyleItem {
+    // 圆坐标
+    set localtion(v) {
+        this._localtion = new SPoint(v);
+        this.update()
+    }
+    get localtion(): SPoint {
+        return this._localtion
+    }
+    _localtion: SPoint = new SPoint(0, 0);
+    // 圆半径
+    set radius(v: number) {
+        this._radius = v;
+        this.update();
+    }
+    get radius(): number {
+        return this._radius
+    }
+    _radius: number = 0;
+
+    /**
+     * 构造函数
+     *
+     * @param parent
+     */
+    constructor(parent: SGraphItem | null) {
+        super(parent)
+    }
+
+    /**
+    * Item 绘制操作
+    *
+    * @param painter    绘制对象
+    */
+    onDraw(painter: SPainter): void {
+        painter.pen.color = this.strokeColor;
+        painter.brush.color = this.fillColor;
+        painter.pen.lineWidth = this.lineWidth;
+        if (this.lineStyle == SLineStyle.Dashed) {
+            painter.pen.lineDash = [
+                painter.toPx(this.lineWidth * 3),
+                painter.toPx(this.lineWidth * 7)
+            ];
+        } else if (this.lineStyle == SLineStyle.Dotted) {
+            painter.pen.lineDash = [
+                painter.toPx(this.lineWidth * 2),
+                painter.toPx(this.lineWidth * 2)
+            ];
+        }
+
+        painter.drawCircle(this.localtion.x, this.localtion.y, this.radius);
+    } // Function onDraw()
+}