浏览代码

modify canvas version and import path

haojianlong 5 年之前
父节点
当前提交
69fb1c35ed

+ 3 - 3
package.json

@@ -20,9 +20,9 @@
         "vue-axios": "^2.1.4",
         "vue-router": "^3.0.1",
         "vuex": "^3.1.0",
-        "@sybotan-web/base": "2.0.51",
-        "@sybotan-web/draw": "2.0.106",
-        "@sybotan-web/graphy": "2.0.83"
+        "@sybotan-web/base": "2.0.54",
+        "@sybotan-web/draw": "2.0.114",
+        "@sybotan-web/graphy": "2.0.90"
     },
     "devDependencies": {
         "ajv": "^6.9.1",

+ 1 - 2
src/assets/graphy/SGraphy/newItems/SGraphyPolygonItem.js

@@ -12,8 +12,7 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 import { SGraphyItem } from '@sybotan-web/graphy';
-import { SRect, SPoint } from "@sybotan-web/base";
-import { SColor } from "@sybotan-web/draw";
+import { SColor, SRect, SPoint } from "@sybotan-web/draw";
 /**
  * 不规则多边形Item类
  *

+ 1 - 2
src/assets/graphy/SGraphy/newItems/SGraphyPolygonItem.ts

@@ -1,7 +1,6 @@
 
 import { SGraphyItem, SMouseEvent } from '@sybotan-web/graphy'
-import { SRect, SSize, SPoint } from "@sybotan-web/base";
-import { SPen, SPainter, SColor, SFont } from "@sybotan-web/draw";
+import { SPen, SPainter, SColor, SFont, SRect, SPoint, SSize } from "@sybotan-web/draw";
 import { dataItemPath, dataItem, dataSpaceItem, dataInterface, PolygonItemInterface } from './../dataType'   //传入参数的参数接口类型
 /**
  * 不规则多边形Item类

+ 1 - 3
src/views/data_admin/buildGraphy/graphyCanvas-copy.vue

@@ -27,8 +27,7 @@ import { SGraphyImgItem } from '@/assets/graphy/SGraphy/newItems/SGraphyImgItem.
 import SGraphyPolygonItem from '@/assets/graphy/SGraphy/newItems/SGraphyPolygonItem.js'
 import { SGraphyView } from "@sybotan-web/graphy";
 import { mapGetters, mapActions } from "vuex";
-import { SPoint } from '@sybotan-web/base/lib';
-import { SPen, SPainter, SColor } from "@sybotan-web/draw";
+import { SPen, SPainter, SColor, SPoint } from "@sybotan-web/draw";
 import pako from '@/assets/pako/pako'
 import tools from "@/utils/scan/tools";
 import { LocationPointScene } from './utils/LocationPointScene.js'
@@ -101,7 +100,6 @@ export default {
       this.mainScene = null;
       // 初始化view类
       this.view = new SGraphyView("canvas");
-      console.log(LocationPointScene)
       this.mainScene = new LocationPointScene(null);
       this.mainScene.urlGetData(url).then(() => {
         this.view.scene = this.mainScene;

+ 1 - 1
src/views/data_admin/buildGraphy/utils/MarkerItem.js

@@ -12,7 +12,7 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 import { SGraphyItem } from '@sybotan-web/graphy';
-import { SRect } from "@sybotan-web/base";
+import { SRect } from "@sybotan-web/draw";
 /**
  * 位置标签item
  *

+ 1 - 2
src/views/data_admin/buildGraphy/utils/MarkerItem.ts

@@ -1,6 +1,5 @@
 import { SGraphyItem, SMouseEvent } from '@sybotan-web/graphy'
-import { SRect, SSize } from "@sybotan-web/base";
-import { SPen, SPainter, SColor } from "@sybotan-web/draw";
+import { SPen, SPainter, SColor, SRect, SSize } from "@sybotan-web/draw";
 
 /**
  * 位置标签item