evui 3.4.62 → 3.4.63

package/package.json

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

package/src/components/chart/scale/scale.js

@@ -100,7 +100,9 @@ class Scale {
     }
 
     const minLabel = this.getLabelFormat(minValue);
-    const maxLabel = this.getLabelFormat(maxValue, isDefaultMaxSameAsMin);
+    const maxLabel = this.getLabelFormat(maxValue, {
+      isMaxValueSameAsMin: isDefaultMaxSameAsMin,
+    });
 
     return {
       min: minValue,
@@ -319,14 +321,18 @@ class Scale {
           ticks[ix] = axisMinForLabel + (ix * stepValue);
 
           linePosition = labelCenter + aliasPixel;
-          labelText = this.getLabelFormat(Math.min(axisMax, ticks[ix]));
+          labelText = this.getLabelFormat(Math.min(axisMax, ticks[ix]), {
+            prev: ticks[ix - 1] ?? '',
+          });
 
           const isBlurredLabel = this.options?.selectLabel?.use
             && this.options?.selectLabel?.useLabelOpacity
             && (this.options.horizontal === (this.type === 'y'))
             && selectLabelInfo?.dataIndex?.length
             && !selectLabelInfo?.label
-              .map(t => this.getLabelFormat(Math.min(axisMax, t))).includes(labelText);
+              .map((t, index) => this.getLabelFormat(Math.min(axisMax, t), {
+                prev: selectLabelInfo?.label[index - 1] ?? '',
+              })).includes(labelText);
 
           const labelColor = this.labelStyle.color;
           let defaultOpacity = 1;

package/src/components/chart/scale/scale.linear.js

@@ -5,13 +5,13 @@ class LinearScale extends Scale {
   /**
    * Transforming label by designated format
    * @param {number} value                   label value
-   * @param {boolean} isMaxValueSameAsMin    is default max value same as min value
+   * @param {object} data                   data for formatting
    *
    * @returns {string} formatted label
    */
-  getLabelFormat(value, isMaxValueSameAsMin) {
+  getLabelFormat(value, data = {}) {
     if (this.formatter) {
-      const formattedLabel = this.formatter(value, isMaxValueSameAsMin);
+      const formattedLabel = this.formatter(value, data);
 
       if (typeof formattedLabel === 'string') {
         return formattedLabel;

package/src/components/chart/scale/scale.logarithmic.js

@@ -33,7 +33,9 @@ class LogarithmicScale extends Scale {
     }
 
     const minLabel = this.getLabelFormat(minValue);
-    const maxLabel = this.getLabelFormat(maxValue, isDefaultMaxSameAsMin);
+    const maxLabel = this.getLabelFormat(maxValue, {
+      isMaxValueSameAsMin: isDefaultMaxSameAsMin,
+    });
 
     return {
       min: minValue,
@@ -99,13 +101,13 @@ class LogarithmicScale extends Scale {
   /**
    * Transforming label by designated format
    * @param {number} value                   label value
-   * @param {boolean} isMaxValueSameAsMin    is default max value same as min value
+   * @param {object} data                    data for formatting
    *
    * @returns {string} formatted label
    */
-  getLabelFormat(value, isMaxValueSameAsMin) {
+  getLabelFormat(value, data = {}) {
     if (this.formatter) {
-      const formattedLabel = this.formatter(value, isMaxValueSameAsMin);
+      const formattedLabel = this.formatter(value, data);
 
       if (typeof formattedLabel === 'string') {
         return formattedLabel;

package/src/components/chart/scale/scale.step.js

@@ -347,12 +347,13 @@ class StepScale extends Scale {
    * Transforming label by designated format
    * @param {string} value       label value
    * @param {number} maxWidth    max width for each label
+   * @param {object} data        data for formatting
    *
    * @returns {string} formatted label
    */
-  getLabelFormat(value, maxWidth) {
+  getLabelFormat(value, maxWidth, data = {}) {
     if (this.formatter) {
-      const formattedLabel = this.formatter(value);
+      const formattedLabel = this.formatter(value, data);
 
       if (typeof formattedLabel === 'string') {
         return formattedLabel;

package/src/components/chart/scale/scale.time.category.js

@@ -13,13 +13,13 @@ class TimeCategoryScale extends Scale {
   /**
    * Transforming label by designated format
    * @param {number} value                   label value
-   * @param {boolean} isMaxValueSameAsMin    is default max value same as min value
+   * @param {object} data                    data for formatting
    *
    * @returns {string} formatted label
    */
-  getLabelFormat(value, isMaxValueSameAsMin) {
+  getLabelFormat(value, data = {}) {
     if (this.formatter) {
-      const formattedLabel = this.formatter(value, isMaxValueSameAsMin);
+      const formattedLabel = this.formatter(value, data);
 
       if (typeof formattedLabel === 'string') {
         return formattedLabel;
@@ -187,14 +187,24 @@ class TimeCategoryScale extends Scale {
 
       labelCenter = Math.round(startPoint + (graphGap * ix));
       linePosition = labelCenter + aliasPixel;
-      labelText = this.getLabelFormat(Math.min(axisMax, ticks[ix]));
+
+      let prev;
+      for (let jx = 0; jx < ticks.length; jx++) {
+        if (ticks[jx] !== undefined && jx !== ix) {
+          prev = ticks[jx];
+        }
+      }
+
+      labelText = this.getLabelFormat(Math.min(axisMax, ticks[ix]), { prev });
 
       const isBlurredLabel = this.options?.selectLabel?.use
         && this.options?.selectLabel?.useLabelOpacity
         && (this.options.horizontal === (this.type === 'y'))
         && selectLabelInfo?.dataIndex?.length
         && !selectLabelInfo?.label
-          .map(t => this.getLabelFormat(Math.min(axisMax, t))).includes(labelText);
+          .map((t, index) => this.getLabelFormat(Math.min(axisMax, t), {
+            prev: selectLabelInfo?.label[index - 1] ?? '',
+          })).includes(labelText);
 
       const labelColor = this.labelStyle.color;
       let defaultOpacity = 1;

package/src/components/chart/scale/scale.time.js

@@ -6,13 +6,13 @@ class TimeScale extends Scale {
   /**
    * Transforming label by designated format
    * @param {number} value                   label value
-   * @param {boolean} isMaxValueSameAsMin    is default max value same as min value
+   * @param {object} data                    data for formatting
    *
    * @returns {string} formatted label
    */
-  getLabelFormat(value, isMaxValueSameAsMin) {
+  getLabelFormat(value, data = {}) {
     if (this.formatter) {
-      const formattedLabel = this.formatter(value, isMaxValueSameAsMin);
+      const formattedLabel = this.formatter(value, data);
 
       if (typeof formattedLabel === 'string') {
         return formattedLabel;

package/src/components/grid/uses.js

@@ -1180,13 +1180,13 @@ export const contextMenuEvent = (params) => {
             });
           },
           disabled: !filterable,
-          hidden: contextInfo.hiddenColumnMenuItem?.filter,
+          hidden: contextInfo.hiddenColumnMenuItem?.filter || !filterInfo.isFiltering,
         },
         {
           text: contextInfo.columnMenuTextInfo?.hide ?? 'Hide',
           iconClass: 'ev-icon-visibility-off',
-          disabled: (!useGridSetting.value || stores.orderedColumns.length === 1) || column.fixed,
-          hidden: contextInfo.hiddenColumnMenuItem?.hide,
+          disabled: !useGridSetting.value || stores.orderedColumns.length === 1 || column.fixed,
+          hidden: contextInfo.hiddenColumnMenuItem?.hide || !useGridSetting.value,
           click: () => {
             setColumnHidden(column.field);
             emit('change-column-status', {
@@ -1201,7 +1201,7 @@ export const contextMenuEvent = (params) => {
         },
       ];
       contextInfo.columnMenuItems = [];
-      if (!sortable && !filterable) {
+      if (!sortable && !filterable && !useGridSetting.value) {
         return;
       }
       contextInfo.columnMenuItems = columnMenuItems.filter(item => !item.hidden);