@visactor/vtable-calendar 1.11.6-alpha.5 → 1.11.6-alpha.6

package/dist/vtable-calendar.js

@@ -45586,7 +45586,7 @@
       constructor(container) {
         let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
-        if (super(), this.showFrozenIcon = !0, this.version = "1.11.6-alpha.5", this.id = `VTable${Date.now()}`, this.isReleased = !1, this._chartEventMap = {}, this.throttleInvalidate = throttle2(this.render.bind(this), 200), !container && "node" !== options.mode && !options.canvas) throw new Error("vtable's container is undefined");
+        if (super(), this.showFrozenIcon = !0, this.version = "1.11.6-alpha.6", this.id = `VTable${Date.now()}`, this.isReleased = !1, this._chartEventMap = {}, this.throttleInvalidate = throttle2(this.render.bind(this), 200), !container && "node" !== options.mode && !options.canvas) throw new Error("vtable's container is undefined");
         !1 === (null === (_a = options.customConfig) || void 0 === _a ? void 0 : _a.imageAnonymous) && (vglobal.isImageAnonymous = !1);
         const {
           frozenColCount = 0,
@@ -52700,22 +52700,42 @@
     }
 
     function createProgressBarCell(progressBarDefine, style, width, value, dataValue, col, row, padding, table, range) {
-      var _a, _b, _c, _d, _e, _f;
-      progressBarDefine.dependField && (dataValue = null !== (_b = null === (_a = table.getCellOriginRecord(col, row)) || void 0 === _a ? void 0 : _a[progressBarDefine.dependField]) && void 0 !== _b ? _b : dataValue), progressBarDefine.barType = null !== (_c = progressBarDefine.barType) && void 0 !== _c ? _c : "default", progressBarDefine.min = null !== (_d = getOrApply(progressBarDefine.min, {
-        col: col,
-        row: row,
-        table: table,
-        value: value,
-        dataValue: dataValue,
-        cellHeaderPaths: void 0
-      })) && void 0 !== _d ? _d : 0, progressBarDefine.max = null !== (_e = getOrApply(progressBarDefine.max, {
-        col: col,
-        row: row,
-        table: table,
-        value: value,
-        dataValue: dataValue,
-        cellHeaderPaths: void 0
-      })) && void 0 !== _e ? _e : progressBarDefine.min + 100;
+      var _a, _b, _c, _d, _e;
+      if (progressBarDefine.dependField) {
+        const dependField = getOrApply(progressBarDefine.dependField, {
+          col: col,
+          row: row,
+          table: table,
+          value: value,
+          dataValue: dataValue,
+          cellHeaderPaths: void 0
+        });
+        dataValue = null !== (_b = null === (_a = table.getCellOriginRecord(col, row)) || void 0 === _a ? void 0 : _a[dependField]) && void 0 !== _b ? _b : dataValue;
+      }
+      const barType = null !== (_c = getOrApply(progressBarDefine.barType, {
+          col: col,
+          row: row,
+          table: table,
+          value: value,
+          dataValue: dataValue,
+          cellHeaderPaths: void 0
+        })) && void 0 !== _c ? _c : "default",
+        min = null !== (_d = getOrApply(progressBarDefine.min, {
+          col: col,
+          row: row,
+          table: table,
+          value: value,
+          dataValue: dataValue,
+          cellHeaderPaths: void 0
+        })) && void 0 !== _d ? _d : 0,
+        max = null !== (_e = getOrApply(progressBarDefine.max, {
+          col: col,
+          row: row,
+          table: table,
+          value: value,
+          dataValue: dataValue,
+          cellHeaderPaths: void 0
+        })) && void 0 !== _e ? _e : min + 100;
       let height = 0;
       height = range ? table.getRowsHeight(range.start.row, range.end.row) : table.getRowHeight(row);
       let contentWidth = width,
@@ -52777,8 +52797,8 @@
         str.endsWith(svalue, "%") && (svalue = svalue.substr(0, svalue.length - 1));
         const num = Number(svalue);
         if (isNaN(num)) return percentCompleteBarGroup;
-        if ("default" === (null !== (_f = progressBarDefine.barType) && void 0 !== _f ? _f : "default")) {
-          const percentile = num < progressBarDefine.min ? 0 : num > progressBarDefine.max ? 1 : (num - progressBarDefine.min) / (progressBarDefine.max - progressBarDefine.min),
+        if ("default" === (null != barType ? barType : "default")) {
+          const percentile = num < min ? 0 : num > max ? 1 : (num - min) / (max - min),
             barMaxWidth = contentWidth,
             barTop = top + contentHeight - barHeight - barBottom;
           let barSize = Math.min(barMaxWidth * percentile, barMaxWidth);
@@ -52820,9 +52840,9 @@
               fill: fillColor
             });
           percentCompleteBarGroup.addChild(barMain);
-        } else if ("negative" === progressBarDefine.barType) {
-          const negativeRange = progressBarDefine.min < 0 ? -progressBarDefine.min : 0,
-            positiveRange = progressBarDefine.max > 0 ? progressBarDefine.max : 0,
+        } else if ("negative" === barType) {
+          const negativeRange = min < 0 ? -min : 0,
+            positiveRange = max > 0 ? max : 0,
             negativeFactor = negativeRange / (negativeRange + positiveRange),
             positiveFactor = 1 - negativeFactor,
             positiveRate = num > 0 ? num / positiveRange : 0,
@@ -52995,9 +53015,9 @@
             });
             percentCompleteBarGroup.addChild(barMark);
           }
-        } else if ("negative_no_axis" === progressBarDefine.barType) {
-          const _negativeRange = progressBarDefine.min < 0 ? -progressBarDefine.min : 0,
-            _positiveRange = progressBarDefine.max > 0 ? progressBarDefine.max : 0,
+        } else if ("negative_no_axis" === barType) {
+          const _negativeRange = min < 0 ? -min : 0,
+            _positiveRange = max > 0 ? max : 0,
             range = Math.max(_negativeRange, _positiveRange),
             percentile = 0 === range ? 0 : Math.abs(num) / range,
             barMaxWidth = contentWidth;