Browse Source

更新包

haojianlong 4 years ago
parent
commit
392d592b12

+ 121 - 40
package-lock.json

@@ -1067,71 +1067,55 @@
       "integrity": "sha512-DE0rH2m25O3yCK1b1VXSX3tYUHBBEcQnrkjh72SctsFGK2jdS7XBE4+1x8szajvPIOkH05wMoUC2EsmJsZAhvQ=="
     },
     "@saga-web/big": {
-      "version": "1.0.8",
-      "resolved": "http://192.168.200.80:8081/repository/npm-saga/@saga-web/big/-/big-1.0.8.tgz",
-      "integrity": "sha512-P6i4SlZbDQhj2uq+L0DoqvjGAQXqopGwgmQduUfWo1wH43rdS3uKRgxMGUPJG9uU95mRVEFA4KL3MHzCRTWwww==",
+      "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==",
       "requires": {
-        "@saga-web/graphy": "2.1.53"
+        "@saga-web/graphy": "2.1.54"
       }
     },
     "@saga-web/draw": {
-      "version": "2.1.81",
-      "resolved": "http://192.168.200.80:8081/repository/npm-saga/@saga-web/draw/-/draw-2.1.81.tgz",
-      "integrity": "sha512-fmMHl3lYyGcQFvGlHf/gSYq+hgwuat20Mf3znThG1ABuSM0HserlFmCkjr+mTdYViB6EnzqKspeM0L+90jbH8A==",
+      "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/feng-map": {
-      "version": "1.0.4",
-      "resolved": "http://192.168.200.80:8081/repository/npm-saga/@saga-web/feng-map/-/feng-map-1.0.4.tgz",
-      "integrity": "sha512-p3QbLTuDkXPSnPQNNp790Of3JbkdshOfEyguW3xj7Y+zzY9BgryR1elwY1zPU0JdayPCPcUvi9bvhRvsmrfd/A==",
+      "version": "1.0.6",
+      "resolved": "http://192.168.200.80:8081/repository/npm-saga/@saga-web/feng-map/-/feng-map-1.0.6.tgz",
+      "integrity": "sha512-2/BRDFYsc1HdyThxL703NDI229e1+GjRCcUUYTvVpgGp8QkKy5tJQffCp+FSl4x7IgVYeD1ciFqoY89zzxXRIw==",
       "requires": {
-        "@saga-web/big": "1.0.6"
+        "@saga-web/big": "1.0.9"
       },
       "dependencies": {
         "@saga-web/big": {
-          "version": "1.0.6",
-          "resolved": "http://192.168.200.80:8081/repository/npm-saga/@saga-web/big/-/big-1.0.6.tgz",
-          "integrity": "sha512-YG3KlxfUGN1oBlbIUzC2WiGMia6lwlc+oOXubeMvUC1t5EUA+XwVGlOj26opoAacmDrEaGVzcaG3gclWY0uDaQ==",
-          "requires": {
-            "@saga-web/graphy": "2.1.52"
-          }
-        },
-        "@saga-web/draw": {
-          "version": "2.1.80",
-          "resolved": "http://192.168.200.80:8081/repository/npm-saga/@saga-web/draw/-/draw-2.1.80.tgz",
-          "integrity": "sha512-sbVSq8xNuL60Yj0OJAEF96LkhDrQE5lClOiU6n7XAgyreUW03E1YdmM35a8J3rIJ4yOWh+5WK8Tnoc1NpaI4hw==",
-          "requires": {
-            "@saga-web/base": "^2.1.9"
-          }
-        },
-        "@saga-web/graphy": {
-          "version": "2.1.52",
-          "resolved": "http://192.168.200.80:8081/repository/npm-saga/@saga-web/graphy/-/graphy-2.1.52.tgz",
-          "integrity": "sha512-65lxavb4btJluSFnZ4KCqOZcsH2ksXfHy6XMWNZzTqxqgjP15ZJvT4uLxBdP+2G8SkStVRNkXIAstnroo9XLjA==",
+          "version": "1.0.9",
+          "resolved": "http://192.168.200.80:8081/repository/npm-saga/@saga-web/big/-/big-1.0.9.tgz",
+          "integrity": "sha512-TjxNbh06eYoXCkkT1Uvo0rejjvrhzGqTSdkIQCBrsCHiX+EFY6/7x0DRq3yWSjmk1p92BJ3iDq1hHRl/xwZERQ==",
           "requires": {
-            "@saga-web/draw": "2.1.80"
+            "@saga-web/graphy": "2.1.54"
           }
         }
       }
     },
     "@saga-web/graphy": {
-      "version": "2.1.53",
-      "resolved": "http://192.168.200.80:8081/repository/npm-saga/@saga-web/graphy/-/graphy-2.1.53.tgz",
-      "integrity": "sha512-nvYDt98iNcBNvUWFQhv8woF8G9y1HOPHjg3ZcI5AX7Pg47DvRVvA3/GS3YPYRbcw8LMNmJU8dbRUHMYp8kP+vA==",
+      "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.81"
+        "@saga-web/draw": "2.1.82"
       }
     },
     "@saga-web/topology": {
-      "version": "1.0.83",
-      "resolved": "http://192.168.200.80:8081/repository/npm-saga/@saga-web/topology/-/topology-1.0.83.tgz",
-      "integrity": "sha512-lup2384GLuZqj3LSpxBXrEU/6CObg/7kbeBiZQNvvW1hQiQeLrASt/rPzZoIKK2URc+cU2vkQ1GP1WgV7h0xqA==",
+      "version": "1.0.84",
+      "resolved": "http://192.168.200.80:8081/repository/npm-saga/@saga-web/topology/-/topology-1.0.84.tgz",
+      "integrity": "sha512-JUUjLkwFkq5A3Hye+Axsd+jr/QMrEW4rqvM2U/NFdesH+NXAl5bk1pxAVuAwY+YM6OyjwCxrAzDtD07zmZDNUA==",
       "requires": {
         "@saga-web/base": "2.1.9",
-        "@saga-web/draw": "2.1.80",
-        "@saga-web/graphy": "2.1.52",
+        "@saga-web/draw": "2.1.82",
+        "@saga-web/graphy": "2.1.54",
         "axios": "^0.18.0",
         "pako": "^1.0.10",
         "poly-decomp": "^0.3.0",
@@ -3972,6 +3956,26 @@
         "randomfill": "^1.0.3"
       }
     },
+    "css": {
+      "version": "2.2.4",
+      "resolved": "http://192.168.200.80:8081/repository/npm-saga/css/-/css-2.2.4.tgz",
+      "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.3",
+        "source-map": "^0.6.1",
+        "source-map-resolve": "^0.5.2",
+        "urix": "^0.1.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "http://192.168.200.80:8081/repository/npm-saga/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
     "css-color-names": {
       "version": "0.0.4",
       "resolved": "https://registry.npm.taobao.org/css-color-names/download/css-color-names-0.0.4.tgz",
@@ -4017,6 +4021,15 @@
         }
       }
     },
+    "css-parse": {
+      "version": "2.0.0",
+      "resolved": "http://192.168.200.80:8081/repository/npm-saga/css-parse/-/css-parse-2.0.0.tgz",
+      "integrity": "sha1-pGjuZnwW2BzPBcWMONKpfHgNv9Q=",
+      "dev": true,
+      "requires": {
+        "css": "^2.0.0"
+      }
+    },
     "css-select": {
       "version": "2.1.0",
       "resolved": "https://registry.npm.taobao.org/css-select/download/css-select-2.1.0.tgz",
@@ -7238,6 +7251,12 @@
       "resolved": "https://registry.npm.taobao.org/lodash/download/lodash-4.17.15.tgz",
       "integrity": "sha1-tEf2ZwoEVbv+7dETku/zMOoJdUg="
     },
+    "lodash.clonedeep": {
+      "version": "4.5.0",
+      "resolved": "http://192.168.200.80:8081/repository/npm-saga/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
+      "dev": true
+    },
     "lodash.defaultsdeep": {
       "version": "4.6.1",
       "resolved": "https://registry.npm.taobao.org/lodash.defaultsdeep/download/lodash.defaultsdeep-4.6.1.tgz",
@@ -10597,6 +10616,62 @@
         }
       }
     },
+    "stylus": {
+      "version": "0.54.7",
+      "resolved": "http://192.168.200.80:8081/repository/npm-saga/stylus/-/stylus-0.54.7.tgz",
+      "integrity": "sha512-Yw3WMTzVwevT6ZTrLCYNHAFmanMxdylelL3hkWNgPMeTCpMwpV3nXjpOHuBXtFv7aiO2xRuQS6OoAdgkNcSNug==",
+      "dev": true,
+      "requires": {
+        "css-parse": "~2.0.0",
+        "debug": "~3.1.0",
+        "glob": "^7.1.3",
+        "mkdirp": "~0.5.x",
+        "safer-buffer": "^2.1.2",
+        "sax": "~1.2.4",
+        "semver": "^6.0.0",
+        "source-map": "^0.7.3"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "http://192.168.200.80:8081/repository/npm-saga/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "http://192.168.200.80:8081/repository/npm-saga/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "http://192.168.200.80:8081/repository/npm-saga/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.7.3",
+          "resolved": "http://192.168.200.80:8081/repository/npm-saga/source-map/-/source-map-0.7.3.tgz",
+          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+          "dev": true
+        }
+      }
+    },
+    "stylus-loader": {
+      "version": "3.0.2",
+      "resolved": "http://192.168.200.80:8081/repository/npm-saga/stylus-loader/-/stylus-loader-3.0.2.tgz",
+      "integrity": "sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "^1.0.2",
+        "lodash.clonedeep": "^4.5.0",
+        "when": "~3.6.x"
+      }
+    },
     "supports-color": {
       "version": "5.5.0",
       "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-5.5.0.tgz",
@@ -12194,6 +12269,12 @@
       "integrity": "sha1-XS/yKXcAPsaHpLhwc9+7rBRszyk=",
       "dev": true
     },
+    "when": {
+      "version": "3.6.4",
+      "resolved": "http://192.168.200.80:8081/repository/npm-saga/when/-/when-3.6.4.tgz",
+      "integrity": "sha1-RztRfsFZ4rhQBUl6E5g/CVQS404=",
+      "dev": true
+    },
     "which": {
       "version": "1.3.1",
       "resolved": "https://registry.npm.taobao.org/which/download/which-1.3.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwhich%2Fdownload%2Fwhich-1.3.1.tgz",

+ 5 - 5
package.json

@@ -9,11 +9,11 @@
   },
   "dependencies": {
     "@saga-web/base": "2.1.9",
-    "@saga-web/big": "1.0.8",
-    "@saga-web/draw": "2.1.81",
-    "@saga-web/graphy": "2.1.53",
-    "@saga-web/feng-map": "1.0.4",
-    "@saga-web/topology": "^1.0.83",
+    "@saga-web/big": "1.0.11",
+    "@saga-web/draw": "2.1.82",
+    "@saga-web/graphy": "2.1.54",
+    "@saga-web/feng-map": "1.0.6",
+    "@saga-web/topology": "1.0.84",
     "ant-design-vue": "^1.6.0",
     "core-js": "^3.6.4",
     "vue": "^2.6.11",

BIN
src/components/Select.zip


+ 44 - 39
src/components/baseEditer.vue

@@ -8,11 +8,11 @@
 </template>
 <script>
 import { SFengParser } from "@saga-web/feng-map";
-import { SFloorParser, SImageItem,STextItem } from "@saga-web/big";
-// import { DirectRelationItem } from "@saga-web/topology/lib/items/DirectRelationItem.js";
-import { SGraphyView, SGraphyScene } from "@saga-web/graphy/lib";
+import { SPoint } from "@saga-web/draw/lib";
+import { SFloorParser, SImageItem, STextItem, SLineItem, SPolylineItem } from "@saga-web/big";
 import { SPolygonItem } from "./mapClass/SPolygonItem";
-import {FloorView} from "./../lib/FloorView"
+import { FloorView } from "./../lib/FloorView"
+import { FloorScene } from "./../lib/FloorScene"
 export default {
   data() {
     return {
@@ -23,7 +23,9 @@ export default {
       fmap: null,
       canvasWidth: 700,
       canvasHeight: 800,
-      fParser: null
+      fParser: null,
+      scene: null,
+      view: null
     };
   },
   mounted() {
@@ -35,7 +37,7 @@ export default {
     init() {
       document.getElementById(`canvas`).focus()
       this.clearGraphy();
-      this.scene = new SGraphyScene();
+      this.scene = new FloorScene();
       this.fmap = new SFengParser(
         "fengMap",
         this.mapServerURL,
@@ -44,22 +46,25 @@ export default {
         null
       );
       console.log(this.fmap);
-      // this.fmap.parseData("1001724_29", 1, res => {
-        // console.log(res);
-        // this.fParser = new SFloorParser(null);
-        // console.log(this.fParser);
-        // this.fParser.parseData(res);
-        // this.fParser.spaceList.forEach(t => this.scene.addItem(t));
-        // this.fParser.wallList.forEach(t => this.scene.addItem(t));
-        // this.fParser.virtualWallList.forEach(t => this.scene.addItem(t));
-        // this.fParser.doorList.forEach(t => this.scene.addItem(t));
-        // this.fParser.columnList.forEach(t => this.scene.addItem(t));
-        // this.fParser.casementList.forEach(t => this.scene.addItem(t));
-        this.addPolyLine();
+      this.fmap.parseData("1001724_29", 6, res => {
+        console.log(res);
+        this.fParser = new SFloorParser(null);
+        console.log(this.fParser);
+        this.fParser.parseData(res);
+        this.fParser.spaceList.forEach(t => {
+          t.connect('clicjnnmnk', this, this.spaceClick)
+          this.scene.addItem(t)
+        });
+        this.fParser.wallList.forEach(t => this.scene.addItem(t));
+        this.fParser.virtualWallList.forEach(t => this.scene.addItem(t));
+        this.fParser.doorList.forEach(t => this.scene.addItem(t));
+        this.fParser.columnList.forEach(t => this.scene.addItem(t));
+        this.fParser.casementList.forEach(t => this.scene.addItem(t));
+        // this.addPolyLine();
         // this.DirectRelationItem();
         this.view.scene = this.scene;
         this.view.fitSceneToView();
-      // });
+      });
     },
     // 引入构建多边形类
     addPolyLine() {
@@ -72,21 +77,21 @@ export default {
         ]
       };
       const Polylines = new SPolygonItem(null);
-      Polylines.setStatus =2;
+      Polylines.setStatus = 2;
       this.scene.addItem(Polylines);
       this.scene.grabItem = Polylines;
     },
     // 引入折线
-    DirectRelationItem() {
-      const data = {
-        PointList: [
-          { X: -138.71000000089407, Y: -17.5 },
-          { X: -130.31000000052154, Y: -17.5 }
-        ]
-      };
-      const directRelationItem = new DirectRelationItem(null, data);
-      this.scene.addItem(directRelationItem);
-    },
+    // DirectRelationItem() {
+    //   const data = {
+    //     PointList: [
+    //       { X: -138.71000000089407, Y: -17.5 },
+    //       { X: -130.31000000052154, Y: -17.5 }
+    //     ]
+    //   };
+    //   const directRelationItem = new DirectRelationItem(null, data);
+    //   this.scene.addItem(directRelationItem);
+    // },
     clearGraphy() {
       if (this.view) {
         this.view.scene = null;
@@ -101,18 +106,19 @@ export default {
       //   Height: 32,
       //   Url: "https://dss2.bdstatic.com/6Ot1bjeh1BF3odCf/it/u=1569891320,3644984535&fm=85&app=52&f=JPEG?w=121&h=75&s=891B0FD8964406EF8091EA200300E056"
       // })
-      const item = new STextItem(null);
-      item.moveTo(event[0].x, event[0].y)
-      item.font.size = 12;
-      item.zOrder = 999;
-      item.connect('mousedown', this, this.iconClick)
-      this.scene.addItem(item)
-      setInterval(()=>{item.text+='魔'},1000)
+      // const item = new SImageItem(null);
+      // item.moveTo(event[0].x, event[0].y)
+      // item.url = 'https://dss2.bdstatic.com/6Ot1bjeh1BF3odCf/it/u=1569891320,3644984535&fm=85&app=52&f=JPEG?w=121&h=75&s=891B0FD8964406EF8091EA200300E056'
+      // item.font.size = 12;
+      // item.zOrder = 999;
+      // item.connect('mousedown', this, this.iconClick)
+      // this.scene.addItem(item)
+      // setInterval(() => { item.text += '魔' }, 1000)
     },
     iconClick(item, event) {
       console.log(2222222222222)
     },
-    changeFloor() { },
+    // changeFloor() { },
     changeStatus(name) {
       switch (name) {
         case '选择':
@@ -121,7 +127,6 @@ export default {
           break;
         case '画线':
           this.scene.isLining = true;
-          console.log('lining')
           break;
         case '画文字':
           this.scene.isTexting = true;

+ 2 - 1
src/components/edit/right_toolbar.vue

@@ -152,7 +152,8 @@ export default {
   methods: {
     callback(key) {
       console.log(key);
-    }
+    },
+    onSearch(){}
   }
 };
 </script>

+ 25 - 0
src/lib/FloorScene.ts

@@ -0,0 +1,25 @@
+import { SGraphyScene } from '@saga-web/graphy/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 {
+  isLining: boolean = false;
+
+
+
+  onMouseDown(event: SMouseEvent): boolean {
+    if (this.isLining) {
+      if (this.grabItem instanceof SPolylineItem) {
+        return super.onMouseDown(event);
+      } else {
+        const item = new SPolylineItem(null, new SPoint(event.x, event.y));
+        this.addItem(item);
+        this.grabItem = item;
+        return true;
+      }
+    } else {
+      return super.onMouseDown(event);
+    }
+  }
+}

+ 1 - 1
src/lib/FloorView.ts

@@ -54,6 +54,7 @@ export class FloorView extends SGraphyView {
                 super.onKeyDown(event);
                 break;
         }
+        this.update();
     } // Function onKeyDown()
 
     /**
@@ -72,7 +73,6 @@ export class FloorView extends SGraphyView {
      * @param   event       事件参数
      */
     protected onMouseDown(event: MouseEvent): void {
-        console.log(event)
         let se = new SMouseEvent(event);
         if (se.buttons & SMouseButton.LeftButton) {
             this._leftKeyPos.x = se.x;