Skip to content

Commit

Permalink
Merge pull request #132 from vueblocks/develop
Browse files Browse the repository at this point in the history 
feat: 极区图新增角度轴相关配置
  • Loading branch information
@xiaoluoboding
xiaoluoboding authored Nov 4, 2020
2 parents c07322e + 28807e8 commit 6783e85
Show file tree
Hide file tree
Showing 7 changed files with 127 additions and 41 deletions.
4 changes: 4 additions & 0 deletions docs/change-log.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# 更新日志

## v0.9.4

* **更新** 增强极区图角度轴配置

## v0.9.3

* **更新** 增强地图标记颜色、视觉映射效果配置
Expand Down
10 changes: 10 additions & 0 deletions docs/chart-polar.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,3 +245,13 @@
| stack | 设置数据堆叠 | Object | - | |
| areaStyle | 设置面积图，当 polarType 为 `line` 时生效 | Object | - | |
| radial | 设置数据展示方式 | Boolean | `true`：径向、`false`：环形 | 默认：`false`，代表环形 |
| clockwise | 增长方向 | Boolean | `true`：顺时针、`false`：逆时针 | 默认：`true` |
| startAngle | 起始角度 | Number | - | 默认：`90` |
| showAngleAxisLine | 角度轴轴线 | Boolean | - | 默认：`true` |
| showAngleSplitLine | 角度轴分割线 | Boolean | - | 默认：`true` |
| showAngleAxisLabel | 角度轴标签 | Boolean | - | 默认：`true` |
| angleAxisLabelType | 设置角度轴标签格式化规则 | Array | `en`、`zh`、`percentage` | `en` 英文数字规则；`zh` 中文数字规则；`percentage` 百分比 |
| angleAxisLabelDigits | 设置角度轴标签格式化后保留几位小数，配合 `yAxisLabelType` 使用 | Number/Array | 0 ~ 20 | 默认值为 0 |
| AngleAxisMax | 角度轴刻度最大值 | Array | - | 参见[文档](https://echarts.apache.org/zh/option.html#angleAxis.max) |
| AngleAxisMin | 角度轴刻度最小值 | Array | - | 参见[文档](https://echarts.apache.org/zh/option.html#angleAxis.min) |
|
52 changes: 38 additions & 14 deletions lib/ve-charts.common.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1699,13 +1699,6 @@ module.exports = require("vue");

/***/ }),

/***/ "aee1":
/***/ (function(module, exports) {

module.exports = require("echarts");

/***/ }),

/***/ "c6eb":
/***/ (function(module, __webpack_exports__, __webpack_require__) {

Expand Down Expand Up @@ -1802,6 +1795,13 @@ module.exports = function(originalModule) {
};


/***/ }),

/***/ "ddb4":
/***/ (function(module, exports) {

module.exports = require("echarts");

/***/ }),

/***/ "dff1":
Expand Down Expand Up @@ -1916,7 +1916,7 @@ if (typeof window !== 'undefined') {
/* harmony default export */ var setPublicPath = (null);

// EXTERNAL MODULE: external "echarts"
var external_echarts_ = __webpack_require__("aee1");
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":"55d6b793-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&
Expand Down Expand Up @@ -6431,7 +6431,7 @@ function getRenderInfo (elem) {
}
}

var css = ".resize-triggers{visibility:hidden;opacity:0}.resize-contract-trigger,.resize-contract-trigger:before,.resize-expand-trigger,.resize-triggers{content:\"\";position:absolute;top:0;left:0;height:100%;width:100%;overflow:hidden}.resize-contract-trigger,.resize-expand-trigger{background:#eee;overflow:auto}.resize-contract-trigger:before{width:200%;height:200%}";
var css = ".resize-triggers{visibility:hidden;opacity:0;pointer-events:none}.resize-contract-trigger,.resize-contract-trigger:before,.resize-expand-trigger,.resize-triggers{content:\"\";position:absolute;top:0;left:0;height:100%;width:100%;overflow:hidden}.resize-contract-trigger,.resize-expand-trigger{background:#eee;overflow:auto}.resize-contract-trigger:before{width:200%;height:200%}";

let total = 0;
let style = null;
Expand Down Expand Up @@ -6578,7 +6578,7 @@ function runCallbacks (elem) {
return
}
elem.__resize_listeners__.forEach(callback => {
callback.call(elem);
callback.call(elem, elem);
});
}

Expand Down Expand Up @@ -9581,11 +9581,33 @@ class chart_PolarChart extends src_BaseChart {

static getAngleAxis (settings) {
const {
radial = false
radial = false,
startAngle = 90,
clockwise = true,
showAngleAxisLine = true,
showAngleSplitLine = true,
showAngleAxisLabel = true,
angleAxisLabelType,
angleAxisLabelDigits,
AngleAxisMax,
AngleAxisMin
} = settings

return {
type: radial ? 'category' : 'value'
type: radial ? 'category' : 'value',
clockwise,
startAngle,
min: AngleAxisMin || null,
max: AngleAxisMax || null,
axisLine: { show: showAngleAxisLine },
axisTick: { show: showAngleAxisLine },
splitLine: { show: showAngleSplitLine },
axisLabel: {
show: showAngleAxisLabel,
margin: 10,
fontWeight: 400,
formatter: value => formatMeasure(angleAxisLabelType, value, angleAxisLabelDigits)
}
}
}

Expand All @@ -9606,14 +9628,16 @@ class chart_PolarChart extends src_BaseChart {
const {
polarType = 'line',
stack = null,
itemStyle = {},
...others
} = settings

const series = measures.map((item, idx) => {
const series = measures.map(({ name }, idx) => {
return {
type: polarType,
coordinateSystem: 'polar',
stack,
coordinateSystem: 'polar',
itemStyle: itemStyle[name] || {},
...others
}
})
Expand Down
62 changes: 43 additions & 19 deletions lib/ve-charts.umd.js
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
(function webpackUniversalModuleDefinition(root, factory) {
if(typeof exports === 'object' && typeof module === 'object')
module.exports = factory(require("zrender"), require("vue"), require("echarts"));
module.exports = factory(require("zrender"), require("echarts"), require("vue"));
else if(typeof define === 'function' && define.amd)
define(["zrender", "vue", "echarts"], factory);
define(["zrender", "echarts", "vue"], factory);
else if(typeof exports === 'object')
exports["VeCharts"] = factory(require("zrender"), require("vue"), require("echarts"));
exports["VeCharts"] = factory(require("zrender"), require("echarts"), require("vue"));
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_ddb4__) {
root["VeCharts"] = factory(root["zrender"], root["echarts"], root["vue"]);
})((typeof self !== 'undefined' ? self : this), function(__WEBPACK_EXTERNAL_MODULE__1523__, __WEBPACK_EXTERNAL_MODULE__296b__, __WEBPACK_EXTERNAL_MODULE__8bbf__) {
return /******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
Expand Down Expand Up @@ -265,6 +265,13 @@ module.exports = JSON.parse("{\"72\":\"朝阳区\",\"78\":\"黄浦区\",\"83\":\

/***/ }),

/***/ "296b":
/***/ (function(module, exports) {

module.exports = __WEBPACK_EXTERNAL_MODULE__296b__;

/***/ }),

/***/ "2f74":
/***/ (function(module, __webpack_exports__, __webpack_require__) {

Expand Down Expand Up @@ -1804,13 +1811,6 @@ module.exports = function(originalModule) {
};


/***/ }),

/***/ "ddb4":
/***/ (function(module, exports) {

module.exports = __WEBPACK_EXTERNAL_MODULE_ddb4__;

/***/ }),

/***/ "dff1":
Expand Down Expand Up @@ -1925,7 +1925,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__("296b");
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":"55d6b793-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&
Expand Down Expand Up @@ -6440,7 +6440,7 @@ function getRenderInfo (elem) {
}
}

var css = ".resize-triggers{visibility:hidden;opacity:0}.resize-contract-trigger,.resize-contract-trigger:before,.resize-expand-trigger,.resize-triggers{content:\"\";position:absolute;top:0;left:0;height:100%;width:100%;overflow:hidden}.resize-contract-trigger,.resize-expand-trigger{background:#eee;overflow:auto}.resize-contract-trigger:before{width:200%;height:200%}";
var css = ".resize-triggers{visibility:hidden;opacity:0;pointer-events:none}.resize-contract-trigger,.resize-contract-trigger:before,.resize-expand-trigger,.resize-triggers{content:\"\";position:absolute;top:0;left:0;height:100%;width:100%;overflow:hidden}.resize-contract-trigger,.resize-expand-trigger{background:#eee;overflow:auto}.resize-contract-trigger:before{width:200%;height:200%}";

let total = 0;
let style = null;
Expand Down Expand Up @@ -6587,7 +6587,7 @@ function runCallbacks (elem) {
return
}
elem.__resize_listeners__.forEach(callback => {
callback.call(elem);
callback.call(elem, elem);
});
}

Expand Down Expand Up @@ -9590,11 +9590,33 @@ class chart_PolarChart extends src_BaseChart {

static getAngleAxis (settings) {
const {
radial = false
radial = false,
startAngle = 90,
clockwise = true,
showAngleAxisLine = true,
showAngleSplitLine = true,
showAngleAxisLabel = true,
angleAxisLabelType,
angleAxisLabelDigits,
AngleAxisMax,
AngleAxisMin
} = settings

return {
type: radial ? 'category' : 'value'
type: radial ? 'category' : 'value',
clockwise,
startAngle,
min: AngleAxisMin || null,
max: AngleAxisMax || null,
axisLine: { show: showAngleAxisLine },
axisTick: { show: showAngleAxisLine },
splitLine: { show: showAngleSplitLine },
axisLabel: {
show: showAngleAxisLabel,
margin: 10,
fontWeight: 400,
formatter: value => formatMeasure(angleAxisLabelType, value, angleAxisLabelDigits)
}
}
}

Expand All @@ -9615,14 +9637,16 @@ class chart_PolarChart extends src_BaseChart {
const {
polarType = 'line',
stack = null,
itemStyle = {},
...others
} = settings

const series = measures.map((item, idx) => {
const series = measures.map(({ name }, idx) => {
return {
type: polarType,
coordinateSystem: 'polar',
stack,
coordinateSystem: 'polar',
itemStyle: itemStyle[name] || {},
...others
}
})
Expand Down
4 changes: 2 additions & 2 deletions lib/ve-charts.umd.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ve-charts",
"version": "0.9.3",
"version": "0.9.4",
"description": "ECharts 4.x for Vue.js 2.x.",
"main": "lib/ve-charts.umd.min.js",
"unpkg": "lib/ve-charts.umd.min.js",
Expand Down
34 changes: 29 additions & 5 deletions src/packages/polar/chart.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import BaseChart from '../../BaseChart'
import { getDataset } from '../../utils'
import { formatMeasure, getDataset } from '../../utils'

class PolarChart extends BaseChart {
static getTooltip (settings) {
Expand All @@ -20,11 +20,33 @@ class PolarChart extends BaseChart {

static getAngleAxis (settings) {
const {
radial = false
radial = false,
startAngle = 90,
clockwise = true,
showAngleAxisLine = true,
showAngleSplitLine = true,
showAngleAxisLabel = true,
angleAxisLabelType,
angleAxisLabelDigits,
AngleAxisMax,
AngleAxisMin
} = settings

return {
type: radial ? 'category' : 'value'
type: radial ? 'category' : 'value',
clockwise,
startAngle,
min: AngleAxisMin || null,
max: AngleAxisMax || null,
axisLine: { show: showAngleAxisLine },
axisTick: { show: showAngleAxisLine },
splitLine: { show: showAngleSplitLine },
axisLabel: {
show: showAngleAxisLabel,
margin: 10,
fontWeight: 400,
formatter: value => formatMeasure(angleAxisLabelType, value, angleAxisLabelDigits)
}
}
}

Expand All @@ -45,14 +67,16 @@ class PolarChart extends BaseChart {
const {
polarType = 'line',
stack = null,
itemStyle = {},
...others
} = settings

const series = measures.map((item, idx) => {
const series = measures.map(({ name }, idx) => {
return {
type: polarType,
coordinateSystem: 'polar',
stack,
coordinateSystem: 'polar',
itemStyle: itemStyle[name] || {},
...others
}
})
Expand Down

0 comments on commit 6783e85

Please sign in to comment.