fix(component): fix loading tip & xAxis overflow (#113)

baidu · Mar 25, 2020 · 2661f0b · 2661f0b
1 parent d11c45b
commit 2661f0b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/components/common/CHANGELOG.md b/components/common/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## ChangeLog
 
+## 1.1.24
+[功能修复] 修复提示接口错误时加载提示不隐藏、修复纵坐标轴溢出问题
+
 ## 1.1.23
 [功能修复] 修复nvtrend 滚动加载bug
 

diff --git a/components/common/package.json b/components/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "noahv-component",
-  "version": "1.1.23",
+  "version": "1.1.24",
   "description": "Components Library For NoahV",
   "main": "src/index",
   "scripts": {
@@ -20,7 +20,7 @@
   "dependencies": {
     "axios": "^0.18.1",
     "clipboard": "^2.0.4",
-    "echarts": "^4.2.0-rc.2",
+    "echarts": "^4.7.0",
     "iview": "3.5.1",
     "moment": "^2.19.1",
     "noahv-request": "1.0.2",

diff --git a/components/common/src/components/nv-chart/trend.vue b/components/common/src/components/nv-chart/trend.vue
@@ -35,9 +35,10 @@ const trendOptions = {
         text: ''
     },
     grid: {
-        bottom: 70,
-        left: 50,
-        right: 40
+        containLabel: true,
+        left: 0,
+        right: 5,
+        top: 15,
     },
     chart: {
         height: 250
@@ -54,7 +55,7 @@ const trendOptions = {
         boundaryGap: false,
         showMaxLabel: false,
         axisLabel: {
-            padding: [0, 10],
+            padding: [0, 10, 0, 10],
             formatter: value => {
                 let label = m(value).format('HH:mm:ss');
                 if (label === '00:00:00') {
@@ -74,6 +75,7 @@ const trendOptions = {
         {
             bottom: 24,
             start: 0,
+            end: 100,
             height: 20,
             handleStyle: {
                 color: '#d3dee5'
@@ -318,6 +320,7 @@ export default {
                     .then(response => {
                         if (response.data.success === false && response.data.message) {
                             this.showError(response.data.message);
+                            this.isLoading = true;
                             return Promise.reject(response.data.message);
                         }
                         let data = response.data.data || response.data.result;
@@ -447,7 +450,7 @@ export default {
                         silent: true,
                         symbol: 'none',
                         label: {
-                            position: 'end',
+                            position: 'insideEndTop',
                             formatter: () => {
                                 return  chartUtil.numberFormat(+this.options.threshold, 0) + (this.options.unit || '');
                             }