Browse Source

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

zhangyu 5 years ago
parent
commit
61138b3d5d

+ 1 - 1
saga-web-base/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@saga-web/base",
-    "version": "2.1.19",
+    "version": "2.1.20",
     "description": "上格云Web基础库。",
     "main": "lib/index.js",
     "types": "lib/index.d.js",

+ 1 - 1
saga-web-big/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@saga-web/big",
-    "version": "1.0.40",
+    "version": "1.0.43",
     "description": "上格云建筑信息化库",
     "main": "lib/index.js",
     "types": "lib/index.d.js",

+ 15 - 15
saga-web-big/src/items/SIconTextItem.ts

@@ -13,7 +13,7 @@ import { SSize, SRect, SPainter, SColor, SFont } from "@saga-web/draw";
  * 图例item  icon
  *
  * */
-export class SImgTextItem extends SObjectItem {
+export class SIconTextItem extends SObjectItem {
 
     /** item状态  */
     _status: SItemStatus = SItemStatus.Normal;
@@ -24,7 +24,7 @@ export class SImgTextItem extends SObjectItem {
       this._status = v;
       this.update();
     }
-  
+
     /** 是否显示文字  */
     _showText: boolean = true;
     get showText(): boolean {
@@ -41,7 +41,7 @@ export class SImgTextItem extends SObjectItem {
         this.textItem.hide();
       }
     }
-  
+
     /** X轴坐标 */
     get x(): number {
       return this.pos.x;
@@ -60,7 +60,7 @@ export class SImgTextItem extends SObjectItem {
       this.$emit("changePos");
       this.update();
     } // Set y
-  
+
     /** icon宽 */
     get sWidth(): number {
       return this.img.width;
@@ -69,7 +69,7 @@ export class SImgTextItem extends SObjectItem {
       this.img.width = v
       this.update();
     }
-  
+
     /** icon宽 */
     get sHeight(): number {
       return this.img.height;
@@ -78,7 +78,7 @@ export class SImgTextItem extends SObjectItem {
       this.img.height = v
       this.update();
     }
-  
+
     /** 是否显示锚点  */
     _showAnchor: boolean = false;
     get showAnchor(): boolean {
@@ -90,7 +90,7 @@ export class SImgTextItem extends SObjectItem {
         t.visible = v;
       })
     }
-  
+
     get text(): string {
       return this.textItem.text;
     }
@@ -114,10 +114,10 @@ export class SImgTextItem extends SObjectItem {
     }
     /** img Item    */
     img: SImageItem = new SImageItem(this);
-  
+
     /** text item   */
     textItem: STextItem = new STextItem(this);
-  
+
     /**
      * 构造体
      *
@@ -144,7 +144,7 @@ export class SImgTextItem extends SObjectItem {
       this.textItem.enabled = false;
       this.img.enabled = false;
     }
-  
+
     /**
      * 鼠标按下事件
      *
@@ -158,7 +158,7 @@ export class SImgTextItem extends SObjectItem {
       }
       return true;
     } // Function onMouseDown()
-  
+
     /**
      * 宽高发发生变化
      *
@@ -168,7 +168,7 @@ export class SImgTextItem extends SObjectItem {
     onResize(oldSize: SSize, newSize: SSize) {
       console.log(arguments);
     } // Function onResize()
-  
+
     /**
      * 鼠标双击事件
      *
@@ -179,7 +179,7 @@ export class SImgTextItem extends SObjectItem {
       this.status = SItemStatus.Edit;
       return true;
     } // Function onDoubleClick()
-  
+
     /**
      * 宽高发生变化
      *
@@ -192,7 +192,7 @@ export class SImgTextItem extends SObjectItem {
       }
       return rect.adjusted(-5, -5, 10, 10);
     } // Function boundingRect()
-  
+
     /**
      * Item绘制操作
      *
@@ -210,4 +210,4 @@ export class SImgTextItem extends SObjectItem {
         painter.drawRect(this.boundingRect());
       }
     } // Function onDraw()
-  }
+  }

+ 2 - 2
saga-web-draw/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@saga-web/draw",
-    "version": "2.1.94",
+    "version": "2.1.96",
     "description": "上格云绘制引擎。",
     "main": "lib/index.js",
     "types": "lib/index.d.js",
@@ -33,7 +33,7 @@
         "typescript": "^3.5.3"
     },
     "dependencies": {
-        "@saga-web/base": "^2.1.19"
+        "@saga-web/base": "^2.1.20"
     },
     "jest": {
         "setupFiles": [

+ 2 - 2
saga-web-graph/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@saga-web/graph",
-    "version": "2.1.82",
+    "version": "2.1.86",
     "description": "上格云二维图形引擎。",
     "main": "lib/index.js",
     "types": "lib/index.d.js",
@@ -41,6 +41,6 @@
         "typescript": "^3.5.3"
     },
     "dependencies": {
-        "@saga-web/draw": "2.1.94"
+        "@saga-web/draw": "2.1.96"
     }
 }