From 78b643de0b8690d566146858cd781be98d01777d Mon Sep 17 00:00:00 2001 From: wangqi <magical1908@outlook.com> Date: 星期一, 29 三月 2021 10:00:50 +0800 Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop --- src/components/plugin/MagicMarker.js | 72 ++++++++++++----------------------- 1 files changed, 25 insertions(+), 47 deletions(-) diff --git a/src/components/plugin/MagicMarker.js b/src/components/plugin/MagicMarker.js index f74a2a4..afe9916 100644 --- a/src/components/plugin/MagicMarker.js +++ b/src/components/plugin/MagicMarker.js @@ -1,49 +1,27 @@ -const init = (L) => { - (function (window) { - console.log(window) - const setOptions = function (obj, options) { - for (const i in options) { - obj[i] = options[i] - } - return obj +/* eslint-disable */ +!(function (i) { + var c = function (i, c) { + for (var n in c) i[n] = c[n] + return i + } + L.Icon.Magic = function (i) { + if (i.iconUrl) { + var n = { html: '<div class=\'magicDiv\'><div class=\'magictime ' + i.magic + '\'>' + i.html + '<img id=\'migic\' src=\'' + i.iconUrl + '\'/></div></div>' } + } else { + var n = { html: '<div class=\'magicDiv\'><div class=\'magictime ' + i.magic + '\'>' + i.html + '</div></div>' } } - L.Icon.Magic = function (options) { - let opts - if (options.iconUrl) { - opts = { - html: "<div class='magicDiv'><div class='magictime " + options.magic + "'><img id='migic' src='" + options.iconUrl + "'/></div></div>" - // className: 'magicDiv', - } - } else { - opts = { - html: "<div class='magicDiv'><div class='magictime " + options.magic + "'>" + options.html + '</div></div>' - // className: 'magicDiv', - } - } - delete options.html - const magicIconOpts = setOptions(opts, options) - // console.log(magicIconOpts) - const magicIcon = L.divIcon(magicIconOpts) - return magicIcon + delete i.html + var a = c(n, i) + console.log(a) + var r = L.divIcon(a) + return r + }, L.icon.magic = function (i) { + return new L.Icon.Magic(i) + }, L.Marker.Magic = L.Marker.extend({ + initialize: function (i, c) { + c.icon = L.icon.magic(c), L.Marker.prototype.initialize.call(this, i, c) } - - L.icon.magic = function (options) { - return new L.Icon.Magic(options) - } - - L.Marker.Magic = L.Marker.extend({ - initialize: function (latlng, options) { - options.icon = L.icon.magic(options) - L.Marker.prototype.initialize.call(this, latlng, options) - } - }) - - L.marker.magic = function (latlng, options) { - return new L.Marker.Magic(latlng, options) - } - })(window) -} - -export default { - init -} + }), L.marker.magic = function (i, c) { + return new L.Marker.Magic(i, c) + } +}(window)) -- Gitblit v1.8.0