Skip to content

Commit 9fcde3b

Browse files
committed
【update】 更新 iclient-vue 依赖 review by songym
1 parent 734ea84 commit 9fcde3b

File tree

4 files changed

+78
-51
lines changed

4 files changed

+78
-51
lines changed

dist/mapboxgl/iclient-mapboxgl-vue.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/iclient-mapboxgl-vue.js

Lines changed: 72 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1830,6 +1830,23 @@ __webpack_require__.r(__webpack_exports__);
18301830
module.exports = __webpack_require__("43KI").Transform
18311831

18321832

1833+
/***/ }),
1834+
1835+
/***/ "0Z9T":
1836+
/***/ (function(module, __webpack_exports__, __webpack_require__) {
1837+
1838+
"use strict";
1839+
1840+
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./src/common/image/Image.vue?vue&type=template&id=452a2bc2&
1841+
var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"sm-component-image",style:([_vm.getBackgroundStyle, _vm.getTextColorStyle])},[_c('a',{class:['sm-component-image__link', _vm.realHref ? '': 'sm-component-image__noLink'],attrs:{"href":_vm.realHref,"target":_vm.target}},[(_vm.src)?_c('div',{staticClass:"sm-component-image__content",style:([_vm.repeatStyle,_vm.imgUrl])}):_c('i',{staticClass:"sm-components-icons-x-bmp sm-component-image__defaultImg"})])])}
1842+
var staticRenderFns = []
1843+
1844+
1845+
// CONCATENATED MODULE: ./src/common/image/Image.vue?vue&type=template&id=452a2bc2&
1846+
/* concated harmony reexport render */__webpack_require__.d(__webpack_exports__, "a", function() { return render; });
1847+
/* concated harmony reexport staticRenderFns */__webpack_require__.d(__webpack_exports__, "b", function() { return staticRenderFns; });
1848+
1849+
18331850
/***/ }),
18341851

18351852
/***/ 1:
@@ -2962,6 +2979,23 @@ function (_mapboxgl$Evented) {
29622979

29632980
exports.default = ZoomViewModel;
29642981

2982+
/***/ }),
2983+
2984+
/***/ "1uZ5":
2985+
/***/ (function(module, __webpack_exports__, __webpack_require__) {
2986+
2987+
"use strict";
2988+
2989+
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./src/mapboxgl/web-scene/WebScene.vue?vue&type=template&id=05bd795a&
2990+
var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"sm-component-web-scene"},[(_vm.sceneUrl)?_c('cesium-viewer',{staticClass:"sm-component-web-scene__wrap",on:{"ready":_vm.ready}}):_vm._e()],1)}
2991+
var staticRenderFns = []
2992+
2993+
2994+
// CONCATENATED MODULE: ./src/mapboxgl/web-scene/WebScene.vue?vue&type=template&id=05bd795a&
2995+
/* concated harmony reexport render */__webpack_require__.d(__webpack_exports__, "a", function() { return render; });
2996+
/* concated harmony reexport staticRenderFns */__webpack_require__.d(__webpack_exports__, "b", function() { return staticRenderFns; });
2997+
2998+
29652999
/***/ }),
29663000

29673001
/***/ "1yYI":
@@ -6615,23 +6649,6 @@ function (_mapboxgl$Evented) {
66156649

66166650
exports.default = LabelThemeLayerViewModel;
66176651

6618-
/***/ }),
6619-
6620-
/***/ "42JY":
6621-
/***/ (function(module, __webpack_exports__, __webpack_require__) {
6622-
6623-
"use strict";
6624-
6625-
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./src/mapboxgl/web-scene/WebScene.vue?vue&type=template&id=6e813da6&
6626-
var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"sm-component-web-scene"},[(_vm.sceneUrl)?_c('cesium-viewer',{staticClass:"sm-component-web-scene__wrap",on:{"ready":_vm.ready}}):_vm._e()],1)}
6627-
var staticRenderFns = []
6628-
6629-
6630-
// CONCATENATED MODULE: ./src/mapboxgl/web-scene/WebScene.vue?vue&type=template&id=6e813da6&
6631-
/* concated harmony reexport render */__webpack_require__.d(__webpack_exports__, "a", function() { return render; });
6632-
/* concated harmony reexport staticRenderFns */__webpack_require__.d(__webpack_exports__, "b", function() { return staticRenderFns; });
6633-
6634-
66356652
/***/ }),
66366653

66376654
/***/ "43KI":
@@ -14313,6 +14330,7 @@ var dateTimeFormats = {
1431314330
zh: _zh.default.dateTimeFormat
1431414331
};
1431514332
var i18n = {};
14333+
var rooti18n;
1431614334
var messages = {
1431714335
en: _objectSpread({}, _en.default),
1431814336
zh: _objectSpread({}, _zh.default)
@@ -14343,7 +14361,7 @@ function getLanguage() {
1434314361
}
1434414362

1434514363
function geti18n(n) {
14346-
return i18n;
14364+
return rooti18n || i18n;
1434714365
}
1434814366

1434914367
function setLocale(locales) {
@@ -14372,7 +14390,11 @@ function initi18n(Vue, config) {
1437214390
} else if (!Vue.prototype.hasOwnProperty('$i18n')) {
1437314391
Object.defineProperty(Vue.prototype, '$i18n', {
1437414392
get: function get() {
14375-
return i18n;
14393+
if (!rooti18n && this.$root && this.$root.$options.i18n) {
14394+
rooti18n = this.$root.$options.i18n;
14395+
}
14396+
14397+
return rooti18n || i18n;
1437614398
}
1437714399
});
1437814400
Vue.use(_vueI18n.default);
@@ -14386,8 +14408,6 @@ function initi18n(Vue, config) {
1438614408

1438714409
if (config.locale) {
1438814410
setLocale(config.locale);
14389-
} else {
14390-
setLocale(lang[getLanguage()]);
1439114411
}
1439214412
}
1439314413

@@ -15461,7 +15481,7 @@ __webpack_require__.r(__webpack_exports__);
1546115481

1546215482
"use strict";
1546315483
__webpack_require__.r(__webpack_exports__);
15464-
/* harmony import */ var _WebScene_vue_vue_type_template_id_6e813da6___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("42JY");
15484+
/* harmony import */ var _WebScene_vue_vue_type_template_id_05bd795a___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("1uZ5");
1546515485
/* harmony import */ var _WebScene_vue_vue_type_script_lang_ts___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("We5+");
1546615486
/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _WebScene_vue_vue_type_script_lang_ts___WEBPACK_IMPORTED_MODULE_1__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _WebScene_vue_vue_type_script_lang_ts___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
1546715487
/* harmony import */ var _node_modules_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("KHd+");
@@ -15474,8 +15494,8 @@ __webpack_require__.r(__webpack_exports__);
1547415494

1547515495
var component = Object(_node_modules_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__[/* default */ "a"])(
1547615496
_WebScene_vue_vue_type_script_lang_ts___WEBPACK_IMPORTED_MODULE_1__["default"],
15477-
_WebScene_vue_vue_type_template_id_6e813da6___WEBPACK_IMPORTED_MODULE_0__[/* render */ "a"],
15478-
_WebScene_vue_vue_type_template_id_6e813da6___WEBPACK_IMPORTED_MODULE_0__[/* staticRenderFns */ "b"],
15497+
_WebScene_vue_vue_type_template_id_05bd795a___WEBPACK_IMPORTED_MODULE_0__[/* render */ "a"],
15498+
_WebScene_vue_vue_type_template_id_05bd795a___WEBPACK_IMPORTED_MODULE_0__[/* staticRenderFns */ "b"],
1547915499
false,
1548015500
null,
1548115501
null,
@@ -22213,23 +22233,6 @@ function (_mapboxgl$Evented) {
2221322233
var _default = LegendViewModel;
2221422234
exports.default = _default;
2221522235

22216-
/***/ }),
22217-
22218-
/***/ "PpVA":
22219-
/***/ (function(module, __webpack_exports__, __webpack_require__) {
22220-
22221-
"use strict";
22222-
22223-
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./src/common/image/Image.vue?vue&type=template&id=0f33dd3c&
22224-
var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"sm-component-image",style:([_vm.getBackgroundStyle])},[_c('a',{staticClass:"sm-component-image__link",attrs:{"href":_vm.href,"target":_vm.target}},[(_vm.src)?_c('div',{staticClass:"sm-component-image__content",style:([_vm.repeatStyle,_vm.imgUrl])}):_c('i',{staticClass:"sm-components-icons-x-bmp sm-component-image__defaultImg"})])])}
22225-
var staticRenderFns = []
22226-
22227-
22228-
// CONCATENATED MODULE: ./src/common/image/Image.vue?vue&type=template&id=0f33dd3c&
22229-
/* concated harmony reexport render */__webpack_require__.d(__webpack_exports__, "a", function() { return render; });
22230-
/* concated harmony reexport staticRenderFns */__webpack_require__.d(__webpack_exports__, "b", function() { return staticRenderFns; });
22231-
22232-
2223322236
/***/ }),
2223422237

2223522238
/***/ "PsGY":
@@ -24236,6 +24239,7 @@ function (_mapboxgl$Evented) {
2423624239
period: 2000,
2423724240
speed: 500
2423824241
};
24242+
_this.withCredentials = options.withCredentials || false;
2423924243
_this.position = options.position || {};
2424024244

2424124245
_this.setSceneUrl(sceneUrl);
@@ -24302,7 +24306,9 @@ function (_mapboxgl$Evented) {
2430224306
value: function _getSceneInfo(url) {
2430324307
var _this3 = this;
2430424308

24305-
SuperMap.FetchRequest.get(url + '.json').then(function (response) {
24309+
SuperMap.FetchRequest.get(url + '.json', {}, {
24310+
withCredentials: this.withCredentials
24311+
}).then(function (response) {
2430624312
return response.json();
2430724313
}).then(function (result) {
2430824314
var url = result.url;
@@ -28417,6 +28423,12 @@ exports.default = void 0;
2841728423

2841828424
var _theme = _interopRequireDefault(__webpack_require__("bCOg"));
2841928425

28426+
var _util = __webpack_require__("e7LN");
28427+
28428+
//
28429+
//
28430+
//
28431+
//
2842028432
//
2842128433
//
2842228434
//
@@ -28480,6 +28492,15 @@ var _default = {
2848028492
return {
2848128493
backgroundImage: "url(".concat(this.src, ")")
2848228494
};
28495+
},
28496+
realHref: function realHref() {
28497+
var href = this.href.replace(/ /g, '');
28498+
28499+
if (href && !(0, _util.parseUrl)(href)) {
28500+
return "http://".concat(href);
28501+
}
28502+
28503+
return href;
2848328504
}
2848428505
}
2848528506
};
@@ -48811,6 +48832,7 @@ exports.clearNumberComma = clearNumberComma;
4881148832
exports.isXField = isXField;
4881248833
exports.isYField = isYField;
4881348834
exports.getColorWithOpacity = getColorWithOpacity;
48835+
exports.parseUrl = parseUrl;
4881448836

4881548837
var _lang = __webpack_require__("DSM6");
4881648838

@@ -48874,6 +48896,11 @@ function getColorWithOpacity(color, opacity) {
4887448896
return 'rgba' + newColor.substring(3, newColor.length - 1) + ",".concat(opacity, ")");
4887548897
}
4887648898

48899+
function parseUrl(url) {
48900+
var urlRe = /^(\w+):\/\/([^/?]*)(\/[^?]+)?\??(.+)?/;
48901+
return url.match(urlRe);
48902+
}
48903+
4887748904
/***/ }),
4887848905

4887948906
/***/ "eA/Y":
@@ -54909,7 +54936,7 @@ __webpack_require__.r(__webpack_exports__);
5490954936

5491054937
"use strict";
5491154938
__webpack_require__.r(__webpack_exports__);
54912-
/* harmony import */ var _Image_vue_vue_type_template_id_0f33dd3c___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("PpVA");
54939+
/* harmony import */ var _Image_vue_vue_type_template_id_452a2bc2___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("0Z9T");
5491354940
/* harmony import */ var _Image_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("tA+t");
5491454941
/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _Image_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _Image_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
5491554942
/* harmony import */ var _node_modules_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("KHd+");
@@ -54922,8 +54949,8 @@ __webpack_require__.r(__webpack_exports__);
5492254949

5492354950
var component = Object(_node_modules_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__[/* default */ "a"])(
5492454951
_Image_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__["default"],
54925-
_Image_vue_vue_type_template_id_0f33dd3c___WEBPACK_IMPORTED_MODULE_0__[/* render */ "a"],
54926-
_Image_vue_vue_type_template_id_0f33dd3c___WEBPACK_IMPORTED_MODULE_0__[/* staticRenderFns */ "b"],
54952+
_Image_vue_vue_type_template_id_452a2bc2___WEBPACK_IMPORTED_MODULE_0__[/* render */ "a"],
54953+
_Image_vue_vue_type_template_id_452a2bc2___WEBPACK_IMPORTED_MODULE_0__[/* staticRenderFns */ "b"],
5492754954
false,
5492854955
null,
5492954956
null,

dist/mapboxgl/iclient-mapboxgl-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/iclient-mapboxgl-vue.min.js

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)