升级到typescript3.7

__test__/Utils/jest.util.ts

@@ -7,7 +7,7 @@ declare global
 {
     namespace jest
     {
-        interface Matchers<R>
+        interface Matchers<R, T>
         {
             /**
              * 匹配数值快照,可以指定精度,默认为5

package.json

@@ -21,15 +21,15 @@
     "license": "ISC",
     "devDependencies": {
         "@types/html-webpack-plugin": "^3.2.1",
-        "@types/jest": "^24.0.19",
+        "@types/jest": "^24.0.22",
-        "@types/node": "^12.11.6",
+        "@types/node": "^12.12.6",
         "@types/pako": "^1.0.1",
         "@types/react": "^16.9.9",
         "@types/react-color": "^3.0.1",
         "@types/react-dom": "^16.9.2",
         "@types/stats.js": "^0.17.0",
-        "@types/terser-webpack-plugin": "^1.2.1",
+        "@types/terser-webpack-plugin": "^2.2.0",
-        "@types/webpack": "^4.39.5",
+        "@types/webpack": "^4.39.8",
         "@types/webpack-dev-server": "^3.4.0",
         "@types/webpack-env": "^1.14.1",
         "@types/webpack-merge": "^4.1.5",
@@ -53,7 +53,7 @@
         "mobx-react-devtools": "^6.1.1",
         "react-hot-loader": "^4.12.15",
         "request": "^2.88.0",
-        "request-promise-native": "^1.0.7",
+        "request-promise-native": "^1.0.8",
         "required-loader": "^1.3.16",
         "resize-observer-polyfill": "^1.5.1",
         "shader-loader": "^1.3.1",
@@ -64,7 +64,7 @@
         "ts-loader": "^6.2.1",
         "ts-node": "^8.4.1",
         "tsconfig-paths": "^3.9.0",
-        "typescript": "^3.6.4",
+        "typescript": "^3.7.2",
         "url-loader": "^2.2.0",
         "wallaby-webpack": "^3.9.15",
         "webpack": "^4.41.2",
@@ -75,6 +75,7 @@
     },
     "dependencies": {
         "@blueprintjs/core": "^3.19.1",
+        "clipper-js-fpoint": "^6.4.222",
         "detect-browser": "^4.7.0",
         "dxf-parser": "^1.0.0-alpha.1",
         "golden-layout": "^1.5.9",
@@ -87,7 +88,7 @@
         "react-dom": "^16.11.0",
         "react-rnd2": "^1.0.1",
         "stats.js": "^0.17.0",
-        "three": "^0.109.0",
+        "three": "^0.110.0",
         "xaop": "^1.3.3"
     },
     "jest": {

src/DatabaseServices/Shape2.ts

@@ -43,7 +43,7 @@ export class Shape2 extends Shape
     }
 
 
-    absellipse(aX: number, aY: number, xRadius: number, yRadius: number, aStartAngle: number, aEndAngle: number, aClockwise: boolean, aRotation: number)
+    absellipse(aX: number, aY: number, xRadius: number, yRadius: number, aStartAngle: number, aEndAngle: number, aClockwise: boolean, aRotation: number): this
     {
         let curve = new EllipseCurve(aX, aY, xRadius, yRadius, aStartAngle, aEndAngle, aClockwise, aRotation);
 
@@ -63,5 +63,7 @@ export class Shape2 extends Shape
 
         let lastPoint = curve.getPoint(1);
         this.currentPoint.copy(lastPoint);
+
+        return this;
     }
 }