@visactor/react-vtable 1.10.6-alpha.0 → 1.10.6-alpha.1

package/cjs/index.d.ts

@@ -1,4 +1,4 @@
 export * from './tables';
 export * from './table-components';
 export * from './components';
-export declare const version = "1.10.6-alpha.0";
+export declare const version = "1.10.6-alpha.1";

package/cjs/index.js

@@ -18,5 +18,5 @@ var __createBinding = this && this.__createBinding || (Object.create ? function(
 Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.version = void 0, __exportStar(require("./tables"), exports), __exportStar(require("./table-components"), exports), 
-__exportStar(require("./components"), exports), exports.version = "1.10.6-alpha.0";
+__exportStar(require("./components"), exports), exports.version = "1.10.6-alpha.1";
 //# sourceMappingURL=index.js.map

package/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,2CAAyB;AACzB,qDAAmC;AACnC,+CAA6B;AAEhB,QAAA,OAAO,GAAG,gBAAgB,CAAC","file":"index.js","sourcesContent":["export * from './tables';\nexport * from './table-components';\nexport * from './components';\n\nexport const version = \"1.10.6-alpha.0\";\n"]}
+{"version":3,"sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,2CAAyB;AACzB,qDAAmC;AACnC,+CAA6B;AAEhB,QAAA,OAAO,GAAG,gBAAgB,CAAC","file":"index.js","sourcesContent":["export * from './tables';\nexport * from './table-components';\nexport * from './components';\n\nexport const version = \"1.10.6-alpha.1\";\n"]}

package/dist/react-vtable.js

@@ -2891,12 +2891,11 @@
 	  for (let i = 0, len = paths.length; i < len; i++) if (currPath = paths[i], coordsStr = currPath.slice(1), commandChar = currPath[0], currCommandData = [commandChar], coordsStrArr = coordsStr.match(rePathCommand), null !== coordsStrArr) {
 	    for (let i = 0, len = coordsStrArr.length; i < len; i++) coordStr = coordsStrArr[i], coordNumber = parseFloat(coordStr), Number.isNaN(coordNumber) || currCommandData.push(coordNumber);
 	    if (standardCommandLen = commandLengths[commandChar], currCommandData.length - 1 > standardCommandLen) {
-	      let subCommand,
-	        bestCommandChar = commandChar;
+	      let subCommand;
 	      for (let i = 1, len = currCommandData.length; i < len; i += standardCommandLen) {
-	        subCommand = [bestCommandChar];
+	        subCommand = [commandChar];
 	        for (let j = i, subLen = i + standardCommandLen; j < subLen; j++) subCommand.push(currCommandData[j]);
-	        result.push(subCommand), "m" === bestCommandChar ? bestCommandChar = "l" : "M" === bestCommandChar && (bestCommandChar = "L");
+	        result.push(subCommand);
 	      }
 	    } else result.push(currCommandData);
 	  } else result.push(currCommandData);
@@ -4084,7 +4083,6 @@
 	  zIndex: 0,
 	  layout: null,
 	  boundsPadding: 0,
-	  fillStrokeOrder: 0,
 	  renderStyle: "default",
 	  pickMode: "accurate",
 	  customPickShape: null,
@@ -4155,7 +4153,6 @@
 	});
 	const DefaultPathAttribute = Object.assign(Object.assign({}, DefaultAttribute), {
 	  path: new CustomPath2D(),
-	  fillStrokeOrder: 1,
 	  customPath: () => {
 	    Logger.getInstance().warn("空函数");
 	  }
@@ -5699,7 +5696,7 @@
 	  }
 	  static GetFile(url, type) {
 	    let data = ResourceLoader.cache.get(url);
-	    return data ? "fail" === data.loadState ? Promise.reject() : "init" === data.loadState || "loading" === data.loadState ? data.dataPromise.then(data => data.data) : Promise.resolve(data.data) : (data = {
+	    return data ? "init" === data.loadState || "fail" === data.loadState ? Promise.reject() : "loading" === data.loadState ? data.dataPromise.then(data => data.data) : Promise.resolve(data.data) : (data = {
 	      type: type,
 	      loadState: "init"
 	    }, ResourceLoader.cache.set(url, data), "arrayBuffer" === type ? data.dataPromise = application.global.loadArrayBuffer(url) : "blob" === type ? data.dataPromise = application.global.loadBlob(url) : "json" === type && (data.dataPromise = application.global.loadJson(url)), data.dataPromise.then(data => data.data));
@@ -7913,9 +7910,8 @@
 	  constructor() {
 	    super(...arguments), this.time = BaseRenderContributionTime.afterFillStroke, this.useStyle = !0, this.order = 0;
 	  }
-	  drawShape(image, context, x, y, doFill, doStroke, fVisible, sVisible, rectAttribute, drawContext, fillCb, strokeCb) {
-	    if (!(image.isGifImage && image.renderFrame && image.playing)) return super.drawShape(image, context, x, y, doFill, doStroke, fVisible, sVisible, rectAttribute, drawContext, fillCb, strokeCb);
-	    image.renderFrame(context, x, y);
+	  drawShape(rect, context, x, y, doFill, doStroke, fVisible, sVisible, rectAttribute, drawContext, fillCb, strokeCb) {
+	    return super.drawShape(rect, context, x, y, doFill, doStroke, fVisible, sVisible, rectAttribute, drawContext, fillCb, strokeCb);
 	  }
 	}
 	const defaultImageRenderContribution = new DefaultImageRenderContribution();
@@ -7997,8 +7993,7 @@
 	        x1: x1,
 	        y1: y1,
 	        x: originX = rectAttribute.x,
-	        y: originY = rectAttribute.y,
-	        fillStrokeOrder = rectAttribute.fillStrokeOrder
+	        y: originY = rectAttribute.y
 	      } = rect.attribute;
 	    let {
 	      width: width,
@@ -8017,14 +8012,7 @@
 	      doFill: doFill,
 	      doStroke: doStroke
 	    };
-	    context.setShadowBlendStyle && context.setShadowBlendStyle(rect, rect.attribute, rectAttribute), this.beforeRenderStep(rect, context, x, y, doFill, doStroke, fVisible, sVisible, rectAttribute, drawContext, fillCb, strokeCb, doFillOrStroke);
-	    const _runFill = () => {
-	        doFillOrStroke.doFill && (fillCb ? fillCb(context, rect.attribute, rectAttribute) : fVisible && (context.setCommonStyle(rect, rect.attribute, originX - x, originY - y, rectAttribute), context.fill()));
-	      },
-	      _runStroke = () => {
-	        doFillOrStroke.doStroke && (strokeCb ? strokeCb(context, rect.attribute, rectAttribute) : sVisible && (context.setStrokeStyle(rect, rect.attribute, originX - x, originY - y, rectAttribute), context.stroke()));
-	      };
-	    fillStrokeOrder ? (_runStroke(), _runFill()) : (_runFill(), _runStroke()), this.afterRenderStep(rect, context, x, y, doFill, doStroke, fVisible, sVisible, rectAttribute, drawContext, fillCb, strokeCb);
+	    context.setShadowBlendStyle && context.setShadowBlendStyle(rect, rect.attribute, rectAttribute), this.beforeRenderStep(rect, context, x, y, doFill, doStroke, fVisible, sVisible, rectAttribute, drawContext, fillCb, strokeCb, doFillOrStroke), doFillOrStroke.doFill && (fillCb ? fillCb(context, rect.attribute, rectAttribute) : fVisible && (context.setCommonStyle(rect, rect.attribute, originX - x, originY - y, rectAttribute), context.fill())), doFillOrStroke.doStroke && (strokeCb ? strokeCb(context, rect.attribute, rectAttribute) : sVisible && (context.setStrokeStyle(rect, rect.attribute, originX - x, originY - y, rectAttribute), context.stroke())), this.afterRenderStep(rect, context, x, y, doFill, doStroke, fVisible, sVisible, rectAttribute, drawContext, fillCb, strokeCb);
 	  }
 	  draw(rect, renderService, drawContext, params) {
 	    const rectAttribute = getTheme(rect, null == params ? void 0 : params.theme).rect;
@@ -8060,8 +8048,7 @@
 	        x: originX = symbolAttribute.x,
 	        y: originY = symbolAttribute.y,
 	        scaleX = symbolAttribute.scaleX,
-	        scaleY = symbolAttribute.scaleY,
-	        fillStrokeOrder = symbolAttribute.fillStrokeOrder
+	        scaleY = symbolAttribute.scaleY
 	      } = symbol.attribute,
 	      data = this.valid(symbol, symbolAttribute, fillCb, strokeCb);
 	    if (!data) return;
@@ -8084,27 +8071,14 @@
 	        const obj = Object.assign({}, a);
 	        obj.fill = null !== (_a = a.fill) && void 0 !== _a ? _a : symbol.attribute.fill, obj.opacity = null !== (_b = a.opacity) && void 0 !== _b ? _b : symbol.attribute.opacity, obj.fillOpacity = symbol.attribute.fillOpacity, obj.stroke = null !== (_c = a.stroke) && void 0 !== _c ? _c : symbol.attribute.stroke, a = obj;
 	      }
-	      const _runFill = () => {
-	          a.fill && (fillCb ? fillCb(context, symbol.attribute, symbolAttribute) : (context.setCommonStyle(symbol, a, originX - x, originY - y, symbolAttribute), context.fill()));
-	        },
-	        _runStroke = () => {
-	          a.stroke && (strokeCb ? strokeCb(context, symbol.attribute, symbolAttribute) : (context.setStrokeStyle(symbol, a, (originX - x) / scaleX, (originY - y) / scaleY, symbolAttribute), context.stroke()));
-	        };
-	      fillStrokeOrder ? (_runStroke(), _runFill()) : (_runFill(), _runStroke());
+	      a.fill && (fillCb ? fillCb(context, symbol.attribute, symbolAttribute) : (context.setCommonStyle(symbol, a, originX - x, originY - y, symbolAttribute), context.fill())), a.stroke && (strokeCb ? strokeCb(context, symbol.attribute, symbolAttribute) : (context.setStrokeStyle(symbol, a, (originX - x) / scaleX, (originY - y) / scaleY, symbolAttribute), context.stroke()));
 	    };
 	    if (keepDirIn3d && context.camera && context.project) {
 	      const p = context.project(x, y, z),
 	        camera = context.camera;
 	      context.camera = null, !1 === parsedPath.draw(context, isArray$1(size) ? [size[0] * scaleX, size[1] * scaleY] : size * scaleX, p.x, p.y, void 0, callback) && context.closePath(), context.camera = camera;
 	    } else !1 === parsedPath.draw(context, size, x, y, z, callback) && context.closePath();
-	    context.setShadowBlendStyle && context.setShadowBlendStyle(symbol, symbol.attribute, symbolAttribute), this.beforeRenderStep(symbol, context, x, y, doFill, doStroke, fVisible, sVisible, symbolAttribute, drawContext, fillCb, strokeCb);
-	    const _runFill = () => {
-	        doFill && !parsedPath.isSvg && (fillCb ? fillCb(context, symbol.attribute, symbolAttribute) : fVisible && (context.setCommonStyle(symbol, symbol.attribute, originX - x, originY - y, symbolAttribute), context.fill()));
-	      },
-	      _runStroke = () => {
-	        doStroke && !parsedPath.isSvg && (strokeCb ? strokeCb(context, symbol.attribute, symbolAttribute) : sVisible && (context.setStrokeStyle(symbol, symbol.attribute, (originX - x) / scaleX, (originY - y) / scaleY, symbolAttribute), context.stroke()));
-	      };
-	    fillStrokeOrder ? (_runStroke(), _runFill()) : (_runFill(), _runStroke()), this.afterRenderStep(symbol, context, x, y, doFill, doStroke, fVisible, sVisible, symbolAttribute, drawContext, fillCb, strokeCb);
+	    context.setShadowBlendStyle && context.setShadowBlendStyle(symbol, symbol.attribute, symbolAttribute), this.beforeRenderStep(symbol, context, x, y, doFill, doStroke, fVisible, sVisible, symbolAttribute, drawContext, fillCb, strokeCb), doFill && !parsedPath.isSvg && (fillCb ? fillCb(context, symbol.attribute, symbolAttribute) : fVisible && (context.setCommonStyle(symbol, symbol.attribute, originX - x, originY - y, symbolAttribute), context.fill())), doStroke && !parsedPath.isSvg && (strokeCb ? strokeCb(context, symbol.attribute, symbolAttribute) : sVisible && (context.setStrokeStyle(symbol, symbol.attribute, (originX - x) / scaleX, (originY - y) / scaleY, symbolAttribute), context.stroke())), this.afterRenderStep(symbol, context, x, y, doFill, doStroke, fVisible, sVisible, symbolAttribute, drawContext, fillCb, strokeCb);
 	  }
 	  draw(symbol, renderService, drawContext, params) {
 	    const symbolAttribute = getTheme(symbol, null == params ? void 0 : params.theme).symbol;
@@ -8428,7 +8402,6 @@
 	        x: originX = imageAttribute.x,
 	        y: originY = imageAttribute.y,
 	        cornerRadius = imageAttribute.cornerRadius,
-	        fillStrokeOrder = imageAttribute.fillStrokeOrder,
 	        image: url
 	      } = image.attribute,
 	      data = this.valid(image, imageAttribute, fillCb);
@@ -8439,37 +8412,29 @@
 	      doFill: doFill,
 	      doStroke: doStroke
 	    } = data;
-	    context.setShadowBlendStyle && context.setShadowBlendStyle(image, imageAttribute), this.beforeRenderStep(image, context, x, y, doFill, !1, fVisible, !1, imageAttribute, drawContext, fillCb);
-	    const _runFill = () => {
-	        if (doFill) if (fillCb) fillCb(context, image.attribute, imageAttribute);else if (fVisible) {
-	          if (!url || !image.resources) return;
-	          const res = image.resources.get(url);
-	          if ("success" !== res.state) return;
-	          let needRestore = !1;
-	          0 === cornerRadius || isArray$1(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]);
-	            context.fillStyle = pattern, context.translate(x, y, !0), context.fillRect(0, 0, width, height), context.translate(-x, -y, !0);
-	          } else context.drawImage(res.data, x, y, width, height);
-	          needRestore && context.restore();
-	        }
-	      },
-	      _runStroke = () => {
-	        doStroke && (strokeCb ? strokeCb(context, image.attribute, imageAttribute) : sVisible && (context.setStrokeStyle(image, image.attribute, originX - x, originY - y, imageAttribute), context.stroke()));
-	      };
-	    fillStrokeOrder ? (_runStroke(), _runFill()) : (_runFill(), _runStroke()), this.afterRenderStep(image, context, x, y, doFill, !1, fVisible, !1, imageAttribute, drawContext, fillCb);
+	    if (context.setShadowBlendStyle && context.setShadowBlendStyle(image, imageAttribute), this.beforeRenderStep(image, context, x, y, doFill, !1, fVisible, !1, imageAttribute, drawContext, fillCb), doFill) if (fillCb) fillCb(context, image.attribute, imageAttribute);else if (fVisible) {
+	      if (!url || !image.resources) return;
+	      const res = image.resources.get(url);
+	      if ("success" !== res.state) return;
+	      let needRestore = !1;
+	      0 === cornerRadius || isArray$1(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]);
+	        context.fillStyle = pattern, context.translate(x, y, !0), context.fillRect(0, 0, width, height), context.translate(-x, -y, !0);
+	      } else context.drawImage(res.data, x, y, width, height);
+	      needRestore && context.restore();
+	    }
+	    doStroke && (strokeCb ? strokeCb(context, image.attribute, imageAttribute) : sVisible && (context.setStrokeStyle(image, image.attribute, originX - x, originY - y, imageAttribute), context.stroke())), this.afterRenderStep(image, context, x, y, doFill, !1, fVisible, !1, imageAttribute, drawContext, fillCb);
 	  }
 	  draw(image, renderService, drawContext) {
 	    const {
 	      image: url
 	    } = image.attribute;
-	    if (!image.isGifImage) {
-	      if (!url || !image.resources) return;
-	      const res = image.resources.get(url);
-	      if ("loading" === res.state && isString$1(url)) return void ResourceLoader.improveImageLoading(url);
-	      if ("success" !== res.state) return;
-	    }
+	    if (!url || !image.resources) return;
+	    const res = image.resources.get(url);
+	    if ("loading" === res.state && isString$1(url)) return void ResourceLoader.improveImageLoading(url);
+	    if ("success" !== res.state) return;
 	    const {
 	      context: context
 	    } = renderService.drawParams;
@@ -19573,7 +19538,7 @@
 	const Checkbox = React.forwardRef(CheckboxComponent);
 	Checkbox.displayName = 'Checkbox';
 
-	const version = "1.10.6-alpha.0";
+	const version = "1.10.6-alpha.1";
 
 	Object.defineProperty(exports, 'register', {
 		enumerable: true,