@visactor/vutils-extension 1.4.0-alpha.2 → 1.4.0-alpha.3

package/dist/index.js

@@ -328,53 +328,69 @@
 	var EventEmitter = /*@__PURE__*/getDefaultExportFromCjs(eventemitter3Exports);
 
 	const isType = (value, type) => Object.prototype.toString.call(value) === `[object ${type}]`;
+	var isType$1 = isType;
 
 	const isBoolean = function (value) {
 	  let fuzzy = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : !1;
-	  return fuzzy ? "boolean" == typeof value : !0 === value || !1 === value || isType(value, "Boolean");
+	  return fuzzy ? "boolean" == typeof value : !0 === value || !1 === value || isType$1(value, "Boolean");
 	};
+	var isBoolean$1 = isBoolean;
 
 	const isFunction = value => "function" == typeof value;
+	var isFunction$1 = isFunction;
 
 	const isNil = value => null == value;
+	var isNil$1 = isNil;
 
 	const isValid = value => null != value;
+	var isValid$1 = isValid;
 
 	const isObject$e = value => {
 	  const type = typeof value;
 	  return null !== value && "object" === type || "function" === type;
 	};
+	var isObject$f = isObject$e;
 
 	const isString = function (value) {
 	  let fuzzy = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : !1;
 	  const type = typeof value;
-	  return fuzzy ? "string" === type : "string" === type || isType(value, "String");
+	  return fuzzy ? "string" === type : "string" === type || isType$1(value, "String");
 	};
+	var isString$1 = isString;
 
-	const isArray$3 = value => Array.isArray ? Array.isArray(value) : isType(value, "Array");
+	const isArray$3 = value => Array.isArray ? Array.isArray(value) : isType$1(value, "Array");
+	var isArray$4 = isArray$3;
 
 	const isArrayLike = function (value) {
 	  return null !== value && "function" != typeof value && Number.isFinite(value.length);
 	};
+	var isArrayLike$1 = isArrayLike;
 
-	const isDate = value => isType(value, "Date");
+	const isDate = value => isType$1(value, "Date");
+	var isDate$1 = isDate;
 
 	const isNumber = function (value) {
 	  let fuzzy = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : !1;
 	  const type = typeof value;
-	  return fuzzy ? "number" === type : "number" === type || isType(value, "Number");
+	  return fuzzy ? "number" === type : "number" === type || isType$1(value, "Number");
 	};
+	var isNumber$1 = isNumber;
 
-	const isValidNumber = value => isNumber(value) && Number.isFinite(value);
+	const isValidNumber = value => isNumber$1(value) && Number.isFinite(value);
+	var isValidNumber$1 = isValidNumber;
 
 	const isValidUrl = value => new RegExp(/^(http(s)?:\/\/)\w+[^\s]+(\.[^\s]+){1,}$/).test(value);
+	var isValidUrl$1 = isValidUrl;
 
-	const isRegExp = value => isType(value, "RegExp");
+	const isRegExp = value => isType$1(value, "RegExp");
+	var isRegExp$1 = isRegExp;
 
 	const isBase64 = value => new RegExp(/^data:image\/(?:gif|png|jpeg|bmp|webp)(?:;charset=utf-8)?;base64,(?:[A-Za-z0-9]|[+/])+={0,2}/g).test(value);
+	var isBase64$1 = isBase64;
 
 	const hasOwnProperty$1 = Object.prototype.hasOwnProperty,
 	  has$1 = (object, key) => null != object && hasOwnProperty$1.call(object, key);
+	var has$2 = has$1;
 
 	function getRegExpFlags(re) {
 	  let flags = "";
@@ -391,7 +407,7 @@
 	    if (0 === depth) return parent;
 	    let child;
 	    if ("object" != typeof parent) return parent;
-	    if (isArray$3(parent) ? child = [] : isRegExp(parent) ? (child = new RegExp(parent.source, getRegExpFlags(parent)), parent.lastIndex && (child.lastIndex = parent.lastIndex)) : child = isDate(parent) ? new Date(parent.getTime()) : void 0 === prototype ? Object.create(Object.getPrototypeOf(parent)) : Object.create(prototype), circular) {
+	    if (isArray$4(parent) ? child = [] : isRegExp$1(parent) ? (child = new RegExp(parent.source, getRegExpFlags(parent)), parent.lastIndex && (child.lastIndex = parent.lastIndex)) : child = isDate$1(parent) ? new Date(parent.getTime()) : void 0 === prototype ? Object.create(Object.getPrototypeOf(parent)) : Object.create(prototype), circular) {
 	      const index = allParents.indexOf(parent);
 	      if (-1 !== index) return allChildren[index];
 	      allParents.push(parent), allChildren.push(child);
@@ -402,25 +418,17 @@
 	}
 
 	function last(val) {
-	  if (isArrayLike(val)) {
+	  if (isArrayLike$1(val)) {
 	    return val[val.length - 1];
 	  }
 	}
 	function arrayEqual(a, b) {
-	  if (!isArray$3(a) || !isArray$3(b)) return !1;
+	  if (!isArray$4(a) || !isArray$4(b)) return !1;
 	  if (a.length !== b.length) return !1;
 	  for (let i = 0; i < a.length; i++) if (a[i] !== b[i]) return !1;
 	  return !0;
 	}
 
-	let hasRaf = !1;
-	try {
-	  hasRaf = "function" == typeof requestAnimationFrame && "function" == typeof cancelAnimationFrame;
-	} catch (err) {
-	  hasRaf = !1;
-	}
-	hasRaf = !1;
-
 	const epsilon = 1e-12;
 	const pi = Math.PI;
 	const halfPi$1 = pi / 2;
@@ -466,10 +474,10 @@
 	    return this.x = x, this.y = y, this;
 	  }
 	  add(point) {
-	    return isNumber(point) ? (this.x += point, void (this.y += point)) : (this.x += point.x, this.y += point.y, this);
+	    return isNumber$1(point) ? (this.x += point, void (this.y += point)) : (this.x += point.x, this.y += point.y, this);
 	  }
 	  sub(point) {
-	    return isNumber(point) ? (this.x -= point, void (this.y -= point)) : (this.x -= point.x, this.y -= point.y, this);
+	    return isNumber$1(point) ? (this.x -= point, void (this.y -= point)) : (this.x -= point.x, this.y -= point.y, this);
 	  }
 	  multi(point) {
 	    throw new Error("暂不支持");
@@ -539,7 +547,7 @@
 	  }
 	  expand() {
 	    let d = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
-	    return isArray$3(d) ? (this.y1 -= d[0], this.x2 += d[1], this.y2 += d[2], this.x1 -= d[3]) : (this.x1 -= d, this.y1 -= d, this.x2 += d, this.y2 += d), this;
+	    return isArray$4(d) ? (this.y1 -= d[0], this.x2 += d[1], this.y2 += d[2], this.x1 -= d[3]) : (this.x1 -= d, this.y1 -= d, this.x2 += d, this.y2 += d), this;
 	  }
 	  round() {
 	    return this.x1 = Math.floor(this.x1), this.y1 = Math.floor(this.y1), this.x2 = Math.ceil(this.x2), this.y2 = Math.ceil(this.y2), this;
@@ -863,15 +871,15 @@
 
 	class TextMeasure {
 	  constructor(option, textSpec) {
-	    this._numberCharSize = null, this._fullCharSize = null, this._letterCharSize = null, this._specialCharSizeMap = {}, this._canvas = null, this._context = null, this._contextSaved = !1, this._notSupportCanvas = !1, this._notSupportVRender = !1, this._userSpec = {}, this.specialCharSet = "-/: .,@%'\"~", this._option = option, this._userSpec = null != textSpec ? textSpec : {}, this.textSpec = this._initSpec(), isValid(option.specialCharSet) && (this.specialCharSet = option.specialCharSet), this._standardMethod = isValid(option.getTextBounds) ? this.fullMeasure.bind(this) : this.measureWithNaiveCanvas.bind(this);
+	    this._numberCharSize = null, this._fullCharSize = null, this._letterCharSize = null, this._specialCharSizeMap = {}, this._canvas = null, this._context = null, this._contextSaved = !1, this._notSupportCanvas = !1, this._notSupportVRender = !1, this._userSpec = {}, this.specialCharSet = "-/: .,@%'\"~", this._option = option, this._userSpec = null != textSpec ? textSpec : {}, this.textSpec = this._initSpec(), isValid$1(option.specialCharSet) && (this.specialCharSet = option.specialCharSet), this._standardMethod = isValid$1(option.getTextBounds) ? this.fullMeasure.bind(this) : this.measureWithNaiveCanvas.bind(this);
 	  }
 	  initContext() {
 	    if (this._notSupportCanvas) return !1;
-	    if (isNil(this._canvas) && (isValid(this._option.getCanvasForMeasure) && (this._canvas = this._option.getCanvasForMeasure()), isNil(this._canvas) && "undefined" != typeof window && void 0 !== window.document && isValid(globalThis.document) && (this._canvas = globalThis.document.createElement("canvas"))), isNil(this._context) && isValid(this._canvas)) {
+	    if (isNil$1(this._canvas) && (isValid$1(this._option.getCanvasForMeasure) && (this._canvas = this._option.getCanvasForMeasure()), isNil$1(this._canvas) && "undefined" != typeof window && void 0 !== window.document && isValid$1(globalThis.document) && (this._canvas = globalThis.document.createElement("canvas"))), isNil$1(this._context) && isValid$1(this._canvas)) {
 	      const context = this._canvas.getContext("2d");
-	      isValid(context) && (context.save(), context.font = getContextFont$1(this.textSpec), this._contextSaved = !0, this._context = context);
+	      isValid$1(context) && (context.save(), context.font = getContextFont$1(this.textSpec), this._contextSaved = !0, this._context = context);
 	    }
-	    return !isNil(this._context) || (this._notSupportCanvas = !0, !1);
+	    return !isNil$1(this._context) || (this._notSupportCanvas = !0, !1);
 	  }
 	  _initSpec() {
 	    var _a, _b, _c;
@@ -919,11 +927,11 @@
 	    }
 	  }
 	  fullMeasure(text) {
-	    if (isNil(text)) return {
+	    if (isNil$1(text)) return {
 	      width: 0,
 	      height: 0
 	    };
-	    if (isNil(this._option.getTextBounds) || !this._notSupportVRender) return this.measureWithNaiveCanvas(text);
+	    if (isNil$1(this._option.getTextBounds) || !this._notSupportVRender) return this.measureWithNaiveCanvas(text);
 	    const {
 	      fontFamily: fontFamily,
 	      fontSize: fontSize,
@@ -982,7 +990,7 @@
 	    for (let i = 0; i < text.length; i++) {
 	      const char = text[i];
 	      let size = this._measureSpecialChar(char);
-	      isNil(size) && TextMeasure.NUMBERS_CHAR_SET.includes(char) && (size = this._measureNumberChar()), isNil(size) && ["F", "W"].includes(eastAsianCharacterInfo(char)) && (size = this._measureFullSizeChar()), isNil(size) && (size = this._measureLetterChar()), totalSize.width += size.width, totalSize.height = Math.max(totalSize.height, size.height);
+	      isNil$1(size) && TextMeasure.NUMBERS_CHAR_SET.includes(char) && (size = this._measureNumberChar()), isNil$1(size) && ["F", "W"].includes(eastAsianCharacterInfo(char)) && (size = this._measureFullSizeChar()), isNil$1(size) && (size = this._measureLetterChar()), totalSize.width += size.width, totalSize.height = Math.max(totalSize.height, size.height);
 	    }
 	    return totalSize;
 	  }
@@ -1014,9 +1022,9 @@
 	        width: 0,
 	        height: 0
 	      };
-	    if (isNil(text)) return defaultResult;
-	    if (isArray$3(text)) {
-	      const textArr = text.filter(isValid).map(s => s.toString());
+	    if (isNil$1(text)) return defaultResult;
+	    if (isArray$4(text)) {
+	      const textArr = text.filter(isValid$1).map(s => s.toString());
 	      return 0 === textArr.length ? defaultResult : 1 === textArr.length ? processor(textArr[0]) : {
 	        width: textArr.reduce((maxWidth, cur) => Math.max(maxWidth, processor(cur).width), 0),
 	        height: textArr.length * ((null != lineHeight ? lineHeight : fontSize) + 1) + 1
@@ -1025,7 +1033,7 @@
 	    return processor(text.toString());
 	  }
 	  _measureNumberChar() {
-	    if (isNil(this._numberCharSize)) {
+	    if (isNil$1(this._numberCharSize)) {
 	      const numberBounds = this._standardMethod(TextMeasure.NUMBERS_CHAR_SET);
 	      this._numberCharSize = {
 	        width: numberBounds.width / TextMeasure.NUMBERS_CHAR_SET.length,
@@ -1035,10 +1043,10 @@
 	    return this._numberCharSize;
 	  }
 	  _measureFullSizeChar() {
-	    return isNil(this._fullCharSize) && (this._fullCharSize = this._standardMethod(TextMeasure.FULL_SIZE_CHAR)), this._fullCharSize;
+	    return isNil$1(this._fullCharSize) && (this._fullCharSize = this._standardMethod(TextMeasure.FULL_SIZE_CHAR)), this._fullCharSize;
 	  }
 	  _measureLetterChar() {
-	    if (isNil(this._letterCharSize)) {
+	    if (isNil$1(this._letterCharSize)) {
 	      const alphabetBounds = this._standardMethod(TextMeasure.ALPHABET_CHAR_SET);
 	      this._letterCharSize = {
 	        width: alphabetBounds.width / TextMeasure.ALPHABET_CHAR_SET.length,
@@ -1048,19 +1056,14 @@
 	    return this._letterCharSize;
 	  }
 	  _measureSpecialChar(char) {
-	    return isValid(this._specialCharSizeMap[char]) ? this._specialCharSizeMap[char] : this.specialCharSet.includes(char) ? (this._specialCharSizeMap[char] = this._standardMethod(char), this._specialCharSizeMap[char]) : null;
+	    return isValid$1(this._specialCharSizeMap[char]) ? this._specialCharSizeMap[char] : this.specialCharSet.includes(char) ? (this._specialCharSizeMap[char] = this._standardMethod(char), this._specialCharSizeMap[char]) : null;
 	  }
 	  release() {
-	    isValid(this._canvas) && (this._canvas = null), isValid(this._context) && (this._contextSaved && (this._context.restore(), this._contextSaved = !1), this._context = null);
+	    isValid$1(this._canvas) && (this._canvas = null), isValid$1(this._context) && (this._contextSaved && (this._context.restore(), this._contextSaved = !1), this._context = null);
 	  }
 	}
 	TextMeasure.ALPHABET_CHAR_SET = "abcdefghijklmnopqrstuvwxyz", TextMeasure.NUMBERS_CHAR_SET = "0123456789", TextMeasure.FULL_SIZE_CHAR = "字";
 
-	var LoggerLevel;
-	!function (LoggerLevel) {
-	  LoggerLevel[LoggerLevel.None = 0] = "None", LoggerLevel[LoggerLevel.Error = 1] = "Error", LoggerLevel[LoggerLevel.Warn = 2] = "Warn", LoggerLevel[LoggerLevel.Info = 3] = "Info", LoggerLevel[LoggerLevel.Debug = 4] = "Debug";
-	}(LoggerLevel || (LoggerLevel = {}));
-
 	var ScaleEnum;
 	!function (ScaleEnum) {
 	  ScaleEnum.Identity = "identity", ScaleEnum.Linear = "linear", ScaleEnum.Log = "log", ScaleEnum.Pow = "pow", ScaleEnum.Sqrt = "sqrt", ScaleEnum.Symlog = "symlog", ScaleEnum.Time = "time", ScaleEnum.Quantile = "quantile", ScaleEnum.Quantize = "quantize", ScaleEnum.Threshold = "threshold", ScaleEnum.Ordinal = "ordinal", ScaleEnum.Point = "point", ScaleEnum.Band = "band";
@@ -8190,6 +8193,7 @@
 	  angle: 0,
 	  alpha: 0,
 	  beta: 0,
+	  scaleCenter: [0, 0],
 	  anchor: [0, 0],
 	  anchor3d: [0, 0],
 	  postMatrix: new Matrix()
@@ -8320,7 +8324,8 @@
 	  segments: [],
 	  curveType: "linear",
 	  clipRange: 1,
-	  clipRangeByDimension: "default"
+	  clipRangeByDimension: "default",
+	  closePath: !1
 	});
 	const DefaultPathAttribute = Object.assign(Object.assign({}, DefaultAttribute), {
 	  path: new CustomPath2D(),
@@ -9611,26 +9616,26 @@
 	    return this.removeChild(child);
 	  }
 	  addEventListener(type, listener, options) {
-	    const capture = isBoolean(options, !0) && options || isObject$e(options) && options.capture,
-	      once = isObject$e(options) && options.once,
-	      context = isFunction(listener) ? void 0 : listener;
-	    return type = capture ? `${type}capture` : type, listener = isFunction(listener) ? listener : listener.handleEvent, once ? super.once(type, listener, context) : super.on(type, listener, context), this;
+	    const capture = isBoolean$1(options, !0) && options || isObject$f(options) && options.capture,
+	      once = isObject$f(options) && options.once,
+	      context = isFunction$1(listener) ? void 0 : listener;
+	    return type = capture ? `${type}capture` : type, listener = isFunction$1(listener) ? listener : listener.handleEvent, once ? super.once(type, listener, context) : super.on(type, listener, context), this;
 	  }
 	  on(type, listener, options) {
 	    return this.addEventListener(type, listener, options);
 	  }
 	  removeEventListener(type, listener, options) {
-	    const capture = isBoolean(options, !0) && options || isObject$e(options) && options.capture,
-	      context = isFunction(listener) ? void 0 : listener;
-	    type = capture ? `${type}capture` : type, listener = isFunction(listener) ? listener : listener.handleEvent;
-	    const once = isObject$e(options) && options.once;
+	    const capture = isBoolean$1(options, !0) && options || isObject$f(options) && options.capture,
+	      context = isFunction$1(listener) ? void 0 : listener;
+	    type = capture ? `${type}capture` : type, listener = isFunction$1(listener) ? listener : listener.handleEvent;
+	    const once = isObject$f(options) && options.once;
 	    return super.off(type, listener, context, once), this;
 	  }
 	  off(type, listener, options) {
 	    return this.removeEventListener(type, listener, options);
 	  }
 	  once(type, listener, options) {
-	    return isObject$e(options) ? (options.once = !0, this.addEventListener(type, listener, options)) : this.addEventListener(type, listener, {
+	    return isObject$f(options) ? (options.once = !0, this.addEventListener(type, listener, options)) : this.addEventListener(type, listener, {
 	      once: !0
 	    });
 	  }
@@ -10477,7 +10482,7 @@
 	const parseStroke = stroke => {
 	  var _a;
 	  let isFullStroke = !0;
-	  if (isBoolean(stroke, !0)) {
+	  if (isBoolean$1(stroke, !0)) {
 	    for (let i = 0; i < 4; i++) _strokeVec4[i] = stroke, isFullStroke && (isFullStroke = !(null !== (_a = _strokeVec4[i]) && void 0 !== _a && !_a));
 	    isFullStroke = stroke;
 	  } else if (Array.isArray(stroke)) for (let i = 0; i < 4; i++) _strokeVec4[i] = !!stroke[i], isFullStroke && (isFullStroke = !!_strokeVec4[i]);else _strokeVec4[0] = !1, _strokeVec4[1] = !1, _strokeVec4[2] = !1, _strokeVec4[3] = !1;
@@ -10487,7 +10492,7 @@
 	  };
 	};
 	const _paddingVec4 = [0, 0, 0, 0];
-	const parsePadding = padding => padding ? isArray$3(padding) ? 0 === padding.length ? 0 : 1 === padding.length ? padding[0] : 2 === padding.length ? (_paddingVec4[0] = padding[0], _paddingVec4[2] = padding[0], _paddingVec4[1] = padding[1], _paddingVec4[3] = padding[1], _paddingVec4) : padding : padding : 0;
+	const parsePadding = padding => padding ? isArray$4(padding) ? 0 === padding.length ? 0 : 1 === padding.length ? padding[0] : 2 === padding.length ? (_paddingVec4[0] = padding[0], _paddingVec4[2] = padding[0], _paddingVec4[1] = padding[1], _paddingVec4[3] = padding[1], _paddingVec4) : padding : padding : 0;
 	const _coords = [{
 	    x: 0,
 	    y: 0
@@ -10556,7 +10561,7 @@
 	  return points;
 	}
 	function getAttributeFromDefaultAttrList(attr, key) {
-	  if (isArray$3(attr)) {
+	  if (isArray$4(attr)) {
 	    let val;
 	    for (let i = 0; i < attr.length && void 0 === val; i++) val = attr[i][key];
 	    return val;
@@ -10739,7 +10744,7 @@
 	};
 
 	const reverseNames = {};
-	for (const name in colorNames) has$1(colorNames, name) && (reverseNames[colorNames[name]] = name);
+	for (const name in colorNames) has$2(colorNames, name) && (reverseNames[colorNames[name]] = name);
 	const cs = {
 	  to: {},
 	  get: {}
@@ -11177,7 +11182,7 @@
 	    const params = this.onBeforeAttributeUpdate && this.onBeforeAttributeUpdate({
 	      [key]: value
 	    }, this.attribute, key, context);
-	    params ? this._setAttributes(params, forceUpdateTag, context) : isNil(null === (_a = this.normalAttrs) || void 0 === _a ? void 0 : _a[key]) ? (this.attribute[key] = value, this.valid = this.isValid(), this.updateShapeAndBoundsTagSetted() || !forceUpdateTag && !this.needUpdateTag(key) ? this.addUpdateBoundTag() : this.addUpdateShapeAndBoundsTag(), this.addUpdatePositionTag(), this.addUpdateLayoutTag(), this.onAttributeUpdate(context)) : this.normalAttrs[key] = value, "background" === key && this.loadImage(value, !0);
+	    params ? this._setAttributes(params, forceUpdateTag, context) : isNil$1(null === (_a = this.normalAttrs) || void 0 === _a ? void 0 : _a[key]) ? (this.attribute[key] = value, this.valid = this.isValid(), this.updateShapeAndBoundsTagSetted() || !forceUpdateTag && !this.needUpdateTag(key) ? this.addUpdateBoundTag() : this.addUpdateShapeAndBoundsTag(), this.addUpdatePositionTag(), this.addUpdateLayoutTag(), this.onAttributeUpdate(context)) : this.normalAttrs[key] = value, "background" === key && this.loadImage(value, !0);
 	  }
 	  needUpdateTags(keys) {
 	    for (let i = 0; i < GRAPHIC_UPDATE_TAG_KEY.length; i++) {
@@ -11313,7 +11318,7 @@
 	    d ? (d.bounds && this.tryUpdateAABBBounds("imprecise" === this.attribute.boundsMode), d.trans && this.tryUpdateLocalTransMatrix()) : (this.tryUpdateAABBBounds("imprecise" === this.attribute.boundsMode), this.tryUpdateLocalTransMatrix());
 	  }
 	  hasState(stateName) {
-	    return !(!this.currentStates || !this.currentStates.length) && (!!isNil(stateName) || this.currentStates.includes(stateName));
+	    return !(!this.currentStates || !this.currentStates.length) && (!!isNil$1(stateName) || this.currentStates.includes(stateName));
 	  }
 	  getState(stateName) {
 	    var _a;
@@ -11345,7 +11350,7 @@
 	    return this.animates && this.animates.forEach(animate => {
 	      if (animate.stateNames) {
 	        const endProps = animate.getEndProps();
-	        has$1(endProps, key) && (value = endProps[key]);
+	        has$2(endProps, key) && (value = endProps[key]);
 	      }
 	    }), value;
 	  }
@@ -11426,6 +11431,7 @@
 	        scaleX = DefaultTransform.scaleX,
 	        scaleY = DefaultTransform.scaleY,
 	        angle = DefaultTransform.angle,
+	        scaleCenter: scaleCenter,
 	        anchor: anchor,
 	        postMatrix: postMatrix
 	      } = this.attribute,
@@ -11442,7 +11448,13 @@
 	        _anchor[1] = bounds.x1 + (bounds.x2 - bounds.x1) * ratio;
 	      } else _anchor[1] = anchor[1];
 	    }
-	    normalTransform(this._transMatrix, this._transMatrix.reset(), x, y, scaleX, scaleY, angle, anchor && _anchor);
+	    if (!scaleCenter || 1 === scaleX && 1 === scaleY) normalTransform(this._transMatrix, this._transMatrix.reset(), x, y, scaleX, scaleY, angle, anchor && _anchor);else {
+	      const m = this._transMatrix;
+	      m.reset(), m.translate(_anchor[0], _anchor[1]), m.rotate(angle), m.translate(-_anchor[0], -_anchor[1]), m.translate(x, y), application.transformUtil.fromMatrix(m, m).scale(scaleX, scaleY, {
+	        x: scaleCenter[0],
+	        y: scaleCenter[1]
+	      });
+	    }
 	    const p = this.getOffsetXY(DefaultTransform);
 	    if (this._transMatrix.e += p.x, this._transMatrix.f += p.y, postMatrix) {
 	      const m1 = tempMatrix.setValue(postMatrix.a, postMatrix.b, postMatrix.c, postMatrix.d, postMatrix.e, postMatrix.f),
@@ -11566,7 +11578,7 @@
 	    };
 	  }
 	  createPathProxy(path) {
-	    return isString(path, !0) ? this.pathProxy = new CustomPath2D().fromString(path) : this.pathProxy = new CustomPath2D(), this.pathProxy;
+	    return isString$1(path, !0) ? this.pathProxy = new CustomPath2D().fromString(path) : this.pathProxy = new CustomPath2D(), this.pathProxy;
 	  }
 	  loadImage(image) {
 	    let background = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : !1;
@@ -11577,7 +11589,7 @@
 	      data: "init",
 	      state: null
 	    };
-	    this.resources.set(url, cache), "string" == typeof image ? (cache.state = "loading", isValidUrl(image) || isBase64(image) ? (ResourceLoader.GetImage(image, this), this.backgroundImg = this.backgroundImg || background) : image.startsWith("<svg") && (ResourceLoader.GetSvg(image, this), this.backgroundImg = this.backgroundImg || background)) : (cache.state = "success", cache.data = image, this.backgroundImg = this.backgroundImg || background);
+	    this.resources.set(url, cache), "string" == typeof image ? (cache.state = "loading", isValidUrl$1(image) || isBase64$1(image) ? (ResourceLoader.GetImage(image, this), this.backgroundImg = this.backgroundImg || background) : image.startsWith("<svg") && (ResourceLoader.GetSvg(image, this), this.backgroundImg = this.backgroundImg || background)) : (cache.state = "success", cache.data = image, this.backgroundImg = this.backgroundImg || background);
 	  }
 	  imageLoadSuccess(url, image, cb) {
 	    if (!this.resources) return;
@@ -14037,7 +14049,7 @@
 	}
 	function runStroke(stroke, lineWidth) {
 	  let s;
-	  return s = isArray$3(stroke) ? stroke.some(item => item || void 0 === item) : !!stroke, s && lineWidth > 0;
+	  return s = isArray$4(stroke) ? stroke.some(item => item || void 0 === item) : !!stroke, s && lineWidth > 0;
 	}
 	function fillVisible(opacity, fillOpacity, fill) {
 	  return fill && opacity * fillOpacity > 0;
@@ -14439,7 +14451,7 @@
 	      forceShowCap = arcAttribute.forceShowCap
 	    } = arc.attribute;
 	    let conicalOffset = 0;
-	    const tempChangeConicalColor = (isBoolean(cap) && cap || cap[0]) && "conical" === fill.gradient;
+	    const tempChangeConicalColor = (isBoolean$1(cap) && cap || cap[0]) && "conical" === fill.gradient;
 	    if (tempChangeConicalColor) {
 	      const {
 	        sc: sc,
@@ -14482,7 +14494,7 @@
 	      }
 	      strokeCb ? strokeCb(context, arc.attribute, arcAttribute) : sVisible && (context.setStrokeStyle(arc, arc.attribute, x, y, arcAttribute), context.stroke());
 	    }
-	    if ((isBoolean(cap) && cap || cap[1]) && forceShowCap) {
+	    if ((isBoolean$1(cap) && cap || cap[1]) && forceShowCap) {
 	      const {
 	        startAngle: sa,
 	        endAngle: ea
@@ -15100,7 +15112,7 @@
 	    const {
 	      text: text
 	    } = this.attribute;
-	    return isArray$3(text) ? !text.every(t => null == t || "" === t) : null != text && "" !== text;
+	    return isArray$4(text) ? !text.every(t => null == t || "" === t) : null != text && "" !== text;
 	  }
 	  updateMultilineAABBBounds(text) {
 	    var _a, _b, _c;
@@ -15717,13 +15729,13 @@
 	    this.type = "rect", this.pathStr = "M-0.5,-0.5h1v1h-1Z";
 	  }
 	  draw(ctx, size, x, y) {
-	    return rect(ctx, isNumber(size) ? [size, size] : size, x, y);
+	    return rect(ctx, isNumber$1(size) ? [size, size] : size, x, y);
 	  }
 	  drawOffset(ctx, size, x, y, offset) {
-	    return rect(ctx, isNumber(size) ? [size + 2 * offset, size + 2 * offset] : [size[0] + 2 * offset, size[1] + 2 * offset], x, y);
+	    return rect(ctx, isNumber$1(size) ? [size + 2 * offset, size + 2 * offset] : [size[0] + 2 * offset, size[1] + 2 * offset], x, y);
 	  }
 	  bounds(size, bounds) {
-	    const rectSize = isNumber(size) ? [size, size] : size;
+	    const rectSize = isNumber$1(size) ? [size, size] : size;
 	    bounds.x1 = -rectSize[0] / 2, bounds.x2 = rectSize[0] / 2, bounds.y1 = -rectSize[1] / 2, bounds.y2 = rectSize[1] / 2;
 	  }
 	}
@@ -15733,7 +15745,7 @@
 	class CustomSymbolClass {
 	  constructor(type, path) {
 	    let isSvg = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : !1;
-	    this.pathStr = "", this.type = type, isArray$3(path) ? this.svgCache = path : this.path = path, this.isSvg = isSvg;
+	    this.pathStr = "", this.type = type, isArray$4(path) ? this.svgCache = path : this.path = path, this.isSvg = isSvg;
 	  }
 	  drawOffset(ctx, size, x, y, offset, z, cb) {
 	    return this.isSvg ? !!this.svgCache && (this.svgCache.forEach(item => {
@@ -15783,7 +15795,7 @@
 	    const {
 	      size: size
 	    } = this.attribute;
-	    return isArray$3(size) ? 2 === size.length && size.every(this._validNumber) : this._validNumber(size);
+	    return isArray$4(size) ? 2 === size.length && size.every(this._validNumber) : this._validNumber(size);
 	  }
 	  doUpdateParsedPath() {
 	    const symbolTheme = getTheme(this).symbol,
@@ -15803,7 +15815,7 @@
 	          svg: svg
 	        } = parser.parse(symbolType);
 	      if (!svg) return null;
-	      const path = isArray$3(svg.path) ? svg.path : [svg.path],
+	      const path = isArray$4(svg.path) ? svg.path : [svg.path],
 	        b = new AABBBounds(),
 	        cacheList = [];
 	      path.forEach(item => {
@@ -15862,7 +15874,7 @@
 	  toCustomPath() {
 	    const symbolInstance = this.getParsedPath(),
 	      size = this.attribute.size,
-	      formattedSize = isArray$3(size) ? size : [size, size];
+	      formattedSize = isArray$4(size) ? size : [size, size];
 	    return symbolInstance.path ? new CustomPath2D().fromCustomPath2D(symbolInstance.path, 0, 0, formattedSize[0], formattedSize[1]) : new CustomPath2D().fromString(symbolInstance.pathStr, 0, 0, formattedSize[0], formattedSize[1]);
 	  }
 	  clone() {
@@ -16353,7 +16365,7 @@
 	      this._marginArray = "number" == typeof marginArray ? [marginArray, marginArray, marginArray, marginArray] : marginArray;
 	    }
 	    this.onBeforeAttributeUpdate = (val, attributes, key) => {
-	      if (isArray$3(key) && -1 !== key.indexOf("margin") || "margin" === key) if (attributes.margin) {
+	      if (isArray$4(key) && -1 !== key.indexOf("margin") || "margin" === key) if (attributes.margin) {
 	        const marginArray = parsePadding(attributes.margin);
 	        this._marginArray = "number" == typeof marginArray ? [marginArray, marginArray, marginArray, marginArray] : marginArray;
 	      } else this._marginArray = [0, 0, 0, 0];
@@ -16707,7 +16719,7 @@
 	    const pathTheme = getTheme(this).path;
 	    if (!this.valid) return pathTheme.path;
 	    const attribute = this.attribute;
-	    return attribute.path instanceof CustomPath2D ? attribute.path : (isNil(this.cache) && this.doUpdatePathShape(), this.cache instanceof CustomPath2D ? this.cache : pathTheme.path);
+	    return attribute.path instanceof CustomPath2D ? attribute.path : (isNil$1(this.cache) && this.doUpdatePathShape(), this.cache instanceof CustomPath2D ? this.cache : pathTheme.path);
 	  }
 	  doUpdateAABBBounds() {
 	    const pathTheme = getTheme(this).path;
@@ -16722,7 +16734,7 @@
 	  }
 	  doUpdatePathShape() {
 	    const attribute = this.attribute;
-	    isString(attribute.path, !0) ? this.cache = new CustomPath2D().fromString(attribute.path) : attribute.customPath && (this.cache = new CustomPath2D(), attribute.customPath(this.cache, this));
+	    isString$1(attribute.path, !0) ? this.cache = new CustomPath2D().fromString(attribute.path) : attribute.customPath && (this.cache = new CustomPath2D(), attribute.customPath(this.cache, this));
 	  }
 	  tryUpdateOBBBounds() {
 	    throw new Error("暂不支持");
@@ -16854,7 +16866,7 @@
 	      } = this.attribute;
 	    if (0 === cornerRadius || "0%" === cornerRadius) return 0;
 	    const deltaRadius = Math.abs(outerRadius - innerRadius);
-	    return Math.min(isNumber(cornerRadius, !0) ? cornerRadius : deltaRadius * parseFloat(cornerRadius) / 100, deltaRadius / 2);
+	    return Math.min(isNumber$1(cornerRadius, !0) ? cornerRadius : deltaRadius * parseFloat(cornerRadius) / 100, deltaRadius / 2);
 	  }
 	  getParsedAngle() {
 	    const arcTheme = getTheme(this).arc;
@@ -17697,7 +17709,7 @@
 	    const {
 	      size = symbolTheme.size
 	    } = attribute;
-	    if (isArray$3(size)) aabbBounds.set(-size[0] / 2, -size[1] / 2, size[0] / 2, size[1] / 2);else {
+	    if (isArray$4(size)) aabbBounds.set(-size[0] / 2, -size[1] / 2, size[0] / 2, size[1] / 2);else {
 	      const halfWH = size / 2;
 	      aabbBounds.set(-halfWH, -halfWH, halfWH, halfWH);
 	    }
@@ -18112,7 +18124,7 @@
 	      offsetX: offsetX,
 	      offsetY: offsetY,
 	      offsetZ: z
-	    }), line.cache && !isArray$3(line.cache) && line.attribute.curveType && line.attribute.curveType.includes("Closed") && context.closePath(), context.setShadowStyle && context.setShadowStyle(line, attribute, defaultAttribute);
+	    }), line.cache && !isArray$4(line.cache) && line.attribute.curveType && line.attribute.curveType.includes("Closed") && context.closePath(), context.setShadowStyle && context.setShadowStyle(line, attribute, defaultAttribute);
 	    const {
 	      x: originX = 0,
 	      x: originY = 0
@@ -18124,7 +18136,7 @@
 	      connectedY: connectedY,
 	      connectedStyle: connectedStyle
 	    } = attribute;
-	    if (isArray$3(defaultAttribute) ? (connectedType = null !== (_b = null != connectedType ? connectedType : defaultAttribute[0].connectedType) && void 0 !== _b ? _b : defaultAttribute[1].connectedType, connectedX = null !== (_c = null != connectedX ? connectedX : defaultAttribute[0].connectedX) && void 0 !== _c ? _c : defaultAttribute[1].connectedX, connectedY = null !== (_d = null != connectedY ? connectedY : defaultAttribute[0].connectedY) && void 0 !== _d ? _d : defaultAttribute[1].connectedY, connectedStyle = null !== (_e = null != connectedStyle ? connectedStyle : defaultAttribute[0].connectedStyle) && void 0 !== _e ? _e : defaultAttribute[1].connectedStyle) : (connectedType = null != connectedType ? connectedType : defaultAttribute.connectedType, connectedX = null != connectedX ? connectedX : defaultAttribute.connectedX, connectedY = null != connectedY ? connectedY : defaultAttribute.connectedY, connectedStyle = null != connectedStyle ? connectedStyle : defaultAttribute.connectedStyle), "connect" !== connectedType && "zero" !== connectedType && (connectedType = "none"), "none" !== connectedType) {
+	    if (isArray$4(defaultAttribute) ? (connectedType = null !== (_b = null != connectedType ? connectedType : defaultAttribute[0].connectedType) && void 0 !== _b ? _b : defaultAttribute[1].connectedType, connectedX = null !== (_c = null != connectedX ? connectedX : defaultAttribute[0].connectedX) && void 0 !== _c ? _c : defaultAttribute[1].connectedX, connectedY = null !== (_d = null != connectedY ? connectedY : defaultAttribute[0].connectedY) && void 0 !== _d ? _d : defaultAttribute[1].connectedY, connectedStyle = null !== (_e = null != connectedStyle ? connectedStyle : defaultAttribute[0].connectedStyle) && void 0 !== _e ? _e : defaultAttribute[1].connectedStyle) : (connectedType = null != connectedType ? connectedType : defaultAttribute.connectedType, connectedX = null != connectedX ? connectedX : defaultAttribute.connectedX, connectedY = null != connectedY ? connectedY : defaultAttribute.connectedY, connectedStyle = null != connectedStyle ? connectedStyle : defaultAttribute.connectedStyle), "connect" !== connectedType && "zero" !== connectedType && (connectedType = "none"), "none" !== connectedType) {
 	      context.beginPath(), drawSegments(context.camera ? context : context.nativeContext, cache, clipRange, clipRangeByDimension, {
 	        offsetX: offsetX,
 	        offsetY: offsetY,
@@ -18135,7 +18147,7 @@
 	        zeroY: connectedY
 	      });
 	      const da = [];
-	      isArray$3(defaultAttribute) ? defaultAttribute.forEach(i => da.push(i)) : da.push(defaultAttribute), da.push(attribute), !1 !== fill && (fillCb ? fillCb(context, attribute, defaultAttribute) : fillOpacity && (context.setCommonStyle(line, connectedStyle, originX - offsetX, originY - offsetY, da), context.fill())), !1 !== stroke && (strokeCb ? strokeCb(context, attribute, defaultAttribute) : strokeOpacity && (context.setStrokeStyle(line, connectedStyle, originX - offsetX, originY - offsetY, da), context.stroke()));
+	      isArray$4(defaultAttribute) ? defaultAttribute.forEach(i => da.push(i)) : da.push(defaultAttribute), da.push(attribute), !1 !== fill && (fillCb ? fillCb(context, attribute, defaultAttribute) : fillOpacity && (context.setCommonStyle(line, connectedStyle, originX - offsetX, originY - offsetY, da), context.fill())), !1 !== stroke && (strokeCb ? strokeCb(context, attribute, defaultAttribute) : strokeOpacity && (context.setStrokeStyle(line, connectedStyle, originX - offsetX, originY - offsetY, da), context.stroke()));
 	    }
 	    return !1;
 	  }
@@ -18159,20 +18171,46 @@
 	    if (!(fVisible || sVisible || fillCb || strokeCb)) return;
 	    if (line.shouldUpdateShape()) {
 	      const {
-	          points: points,
-	          segments: segments,
-	          curveType = lineAttribute.curveType
-	        } = line.attribute,
-	        _points = points;
+	        points: points,
+	        segments: segments,
+	        closePath: closePath
+	      } = line.attribute;
+	      let {
+	        curveType = lineAttribute.curveType
+	      } = line.attribute;
+	      closePath && "linear" === curveType && (curveType = "linearClosed");
+	      const _points = points;
 	      if (segments && segments.length) {
 	        let startPoint, lastSeg;
-	        line.cache = segments.map((seg, index) => (1 === index ? startPoint = {
-	          x: lastSeg.endX,
-	          y: lastSeg.endY,
-	          defined: lastSeg.curves[lastSeg.curves.length - 1].defined
-	        } : index > 1 && (startPoint.x = lastSeg.endX, startPoint.y = lastSeg.endY, startPoint.defined = lastSeg.curves[lastSeg.curves.length - 1].defined), lastSeg = calcLineCache$1(seg.points, curveType, {
-	          startPoint: startPoint
-	        }), lastSeg));
+	        if (line.cache = segments.map((seg, index) => {
+	          if (seg.points.length <= 1 && 0 === index) return seg.points[0] && (lastSeg = {
+	            endX: seg.points[0].x,
+	            endY: seg.points[0].y,
+	            curves: [{
+	              defined: !1 !== seg.points[0].defined
+	            }]
+	          }), null;
+	          1 === index ? startPoint = {
+	            x: lastSeg.endX,
+	            y: lastSeg.endY,
+	            defined: lastSeg.curves[lastSeg.curves.length - 1].defined
+	          } : index > 1 && (startPoint.x = lastSeg.endX, startPoint.y = lastSeg.endY, startPoint.defined = lastSeg.curves[lastSeg.curves.length - 1].defined);
+	          const data = calcLineCache$1(seg.points, curveType, {
+	            startPoint: startPoint
+	          });
+	          return lastSeg = data, data;
+	        }).filter(item => !!item), "linearClosed" === curveType) {
+	          let startP;
+	          for (let i = 0; i < line.cache.length; i++) {
+	            const cacheItem = line.cache[i];
+	            for (let i = 0; i < cacheItem.curves.length; i++) if (cacheItem.curves[i].defined) {
+	              startP = cacheItem.curves[i].p0;
+	              break;
+	            }
+	            if (startP) break;
+	          }
+	          line.cache[line.cache.length - 1] && line.cache[line.cache.length - 1].lineTo(startP.x, startP.y, !0);
+	        }
 	      } else {
 	        if (!points || !points.length) return line.cache = null, void line.clearUpdateShapeTag();
 	        line.cache = calcLineCache$1(_points, curveType);
@@ -18184,10 +18222,11 @@
 	      clipRangeByDimension = lineAttribute.clipRangeByDimension
 	    } = line.attribute;
 	    if (Array.isArray(line.cache)) {
-	      if (1 === clipRange) {
+	      const segments = line.attribute.segments.filter(item => item.points.length);
+	      if (1 === segments[0].points.length && segments.shift(), 1 === clipRange) {
 	        let skip = !1;
 	        line.cache.forEach((cache, index) => {
-	          skip || (skip = this.drawSegmentItem(context, cache, !!fill, !!stroke, fillOpacity, strokeOpacity, line.attribute.segments[index], [lineAttribute, line.attribute], clipRange, clipRangeByDimension, x, y, line, fillCb, strokeCb));
+	          skip || (skip = this.drawSegmentItem(context, cache, !!fill, !!stroke, fillOpacity, strokeOpacity, segments[index], [lineAttribute, line.attribute], clipRange, clipRangeByDimension, x, y, line, fillCb, strokeCb));
 	        });
 	      } else {
 	        const totalLength = line.cache.reduce((l, c) => l + c.getLength(), 0),
@@ -18198,7 +18237,7 @@
 	          if (skip) return;
 	          const curSegLength = cache.getLength(),
 	            _cr = (totalDrawLength - drawedLengthUntilLast) / curSegLength;
-	          drawedLengthUntilLast += curSegLength, _cr > 0 && (skip = this.drawSegmentItem(context, cache, !!fill, !!stroke, fillOpacity, strokeOpacity, line.attribute.segments[index], [lineAttribute, line.attribute], min$2(_cr, 1), clipRangeByDimension, x, y, line, fillCb, strokeCb));
+	          drawedLengthUntilLast += curSegLength, _cr > 0 && (skip = this.drawSegmentItem(context, cache, !!fill, !!stroke, fillOpacity, strokeOpacity, segments[index], [lineAttribute, line.attribute], min$2(_cr, 1), clipRangeByDimension, x, y, line, fillCb, strokeCb));
 	        });
 	      }
 	    } else this.drawSegmentItem(context, line.cache, !!fill, !!stroke, fillOpacity, strokeOpacity, line.attribute, lineAttribute, clipRange, clipRangeByDimension, x, y, line, fillCb, strokeCb);
@@ -18416,12 +18455,20 @@
 	      } = area.attribute;
 	      if (segments && segments.length) {
 	        let startPoint, lastTopSeg;
-	        const topCaches = segments.map((seg, index) => (1 === index ? startPoint = {
-	          x: lastTopSeg.endX,
-	          y: lastTopSeg.endY
-	        } : index > 1 && (startPoint.x = lastTopSeg.endX, startPoint.y = lastTopSeg.endY), lastTopSeg = calcLineCache(seg.points, curveType, {
-	          startPoint: startPoint
-	        }), lastTopSeg));
+	        const topCaches = segments.map((seg, index) => {
+	          if (seg.points.length <= 1 && 0 === index) return seg.points[0] && (lastTopSeg = {
+	            endX: seg.points[0].x,
+	            endY: seg.points[0].y
+	          }), null;
+	          1 === index ? startPoint = {
+	            x: lastTopSeg.endX,
+	            y: lastTopSeg.endY
+	          } : index > 1 && (startPoint.x = lastTopSeg.endX, startPoint.y = lastTopSeg.endY);
+	          const data = calcLineCache(seg.points, curveType, {
+	            startPoint: startPoint
+	          });
+	          return lastTopSeg = data, data;
+	        }).filter(item => !!item);
 	        let lastBottomSeg;
 	        const bottomCaches = [];
 	        for (let i = segments.length - 1; i >= 0; i--) {
@@ -18465,10 +18512,11 @@
 	      area.clearUpdateShapeTag();
 	    }
 	    if (Array.isArray(area.cacheArea)) {
-	      if (1 === clipRange) {
+	      const segments = area.attribute.segments.filter(item => item.points.length);
+	      if (1 === segments[0].points.length && segments.shift(), 1 === clipRange) {
 	        let skip = !1;
 	        area.cacheArea.forEach((cache, index) => {
-	          skip || (skip = this.drawSegmentItem(context, cache, doFill, fillOpacity, doStroke, strokeOpacity, area.attribute.segments[index], [areaAttribute, area.attribute], clipRange, x, y, z, area, drawContext, fillCb, strokeCb));
+	          skip || (skip = this.drawSegmentItem(context, cache, doFill, fillOpacity, doStroke, strokeOpacity, segments[index], [areaAttribute, area.attribute], clipRange, x, y, z, area, drawContext, fillCb, strokeCb));
 	        });
 	      } else {
 	        const totalLength = area.cacheArea.reduce((l, c) => l + c.top.getLength(), 0),
@@ -18479,7 +18527,7 @@
 	          if (skip) return;
 	          const curSegLength = cache.top.getLength(),
 	            _cr = (totalDrawLength - drawedLengthUntilLast) / curSegLength;
-	          drawedLengthUntilLast += curSegLength, _cr > 0 && (skip = this.drawSegmentItem(context, cache, doFill, fillOpacity, doStroke, strokeOpacity, area.attribute.segments[index], [areaAttribute, area.attribute], min$2(_cr, 1), x, y, z, area, drawContext, fillCb, strokeCb));
+	          drawedLengthUntilLast += curSegLength, _cr > 0 && (skip = this.drawSegmentItem(context, cache, doFill, fillOpacity, doStroke, strokeOpacity, segments[index], [areaAttribute, area.attribute], min$2(_cr, 1), x, y, z, area, drawContext, fillCb, strokeCb));
 	        });
 	      }
 	    } else this.drawSegmentItem(context, area.cacheArea, doFill, fillOpacity, doStroke, strokeOpacity, area.attribute, areaAttribute, clipRange, x, y, z, area, drawContext, fillCb, strokeCb);
@@ -18512,7 +18560,7 @@
 	      connectedStyle: connectedStyle
 	    } = attribute;
 	    const da = [];
-	    if (connect && (isArray$3(defaultAttribute) ? (connectedType = null !== (_a = null != connectedType ? connectedType : defaultAttribute[0].connectedType) && void 0 !== _a ? _a : defaultAttribute[1].connectedType, connectedX = null !== (_b = null != connectedX ? connectedX : defaultAttribute[0].connectedX) && void 0 !== _b ? _b : defaultAttribute[1].connectedX, connectedY = null !== (_c = null != connectedY ? connectedY : defaultAttribute[0].connectedY) && void 0 !== _c ? _c : defaultAttribute[1].connectedY, connectedStyle = null !== (_d = null != connectedStyle ? connectedStyle : defaultAttribute[0].connectedStyle) && void 0 !== _d ? _d : defaultAttribute[1].connectedStyle) : (connectedType = null != connectedType ? connectedType : defaultAttribute.connectedType, connectedX = null != connectedX ? connectedX : defaultAttribute.connectedX, connectedY = null != connectedY ? connectedY : defaultAttribute.connectedY, connectedStyle = null != connectedStyle ? connectedStyle : defaultAttribute.connectedStyle), "connect" !== connectedType && "zero" !== connectedType && (connectedType = "none"), isArray$3(defaultAttribute) ? defaultAttribute.forEach(i => da.push(i)) : da.push(defaultAttribute), da.push(attribute)), connect && "none" === connectedType) return !1;
+	    if (connect && (isArray$4(defaultAttribute) ? (connectedType = null !== (_a = null != connectedType ? connectedType : defaultAttribute[0].connectedType) && void 0 !== _a ? _a : defaultAttribute[1].connectedType, connectedX = null !== (_b = null != connectedX ? connectedX : defaultAttribute[0].connectedX) && void 0 !== _b ? _b : defaultAttribute[1].connectedX, connectedY = null !== (_c = null != connectedY ? connectedY : defaultAttribute[0].connectedY) && void 0 !== _c ? _c : defaultAttribute[1].connectedY, connectedStyle = null !== (_d = null != connectedStyle ? connectedStyle : defaultAttribute[0].connectedStyle) && void 0 !== _d ? _d : defaultAttribute[1].connectedStyle) : (connectedType = null != connectedType ? connectedType : defaultAttribute.connectedType, connectedX = null != connectedX ? connectedX : defaultAttribute.connectedX, connectedY = null != connectedY ? connectedY : defaultAttribute.connectedY, connectedStyle = null != connectedStyle ? connectedStyle : defaultAttribute.connectedStyle), "connect" !== connectedType && "zero" !== connectedType && (connectedType = "none"), isArray$4(defaultAttribute) ? defaultAttribute.forEach(i => da.push(i)) : da.push(defaultAttribute), da.push(attribute)), connect && "none" === connectedType) return !1;
 	    if (!cache) return;
 	    context.beginPath();
 	    const {
@@ -18552,7 +18600,7 @@
 	      const {
 	        stroke = defaultAttribute && defaultAttribute[1] && defaultAttribute[1].stroke
 	      } = attribute;
-	      isArray$3(stroke) && (stroke[0] || stroke[2]) && !1 === stroke[1] && (context.beginPath(), drawSegments(context.camera ? context : context.nativeContext, stroke[0] ? cache.top : cache.bottom, clipRange, direction === Direction$1.ROW ? "x" : "y", {
+	      isArray$4(stroke) && (stroke[0] || stroke[2]) && !1 === stroke[1] && (context.beginPath(), drawSegments(context.camera ? context : context.nativeContext, stroke[0] ? cache.top : cache.bottom, clipRange, direction === Direction$1.ROW ? "x" : "y", {
 	        offsetX: offsetX,
 	        offsetY: offsetY,
 	        offsetZ: offsetZ,
@@ -18640,7 +18688,7 @@
 	const halfPi = pi / 2;
 	function createRectPath(path, x, y, width, height, rectCornerRadius) {
 	  let cornerRadius;
-	  if (isNumber(rectCornerRadius, !0)) cornerRadius = [rectCornerRadius, rectCornerRadius, rectCornerRadius, rectCornerRadius];else if (Array.isArray(rectCornerRadius)) {
+	  if (isNumber$1(rectCornerRadius, !0)) cornerRadius = [rectCornerRadius, rectCornerRadius, rectCornerRadius, rectCornerRadius];else if (Array.isArray(rectCornerRadius)) {
 	    const cornerRadiusArr = rectCornerRadius;
 	    switch (cornerRadiusArr.length) {
 	      case 0:
@@ -18735,7 +18783,7 @@
 	    if (!rect.valid || !visible) return;
 	    if (!doFill && !doStroke) return;
 	    if (!(fVisible || sVisible || fillCb || strokeCb || background)) return;
-	    0 === cornerRadius || isArray$3(cornerRadius) && cornerRadius.every(num => 0 === num) ? (context.beginPath(), context.rect(x, y, width, height)) : (context.beginPath(), createRectPath(context, x, y, width, height, cornerRadius)), this._rectRenderContribitions || (this._rectRenderContribitions = this.rectRenderContribitions.getContributions() || [], this._rectRenderContribitions.sort((a, b) => b.order - a.order));
+	    0 === cornerRadius || isArray$4(cornerRadius) && cornerRadius.every(num => 0 === num) ? (context.beginPath(), context.rect(x, y, width, height)) : (context.beginPath(), createRectPath(context, x, y, width, height, cornerRadius)), this._rectRenderContribitions || (this._rectRenderContribitions = this.rectRenderContribitions.getContributions() || [], this._rectRenderContribitions.sort((a, b) => b.order - a.order));
 	    const doFillOrStroke = {
 	      doFill: doFill,
 	      doStroke: doStroke
@@ -19167,7 +19215,7 @@
 	      sVisible = strokeVisible(opacity, strokeOpacity),
 	      doFill = runFill(fill, background),
 	      doStroke = runStroke(stroke, lineWidth);
-	    polygon.valid && visible && (doFill || doStroke) && (fVisible || sVisible || fillCb || strokeCb || background) && (context.beginPath(), cornerRadius <= 0 || isArray$3(cornerRadius) && cornerRadius.every(num => 0 === num) ? drawPolygon(context.camera ? context : context.nativeContext, points, x, y) : drawRoundedPolygon(context.camera ? context : context.nativeContext, points, x, y, cornerRadius), context.closePath(), this._polygonRenderContribitions || (this._polygonRenderContribitions = this.polygonRenderContribitions.getContributions() || [], this._polygonRenderContribitions.sort((a, b) => b.order - a.order)), this._polygonRenderContribitions.forEach(c => {
+	    polygon.valid && visible && (doFill || doStroke) && (fVisible || sVisible || fillCb || strokeCb || background) && (context.beginPath(), cornerRadius <= 0 || isArray$4(cornerRadius) && cornerRadius.every(num => 0 === num) ? drawPolygon(context.camera ? context : context.nativeContext, points, x, y) : drawRoundedPolygon(context.camera ? context : context.nativeContext, points, x, y, cornerRadius), context.closePath(), this._polygonRenderContribitions || (this._polygonRenderContribitions = this.polygonRenderContribitions.getContributions() || [], this._polygonRenderContribitions.sort((a, b) => b.order - a.order)), this._polygonRenderContribitions.forEach(c => {
 	      c.time === BaseRenderContributionTime.beforeFillStroke && c.drawShape(polygon, context, x, y, doFill, doStroke, fVisible, sVisible, polygonAttribute, drawContext, fillCb, strokeCb);
 	    }), context.setShadowStyle && context.setShadowStyle(polygon, polygon.attribute, polygonAttribute), doFill && (fillCb ? fillCb(context, polygon.attribute, polygonAttribute) : fillOpacity && (context.setCommonStyle(polygon, polygon.attribute, originX - x, originY - y, polygonAttribute), context.fill())), doStroke && (strokeCb ? strokeCb(context, polygon.attribute, polygonAttribute) : strokeOpacity && (context.setStrokeStyle(polygon, polygon.attribute, originX - x, originY - y, polygonAttribute), context.stroke())), this._polygonRenderContribitions.forEach(c => {
 	      c.time === BaseRenderContributionTime.afterFillStroke && c.drawShape(polygon, context, x, y, doFill, doStroke, fVisible, sVisible, polygonAttribute, drawContext, fillCb, strokeCb);
@@ -19237,7 +19285,7 @@
 	        const res = image.resources.get(url);
 	        if ("success" !== res.state) return;
 	        let needRestore = !1;
-	        0 === cornerRadius || isArray$3(cornerRadius) && cornerRadius.every(num => 0 === num) || (context.beginPath(), createRectPath(context, x, y, width, height, cornerRadius), context.save(), context.clip(), needRestore = !0), context.setCommonStyle(image, image.attribute, x, y, imageAttribute);
+	        0 === cornerRadius || isArray$4(cornerRadius) && cornerRadius.every(num => 0 === num) || (context.beginPath(), createRectPath(context, x, y, width, height, cornerRadius), context.save(), context.clip(), needRestore = !0), context.setCommonStyle(image, image.attribute, x, y, imageAttribute);
 	        let repeat = 0;
 	        if ("repeat" === repeatX && (repeat |= 1), "repeat" === repeatY && (repeat |= 2), repeat) {
 	          const pattern = context.createPattern(res.data, repeatStr[repeat]);
@@ -19311,7 +19359,7 @@
 	function createColor(context, c, params, offsetX, offsetY) {
 	  if (!c || !0 === c) return "black";
 	  let result, color;
-	  if (isArray$3(c)) for (let i = 0; i < c.length && (color = c[i], !color); i++);else color = c;
+	  if (isArray$4(c)) for (let i = 0; i < c.length && (color = c[i], !color); i++);else color = c;
 	  return "string" == typeof color ? color : ("linear" === color.gradient ? result = createLinearGradient(context, color, params, offsetX, offsetY) : "conical" === color.gradient ? result = createConicGradient(context, color, params, offsetX, offsetY) : "radial" === color.gradient && (result = createRadialGradient(context, color, params, offsetX, offsetY)), result || "orange");
 	}
 	function createLinearGradient(context, color, params) {
@@ -19796,7 +19844,7 @@
 	      }
 	      const b = graphic.AABBBounds;
 	      context.drawImage(res.data, b.x1, b.y1, b.width(), b.height()), context.restore(), graphic.transMatrix.onlyTranslate() || context.setTransformForCurrent();
-	    } else if (isObject$e(background)) {
+	    } else if (isObject$f(background)) {
 	      const {
 	        stroke: stroke,
 	        fill: fill,
@@ -19829,7 +19877,7 @@
 	    y = bounds.y1,
 	    width = bounds.width(),
 	    height = bounds.height();
-	  return isNumber(boundsPadding) ? (x += boundsPadding, y += boundsPadding, width -= 2 * boundsPadding, height -= 2 * boundsPadding) : (x += boundsPadding[3], y += boundsPadding[0], width -= boundsPadding[1] + boundsPadding[3], height -= boundsPadding[0] + boundsPadding[2]), {
+	  return isNumber$1(boundsPadding) ? (x += boundsPadding, y += boundsPadding, width -= 2 * boundsPadding, height -= 2 * boundsPadding) : (x += boundsPadding[3], y += boundsPadding[0], width -= boundsPadding[1] + boundsPadding[3], height -= boundsPadding[0] + boundsPadding[2]), {
 	    x: x,
 	    y: y,
 	    width: width,
@@ -19876,7 +19924,7 @@
 	        nextX = x - d,
 	        nextY = y - d,
 	        dw = 2 * d;
-	      if (0 === cornerRadius || isArray$3(cornerRadius) && cornerRadius.every(num => 0 === num) ? (context.beginPath(), context.rect(nextX, nextY, width + dw, height + dw)) : (context.beginPath(), createRectPath(context, nextX, nextY, width + dw, height + dw, cornerRadius)), context.setShadowStyle && context.setShadowStyle(rect, rect.attribute, rectAttribute), strokeCb) strokeCb(context, outerBorder, rectAttribute.outerBorder);else if (doStrokeOuter) {
+	      if (0 === cornerRadius || isArray$4(cornerRadius) && cornerRadius.every(num => 0 === num) ? (context.beginPath(), context.rect(nextX, nextY, width + dw, height + dw)) : (context.beginPath(), createRectPath(context, nextX, nextY, width + dw, height + dw, cornerRadius)), context.setShadowStyle && context.setShadowStyle(rect, rect.attribute, rectAttribute), strokeCb) strokeCb(context, outerBorder, rectAttribute.outerBorder);else if (doStrokeOuter) {
 	        const lastOpacity = rectAttribute.outerBorder.opacity;
 	        rectAttribute.outerBorder.opacity = opacity, context.setStrokeStyle(rect, outerBorder, (originX - x) / scaleX, (originY - y) / scaleY, rectAttribute.outerBorder), rectAttribute.outerBorder.opacity = lastOpacity, context.stroke();
 	      }
@@ -19889,7 +19937,7 @@
 	        nextX = x + d,
 	        nextY = y + d,
 	        dw = 2 * d;
-	      if (0 === cornerRadius || isArray$3(cornerRadius) && cornerRadius.every(num => 0 === num) ? (context.beginPath(), context.rect(nextX, nextY, width - dw, height - dw)) : (context.beginPath(), createRectPath(context, nextX, nextY, width - dw, height - dw, cornerRadius)), context.setShadowStyle && context.setShadowStyle(rect, rect.attribute, rectAttribute), strokeCb) strokeCb(context, innerBorder, rectAttribute.innerBorder);else if (doStrokeInner) {
+	      if (0 === cornerRadius || isArray$4(cornerRadius) && cornerRadius.every(num => 0 === num) ? (context.beginPath(), context.rect(nextX, nextY, width - dw, height - dw)) : (context.beginPath(), createRectPath(context, nextX, nextY, width - dw, height - dw, cornerRadius)), context.setShadowStyle && context.setShadowStyle(rect, rect.attribute, rectAttribute), strokeCb) strokeCb(context, innerBorder, rectAttribute.innerBorder);else if (doStrokeInner) {
 	        const lastOpacity = rectAttribute.innerBorder.opacity;
 	        rectAttribute.innerBorder.opacity = opacity, context.setStrokeStyle(rect, innerBorder, (originX - x) / scaleX, (originY - y) / scaleY, rectAttribute.innerBorder), rectAttribute.innerBorder.opacity = lastOpacity, context.stroke();
 	      }
@@ -21676,8 +21724,8 @@
 	        nativeCanvas = null === (_a = domElement.getNativeHandler) || void 0 === _a ? void 0 : _a.call(domElement).nativeCanvas;
 	      let scaleX, scaleY;
 	      return nativeCanvas && (scaleX = rect.width / nativeCanvas.offsetWidth, scaleY = rect.height / nativeCanvas.offsetHeight), {
-	        x: (x - rect.left) / (isValidNumber(scaleX) ? scaleX : 1),
-	        y: (y - rect.top) / (isValidNumber(scaleY) ? scaleX : 1)
+	        x: (x - rect.left) / (isValidNumber$1(scaleX) ? scaleX : 1),
+	        y: (y - rect.top) / (isValidNumber$1(scaleY) ? scaleX : 1)
 	      };
 	    }
 	    return {
@@ -21705,10 +21753,10 @@
 	        parent: parent
 	      } = params,
 	      element = document.createElement(tagName);
-	    if (style && (isString(style) ? element.setAttribute("style", style) : Object.keys(style).forEach(k => {
+	    if (style && (isString$1(style) ? element.setAttribute("style", style) : Object.keys(style).forEach(k => {
 	      element.setAttribute(k, style[k]);
 	    })), null != width && (element.style.width = `${width}px`), null != height && (element.style.height = `${height}px`), parent) {
-	      const pd = isString(parent) ? this.getElementById(parent) : parent;
+	      const pd = isString$1(parent) ? this.getElementById(parent) : parent;
 	      pd && pd.appendChild && pd.appendChild(element);
 	    }
 	    return element;
@@ -23647,7 +23695,7 @@
 	    throw new Error("暂未实现");
 	  }
 	  release() {
-	    this._nativeCanvas.release && isFunction(this._nativeCanvas.release) && this._nativeCanvas.release();
+	    this._nativeCanvas.release && isFunction$1(this._nativeCanvas.release) && this._nativeCanvas.release();
 	  }
 	};
 	NodeCanvas.env = "node", NodeCanvas = __decorate$M([injectable(), __metadata$v("design:paramtypes", [Object])], NodeCanvas);
@@ -24547,7 +24595,7 @@
 	      context.disableFill = !0, context.disableStroke = !0, context.disableBeginPath = !0, path.forEach(g => {
 	        drawContext.drawContribution.getRenderContribution(g).draw(g, drawContext.renderService, drawContext, params);
 	      }), context.disableFill = disableFill, context.disableStroke = disableStroke, context.disableBeginPath = disableBeginPath;
-	    } else 0 === cornerRadius || isArray$3(cornerRadius) && cornerRadius.every(num => 0 === num) ? (context.beginPath(), context.rect(x, y, width, height)) : (context.beginPath(), createRectPath(context, x, y, width, height, cornerRadius));
+	    } else 0 === cornerRadius || isArray$4(cornerRadius) && cornerRadius.every(num => 0 === num) ? (context.beginPath(), context.rect(x, y, width, height)) : (context.beginPath(), createRectPath(context, x, y, width, height, cornerRadius));
 	    this._groupRenderContribitions || (this._groupRenderContribitions = this.groupRenderContribitions.getContributions() || []);
 	    const doFillOrStroke = {
 	      doFill: doFill,
@@ -25544,7 +25592,7 @@
 	      x += point.x, y += point.y, pickContext.setTransformForCurrent();
 	    } else x = 0, y = 0, onlyTranslate = !1, pickContext.transformFromMatrix(rect.transMatrix, !0);
 	    let picked = !0;
-	    if (!onlyTranslate || isNumber(cornerRadius, !0) && 0 !== cornerRadius || isArray$3(cornerRadius) && cornerRadius.some(num => 0 !== num)) picked = !1, this.canvasRenderer.drawShape(rect, pickContext, x, y, {}, null, (context, rectAttribute, themeAttribute) => !!picked || (picked = context.isPointInPath(point.x, point.y), picked), (context, rectAttribute, themeAttribute) => {
+	    if (!onlyTranslate || isNumber$1(cornerRadius, !0) && 0 !== cornerRadius || isArray$4(cornerRadius) && cornerRadius.some(num => 0 !== num)) picked = !1, this.canvasRenderer.drawShape(rect, pickContext, x, y, {}, null, (context, rectAttribute, themeAttribute) => !!picked || (picked = context.isPointInPath(point.x, point.y), picked), (context, rectAttribute, themeAttribute) => {
 	      if (picked) return !0;
 	      const lineWidth = rectAttribute.lineWidth || themeAttribute.lineWidth;
 	      return pickContext.lineWidth = getScaledStroke(pickContext, lineWidth, pickContext.dpr), picked = context.isPointInStroke(point.x, point.y), picked;
@@ -26308,7 +26356,7 @@
 	      x += point.x, y += point.y, pickContext.setTransformForCurrent();
 	    } else x = 0, y = 0, onlyTranslate = !1, pickContext.transformFromMatrix(rect.transMatrix, !0);
 	    let picked = !0;
-	    if (!onlyTranslate || isNumber(cornerRadius, !0) && 0 !== cornerRadius || isArray$3(cornerRadius) && cornerRadius.some(num => 0 !== num)) picked = !1, this.canvasRenderer.drawShape(rect, pickContext, x, y, {}, null, (context, rectAttribute, themeAttribute) => !!picked || (picked = context.isPointInPath(point.x, point.y), picked), (context, rectAttribute, themeAttribute) => {
+	    if (!onlyTranslate || isNumber$1(cornerRadius, !0) && 0 !== cornerRadius || isArray$4(cornerRadius) && cornerRadius.some(num => 0 !== num)) picked = !1, this.canvasRenderer.drawShape(rect, pickContext, x, y, {}, null, (context, rectAttribute, themeAttribute) => !!picked || (picked = context.isPointInPath(point.x, point.y), picked), (context, rectAttribute, themeAttribute) => {
 	      if (picked) return !0;
 	      const lineWidth = rectAttribute.lineWidth || themeAttribute.lineWidth;
 	      return pickContext.lineWidth = lineWidth, picked = context.isPointInStroke(point.x, point.y), picked;
@@ -26855,10 +26903,10 @@
 	    }
 	    const { tickCount, forceTickCount, tickStep, noDecimals = false } = op;
 	    let scaleTicks;
-	    if (isValid(tickStep)) {
+	    if (isValid$1(tickStep)) {
 	        scaleTicks = scale.stepTicks(tickStep);
 	    }
-	    else if (isValid(forceTickCount)) {
+	    else if (isValid$1(forceTickCount)) {
 	        scaleTicks = scale.forceTicks(forceTickCount);
 	    }
 	    else if (op.tickMode === 'd3') {
@@ -26924,13 +26972,13 @@
 	        return convertDomainToTickData([domain[0]]);
 	    }
 	    let scaleTicks;
-	    if (isValid(tickStep)) {
+	    if (isValid$1(tickStep)) {
 	        scaleTicks = scale.stepTicks(tickStep);
 	    }
-	    else if (isValid(forceTickCount)) {
+	    else if (isValid$1(forceTickCount)) {
 	        scaleTicks = scale.forceTicks(forceTickCount);
 	    }
-	    else if (isValid(tickCount)) {
+	    else if (isValid$1(tickCount)) {
 	        scaleTicks = scale.ticks(tickCount);
 	    }
 	    else if (op.sampling) {
@@ -27068,13 +27116,13 @@
 	        return convertDomainToTickData(scale.domain());
 	    }
 	    let scaleTicks;
-	    if (isValid(tickStep)) {
+	    if (isValid$1(tickStep)) {
 	        scaleTicks = scale.stepTicks(tickStep);
 	    }
-	    else if (isValid(forceTickCount)) {
+	    else if (isValid$1(forceTickCount)) {
 	        scaleTicks = scale.forceTicks(forceTickCount);
 	    }
-	    else if (isValid(tickCount)) {
+	    else if (isValid$1(tickCount)) {
 	        scaleTicks = scale.ticks(tickCount);
 	    }
 	    else if (op.sampling) {