evui 3.1.47 → 3.1.48

package/dist/evui.common.js

@@ -7805,7 +7805,7 @@ $({ target: 'Number', stat: true }, {
 /***/ "9224":
 /***/ (function(module) {
 
-module.exports = JSON.parse("{\"a\":\"3.1.47\"}");
+module.exports = JSON.parse("{\"a\":\"3.1.48\"}");
 
 /***/ }),
 
@@ -30943,15 +30943,12 @@ var modules = {
      * @returns {object} data for each graph point
    */
   addData: function addData(gdata, ldata) {
-    var _gdata$value, _odata$value2, _gdata$color;
-
     var odata = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
     var bdata = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
     var isTop = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : true;
     var data;
-    var gdataValue = (_gdata$value = gdata === null || gdata === void 0 ? void 0 : gdata.value) !== null && _gdata$value !== void 0 ? _gdata$value : gdata;
-    var odataValue = (_odata$value2 = odata === null || odata === void 0 ? void 0 : odata.value) !== null && _odata$value2 !== void 0 ? _odata$value2 : odata;
-    var dataColor = (_gdata$color = gdata === null || gdata === void 0 ? void 0 : gdata.color) !== null && _gdata$color !== void 0 ? _gdata$color : odata === null || odata === void 0 ? void 0 : odata.color;
+    var gdataValue = Object.hasOwnProperty.call(gdata, 'value') ? gdata.value : gdata;
+    var odataValue = Object.hasOwnProperty.call(gdata, 'value') ? odata.value : odata;
 
     if (this.options.horizontal) {
       data = {
@@ -30973,8 +30970,10 @@ var modules = {
     data.yp = null;
     data.w = null;
     data.h = null;
-    data.dataColor = dataColor || null;
     data.isTop = isTop;
+    var gDataColor = Object.hasOwnProperty.call(gdata, 'color') ? gdata.color : null;
+    var oDataColor = Object.hasOwnProperty.call(odata, 'color') ? odata.color : null;
+    data.dataColor = gDataColor !== null && gDataColor !== void 0 ? gDataColor : oDataColor;
     return data;
   },