@fonixtree/magic-design 0.0.150 → 0.0.151

package/lib/composite-comp/bol/components/Text/index.js

@@ -15,8 +15,6 @@ var _components = require("../../../../meta-comp/components");
 
 var _compositeDecorator = _interopRequireDefault(require("../../../../decorator/compositeDecorator"));
 
-require("./index.less");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -61,6 +59,11 @@ var __decorate = void 0 && (void 0).__decorate || function (decorators, target,
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 
+// import './index.less';
+// less to css 在线地址 https://tool.oschina.net/less
+// css 压缩地址 https://www.runoob.com/csspack
+var style = '.m-text{display: flex;flex-direction: column;}.m-text .title-wrap{font-weight:500;font-size:20px;}.m-text .sub-title{font-size:15px;color:#b7b7b7;margin-top:10px;}.m-text .group-content-wrap{width:100%;}.m-text .group-content-wrap .group-wrap-container{padding:10px 20px;}.m-text .group-content-wrap .group-wrap{display:flex;flex-direction:column;width:100%;}.m-text .group-content-wrap .group-wrap .group-title{font-size:14px;}.m-text .group-content-wrap.col-1 .group-wrap{width:100%;}.m-text .group-content-wrap.col-2{display:grid;grid-template-columns:50% 50%;}.m-text .group-content-wrap.col-3{display:grid;grid-template-columns:33.3% 33.3% 33.3%;}.m-text .group-content-wrap.mobile{display:block;}';
+
 var Text =
 /** @class */
 function (_super) {
@@ -73,18 +76,25 @@ function (_super) {
   Text.prototype.render = function () {
     var _a;
 
-    var nodeData = this.props.nodeData;
+    var _b = this.props,
+        nodeData = _b.nodeData,
+        mode = _b.mode,
+        outputType = _b.outputType;
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "m-text",
       onClick: this.onComponentClick
-    }, nodeData.title.headline.open && /*#__PURE__*/_react["default"].createElement("div", {
+    }, /*#__PURE__*/_react["default"].createElement("style", null, style), nodeData.title.headline.open && /*#__PURE__*/_react["default"].createElement("div", {
       className: "title-wrap"
     }, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
-      data: nodeData.title.headline
+      data: nodeData.title.headline,
+      mode: mode,
+      outputType: outputType
     })), nodeData.title.subtitle.open && /*#__PURE__*/_react["default"].createElement("div", {
       className: "sub-title"
     }, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
-      data: nodeData.title.subtitle
+      data: nodeData.title.subtitle,
+      mode: mode,
+      outputType: outputType
     })), /*#__PURE__*/_react["default"].createElement("div", {
       className: (0, _classnames["default"])('group-content-wrap', 'col-' + nodeData.customize.pcRowNum, (_a = {}, _a[window.magicDesign.device] = true, _a))
     }, nodeData.groupSource.map(function (group) {
@@ -99,11 +109,15 @@ function (_super) {
       }, group.content.title.open && /*#__PURE__*/_react["default"].createElement("div", {
         className: "group-title"
       }, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
-        data: group.content.title
+        data: group.content.title,
+        mode: mode,
+        outputType: outputType
       })), group.content.text.open && /*#__PURE__*/_react["default"].createElement("div", {
         className: "group-content"
       }, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
-        data: group.content.text
+        data: group.content.text,
+        mode: mode,
+        outputType: outputType
       }))));
     })));
   };

package/lib/composite-comp/bol/components/Text/index.less

@@ -1,8 +1,7 @@
 .m-text {
-  // display: flex;
-  // flex-direction: column;
-  // align-items: center;
-
+  display: flex;
+  flex-direction: column;
+  
   .title-wrap {
     font-weight: 500;
     font-size: 20px;
@@ -18,13 +17,12 @@
     width: 100%;
 
     .group-wrap-container {
-      padding: 20px;
+      padding: 10px 20px;
     }
 
     .group-wrap {
       display: flex;
       flex-direction: column;
-      margin-top: 20px;
       width: 100%;
 
       .group-title {

package/lib/composite-comp/bol/components/Video/components/ShareBtn/index.less

@@ -1,17 +1,20 @@
 .video-share-btn {
-  height: 32px;
-  width: 32px;
+  height: 44px;
+  width: 44px;
   position: relative;
   flex-shrink: 0;
   z-index: 9;
   margin-left: auto;
+  position: absolute;
+  right: 12px;
+  bottom: 12px;
 
   &.pc {
     position: absolute;
     right: 48px;
     bottom: 48px;
-    height: 50px;
-    width: 50px;
+    height: 60px;
+    width: 60px;
   }
 
   .share-img {

package/lib/composite-comp/bol/components/Video/components/VideoTag/index.js

@@ -66,14 +66,17 @@ function (_super) {
         position = _b === void 0 ? 'absolute' : _b,
         noShare = _a.noShare,
         padding = _a.padding,
-        share = _a.share;
+        share = _a.share,
+        layout = _a.layout,
+        align = _a.align;
+    var showBtn = data.video.playButton == 'Bottom Left' && !['h5-layout3', 'pc-layout4', 'pc-layout5'].includes(layout);
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "video-tag-container",
       style: {
         position: position,
         padding: padding
       }
-    }, data.video.playButton == 'Bottom Left' && /*#__PURE__*/_react["default"].createElement("div", {
+    }, showBtn && /*#__PURE__*/_react["default"].createElement("div", {
       className: "left-wrap"
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "play-btn center"
@@ -97,7 +100,10 @@ function (_super) {
     }, /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
       data: data.secondButtonTag
     }))), /*#__PURE__*/_react["default"].createElement("div", {
-      className: "text-wrap"
+      className: "text-wrap",
+      style: {
+        textAlign: align
+      }
     }, data.title.open && /*#__PURE__*/_react["default"].createElement("div", {
       className: "title-text"
     }, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {

package/lib/composite-comp/bol/components/Video/components/VideoTag/index.less

@@ -18,8 +18,8 @@
       top: 50%;
       left: 50%;
       transform: translate(-50%, -50%);
-      width: 65px;
-      height: 65px;
+      width: 60px;
+      height: 60px;
       z-index: 1;
 
       img {

package/lib/composite-comp/bol/components/Video/defaultJSON.js

@@ -170,7 +170,7 @@ var getDefaultJSON = function getDefaultJSON() {
     id: id,
     type: 'VIDEO',
     groupSource: [videoGroupSourceJSON(id)],
-    pcHeight: 792,
+    pcHeight: 600,
     mobileHeight: 212,
     share: {
       open: false,

package/lib/composite-comp/bol/components/Video/mobile/Layout1/index.js

@@ -7,6 +7,8 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
+var _index = _interopRequireDefault(require("../../components/ShareBtn/index"));
+
 var _common = require("../../../../../../common");
 
 var _playCircle = _interopRequireDefault(require("../../imgs/play-circle.png"));
@@ -145,9 +147,12 @@ function (_super) {
       }, /*#__PURE__*/_react["default"].createElement("img", {
         alt: "",
         src: _playCircle["default"]
-      })), !isPlaying && /*#__PURE__*/_react["default"].createElement(_VideoTag["default"], {
+      })), /*#__PURE__*/_react["default"].createElement(_index["default"], {
+        data: data
+      }), !isPlaying && /*#__PURE__*/_react["default"].createElement(_VideoTag["default"], {
+        align: data.customize.align,
         data: group,
-        noShare: !data.share.open,
+        noShare: true,
         share: __assign({
           url: (0, _commonUtil.addUrlQuery)(window.location.href, {
             scroll: 'node-' + data.id

package/lib/composite-comp/bol/components/Video/mobile/Layout1/index.less

@@ -16,8 +16,8 @@
       top: 50%;
       left: 50%;
       transform: translate(-50%, -50%);
-      width: 65px;
-      height: 65px;
+      width: 60px;
+      height: 60px;
       z-index: 1;
 
       img {

package/lib/composite-comp/bol/components/Video/mobile/Layout2/index.js

@@ -7,6 +7,8 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
+var _index = _interopRequireDefault(require("../../components/ShareBtn/index"));
+
 var _common = require("../../../../../../common");
 
 var _playCircle = _interopRequireDefault(require("../../imgs/play-circle.png"));
@@ -15,10 +17,10 @@ var _commonUtil = require("../../../../../../utils/commonUtil");
 
 var _coreUtil = require("../../../../../../utils/coreUtil");
 
-require("./index.less");
-
 var _VideoTag = _interopRequireDefault(require("../../components/VideoTag"));
 
+require("./index.less");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var __extends = void 0 && (void 0).__extends || function () {
@@ -69,8 +71,6 @@ var __assign = void 0 && (void 0).__assign || function () {
 /* eslint-disable no-plusplus */
 
 
-var debug = require('debug')('worker:Layout1');
-
 var Layout1 =
 /** @class */
 function (_super) {
@@ -181,14 +181,17 @@ function (_super) {
         alt: "",
         src: _playCircle["default"]
       })), !isPlaying && /*#__PURE__*/_react["default"].createElement(_VideoTag["default"], {
+        align: data.customize.align,
         data: group,
-        noShare: !data.share.open,
+        noShare: true,
         share: __assign({
           url: (0, _commonUtil.addUrlQuery)(window.location.href, {
             scroll: 'node-' + data.id
           })
         }, data.share)
       }));
+    }), /*#__PURE__*/_react["default"].createElement(_index["default"], {
+      data: data
     }))), /*#__PURE__*/_react["default"].createElement(_common.SwiperBan, {
       data: data.groupSource,
       onChange: function onChange(i) {

package/lib/composite-comp/bol/components/Video/mobile/Layout2/index.less

@@ -12,6 +12,7 @@
       display: flex;
       transform: translateX(-100%);
       transition: all .3s linear;
+      position: relative;
 
       &.noAnimation {
         animation: none;
@@ -21,7 +22,6 @@
     .video-item-wrap {
       height: 212px;
       position: relative;
-      margin-bottom: 10px;
       width: 100%;
       flex-shrink: 0;
 
@@ -34,8 +34,8 @@
         top: 50%;
         left: 50%;
         transform: translate(-50%, -50%);
-        width: 65px;
-        height: 65px;
+        width: 60px;
+        height: 60px;
         z-index: 1;
 
         img {

package/lib/composite-comp/bol/components/Video/mobile/Layout3/index.js

@@ -7,6 +7,8 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
 var _common = require("../../../../../../common");
 
 var _playCircle = _interopRequireDefault(require("../../imgs/play-circle.png"));
@@ -15,10 +17,12 @@ var _commonUtil = require("../../../../../../utils/commonUtil");
 
 var _coreUtil = require("../../../../../../utils/coreUtil");
 
-require("./index.less");
-
 var _VideoTag = _interopRequireDefault(require("../../components/VideoTag"));
 
+var _ShareBtn = _interopRequireDefault(require("../../components/ShareBtn"));
+
+require("./index.less");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var __extends = void 0 && (void 0).__extends || function () {
@@ -65,8 +69,6 @@ var __assign = void 0 && (void 0).__assign || function () {
 /* eslint-disable no-lonely-if */
 
 
-var debug = require('debug')('worker:Layout3');
-
 var Layout3 =
 /** @class */
 function (_super) {
@@ -137,14 +139,21 @@ function (_super) {
           source: group.video.sourceUrl
         }),
         videoId: group.id
-      }), !isPlaying && group.video.playButton == 'Middle' && /*#__PURE__*/_react["default"].createElement("div", {
-        className: "play-btn center"
+      }), !isPlaying && /*#__PURE__*/_react["default"].createElement("div", {
+        className: (0, _classnames["default"])('play-btn', {
+          middle: group.video.playButton == 'Middle',
+          bottomLeft: group.video.playButton == 'Bottom Left'
+        })
       }, /*#__PURE__*/_react["default"].createElement("img", {
         alt: "",
         src: _playCircle["default"]
-      }))), /*#__PURE__*/_react["default"].createElement(_VideoTag["default"], {
+      })), data.share.open && /*#__PURE__*/_react["default"].createElement(_ShareBtn["default"], {
+        data: data.share
+      })), /*#__PURE__*/_react["default"].createElement(_VideoTag["default"], {
+        align: data.customize.align,
         data: group,
-        noShare: !data.share.open,
+        layout: 'h5-' + data.customize.layout.h5Layout,
+        noShare: true,
         position: "relative",
         share: __assign({
           url: (0, _commonUtil.addUrlQuery)(window.location.href, {

package/lib/composite-comp/bol/components/Video/mobile/Layout3/index.less

@@ -7,7 +7,7 @@
     flex-direction: column;
     margin-bottom: 10px;
 
-    &:last-child{
+    &:last-child {
       margin-bottom: 0;
     }
   }
@@ -26,14 +26,27 @@
       top: 50%;
       left: 50%;
       transform: translate(-50%, -50%);
-      width: 65px;
-      height: 65px;
+      width: 60px;
+      height: 60px;
       z-index: 1;
 
       img {
         width: 100%;
         height: 100%;
       }
+
+      &.bottomLeft {
+        left: 16px;
+        bottom: 16px;
+        transform: unset;
+        top: unset;
+      }
+    }
+
+    .video-share-btn {
+      position: absolute;
+      right: 20px;
+      bottom: 20px;
     }
   }
 }

package/lib/composite-comp/bol/components/Video/pc/Layout1/index.js

@@ -65,8 +65,6 @@ var __assign = void 0 && (void 0).__assign || function () {
   return __assign.apply(this, arguments);
 };
 
-var debug = require('debug')('worker:Layout1');
-
 var Layout1 =
 /** @class */
 function (_super) {
@@ -86,7 +84,6 @@ function (_super) {
     var _this = this;
 
     var data = this.props.data;
-    console.log('data: ', data);
     var hasPlaying = Object.keys(this.videoRefMap).find(function (key) {
       return _this.videoRefMap[key].playing;
     });
@@ -145,18 +142,19 @@ function (_super) {
         alt: "",
         src: _playCircle["default"]
       })), !isPlaying && /*#__PURE__*/_react["default"].createElement(_VideoTag["default"], {
+        align: data.customize.align,
         data: group,
         noShare: true,
         padding: 48
+      }), data.share.open && !hasPlaying && /*#__PURE__*/_react["default"].createElement(_ShareBtn["default"], {
+        data: __assign({
+          url: (0, _commonUtil.addUrlQuery)(window.location.href, {
+            scroll: 'node-' + data.id
+          })
+        }, data.share),
+        pc: true
       }));
-    })), data.share.open && !hasPlaying && /*#__PURE__*/_react["default"].createElement(_ShareBtn["default"], {
-      data: __assign({
-        url: (0, _commonUtil.addUrlQuery)(window.location.href, {
-          scroll: 'node-' + data.id
-        })
-      }, data.share),
-      pc: true
-    }));
+    })));
   };
 
   Layout1.defaultProps = {};

package/lib/composite-comp/bol/components/Video/pc/Layout2/index.js

@@ -85,15 +85,16 @@ function (_super) {
   Layout2.prototype.render = function () {
     var _this = this;
 
-    var _a;
-
     var data = this.props.data;
-    console.log('data: ', data);
     var hasPlaying = Object.keys(this.videoRefMap).find(function (key) {
       return _this.videoRefMap[key].playing;
     });
     var firstGroup = data.groupSource[0] || null;
-    var isFirstGroupPlaying = !!((_a = this.videoRefMap[firstGroup.id]) === null || _a === void 0 ? void 0 : _a.playing);
+    var isFirstGroupPlaying = (0, _commonUtil.ensure)(function () {
+      var _a;
+
+      return !!((_a = _this.videoRefMap[firstGroup.id]) === null || _a === void 0 ? void 0 : _a.playing);
+    }, false);
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "video-pc-layout2-wrap",
       style: {
@@ -139,6 +140,7 @@ function (_super) {
       alt: "",
       src: _playCircle["default"]
     })), !isFirstGroupPlaying && /*#__PURE__*/_react["default"].createElement(_VideoTag["default"], {
+      align: data.customize.align,
       data: firstGroup,
       noShare: true,
       padding: 32
@@ -194,6 +196,7 @@ function (_super) {
         alt: "",
         src: _playCircle["default"]
       })), data.share.open && !isPlaying && /*#__PURE__*/_react["default"].createElement(_VideoTag["default"], {
+        align: data.customize.align,
         data: group,
         noShare: true,
         padding: 32

package/lib/composite-comp/bol/components/Video/pc/Layout3/index.js

@@ -151,6 +151,7 @@ function (_super) {
         alt: "",
         src: _playCircle["default"]
       })), data.share.open && !isPlaying && /*#__PURE__*/_react["default"].createElement(_VideoTag["default"], {
+        align: data.customize.align,
         data: group,
         noShare: true,
         padding: 20

package/lib/composite-comp/bol/components/Video/pc/Layout4/index.js

@@ -7,6 +7,8 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
 var _common = require("../../../../../../common");
 
 var _playCircle = _interopRequireDefault(require("../../imgs/play-circle.png"));
@@ -137,8 +139,11 @@ function (_super) {
           source: group.video.sourceUrl
         }),
         videoId: group.id
-      }), !isPlaying && group.video.playButton == 'Middle' && /*#__PURE__*/_react["default"].createElement("div", {
-        className: "play-btn center"
+      }), !isPlaying && /*#__PURE__*/_react["default"].createElement("div", {
+        className: (0, _classnames["default"])('play-btn', {
+          middle: group.video.playButton == 'Middle',
+          bottomLeft: group.video.playButton == 'Bottom Left'
+        })
       }, /*#__PURE__*/_react["default"].createElement("img", {
         alt: "",
         src: _playCircle["default"]
@@ -153,7 +158,9 @@ function (_super) {
       })), /*#__PURE__*/_react["default"].createElement("div", {
         className: "video-tag-wrap"
       }, /*#__PURE__*/_react["default"].createElement(_VideoTag["default"], {
+        align: data.customize.align,
         data: group,
+        layout: 'pc-' + data.customize.layout.pcLayout,
         noShare: true,
         position: "relative"
       })));

package/lib/composite-comp/bol/components/Video/pc/Layout4/index.less

@@ -2,13 +2,13 @@
   display: flex;
   flex-direction: column;
 
-  .video-container-wrap{
+  .video-container-wrap {
     display: flex;
     align-items: center;
     padding: 0px 40px;
     margin-bottom: 40px;
 
-    &:last-child{
+    &:last-child {
       margin-bottom: 0;
     }
   }
@@ -18,7 +18,7 @@
     position: relative;
     width: 440px;
 
-    &:last-child{
+    &:last-child {
       margin-bottom: 0;
     }
 
@@ -35,10 +35,17 @@
         width: 100%;
         height: 100%;
       }
+
+      &.bottomLeft {
+        left: 16px;
+        bottom: 16px;
+        transform: unset;
+        top: unset;
+      }
     }
   }
 
-  .video-tag-wrap{
+  .video-tag-wrap {
     padding: 40px;
     flex: 1;
   }

package/lib/composite-comp/bol/components/Video/pc/Layout5/index.js

@@ -7,6 +7,8 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
 var _common = require("../../../../../../common");
 
 var _playCircle = _interopRequireDefault(require("../../imgs/play-circle.png"));
@@ -137,8 +139,11 @@ function (_super) {
           source: group.video.sourceUrl
         }),
         videoId: group.id
-      }), !isPlaying && group.video.playButton == 'Middle' && /*#__PURE__*/_react["default"].createElement("div", {
-        className: "play-btn center"
+      }), !isPlaying && /*#__PURE__*/_react["default"].createElement("div", {
+        className: (0, _classnames["default"])('play-btn', {
+          middle: group.video.playButton == 'Middle',
+          bottomLeft: group.video.playButton == 'Bottom Left'
+        })
       }, /*#__PURE__*/_react["default"].createElement("img", {
         alt: "",
         src: _playCircle["default"]
@@ -153,7 +158,9 @@ function (_super) {
       })), /*#__PURE__*/_react["default"].createElement("div", {
         className: "video-tag-wrap"
       }, /*#__PURE__*/_react["default"].createElement(_VideoTag["default"], {
+        align: data.customize.align,
         data: group,
+        layout: 'pc-' + data.customize.layout.pcLayout,
         noShare: true,
         position: "relative"
       })));

package/lib/composite-comp/bol/components/Video/pc/Layout5/index.less

@@ -24,14 +24,21 @@
       top: 50%;
       left: 50%;
       transform: translate(-50%, -50%);
-      width: 65px;
-      height: 65px;
+      width: 60px;
+      height: 60px;
       z-index: 1;
 
       img {
         width: 100%;
         height: 100%;
       }
+
+      &.bottomLeft {
+        left: 16px;
+        bottom: 16px;
+        transform: unset;
+        top: unset;
+      }
     }
   }
 

package/lib/composite-comp/bol/components/Video/pc/index.js

@@ -17,6 +17,8 @@ var _Layout4 = _interopRequireDefault(require("./Layout4"));
 
 var _Layout5 = _interopRequireDefault(require("./Layout5"));
 
+var _commonUtil = require("../../../../../utils/commonUtil");
+
 require("./index.less");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -97,6 +99,13 @@ function (_super) {
       return __assign({}, wrapStyle);
     };
 
+    _this.keyDoFunc = function (data) {
+      data.groupSource.forEach(function (group) {
+        Reflect.deleteProperty(group, 'text');
+        Reflect.deleteProperty(group, 'title');
+      });
+    };
+
     return _this;
   }
 
@@ -105,19 +114,19 @@ function (_super) {
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "m-video-mobile"
     }, data.customize.layout.pcLayout == 'layout1' && /*#__PURE__*/_react["default"].createElement(_Layout["default"], {
-      key: JSON.stringify(data),
+      key: (0, _commonUtil.covertKey)(data, this.keyDoFunc),
       data: data
     }), data.customize.layout.pcLayout == 'layout2' && /*#__PURE__*/_react["default"].createElement(_Layout2["default"], {
-      key: JSON.stringify(data),
+      key: (0, _commonUtil.covertKey)(data, this.keyDoFunc),
       data: data
     }), data.customize.layout.pcLayout == 'layout3' && /*#__PURE__*/_react["default"].createElement(_Layout3["default"], {
-      key: JSON.stringify(data),
+      key: (0, _commonUtil.covertKey)(data, this.keyDoFunc),
       data: data
     }), data.customize.layout.pcLayout == 'layout4' && /*#__PURE__*/_react["default"].createElement(_Layout4["default"], {
-      key: JSON.stringify(data),
+      key: (0, _commonUtil.covertKey)(data, this.keyDoFunc),
       data: data
     }), data.customize.layout.pcLayout == 'layout5' && /*#__PURE__*/_react["default"].createElement(_Layout5["default"], {
-      key: JSON.stringify(data),
+      key: (0, _commonUtil.covertKey)(data, this.keyDoFunc),
       data: data
     }));
   };