evui 3.1.44 → 3.1.48

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "evui",
-  "version": "3.1.44",
+  "version": "3.1.48",
   "description": "A EXEM Library project",
   "author": "exem <dev_client@ex-em.com>",
   "license": "MIT",

package/src/components/chart/Chart.vue

@@ -85,7 +85,7 @@
 
         await watch(() => props.data, (chartData) => {
           const newData = getNormalizedData(chartData);
-          const isUpdateSeries = !isEqual(newData.series, evChart.data.series);
+          const isUpdateSeries = !isEqual(newData, evChart.data);
           evChart.data = cloneDeep(newData);
           evChart.update({
             updateSeries: isUpdateSeries,

package/src/components/chart/chart.core.js

@@ -520,7 +520,7 @@ class EvChart {
       this.seriesList = {};
       this.lastTip = { pos: null, value: null };
 
-      this.createSeriesSet(series, options.type);
+      this.createSeriesSet(series, options.type, options.horizontal);
 
       if (this.legendDOM) {
         this.resetLegend();

package/src/components/chart/element/element.bar.js

@@ -151,6 +151,7 @@ class Bar {
       this.drawBar({
         ctx,
         positions: { x, y, w, h },
+        isTop: item.isTop,
       });
 
       if (showValue.use) {
@@ -212,6 +213,7 @@ class Bar {
     this.drawBar({
       ctx,
       positions: { x, y, w, h: this.isHorizontal ? -h : h },
+      isTop: item.data.isTop,
     });
 
     if (showValue.use) {
@@ -409,7 +411,7 @@ class Bar {
     ctx.restore();
   }
 
-  drawBar({ ctx, positions }) {
+  drawBar({ ctx, positions, isTop }) {
     const isHorizontal = this.isHorizontal;
     const isStackBar = 'stackIndex' in this;
     const isBorderRadius = this.borderRadius && this.borderRadius > 0;
@@ -421,7 +423,7 @@ class Bar {
       return;
     }
 
-    if (isBorderRadius && !isStackBar) {
+    if ((!isStackBar && isBorderRadius) || (isStackBar && isBorderRadius && isTop)) {
       try {
         this.drawRoundedRect(ctx, positions);
       } catch (e) {

package/src/components/chart/helpers/helpers.canvas.js

@@ -12,7 +12,7 @@ export default {
    * @returns {any} position
    */
   calculateX(value, min, max, area, startPoint = 0) {
-    if (value === null) {
+    if (value === null || value === undefined) {
       return null;
     }
 
@@ -35,7 +35,7 @@ export default {
    * @returns {any} position
    */
   calculateSubX(value, min, max, area, startPoint = 0) {
-    if (value === null) {
+    if (value === null || value === undefined) {
       return null;
     }
 
@@ -56,7 +56,7 @@ export default {
   calculateY(value, min, max, area, startPoint = 0) {
     let calcY;
 
-    if (value === null) {
+    if (value === null || value === undefined) {
       return null;
     }
 

package/src/components/chart/model/model.store.js

@@ -26,7 +26,7 @@ const modules = {
 
             if (series && sData) {
               if (series.isExistGrp && series.stackIndex) {
-                series.data = this.addSeriesStackDS(sData, label, series.bsIds, series.stackIndex);
+                series.data = this.addSeriesStackDS(sData, label, series);
               } else {
                 series.data = this.addSeriesDS(sData, label);
               }
@@ -173,12 +173,12 @@ const modules = {
    * Take data and label to create stack data for each series
    * @param {object}  data    chart series info
    * @param {object}  label   chart label
-   * @param {array}   bsIds   stacked base data ID List
-   * @param {number}  sIdx    series ordered index
+   * @param {object}  series  series Information
    *
    * @returns {array} data for each series
    */
-  addSeriesStackDS(data, label, bsIds, sIdx = 0) {
+  addSeriesStackDS(data, label, series) {
+    const bsIds = series.bsIds; // stacked base data ID List
     const isHorizontal = this.options.horizontal;
     const sdata = [];
 
@@ -201,6 +201,8 @@ const modules = {
     };
 
     data.forEach((curr, index) => {
+      const { stackIndex, show: isShowSeries } = series;
+      const isTop = true; // is top position on stack (Stacked or not, default is true)
       const baseIndex = bsIds.length - 1 < 0 ? 0 : bsIds.length - 1;
       let bdata = getBaseDataPosition(baseIndex, index); // base(previous) series data
       let odata = curr; // current series original data
@@ -214,7 +216,7 @@ const modules = {
         }
 
         const oData = odata?.value ?? odata;
-        if (sIdx > 0) {
+        if (stackIndex > 0) {
           if (oData != null) {
             gdata = bdata + oData;
           } else {
@@ -226,7 +228,14 @@ const modules = {
           gdata = oData;
         }
 
-        sdata.push(this.addData(gdata, ldata, odata, bdata));
+        if (gdata && isShowSeries) {
+          for (let idx = baseIndex; idx > -1; idx--) {
+            const prevSeriesData = this.seriesList[bsIds[idx]];
+            prevSeriesData.data[index].isTop = false;
+          }
+        }
+
+        sdata.push(this.addData(gdata, ldata, odata, bdata, isTop));
       }
     });
 
@@ -267,14 +276,14 @@ const modules = {
    * @param {object}  ldata    label data (x-axis value for vertical chart)
    * @param {object}  odata    original data (without stacked value)
    * @param {object}  bdata    base data (stacked value)
+   * @param {boolean} isTop    is top position on stack (Stacked or not, default is true)
 
    * @returns {object} data for each graph point
    */
-  addData(gdata, ldata, odata = null, bdata = null) {
+  addData(gdata, ldata, odata = null, bdata = null, isTop = true) {
     let data;
-    const gdataValue = gdata?.value ?? gdata;
-    const odataValue = odata?.value ?? odata;
-    const dataColor = gdata?.color ?? odata?.color;
+    const gdataValue = Object.hasOwnProperty.call(gdata, 'value') ? gdata.value : gdata;
+    const odataValue = Object.hasOwnProperty.call(gdata, 'value') ? odata.value : odata;
 
     if (this.options.horizontal) {
       data = { x: gdataValue, y: ldata, o: odataValue, b: bdata };
@@ -286,7 +295,11 @@ const modules = {
     data.yp = null;
     data.w = null;
     data.h = null;
-    data.dataColor = dataColor || null;
+    data.isTop = isTop;
+
+    const gDataColor = Object.hasOwnProperty.call(gdata, 'color') ? gdata.color : null;
+    const oDataColor = Object.hasOwnProperty.call(odata, 'color') ? odata.color : null;
+    data.dataColor = gDataColor ?? oDataColor;
 
     return data;
   },

package/src/components/datePicker/uses.js

@@ -361,6 +361,7 @@ export const useShortcuts = (param) => {
     }
 
     clearShortcuts();
+    activeShortcut(targetKey);
   };
 
   watch(