Преглед на файлове

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

zhangyu преди 4 години
родител
ревизия
edbcbd4dbb
променени са 4 файла, в които са добавени 45 реда и са изтрити 3 реда
  1. 24 3
      src/components/edit/attr_select.vue
  2. 7 0
      src/lib/items/SFHFQZoneLegendItem.ts
  3. 7 0
      src/lib/items/SSCPZZoneLegendItem.ts
  4. 7 0
      src/lib/items/SZoneLegendItem.ts

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

@@ -118,7 +118,14 @@
           <a-button type="link" class="edit-option-btn" @click="OpenEditStatus">{{isEdit? "取消编辑" : 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 @@
             >{{isEdit? "取消编辑" : 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 @@
             >{{isEdit? "取消编辑" : 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>

+ 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 {