@antv/l7-layers 2.22.2 → 2.22.3

package/es/plugins/FeatureScalePlugin.js

@@ -234,9 +234,11 @@ export default class FeatureScalePlugin {
   }
   // 生成Scale 默认配置
   createScaleConfig(type, field, scaleOption, data) {
-    const cfg = {
+    const cfg = _objectSpread(_objectSpread({}, scaleOption), {}, {
       type
-    };
+    });
+    if (cfg !== null && cfg !== void 0 && cfg.domain) return cfg;
+
     // quantile domain 需要根据ID 进行去重
     let values = [];
     if (type === ScaleTypes.QUANTILE) {
@@ -249,9 +251,7 @@ export default class FeatureScalePlugin {
     } else {
       values = (data === null || data === void 0 ? void 0 : data.map(item => item[field])) || [];
     }
-    if (scaleOption !== null && scaleOption !== void 0 && scaleOption.domain) {
-      cfg.domain = scaleOption === null || scaleOption === void 0 ? void 0 : scaleOption.domain;
-    } else if (type === ScaleTypes.CAT || type === ScaleTypes.IDENTITY) {
+    if (type === ScaleTypes.CAT || type === ScaleTypes.IDENTITY) {
       cfg.domain = uniq(values);
     } else if (type === ScaleTypes.QUANTILE) {
       cfg.domain = values;
@@ -263,7 +263,7 @@ export default class FeatureScalePlugin {
       // linear/Power/log
       cfg.domain = extent(values);
     }
-    return _objectSpread(_objectSpread({}, cfg), scaleOption);
+    return cfg;
   }
 
   // 创建Scale 实例

package/lib/plugins/FeatureScalePlugin.js

@@ -243,9 +243,11 @@ class FeatureScalePlugin {
   }
   // 生成Scale 默认配置
   createScaleConfig(type, field, scaleOption, data) {
-    const cfg = {
+    const cfg = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, scaleOption), {}, {
       type
-    };
+    });
+    if (cfg !== null && cfg !== void 0 && cfg.domain) return cfg;
+
     // quantile domain 需要根据ID 进行去重
     let values = [];
     if (type === _l7Core.ScaleTypes.QUANTILE) {
@@ -258,9 +260,7 @@ class FeatureScalePlugin {
     } else {
       values = (data === null || data === void 0 ? void 0 : data.map(item => item[field])) || [];
     }
-    if (scaleOption !== null && scaleOption !== void 0 && scaleOption.domain) {
-      cfg.domain = scaleOption === null || scaleOption === void 0 ? void 0 : scaleOption.domain;
-    } else if (type === _l7Core.ScaleTypes.CAT || type === _l7Core.ScaleTypes.IDENTITY) {
+    if (type === _l7Core.ScaleTypes.CAT || type === _l7Core.ScaleTypes.IDENTITY) {
       cfg.domain = uniq(values);
     } else if (type === _l7Core.ScaleTypes.QUANTILE) {
       cfg.domain = values;
@@ -272,7 +272,7 @@ class FeatureScalePlugin {
       // linear/Power/log
       cfg.domain = (0, _d3Array.extent)(values);
     }
-    return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, cfg), scaleOption);
+    return cfg;
   }
 
   // 创建Scale 实例

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-layers",
-  "version": "2.22.2",
+  "version": "2.22.3",
   "description": "L7's collection of built-in layers",
   "license": "MIT",
   "author": "https://github.com/orgs/antvis/people",
@@ -33,10 +33,10 @@
     "gl-matrix": "^3.1.0",
     "gl-vec2": "^1.3.0",
     "polyline-miter-util": "^1.0.1",
-    "@antv/l7-core": "2.22.2",
-    "@antv/l7-maps": "2.22.2",
-    "@antv/l7-source": "2.22.2",
-    "@antv/l7-utils": "2.22.2"
+    "@antv/l7-core": "2.22.3",
+    "@antv/l7-source": "2.22.3",
+    "@antv/l7-maps": "2.22.3",
+    "@antv/l7-utils": "2.22.3"
   },
   "devDependencies": {
     "@types/d3-array": "^2",
@@ -45,7 +45,7 @@
     "@types/d3-scale": "^2.1.1",
     "@types/earcut": "^2.1.0",
     "@types/gl-matrix": "^2.4.5",
-    "@antv/l7-test-utils": "^2.22.2"
+    "@antv/l7-test-utils": "^2.22.3"
   },
   "publishConfig": {
     "access": "public",