[fix]isvj-5083 属性表排序不对 review by qiw

SuperMap · Oct 10, 2022 · d46377f · d46377f
1 parent 7e29896
commit d46377f
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 4 deletions.
diff --git a/src/mapboxgl/attributes/AttributesViewModel.ts b/src/mapboxgl/attributes/AttributesViewModel.ts
@@ -507,7 +507,7 @@ class FeatureTableViewModel extends mapboxgl.Evented {
         dataIndex: propertyName,
         visible: true
       };
-      if (typeof +headers[propertyName] === 'number' && !isNaN(+headers[propertyName])) {
+      if (!isNaN(parseFloat(headers[propertyName])) && !isNaN(+headers[propertyName])) {
         // @ts-ignore
         columnConfig.sorter = (a, b) => a[propertyName] - b[propertyName];
       }

diff --git a/src/mapboxgl/attributes/__tests__/AttributesViewModel.spec.js b/src/mapboxgl/attributes/__tests__/AttributesViewModel.spec.js
@@ -135,7 +135,7 @@ describe('AttributesViewModel.ts', () => {
           {
             type: 'Feature',
             geometry: {
-              coordinates: [1,1],
+              coordinates: [1, 1],
               type: 'Point'
             },
             properties: {
@@ -371,7 +371,7 @@ describe('AttributesViewModel.ts', () => {
         getBounds: () => {
           return {
             contains: () => true
-          }
+          };
         }
       },
       featureMap: {
@@ -407,7 +407,7 @@ describe('AttributesViewModel.ts', () => {
         getBounds: () => {
           return {
             contains: () => true
-          }
+          };
         }
       },
       featureMap: {
@@ -431,4 +431,26 @@ describe('AttributesViewModel.ts', () => {
     viewModel.addOverlaysToMap(selectedKeys, layerStyleOptions, attributesTitle);
     expect(spy).toBeCalled();
   });
+  it('add Polygon Overlays to map', () => {
+    const headers = {
+      Layer: '中学1',
+      LayerOn: '1',
+      LineWidth: '0',
+      Ctype: null,
+      Ctype1: [],
+      Ctype2: undefined,
+      Ctype3: '',
+      Ctype4: {},
+      key: 0
+    };
+    const viewModel = new AttributesViewModel(options);
+    const columns = viewModel.toTableColumns(headers);
+    columns.forEach((element, index) => {
+      if([1, 2, 8].includes(index)){
+        expect(typeof element.sorter).toBe('function');
+      }else {
+        expect(element.sorter).toBe(undefined);
+      }
+    });
+  });
 });