[update] getLayer方法新增layerName和filter参数

(review by xjj)

Author: SuperHuZhiPeng

src/common/mapping/utils/AppreciableLayerBase.js

@@ -260,7 +260,8 @@ export class AppreciableLayerBase extends Events {
       CLASS_NAME,
       CLASS_INSTANCE,
       reused,
-      metadata = layer.metadata || {}
+      metadata = layer.metadata || {},
+      filter
     } = layerInfo;
     const sourceOnMap = this.map.getSource(layer.source);
     const fields = {
@@ -279,7 +280,8 @@ export class AppreciableLayerBase extends Events {
       themeSetting,
       metadata,
       // top bottom auto
-      layerOrder: metadata.SM_Layer_Order || 'auto'
+      layerOrder: metadata.SM_Layer_Order || 'auto',
+      filter
     };
     if (layer.sourceLayer) {
       fields.renderSource.sourceLayer = layer.sourceLayer;

src/common/mapping/utils/SourceListModelV3.js

@@ -133,7 +133,8 @@ export class SourceListModelV3 extends AppreciableLayerBase {
         reused: layer.metadata && layer.metadata.reused
       };
       const matchProjectCatalog = projectCataglogs.find((item) => item.id === layerCatalog.id) || {};
-      const { msDatasetId, relationMsDatasetId } = matchProjectCatalog;
+      const { msDatasetId, relationMsDatasetId, filter, serviceLayerId } = matchProjectCatalog;
+      filter && (layerInfo.filter = filter);
       let dataSource = {};
       if (msDatasetId) {
         for (const data of datas) {
@@ -181,6 +182,7 @@ export class SourceListModelV3 extends AppreciableLayerBase {
           dataSource.url = `${serverUrl}/rest/maps`;
           dataSource.mapName = mapName;
           dataSource.type = 'REST_MAP';
+          dataSource.layerName = serviceLayerId;
         }
       }
       layerInfo.dataSource = dataSource;

src/common/util/FilterCondition.js

@@ -119,7 +119,7 @@ function mapboxFilterToCqlFilter(filter) {
             if (isNullvalue(value)) {
                 return `${field} IS NULL`;
             }
-            return `${field} == ${formatValue(value)}`;
+            return `${field} = ${formatValue(value)}`;
         }
         case '!=': {
             value = operands[1];