web-core-tcm 0.0.61 → 0.0.63

package/dist/node_modules/echarts/lib/label/labelStyle.js

@@ -1,149 +1,150 @@
-import L from "../../../zrender/lib/graphic/Text.js";
-import { trim as _, extend as x, keys as X, retrieve2 as w, isFunction as Y } from "../../../zrender/lib/core/util.js";
-import { DISPLAY_STATES as D, SPECIAL_STATES as C } from "../util/states.js";
+import B from "../../../zrender/lib/graphic/Text.js";
+import { isFunction as x, retrieve2 as w, extend as _, keys as X, trim as Y } from "../../../zrender/lib/core/util.js";
+import { SPECIAL_STATES as T, DISPLAY_STATES as I } from "../util/states.js";
+import "../util/log.js";
 import { makeInner as z, interpolateRawValues as H } from "../util/model.js";
 import "../util/graphic.js";
 import { initProps as G, updateProps as J } from "../animation/basicTransition.js";
-var O = {};
-function W(r, n) {
-  for (var a = 0; a < C.length; a++) {
-    var i = C[a], e = n[i], o = r.ensureState(i);
-    o.style = o.style || {}, o.style.text = e;
+var p = {};
+function W(r, e) {
+  for (var a = 0; a < T.length; a++) {
+    var n = T[a], o = e[n], i = r.ensureState(n);
+    i.style = i.style || {}, i.style.text = o;
   }
-  var u = r.currentStates.slice();
+  var t = r.currentStates.slice();
   r.clearStates(!0), r.setStyle({
-    text: n.normal
-  }), r.useStates(u, !0);
+    text: e.normal
+  }), r.useStates(t, !0);
 }
-function P(r, n, a) {
-  var i = r.labelFetcher, e = r.labelDataIndex, o = r.labelDimIndex, u = n.normal, f;
-  i && (f = i.getFormattedLabel(e, "normal", null, o, u && u.get("formatter"), a != null ? {
+function L(r, e, a) {
+  var n = r.labelFetcher, o = r.labelDataIndex, i = r.labelDimIndex, t = e.normal, f;
+  n && (f = n.getFormattedLabel(o, "normal", null, i, t && t.get("formatter"), a != null ? {
     interpolatedValue: a
-  } : null)), f == null && (f = Y(r.defaultText) ? r.defaultText(e, r, a) : r.defaultText);
+  } : null)), f == null && (f = x(r.defaultText) ? r.defaultText(o, r, a) : r.defaultText);
   for (var l = {
     normal: f
-  }, v = 0; v < C.length; v++) {
-    var t = C[v], h = n[t];
-    l[t] = w(i ? i.getFormattedLabel(e, t, null, o, h && h.get("formatter")) : null, f);
+  }, v = 0; v < T.length; v++) {
+    var u = T[v], h = e[u];
+    l[u] = w(n ? n.getFormattedLabel(o, u, null, i, h && h.get("formatter")) : null, f);
   }
   return l;
 }
-function E(r, n, a, i) {
-  a = a || O;
-  for (var e = r instanceof L, o = !1, u = 0; u < D.length; u++) {
-    var f = n[D[u]];
+function M(r, e, a, n) {
+  a = a || p;
+  for (var o = r instanceof B, i = !1, t = 0; t < I.length; t++) {
+    var f = e[I[t]];
     if (f && f.getShallow("show")) {
-      o = !0;
+      i = !0;
       break;
     }
   }
-  var l = e ? r : r.getTextContent();
-  if (o) {
-    e || (l || (l = new L(), r.setTextContent(l)), r.stateProxy && (l.stateProxy = r.stateProxy));
-    var v = P(a, n), t = n.normal, h = !!t.getShallow("show"), g = A(t, i && i.normal, a, !1, !e);
-    g.text = v.normal, e || r.setTextConfig(F(t, a, !1));
-    for (var u = 0; u < C.length; u++) {
-      var T = C[u], f = n[T];
+  var l = o ? r : r.getTextContent();
+  if (i) {
+    o || (l || (l = new B(), r.setTextContent(l)), r.stateProxy && (l.stateProxy = r.stateProxy));
+    var v = L(a, e), u = e.normal, h = !!u.getShallow("show"), g = k(u, n && n.normal, a, !1, !o);
+    g.text = v.normal, o || r.setTextConfig(D(u, a, !1));
+    for (var t = 0; t < T.length; t++) {
+      var C = T[t], f = e[C];
       if (f) {
-        var m = l.ensureState(T), s = !!w(f.getShallow("show"), h);
-        if (s !== h && (m.ignore = !s), m.style = A(f, i && i[T], a, !0, !e), m.style.text = v[T], !e) {
-          var c = r.ensureState(T);
-          c.textConfig = F(f, a, !0);
+        var m = l.ensureState(C), s = !!w(f.getShallow("show"), h);
+        if (s !== h && (m.ignore = !s), m.style = k(f, n && n[C], a, !0, !o), m.style.text = v[C], !o) {
+          var c = r.ensureState(C);
+          c.textConfig = D(f, a, !0);
         }
       }
     }
-    l.silent = !!t.getShallow("silent"), l.style.x != null && (g.x = l.style.x), l.style.y != null && (g.y = l.style.y), l.ignore = !h, l.useStyle(g), l.dirty(), a.enableTextSetter && (B(l).setLabelText = function(d) {
-      var b = P(a, n, d);
+    l.silent = !!u.getShallow("silent"), l.style.x != null && (g.x = l.style.x), l.style.y != null && (g.y = l.style.y), l.ignore = !h, l.useStyle(g), l.dirty(), a.enableTextSetter && (O(l).setLabelText = function(d) {
+      var b = L(a, e, d);
       W(l, b);
     });
   } else l && (l.ignore = !0);
   r.dirty();
 }
-function y(r, n) {
-  n = n || "label";
+function N(r, e) {
+  e = e || "label";
   for (var a = {
-    normal: r.getModel(n)
-  }, i = 0; i < C.length; i++) {
-    var e = C[i];
-    a[e] = r.getModel([e, n]);
+    normal: r.getModel(e)
+  }, n = 0; n < T.length; n++) {
+    var o = T[n];
+    a[o] = r.getModel([o, e]);
   }
   return a;
 }
-function A(r, n, a, i, e) {
-  var o = {};
-  return Z(o, r, a, i, e), n && x(o, n), o;
+function k(r, e, a, n, o) {
+  var i = {};
+  return Z(i, r, a, n, o), e && _(i, e), i;
 }
-function F(r, n, a) {
-  n = n || {};
-  var i = {}, e, o = r.getShallow("rotate"), u = w(r.getShallow("distance"), a ? null : 5), f = r.getShallow("offset");
-  return e = r.getShallow("position") || (a ? null : "inside"), e === "outside" && (e = n.defaultOutsidePosition || "top"), e != null && (i.position = e), f != null && (i.offset = f), o != null && (o *= Math.PI / 180, i.rotation = o), u != null && (i.distance = u), i.outsideFill = r.get("color") === "inherit" ? n.inheritColor || null : "auto", i;
+function D(r, e, a) {
+  e = e || {};
+  var n = {}, o, i = r.getShallow("rotate"), t = w(r.getShallow("distance"), a ? null : 5), f = r.getShallow("offset");
+  return o = r.getShallow("position") || (a ? null : "inside"), o === "outside" && (o = e.defaultOutsidePosition || "top"), o != null && (n.position = o), f != null && (n.offset = f), i != null && (i *= Math.PI / 180, n.rotation = i), t != null && (n.distance = t), n.outsideFill = r.get("color") === "inherit" ? e.inheritColor || null : "auto", n;
 }
-function Z(r, n, a, i, e) {
-  a = a || O;
-  var o = n.ecModel, u = o && o.option.textStyle, f = j(n), l;
+function Z(r, e, a, n, o) {
+  a = a || p;
+  var i = e.ecModel, t = i && i.option.textStyle, f = j(e), l;
   if (f) {
     l = {};
     for (var v in f)
       if (f.hasOwnProperty(v)) {
-        var t = n.getModel(["rich", v]);
-        V(l[v] = {}, t, u, a, i, e, !1, !0);
+        var u = e.getModel(["rich", v]);
+        V(l[v] = {}, u, t, a, n, o, !1, !0);
       }
   }
   l && (r.rich = l);
-  var h = n.get("overflow");
+  var h = e.get("overflow");
   h && (r.overflow = h);
-  var g = n.get("minMargin");
-  g != null && (r.margin = g), V(r, n, u, a, i, e, !0, !1);
+  var g = e.get("minMargin");
+  g != null && (r.margin = g), V(r, e, t, a, n, o, !0, !1);
 }
 function j(r) {
-  for (var n; r && r !== r.ecModel; ) {
-    var a = (r.option || O).rich;
+  for (var e; r && r !== r.ecModel; ) {
+    var a = (r.option || p).rich;
     if (a) {
-      n = n || {};
-      for (var i = X(a), e = 0; e < i.length; e++) {
-        var o = i[e];
-        n[o] = 1;
+      e = e || {};
+      for (var n = X(a), o = 0; o < n.length; o++) {
+        var i = n[o];
+        e[i] = 1;
       }
     }
     r = r.parentModel;
   }
-  return n;
+  return e;
 }
-var k = ["fontStyle", "fontWeight", "fontSize", "fontFamily", "textShadowColor", "textShadowBlur", "textShadowOffsetX", "textShadowOffsetY"], p = ["align", "lineHeight", "width", "height", "tag", "verticalAlign", "ellipsis"], R = ["padding", "borderWidth", "borderRadius", "borderDashOffset", "backgroundColor", "borderColor", "shadowColor", "shadowBlur", "shadowOffsetX", "shadowOffsetY"];
-function V(r, n, a, i, e, o, u, f) {
-  a = !e && a || O;
-  var l = i && i.inheritColor, v = n.getShallow("color"), t = n.getShallow("textBorderColor"), h = w(n.getShallow("opacity"), a.opacity);
-  (v === "inherit" || v === "auto") && (l ? v = l : v = null), (t === "inherit" || t === "auto") && (l ? t = l : t = null), o || (v = v || a.color, t = t || a.textBorderColor), v != null && (r.fill = v), t != null && (r.stroke = t);
-  var g = w(n.getShallow("textBorderWidth"), a.textBorderWidth);
+var R = ["fontStyle", "fontWeight", "fontSize", "fontFamily", "textShadowColor", "textShadowBlur", "textShadowOffsetX", "textShadowOffsetY"], A = ["align", "lineHeight", "width", "height", "tag", "verticalAlign", "ellipsis"], F = ["padding", "borderWidth", "borderRadius", "borderDashOffset", "backgroundColor", "borderColor", "shadowColor", "shadowBlur", "shadowOffsetX", "shadowOffsetY"];
+function V(r, e, a, n, o, i, t, f) {
+  a = !o && a || p;
+  var l = n && n.inheritColor, v = e.getShallow("color"), u = e.getShallow("textBorderColor"), h = w(e.getShallow("opacity"), a.opacity);
+  (v === "inherit" || v === "auto") && (l ? v = l : v = null), (u === "inherit" || u === "auto") && (l ? u = l : u = null), i || (v = v || a.color, u = u || a.textBorderColor), v != null && (r.fill = v), u != null && (r.stroke = u);
+  var g = w(e.getShallow("textBorderWidth"), a.textBorderWidth);
   g != null && (r.lineWidth = g);
-  var T = w(n.getShallow("textBorderType"), a.textBorderType);
-  T != null && (r.lineDash = T);
-  var m = w(n.getShallow("textBorderDashOffset"), a.textBorderDashOffset);
-  m != null && (r.lineDashOffset = m), !e && h == null && !f && (h = i && i.defaultOpacity), h != null && (r.opacity = h), !e && !o && r.fill == null && i.inheritColor && (r.fill = i.inheritColor);
-  for (var s = 0; s < k.length; s++) {
-    var c = k[s], d = w(n.getShallow(c), a[c]);
+  var C = w(e.getShallow("textBorderType"), a.textBorderType);
+  C != null && (r.lineDash = C);
+  var m = w(e.getShallow("textBorderDashOffset"), a.textBorderDashOffset);
+  m != null && (r.lineDashOffset = m), !o && h == null && !f && (h = n && n.defaultOpacity), h != null && (r.opacity = h), !o && !i && r.fill == null && n.inheritColor && (r.fill = n.inheritColor);
+  for (var s = 0; s < R.length; s++) {
+    var c = R[s], d = w(e.getShallow(c), a[c]);
     d != null && (r[c] = d);
   }
-  for (var s = 0; s < p.length; s++) {
-    var c = p[s], d = n.getShallow(c);
+  for (var s = 0; s < A.length; s++) {
+    var c = A[s], d = e.getShallow(c);
     d != null && (r[c] = d);
   }
   if (r.verticalAlign == null) {
-    var b = n.getShallow("baseline");
+    var b = e.getShallow("baseline");
     b != null && (r.verticalAlign = b);
   }
-  if (!u || !i.disableBox) {
-    for (var s = 0; s < R.length; s++) {
-      var c = R[s], d = n.getShallow(c);
+  if (!t || !n.disableBox) {
+    for (var s = 0; s < F.length; s++) {
+      var c = F[s], d = e.getShallow(c);
       d != null && (r[c] = d);
     }
-    var I = n.getShallow("borderType");
-    I != null && (r.borderDash = I), (r.backgroundColor === "auto" || r.backgroundColor === "inherit") && l && (r.backgroundColor = l), (r.borderColor === "auto" || r.borderColor === "inherit") && l && (r.borderColor = l);
+    var P = e.getShallow("borderType");
+    P != null && (r.borderDash = P), (r.backgroundColor === "auto" || r.backgroundColor === "inherit") && l && (r.backgroundColor = l), (r.borderColor === "auto" || r.borderColor === "inherit") && l && (r.borderColor = l);
   }
 }
-function M(r, n) {
-  var a = n && n.getModel("textStyle");
-  return _([
+function rr(r, e) {
+  var a = e && e.getModel("textStyle");
+  return Y([
     // FIXME in node-canvas fontWeight is before fontStyle
     r.fontStyle || a && a.getShallow("fontStyle") || "",
     r.fontWeight || a && a.getShallow("fontWeight") || "",
@@ -151,43 +152,43 @@ function M(r, n) {
     r.fontFamily || a && a.getShallow("fontFamily") || "sans-serif"
   ].join(" "));
 }
-var B = z();
-function N(r, n, a, i) {
+var O = z();
+function er(r, e, a, n) {
   if (r) {
-    var e = B(r);
-    e.prevValue = e.value, e.value = a;
-    var o = n.normal;
-    e.valueAnimation = o.get("valueAnimation"), e.valueAnimation && (e.precision = o.get("precision"), e.defaultInterpolatedText = i, e.statesModels = n);
+    var o = O(r);
+    o.prevValue = o.value, o.value = a;
+    var i = e.normal;
+    o.valueAnimation = i.get("valueAnimation"), o.valueAnimation && (o.precision = i.get("precision"), o.defaultInterpolatedText = n, o.statesModels = e);
   }
 }
-function rr(r, n, a, i, e) {
-  var o = B(r);
-  if (!o.valueAnimation || o.prevValue === o.value)
+function ar(r, e, a, n, o) {
+  var i = O(r);
+  if (!i.valueAnimation || i.prevValue === i.value)
     return;
-  var u = o.defaultInterpolatedText, f = w(o.interpolatedValue, o.prevValue), l = o.value;
-  function v(t) {
-    var h = H(a, o.precision, f, l, t);
-    o.interpolatedValue = t === 1 ? null : h;
-    var g = P({
-      labelDataIndex: n,
-      labelFetcher: e,
-      defaultText: u ? u(h) : h + ""
-    }, o.statesModels, h);
+  var t = i.defaultInterpolatedText, f = w(i.interpolatedValue, i.prevValue), l = i.value;
+  function v(u) {
+    var h = H(a, i.precision, f, l, u);
+    i.interpolatedValue = u === 1 ? null : h;
+    var g = L({
+      labelDataIndex: e,
+      labelFetcher: o,
+      defaultText: t ? t(h) : h + ""
+    }, i.statesModels, h);
     W(r, g);
   }
-  r.percent = 0, (o.prevValue == null ? G : J)(r, {
+  r.percent = 0, (i.prevValue == null ? G : J)(r, {
     // percent is used to prevent animation from being aborted #15916
     percent: 1
-  }, i, n, null, v);
+  }, n, e, null, v);
 }
 export {
-  rr as animateLabelValue,
-  F as createTextConfig,
-  A as createTextStyle,
-  M as getFont,
-  y as getLabelStatesModels,
-  B as labelInner,
-  E as setLabelStyle,
+  ar as animateLabelValue,
+  D as createTextConfig,
+  k as createTextStyle,
+  rr as getFont,
+  N as getLabelStatesModels,
+  O as labelInner,
+  M as setLabelStyle,
   W as setLabelText,
-  N as setLabelValueAnimation
+  er as setLabelValueAnimation
 };

package/dist/node_modules/echarts/lib/layout/barGrid.js

@@ -1,43 +1,43 @@
-import { each as l, keys as Y, defaults as Z } from "../../../zrender/lib/core/util.js";
-import { parsePercent as M } from "../util/number.js";
+import { defaults as Y, each as l, keys as Z } from "../../../zrender/lib/core/util.js";
+import { parsePercent as S } from "../util/number.js";
 import { isDimensionStacked as $ } from "../data/helper/dataStackHelper.js";
 import N from "../chart/helper/createRenderPlanner.js";
 import { createFloat32Array as R } from "../util/vendor.js";
 var E = "__ec_stack_";
-function X(e) {
-  return e.get("stack") || E + e.seriesIndex;
+function F(n) {
+  return n.get("stack") || E + n.seriesIndex;
 }
-function F(e) {
-  return e.dim + e.index;
+function V(n) {
+  return n.dim + n.index;
 }
-function da(e) {
-  var i = [], t = e.axis, a = "axis0";
+function da(n) {
+  var i = [], t = n.axis, a = "axis0";
   if (t.type === "category") {
-    for (var u = t.getBandWidth(), r = 0; r < e.count; r++)
-      i.push(Z({
+    for (var u = t.getBandWidth(), r = 0; r < n.count; r++)
+      i.push(Y({
         bandWidth: u,
         axisKey: a,
         stackId: E + r
-      }, e));
-    for (var s = q(i), n = [], r = 0; r < e.count; r++) {
-      var o = s[a][E + r];
-      o.offsetCenter = o.offset + o.width / 2, n.push(o);
+      }, n));
+    for (var f = q(i), e = [], r = 0; r < n.count; r++) {
+      var o = f[a][E + r];
+      o.offsetCenter = o.offset + o.width / 2, e.push(o);
     }
-    return n;
+    return e;
   }
 }
-function j(e, i) {
+function j(n, i) {
   var t = [];
-  return i.eachSeriesByType(e, function(a) {
+  return i.eachSeriesByType(n, function(a) {
     J(a) && t.push(a);
   }), t;
 }
-function aa(e) {
+function aa(n) {
   var i = {};
-  l(e, function(o) {
+  l(n, function(o) {
     var d = o.coordinateSystem, v = d.getBaseAxis();
     if (!(v.type !== "time" && v.type !== "value"))
-      for (var f = o.getData(), h = v.dim + "_" + v.index, m = f.getDimensionIndex(f.mapDimension(v.dim)), p = f.getStore(), x = 0, b = p.count(); x < b; ++x) {
+      for (var s = o.getData(), h = v.dim + "_" + v.index, m = s.getDimensionIndex(s.mapDimension(v.dim)), p = s.getStore(), x = 0, b = p.count(); x < b; ++x) {
         var c = p.get(m, x);
         i[h] ? i[h].push(c) : i[h] = [c];
       }
@@ -50,93 +50,93 @@ function aa(e) {
         u.sort(function(o, d) {
           return o - d;
         });
-        for (var r = null, s = 1; s < u.length; ++s) {
-          var n = u[s] - u[s - 1];
-          n > 0 && (r = r === null ? n : Math.min(r, n));
+        for (var r = null, f = 1; f < u.length; ++f) {
+          var e = u[f] - u[f - 1];
+          e > 0 && (r = r === null ? e : Math.min(r, e));
         }
         t[a] = r;
       }
     }
   return t;
 }
-function ta(e) {
-  var i = aa(e), t = [];
-  return l(e, function(a) {
-    var u = a.coordinateSystem, r = u.getBaseAxis(), s = r.getExtent(), n;
+function ta(n) {
+  var i = aa(n), t = [];
+  return l(n, function(a) {
+    var u = a.coordinateSystem, r = u.getBaseAxis(), f = r.getExtent(), e;
     if (r.type === "category")
-      n = r.getBandWidth();
+      e = r.getBandWidth();
     else if (r.type === "value" || r.type === "time") {
-      var o = r.dim + "_" + r.index, d = i[o], v = Math.abs(s[1] - s[0]), f = r.scale.getExtent(), h = Math.abs(f[1] - f[0]);
-      n = d ? v / h * d : v;
+      var o = r.dim + "_" + r.index, d = i[o], v = Math.abs(f[1] - f[0]), s = r.scale.getExtent(), h = Math.abs(s[1] - s[0]);
+      e = d ? v / h * d : v;
     } else {
       var m = a.getData();
-      n = Math.abs(s[1] - s[0]) / m.count();
+      e = Math.abs(f[1] - f[0]) / m.count();
     }
-    var p = M(a.get("barWidth"), n), x = M(a.get("barMaxWidth"), n), b = M(
+    var p = S(a.get("barWidth"), e), x = S(a.get("barMaxWidth"), e), b = S(
       // barMinWidth by default is 0.5 / 1 in cartesian. Because in value axis,
       // the auto-calculated bar width might be less than 0.5 / 1.
       a.get("barMinWidth") || (Q(a) ? 0.5 : 1),
-      n
+      e
     ), c = a.get("barGap"), y = a.get("barCategoryGap");
     t.push({
-      bandWidth: n,
+      bandWidth: e,
       barWidth: p,
       barMaxWidth: x,
       barMinWidth: b,
       barGap: c,
       barCategoryGap: y,
-      axisKey: F(r),
-      stackId: X(a)
+      axisKey: V(r),
+      stackId: F(a)
     });
   }), q(t);
 }
-function q(e) {
+function q(n) {
   var i = {};
-  l(e, function(a, u) {
-    var r = a.axisKey, s = a.bandWidth, n = i[r] || {
-      bandWidth: s,
-      remainedWidth: s,
+  l(n, function(a, u) {
+    var r = a.axisKey, f = a.bandWidth, e = i[r] || {
+      bandWidth: f,
+      remainedWidth: f,
       autoWidthCount: 0,
       categoryGap: null,
       gap: "20%",
       stacks: {}
-    }, o = n.stacks;
-    i[r] = n;
+    }, o = e.stacks;
+    i[r] = e;
     var d = a.stackId;
-    o[d] || n.autoWidthCount++, o[d] = o[d] || {
+    o[d] || e.autoWidthCount++, o[d] = o[d] || {
       width: 0,
       maxWidth: 0
     };
     var v = a.barWidth;
-    v && !o[d].width && (o[d].width = v, v = Math.min(n.remainedWidth, v), n.remainedWidth -= v);
-    var f = a.barMaxWidth;
-    f && (o[d].maxWidth = f);
+    v && !o[d].width && (o[d].width = v, v = Math.min(e.remainedWidth, v), e.remainedWidth -= v);
+    var s = a.barMaxWidth;
+    s && (o[d].maxWidth = s);
     var h = a.barMinWidth;
     h && (o[d].minWidth = h);
     var m = a.barGap;
-    m != null && (n.gap = m);
+    m != null && (e.gap = m);
     var p = a.barCategoryGap;
-    p != null && (n.categoryGap = p);
+    p != null && (e.categoryGap = p);
   });
   var t = {};
   return l(i, function(a, u) {
     t[u] = {};
-    var r = a.stacks, s = a.bandWidth, n = a.categoryGap;
-    if (n == null) {
-      var o = Y(r).length;
-      n = Math.max(35 - o * 4, 15) + "%";
+    var r = a.stacks, f = a.bandWidth, e = a.categoryGap;
+    if (e == null) {
+      var o = Z(r).length;
+      e = Math.max(35 - o * 4, 15) + "%";
     }
-    var d = M(n, s), v = M(a.gap, 1), f = a.remainedWidth, h = a.autoWidthCount, m = (f - d) / (h + (h - 1) * v);
+    var d = S(e, f), v = S(a.gap, 1), s = a.remainedWidth, h = a.autoWidthCount, m = (s - d) / (h + (h - 1) * v);
     m = Math.max(m, 0), l(r, function(c) {
       var y = c.maxWidth, W = c.minWidth;
       if (c.width) {
         var g = c.width;
-        y && (g = Math.min(g, y)), W && (g = Math.max(g, W)), c.width = g, f -= g + v * g, h--;
+        y && (g = Math.min(g, y)), W && (g = Math.max(g, W)), c.width = g, s -= g + v * g, h--;
       } else {
         var g = m;
-        y && y < g && (g = Math.min(y, f)), W && W > g && (g = W), g !== m && (c.width = g, f -= g + v * g, h--);
+        y && y < g && (g = Math.min(y, s)), W && W > g && (g = W), g !== m && (c.width = g, s -= g + v * g, h--);
       }
-    }), m = (f - d) / (h + (h - 1) * v), m = Math.max(m, 0);
+    }), m = (s - d) / (h + (h - 1) * v), m = Math.max(m, 0);
     var p = 0, x;
     l(r, function(c, y) {
       c.width || (c.width = m), x = c, p += c.width * (1 + v);
@@ -144,59 +144,59 @@ function q(e) {
     var b = -p / 2;
     l(r, function(c, y) {
       t[u][y] = t[u][y] || {
-        bandWidth: s,
+        bandWidth: f,
         offset: b,
         width: c.width
       }, b += c.width * (1 + v);
     });
   }), t;
 }
-function ua(e, i, t) {
-  if (e && i) {
-    var a = e[F(i)];
-    return a;
+function ua(n, i, t) {
+  if (n && i) {
+    var a = n[V(i)];
+    return a != null && t != null ? a[F(t)] : a;
   }
 }
-function sa(e, i) {
-  var t = j(e, i), a = ta(t);
+function fa(n, i) {
+  var t = j(n, i), a = ta(t);
   l(t, function(u) {
-    var r = u.getData(), s = u.coordinateSystem, n = s.getBaseAxis(), o = X(u), d = a[F(n)][o], v = d.offset, f = d.width;
+    var r = u.getData(), f = u.coordinateSystem, e = f.getBaseAxis(), o = F(u), d = a[V(e)][o], v = d.offset, s = d.width;
     r.setLayout({
       bandWidth: d.bandWidth,
       offset: v,
-      size: f
+      size: s
     });
   });
 }
-function fa(e) {
+function sa(n) {
   return {
-    seriesType: e,
+    seriesType: n,
     plan: N(),
     reset: function(i) {
       if (J(i)) {
-        var t = i.getData(), a = i.coordinateSystem, u = a.getBaseAxis(), r = a.getOtherAxis(u), s = t.getDimensionIndex(t.mapDimension(r.dim)), n = t.getDimensionIndex(t.mapDimension(u.dim)), o = i.get("showBackground", !0), d = t.mapDimension(r.dim), v = t.getCalculationInfo("stackResultDimension"), f = $(t, d) && !!t.getCalculationInfo("stackedOnSeries"), h = r.isHorizontal(), m = ra(u, r), p = Q(i), x = i.get("barMinHeight") || 0, b = v && t.getDimensionIndex(v), c = t.getLayout("size"), y = t.getLayout("offset");
+        var t = i.getData(), a = i.coordinateSystem, u = a.getBaseAxis(), r = a.getOtherAxis(u), f = t.getDimensionIndex(t.mapDimension(r.dim)), e = t.getDimensionIndex(t.mapDimension(u.dim)), o = i.get("showBackground", !0), d = t.mapDimension(r.dim), v = t.getCalculationInfo("stackResultDimension"), s = $(t, d) && !!t.getCalculationInfo("stackedOnSeries"), h = r.isHorizontal(), m = ra(u, r), p = Q(i), x = i.get("barMinHeight") || 0, b = v && t.getDimensionIndex(v), c = t.getLayout("size"), y = t.getLayout("offset");
         return {
           progress: function(W, g) {
-            for (var K = W.count, S = p && R(K * 3), L = p && o && R(K * 3), V = p && R(K), A = a.master.getRect(), U = h ? A.width : A.height, k, _ = g.getStore(), D = 0; (k = W.next()) != null; ) {
-              var O = _.get(f ? b : s, k), T = _.get(n, k), C = m, z = void 0;
-              f && (z = +O - _.get(s, k));
+            for (var K = W.count, A = p && R(K * 3), L = p && o && R(K * 3), X = p && R(K), M = a.master.getRect(), U = h ? M.width : M.height, k, _ = g.getStore(), D = 0; (k = W.next()) != null; ) {
+              var O = _.get(s ? b : f, k), T = _.get(e, k), C = m, z = void 0;
+              s && (z = +O - _.get(f, k));
               var P = void 0, B = void 0, G = void 0, w = void 0;
               if (h) {
                 var I = a.dataToPoint([O, T]);
-                if (f) {
+                if (s) {
                   var H = a.dataToPoint([z, T]);
                   C = H[0];
                 }
                 P = C, B = I[1] + y, G = I[0] - C, w = c, Math.abs(G) < x && (G = (G < 0 ? -1 : 1) * x);
               } else {
                 var I = a.dataToPoint([T, O]);
-                if (f) {
+                if (s) {
                   var H = a.dataToPoint([T, z]);
                   C = H[1];
                 }
                 P = I[0] + y, B = C, G = c, w = I[1] - C, Math.abs(w) < x && (w = (w <= 0 ? -1 : 1) * x);
               }
-              p ? (S[D] = P, S[D + 1] = B, S[D + 2] = h ? G : w, L && (L[D] = h ? A.x : P, L[D + 1] = h ? B : A.y, L[D + 2] = U), V[k] = k) : g.setItemLayout(k, {
+              p ? (A[D] = P, A[D + 1] = B, A[D + 2] = h ? G : w, L && (L[D] = h ? M.x : P, L[D + 1] = h ? B : M.y, L[D + 2] = U), X[k] = k) : g.setItemLayout(k, {
                 x: P,
                 y: B,
                 width: G,
@@ -204,8 +204,8 @@ function fa(e) {
               }), D += 3;
             }
             p && g.setLayout({
-              largePoints: S,
-              largeDataIndices: V,
+              largePoints: A,
+              largeDataIndices: X,
               largeBackgroundPoints: L,
               valueAxisHorizontal: h
             });
@@ -215,20 +215,20 @@ function fa(e) {
     }
   };
 }
-function J(e) {
-  return e.coordinateSystem && e.coordinateSystem.type === "cartesian2d";
+function J(n) {
+  return n.coordinateSystem && n.coordinateSystem.type === "cartesian2d";
 }
-function Q(e) {
-  return e.pipelineContext && e.pipelineContext.large;
+function Q(n) {
+  return n.pipelineContext && n.pipelineContext.large;
 }
-function ra(e, i) {
+function ra(n, i) {
   var t = i.model.get("startValue");
   return t || (t = 0), i.toGlobalCoord(i.dataToCoord(i.type === "log" ? t > 0 ? t : 1 : t));
 }
 export {
-  fa as createProgressiveLayout,
+  sa as createProgressiveLayout,
   da as getLayoutOnAxis,
-  sa as layout,
+  fa as layout,
   ta as makeColumnLayout,
   j as prepareLayoutBarSeries,
   ua as retrieveColumnLayout