From 7731a6ed673e8c326e5e293e6f2ab6f1361e4f0d Mon Sep 17 00:00:00 2001
From: qiwei <qiwei@supermap.com>
Date: Sat, 12 Oct 2024 09:04:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B1=9E=E6=80=A7=E9=9D=A2?=
 =?UTF-8?q?=E6=9D=BF=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/attribute-panel/AttributePanel.vue | 78 ++++++++++++-------
 .../style/attribute-panel.scss                | 15 ++--
 src/mapboxgl/map-popup/MapPopup.vue           |  5 +-
 3 files changed, 61 insertions(+), 37 deletions(-)

diff --git a/src/common/attribute-panel/AttributePanel.vue b/src/common/attribute-panel/AttributePanel.vue
index 545260a5..ba1fd4ac 100644
--- a/src/common/attribute-panel/AttributePanel.vue
+++ b/src/common/attribute-panel/AttributePanel.vue
@@ -1,19 +1,19 @@
 <template>
-  <div class="sm-component-attribute-panel" :style="[getTextColorStyle]">
+  <div class="sm-component-attribute-panel" :style="[getTextColorStyle, !showBorder && { border: 'none' }]">
     <div class="sm-component-attribute-panel__header">
       <div class="title">{{ title }}</div>
       <div v-show="showIcon" class="switchDataText">
         <sm-icon
-        :class="['icon', 'left-icon', currentIndex === 0 && 'disabled']"
-        type="caret-left"
-        @click="changeIndex(-1)"
-      />
-      <span class="ellipsis" :title="paginationContent">{{ paginationContent }}</span>
-      <sm-icon
-        type="caret-right"
-        :class="['icon', 'right-icon', currentIndex === total - 1 && 'disabled']"
-        @click="changeIndex(1)"
-      />
+          :class="['icon', 'left-icon', attrIndex === 0 && 'disabled']"
+          type="caret-left"
+          @click="changeIndex(-1)"
+        />
+        <span class="ellipsis" :title="paginationContent">{{ paginationContent }}</span>
+        <sm-icon
+          type="caret-right"
+          :class="['icon', 'right-icon', attrIndex === total - 1 && 'disabled']"
+          @click="changeIndex(1)"
+        />
       </div>
     </div>
     <div class="sm-component-attribute-panel__content">
@@ -21,15 +21,19 @@
       <div v-if="$scopedSlots && Object.keys($scopedSlots).length && Object.keys(attributes).length">
         <ul>
           <li v-for="(value, key, index) in attributes" :key="index" class="content">
-            <div class="left ellipsis" :title="key" :style="attributeStyle.keyStyle">{{ key }}</div>
-            <div class="right ellipsis" :title="value.value || value" :style="attributeStyle.valueStyle">
+            <div class="left ellipsis" :title="key" :style="formatStyle.keyStyle">{{ key }}</div>
+            <div class="right ellipsis" :title="value.value || value" :style="formatStyle.valueStyle">
               <slot v-if="fieldsMap[key]" :name="fieldsMap[key]" :value="value"></slot>
               <span v-else>{{ value }}</span>
             </div>
           </li>
         </ul>
       </div>
-      <sm-table-popup v-if="!$slots.default && !($scopedSlots && Object.keys($scopedSlots).length) && Object.keys(attributes).length" v-bind="tablePopupProps" class="sm-component-attribute-panel__self-content" />
+      <sm-table-popup
+        v-if="!$slots.default && !($scopedSlots && Object.keys($scopedSlots).length) && Object.keys(attributes).length"
+        v-bind="tablePopupProps"
+        class="sm-component-attribute-panel__self-content"
+      />
       <sm-empty v-if="!$slots.default && !Object.keys(attributes).length" />
     </div>
   </div>
@@ -46,11 +50,11 @@ import SmEmpty from 'vue-iclient/src/common/empty/Empty.vue';
   components: { SmTablePopup, SmEmpty }
 })
 class SmAttributePanel extends Mixins(Theme) {
-  currentIndex = 0;
+  attrIndex = 0;
 
   @Prop({ default: false }) showIcon: Boolean;
 
-  @Prop({ default: 0 }) defaultIndex: number;
+  @Prop({ default: 0 }) currentIndex: number;
 
   @Prop() paginationText: String;
 
@@ -58,6 +62,8 @@ class SmAttributePanel extends Mixins(Theme) {
 
   @Prop() title: String;
 
+  @Prop({ default: true }) showBorder: Boolean;
+
   @Prop({
     default: () => {
       return {
@@ -65,7 +71,8 @@ class SmAttributePanel extends Mixins(Theme) {
         valueStyle: {}
       };
     }
-  }) attributeStyle: Object;
+  })
+  attributeStyle: Object;
 
   @Prop({
     default: () => {
@@ -88,14 +95,14 @@ class SmAttributePanel extends Mixins(Theme) {
   })
   columns: Array<Object>;
 
-  @Watch('defaultIndex')
-  defaultIndexChanged() {
-    this.currentIndex = this.defaultIndex;
+  @Watch('currentIndex')
+  currentIndexChanged() {
+    this.attrIndex = this.currentIndex;
   }
 
   get fieldsMap() {
     const attributeMap = {};
-    this.fields.forEach((field) => {
+    this.fields.forEach(field => {
       // @ts-ignore
       attributeMap[field.field] = field.slotName;
     });
@@ -106,19 +113,36 @@ class SmAttributePanel extends Mixins(Theme) {
     if (this.paginationText) {
       return this.paginationText;
     }
-    return `${this.currentIndex + 1}/${this.total}`;
+    return `${this.attrIndex + 1}/${this.total}`;
   }
 
   get tablePopupProps() {
     return { data: [this.attributes], columns: this.columns };
   }
 
-  changeIndex(val) {
-    this.currentIndex += val;
-    if (this.currentIndex < 0) {
-      this.currentIndex = 0;
+  get formatStyle() {
+    let style = Object.assign({}, this.attributeStyle);
+    Object.keys(style).forEach(item => {
+      // @ts-ignore
+      if (Object.prototype.hasOwnProperty.call(style[item], 'width')) {
+        // @ts-ignore
+        style[item].width += 'px';
+      }
+      // @ts-ignore
+      if (Object.prototype.hasOwnProperty.call(style[item], 'height')) {
+        // @ts-ignore
+        style[item].height += 'px';
+      }
+    });
+    return style;
+  }
+
+  changeIndex(delta) {
+    this.attrIndex += delta;
+    if (this.attrIndex < 0) {
+      this.attrIndex = 0;
     }
-    this.$emit('change', this.currentIndex);
+    this.$emit('change', this.attrIndex);
   }
 }
 export default SmAttributePanel;
diff --git a/src/common/attribute-panel/style/attribute-panel.scss b/src/common/attribute-panel/style/attribute-panel.scss
index 02897a96..59b02d8d 100644
--- a/src/common/attribute-panel/style/attribute-panel.scss
+++ b/src/common/attribute-panel/style/attribute-panel.scss
@@ -7,12 +7,13 @@
   overflow: auto;
   padding: 10px;
   border-radius: 4px;
+  border: 1px solid $border-color-split;
   @include e(header) {
     width: 100%;
     display: inline-flex;
     align-items: center;
-    padding: 0px 10px 8px ;
-    border-bottom: 1px solid $border-color-split;
+    padding: 0px 8px 4px ;
+    border-bottom: 2px solid $border-color-split;
     .switchDataText {
       position: absolute;
       right: 10px;
@@ -56,15 +57,13 @@
         }
         border-collapse: separate;
         .content {
-          display: table-row;
-          color: white;
+          display: flex;
+          justify-content: space-around;
           .left {
-            max-width: 110px;
-            display: table-cell;
+            width: 110px;
           }
           .right {
-            max-width: 170px;
-            display: table-cell;
+            width: 170px;
           }
           .ellipsis {
             overflow: hidden;
diff --git a/src/mapboxgl/map-popup/MapPopup.vue b/src/mapboxgl/map-popup/MapPopup.vue
index d33ad184..cad5a7a0 100644
--- a/src/mapboxgl/map-popup/MapPopup.vue
+++ b/src/mapboxgl/map-popup/MapPopup.vue
@@ -4,8 +4,9 @@
       :showIcon="showIcon"
       :title="title"
       :total="lnglats.length || data.length"
-      :defaultIndex="defaultIndex"
-      :contentSlot="contentSlot"
+      :currentIndex="defaultIndex"
+      :showBorder="false"
+      :textColor="textColor"
       :data="data"
       :columns="columns"
       @change="changeIndex"