This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch release
in repository https://gitbox.apache.org/repos/asf/incubator-echarts-doc.git
The following commit(s) were added to refs/heads/release by this push:
new 77f0e4e fix page description not show on mobile.
77f0e4e is described below
commit 77f0e4e6a1733583c4a9f9ba3cb0e885b59785d9
Author: pissang <[email protected]>
AuthorDate: Wed Dec 25 15:13:11 2019 +0800
fix page description not show on mobile.
---
src/components/DocContent.vue | 22 ++++++++++++++++++----
src/components/DocContentItemCard.vue | 8 +-------
src/components/PropertiesList.vue | 8 +-------
src/style/mixin.scss | 2 +-
4 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/src/components/DocContent.vue b/src/components/DocContent.vue
index cd91ee2..9eae169 100644
--- a/src/components/DocContent.vue
+++ b/src/components/DocContent.vue
@@ -3,8 +3,8 @@
<h2 :id="pageId">{{pageTitle}}</h2>
<div
class="page-description"
- v-if="rootPageDescMap[pagePath]"
- v-html="rootPageDescMap[pagePath]"
+ v-if="pageDesc"
+ v-html="pageDesc"
v-highlight
></div>
@@ -74,6 +74,11 @@ export default {
return convertPathToId(this.pagePath);
},
+ pageDesc() {
+ return this.rootPageDescMap[this.pagePath]
+ || this.pageDescMap[this.pagePath]; // In mobile.
+ },
+
pageDisplayOutline() {
if (!this.shared.isMobile) {
return this.pageOutline;
@@ -151,9 +156,18 @@ export default {
this.pagePath = newPagePath;
// Fetch components.
getPageOutlineAsync(newVal).then(pageOutline => {
+ this.pageOutline = Object.freeze(Object.assign({},
pageOutline));
+
return getPageTotalDescAsync(newVal).then(pageDescMap => {
- this.pageOutline = Object.freeze(Object.assign({},
pageOutline));
- this.pageDescMap = Object.freeze(pageDescMap);
+ let newPageDescMap = {};
+ let outlineRootName = newVal.split('.')[0];
+ for (let key in pageDescMap) {
+ // Add key prefix
+ // For example: `series-bar.itemStyle` is `itemStyle`
in the storage
+ newPageDescMap[outlineRootName + '.' + key] =
pageDescMap[key];
+ }
+
+ this.pageDescMap = Object.freeze(newPageDescMap);
if (this.pageOutline.isRoot) {
this.maxDepth = 0; // No children
}
diff --git a/src/components/DocContentItemCard.vue
b/src/components/DocContentItemCard.vue
index f78ce63..de22fbd 100644
--- a/src/components/DocContentItemCard.vue
+++ b/src/components/DocContentItemCard.vue
@@ -112,13 +112,7 @@ export default {
},
desc() {
- let parts = this.nodeData.path.split('.');
- if (parts.length > 1) {
- // Remove the top page path.
- // For example: `series-bar.itemStyle` will be `itemStyle`
- parts = parts.slice(1);
- }
- return this.descMap[parts.join('.')];
+ return this.descMap[this.nodeData.path];
},
parentPath() {
diff --git a/src/components/PropertiesList.vue
b/src/components/PropertiesList.vue
index 877cf56..fa5ff0e 100644
--- a/src/components/PropertiesList.vue
+++ b/src/components/PropertiesList.vue
@@ -45,13 +45,7 @@ export default {
methods: {
getDesc(path) {
- let parts = path.split('.');
- if (parts.length > 1) {
- // Remove the top page path.
- // For example: `series-bar.itemStyle` will be `itemStyle`
- parts = parts.slice(1);
- }
- return this.descMap[parts.join('.')];
+ return this.descMap[path];
},
getName(path) {
diff --git a/src/style/mixin.scss b/src/style/mixin.scss
index 6ee0401..8c308cc 100644
--- a/src/style/mixin.scss
+++ b/src/style/mixin.scss
@@ -40,7 +40,7 @@
p {
line-height: 1.7em;
- margin: 12px 0 0 0;
+ margin: 12px 0 12px 0;
font-size: 14px;
}
pre {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
