evui 3.1.48 → 3.1.49

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -7805,7 +7805,7 @@ $({ target: 'Number', stat: true }, {
7805
7805
  /***/ "9224":
7806
7806
  /***/ (function(module) {
7807
7807
 
7808
- module.exports = JSON.parse("{\"a\":\"3.1.48\"}");
7808
+ module.exports = JSON.parse("{\"a\":\"3.1.49\"}");
7809
7809
 
7810
7810
  /***/ }),
7811
7811
 
@@ -30943,12 +30943,26 @@ var modules = {
30943
30943
  * @returns {object} data for each graph point
30944
30944
  */
30945
30945
  addData: function addData(gdata, ldata) {
30946
+ var _gdataColor;
30947
+
30946
30948
  var odata = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
30947
30949
  var bdata = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
30948
30950
  var isTop = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : true;
30949
30951
  var data;
30950
- var gdataValue = Object.hasOwnProperty.call(gdata, 'value') ? gdata.value : gdata;
30951
- var odataValue = Object.hasOwnProperty.call(gdata, 'value') ? odata.value : odata;
30952
+ var gdataValue = null;
30953
+ var odataValue = null;
30954
+ var gdataColor = null;
30955
+ var odataColor = null;
30956
+
30957
+ if (gdata) {
30958
+ gdataValue = Object.hasOwnProperty.call(gdata, 'value') ? gdata.value : gdata;
30959
+ gdataColor = Object.hasOwnProperty.call(gdata, 'color') ? gdata.color : null;
30960
+ }
30961
+
30962
+ if (odata) {
30963
+ odataValue = Object.hasOwnProperty.call(odata, 'value') ? odata.value : odata;
30964
+ odataColor = Object.hasOwnProperty.call(odata, 'color') ? odata.color : null;
30965
+ }
30952
30966
 
30953
30967
  if (this.options.horizontal) {
30954
30968
  data = {
@@ -30970,10 +30984,8 @@ var modules = {
30970
30984
  data.yp = null;
30971
30985
  data.w = null;
30972
30986
  data.h = null;
30987
+ data.dataColor = (_gdataColor = gdataColor) !== null && _gdataColor !== void 0 ? _gdataColor : odataColor;
30973
30988
  data.isTop = isTop;
30974
- var gDataColor = Object.hasOwnProperty.call(gdata, 'color') ? gdata.color : null;
30975
- var oDataColor = Object.hasOwnProperty.call(odata, 'color') ? odata.color : null;
30976
- data.dataColor = gDataColor !== null && gDataColor !== void 0 ? gDataColor : oDataColor;
30977
30989
  return data;
30978
30990
  },
30979
30991