evui 3.1.46 → 3.1.50

package/dist/evui.common.js

@@ -7805,7 +7805,7 @@ $({ target: 'Number', stat: true }, {
 /***/ "9224":
 /***/ (function(module) {
 
-module.exports = JSON.parse("{\"a\":\"3.1.46\"}");
+module.exports = JSON.parse("{\"a\":\"3.1.50\"}");
 
 /***/ }),
 
@@ -30943,15 +30943,30 @@ var modules = {
      * @returns {object} data for each graph point
    */
   addData: function addData(gdata, ldata) {
-    var _gdata$value, _odata$value2, _gdata$color;
+    var _gdataColor;
 
     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 = null;
+    var odataValue = null;
+    var gdataColor = null;
+    var odataColor = null;
+
+    if (gdata !== null && _typeof(gdata) === 'object') {
+      gdataValue = gdata.value;
+      gdataColor = gdata.color;
+    } else {
+      gdataValue = gdata;
+    }
+
+    if (odata !== null && _typeof(odata) === 'object') {
+      odataValue = odata.value;
+      odataColor = odata.color;
+    } else {
+      odataValue = odata;
+    }
 
     if (this.options.horizontal) {
       data = {
@@ -30973,7 +30988,7 @@ var modules = {
     data.yp = null;
     data.w = null;
     data.h = null;
-    data.dataColor = dataColor || null;
+    data.dataColor = (_gdataColor = gdataColor) !== null && _gdataColor !== void 0 ? _gdataColor : odataColor;
     data.isTop = isTop;
     return data;
   },
@@ -33832,7 +33847,7 @@ var element_bar_Bar = /*#__PURE__*/function () {
         return;
       }
 
-      if (isBorderRadius && isStackBar && isTop) {
+      if (!isStackBar && isBorderRadius || isStackBar && isBorderRadius && isTop) {
         try {
           this.drawRoundedRect(ctx, positions);
         } catch (e) {
@@ -39133,7 +39148,7 @@ var chart_core_EvChart = /*#__PURE__*/function () {
           pos: null,
           value: null
         };
-        this.createSeriesSet(series, options.type);
+        this.createSeriesSet(series, options.type, options.horizontal);
 
         if (this.legendDOM) {
           this.resetLegend();