Browse Source

Merge branch 'develop' of http://39.106.8.246:3003/web/wanda-editer into develop

zhangyu 4 years ago
parent
commit
5bf7d14c76
3 changed files with 9 additions and 29 deletions
  1. 7 25
      package-lock.json
  2. 1 2
      src/lib/items/SFHFQZoneLegendItem.ts
  3. 1 2
      src/lib/items/SSCPZZoneLegendItem.ts

+ 7 - 25
package-lock.json

@@ -1064,29 +1064,11 @@
       "integrity": "sha512-lVDkCBkgu+nSkwyJrOU09aNnInRGrfeMFYANABSwtVmO7+4HK/T0qPCP1KiGZsq8vP6s1MDe+9fax1hp9Evefg=="
     },
     "@saga-web/big": {
-      "version": "1.0.48",
-      "resolved": "http://192.168.200.80:8081/repository/npm-saga/@saga-web/big/-/big-1.0.48.tgz",
-      "integrity": "sha512-ql3Hglt9HcdbtoJ2v5k6vEs4ECvDTQoBvILLh22K4ByEc26k9kLITISDjQx2l5tL19HSQ8nr0RH2fi9UHY9e9A==",
+      "version": "1.0.54",
+      "resolved": "http://192.168.200.80:8081/repository/npm-saga/@saga-web/big/-/big-1.0.54.tgz",
+      "integrity": "sha512-1r480w4B7YfWBFkrPahP++glQCbtp1JS+8B8+4NeYU3ErdBhzZ++Ij6OJOkDYop9D7tuRSqLreBZDYHOf9NCgg==",
       "requires": {
-        "@saga-web/graph": "2.1.92"
-      },
-      "dependencies": {
-        "@saga-web/draw": {
-          "version": "2.1.99",
-          "resolved": "http://192.168.200.80:8081/repository/npm-saga/@saga-web/draw/-/draw-2.1.99.tgz",
-          "integrity": "sha512-DEcgIZRVfCeCTaXCxO2qwisttApo/gz5Acs9Z16+nAQ/OUAZFj083qkwY40BmHFzsy27RFEi1l/zy5+lyJe8eQ==",
-          "requires": {
-            "@saga-web/base": "^2.1.22"
-          }
-        },
-        "@saga-web/graph": {
-          "version": "2.1.92",
-          "resolved": "http://192.168.200.80:8081/repository/npm-saga/@saga-web/graph/-/graph-2.1.92.tgz",
-          "integrity": "sha512-r/oGwf8TdZUg0IKXAkgkn9I49Sihju6qz8GOr4sjuvOdJdrCLz3/hq30EPQ2g2p7S5yxMyyk5MbQxZF2Ezx62w==",
-          "requires": {
-            "@saga-web/draw": "2.1.99"
-          }
-        }
+        "@saga-web/graph": "2.1.94"
       }
     },
     "@saga-web/draw": {
@@ -1133,9 +1115,9 @@
       }
     },
     "@saga-web/graph": {
-      "version": "2.1.93",
-      "resolved": "http://192.168.200.80:8081/repository/npm-saga/@saga-web/graph/-/graph-2.1.93.tgz",
-      "integrity": "sha512-M8DYminPBzc4wgzCkNcPUCakC/rQp10HaMwv+TcjhIrsJJT3NL9GG61ksh5IUe3zSdh6Y0QDekCV3zvFc+5hRg==",
+      "version": "2.1.94",
+      "resolved": "http://192.168.200.80:8081/repository/npm-saga/@saga-web/graph/-/graph-2.1.94.tgz",
+      "integrity": "sha512-e0tMlLiK+bfn8ld/5e/oj06hPMQcQ2Kex9dpvsdFaoN8rfteM5A1Z8w98PqRVlkKat+diXra8JGU0zJlsDpw8A==",
       "requires": {
         "@saga-web/draw": "2.1.100"
       }

+ 1 - 2
src/lib/items/SFHFQZoneLegendItem.ts

@@ -1,11 +1,10 @@
 
 import { SGraphItem } from "@saga-web/graph/lib";
-import { SPolygonItem } from "@/components/mapClass/SPolygonItem";
 import { Legend } from '../types/Legend';
 import { SPainter, SColor, SFont, SPoint, SLineCapStyle } from "@saga-web/draw";
 import { STextItem } from '@saga-web/graph/lib';
 import { hexify } from "@/components/mapClass/until"
-import { SItemStatus, ItemOrder } from '@saga-web/big/lib';
+import { SItemStatus, ItemOrder, SPolygonItem } from '@saga-web/big/lib';
 /**
  *图例节点Item(区域类型 --防火分区)
  *

+ 1 - 2
src/lib/items/SSCPZZoneLegendItem.ts

@@ -1,11 +1,10 @@
 
 import { SGraphItem } from "@saga-web/graph/lib";
-import { SPolygonItem } from "@/components/mapClass/SPolygonItem";
 import { Legend } from '../types/Legend';
 import { SPainter, SColor, SFont, SPoint, SLineCapStyle } from "@saga-web/draw";
 import { STextItem } from '@saga-web/graph/lib';
 import { hexify } from "@/components/mapClass/until"
-import { SItemStatus, ItemOrder } from '@saga-web/big/lib';
+import { SItemStatus, ItemOrder, SPolygonItem } from '@saga-web/big/lib';
 /**
  * 图例节点Item(区域类型 --石材铺装)
  *