Skip to content

Commit d4b71c1

Browse files
committed
优化examples 优化icon png
1 parent 577cb03 commit d4b71c1

File tree

9 files changed

+66
-45
lines changed

9 files changed

+66
-45
lines changed

dist/leaflet/iclient9-leaflet-es6.js

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,34 @@
4444
/******/ // define getter function for harmony exports
4545
/******/ __webpack_require__.d = function(exports, name, getter) {
4646
/******/ if(!__webpack_require__.o(exports, name)) {
47-
/******/ Object.defineProperty(exports, name, {
48-
/******/ configurable: false,
49-
/******/ enumerable: true,
50-
/******/ get: getter
51-
/******/ });
47+
/******/ Object.defineProperty(exports, name, { enumerable: true, get: getter });
5248
/******/ }
5349
/******/ };
5450
/******/
5551
/******/ // define __esModule on exports
5652
/******/ __webpack_require__.r = function(exports) {
53+
/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
54+
/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
55+
/******/ }
5756
/******/ Object.defineProperty(exports, '__esModule', { value: true });
5857
/******/ };
5958
/******/
59+
/******/ // create a fake namespace object
60+
/******/ // mode & 1: value is a module id, require it
61+
/******/ // mode & 2: merge all properties of value into the ns
62+
/******/ // mode & 4: return value when already ns object
63+
/******/ // mode & 8|1: behave like require
64+
/******/ __webpack_require__.t = function(value, mode) {
65+
/******/ if(mode & 1) value = __webpack_require__(value);
66+
/******/ if(mode & 8) return value;
67+
/******/ if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
68+
/******/ var ns = Object.create(null);
69+
/******/ __webpack_require__.r(ns);
70+
/******/ Object.defineProperty(ns, 'default', { enumerable: true, value: value });
71+
/******/ if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
72+
/******/ return ns;
73+
/******/ };
74+
/******/
6075
/******/ // getDefaultExport function for compatibility with non-harmony modules
6176
/******/ __webpack_require__.n = function(module) {
6277
/******/ var getter = module && module.__esModule ?
@@ -84814,16 +84829,14 @@ var ClientComputationView = external_L_default.a.Control.extend({
8481484829
'dataValue': 'isolines',
8481584830
'remark': Lang.i18n('text_extractDiscreteValue'),
8481684831
'icon': {
84817-
'className': 'analyst-isoline-img',
84818-
'background': 'url("../../src/common/widgets/image/analyst_isoline_icon.png")'
84832+
'className': 'analyst-isoline-img'
8481984833
}
8482084834
}, {
8482184835
'title': Lang.i18n('text_buffer'),
8482284836
'dataValue': 'buffer',
8482384837
'remark': Lang.i18n('text_specifyTheDistance'),
8482484838
'icon': {
84825-
'className': 'analyst-buffer-img',
84826-
'background': 'url("../../src/common/widgets/image/analyst_buffer_icon.png")'
84839+
'className': 'analyst-buffer-img'
8482784840
}
8482884841
}];
8482984842
let widgetContentContainer = container.children[1];
@@ -85621,8 +85634,7 @@ var DistributedAnalysisView = external_L_default.a.Control.extend({
8562185634
'dataValue': 'density',
8562285635
'remark': Lang.i18n('text_CalculateTheValuePerUnitArea'),
8562385636
'icon': {
85624-
'className': 'analyst-density-img',
85625-
'background': 'url("../../src/common/widgets/image/analyst-density-icon.png")'
85637+
'className': 'analyst-density-img'
8562685638
}
8562785639
}];
8562885640
let dropDownBox = (new WidgetDropDownBox(analysisOptionsArr)).getElement();
@@ -89574,7 +89586,7 @@ module.exports = function(proj4){
8957489586
/* 74 */
8957589587
/***/ (function(module) {
8957689588

89577-
module.exports = {"_from":"proj4@2.3.15","_id":"proj4@2.3.15","_inBundle":false,"_integrity":"sha1-WtBui8owvg/6OJpJ5FZfUfBtCJ4=","_location":"/proj4","_phantomChildren":{},"_requested":{"type":"version","registry":true,"raw":"proj4@2.3.15","name":"proj4","escapedName":"proj4","rawSpec":"2.3.15","saveSpec":null,"fetchSpec":"2.3.15"},"_requiredBy":["/"],"_resolved":"http://registry.npm.taobao.org/proj4/download/proj4-2.3.15.tgz","_shasum":"5ad06e8bca30be0ffa389a49e4565f51f06d089e","_spec":"proj4@2.3.15","_where":"G:\\iClient\\iClient-JavaScript","author":"","bugs":{"url":"https://github.com/proj4js/proj4js/issues"},"bundleDependencies":false,"contributors":[{"name":"Mike Adair","email":"madair@dmsolutions.ca"},{"name":"Richard Greenwood","email":"rich@greenwoodmap.com"},{"name":"Calvin Metcalf","email":"calvin.metcalf@gmail.com"},{"name":"Richard Marsden","url":"http://www.winwaed.com"},{"name":"T. Mittan"},{"name":"D. Steinwand"},{"name":"S. Nelson"}],"dependencies":{"mgrs":"~0.0.2"},"deprecated":false,"description":"Proj4js is a JavaScript library to transform point coordinates from one coordinate system to another, including datum transformations.","devDependencies":{"browserify":"~12.0.1","chai":"~1.8.1","curl":"git://github.com/cujojs/curl.git","grunt":"~0.4.2","grunt-browserify":"~4.0.1","grunt-cli":"~0.1.13","grunt-contrib-connect":"~0.6.0","grunt-contrib-jshint":"~0.8.0","grunt-contrib-uglify":"~0.11.1","grunt-mocha-phantomjs":"~0.4.0","istanbul":"~0.2.4","mocha":"~1.17.1","tin":"~0.4.0"},"directories":{"test":"test","doc":"docs"},"homepage":"https://github.com/proj4js/proj4js#readme","jam":{"main":"dist/proj4.js","include":["dist/proj4.js","README.md","AUTHORS","LICENSE.md"]},"license":"MIT","main":"lib/index.js","name":"proj4","repository":{"type":"git","url":"git://github.com/proj4js/proj4js.git"},"scripts":{"test":"./node_modules/istanbul/lib/cli.js test ./node_modules/mocha/bin/_mocha test/test.js"},"version":"2.3.15"};
89589+
module.exports = {"_from":"proj4@2.3.15","_id":"proj4@2.3.15","_inBundle":false,"_integrity":"sha1-WtBui8owvg/6OJpJ5FZfUfBtCJ4=","_location":"/proj4","_phantomChildren":{},"_requested":{"type":"version","registry":true,"raw":"proj4@2.3.15","name":"proj4","escapedName":"proj4","rawSpec":"2.3.15","saveSpec":null,"fetchSpec":"2.3.15"},"_requiredBy":["/"],"_resolved":"http://localhost:4873/proj4/-/proj4-2.3.15.tgz","_shasum":"5ad06e8bca30be0ffa389a49e4565f51f06d089e","_spec":"proj4@2.3.15","_where":"E:\\2018\\git\\iClient-JavaScript","author":"","bugs":{"url":"https://github.com/proj4js/proj4js/issues"},"bundleDependencies":false,"contributors":[{"name":"Mike Adair","email":"madair@dmsolutions.ca"},{"name":"Richard Greenwood","email":"rich@greenwoodmap.com"},{"name":"Calvin Metcalf","email":"calvin.metcalf@gmail.com"},{"name":"Richard Marsden","url":"http://www.winwaed.com"},{"name":"T. Mittan"},{"name":"D. Steinwand"},{"name":"S. Nelson"}],"dependencies":{"mgrs":"~0.0.2"},"deprecated":false,"description":"Proj4js is a JavaScript library to transform point coordinates from one coordinate system to another, including datum transformations.","devDependencies":{"browserify":"~12.0.1","chai":"~1.8.1","curl":"git://github.com/cujojs/curl.git","grunt":"~0.4.2","grunt-browserify":"~4.0.1","grunt-cli":"~0.1.13","grunt-contrib-connect":"~0.6.0","grunt-contrib-jshint":"~0.8.0","grunt-contrib-uglify":"~0.11.1","grunt-mocha-phantomjs":"~0.4.0","istanbul":"~0.2.4","mocha":"~1.17.1","tin":"~0.4.0"},"directories":{"test":"test","doc":"docs"},"homepage":"https://github.com/proj4js/proj4js#readme","jam":{"main":"dist/proj4.js","include":["dist/proj4.js","README.md","AUTHORS","LICENSE.md"]},"license":"MIT","main":"lib/index.js","name":"proj4","repository":{"type":"git","url":"git://github.com/proj4js/proj4js.git"},"scripts":{"test":"./node_modules/istanbul/lib/cli.js test ./node_modules/mocha/bin/_mocha test/test.js"},"version":"2.3.15"};
8957889590

8957989591
/***/ }),
8958089592
/* 75 */

dist/leaflet/iclient9-leaflet-es6.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.

dist/leaflet/iclient9-leaflet.js

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,34 @@
4444
/******/ // define getter function for harmony exports
4545
/******/ __webpack_require__.d = function(exports, name, getter) {
4646
/******/ if(!__webpack_require__.o(exports, name)) {
47-
/******/ Object.defineProperty(exports, name, {
48-
/******/ configurable: false,
49-
/******/ enumerable: true,
50-
/******/ get: getter
51-
/******/ });
47+
/******/ Object.defineProperty(exports, name, { enumerable: true, get: getter });
5248
/******/ }
5349
/******/ };
5450
/******/
5551
/******/ // define __esModule on exports
5652
/******/ __webpack_require__.r = function(exports) {
53+
/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
54+
/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
55+
/******/ }
5756
/******/ Object.defineProperty(exports, '__esModule', { value: true });
5857
/******/ };
5958
/******/
59+
/******/ // create a fake namespace object
60+
/******/ // mode & 1: value is a module id, require it
61+
/******/ // mode & 2: merge all properties of value into the ns
62+
/******/ // mode & 4: return value when already ns object
63+
/******/ // mode & 8|1: behave like require
64+
/******/ __webpack_require__.t = function(value, mode) {
65+
/******/ if(mode & 1) value = __webpack_require__(value);
66+
/******/ if(mode & 8) return value;
67+
/******/ if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
68+
/******/ var ns = Object.create(null);
69+
/******/ __webpack_require__.r(ns);
70+
/******/ Object.defineProperty(ns, 'default', { enumerable: true, value: value });
71+
/******/ if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
72+
/******/ return ns;
73+
/******/ };
74+
/******/
6075
/******/ // getDefaultExport function for compatibility with non-harmony modules
6176
/******/ __webpack_require__.n = function(module) {
6277
/******/ var getter = module && module.__esModule ?
@@ -36504,7 +36519,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
3650436519
* L.supermap.tiledMapLayer(url).addTo(map);
3650536520
* @param {string} url - 影像图层地址。
3650636521
* @param {Object} options - 影像图层参数。
36507-
* @param {number} [options.layersID] - 图层 ID,如果有 layersID,则是在使用专题图。
36522+
* @param {string} [options.layersID] - 图层 ID,如果有 layersID,则是在使用专题图。
3650836523
* @param {boolean} [options.redirect=false] - 是否重定向,如果为 true,则将请求重定向到瓦片的真实地址;如果为 false,则响应体中是瓦片的字节流。
3650936524
* @param {boolean} [options.transparent=true] - 是否背景透明。
3651036525
* @param {boolean} [options.cacheEnabled=true] - 启用缓存。
@@ -63142,8 +63157,7 @@ var DistributedAnalysisView = exports.DistributedAnalysisView = _leaflet2["defau
6314263157
'dataValue': 'density',
6314363158
'remark': _iclientCommon.Lang.i18n('text_CalculateTheValuePerUnitArea'),
6314463159
'icon': {
63145-
'className': 'analyst-density-img',
63146-
'background': 'url("../../src/common/widgets/image/analyst-density-icon.png")'
63160+
'className': 'analyst-density-img'
6314763161
}
6314863162
}];
6314963163
var dropDownBox = new _iclientCommon.WidgetDropDownBox(analysisOptionsArr).getElement();
@@ -63645,16 +63659,14 @@ var ClientComputationView = exports.ClientComputationView = _leaflet2["default"]
6364563659
'dataValue': 'isolines',
6364663660
'remark': _iclientCommon.Lang.i18n('text_extractDiscreteValue'),
6364763661
'icon': {
63648-
'className': 'analyst-isoline-img',
63649-
'background': 'url("../../src/common/widgets/image/analyst_isoline_icon.png")'
63662+
'className': 'analyst-isoline-img'
6365063663
}
6365163664
}, {
6365263665
'title': _iclientCommon.Lang.i18n('text_buffer'),
6365363666
'dataValue': 'buffer',
6365463667
'remark': _iclientCommon.Lang.i18n('text_specifyTheDistance'),
6365563668
'icon': {
63656-
'className': 'analyst-buffer-img',
63657-
'background': 'url("../../src/common/widgets/image/analyst_buffer_icon.png")'
63669+
'className': 'analyst-buffer-img'
6365863670
}
6365963671
}];
6366063672
var widgetContentContainer = container.children[1];
@@ -77865,7 +77877,7 @@ module.exports = function (proj4) {
7786577877
/* 408 */
7786677878
/***/ (function(module) {
7786777879

77868-
module.exports = {"_from":"proj4@2.3.15","_id":"proj4@2.3.15","_inBundle":false,"_integrity":"sha1-WtBui8owvg/6OJpJ5FZfUfBtCJ4=","_location":"/proj4","_phantomChildren":{},"_requested":{"type":"version","registry":true,"raw":"proj4@2.3.15","name":"proj4","escapedName":"proj4","rawSpec":"2.3.15","saveSpec":null,"fetchSpec":"2.3.15"},"_requiredBy":["/"],"_resolved":"http://registry.npm.taobao.org/proj4/download/proj4-2.3.15.tgz","_shasum":"5ad06e8bca30be0ffa389a49e4565f51f06d089e","_spec":"proj4@2.3.15","_where":"G:\\iClient\\iClient-JavaScript","author":"","bugs":{"url":"https://github.com/proj4js/proj4js/issues"},"bundleDependencies":false,"contributors":[{"name":"Mike Adair","email":"madair@dmsolutions.ca"},{"name":"Richard Greenwood","email":"rich@greenwoodmap.com"},{"name":"Calvin Metcalf","email":"calvin.metcalf@gmail.com"},{"name":"Richard Marsden","url":"http://www.winwaed.com"},{"name":"T. Mittan"},{"name":"D. Steinwand"},{"name":"S. Nelson"}],"dependencies":{"mgrs":"~0.0.2"},"deprecated":false,"description":"Proj4js is a JavaScript library to transform point coordinates from one coordinate system to another, including datum transformations.","devDependencies":{"browserify":"~12.0.1","chai":"~1.8.1","curl":"git://github.com/cujojs/curl.git","grunt":"~0.4.2","grunt-browserify":"~4.0.1","grunt-cli":"~0.1.13","grunt-contrib-connect":"~0.6.0","grunt-contrib-jshint":"~0.8.0","grunt-contrib-uglify":"~0.11.1","grunt-mocha-phantomjs":"~0.4.0","istanbul":"~0.2.4","mocha":"~1.17.1","tin":"~0.4.0"},"directories":{"test":"test","doc":"docs"},"homepage":"https://github.com/proj4js/proj4js#readme","jam":{"main":"dist/proj4.js","include":["dist/proj4.js","README.md","AUTHORS","LICENSE.md"]},"license":"MIT","main":"lib/index.js","name":"proj4","repository":{"type":"git","url":"git://github.com/proj4js/proj4js.git"},"scripts":{"test":"./node_modules/istanbul/lib/cli.js test ./node_modules/mocha/bin/_mocha test/test.js"},"version":"2.3.15"};
77880+
module.exports = {"_from":"proj4@2.3.15","_id":"proj4@2.3.15","_inBundle":false,"_integrity":"sha1-WtBui8owvg/6OJpJ5FZfUfBtCJ4=","_location":"/proj4","_phantomChildren":{},"_requested":{"type":"version","registry":true,"raw":"proj4@2.3.15","name":"proj4","escapedName":"proj4","rawSpec":"2.3.15","saveSpec":null,"fetchSpec":"2.3.15"},"_requiredBy":["/"],"_resolved":"http://localhost:4873/proj4/-/proj4-2.3.15.tgz","_shasum":"5ad06e8bca30be0ffa389a49e4565f51f06d089e","_spec":"proj4@2.3.15","_where":"E:\\2018\\git\\iClient-JavaScript","author":"","bugs":{"url":"https://github.com/proj4js/proj4js/issues"},"bundleDependencies":false,"contributors":[{"name":"Mike Adair","email":"madair@dmsolutions.ca"},{"name":"Richard Greenwood","email":"rich@greenwoodmap.com"},{"name":"Calvin Metcalf","email":"calvin.metcalf@gmail.com"},{"name":"Richard Marsden","url":"http://www.winwaed.com"},{"name":"T. Mittan"},{"name":"D. Steinwand"},{"name":"S. Nelson"}],"dependencies":{"mgrs":"~0.0.2"},"deprecated":false,"description":"Proj4js is a JavaScript library to transform point coordinates from one coordinate system to another, including datum transformations.","devDependencies":{"browserify":"~12.0.1","chai":"~1.8.1","curl":"git://github.com/cujojs/curl.git","grunt":"~0.4.2","grunt-browserify":"~4.0.1","grunt-cli":"~0.1.13","grunt-contrib-connect":"~0.6.0","grunt-contrib-jshint":"~0.8.0","grunt-contrib-uglify":"~0.11.1","grunt-mocha-phantomjs":"~0.4.0","istanbul":"~0.2.4","mocha":"~1.17.1","tin":"~0.4.0"},"directories":{"test":"test","doc":"docs"},"homepage":"https://github.com/proj4js/proj4js#readme","jam":{"main":"dist/proj4.js","include":["dist/proj4.js","README.md","AUTHORS","LICENSE.md"]},"license":"MIT","main":"lib/index.js","name":"proj4","repository":{"type":"git","url":"git://github.com/proj4js/proj4js.git"},"scripts":{"test":"./node_modules/istanbul/lib/cli.js test ./node_modules/mocha/bin/_mocha test/test.js"},"version":"2.3.15"};
7786977881

7787077882
/***/ }),
7787177883
/* 409 */

dist/leaflet/iclient9-leaflet.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.

dist/leaflet/include-leaflet.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
if (supportES6() && !inArray(includes, 'iclient9-plot-leaflet')) {
8484
inputScript("../../dist/leaflet/iclient9-leaflet-es6.js");
8585
} else {
86-
inputScript("../../dist/leaflet/iclient9-leaflet.min.js");
86+
inputScript("../../dist/leaflet/iclient9-leaflet.js");
8787
}
8888
}
8989
if (inArray(includes, 'iclient9-leaflet-css')) {

dist/mapboxgl/include-mapboxgl.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
var includes = (targetScript.getAttribute('include') || "").split(",");
5151
var excludes = (targetScript.getAttribute('exclude') || "").split(",");
5252
if (!inArray(excludes, 'mapbox-gl')) {
53-
inputCSS("https://cdn.bootcss.com/mapbox-gl/0.45.0/mapbox-gl.css");
54-
inputScript("https://cdn.bootcss.com/mapbox-gl/0.45.0/mapbox-gl.js");
53+
inputCSS("https://api.tiles.mapbox.com/mapbox-gl-js/v0.49.0/mapbox-gl.css");
54+
inputScript("https://api.tiles.mapbox.com/mapbox-gl-js/v0.49.0/mapbox-gl.js");
5555
}
5656
if (inArray(includes, 'draw')) {
5757
inputCSS("http://iclient.supermap.io/web/libs/mapbox-gl-js/plugins/mapbox-gl-draw/1.0.9/mapbox-gl-draw.css");

examples/js/localization.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,14 @@ var Localization = {
6868

6969
}
7070
window.resources = window.examplesResources;
71-
i18next.addResourceBundle(lang, 'translation', window.resources);
71+
i18next.addResourceBundle && i18next.addResourceBundle(lang, 'translation', window.resources);
7272
callback && callback();
7373

7474
})
7575

7676
} else {
7777
window.resources = window.examplesResources;
78-
i18next.addResourceBundle(lang, 'translation', window.resources);
78+
i18next.addResourceBundle && i18next.addResourceBundle(lang, 'translation', window.resources);
7979
callback && callback();
8080
}
8181
});
@@ -98,7 +98,7 @@ var Localization = {
9898
rootNameSpace.oldResources = rootNameSpace.resources;
9999
}
100100
//example只开放资源映射到resources字段
101-
var resources = i18next.getResourceBundle(utils.getLanguage());
101+
var resources = i18next.getResourceBundle && i18next.getResourceBundle(utils.getLanguage());
102102
rootNameSpace.resources = resources && resources.resources;
103103
}
104104

src/leaflet/widgets/clientcomputation/ClientComputationView.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,16 +129,14 @@ export var ClientComputationView = L.Control.extend({
129129
'dataValue': 'isolines',
130130
'remark': Lang.i18n('text_extractDiscreteValue'),
131131
'icon': {
132-
'className': 'analyst-isoline-img',
133-
'background': 'url("../../src/common/widgets/image/analyst_isoline_icon.png")'
132+
'className': 'analyst-isoline-img'
134133
}
135134
}, {
136135
'title': Lang.i18n('text_buffer'),
137136
'dataValue': 'buffer',
138137
'remark': Lang.i18n('text_specifyTheDistance'),
139138
'icon': {
140-
'className': 'analyst-buffer-img',
141-
'background': 'url("../../src/common/widgets/image/analyst_buffer_icon.png")'
139+
'className': 'analyst-buffer-img'
142140
}
143141
}];
144142
let widgetContentContainer = container.children[1];

src/leaflet/widgets/distributedanalysis/DistributedAnalysisView.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,7 @@ export var DistributedAnalysisView = L.Control.extend({
110110
'dataValue': 'density',
111111
'remark': Lang.i18n('text_CalculateTheValuePerUnitArea'),
112112
'icon': {
113-
'className': 'analyst-density-img',
114-
'background': 'url("../../src/common/widgets/image/analyst-density-icon.png")'
113+
'className': 'analyst-density-img'
115114
}
116115
}];
117116
let dropDownBox = (new WidgetDropDownBox(analysisOptionsArr)).getElement();

0 commit comments

Comments
 (0)