Skip to content

Commit 7d28324

Browse files
committed
【update/fix】 更新部分例子截图,fix 基础微件,主题切换 范例样式错乱问题 review by songym
1 parent ee0d631 commit 7d28324

11 files changed

+144
-19
lines changed

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

Lines changed: 135 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36080,6 +36080,7 @@ __webpack_require__.d(components_namespaceObject, "DataFlowLayer", function() {
3608036080
__webpack_require__.d(components_namespaceObject, "EchartsLayer", function() { return components_EchartsLayer; });
3608136081
__webpack_require__.d(components_namespaceObject, "HeatmapLayer", function() { return HeatmapLayer; });
3608236082
__webpack_require__.d(components_namespaceObject, "ClusterLayer", function() { return ClusterLayer; });
36083+
__webpack_require__.d(components_namespaceObject, "ThemeLayer", function() { return ThemeLayer; });
3608336084
var commontypes_namespaceObject = {};
3608436085
__webpack_require__.r(commontypes_namespaceObject);
3608536086
__webpack_require__.d(commontypes_namespaceObject, "AddressMatchParameter", function() { return AddressMatchParameter_AddressMatchParameter; });
@@ -40874,15 +40875,20 @@ function callHook(vm, hook, map) {
4087440875
this.parentIsWebMapOrMap = ['smwebmap', 'smmap'].includes(this.$parent.$options.name && this.$parent.$options.name.toLowerCase());
4087540876
this.filterDelayLoad = !['smwebmap', 'smmap', 'smminimap'].includes(this.$options.name && this.$options.name.toLowerCase());
4087640877

40877-
if (this.$el && this.parentIsWebMapOrMap && this.filterDelayLoad) {
40878-
this.isShow = false;
40879-
this.$el.style && (this.$el.style.display = 'none');
40878+
if (this.$el && this.parentIsWebMapOrMap) {
40879+
if (this.filterDelayLoad) {
40880+
this.isShow = false;
40881+
this.$el.style && (this.$el.style.display = 'none');
40882+
}
40883+
4088040884
var targetName = this.$parent.target || mapEvent.firstMapTarget;
4088140885
mapEvent.$on("initMap-".concat(targetName), function (map) {
4088240886
_this.addTo(map);
4088340887

40884-
_this.isShow = true;
40885-
_this.$el.style && (_this.$el.style.display = 'block');
40888+
if (_this.filterDelayLoad) {
40889+
_this.isShow = true;
40890+
_this.$el.style && (_this.$el.style.display = 'block');
40891+
}
4088640892

4088740893
if (_this.$options.name.toLowerCase() === 'smchart') {
4088840894
_this.viewModel.resize();
@@ -43674,12 +43680,12 @@ var Chart_component = normalizeComponent(
4367443680
)
4367543681

4367643682
/* harmony default export */ var Chart = (Chart_component.exports);
43677-
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./src/view/components/Map.vue?vue&type=template&id=537d3642&
43678-
var Mapvue_type_template_id_537d3642_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"sm-widget-map",attrs:{"id":_vm.target}},[_vm._t("default")],2)}
43679-
var Mapvue_type_template_id_537d3642_staticRenderFns = []
43683+
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./src/view/components/Map.vue?vue&type=template&id=29303d6e&
43684+
var Mapvue_type_template_id_29303d6e_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"sm-widget-map",attrs:{"id":_vm.target}},[_vm._t("default")],2)}
43685+
var Mapvue_type_template_id_29303d6e_staticRenderFns = []
4368043686

4368143687

43682-
// CONCATENATED MODULE: ./src/view/components/Map.vue?vue&type=template&id=537d3642&
43688+
// CONCATENATED MODULE: ./src/view/components/Map.vue?vue&type=template&id=29303d6e&
4368343689

4368443690
// CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./src/view/components/Map.vue?vue&type=script&lang=js&
4368543691
//
@@ -43748,8 +43754,8 @@ var Mapvue_type_template_id_537d3642_staticRenderFns = []
4374843754

4374943755
var Map_component = normalizeComponent(
4375043756
components_Mapvue_type_script_lang_js_,
43751-
Mapvue_type_template_id_537d3642_render,
43752-
Mapvue_type_template_id_537d3642_staticRenderFns,
43757+
Mapvue_type_template_id_29303d6e_render,
43758+
Mapvue_type_template_id_29303d6e_staticRenderFns,
4375343759
false,
4375443760
null,
4375543761
null,
@@ -48622,7 +48628,7 @@ function (_WidgetViewModel) {
4862248628
deckglOptions = deckglProps.deckglOptions,
4862348629
layerId = deckglProps.layerId;
4862448630
_this.layerTypeId = layerTypeId;
48625-
deckglOptions.data = deckglOptions.data;
48631+
deckglOptions.data = deckglOptions.data || [];
4862648632
deckglOptions.layerId = deckglOptions.layerId || layerId;
4862748633
_this.deckglOptions = deckglOptions;
4862848634

@@ -49401,6 +49407,122 @@ var ClusterLayer_component = normalizeComponent(
4940149407
)
4940249408

4940349409
/* harmony default export */ var ClusterLayer = (ClusterLayer_component.exports);
49410+
// CONCATENATED MODULE: ./src/viewmodel/ThemeLayerViewModel.js
49411+
49412+
49413+
49414+
49415+
49416+
49417+
49418+
var ThemeLayerViewModel_ThemeLayerViewModel =
49419+
/*#__PURE__*/
49420+
function (_WidgetViewModel) {
49421+
inherits_default()(ThemeLayerViewModel, _WidgetViewModel);
49422+
49423+
function ThemeLayerViewModel(map, themeProps) {
49424+
var _this;
49425+
49426+
classCallCheck_default()(this, ThemeLayerViewModel);
49427+
49428+
_this = possibleConstructorReturn_default()(this, getPrototypeOf_default()(ThemeLayerViewModel).call(this, map));
49429+
var dataUrl = themeProps.dataUrl,
49430+
themeParameters = themeProps.themeParameters,
49431+
tileUrl = themeProps.tileUrl,
49432+
layerId = themeProps.layerId;
49433+
_this.dataUrl = dataUrl;
49434+
_this.themeParameters = themeParameters;
49435+
_this.tileUrl = tileUrl;
49436+
_this.layerId = layerId;
49437+
49438+
_this._init();
49439+
49440+
return _this;
49441+
}
49442+
49443+
createClass_default()(ThemeLayerViewModel, [{
49444+
key: "_init",
49445+
value: function _init() {
49446+
var _this2 = this;
49447+
49448+
new mapboxgl.supermap.ThemeService(this.dataUrl).getThemeInfo(this.themeParameters, function (serviceResult) {
49449+
var result = serviceResult.result;
49450+
49451+
if (result && result.newResourceID) {
49452+
var sourceName = _this2.layerId || 'theme';
49453+
49454+
_this2.map.addSource(sourceName, {
49455+
type: 'raster',
49456+
tiles: [_this2.tileUrl + result.newResourceID],
49457+
tileSize: 256
49458+
});
49459+
49460+
_this2.map.addLayer({
49461+
id: _this2.layerId || 'themeLayer',
49462+
type: 'raster',
49463+
source: sourceName
49464+
});
49465+
}
49466+
});
49467+
}
49468+
}]);
49469+
49470+
return ThemeLayerViewModel;
49471+
}(WidgetViewModel_WidgetViewModel);
49472+
49473+
49474+
// CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./src/view/components/ThemeLayer.vue?vue&type=script&lang=js&
49475+
49476+
49477+
49478+
/* harmony default export */ var ThemeLayervue_type_script_lang_js_ = ({
49479+
name: 'SmThemeLayer',
49480+
mixins: [map_getter, mixin_layer],
49481+
props: {
49482+
dataUrl: {
49483+
type: String,
49484+
required: true
49485+
},
49486+
tileUrl: {
49487+
type: String,
49488+
required: true
49489+
},
49490+
themeParameters: {
49491+
type: Object,
49492+
default: function _default() {
49493+
return {};
49494+
}
49495+
}
49496+
},
49497+
loaded: function loaded() {
49498+
if (this.dataUrl && this.tileUrl) {
49499+
this.viewModel = new ThemeLayerViewModel_ThemeLayerViewModel(this.map, this.$props);
49500+
}
49501+
},
49502+
render: function render() {}
49503+
});
49504+
// CONCATENATED MODULE: ./src/view/components/ThemeLayer.vue?vue&type=script&lang=js&
49505+
/* harmony default export */ var components_ThemeLayervue_type_script_lang_js_ = (ThemeLayervue_type_script_lang_js_);
49506+
// CONCATENATED MODULE: ./src/view/components/ThemeLayer.vue
49507+
var ThemeLayer_render, ThemeLayer_staticRenderFns
49508+
49509+
49510+
49511+
49512+
/* normalize component */
49513+
49514+
var ThemeLayer_component = normalizeComponent(
49515+
components_ThemeLayervue_type_script_lang_js_,
49516+
ThemeLayer_render,
49517+
ThemeLayer_staticRenderFns,
49518+
false,
49519+
null,
49520+
null,
49521+
null
49522+
49523+
)
49524+
49525+
/* harmony default export */ var ThemeLayer = (ThemeLayer_component.exports);
4940449526
// CONCATENATED MODULE: ./src/view/components/index.js
4940549527

4940649528

@@ -49427,6 +49549,7 @@ var ClusterLayer_component = normalizeComponent(
4942749549

4942849550

4942949551

49552+
4943049553

4943149554

4943249555
// EXTERNAL MODULE: ./src/assets/iconfont/iconfont.css

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

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
-81 KB
Loading
-109 KB
Loading
-45.3 KB
Loading
-29.6 KB
Loading
-584 Bytes
Loading
-74.4 KB
Loading
5.87 KB
Loading

examples/mapboxgl/widgets_basic_vue.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,9 @@
3737
.sm-progress-wrap {
3838
height: 100px;
3939
}
40-
.sm-progress-wrap, .sm-liquidFill {
41-
width: 115px;
40+
.sm-progress-wrap, .sm-widget-liquidFill {
41+
width: 110px;
42+
height: 110px;
4243
display: inline-block;
4344
vertical-align: middle;
4445
}

0 commit comments

Comments
 (0)