@visactor/vrender 1.0.32-alpha.1 → 1.0.33-alpha.0

package/cjs/index.d.ts

@@ -1,5 +1,5 @@
 import '@visactor/vrender-core';
-export declare const version = "1.0.32-alpha.1";
+export declare const version = "1.0.33-alpha.0";
 export * from '@visactor/vrender-core';
 export * from '@visactor/vrender-kits';
 export * from '@visactor/vrender-animate';

package/cjs/index.js

@@ -21,7 +21,7 @@ Object.defineProperty(exports, "__esModule", {
 
 const vrender_core_1 = require("@visactor/vrender-core"), vrender_kits_1 = require("@visactor/vrender-kits"), vrender_kits_2 = require("@visactor/vrender-kits"), vrender_animate_1 = require("@visactor/vrender-animate");
 
-exports.version = "1.0.32-alpha.1", (0, vrender_core_1.preLoadAllModule)(), (0, 
+exports.version = "1.0.33-alpha.0", (0, vrender_core_1.preLoadAllModule)(), (0, 
 vrender_core_1.isBrowserEnv)() ? (0, vrender_kits_1.loadBrowserEnv)(vrender_core_1.container) : (0, 
 vrender_core_1.isNodeEnv)() && (0, vrender_kits_1.loadNodeEnv)(vrender_core_1.container), 
 (0, vrender_kits_2.registerArc)(), (0, vrender_kits_2.registerArc3d)(), (0, vrender_kits_2.registerArea)(), 

package/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,kCAAgC;AAChC,yDAWgC;AAChC,yDAAmF;AACnF,yDAmBgC;AAChC,+DAAmF;AAEtE,QAAA,OAAO,GAAG,gBAAgB,CAAC;AAExC,IAAA,+BAAgB,GAAE,CAAC;AAEnB,IAAI,IAAA,2BAAY,GAAE,EAAE;IAClB,IAAA,6BAAc,EAAC,wBAAS,CAAC,CAAC;CAC3B;KAAM,IAAI,IAAA,wBAAS,GAAE,EAAE;IACtB,IAAA,0BAAW,EAAC,wBAAS,CAAC,CAAC;CACxB;AACD,IAAA,0BAAW,GAAE,CAAC;AACd,IAAA,4BAAa,GAAE,CAAC;AAChB,IAAA,2BAAY,GAAE,CAAC;AACf,IAAA,6BAAc,GAAE,CAAC;AACjB,IAAA,4BAAa,GAAE,CAAC;AAChB,IAAA,4BAAa,GAAE,CAAC;AAChB,IAAA,4BAAa,GAAE,CAAC;AAChB,IAAA,2BAAY,GAAE,CAAC;AACf,IAAA,2BAAY,GAAE,CAAC;AACf,IAAA,8BAAe,GAAE,CAAC;AAClB,IAAA,gCAAiB,GAAE,CAAC;AACpB,IAAA,2BAAY,GAAE,CAAC;AACf,IAAA,6BAAc,GAAE,CAAC;AACjB,IAAA,+BAAgB,GAAE,CAAC;AACnB,IAAA,iCAAkB,GAAE,CAAC;AACrB,IAAA,6BAAc,GAAE,CAAC;AACjB,IAAA,2BAAY,GAAE,CAAC;AACf,IAAA,+BAAgB,GAAE,CAAC;AACnB,IAAA,2BAAY,GAAE,CAAC;AAEf,IAAA,uCAAwB,GAAE,CAAC;AAC3B,IAAA,4CAA6B,GAAE,CAAC;AAChC,IAAA,0CAA2B,GAAE,CAAC;AAC9B,IAAA,2CAA4B,GAAE,CAAC;AAC/B,IAAA,uCAAwB,GAAE,CAAC;AAC3B,IAAA,kCAAmB,GAAE,CAAC;AAEtB,IAAA,uCAAqB,GAAE,CAAC;AACxB,IAAA,iCAAe,GAAE,CAAC;AAElB,yDAAuC;AACvC,yDAAuC;AACvC,4DAA0C;AAC1C,+DAA6C;AAG7C,6DAAkD;AAAzC,wGAAA,KAAK,OAAA;AACd,uDAAmD;AAA1C,yGAAA,SAAS,OAAA","file":"index.js","sourcesContent":["import '@visactor/vrender-core';\nimport {\n  container,\n  isBrowserEnv,\n  isNodeEnv,\n  preLoadAllModule,\n  registerFlexLayoutPlugin,\n  registerViewTransform3dPlugin,\n  registerHtmlAttributePlugin,\n  registerReactAttributePlugin,\n  registerDirectionalLight,\n  registerOrthoCamera\n} from '@visactor/vrender-core';\nimport { loadBrowserEnv, loadNodeEnv, registerStar } from '@visactor/vrender-kits';\nimport {\n  registerArc,\n  registerArc3d,\n  registerArea,\n  registerCircle,\n  registerGlyph,\n  registerGroup,\n  registerImage,\n  registerLine,\n  registerPath,\n  registerPolygon,\n  registerPyramid3d,\n  registerRect,\n  registerRect3d,\n  registerRichtext,\n  registerShadowRoot,\n  registerSymbol,\n  registerText,\n  registerWrapText\n} from '@visactor/vrender-kits';\nimport { registerCustomAnimate, registerAnimate } from '@visactor/vrender-animate';\n// 导出版本号\nexport const version = \"1.0.32-alpha.1\";\n\npreLoadAllModule();\n\nif (isBrowserEnv()) {\n  loadBrowserEnv(container);\n} else if (isNodeEnv()) {\n  loadNodeEnv(container);\n}\nregisterArc();\nregisterArc3d();\nregisterArea();\nregisterCircle();\nregisterGlyph();\nregisterGroup();\nregisterImage();\nregisterLine();\nregisterPath();\nregisterPolygon();\nregisterPyramid3d();\nregisterRect();\nregisterRect3d();\nregisterRichtext();\nregisterShadowRoot();\nregisterSymbol();\nregisterText();\nregisterWrapText();\nregisterStar();\n\nregisterFlexLayoutPlugin();\nregisterViewTransform3dPlugin();\nregisterHtmlAttributePlugin();\nregisterReactAttributePlugin();\nregisterDirectionalLight();\nregisterOrthoCamera();\n\nregisterCustomAnimate();\nregisterAnimate();\n\nexport * from '@visactor/vrender-core';\nexport * from '@visactor/vrender-kits';\nexport * from '@visactor/vrender-animate';\nexport * from '@visactor/vrender-components';\n\n// avoid naming conflicts with 'State' & 'Direction' in '@visactor/vrender-components'\nexport { State } from '@visactor/vrender-animate';\nexport { Direction } from '@visactor/vrender-core';\n"]}
+{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,kCAAgC;AAChC,yDAWgC;AAChC,yDAAmF;AACnF,yDAmBgC;AAChC,+DAAmF;AAEtE,QAAA,OAAO,GAAG,gBAAgB,CAAC;AAExC,IAAA,+BAAgB,GAAE,CAAC;AAEnB,IAAI,IAAA,2BAAY,GAAE,EAAE;IAClB,IAAA,6BAAc,EAAC,wBAAS,CAAC,CAAC;CAC3B;KAAM,IAAI,IAAA,wBAAS,GAAE,EAAE;IACtB,IAAA,0BAAW,EAAC,wBAAS,CAAC,CAAC;CACxB;AACD,IAAA,0BAAW,GAAE,CAAC;AACd,IAAA,4BAAa,GAAE,CAAC;AAChB,IAAA,2BAAY,GAAE,CAAC;AACf,IAAA,6BAAc,GAAE,CAAC;AACjB,IAAA,4BAAa,GAAE,CAAC;AAChB,IAAA,4BAAa,GAAE,CAAC;AAChB,IAAA,4BAAa,GAAE,CAAC;AAChB,IAAA,2BAAY,GAAE,CAAC;AACf,IAAA,2BAAY,GAAE,CAAC;AACf,IAAA,8BAAe,GAAE,CAAC;AAClB,IAAA,gCAAiB,GAAE,CAAC;AACpB,IAAA,2BAAY,GAAE,CAAC;AACf,IAAA,6BAAc,GAAE,CAAC;AACjB,IAAA,+BAAgB,GAAE,CAAC;AACnB,IAAA,iCAAkB,GAAE,CAAC;AACrB,IAAA,6BAAc,GAAE,CAAC;AACjB,IAAA,2BAAY,GAAE,CAAC;AACf,IAAA,+BAAgB,GAAE,CAAC;AACnB,IAAA,2BAAY,GAAE,CAAC;AAEf,IAAA,uCAAwB,GAAE,CAAC;AAC3B,IAAA,4CAA6B,GAAE,CAAC;AAChC,IAAA,0CAA2B,GAAE,CAAC;AAC9B,IAAA,2CAA4B,GAAE,CAAC;AAC/B,IAAA,uCAAwB,GAAE,CAAC;AAC3B,IAAA,kCAAmB,GAAE,CAAC;AAEtB,IAAA,uCAAqB,GAAE,CAAC;AACxB,IAAA,iCAAe,GAAE,CAAC;AAElB,yDAAuC;AACvC,yDAAuC;AACvC,4DAA0C;AAC1C,+DAA6C;AAG7C,6DAAkD;AAAzC,wGAAA,KAAK,OAAA;AACd,uDAAmD;AAA1C,yGAAA,SAAS,OAAA","file":"index.js","sourcesContent":["import '@visactor/vrender-core';\nimport {\n  container,\n  isBrowserEnv,\n  isNodeEnv,\n  preLoadAllModule,\n  registerFlexLayoutPlugin,\n  registerViewTransform3dPlugin,\n  registerHtmlAttributePlugin,\n  registerReactAttributePlugin,\n  registerDirectionalLight,\n  registerOrthoCamera\n} from '@visactor/vrender-core';\nimport { loadBrowserEnv, loadNodeEnv, registerStar } from '@visactor/vrender-kits';\nimport {\n  registerArc,\n  registerArc3d,\n  registerArea,\n  registerCircle,\n  registerGlyph,\n  registerGroup,\n  registerImage,\n  registerLine,\n  registerPath,\n  registerPolygon,\n  registerPyramid3d,\n  registerRect,\n  registerRect3d,\n  registerRichtext,\n  registerShadowRoot,\n  registerSymbol,\n  registerText,\n  registerWrapText\n} from '@visactor/vrender-kits';\nimport { registerCustomAnimate, registerAnimate } from '@visactor/vrender-animate';\n// 导出版本号\nexport const version = \"1.0.33-alpha.0\";\n\npreLoadAllModule();\n\nif (isBrowserEnv()) {\n  loadBrowserEnv(container);\n} else if (isNodeEnv()) {\n  loadNodeEnv(container);\n}\nregisterArc();\nregisterArc3d();\nregisterArea();\nregisterCircle();\nregisterGlyph();\nregisterGroup();\nregisterImage();\nregisterLine();\nregisterPath();\nregisterPolygon();\nregisterPyramid3d();\nregisterRect();\nregisterRect3d();\nregisterRichtext();\nregisterShadowRoot();\nregisterSymbol();\nregisterText();\nregisterWrapText();\nregisterStar();\n\nregisterFlexLayoutPlugin();\nregisterViewTransform3dPlugin();\nregisterHtmlAttributePlugin();\nregisterReactAttributePlugin();\nregisterDirectionalLight();\nregisterOrthoCamera();\n\nregisterCustomAnimate();\nregisterAnimate();\n\nexport * from '@visactor/vrender-core';\nexport * from '@visactor/vrender-kits';\nexport * from '@visactor/vrender-animate';\nexport * from '@visactor/vrender-components';\n\n// avoid naming conflicts with 'State' & 'Direction' in '@visactor/vrender-components'\nexport { State } from '@visactor/vrender-animate';\nexport { Direction } from '@visactor/vrender-core';\n"]}

package/dist/index.es.js

@@ -31944,6 +31944,10 @@ class AnimationTransitionRegistry {
 }
 const transitionRegistry = AnimationTransitionRegistry.getInstance();
 
+function getCustomType(custom) {
+  return custom && isFunction$1(custom) ? /^class\s/.test(Function.prototype.toString.call(custom)) ? 1 : 2 : 0;
+}
+
 class AnimateExecutor {
   static registerBuiltInAnimate(name, animate) {
     AnimateExecutor.builtInAnimateMap[name] = animate;
@@ -32008,7 +32012,7 @@ class AnimateExecutor {
           effects: effects.map(effect => {
             var _a, _b;
             const custom = null !== (_a = effect.custom) && void 0 !== _a ? _a : AnimateExecutor.builtInAnimateMap[null !== (_b = effect.type) && void 0 !== _b ? _b : "fromTo"],
-              customType = custom && isFunction$1(custom) ? /^class\s/.test(Function.prototype.toString.call(custom)) ? 1 : 2 : 0;
+              customType = getCustomType(custom);
             return Object.assign(Object.assign({}, effect), {
               custom: custom,
               customType: customType
@@ -32022,7 +32026,7 @@ class AnimateExecutor {
         duration = this.resolveValue(params.duration, child, 300);
       let oneByOneDelay = 0;
       oneByOne && (oneByOneDelay = "number" == typeof oneByOne ? oneByOne : oneByOne ? delay + delayAfter + duration : 0), parsedParams.oneByOneDelay = oneByOneDelay, parsedParams.custom = null !== (_a = params.custom) && void 0 !== _a ? _a : AnimateExecutor.builtInAnimateMap[null !== (_b = params.type) && void 0 !== _b ? _b : "fromTo"];
-      const customType = parsedParams.custom && isFunction$1(parsedParams.custom) ? /^class\s/.test(Function.prototype.toString.call(parsedParams.custom)) ? 1 : 2 : 0;
+      const customType = getCustomType(parsedParams.custom);
       if (parsedParams.customType = customType, totalTime) {
         const _totalTime = delay + delayAfter + duration + oneByOneDelay * (this._target.count - 2),
           scale = totalTime ? totalTime / _totalTime : 1;
@@ -32096,6 +32100,7 @@ class AnimateExecutor {
   _handleRunAnimate(animate, custom, customType, from, props, duration, easing, customParameters, controlOptions, options, type, graphic) {
     var _a, _b, _c, _d, _e, _f, _g, _h;
     if (custom && customType) {
+      customType = getCustomType(custom);
       let customParams = this.resolveValue(customParameters, graphic);
       "function" == typeof customParams && (customParams = customParams(null === (_b = null === (_a = graphic.context) || void 0 === _a ? void 0 : _a.data) || void 0 === _b ? void 0 : _b[0], graphic, {})), customParams = Object.assign({
         width: (null === (_c = graphic.stage) || void 0 === _c ? void 0 : _c.width) || 0,
@@ -32151,7 +32156,7 @@ class AnimateExecutor {
         from = effect.from;
       props || (parsedFromProps || (parsedFromProps = this.createPropsFromChannel(channel, graphic)), props = parsedFromProps.props), from || (parsedFromProps || (parsedFromProps = this.createPropsFromChannel(channel, graphic)), from = parsedFromProps.from);
       const custom = null !== (_a = effect.custom) && void 0 !== _a ? _a : AnimateExecutor.builtInAnimateMap[type],
-        customType = effect.customType;
+        customType = effect.custom ? effect.customType : getCustomType(custom);
       this._handleRunAnimate(animate, custom, customType, from, props, duration, easing, customParameters, controlOptions, options, type, graphic);
     }), delayAfterValue > 0 && animate.wait(delayAfterValue);
   }
@@ -41158,7 +41163,31 @@ class CircleAxis extends AxisBase {
       separation: autoHideSeparation
     }));
   }
-  afterLabelsOverlap(labelShapes, labelData, labelContainer, layer, layerCount) {}
+  afterLabelsOverlap(labelShapes, labelData, labelContainer, layer, layerCount) {
+    var _a;
+    const {
+      layoutRect: layoutRect,
+      autoLabelMaxWidth: autoLabelMaxWidth
+    } = this.attribute;
+    if (!autoLabelMaxWidth || !layoutRect || !labelShapes || 0 === labelShapes.length) return;
+    const rectRight = 0 + layoutRect.width;
+    for (let i = 0; i < labelShapes.length; i++) {
+      const label = labelShapes[i],
+        x = label.attribute.x,
+        align = null !== (_a = label.attribute.textAlign) && void 0 !== _a ? _a : "center";
+      let maxWidth = 0;
+      if ("left" === align) maxWidth = rectRight - x;else if ("right" === align) maxWidth = x - 0;else {
+        const leftDist = x - 0,
+          rightDist = rectRight - x;
+        maxWidth = 2 * Math.max(0, Math.min(leftDist, rightDist));
+      }
+      maxWidth > 0 ? label.setAttributes({
+        maxLineWidth: maxWidth
+      }) : label.setAttributes({
+        maxLineWidth: 0
+      });
+    }
+  }
   getTextBaseline(vector) {
     return Math.abs(vector[1] / vector[0]) < .3 ? "middle" : vector[1] < 0 ? "bottom" : vector[1] > 0 ? "top" : "middle";
   }
@@ -52973,7 +53002,7 @@ TableSeriesNumber.defaultAttributes = {
   select: !0
 };
 
-const version = "1.0.32-alpha.1";
+const version = "1.0.33-alpha.0";
 preLoadAllModule();
 if (isBrowserEnv()) {
     loadBrowserEnv(container);

package/dist/index.js

@@ -31950,6 +31950,10 @@
     }
     const transitionRegistry = AnimationTransitionRegistry.getInstance();
 
+    function getCustomType(custom) {
+      return custom && isFunction$1(custom) ? /^class\s/.test(Function.prototype.toString.call(custom)) ? 1 : 2 : 0;
+    }
+
     class AnimateExecutor {
       static registerBuiltInAnimate(name, animate) {
         AnimateExecutor.builtInAnimateMap[name] = animate;
@@ -32014,7 +32018,7 @@
               effects: effects.map(effect => {
                 var _a, _b;
                 const custom = null !== (_a = effect.custom) && void 0 !== _a ? _a : AnimateExecutor.builtInAnimateMap[null !== (_b = effect.type) && void 0 !== _b ? _b : "fromTo"],
-                  customType = custom && isFunction$1(custom) ? /^class\s/.test(Function.prototype.toString.call(custom)) ? 1 : 2 : 0;
+                  customType = getCustomType(custom);
                 return Object.assign(Object.assign({}, effect), {
                   custom: custom,
                   customType: customType
@@ -32028,7 +32032,7 @@
             duration = this.resolveValue(params.duration, child, 300);
           let oneByOneDelay = 0;
           oneByOne && (oneByOneDelay = "number" == typeof oneByOne ? oneByOne : oneByOne ? delay + delayAfter + duration : 0), parsedParams.oneByOneDelay = oneByOneDelay, parsedParams.custom = null !== (_a = params.custom) && void 0 !== _a ? _a : AnimateExecutor.builtInAnimateMap[null !== (_b = params.type) && void 0 !== _b ? _b : "fromTo"];
-          const customType = parsedParams.custom && isFunction$1(parsedParams.custom) ? /^class\s/.test(Function.prototype.toString.call(parsedParams.custom)) ? 1 : 2 : 0;
+          const customType = getCustomType(parsedParams.custom);
           if (parsedParams.customType = customType, totalTime) {
             const _totalTime = delay + delayAfter + duration + oneByOneDelay * (this._target.count - 2),
               scale = totalTime ? totalTime / _totalTime : 1;
@@ -32102,6 +32106,7 @@
       _handleRunAnimate(animate, custom, customType, from, props, duration, easing, customParameters, controlOptions, options, type, graphic) {
         var _a, _b, _c, _d, _e, _f, _g, _h;
         if (custom && customType) {
+          customType = getCustomType(custom);
           let customParams = this.resolveValue(customParameters, graphic);
           "function" == typeof customParams && (customParams = customParams(null === (_b = null === (_a = graphic.context) || void 0 === _a ? void 0 : _a.data) || void 0 === _b ? void 0 : _b[0], graphic, {})), customParams = Object.assign({
             width: (null === (_c = graphic.stage) || void 0 === _c ? void 0 : _c.width) || 0,
@@ -32157,7 +32162,7 @@
             from = effect.from;
           props || (parsedFromProps || (parsedFromProps = this.createPropsFromChannel(channel, graphic)), props = parsedFromProps.props), from || (parsedFromProps || (parsedFromProps = this.createPropsFromChannel(channel, graphic)), from = parsedFromProps.from);
           const custom = null !== (_a = effect.custom) && void 0 !== _a ? _a : AnimateExecutor.builtInAnimateMap[type],
-            customType = effect.customType;
+            customType = effect.custom ? effect.customType : getCustomType(custom);
           this._handleRunAnimate(animate, custom, customType, from, props, duration, easing, customParameters, controlOptions, options, type, graphic);
         }), delayAfterValue > 0 && animate.wait(delayAfterValue);
       }
@@ -41164,7 +41169,31 @@
           separation: autoHideSeparation
         }));
       }
-      afterLabelsOverlap(labelShapes, labelData, labelContainer, layer, layerCount) {}
+      afterLabelsOverlap(labelShapes, labelData, labelContainer, layer, layerCount) {
+        var _a;
+        const {
+          layoutRect: layoutRect,
+          autoLabelMaxWidth: autoLabelMaxWidth
+        } = this.attribute;
+        if (!autoLabelMaxWidth || !layoutRect || !labelShapes || 0 === labelShapes.length) return;
+        const rectRight = 0 + layoutRect.width;
+        for (let i = 0; i < labelShapes.length; i++) {
+          const label = labelShapes[i],
+            x = label.attribute.x,
+            align = null !== (_a = label.attribute.textAlign) && void 0 !== _a ? _a : "center";
+          let maxWidth = 0;
+          if ("left" === align) maxWidth = rectRight - x;else if ("right" === align) maxWidth = x - 0;else {
+            const leftDist = x - 0,
+              rightDist = rectRight - x;
+            maxWidth = 2 * Math.max(0, Math.min(leftDist, rightDist));
+          }
+          maxWidth > 0 ? label.setAttributes({
+            maxLineWidth: maxWidth
+          }) : label.setAttributes({
+            maxLineWidth: 0
+          });
+        }
+      }
       getTextBaseline(vector) {
         return Math.abs(vector[1] / vector[0]) < .3 ? "middle" : vector[1] < 0 ? "bottom" : vector[1] > 0 ? "top" : "middle";
       }
@@ -52979,7 +53008,7 @@
       select: !0
     };
 
-    const version = "1.0.32-alpha.1";
+    const version = "1.0.33-alpha.0";
     preLoadAllModule();
     if (isBrowserEnv()) {
         loadBrowserEnv(container);