haojianlong %!s(int64=4) %!d(string=hai) anos
pai
achega
3baab91faa
Modificáronse 6 ficheiros con 63 adicións e 18 borrados
  1. 43 8
      package-lock.json
  2. 3 3
      package.json
  3. 3 1
      src/components/baseEditer.vue
  4. 10 2
      src/lib/FloorScene.ts
  5. 2 2
      src/lib/FloorView.ts
  6. 2 2
      src/views/editer.vue

+ 43 - 8
package-lock.json

@@ -1067,19 +1067,26 @@
       "integrity": "sha512-DE0rH2m25O3yCK1b1VXSX3tYUHBBEcQnrkjh72SctsFGK2jdS7XBE4+1x8szajvPIOkH05wMoUC2EsmJsZAhvQ=="
     },
     "@saga-web/big": {
-      "version": "1.0.11",
-      "resolved": "http://192.168.200.80:8081/repository/npm-saga/@saga-web/big/-/big-1.0.11.tgz",
-      "integrity": "sha512-LFG859n6oDtrLnzkN2/p5Hql01eOFEN3BO1dfvkE0ApuQBSkMXFIsrCbsvgLdbodbwJPFeZLyN6LdSrytDN+Hw==",
+      "version": "1.0.16",
+      "resolved": "http://192.168.200.80:8081/repository/npm-saga/@saga-web/big/-/big-1.0.16.tgz",
+      "integrity": "sha512-TA9F8KSG+Y0YxIOmxrMQ8s9fxCA88wU8JU7mBNYSvFwQrQ1Ur85rhIw3dn7uXBi3qPIUVvhee5hh1lXFPUSfJw==",
       "requires": {
-        "@saga-web/graphy": "2.1.54"
+        "@saga-web/graph": "2.1.65"
       }
     },
     "@saga-web/draw": {
-      "version": "2.1.82",
-      "resolved": "http://192.168.200.80:8081/repository/npm-saga/@saga-web/draw/-/draw-2.1.82.tgz",
-      "integrity": "sha512-69guXPLfDZnAHC2sluakctR9ajDztbir5e3ilYjEpuBZnR5BepnlFp7sxvtui6v2SUBt7V2TmYOji99ix63MIw==",
+      "version": "2.1.84",
+      "resolved": "http://192.168.200.80:8081/repository/npm-saga/@saga-web/draw/-/draw-2.1.84.tgz",
+      "integrity": "sha512-j7sM0NSB6+uq+83ZqvZfX+IasUBUE7C06Agtqn+yQu93bWChR9/aM7pYcwMaVrFk3UysjKSsiFmhFMkVzVJcyA==",
       "requires": {
-        "@saga-web/base": "^2.1.9"
+        "@saga-web/base": "^2.1.12"
+      },
+      "dependencies": {
+        "@saga-web/base": {
+          "version": "2.1.14",
+          "resolved": "http://192.168.200.80:8081/repository/npm-saga/@saga-web/base/-/base-2.1.14.tgz",
+          "integrity": "sha512-mmoFJ6Bsg/ui2aqhwNdRPTj6meAEEVPAK+jjTmHWqDSsjVbAqNeSAKL04Cr0UtOqgi4+6P3Ys9klZgITHDpiFw=="
+        }
       }
     },
     "@saga-web/feng-map": {
@@ -1100,12 +1107,30 @@
         }
       }
     },
+    "@saga-web/graph": {
+      "version": "2.1.65",
+      "resolved": "http://192.168.200.80:8081/repository/npm-saga/@saga-web/graph/-/graph-2.1.65.tgz",
+      "integrity": "sha512-IHSm612oEIZXqJReECMw46C9y0lyOJz8LxbHm8gWpo4BOT0PuhokyiRM2PyfFEVW1DMr/Rtgw2QOpf3UCud9mA==",
+      "requires": {
+        "@saga-web/draw": "2.1.84"
+      }
+    },
     "@saga-web/graphy": {
       "version": "2.1.54",
       "resolved": "http://192.168.200.80:8081/repository/npm-saga/@saga-web/graphy/-/graphy-2.1.54.tgz",
       "integrity": "sha512-rx7DNqaB2cZvpqRii0B/BZUrsNN2JGzFA05DyTV1epr+xBed0udLaa2x3mC0bxzZZZvdhNE/0mBIWboxiYxp0Q==",
       "requires": {
         "@saga-web/draw": "2.1.82"
+      },
+      "dependencies": {
+        "@saga-web/draw": {
+          "version": "2.1.82",
+          "resolved": "http://192.168.200.80:8081/repository/npm-saga/@saga-web/draw/-/draw-2.1.82.tgz",
+          "integrity": "sha512-69guXPLfDZnAHC2sluakctR9ajDztbir5e3ilYjEpuBZnR5BepnlFp7sxvtui6v2SUBt7V2TmYOji99ix63MIw==",
+          "requires": {
+            "@saga-web/base": "^2.1.9"
+          }
+        }
       }
     },
     "@saga-web/topology": {
@@ -1120,6 +1145,16 @@
         "pako": "^1.0.10",
         "poly-decomp": "^0.3.0",
         "polybooljs": "^1.2.0"
+      },
+      "dependencies": {
+        "@saga-web/draw": {
+          "version": "2.1.82",
+          "resolved": "http://192.168.200.80:8081/repository/npm-saga/@saga-web/draw/-/draw-2.1.82.tgz",
+          "integrity": "sha512-69guXPLfDZnAHC2sluakctR9ajDztbir5e3ilYjEpuBZnR5BepnlFp7sxvtui6v2SUBt7V2TmYOji99ix63MIw==",
+          "requires": {
+            "@saga-web/base": "^2.1.9"
+          }
+        }
       }
     },
     "@soda/friendly-errors-webpack-plugin": {

+ 3 - 3
package.json

@@ -9,9 +9,9 @@
   },
   "dependencies": {
     "@saga-web/base": "2.1.9",
-    "@saga-web/big": "1.0.11",
-    "@saga-web/draw": "2.1.82",
-    "@saga-web/graphy": "2.1.54",
+    "@saga-web/big": "1.0.16",
+    "@saga-web/draw": "2.1.84",
+    "@saga-web/graph": "2.1.65",
     "@saga-web/feng-map": "1.0.6",
     "@saga-web/topology": "1.0.84",
     "ant-design-vue": "^1.6.0",

+ 3 - 1
src/components/baseEditer.vue

@@ -52,7 +52,8 @@ export default {
         console.log(this.fParser);
         this.fParser.parseData(res);
         this.fParser.spaceList.forEach(t => {
-          t.connect('clicjnnmnk', this, this.spaceClick)
+          t.connect('click', this, this.spaceClick)
+          t.selectable = true;
           this.scene.addItem(t)
         });
         this.fParser.wallList.forEach(t => this.scene.addItem(t));
@@ -101,6 +102,7 @@ export default {
       document.getElementById('canvas').focus()
     },
     spaceClick(space, event) {
+      console.log(this.scene.selectContainer)
       // const item = new SImageItem(null, {
       //   Width: 32,
       //   Height: 32,

+ 10 - 2
src/lib/FloorScene.ts

@@ -1,12 +1,20 @@
-import { SGraphyScene } from '@saga-web/graphy/lib';
+import { SGraphScene } from '@saga-web/graph/lib';
 import { SMouseEvent } from '@saga-web/base/lib';
 import { SPoint } from '@saga-web/draw/lib';
 import { SFloorParser, SImageItem,STextItem,SLineItem,SPolylineItem } from "@saga-web/big";
 
-export class FloorScene extends SGraphyScene {
+export class FloorScene extends SGraphScene {
   isLining: boolean = false;
 
+  constructor(){
+    super();
+    console.log(999999999)
+    this.selectContainer.connect('listChange',this,this.listChange)
+  }
 
+  listChange(){
+    console.log(arguments)
+  }
 
   onMouseDown(event: SMouseEvent): boolean {
     if (this.isLining) {

+ 2 - 2
src/lib/FloorView.ts

@@ -1,4 +1,4 @@
-import { SGraphyItem, SGraphyView } from "@saga-web/graphy/lib";
+import { SGraphItem, SGraphView } from "@saga-web/graph/lib";
 import { SMouseButton, SMouseEvent, SNetUtil } from "@saga-web/base/lib";
 import { SPoint } from "@saga-web/draw/lib";
 
@@ -7,7 +7,7 @@ import { SPoint } from "@saga-web/draw/lib";
  *
  * @author  郝建龙
  */
-export class FloorView extends SGraphyView {
+export class FloorView extends SGraphView {
     /** 鼠标左键键按下时位置 */
     private _leftKeyPos = new SPoint();
     /** 空格是否被按下 */

+ 2 - 2
src/views/editer.vue

@@ -11,9 +11,9 @@
       </div>
       <!-- 绘制界面 -->
       <div class="baseEdit">
-        <!-- <baseEditer ref="graphy"></baseEditer> -->
+        <baseEditer ref="graphy"></baseEditer>
         <!-- <baseEditertest ref="graphy"></baseEditertest> -->
-        <baseEditerzy ref="graphy"></baseEditerzy>
+        <!-- <baseEditerzy ref="graphy"></baseEditerzy> -->
       </div>
       <!-- 右侧工具栏 -->
       <div class="right_toolbar">