This is an automated email from the ASF dual-hosted git repository.
wangzx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/echarts-handbook.git
The following commit(s) were added to refs/heads/master by this push:
new c9bfea8 use China CDN for Chinese website
c9bfea8 is described below
commit c9bfea893b9f00c8d40094f1d620c6dff8f41f07
Author: plainheart <y...@all-my-life.cn>
AuthorDate: Sat Dec 9 05:45:40 2023 +0800
use China CDN for Chinese website
---
app.html | 23 +++--------------
components/markdown/Live.vue | 13 +++++-----
layouts/default.vue | 5 ----
nuxt.config.js | 60 ++++++++++++++++++++++++++++++++++----------
4 files changed, 57 insertions(+), 44 deletions(-)
diff --git a/app.html b/app.html
index 77cdfff..5df43a3 100644
--- a/app.html
+++ b/app.html
@@ -1,20 +1,9 @@
<!DOCTYPE html>
<html {{ HTML_ATTRS }}>
<head {{ HEAD_ATTRS }}>
- <link
- rel="stylesheet"
- type="text/css"
-
href="https://fastly.jsdelivr.net/npm/bootstrap@3.3.7/dist/css/bootstrap.min.css";
- />
- <link
- rel="stylesheet"
- type="text/css"
- href="https://echarts.apache.org/zh/css/main.css";
- />
- <link
- rel="stylesheet"
-
href="https://fastly.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css";
- />
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width,initial-scale=1">
{{ HEAD }}
</head>
<body {{ BODY_ATTRS }}>
@@ -22,12 +11,6 @@
<script type="text/javascript">
document.getElementById('nav-doc').className = 'active'
</script>
- <script
src="https://fastly.jsdelivr.net/npm/jquery@2.2.4/dist/jquery.min.js";></script>
- <script
src="https://fastly.jsdelivr.net/npm/bootstrap@3.3.7/dist/js/bootstrap.min.js";></script>
- <script
- type="text/javascript"
-
src="https://fastly.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.js";
- ></script>
<script async
src="https://www.googletagmanager.com/gtag/js?id=UA-141228404-1";></script>
<script>
var _hmt = _hmt || []
diff --git a/components/markdown/Live.vue b/components/markdown/Live.vue
index ae5adfc..2fa9bb1 100644
--- a/components/markdown/Live.vue
+++ b/components/markdown/Live.vue
@@ -47,13 +47,14 @@ import CodeBlockCopyClipboard from
'./CodeBlockCopyClipboard.vue'
declare const echarts: any
-function ensureECharts() {
+function ensureECharts(locale) {
if (typeof echarts === 'undefined') {
+ const isCN = locale === 'zh'
+ const lib = process.env.NUXT_ENV_DEPLOY === 'asf' ? 'echarts' :
'echarts-nightly'
return loadScriptsAsync([
- // 'https://fastly.jsdelivr.net/npm/echarts/dist/echarts.js'
- process.env.NUXT_ENV_DEPLOY === 'asf'
- ? 'https://fastly.jsdelivr.net/npm/echarts/dist/echarts.min.js'
- : 'https://fastly.jsdelivr.net/npm/echarts-nightly/dist/echarts.min.js'
+ isCN
+ ?
`https://registry.npmmirror.com/${lib}/latest/files/dist/echarts.min.js`
+ : `https://fastly.jsdelivr.net/npm/${lib}@latest/dist/echarts.min.js`
]).then(() => {})
}
return Promise.resolve()
@@ -103,7 +104,7 @@ export default defineComponent({
if (props.height) {
container.value!.style.height = props.height + 'px'
}
- ensureECharts().then(() => {
+ ensureECharts((context.root as any).$i18n.locale).then(() => {
if (!sandbox) {
addListener(unref(previewContainer)!, resize)
sandbox = createSandbox()
diff --git a/layouts/default.vue b/layouts/default.vue
index f7eff27..a9d5c07 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -14,11 +14,6 @@
</div>
</div>
</div>
-
- <link
- rel="stylesheet"
-
href="//fastly.jsdelivr.net/npm/highlight.js@9.12.0/styles/github-gist.min.css"
- />
</div>
</div>
</template>
diff --git a/nuxt.config.js b/nuxt.config.js
index a68f067..f679c5d 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -41,19 +41,53 @@ export default {
/*
** Headers of the page
*/
- head: {
- titleTemplate: chunk => `${chunk ? chunk + ' - ' : ''}Handbook - Apache
ECharts`,
- meta: [
- { charset: 'utf-8' },
- { name: 'viewport', content: 'width=device-width, initial-scale=1' }
- ],
- link: [
- {
- rel: 'icon',
- type: 'image/x-icon',
- href: 'https://echarts.apache.org/zh/images/favicon.png'
- }
- ]
+ head() {
+ const locale = this.$i18n.locale;
+ const isCN = locale === 'zh';
+ const appName = isCN ? '使用手册' : 'Handbook'
+ return {
+ titleTemplate: chunk => `${chunk ? chunk + ' - ' : ''}${appName} -
Apache ECharts`,
+ link: [
+ {
+ rel: 'shortcut icon',
+ type: 'image/png',
+ href: `https://echarts.apache.org/${locale}/images/favicon.png`
+ },
+ {
+ rel: 'stylesheet',
+ href: isCN
+ ?
'https://lib.baomitu.com/twitter-bootstrap/3.4.1/css/bootstrap.min.css'
+ :
'https://fastly.jsdelivr.net/npm/bootstrap@3.4.1/dist/css/bootstrap.min.css'
+ },
+ {
+ rel: 'stylesheet',
+ href: `https://echarts.apache.org/${locale}/css/main.css`
+ },
+ {
+ rel: 'stylesheet',
+ href: isCN
+ ? 'https://lib.baomitu.com/docsearch.js/2.6.3/docsearch.min.css'
+ :
'https://fastly.jsdelivr.net/npm/docsearch.js@2.6.3/dist/cdn/docsearch.min.css'
+ }
+ ],
+ script: [
+ {
+ src: isCN
+ ? 'https://cdn.staticfile.org/jquery/3.7.1/jquery.min.js'
+ : 'https://fastly.jsdelivr.net/npm/jquery@3.7.1/dist/jquery.min.js'
+ },
+ {
+ src: isCN
+ ?
'https://lib.baomitu.com/twitter-bootstrap/3.4.1/js/bootstrap.min.js'
+ :
'https://fastly.jsdelivr.net/npm/bootstrap@3.4.1/dist/js/bootstrap.min.js'
+ },
+ {
+ src: isCN
+ ? 'https://lib.baomitu.com/docsearch.js/2.6.3/docsearch.min.js'
+ :
'https://fastly.jsdelivr.net/npm/docsearch.js@2.6.3/dist/cdn/docsearch.min.js'
+ }
+ ]
+ }
},
tailwindcss: {},
/*
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
