You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@echarts.apache.org by sh...@apache.org on 2020/08/10 11:14:21 UTC
[incubator-echarts-doc] branch master updated: refact: separate vue,
element ui to CDN.
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts-doc.git
The following commit(s) were added to refs/heads/master by this push:
new 9db41c6 refact: separate vue, element ui to CDN.
9db41c6 is described below
commit 9db41c656f837bb1bdb4ede77074a51c67fb29aa
Author: pissang <bm...@gmail.com>
AuthorDate: Mon Aug 10 19:10:07 2020 +0800
refact: separate vue, element ui to CDN.
---
build/webpack.config.js | 5 +++++
package.json | 4 ----
public/en/api.html | 8 ++++++-
public/en/option-gl.html | 8 ++++++-
public/en/option.html | 9 +++++++-
public/en/tutorial.html | 9 ++++++--
public/zh/api.html | 9 ++++++--
public/zh/option-gl.html | 9 ++++++--
public/zh/option.html | 9 ++++++--
public/zh/tutorial.html | 9 ++++++--
src/components/LiveExample.vue | 31 ++++++++++++++--------------
src/config.js | 2 ++
src/main.js | 47 ------------------------------------------
13 files changed, 80 insertions(+), 79 deletions(-)
diff --git a/build/webpack.config.js b/build/webpack.config.js
index 45f7232..a6f5833 100644
--- a/build/webpack.config.js
+++ b/build/webpack.config.js
@@ -39,6 +39,11 @@ module.exports = {
}]
}]
},
+ externals: {
+ vue: 'Vue',
+ codemirror: 'CodeMirror',
+ 'js-beautify': 'beautifier'
+ },
plugins: [
new webpack.IgnorePlugin(/^fs$/),
new VueLoaderPlugin(),
diff --git a/package.json b/package.json
index ec0e2f2..28cfa5d 100644
--- a/package.json
+++ b/package.json
@@ -50,10 +50,7 @@
"yargs": "^14.2.3"
},
"dependencies": {
- "codemirror": "^5.54.0",
- "element-ui": "^2.13.2",
"highlight.js": "^9.18.1",
- "js-beautify": "^1.11.0",
"jsonpack": "^1.1.5",
"lodash.debounce": "^4.0.8",
"lodash.throttle": "^4.1.1",
@@ -61,7 +58,6 @@
"scroll-into-view": "^1.14.2",
"string-similarity-js": "^2.1.2",
"vanilla-lazyload": "^12.5.1",
- "vue": "^2.6.11",
"vue-custom-scrollbar": "^1.2.0",
"vue-i18n": "^8.18.2",
"vue-text-highlight": "^2.0.10",
diff --git a/public/en/api.html b/public/en/api.html
index fcf1497..378cf43 100644
--- a/public/en/api.html
+++ b/public/en/api.html
@@ -6,7 +6,6 @@
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>Apache ECharts (incubating) Documents - API</title>
<link rel="stylesheet" href="../lib/reset.css">
- <link rel="stylesheet" href="../css/doc-bundle.css">
<script src="../lib/pace.min.js"></script>
</head>
<body>
@@ -24,6 +23,13 @@
<div id="app"></div>
+ <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/element-ui@2.13.2/lib/theme-chalk/index.css">
+ <link rel="stylesheet" href="../css/doc-bundle.css">
+ <script src="//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js"></script>
+ <script src="//cdn.jsdelivr.net/npm/element-ui@2.13.2/lib/index.js"></script>
+ <script src="//cdn.jsdelivr.net/npm/codemirror@5.56.0/lib/codemirror.min.js"></script>
+ <script src="//cdn.jsdelivr.net/npm/codemirror@5.56.0/mode/javascript/javascript.js"></script>
+ <script src="//cdn.jsdelivr.net/npm/js-beautify@1.11.0/js/lib/beautifier.min.js"></script>
<script src="../js/doc-bundle.js"></script>
<script>
echartsDoc.init('#app', {
diff --git a/public/en/option-gl.html b/public/en/option-gl.html
index a68f331..d4800c5 100644
--- a/public/en/option-gl.html
+++ b/public/en/option-gl.html
@@ -6,7 +6,6 @@
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>Apache ECharts (incubating) Documents - GL Option</title>
<link rel="stylesheet" href="../lib/reset.css">
- <link rel="stylesheet" href="../css/doc-bundle.css">
<script src="../lib/pace.min.js"></script>
</head>
<body>
@@ -23,6 +22,13 @@
</script>
<div id="app"></div>
+ <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/element-ui@2.13.2/lib/theme-chalk/index.css">
+ <link rel="stylesheet" href="../css/doc-bundle.css">
+ <script src="//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js"></script>
+ <script src="//cdn.jsdelivr.net/npm/element-ui@2.13.2/lib/index.js"></script>
+ <script src="//cdn.jsdelivr.net/npm/codemirror@5.56.0/lib/codemirror.min.js"></script>
+ <script src="//cdn.jsdelivr.net/npm/codemirror@5.56.0/mode/javascript/javascript.js"></script>
+ <script src="//cdn.jsdelivr.net/npm/js-beautify@1.11.0/js/lib/beautifier.min.js"></script>
<script src="../js/doc-bundle.js"></script>
<script>
echartsDoc.init('#app', {
diff --git a/public/en/option.html b/public/en/option.html
index e07ef8e..3c251d7 100644
--- a/public/en/option.html
+++ b/public/en/option.html
@@ -8,7 +8,6 @@
<link rel="stylesheet" href="../lib/reset.css">
<script src="../lib/pace.min.js"></script>
- <link rel="stylesheet" href="../css/doc-bundle.css">
</head>
<body>
<div id="header">
@@ -24,6 +23,14 @@
</script>
<div id="app"></div>
+
+ <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/element-ui@2.13.2/lib/theme-chalk/index.css">
+ <link rel="stylesheet" href="../css/doc-bundle.css">
+ <script src="//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js"></script>
+ <script src="//cdn.jsdelivr.net/npm/element-ui@2.13.2/lib/index.js"></script>
+ <script src="//cdn.jsdelivr.net/npm/codemirror@5.56.0/lib/codemirror.min.js"></script>
+ <script src="//cdn.jsdelivr.net/npm/codemirror@5.56.0/mode/javascript/javascript.js"></script>
+ <script src="//cdn.jsdelivr.net/npm/js-beautify@1.11.0/js/lib/beautifier.min.js"></script>
<script src="../js/doc-bundle.js"></script>
<script>
echartsDoc.init('#app', {
diff --git a/public/en/tutorial.html b/public/en/tutorial.html
index 132a575..e2eacec 100644
--- a/public/en/tutorial.html
+++ b/public/en/tutorial.html
@@ -7,8 +7,6 @@
<title>Apache ECharts (incubating) Documents - Tutorial</title>
<link rel="stylesheet" href="../lib/reset.css">
<script src="../lib/pace.min.js"></script>
-
- <link rel="stylesheet" href="../css/doc-bundle.css">
</head>
<body>
<div id="header">
@@ -25,6 +23,13 @@
<div id="app"></div>
+ <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/element-ui@2.13.2/lib/theme-chalk/index.css">
+ <link rel="stylesheet" href="../css/doc-bundle.css">
+ <script src="//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js"></script>
+ <script src="//cdn.jsdelivr.net/npm/element-ui@2.13.2/lib/index.js"></script>
+ <script src="//cdn.jsdelivr.net/npm/codemirror@5.56.0/lib/codemirror.min.js"></script>
+ <script src="//cdn.jsdelivr.net/npm/codemirror@5.56.0/mode/javascript/javascript.js"></script>
+ <script src="//cdn.jsdelivr.net/npm/js-beautify@1.11.0/js/lib/beautifier.min.js"></script>
<script src="../js/doc-bundle.js"></script>
<script>
echartsDoc.init('#app', {
diff --git a/public/zh/api.html b/public/zh/api.html
index 11fcd1d..9eadf56 100644
--- a/public/zh/api.html
+++ b/public/zh/api.html
@@ -7,8 +7,6 @@
<title>Apache ECharts (incubating) 文档 - API</title>
<link rel="stylesheet" href="../lib/reset.css">
<script src="../lib/pace.min.js"></script>
-
- <link rel="stylesheet" href="../css/doc-bundle.css">
</head>
<body>
<div id="header">
@@ -24,6 +22,13 @@
</script>
<div id="app"></div>
+ <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/element-ui@2.13.2/lib/theme-chalk/index.css">
+ <link rel="stylesheet" href="../css/doc-bundle.css">
+ <script src="//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js"></script>
+ <script src="//cdn.jsdelivr.net/npm/element-ui@2.13.2/lib/index.js"></script>
+ <script src="//cdn.jsdelivr.net/npm/codemirror@5.56.0/lib/codemirror.min.js"></script>
+ <script src="//cdn.jsdelivr.net/npm/codemirror@5.56.0/mode/javascript/javascript.js"></script>
+ <script src="//cdn.jsdelivr.net/npm/js-beautify@1.11.0/js/lib/beautifier.min.js"></script>
<script src="../js/doc-bundle.js"></script>
<script>
echartsDoc.init('#app', {
diff --git a/public/zh/option-gl.html b/public/zh/option-gl.html
index a5fa1b9..0bff801 100644
--- a/public/zh/option-gl.html
+++ b/public/zh/option-gl.html
@@ -7,8 +7,6 @@
<title>Apache ECharts (incubating) 文档 - GL 配置项</title>
<link rel="stylesheet" href="../lib/reset.css">
<script src="../lib/pace.min.js"></script>
-
- <link rel="stylesheet" href="../css/doc-bundle.css">
</head>
<body>
<div id="header">
@@ -24,6 +22,13 @@
</script>
<div id="app"></div>
+ <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/element-ui@2.13.2/lib/theme-chalk/index.css">
+ <link rel="stylesheet" href="../css/doc-bundle.css">
+ <script src="//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js"></script>
+ <script src="//cdn.jsdelivr.net/npm/element-ui@2.13.2/lib/index.js"></script>
+ <script src="//cdn.jsdelivr.net/npm/codemirror@5.56.0/lib/codemirror.min.js"></script>
+ <script src="//cdn.jsdelivr.net/npm/codemirror@5.56.0/mode/javascript/javascript.js"></script>
+ <script src="//cdn.jsdelivr.net/npm/js-beautify@1.11.0/js/lib/beautifier.min.js"></script>
<script src="../js/doc-bundle.js"></script>
<script>
echartsDoc.init('#app', {
diff --git a/public/zh/option.html b/public/zh/option.html
index 5f116e3..9856066 100644
--- a/public/zh/option.html
+++ b/public/zh/option.html
@@ -7,8 +7,6 @@
<title>Apache ECharts (incubating) 文档 - 配置项</title>
<link rel="stylesheet" href="../lib/reset.css">
<script src="../lib/pace.min.js"></script>
-
- <link rel="stylesheet" href="../css/doc-bundle.css">
</head>
<body>
<div id="header">
@@ -24,6 +22,13 @@
</script>
<div id="app"></div>
+ <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/element-ui@2.13.2/lib/theme-chalk/index.css">
+ <link rel="stylesheet" href="../css/doc-bundle.css">
+ <script src="//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js"></script>
+ <script src="//cdn.jsdelivr.net/npm/element-ui@2.13.2/lib/index.js"></script>
+ <script src="//cdn.jsdelivr.net/npm/codemirror@5.56.0/lib/codemirror.min.js"></script>
+ <script src="//cdn.jsdelivr.net/npm/codemirror@5.56.0/mode/javascript/javascript.js"></script>
+ <script src="//cdn.jsdelivr.net/npm/js-beautify@1.11.0/js/lib/beautifier.min.js"></script>
<script src="../js/doc-bundle.js"></script>
<script>
echartsDoc.init('#app', {
diff --git a/public/zh/tutorial.html b/public/zh/tutorial.html
index 69b7db1..d3ec9f7 100644
--- a/public/zh/tutorial.html
+++ b/public/zh/tutorial.html
@@ -7,8 +7,6 @@
<title>Apache ECharts (incubating) 文档 - 教程</title>
<link rel="stylesheet" href="../lib/reset.css">
<script src="../lib/pace.min.js"></script>
-
- <link rel="stylesheet" href="../css/doc-bundle.css">
</head>
<body>
<div id="header">
@@ -24,6 +22,13 @@
</script>
<div id="app"></div>
+ <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/element-ui@2.13.2/lib/theme-chalk/index.css">
+ <link rel="stylesheet" href="../css/doc-bundle.css">
+ <script src="//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js"></script>
+ <script src="//cdn.jsdelivr.net/npm/element-ui@2.13.2/lib/index.js"></script>
+ <script src="//cdn.jsdelivr.net/npm/codemirror@5.56.0/lib/codemirror.min.js"></script>
+ <script src="//cdn.jsdelivr.net/npm/codemirror@5.56.0/mode/javascript/javascript.js"></script>
+ <script src="//cdn.jsdelivr.net/npm/js-beautify@1.11.0/js/lib/beautifier.min.js"></script>
<script src="../js/doc-bundle.js"></script>
<script>
echartsDoc.init('#app', {
diff --git a/src/components/LiveExample.vue b/src/components/LiveExample.vue
index 53ff1c3..0881f35 100644
--- a/src/components/LiveExample.vue
+++ b/src/components/LiveExample.vue
@@ -23,17 +23,17 @@
:label="shared.locale === 'en' ? item['title-en'] : item.title"
></el-option>
</el-select>
- <el-button v-if="shared.currentExampleOption"
- type="primary"
- icon="el-icon-refresh"
- size="mini"
+ <el-button v-if="shared.currentExampleOption"
+ type="primary"
+ icon="el-icon-refresh"
+ size="mini"
:title="$t('example.refresh')"
@click="refreshForce"></el-button>
- <el-button
+ <el-button
style="margin-left: 0"
- type="primary"
- icon="el-icon-s-operation"
- size="mini"
+ type="primary"
+ icon="el-icon-s-operation"
+ size="mini"
:title="$t('example.changeLayout')"
v-popover:changeLayoutPopover></el-button>
<el-button size='mini' circle icon="el-icon-close" @click="closeExamplePanel"></el-button>
@@ -47,9 +47,9 @@
<div class="layout-title"><i class="el-icon-s-operation"></i>{{$t('example.changeLayout')}}</div>
<div class="layout-mode">
<el-radio-group v-model="shared.optionExampleLayout" @change="changeLayout" size="mini">
- <el-radio-button
- v-for="layout in optionExampleLayouts"
- :key="layout"
+ <el-radio-button
+ v-for="layout in optionExampleLayouts"
+ :key="layout"
:label="layout">{{$t('example.layout.' + layout)}}</el-radio-button>
</el-radio-group>
</div>
@@ -68,18 +68,19 @@ import CodeMirror from 'codemirror';
import 'codemirror/lib/codemirror.css';
// import 'codemirror/theme/paraiso-dark.css';
import 'codemirror/theme/dracula.css';
-import 'codemirror/mode/javascript/javascript.js'
-import beautify from 'js-beautify';
+// import 'codemirror/mode/javascript/javascript.js'
+import beautifier from 'js-beautify';
import throttle from 'lodash.throttle';
import arrayDiff from 'zrender/src/core/arrayDiff';
import scrollIntoView from 'scroll-into-view';
+import {EChartsLib} from '../config';
let echartsLoadPromise;
function fetchECharts() {
return echartsLoadPromise || (echartsLoadPromise = new Promise(function (resolve) {
const script = document.createElement('script');
- script.src = 'https://cdn.jsdelivr.net/npm/echarts@4.8.0/dist/echarts.min.js';
+ script.src = EChartsLib;
script.async = true;
script.onload = function () {
resolve();
@@ -354,7 +355,7 @@ export default {
},
formattedOptionCodeStr() {
- return beautify.js(this.optionCodeStr
+ return beautifier.js(this.optionCodeStr
.replace(/"(\w+)"\s*:/g, '$1:')
.replace(/"__functionstart__/g, "")
.replace(/__functionend__"/g, "")
diff --git a/src/config.js b/src/config.js
new file mode 100644
index 0000000..5ba20c5
--- /dev/null
+++ b/src/config.js
@@ -0,0 +1,2 @@
+
+export const EChartsLib = 'https://cdn.jsdelivr.net/npm/echarts@4.8.0/dist/echarts.min.js';
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index 9a9617f..a6390bc 100644
--- a/src/main.js
+++ b/src/main.js
@@ -2,31 +2,7 @@ import Vue from 'vue';
import VueI18n from 'vue-i18n';
import App from './App.vue';
import AppMobile from './AppMobile.vue';
-import {
- Button,
- Container,
- Aside,
- Main,
- Tree,
- Loading,
- Autocomplete,
- Input,
- Tooltip,
- Drawer,
- Popover,
- Footer,
- Switch,
- ColorPicker,
- InputNumber,
- Select,
- Option,
- Alert,
- Slider,
- RadioGroup,
- RadioButton
-} from 'element-ui';
import {preload} from './docHelper';
-// import 'element-ui/lib/theme-chalk/index.css';
import './directive/highlight';
import './directive/mark';
@@ -35,29 +11,6 @@ import {initResponsive} from './responsive';
import {store} from './store';
import messages from './i18n';
-Vue.use(Button);
-Vue.use(Container);
-Vue.use(Aside);
-Vue.use(Footer);
-Vue.use(Main);
-Vue.use(Tree);
-Vue.use(Loading);
-Vue.use(Autocomplete);
-Vue.use(Input);
-Vue.use(Tooltip);
-Vue.use(VueI18n);
-Vue.use(Drawer);
-Vue.use(Popover);
-Vue.use(Switch);
-Vue.use(ColorPicker);
-Vue.use(InputNumber);
-Vue.use(Select);
-Vue.use(Option);
-Vue.use(Alert);
-Vue.use(Slider);
-Vue.use(RadioGroup);
-Vue.use(RadioButton);
-
/**
*
* @param {HTMLDivElement|string} el
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org