Bläddra i källkod

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

YaolongHan 4 år sedan
förälder
incheckning
662d96b82f

+ 56 - 4
persagy-web-base/src/enums/SKeyCode.ts

@@ -35,8 +35,60 @@ export enum SKeyCode {
     /** Esc键 */
     Esc = 27,
     /** 删除键 */
-    Delete = 46,
-    /** Z 键 */
-    Z = 90
+    Delete = 127,
+    /** A - Z 键 */
+    A = 65,
+    B = 66,
+    C = 67,
+    D = 68,
+    E = 69,
+    F = 70,
+    G = 71,
+    H = 72,
+    I = 73,
+    J = 74,
+    K = 75,
+    L = 76,
+    M = 77,
+    N = 78,
+    O = 79,
+    P = 80,
+    Q = 81,
+    R = 82,
+    S = 83,
+    T = 84,
+    U = 85,
+    V = 86,
+    W = 87,
+    X = 88,
+    Y = 89,
+    Z = 90,
+    /** a - z 键 */
+    a = 97,
+    b = 98,
+    c = 99,
+    d = 100,
+    e = 101,
+    f = 102,
+    g = 103,
+    h = 104,
+    i = 105,
+    j = 106,
+    k = 107,
+    l = 108,
+    m = 109,
+    n = 110,
+    o = 111,
+    p = 112,
+    q = 113,
+    r = 114,
+    s = 115,
+    t = 116,
+    u = 117,
+    v = 118,
+    w = 119,
+    x = 120,
+    y = 121,
+    z = 122
 } // Enum SKeyCode
-//todo a-z 0-9 郝洁补充
+

+ 3 - 3
persagy-web-big/package.json

@@ -1,9 +1,9 @@
 {
     "name": "@persagy-web/big",
-    "version": "2.2.15",
+    "version": "2.2.17",
     "description": "博锐尚格建筑信息化库",
     "main": "lib/index.js",
-    "types": "lib/index.d.js",ef
+    "types": "lib/index.d.js",
     "remote": {
         "host": "47.93.22.124",
         "path": "/opt/web/doc/api/web/big",
@@ -41,6 +41,6 @@
         "typescript": "^3.9.3"
     },
     "dependencies": {
-        "@persagy-web/graph": "2.2.20"
+        "@persagy-web/graph": "2.2.22"
     }
 }

+ 20 - 2
persagy-web-draw/src/SColor.ts

@@ -32,27 +32,45 @@ import { SStringUtil } from "@persagy-web/base";
  * @author 庞利祥 <sybotan@126.com>
  */
 export class SColor {
+    /** 透明色 */
     static readonly Transparent = new SColor("#00000000");
+    /** 黑色 */
     static readonly Black = new SColor("#000000");
+    /** 深蓝色 */
     static readonly DarkBlue = new SColor("#000080");
+    /** 蓝色 */
     static readonly Blue = new SColor("#0000FF");
+    /** 深绿色 */
     static readonly DarkGreen = new SColor("#008000");
+    /** 绿色 */
     static readonly Green = new SColor("#00FF00");
+    /** 深青色 */
     static readonly DarkCyan = new SColor("#008080");
+    /** 青色 */
     static readonly Cyan = new SColor("#00FFFF");
+    /** 深红色 */
     static readonly DarkRed = new SColor("#800000");
+    /** 红色 */
     static readonly Red = new SColor("#FF0000");
+    /** 深洋红色 */
     static readonly DarkMagenta = new SColor("#800080");
+    /** 洋红色 */
     static readonly Magenta = new SColor("#FF00FF");
+    /** 深黄色 */
     static readonly DarkYellow = new SColor("#808000");
+    /** 黄色 */
     static readonly Yellow = new SColor("#FFFF00");
+    /** 白色 */
     static readonly White = new SColor("#FFFFFF");
+    /** 深灰色 */
     static readonly DarkGray = new SColor("#808080");
+    /** 灰色 */
     static readonly Gray = new SColor("#A0A0A0");
+    /** 浅灰色 */
     static readonly LightGray = new SColor("#C0C0C0");
 
     /**
-     * 根据rgb分量生成颜色
+     * 根据 rgb 分量生成颜色
      *
      * @param r       红色分量
      * @param g       绿色分量
@@ -64,7 +82,7 @@ export class SColor {
     }
 
     /**
-     * 根据rgba分量生成颜色
+     * 根据 rgba 分量生成颜色
      *
      * @param r       红色分量
      * @param g       绿色分量

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

@@ -1,6 +1,6 @@
 {
     "name": "@persagy-web/graph",
-    "version": "2.2.20",
+    "version": "2.2.22",
     "description": "博锐尚格二维图形引擎。",
     "main": "lib/index.js",
     "types": "lib/index.d.js",

+ 4 - 1
persagy-web-graph/src/SGraphSelectContainer.ts

@@ -963,7 +963,7 @@ export class SGraphSelectContainer extends SGraphItem {
                         event.y - this._mouseDownPos.y
                     );
                     this.itemList.forEach(t => {
-                        t.moveTo(t.pos.x + mp.x, t.pos.y + mp.y);
+                        t.moveTo(t.x + mp.x, t.y + mp.y);
                     });
                 }
             }
@@ -992,6 +992,9 @@ export class SGraphSelectContainer extends SGraphItem {
     onMouseUp(event: SMouseEvent): boolean {
         this.curIndex = -1;
         super.onMouseUp(event);
+        this.itemList.forEach(t => {
+            t.moveToOrigin(t.x, t.y);
+        });
         return true;
     } // Function onMouseUp()