Skip to content

Commit 7d5c7bb

Browse files
xiongjiaojiaoxiongjiaojiao
committed
【fix】土地利用示例滚动条显示优化， review by songym
1 parent 639615a commit 7d5c7bb

File tree

5 files changed

+38
-30
lines changed

5 files changed

+38
-30
lines changed

‎dist/mapboxgl/iclient9-mapboxgl-widgets-vue.css

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11834,6 +11834,9 @@ body .mapboxgl-ctrl {
1183411834
.sm-card__content.is-top-right {
1183511835
transform-origin: top right; }
1183611836

11837+
.sm-liquidFill {
11838+
height: 140px; }
11839+
1183711840
@charset "UTF-8";
1183811841
/* Element Chalk Variables */
1183911842
/* Transition
@@ -23191,3 +23194,6 @@ body .mapboxgl-ctrl {
2319123194
.sm-card__content.is-top-right {
2319223195
transform-origin: top right; }
2319323196

23197+
.sm-liquidFill {
23198+
height: 140px; }
23199+

‎dist/mapboxgl/iclient9-mapboxgl-widgets-vue.js

Lines changed: 18 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -42828,12 +42828,12 @@ var TimeText_component = normalizeComponent(
4282842828
)
4282942829

4283042830
/* harmony default export */ var TimeText = (TimeText_component.exports);
42831-
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./src/view/components/Progress.vue?vue&type=template&id=3499b000&
42832-
var Progressvue_type_template_id_3499b000_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"sm-progress"},[_c('el-progress',{attrs:{"percentage":parseFloat(_vm.percentage),"type":_vm.type,"stroke-width":parseFloat(_vm.strokeWidth),"show-text":_vm.showText,"width":_vm.type==='circle'?parseFloat(_vm.circleWidth):null,"color":_vm.curColor,"status":_vm.status}})],1)}
42833-
var Progressvue_type_template_id_3499b000_staticRenderFns = []
42831+
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./src/view/components/Progress.vue?vue&type=template&id=e8528960&
42832+
var Progressvue_type_template_id_e8528960_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"sm-progress"},[_c('el-progress',{attrs:{"percentage":parseFloat(_vm.percentage),"type":_vm.type,"stroke-width":parseFloat(_vm.strokeWidth),"show-text":_vm.showText,"width":_vm.type==='circle'?parseFloat(_vm.circleWidth):null,"color":_vm.curColor,"status":_vm.status}})],1)}
42833+
var Progressvue_type_template_id_e8528960_staticRenderFns = []
4283442834

4283542835

42836-
// CONCATENATED MODULE: ./src/view/components/Progress.vue?vue&type=template&id=3499b000&
42836+
// CONCATENATED MODULE: ./src/view/components/Progress.vue?vue&type=template&id=e8528960&
4283742837

4283842838
// CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./src/view/components/Progress.vue?vue&type=script&lang=js&
4283942839
//
@@ -42903,9 +42903,9 @@ var Progressvue_type_template_id_3499b000_staticRenderFns = []
4290342903
var _this = this;
4290442904

4290542905
this.curColor = this.color || this.getColor(0);
42906-
this.circleWidth = this.$parent.$el.offsetWidth * 0.5;
42906+
this.circleWidth = Math.min(this.$parent.$el.offsetWidth, this.$parent.$el.offsetHeight);
4290742907
window.addEventListener('resize', function () {
42908-
_this.circleWidth = _this.$parent.$el.offsetWidth * 0.5;
42908+
_this.circleWidth = Math.min(_this.$parent.$el.offsetWidth, _this.$parent.$el.offsetHeight);
4290942909
});
4291042910
}
4291142911
});
@@ -42921,8 +42921,8 @@ var Progressvue_type_template_id_3499b000_staticRenderFns = []
4292142921

4292242922
var Progress_component = normalizeComponent(
4292342923
components_Progressvue_type_script_lang_js_,
42924-
Progressvue_type_template_id_3499b000_render,
42925-
Progressvue_type_template_id_3499b000_staticRenderFns,
42924+
Progressvue_type_template_id_e8528960_render,
42925+
Progressvue_type_template_id_e8528960_staticRenderFns,
4292642926
false,
4292742927
null,
4292842928
null,
@@ -43009,12 +43009,12 @@ var Icon_component = normalizeComponent(
4300943009
)
4301043010

4301143011
/* harmony default export */ var Icon = (Icon_component.exports);
43012-
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./src/view/components/LiquidFill.vue?vue&type=template&id=570ba3ea&
43013-
var LiquidFillvue_type_template_id_570ba3ea_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"liquid-fill"},[_c('div',{ref:"chart",staticClass:"chart",style:({width: _vm.size, height: _vm.size, margin: '0 auto'}),attrs:{"id":"chart"}})])}
43014-
var LiquidFillvue_type_template_id_570ba3ea_staticRenderFns = []
43012+
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./src/view/components/LiquidFill.vue?vue&type=template&id=511ce336&
43013+
var LiquidFillvue_type_template_id_511ce336_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{ref:"chart",staticClass:"sm-liquidFill",attrs:{"id":"chart"}})}
43014+
var LiquidFillvue_type_template_id_511ce336_staticRenderFns = []
4301543015

4301643016

43017-
// CONCATENATED MODULE: ./src/view/components/LiquidFill.vue?vue&type=template&id=570ba3ea&
43017+
// CONCATENATED MODULE: ./src/view/components/LiquidFill.vue?vue&type=template&id=511ce336&
4301843018

4301943019
// EXTERNAL MODULE: external "echarts-liquidfill"
4302043020
var external_echarts_liquidfill_ = __webpack_require__("hQXD");
@@ -43027,11 +43027,6 @@ var external_echarts_liquidfill_ = __webpack_require__("hQXD");
4302743027
//
4302843028
//
4302943029
//
43030-
//
43031-
//
43032-
//
43033-
//
43034-
//
4303543030

4303643031

4303743032

@@ -43114,7 +43109,9 @@ var external_echarts_liquidfill_ = __webpack_require__("hQXD");
4311443109
});
4311543110
this.chart = external_echarts_default.a.init(this.$refs.chart);
4311643111
this.updateChart();
43117-
this.size = this.$el.offsetWidth * 0.75 + 'px';
43112+
this.chart.on('finished', function () {
43113+
_this.chart.resize();
43114+
});
4311843115
this.$on("themeStyle", function () {
4311943116
_this.waveColorData = _this.getColor(0);
4312043117
_this.labelColorData = _this.getTextColor;
@@ -43124,11 +43121,7 @@ var external_echarts_liquidfill_ = __webpack_require__("hQXD");
4312443121
_this.updateChart(true);
4312543122
});
4312643123
addEventListener('resize', function () {
43127-
_this.size = _this.$el.offsetWidth * 0.75 + 'px';
43128-
43129-
_this.$nextTick(function () {
43130-
this.chart.resize();
43131-
});
43124+
_this.chart.resize();
4313243125
});
4313343126
},
4313443127
methods: {
@@ -43187,8 +43180,8 @@ var external_echarts_liquidfill_ = __webpack_require__("hQXD");
4318743180

4318843181
var LiquidFill_component = normalizeComponent(
4318943182
components_LiquidFillvue_type_script_lang_js_,
43190-
LiquidFillvue_type_template_id_570ba3ea_render,
43191-
LiquidFillvue_type_template_id_570ba3ea_staticRenderFns,
43183+
LiquidFillvue_type_template_id_511ce336_render,
43184+
LiquidFillvue_type_template_id_511ce336_staticRenderFns,
4319243185
false,
4319343186
null,
4319443187
null,

‎dist/mapboxgl/iclient9-mapboxgl-widgets-vue.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/mapboxgl/iclient9-mapboxgl-widgets-vue.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/mapboxgl/widgets_demo_vue.html

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,12 @@
2020
box-sizing: border-box;
2121
}
2222

23-
@media screen and (max-width: 767px) {
23+
@media screen and (max-width: 992px) {
24+
#main {
25+
overflow: auto;
26+
}
27+
}
28+
@media screen and (max-height: 640px) {
2429
#main {
2530
overflow: auto;
2631
}
@@ -275,8 +280,8 @@
275280
padding-top: 2.78vh;
276281
}
277282

278-
.control-wrap .control-title .liquid-fill {
279-
min-height: 12.96vh;
283+
.control-wrap .control-title .sm-liquidFill {
284+
height: 13.89vh;
280285
}
281286

282287
.control-wrap .control-title .sm-text,
@@ -308,6 +313,10 @@
308313
margin-right: 0;
309314
}
310315

316+
.resource-wrap .resource-chart .el-col {
317+
height: 12.96vh;
318+
}
319+
311320
.resource-wrap .resource-chart .sm-progress {
312321
text-align: center;
313322
}

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy