fix 修复 leaflet fgb 自定义 style 会引用与增加ol 包私有方法检测方法

xilanhuaweidapao · xilanhuaweidapao · commit 2b9276608eb2 · 2025-01-17T17:54:00.000+08:00
diff --git a/build/webpack.config.openlayers.js b/build/webpack.config.openlayers.js
@@ -1,4 +1,6 @@
 var configBase = require('./webpack.config.base');
+var fs = require('fs');
+const chalk = require('chalk');
 //端名
 var libName = 'openlayers';
 //产品包名
@@ -11,6 +13,7 @@ if (origin && origin.includes('deploy-ol')) {
     libName = 'ol';
     productName = 'iclient-ol';
 }
+
 var externals = [
     Object.assign({}, configBase.externals, {
         '@turf/turf': 'function(){try{return turf}catch(e){return {}}}()',
@@ -32,6 +35,23 @@ var externals = [
     }
 ];
 
+var methodNames = ['bindFeaturesCollection_', 'addFeaturesInternal'];
+checkPrivateMethodExists(methodNames);
+
+function checkPrivateMethodExists(methodNames) {
+  const file_path = 'node_modules/ol/dist/ol.js';
+  try {
+    const data = fs.readFileSync(file_path, 'utf8');
+    methodNames.forEach((methodName) => {
+      if (!data.includes(methodName)) {
+        console.log(chalk.red(`方法 ${methodName} 不存在于混淆后的 ol 中 ${file_path}，测试 ol fgb 重写方法是否被调用`));
+      }
+    });
+  } catch (err) {
+    console.error('读取文件出错：', err);
+  }
+}
+
 module.exports = {
     target: configBase.target,
     mode: configBase.mode,
diff --git a/src/leaflet/core/Base.js b/src/leaflet/core/Base.js
@@ -128,7 +128,7 @@ L.GeoJSON.include({
     layer.defaultOptions = layer.options;
     var defaultGeometryOptions = this.defaultGeometryOptions[geometry.type];
     if (defaultGeometryOptions) {
-      layer.commonOptions = defaultGeometryOptions;
+      layer.commonOptions = Object.assign({}, defaultGeometryOptions);
     } else {
       this.defaultGeometryOptions[geometry.type] = L.Util.extend({}, layer.defaultOptions);
     }

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ L.GeoJSON.include({`
`128`	`128`	`layer.defaultOptions = layer.options;`
`129`	`129`	`var defaultGeometryOptions = this.defaultGeometryOptions[geometry.type];`
`130`	`130`	`if (defaultGeometryOptions) {`
`131`		`- layer.commonOptions = defaultGeometryOptions;`
	`131`	`+ layer.commonOptions = Object.assign({}, defaultGeometryOptions);`
`132`	`132`	`} else {`
`133`	`133`	`this.defaultGeometryOptions[geometry.type] = L.Util.extend({}, layer.defaultOptions);`
`134`	`134`	`}`