Browse Source

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

YaolongHan 4 years ago
parent
commit
2b4336de58

+ 25 - 3
src/components/edit/attr_select.vue

@@ -118,7 +118,14 @@
           <a-button type="link" class="edit-option-btn" @click="OpenEditStatus">{{editStatus[type]}}</a-button>
         </div>
         <div class="row">
-          <a-input v-model="lengedName" @change="changeLengedName" />
+          <a-textarea :disabled="type == 'Line' "
+                  placeholder=""
+                  v-model="lengedName"
+                  allow-clear
+                  @change="changeLengedName"
+                  :rows="2"
+          />
+<!--          <a-input v-model="lengedName" @change="changeLengedName" />-->
         </div>
         <div class="row" v-show="type =='Image'">
           <div class="row-tit">字号</div>
@@ -171,7 +178,14 @@
             >{{editStatus[type]}}</a-button>
           </div>
           <div class="row">
-            <a-input v-model="lengedName" @change="changeLengedName" />
+            <a-textarea
+                    placeholder=""
+                    v-model="lengedName"
+                    allow-clear
+                    @change="changeLengedName"
+                    :rows="2"
+            />
+<!--            <a-input v-model="lengedName" @change="changeLengedName" />-->
           </div>
           <div class="row">
             <div class="row-tit">字号</div>
@@ -234,7 +248,14 @@
             >{{editStatus[type]}}</a-button>
           </div>
           <div class="row">
-            <a-input v-model="lengedName" @change="changeLengedName" />
+            <a-textarea
+                    placeholder=""
+                    v-model="lengedName"
+                    allow-clear
+                    @change="changeLengedName"
+                    :rows="2"
+            />
+<!--            <a-input v-model="lengedName" @change="changeLengedName" />-->
           </div>
           <div class="row">
             <div class="row-tit">字号</div>
@@ -608,6 +629,7 @@ export default {
             this.lengedName = Item.name;
             this.fontSize = Item.font.size;
             this.fontColor = Item.color.value;
+            this.lineWidth = Item.lineWidth;
             this.borderColor = Item.strokeColor ? Item.strokeColor.value : "";
             this.fillColor = Item.fillColor ? Item.fillColor.value : "";
             this.itemExplain = "";

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

@@ -280,7 +280,7 @@
                     size: this.size,//条数
                 }
                 if (this.keyword) {
-                    data.keyword = this.typeEdit == 'Image' ? `${this.keyword}:brand` : `${this.keyword}:wzjc`
+                    data.keyword = this.typeEdit == 'Image' ? `${this.keyword}:sbjc` : `${this.keyword}:wzjc`
                 }
                 const paramData = {classstructureid: this.classstructureid, gname: this.floorId};
                 const paramDataLocal = {locfl: this.locfl, gname: this.floorId};

+ 7 - 0
src/lib/items/SFHFQZoneLegendItem.ts

@@ -237,6 +237,13 @@ export class SFHFQZoneLegendItem extends SPolygonItem {
             painter.pen.lineCapStyle = SLineCapStyle.Square
             painter.pen.lineWidth = painter.toPx(this._lineWidth)
             painter.brush.color = brushcolor
+            if (this.selected) {
+                painter.pen.lineWidth = painter.toPx(this.lineWidth * 2);
+                painter.shadow.shadowBlur = 10;
+                painter.shadow.shadowColor = new SColor(`#00000033`);
+                painter.shadow.shadowOffsetX = 5;
+                painter.shadow.shadowOffsetY = 5;
+            }
             // @ts-ignore
             painter.drawPolygon([...this.pointList]);
         } else {

+ 7 - 0
src/lib/items/SSCPZZoneLegendItem.ts

@@ -245,6 +245,13 @@ export class SSCPZZoneLegendItem extends SPolygonItem {
             painter.pen.lineCapStyle = SLineCapStyle.Square
             painter.pen.lineWidth = painter.toPx(this._lineWidth)
             painter.brush.color = brushcolor
+            if (this.selected) {
+                painter.pen.lineWidth = painter.toPx(this.lineWidth * 2);
+                painter.shadow.shadowBlur = 10;
+                painter.shadow.shadowColor = new SColor(`#00000033`);
+                painter.shadow.shadowOffsetX = 5;
+                painter.shadow.shadowOffsetY = 5;
+            }
             // @ts-ignore
             painter.drawPolygon([...this.pointList]);
         } else {

+ 7 - 0
src/lib/items/SZoneLegendItem.ts

@@ -238,6 +238,13 @@ export class SZoneLegendItem extends SPolygonItem {
             painter.pen.lineCapStyle = SLineCapStyle.Square
             painter.pen.lineWidth = painter.toPx(this._lineWidth)
             painter.brush.color = brushcolor
+            if (this.selected) {
+                painter.pen.lineWidth = painter.toPx(this.lineWidth * 2);
+                painter.shadow.shadowBlur = 10;
+                painter.shadow.shadowColor = new SColor(`#00000033`);
+                painter.shadow.shadowOffsetX = 5;
+                painter.shadow.shadowOffsetY = 5;
+            }
             // @ts-ignore
             painter.drawPolygon([...this.pointList]);
         } else {