Bläddra i källkod

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

YaolongHan 4 år sedan
förälder
incheckning
3fdffd5bd4

+ 2 - 2
package.json

@@ -9,9 +9,9 @@
   },
   "dependencies": {
     "@saga-web/base": "2.1.22",
-    "@saga-web/big": "1.0.65",
+    "@saga-web/big": "1.0.66",
     "@saga-web/draw": "2.1.100",
-    "@saga-web/feng-map": "1.0.16",
+    "@saga-web/feng-map": "1.0.17",
     "@saga-web/graph": "2.1.101",
     "ant-design-vue": "^1.6.0",
     "core-js": "^3.6.4",

+ 1 - 1
src/components/edit/attr_select.vue

@@ -496,7 +496,7 @@ export default {
         } else if (newval.itemType == "baseLine") {
           this.lineWidth = Item.lineWidth;
           this.borderColor = Item.strokeColor.value;
-          if (Item.lineStyle == SLineStyle.Soild) {
+          if (Item.lineStyle == SLineStyle.Solid) {
             this.borderStyle = "solid";
           } else if (Item.lineStyle == SLineStyle.Dashed) {
             this.borderStyle = "dashed";

+ 2 - 2
src/components/edit/edit-dialog.vue

@@ -33,7 +33,7 @@
                 class="search-select"
                 width="236"
             />
-            <a-input-search placeholder="搜索" class="press-enter" @search="onSearch" v-model="keyword"/>
+            <a-input-search placeholder="搜索位置名称" class="press-enter" @search="onSearch" v-model="keyword"/>
 
           </div>
         </div>
@@ -48,7 +48,7 @@
       <div class="right">
         <div class="header">
           <span class="select-number">已选择 <b>{{arrList.length}}</b>/{{sysNum}}</span>
-          <a-button type="link" class="link" @click="clearArrList">清空</a-button>
+          <a-button type="link" class="link" @click="clearArrList" :disabled="arrList.length==0">清空</a-button>
         </div>
 
         <div class="list-box">

+ 7 - 1
src/components/edit/left_toolbar.vue

@@ -107,6 +107,7 @@
                     v-for="(items,indexs) in item.GraphElements"
                     :key="indexs"
                     :class="[activeIndexs==indexs &&activeIndex==index ?'active-li':'']"
+                    :title="items.Name"
                   >
                     <img
                       :class="['item',`item-${items.Type}`]"
@@ -641,8 +642,13 @@ export default {
               background: #fff;
             }
             .text {
+              width: 100%;
+              padding: 0 5px;
               font-size: 12px;
-              margin: 0 auto;
+              text-align: center;
+              overflow: hidden;
+              text-overflow:ellipsis;
+              white-space: nowrap;
             }
           }
           .active-li {

+ 1 - 1
src/components/mapClass/EditScence.ts

@@ -638,7 +638,7 @@ export class EditScence extends SGraphScene {
             } else if (val == 'dotted') {
                 borderStyle = SLineStyle.Dotted;
             } else if (val == 'solid') {
-                borderStyle = SLineStyle.Soild;
+                borderStyle = SLineStyle.Solid;
             }
             const newMsg = borderStyle;
             const oldMsg = this.focusItem.lineStyle;

+ 26 - 3
src/lib/items/SFHFQZoneLegendItem.ts

@@ -143,9 +143,19 @@ export class SFHFQZoneLegendItem extends SPolygonItem {
             if (data.Properties.font) {
                 this.font = new SFont("sans-serif", data.Properties.font);
             }
-            //    if( data.Properties.LineDash){
-            //     this.LineDash =this._legend.Properties.LineDash
-            //    }
+            switch (data.Properties.LineDash) {
+                case "solid":
+                    this.lineStyle = SLineStyle.Solid;
+                    break;
+                case "dotted":
+                    this.lineStyle = SLineStyle.Dotted;
+                    break;
+                case "dashed":
+                    this.lineStyle = SLineStyle.Dashed;
+                    break;
+                default:
+                    this.lineStyle = SLineStyle.Solid;
+            }
         }
         // 监听多边形创建完成事件,并动态计算文本位置
         this.connect("finishCreated", this, () => {
@@ -166,6 +176,19 @@ export class SFHFQZoneLegendItem extends SPolygonItem {
         this.data.Properties.FillColor = this.fillColor.value;
         this.data.Properties.StrokeColor = this.strokeColor.value;
         this.data.Properties.LineWidth = this.lineWidth;
+        switch (this.lineStyle) {
+            case SLineStyle.Solid:
+                this.data.Properties.LineDash = "solid";
+                break;
+            case SLineStyle.Dotted:
+                this.data.Properties.LineDash = "dotted";
+                break;
+            case SLineStyle.Dashed:
+                this.data.Properties.LineDash = "dashed";
+                break;
+            default:
+                this.data.Properties.LineDash = "solid";
+        }
         this.data.OutLine = this.getPointList.map(pos => {
             return {
                 X: pos.x,

+ 26 - 3
src/lib/items/SSCPZZoneLegendItem.ts

@@ -151,9 +151,19 @@ export class SSCPZZoneLegendItem extends SPolygonItem {
             if (data.Properties.font) {
                 this.font = new SFont("sans-serif", data.Properties.font);
             }
-            //    if( data.Properties.LineDash){
-            //     this.LineDash =this._legend.Properties.LineDash
-            //    }
+            switch (data.Properties.LineDash) {
+                case "solid":
+                    this.lineStyle = SLineStyle.Solid;
+                    break;
+                case "dotted":
+                    this.lineStyle = SLineStyle.Dotted;
+                    break;
+                case "dashed":
+                    this.lineStyle = SLineStyle.Dashed;
+                    break;
+                default:
+                    this.lineStyle = SLineStyle.Solid;
+            }
         }
         // 监听多边形创建完成事件,并动态计算文本位置
         this.connect("finishCreated", this, () => {
@@ -174,6 +184,19 @@ export class SSCPZZoneLegendItem extends SPolygonItem {
         this.data.Properties.FillColor = this.fillColor.value;
         this.data.Properties.StrokeColor = this.strokeColor.value;
         this.data.Properties.LineWidth = this.lineWidth;
+        switch (this.lineStyle) {
+            case SLineStyle.Solid:
+                this.data.Properties.LineDash = "solid";
+                break;
+            case SLineStyle.Dotted:
+                this.data.Properties.LineDash = "dotted";
+                break;
+            case SLineStyle.Dashed:
+                this.data.Properties.LineDash = "dashed";
+                break;
+            default:
+                this.data.Properties.LineDash = "solid";
+        }
         this.data.OutLine = this.getPointList.map(pos => {
             return {
                 X: pos.x,

+ 27 - 4
src/lib/items/SZoneLegendItem.ts

@@ -1,5 +1,5 @@
 
-import { SGraphItem } from "@saga-web/graph/lib";
+import { SGraphItem, SLineStyle } from "@saga-web/graph/lib";
 import { Legend } from '../types/Legend';
 import { SPainter, SColor, SFont, SPoint, SLineCapStyle } from "@saga-web/draw";
 import { STextItem } from '@saga-web/graph/lib';
@@ -144,9 +144,19 @@ export class SZoneLegendItem extends SPolygonItem {
             if (data.Properties.font) {
                 this.font = new SFont("sans-serif", data.Properties.font);
             }
-            //    if( data.Properties.LineDash){
-            //     this.LineDash =this._legend.Properties.LineDash
-            //    }
+            switch (data.Properties.LineDash) {
+                case "solid":
+                    this.lineStyle = SLineStyle.Solid;
+                    break;
+                case "dotted":
+                    this.lineStyle = SLineStyle.Dotted;
+                    break;
+                case "dashed":
+                    this.lineStyle = SLineStyle.Dashed;
+                    break;
+                default:
+                    this.lineStyle = SLineStyle.Solid;
+            }
         }
         // 监听多边形创建完成事件,并动态计算文本位置
         this.connect("finishCreated", this, () => {
@@ -167,6 +177,19 @@ export class SZoneLegendItem extends SPolygonItem {
         this.data.Properties.FillColor = this.fillColor.value;
         this.data.Properties.StrokeColor = this.strokeColor.value;
         this.data.Properties.LineWidth = this.lineWidth;
+        switch (this.lineStyle) {
+            case SLineStyle.Solid:
+                this.data.Properties.LineDash = "solid";
+                break;
+            case SLineStyle.Dotted:
+                this.data.Properties.LineDash = "dotted";
+                break;
+            case SLineStyle.Dashed:
+                this.data.Properties.LineDash = "dashed";
+                break;
+            default:
+                this.data.Properties.LineDash = "solid";
+        }
         this.data.OutLine = this.getPointList.map(pos => {
             return {
                 X: pos.x,