[ifx]还原maxWidth width设置 review by xiongjj

SuperMap · Oct 31, 2024 · f1b3627 · f1b3627
1 parent 93aaa8a
commit f1b3627
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/src/mapboxgl/layer-highlight/LayerHighlight.vue b/src/mapboxgl/layer-highlight/LayerHighlight.vue
@@ -96,21 +96,20 @@ export default {
     columnStyle() {
       const { autoResize, keyWidth, valueWidth, keyMaxWidth, valueMaxWidth, keyWordStyle, valueWordStyle } = this.popupStyle;
       const style = { keyStyle: {}, valueStyle: {} };
-      if (keyWidth) {
-        style.keyStyle.minWidth = keyWidth + 'px';
-      }
-      if (valueWidth) {
-        style.valueStyle.minWidth = valueWidth + 'px';
-      }
-      if (keyMaxWidth) {
-        style.keyStyle.maxWidth = keyMaxWidth + 'px';
-      }
-      if (valueMaxWidth) {
-        style.valueStyle.maxWidth = valueMaxWidth + 'px';
-      }
       if (!autoResize) {
-        style.keyStyle.maxWidth = style.keyStyle.minWidth;
-        style.valueStyle.maxWidth = style.valueStyle.minWidth;
+        if (keyWidth) {
+          style.keyStyle.width = keyWidth + 'px';
+        }
+        if (valueWidth) {
+          style.valueStyle.width = valueWidth + 'px';
+        }
+      } else {
+        if (keyMaxWidth) {
+          style.keyStyle.maxWidth = keyMaxWidth + 'px';
+        }
+        if (valueMaxWidth) {
+          style.valueStyle.maxWidth = valueMaxWidth + 'px';
+        }
       }
       const ellipsisStyle = {
         overflow: 'hidden',
@@ -141,6 +140,7 @@ export default {
               ((this.customColumnRenders || {})[record.slotName] ||
                 (this.$parent && this.$parent.$scopedSlots[record.slotName]));
             const style = this.columnStyle.valueStyle;
+            console.log(style)
             if (valueCustomRender) {
               return <div style={style} title={text}>{valueCustomRender({ value: text, style })}</div>;
             }

diff --git a/src/mapboxgl/layer-highlight/__tests__/LayersHighlight.spec.js b/src/mapboxgl/layer-highlight/__tests__/LayersHighlight.spec.js
@@ -71,8 +71,8 @@ describe('LayerHighlight.vue', () => {
     expect(wrapper.find(SmMapPopup).exists()).toBe(true);
     expect(wrapper.vm.tableColumns.length).toBe(2);
     const style = { overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' };
-    expect(wrapper.vm.columnStyle.keyStyle).toEqual({ ...style, maxWidth: '160px', minWidth: '80px' });
-    expect(wrapper.vm.columnStyle.valueStyle).toEqual({ ...style, maxWidth: '300px', minWidth: '150px' });
+    expect(wrapper.vm.columnStyle.keyStyle).toEqual({ ...style, maxWidth: '160px' });
+    expect(wrapper.vm.columnStyle.valueStyle).toEqual({ ...style, maxWidth: '300px' });
     done();
   });