Merge pull request #145 from vueblocks/develop

Develop
vueblocks · Mar 25, 2021 · 7f167b4 · 7f167b4
2 parents b6593c3 + 9b22b82
commit 7f167b4
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 26 deletions.
diff --git a/docs/change-log.md b/docs/change-log.md
@@ -1,5 +1,13 @@
 # 更新日志
 
+## v0.9.7
+
+* **修复** 雷达图刻度轴不可取消的问题
+
+### PRS
+
+* [#144](https://github.com/vueblocks/ve-charts/pull/142) by [liweina-fans](https://github.com/liweina-fans)
+
 ## v0.9.6
 
 * **新增** 柱状图/折线图新增维度轴分隔线设置

diff --git a/lib/ve-charts.common.js b/lib/ve-charts.common.js
@@ -123,6 +123,13 @@ var update = add("d14a69d0", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
+/***/ "1104":
+/***/ (function(module, exports) {
+
+module.exports = require("echarts");
+
+/***/ }),
+
 /***/ "137f":
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -1795,13 +1802,6 @@ module.exports = function(originalModule) {
 };
 
 
-/***/ }),
-
-/***/ "ddb4":
-/***/ (function(module, exports) {
-
-module.exports = require("echarts");
-
 /***/ }),
 
 /***/ "dff1":
@@ -1916,7 +1916,7 @@ if (typeof window !== 'undefined') {
 /* harmony default export */ var setPublicPath = (null);
 
 // EXTERNAL MODULE: external "echarts"
-var external_echarts_ = __webpack_require__("ddb4");
+var external_echarts_ = __webpack_require__("1104");
 var external_echarts_default = /*#__PURE__*/__webpack_require__.n(external_echarts_);
 
 // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"45371285-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/HocEcharts.vue?vue&type=template&id=1a0a63b4&
@@ -9077,7 +9077,15 @@ class chart_RadarChart extends src_BaseChart {
     return series
   }
 
-  static getRadiusPolar ({ data, settings }) {
+  static getRadiusPolar ({ data, settings, tickMarkVisible }) {
+    if (!tickMarkVisible) {
+      return {
+        polar: null,
+        radiusAxis: null,
+        angleAxis: null
+      }
+    }
+
     const { splitNumber = 5, offsetY = '50%', radius = '75%', axisLabel = {}, axisLine = {} } = settings
     const max = data.dimensions[0].max
     const min = 0
@@ -9128,7 +9136,7 @@ class chart_RadarChart extends src_BaseChart {
 
     const series = chart_RadarChart.getRadarSeries({ data, settings })
 
-    const polarOptions = tickMarkVisible ? chart_RadarChart.getRadiusPolar({ data, settings }) : {}
+    const polarOptions = chart_RadarChart.getRadiusPolar({ data, settings, tickMarkVisible })
 
     // build echarts options
     const options = {

diff --git a/lib/ve-charts.umd.js b/lib/ve-charts.umd.js
@@ -7,7 +7,7 @@
 		exports["VeCharts"] = factory(require("zrender"), require("vue"), require("echarts"));
 	else
 		root["VeCharts"] = factory(root["zrender"], root["vue"], root["echarts"]);
-})((typeof self !== 'undefined' ? self : this), function(__WEBPACK_EXTERNAL_MODULE__1523__, __WEBPACK_EXTERNAL_MODULE__8bbf__, __WEBPACK_EXTERNAL_MODULE_e2b6__) {
+})((typeof self !== 'undefined' ? self : this), function(__WEBPACK_EXTERNAL_MODULE__1523__, __WEBPACK_EXTERNAL_MODULE__8bbf__, __WEBPACK_EXTERNAL_MODULE_ddb4__) {
 return /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -1804,6 +1804,13 @@ module.exports = function(originalModule) {
 };
 
 
+/***/ }),
+
+/***/ "ddb4":
+/***/ (function(module, exports) {
+
+module.exports = __WEBPACK_EXTERNAL_MODULE_ddb4__;
+
 /***/ }),
 
 /***/ "dff1":
@@ -1851,13 +1858,6 @@ function cloneBuffer(buffer, isDeep) {
 
 /***/ }),
 
-/***/ "e2b6":
-/***/ (function(module, exports) {
-
-module.exports = __WEBPACK_EXTERNAL_MODULE_e2b6__;
-
-/***/ }),
-
 /***/ "f6fd":
 /***/ (function(module, exports) {
 
@@ -1925,7 +1925,7 @@ if (typeof window !== 'undefined') {
 /* harmony default export */ var setPublicPath = (null);
 
 // EXTERNAL MODULE: external "echarts"
-var external_echarts_ = __webpack_require__("e2b6");
+var external_echarts_ = __webpack_require__("ddb4");
 var external_echarts_default = /*#__PURE__*/__webpack_require__.n(external_echarts_);
 
 // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"45371285-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/HocEcharts.vue?vue&type=template&id=1a0a63b4&
@@ -9086,7 +9086,15 @@ class chart_RadarChart extends src_BaseChart {
     return series
   }
 
-  static getRadiusPolar ({ data, settings }) {
+  static getRadiusPolar ({ data, settings, tickMarkVisible }) {
+    if (!tickMarkVisible) {
+      return {
+        polar: null,
+        radiusAxis: null,
+        angleAxis: null
+      }
+    }
+
     const { splitNumber = 5, offsetY = '50%', radius = '75%', axisLabel = {}, axisLine = {} } = settings
     const max = data.dimensions[0].max
     const min = 0
@@ -9137,7 +9145,7 @@ class chart_RadarChart extends src_BaseChart {
 
     const series = chart_RadarChart.getRadarSeries({ data, settings })
 
-    const polarOptions = tickMarkVisible ? chart_RadarChart.getRadiusPolar({ data, settings }) : {}
+    const polarOptions = chart_RadarChart.getRadiusPolar({ data, settings, tickMarkVisible })
 
     // build echarts options
     const options = {

diff --git a/lib/ve-charts.umd.min.js b/lib/ve-charts.umd.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ve-charts",
-  "version": "0.9.6",
+  "version": "0.9.7",
   "description": "ECharts 4.x for Vue.js 2.x.",
   "main": "lib/ve-charts.umd.min.js",
   "unpkg": "lib/ve-charts.umd.min.js",

diff --git a/src/packages/radar/chart.js b/src/packages/radar/chart.js
@@ -75,7 +75,15 @@ class RadarChart extends BaseChart {
     return series
   }
 
-  static getRadiusPolar ({ data, settings }) {
+  static getRadiusPolar ({ data, settings, tickMarkVisible }) {
+    if (!tickMarkVisible) {
+      return {
+        polar: null,
+        radiusAxis: null,
+        angleAxis: null
+      }
+    }
+
     const { splitNumber = 5, offsetY = '50%', radius = '75%', axisLabel = {}, axisLine = {} } = settings
     const max = data.dimensions[0].max
     const min = 0
@@ -126,7 +134,7 @@ class RadarChart extends BaseChart {
 
     const series = RadarChart.getRadarSeries({ data, settings })
 
-    const polarOptions = tickMarkVisible ? RadarChart.getRadiusPolar({ data, settings }) : {}
+    const polarOptions = RadarChart.getRadiusPolar({ data, settings, tickMarkVisible })
 
     // build echarts options
     const options = {