Merge pull request #195 from vueblocks/barPieChart

xiaojingha · web-flow · commit 5db59c106b4b · 2023-12-15T17:50:25.000+08:00
chore: v0.9.14
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## [0.9.14](https://github.com/vueblocks/ve-charts/compare/v0.9.13...v0.9.14) (2023-12-14)
+
+
+### Bug Fixes
+
+* 优化悬浮图的默认位置信息，确保其内容不会被遮挡或超出图表容器 ([3a05b9f](https://github.com/vueblocks/ve-charts/commit/3a05b9f2932a2684720122632e925e552542d370))
+
+
 ## [0.9.13](https://github.com/vueblocks/ve-charts/compare/v0.9.12...v0.9.13) (2023-12-14)
 
 
diff --git a/docs/change-log.md b/docs/change-log.md
@@ -1,5 +1,13 @@
 # 更新日志
 
+## v0.9.14
+
+* **优化**：优化悬浮图的默认位置信息，确保其内容不会被遮挡或超出图表容器
+
+### PRS
+
+* [#194](https://github.com/vueblocks/ve-charts/pull/194) by [xiaojingha](https://github.com/xiaojingha)
+
 ## v0.9.13
 
 * **新增** 扩展组件：柱图悬浮饼图
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) {
 };
 
 
-/***/ }),
-
-/***/ "df8e":
-/***/ (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__("df8e");
+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&
@@ -10469,19 +10469,15 @@ class chart_BarpieChart extends src_BaseChart {
       axisPointer: { // 坐标轴指示器，坐标轴触发有效
         type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
       },
-      position: function (pos, params, dom, rect, size) {
-        // 鼠标在左侧时 tooltip 显示到右侧，鼠标在右侧时 tooltip 显示到左侧。
-        let obj = { top: pos[1] - 200 }
-        obj[['left', 'right'][+(pos[0] < size.viewSize[0] / 2)]] = 5
-        return obj
-      },
       show: true,
       enterable: true,
       hideDelay: 500,
       backgroundColor: 'rgb(255,255,255,0.94)',
       textStyle: {
         color: 'black'
       },
+      transitionDuration: 0.4,
+      confine: true,
       ...tooltipOptions,
       formatter: (params) => {
         let dax = params[0].dataIndex
diff --git a/lib/ve-charts.umd.js b/lib/ve-charts.umd.js
@@ -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("echarts"), require("zrender"), require("vue"));
 	else if(typeof define === 'function' && define.amd)
-		define(["zrender", "vue", "echarts"], factory);
+		define(["echarts", "zrender", "vue"], factory);
 	else if(typeof exports === 'object')
-		exports["VeCharts"] = factory(require("zrender"), require("vue"), require("echarts"));
+		exports["VeCharts"] = factory(require("echarts"), require("zrender"), 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_aee1__) {
+		root["VeCharts"] = factory(root["echarts"], root["zrender"], root["vue"]);
+})((typeof self !== 'undefined' ? self : this), function(__WEBPACK_EXTERNAL_MODULE__1104__, __WEBPACK_EXTERNAL_MODULE__1523__, __WEBPACK_EXTERNAL_MODULE__8bbf__) {
 return /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -132,6 +132,13 @@ var update = add("d14a69d0", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
+/***/ "1104":
+/***/ (function(module, exports) {
+
+module.exports = __WEBPACK_EXTERNAL_MODULE__1104__;
+
+/***/ }),
+
 /***/ "137f":
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -1708,13 +1715,6 @@ module.exports = __WEBPACK_EXTERNAL_MODULE__8bbf__;
 
 /***/ }),
 
-/***/ "aee1":
-/***/ (function(module, exports) {
-
-module.exports = __WEBPACK_EXTERNAL_MODULE_aee1__;
-
-/***/ }),
-
 /***/ "c6eb":
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -1925,7 +1925,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__("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&
@@ -10478,19 +10478,15 @@ class chart_BarpieChart extends src_BaseChart {
       axisPointer: { // 坐标轴指示器，坐标轴触发有效
         type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
       },
-      position: function (pos, params, dom, rect, size) {
-        // 鼠标在左侧时 tooltip 显示到右侧，鼠标在右侧时 tooltip 显示到左侧。
-        let obj = { top: pos[1] - 200 }
-        obj[['left', 'right'][+(pos[0] < size.viewSize[0] / 2)]] = 5
-        return obj
-      },
       show: true,
       enterable: true,
       hideDelay: 500,
       backgroundColor: 'rgb(255,255,255,0.94)',
       textStyle: {
         color: 'black'
       },
+      transitionDuration: 0.4,
+      confine: true,
       ...tooltipOptions,
       formatter: (params) => {
         let dax = params[0].dataIndex
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.13",
+  "version": "0.9.14",
   "description": "ECharts 4.x for Vue.js 2.x.",
   "main": "lib/ve-charts.umd.min.js",
   "unpkg": "lib/ve-charts.umd.min.js",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "ve-charts",`
`3`		`- "version": "0.9.13",`
	`3`	`+ "version": "0.9.14",`
`4`	`4`	`"description": "ECharts 4.x for Vue.js 2.x.",`
`5`	`5`	`"main": "lib/ve-charts.umd.min.js",`
`6`	`6`	`"unpkg": "lib/ve-charts.umd.min.js",`