Skip to content

Commit 6df95b5

Browse files
luoxiao-supermapluoxiao-supermap
committed
【update】dist文件更名 review by songym
1 parent b34eb2a commit 6df95b5

File tree

166 files changed

+713
-640
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

166 files changed

+713
-640
lines changed

‎build/build.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ <h1>自定义打包</h1>
169169
</p>
170170
<section class="sec">
171171
<div class="description">
172-
<div>common<span style="font-size: 14px"> --SuperMap iClient9通用模块</span></div>
172+
<div>common<span style="font-size: 14px"> --SuperMap iClient通用模块</span></div>
173173
</div>
174174
<div class="deplistContent active">
175175
<ul id="deplist" class="deplist"></ul>

‎build/pack.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
var program = require('commander');
22
var shell = require("shelljs");
33
require("./deps");
4-
program.description('Customized pack iClient9.');
4+
program.description('Customized pack iClient.');
55

66
var excludeFields = ['title', 'description', 'description_en'];
77

‎build/server.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ if (product) {
1212
const config = require(`./webpack.config.${product}.js`);
1313
const configBase = require(`./webpack.config.base.js`);
1414
const entry = [`./src/${product}/index.js`];
15-
const filename= product === 'classic' ? `iclient-classic` : `iclient9-${product}`;
15+
const filename= product === 'classic' ? `iclient-classic` : `iclient-${product}`;
1616
config.output.filename = `${filename}-es6.min.js`
1717
if (['leaflet', 'openlayers'].includes(product)) {
1818
entry.push(`./src/${product}/css/index.js`);

‎build/webpack.config.leaflet.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ let configBase = require("./webpack.config.base");
33
//端名
44
const libName = "leaflet";
55
//产品包名
6-
const productName = "iclient9-leaflet";
6+
const productName = "iclient-leaflet";
77

88
module.exports = {
99
mode: configBase.mode,

‎build/webpack.config.mapboxgl.js

+48-50
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,55 @@
1-
const configBase = require("./webpack.config.base");
1+
const configBase = require('./webpack.config.base');
22
//端名
3-
const libName = "mapboxgl";
3+
const libName = 'mapboxgl';
44
//产品包名
5-
const productName = "iclient9-mapboxgl";
6-
5+
const productName = 'iclient-mapboxgl';
76

87
module.exports = {
9-
mode: configBase.mode,
10-
//页面入口文件配置
11-
entry: configBase.entry,
12-
//入口文件输出配置
13-
output: configBase.output(libName, productName),
14-
//是否启用压缩
15-
optimization: configBase.optimization,
16-
//不显示打包文件大小相关警告
17-
performance: configBase.performance,
18-
//其它解决方案配置
19-
resolve: configBase.resolve,
20-
21-
externals: Object.assign({}, configBase.externals, {
22-
'mapbox-gl': 'mapboxgl',
23-
'three': 'function(){try{return THREE}catch(e){return {}}}()',
24-
'deck.gl': '(function(){try{return DeckGL}catch(e){return {}}})()',
25-
'luma.gl': '(function(){try{return luma}catch(e){return {}}})()',
26-
'webgl-debug': '(function(){try{return webgl-debug}catch(e){return {}}})()',
27-
'xlsx': "function(){try{return XLSX}catch(e){return {}}}()",
28-
'canvg': "function(){try{return canvg}catch(e){return {}}}()",
29-
'jsonsql': "function(){try{return jsonsql}catch(e){return {}}}()",
30-
'xml-js': "function(){try{return convert}catch(e){return {}}}()",
31-
}),
8+
mode: configBase.mode,
9+
//页面入口文件配置
10+
entry: configBase.entry,
11+
//入口文件输出配置
12+
output: configBase.output(libName, productName),
13+
//是否启用压缩
14+
optimization: configBase.optimization,
15+
//不显示打包文件大小相关警告
16+
performance: configBase.performance,
17+
//其它解决方案配置
18+
resolve: configBase.resolve,
3219

33-
module: {
34-
noParse: /[\/\\]node_modules[\/\\]mapbox-gl[\/\\]dist[\/\\]mapbox-gl\.js$/,
20+
externals: Object.assign({}, configBase.externals, {
21+
'mapbox-gl': 'mapboxgl',
22+
three: 'function(){try{return THREE}catch(e){return {}}}()',
23+
'deck.gl': '(function(){try{return DeckGL}catch(e){return {}}})()',
24+
'luma.gl': '(function(){try{return luma}catch(e){return {}}})()',
25+
'webgl-debug': '(function(){try{return webgl-debug}catch(e){return {}}})()',
26+
xlsx: 'function(){try{return XLSX}catch(e){return {}}}()',
27+
canvg: 'function(){try{return canvg}catch(e){return {}}}()',
28+
jsonsql: 'function(){try{return jsonsql}catch(e){return {}}}()',
29+
'xml-js': 'function(){try{return convert}catch(e){return {}}}()'
30+
}),
3531

36-
rules: (function () {
37-
let moduleRules = [];
38-
moduleRules.push(configBase.module.rules.img);
39-
moduleRules.push(configBase.module.rules.eslint);
40-
if (configBase.moduleVersion === "es5") {
41-
//打包为es5相关配置
42-
moduleRules.push({
43-
test: [/\.js$/],
44-
exclude: /node_modules[\/\\]proj4|classic|webgl-debug/,
45-
loader: 'babel-loader',
46-
options: {
47-
presets: ['es2015']
48-
}
49-
});
32+
module: {
33+
noParse: /[\/\\]node_modules[\/\\]mapbox-gl[\/\\]dist[\/\\]mapbox-gl\.js$/,
5034

51-
}
52-
moduleRules.push(configBase.module.rules.css);
53-
return moduleRules
54-
})()
55-
},
56-
plugins: configBase.plugins(libName, productName)
57-
};
35+
rules: (function() {
36+
let moduleRules = [];
37+
moduleRules.push(configBase.module.rules.img);
38+
moduleRules.push(configBase.module.rules.eslint);
39+
if (configBase.moduleVersion === 'es5') {
40+
//打包为es5相关配置
41+
moduleRules.push({
42+
test: [/\.js$/],
43+
exclude: /node_modules[\/\\]proj4|classic|webgl-debug/,
44+
loader: 'babel-loader',
45+
options: {
46+
presets: ['es2015']
47+
}
48+
});
49+
}
50+
moduleRules.push(configBase.module.rules.css);
51+
return moduleRules;
52+
})()
53+
},
54+
plugins: configBase.plugins(libName, productName)
55+
};

‎build/webpack.config.openlayers.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ var configBase = require("./webpack.config.base");
22
//端名
33
var libName = "openlayers";
44
//产品包名
5-
var productName = "iclient9-openlayers";
5+
var productName = "iclient-openlayers";
66

77
module.exports = {
88
mode: configBase.mode,

‎dist/leaflet/iclient9-leaflet-es6.js renamed to ‎dist/leaflet/iclient-leaflet-es6.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
22
*
3-
* iclient9-leaflet.(http://iclient.supermap.io)
3+
* iclient-leaflet.(http://iclient.supermap.io)
44
* Copyright© 2000 - 2019 SuperMap Software Co.Ltd
55
* license: Apache-2.0
66
* version: v10.0.0
@@ -64917,7 +64917,7 @@ class ChartView_ChartView {
6491764917
*/
6491864918
_fillDataToView() {
6491964919
let messageboxs = new MessageBox_MessageBox();
64920-
//iclient9 绑定createChart事件成功回调
64920+
//iclient 绑定createChart事件成功回调
6492164921
this.viewModel.getDatasetInfo(this._createChart.bind(this));
6492264922
this.viewModel.events.on({
6492364923
"getdatafailed": (error) => {

‎dist/leaflet/iclient9-leaflet-es6.min.js renamed to ‎dist/leaflet/iclient-leaflet-es6.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/leaflet/iclient9-leaflet.css renamed to ‎dist/leaflet/iclient-leaflet.css

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/leaflet/iclient9-leaflet.js renamed to ‎dist/leaflet/iclient-leaflet.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
22
*
3-
* iclient9-leaflet.(http://iclient.supermap.io)
3+
* iclient-leaflet.(http://iclient.supermap.io)
44
* Copyright© 2000 - 2019 SuperMap Software Co.Ltd
55
* license: Apache-2.0
66
* version: v10.0.0
@@ -83286,7 +83286,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
8328683286
/* 433 */
8328783287
/***/ (function(module) {
8328883288

83289-
module.exports = {"_from":"[email protected]","_id":"[email protected]","_inBundle":false,"_integrity":"sha1-46iM5+egciGqzLxnYN0ur+50XwM=","_location":"/proj4","_phantomChildren":{},"_requested":{"type":"version","registry":true,"raw":"[email protected]","name":"proj4","escapedName":"proj4","rawSpec":"2.5.0","saveSpec":null,"fetchSpec":"2.5.0"},"_requiredBy":["/"],"_resolved":"http://registry.npm.taobao.org/proj4/download/proj4-2.5.0.tgz","_shasum":"e3a88ce7e7a07221aaccbc6760dd2eafee745f03","_spec":"[email protected]","_where":"E:\\2018\\git\\iClient-JavaScript","author":"","bugs":{"url":"https://github.com/proj4js/proj4js/issues"},"bundleDependencies":false,"contributors":[{"name":"Mike Adair","email":"[email protected]"},{"name":"Richard Greenwood","email":"[email protected]"},{"name":"Calvin Metcalf","email":"[email protected]"},{"name":"Richard Marsden","url":"http://www.winwaed.com"},{"name":"T. Mittan"},{"name":"D. Steinwand"},{"name":"S. Nelson"}],"dependencies":{"mgrs":"1.0.0","wkt-parser":"^1.2.0"},"deprecated":false,"description":"Proj4js is a JavaScript library to transform point coordinates from one coordinate system to another, including datum transformations.","devDependencies":{"chai":"~4.1.2","curl-amd":"github:cujojs/curl","grunt":"^1.0.1","grunt-cli":"~1.2.0","grunt-contrib-connect":"~1.0.2","grunt-contrib-jshint":"~1.1.0","grunt-contrib-uglify":"~3.1.0","grunt-mocha-phantomjs":"~4.0.0","grunt-rollup":"^6.0.0","istanbul":"~0.4.5","mocha":"~4.0.0","rollup":"^0.50.0","rollup-plugin-json":"^2.3.0","rollup-plugin-node-resolve":"^3.0.0","tin":"~0.5.0"},"directories":{"test":"test","doc":"docs"},"homepage":"https://github.com/proj4js/proj4js#readme","license":"MIT","main":"dist/proj4-src.js","module":"lib/index.js","name":"proj4","repository":{"type":"git","url":"git://github.com/proj4js/proj4js.git"},"scripts":{"build":"grunt","build:tmerc":"grunt build:tmerc","test":"npm run build && istanbul test _mocha test/test.js"},"version":"2.5.0"};
83289+
module.exports = {"_from":"[email protected]","_id":"[email protected]","_inBundle":false,"_integrity":"sha1-46iM5+egciGqzLxnYN0ur+50XwM=","_location":"/proj4","_phantomChildren":{},"_requested":{"type":"version","registry":true,"raw":"[email protected]","name":"proj4","escapedName":"proj4","rawSpec":"2.5.0","saveSpec":null,"fetchSpec":"2.5.0"},"_requiredBy":["/"],"_resolved":"https://registry.npm.taobao.org/proj4/download/proj4-2.5.0.tgz","_shasum":"e3a88ce7e7a07221aaccbc6760dd2eafee745f03","_spec":"[email protected]","_where":"G:\\项目\\iClient-JavaScript","author":"","bugs":{"url":"https://github.com/proj4js/proj4js/issues"},"bundleDependencies":false,"contributors":[{"name":"Mike Adair","email":"[email protected]"},{"name":"Richard Greenwood","email":"[email protected]"},{"name":"Calvin Metcalf","email":"[email protected]"},{"name":"Richard Marsden","url":"http://www.winwaed.com"},{"name":"T. Mittan"},{"name":"D. Steinwand"},{"name":"S. Nelson"}],"dependencies":{"mgrs":"1.0.0","wkt-parser":"^1.2.0"},"deprecated":false,"description":"Proj4js is a JavaScript library to transform point coordinates from one coordinate system to another, including datum transformations.","devDependencies":{"chai":"~4.1.2","curl-amd":"github:cujojs/curl","grunt":"^1.0.1","grunt-cli":"~1.2.0","grunt-contrib-connect":"~1.0.2","grunt-contrib-jshint":"~1.1.0","grunt-contrib-uglify":"~3.1.0","grunt-mocha-phantomjs":"~4.0.0","grunt-rollup":"^6.0.0","istanbul":"~0.4.5","mocha":"~4.0.0","rollup":"^0.50.0","rollup-plugin-json":"^2.3.0","rollup-plugin-node-resolve":"^3.0.0","tin":"~0.5.0"},"directories":{"test":"test","doc":"docs"},"homepage":"https://github.com/proj4js/proj4js#readme","license":"MIT","main":"dist/proj4-src.js","module":"lib/index.js","name":"proj4","repository":{"type":"git","url":"git://github.com/proj4js/proj4js.git"},"scripts":{"build":"grunt","build:tmerc":"grunt build:tmerc","test":"npm run build && istanbul test _mocha test/test.js"},"version":"2.5.0"};
8329083290

8329183291
/***/ }),
8329283292
/* 434 */
@@ -87859,7 +87859,7 @@ var ChartView = exports.ChartView = function () {
8785987859
key: "_fillDataToView",
8786087860
value: function _fillDataToView() {
8786187861
var messageboxs = new _MessageBox.MessageBox();
87862-
//iclient9 绑定createChart事件成功回调
87862+
//iclient 绑定createChart事件成功回调
8786387863
this.viewModel.getDatasetInfo(this._createChart.bind(this));
8786487864
this.viewModel.events.on({
8786587865
"getdatafailed": function getdatafailed(error) {

‎dist/leaflet/iclient-leaflet.min.css

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/leaflet/iclient9-leaflet.min.js renamed to ‎dist/leaflet/iclient-leaflet.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/leaflet/iclient9-leaflet.min.css

-8
This file was deleted.

‎dist/leaflet/include-leaflet.js

+9-9
Original file line numberDiff line numberDiff line change
@@ -113,22 +113,22 @@
113113
}
114114

115115
// iclient
116-
if (!inArray(excludes, 'iclient9-leaflet')) {
116+
if (!inArray(excludes, 'iclient-leaflet')) {
117117
if (supportES6()) {
118-
inputScript("../../dist/leaflet/iclient9-leaflet-es6.min.js");
118+
inputScript("../../dist/leaflet/iclient-leaflet-es6.min.js");
119119
} else {
120-
inputScript("../../dist/leaflet/iclient9-leaflet.min.js");
120+
inputScript("../../dist/leaflet/iclient-leaflet.min.js");
121121
}
122122
}
123-
if (inArray(includes, 'iclient9-leaflet-css')) {
124-
inputCSS("../../dist/leaflet/iclient9-leaflet.min.css");
123+
if (inArray(includes, 'iclient-leaflet-css')) {
124+
inputCSS("../../dist/leaflet/iclient-leaflet.min.css");
125125
}
126-
if (inArray(includes, 'iclient9-plot-leaflet')) {
127-
inputCSS("http://iclient.supermap.io/web/libs/plotting/leaflet/10.0.0/iclient9-plot-leaflet.css");
126+
if (inArray(includes, 'iclient-plot-leaflet')) {
127+
inputCSS("http://iclient.supermap.io/web/libs/plotting/leaflet/10.0.0/iclient-plot-leaflet.css");
128128
if (supportES6()) {
129-
inputScript("http://iclient.supermap.io/web/libs/plotting/leaflet/10.0.0/iclient9-plot-leaflet-es6.min.js");
129+
inputScript("http://iclient.supermap.io/web/libs/plotting/leaflet/10.0.0/iclient-plot-leaflet-es6.min.js");
130130
} else {
131-
inputScript("http://iclient.supermap.io/web/libs/plotting/leaflet/10.0.0/iclient9-plot-leaflet.min.js");
131+
inputScript("http://iclient.supermap.io/web/libs/plotting/leaflet/10.0.0/iclient-plot-leaflet.min.js");
132132
}
133133
}
134134
}

‎dist/mapboxgl/iclient9-mapboxgl-es6.js renamed to ‎dist/mapboxgl/iclient-mapboxgl-es6.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
22
*
3-
* iclient9-mapboxgl.(http://iclient.supermap.io)
3+
* iclient-mapboxgl.(http://iclient.supermap.io)
44
* Copyright© 2000 - 2019 SuperMap Software Co.Ltd
55
* license: Apache-2.0
66
* version: v10.0.0
@@ -63586,7 +63586,7 @@ class ChartView_ChartView {
6358663586
*/
6358763587
_fillDataToView() {
6358863588
let messageboxs = new MessageBox_MessageBox();
63589-
//iclient9 绑定createChart事件成功回调
63589+
//iclient 绑定createChart事件成功回调
6359063590
this.viewModel.getDatasetInfo(this._createChart.bind(this));
6359163591
this.viewModel.events.on({
6359263592
"getdatafailed": (error) => {
@@ -76833,7 +76833,7 @@ class WebMap_WebMap extends external_mapboxgl_default.a.Evented {
7683376833
let labelUrl = tiandituUrls['labelUrl'];
7683476834
let tiandituUrl = tiandituUrls['tiandituUrl'];
7683576835
this._addBaselayer(tiandituUrl, 'tianditu-layers-' + layerType);
76836-
isLabel && this._addBaselayer([labelUrl], 'tianditu-label-layers-' + layerType);
76836+
isLabel && this._addBaselayer(labelUrl, 'tianditu-label-layers-' + layerType);
7683776837
}
7683876838

7683976839
/**

‎dist/mapboxgl/iclient9-mapboxgl-es6.min.js renamed to ‎dist/mapboxgl/iclient-mapboxgl-es6.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/mapboxgl/iclient9-mapboxgl-vue.css renamed to ‎dist/mapboxgl/iclient-mapboxgl-vue.css

-10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)