【fix】修复 ol 比例尺; 迁徙图例子图例无法点击; 符号等级专题图hover无效果; review by luox

xiongjiaojiao · xiongjiaojiao · commit 39a2b11b897a · 2021-12-24T16:39:50.000+08:00
diff --git a/examples/openlayers/echartsGeoLines.html b/examples/openlayers/echartsGeoLines.html
@@ -12,6 +12,10 @@
       .ol-overlaycontainer-stopevent{
         height: 0% !important;
       }
+
+     .ol-overlaycontainer {
+         pointer-events: auto !important;
+     }
     </style>
 </head>
 <body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%;position: absolute;top: 0;">
@@ -329,4 +333,4 @@
     echartslayer.setChartOptions(echartsOptions);
 </script>
 </body>
-</html>
+</html>
diff --git a/src/openlayers/control/ScaleLine.js b/src/openlayers/control/ScaleLine.js
@@ -37,15 +37,15 @@ export class ScaleLine extends Scale {
                 this.viewState_ = frameState.viewState; //NOSONAR
             }
             this.updateElementRepair(); //NOSONAR
-        }
+        };
         super(options); //NOSONAR
     }
 
     updateElementRepair() {
-        const viewState = this.viewState_ || this.o;
+        const viewState = this.viewState_ || this.o || this.Om;
 
         if (!viewState) {
-            this.renderedVisible_ = this.renderedVisible_ || this.j;
+            this.renderedVisible_ = this.renderedVisible_ || this.j || this.yn;
             if (this.renderedVisible_) {
                 this.element_ = this.element_ || this.c;
                 this.element.style.display = 'none';
@@ -62,7 +62,7 @@ export class ScaleLine extends Scale {
             "m";
         let pointResolution =
         olProj.getPointResolution(projection, viewState.resolution, center, pointResolutionUnits);
-        this.minWidth_ = this.minWidth_ || this.v;
+        this.minWidth_ = this.minWidth_ || this.v || this.Em;
         let nominalCount = this.minWidth_ * pointResolution;
         let suffix = '';
         if (units == "degrees") {
@@ -136,10 +136,10 @@ export class ScaleLine extends Scale {
             }
             ++i;
         }
-        this.renderedHTML_ = this.renderedHTML_ || this.D;
-        this.innerElement_ = this.innerElement_ || this.l;
-        this.renderedWidth_ = this.renderedWidth_ || this.B;
-        this.renderedVisible_ = this.renderedVisible_ || this.j;
+        this.renderedHTML_ = this.renderedHTML_ || this.D || this.am;
+        this.innerElement_ = this.innerElement_ || this.l || this.Tm;
+        this.renderedWidth_ = this.renderedWidth_ || this.B || this.Am;
+        this.renderedVisible_ = this.renderedVisible_ || this.j || this.yn;
         this.element_ = this.element_ || this.c;
         let html= count.toFixed(decimalCount < 0 ? -decimalCount : 0) + ' ' + suffix;
         if (this.renderedHTML_ != html) {
@@ -158,4 +158,4 @@ export class ScaleLine extends Scale {
         }
 
     }
-}
+}
diff --git a/src/openlayers/overlay/theme/Theme.js b/src/openlayers/overlay/theme/Theme.js
