@easyv/charts 1.6.15 → 1.6.16

package/lib/components/Axis.js

@@ -228,7 +228,7 @@ var Label = function Label(_ref5) {
     }
   })));
 };
-var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)( /*#__PURE__*/(0, _react.forwardRef)(function (_ref6, ref) {
+var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)(/*#__PURE__*/(0, _react.forwardRef)(function (_ref6, ref) {
   var orientation = _ref6.orientation,
     scaler = _ref6.scaler,
     _ref6$tickSize = _ref6.tickSize,

package/lib/components/Band.js

@@ -149,9 +149,9 @@ var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)(function (_ref
       y2 = yScaler(isVertical ? start : end);
     }
     var positionX = xScaler(x) - step / 2 + seriesStart + index * seriesStep;
-    var showHead, headUrl, headWidth, headHeight, headTranslate;
+    var showHead, headType, headUrl, headVideo, headWidth, headHeight, headTranslate;
     if (headDecorate) {
-      showHead = headDecorate.show, headUrl = headDecorate.url, headWidth = headDecorate.size.width, headHeight = headDecorate.size.height, headTranslate = headDecorate.translate;
+      showHead = headDecorate.show, headType = headDecorate.headType, headUrl = headDecorate.url, headVideo = headDecorate.video, headWidth = headDecorate.size.width, headHeight = headDecorate.size.height, headTranslate = headDecorate.translate;
     }
     //断轴图相关，将柱形在断轴处切开
     var setClipPath = function setClipPath() {
@@ -224,7 +224,7 @@ var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)(function (_ref
         }
       },
       "data-data": JSON.stringify(data)
-    }), headUrl && showHead && /*#__PURE__*/_react["default"].createElement("div", {
+    }), (headUrl || headVideo) && showHead && (headType == "image" ? /*#__PURE__*/_react["default"].createElement("div", {
       style: {
         position: "absolute",
         background: "url(".concat(
@@ -237,7 +237,24 @@ var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)(function (_ref
         zIndex: 1,
         transform: "translate(calc(-50% + ".concat(headTranslate.x, "px), calc(-50% + ").concat(headTranslate.y, "px))")
       }
-    }), /*#__PURE__*/_react["default"].createElement("div", {
+    }) : /*#__PURE__*/_react["default"].createElement("video", {
+      width: headWidth,
+      height: headHeight
+      //@ts-ignore
+      ,
+      src: window.appConfig.ASSETS_URL + headVideo
+      // controls={true}
+      ,
+      muted: true,
+      autoPlay: true,
+      style: {
+        position: "absolute",
+        left: isVertical ? "100%" : "50%",
+        top: isVertical ? "50%" : "0",
+        zIndex: 1,
+        transform: "translate(calc(-50% + ".concat(headTranslate.x, "px), calc(-50% + ").concat(headTranslate.y, "px))")
+      }
+    })), /*#__PURE__*/_react["default"].createElement("div", {
       style: _objectSpread({
         width: "100%",
         height: "100%",

package/lib/components/ChartContainer.js

@@ -15,7 +15,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
  * svg外框
  */
 var event = function event() {};
-var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)( /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
+var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)(/*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   var width = _ref.width,
     height = _ref.height,
     marginLeft = _ref.marginLeft,

package/lib/components/Control.js

@@ -18,7 +18,7 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)( /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
+var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)(/*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var _props$actions = props.actions,
     setX = _props$actions.setX,
     setWorking = _props$actions.setWorking,

package/lib/components/Marquee.js

@@ -17,7 +17,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
  * 文字跑马灯组件
  * eg: <Marquee value={文本内容} speed={跑马灯速度} style={额外样式}></Marquee>
  */
-var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)( /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
+var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)(/*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var value = props.value,
     style = props.style,
     _props$speed = props.speed,

package/lib/components/TextOverflow.js

@@ -17,7 +17,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
  * 文本溢出组件
  * eg: <TextOverflow  type={溢出形式} value={文本内容} speed={跑马灯速度} style={额外样式}></Marquee>
  */
-var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)( /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
+var _default = exports["default"] = /*#__PURE__*/(0, _react.memo)(/*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var type = props.type,
     value = props.value,
     style = props.style,

package/lib/utils/index.js

@@ -354,11 +354,11 @@ function band() {
   };
   scale.range = function (_) {
     var _ref11;
-    return arguments.length ? ((_ref11 = (0, _slicedToArray2["default"])(_, 2), r0 = _ref11[0], r1 = _ref11[1]), r0 = +r0, r1 = +r1, rescale()) : [r0, r1];
+    return arguments.length ? (_ref11 = (0, _slicedToArray2["default"])(_, 2), r0 = _ref11[0], r1 = _ref11[1], r0 = +r0, r1 = +r1, rescale()) : [r0, r1];
   };
   scale.rangeRound = function (_) {
     var _ref12;
-    return (_ref12 = (0, _slicedToArray2["default"])(_, 2), r0 = _ref12[0], r1 = _ref12[1]), r0 = +r0, r1 = +r1, round = true, rescale();
+    return _ref12 = (0, _slicedToArray2["default"])(_, 2), r0 = _ref12[0], r1 = _ref12[1], r0 = +r0, r1 = +r1, round = true, rescale();
   };
   scale.bandwidth = function () {
     return bandwidth;
@@ -499,7 +499,7 @@ var getBandBackground = exports.getBandBackground = function getBandBackground(p
     var _pattern$backgroundSi = pattern.backgroundSize,
       backgroundSize = _pattern$backgroundSi === void 0 ? '100% 100%' : _pattern$backgroundSi,
       _pattern = (0, _objectWithoutProperties2["default"])(pattern, _excluded);
-    return 'center top / ' + backgroundSize + ' url("data:image/svg+xml,' + encodeURIComponent((0, _server.renderToStaticMarkup)( /*#__PURE__*/React.createElement(SvgBackground, {
+    return 'center top / ' + backgroundSize + ' url("data:image/svg+xml,' + encodeURIComponent((0, _server.renderToStaticMarkup)(/*#__PURE__*/React.createElement(SvgBackground, {
       fill: fill,
       pattern: _pattern
     }))) + '")';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@easyv/charts",
-  "version": "1.6.15",
+  "version": "1.6.16",
   "description": "",
   "main": "lib/index.js",
   "scripts": {

package/src/components/Band.tsx

@@ -131,13 +131,15 @@ export default memo(
             }
             const positionX = xScaler(x) - step / 2 + seriesStart + index * seriesStep;
 
-            let showHead, headUrl, headWidth, headHeight, headTranslate;
+            let showHead, headType, headUrl, headVideo, headWidth, headHeight, headTranslate;
             if (headDecorate) {
               (showHead = headDecorate.show),
-                (headUrl = headDecorate.url),
-                (headWidth = headDecorate.size.width),
-                (headHeight = headDecorate.size.height),
-                (headTranslate = headDecorate.translate);
+              (headType = headDecorate.headType),
+              (headUrl = headDecorate.url),
+              (headVideo = headDecorate.video),
+              (headWidth = headDecorate.size.width),
+              (headHeight = headDecorate.size.height),
+              (headTranslate = headDecorate.translate);
             }
             //断轴图相关，将柱形在断轴处切开
             const setClipPath = () => {
@@ -205,8 +207,8 @@ export default memo(
                 }}
                 data-data={JSON.stringify(data)}
               >
-                {headUrl && showHead && (
-                  <div
+                {(headUrl || headVideo) && showHead && (
+                  headType=="image"?<div
                     style={{
                       position: "absolute",
                       background: `url(${
@@ -220,7 +222,21 @@ export default memo(
                       zIndex: 1,
                       transform: `translate(calc(-50% + ${headTranslate.x}px), calc(-50% + ${headTranslate.y}px))`,
                     }}
-                  ></div>
+                  ></div>:<video
+                    width={headWidth} height={headHeight} 
+                    //@ts-ignore
+                    src={window.appConfig.ASSETS_URL + headVideo}
+                    // controls={true}
+                    muted={true}
+                    autoPlay={true}
+                    style={{
+                      position: "absolute",
+                      left: isVertical ? "100%" : "50%",
+                      top: isVertical ? "50%" : "0",
+                      zIndex: 1,
+                      transform: `translate(calc(-50% + ${headTranslate.x}px), calc(-50% + ${headTranslate.y}px))`,
+                    }}
+                  ></video>
                 )}
                 <div
                   style={{

package/.husky/commit-msg

@@ -1,4 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-yarn commitlint --edit $1