fix ICL-1537 属性表无法接入iserver 地图服务 review by luox

SuperMap · May 21, 2024 · 8aae9e0 · 8aae9e0
1 parent b16742b
commit 8aae9e0
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/src/mapboxgl/attributes/AttributesViewModel.ts b/src/mapboxgl/attributes/AttributesViewModel.ts
@@ -627,7 +627,7 @@ class FeatureTableViewModel extends mapboxgl.Evented {
   }
 
   canLazyLoad() {
-    return this.lazy && this.dataset && this.dataset.url && this.dataset.type === 'iServer';
+    return !!(this.lazy && this.dataset && this.dataset.url && this.dataset.type === 'iServer' && this.dataset.dataName);
   }
 
   handleAssociateWithMap() {

diff --git a/src/mapboxgl/attributes/__tests__/AttributesViewModel.spec.js b/src/mapboxgl/attributes/__tests__/AttributesViewModel.spec.js
@@ -217,6 +217,27 @@ describe('AttributesViewModel.ts', () => {
     expect(viewModel.lazy).toBe(true);
   });
 
+  it('check restmap not support lazy', async () => {
+    const nextOption = {
+      ...options,
+      dataset: {
+        layerName: 'Rivers@World',
+        type: 'iServer',
+        url: 'http://test'
+      },
+      lazy: true,
+      searchText: '漠河',
+      searchedColumn: '站台',
+      sorter: {
+        field: '温度',
+        order: 'ascend'
+      }
+    };
+    const viewModel = new AttributesViewModel(nextOption);
+    await flushPromises();
+    expect(viewModel.canLazyLoad()).toBe(false);
+  });
+
   it('setsorter', () => {
     const viewModel = new AttributesViewModel(options);
     const sorter = () => jest.fn();
@@ -491,9 +512,9 @@ describe('AttributesViewModel.ts', () => {
     const viewModel = new AttributesViewModel(options);
     const columns = viewModel.toTableColumns(headers);
     columns.forEach((element, index) => {
-      if([1, 2, 8].includes(index)){
+      if ([1, 2, 8].includes(index)) {
         expect(typeof element.sorter).toBe('function');
-      }else {
+      } else {
         expect(element.sorter).toBe(undefined);
       }
     });