Browse Source

Merge branch 'master' of git.sagacloud.cn:web/persagy-web

zhangyu 4 năm trước cách đây
mục cha
commit
2222e7bf2e

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

@@ -1,6 +1,6 @@
 {
     "name": "@persagy-web/big-edit",
-    "version": "2.2.7",
+    "version": "2.2.9",
     "description": "博锐尚格二维图形编辑器。",
     "main": "lib/index.js",
     "types": "lib/index.d.js",
@@ -40,7 +40,7 @@
         "typescript": "^3.5.3"
     },
     "dependencies": {
-        "@persagy-web/edit": "2.2.6",
+        "@persagy-web/edit": "2.2.8",
         "@types/uuid": "^8.0.0",
         "crypto-js": "^4.0.0",
         "axios": "^0.20.0"

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

@@ -1,6 +1,6 @@
 {
     "name": "@persagy-web/big",
-    "version": "2.2.33",
+    "version": "2.2.34",
     "description": "博锐尚格建筑信息化库",
     "main": "lib/index.js",
     "types": "lib/index.d.js",
@@ -41,7 +41,7 @@
         "typescript": "^3.9.3"
     },
     "dependencies": {
-        "@persagy-web/graph": "2.2.34",
+        "@persagy-web/graph": "2.2.35",
         "axios": "^0.18.0",
         "pako": "^1.0.10",
         "crypto-js": "^4.0.0",

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

@@ -1,6 +1,6 @@
 {
     "name": "@persagy-web/draw",
-    "version": "2.2.8",
+    "version": "2.2.9",
     "description": "博锐尚格绘制引擎。",
     "main": "lib/index.js",
     "types": "lib/index.d.js",

+ 14 - 3
persagy-web-draw/src/engines/SSvgPaintEngine.ts

@@ -114,7 +114,6 @@ export class SSvgPaintEngine extends SPaintEngine {
      */
     drawRect(rect: SRect): void {
         this._builder.append(
-
             `<rect x="${rect.x}" y="${rect.y}" width="${rect.width}" height="${
                 rect.height
             }" ${this.getStyle(true, true, false)} ${this.getSvgMatrix()}/>`
@@ -201,7 +200,6 @@ export class SSvgPaintEngine extends SPaintEngine {
      * @param path  路径
      */
     drawPath(path: SPath): void {
-
         //     `<path d="${path.svgPath()}" ${this.getStyle(
         //         true,
         //         true,
@@ -244,7 +242,20 @@ export class SSvgPaintEngine extends SPaintEngine {
         width?: number,
         height?: number
     ): void {
-        // TODO: 未完成
+        // @ts-ignore
+        if (img.src) {
+            // @ts-ignore
+            let url = img.src;
+            url = url.replace(/\&/g, "&amp;");
+            url = url.replace(/\</g, "&lt;");
+            url = url.replace(/\>/g, "&gt;");
+            url = url.replace(/\'/g, "&apos;");
+            url = url.replace(/\"/g, "&quot;");
+            this._builder.append(
+                // eslint-disable-next-line max-len
+                `<image xlink:href="${url}" width="${width}" height="${height}" x="${x}" y="${y}" ${this.getSvgMatrix()} />`
+            );
+        }
     }
 
     /**

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

@@ -1,6 +1,6 @@
 {
     "name": "@persagy-web/edit",
-    "version": "2.2.6",
+    "version": "2.2.8",
     "description": "博锐尚格二维图形编辑器。",
     "main": "lib/index.js",
     "types": "lib/index.d.js",
@@ -40,7 +40,7 @@
         "typescript": "^3.5.3"
     },
     "dependencies": {
-        "@persagy-web/big": "2.2.33",
+        "@persagy-web/big": "2.2.34",
         "@types/uuid": "^8.0.0"
     }
 }

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

@@ -1,6 +1,6 @@
 {
     "name": "@persagy-web/graph",
-    "version": "2.2.34",
+    "version": "2.2.35",
     "description": "博锐尚格二维图形引擎。",
     "main": "lib/index.js",
     "types": "lib/index.d.js",
@@ -40,7 +40,7 @@
         "typescript": "^3.5.3"
     },
     "dependencies": {
-        "@persagy-web/draw": "2.2.8",
+        "@persagy-web/draw": "2.2.9",
         "@types/uuid": "^8.0.0"
     }
 }