@fonixtree/magic-design 0.0.132 → 0.0.136

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
     }));
   };

package/lib/composite-comp/dito/components/PcNavigation/pc/index.less

@@ -97,6 +97,7 @@
     .one-category {
       margin-right: 44px;
       scroll-snap-align: end;
+      width: fit-content !important;
       cursor: pointer;
       &:last-of-type {
         margin-right: 0;

package/lib/composite-comp/dito/components/Recommend/defaultJSON.js

@@ -100,7 +100,7 @@ var recommendGroupSourceJSON = function recommendGroupSourceJSON(parentId, logo,
     },
     sourceType: 'recommend',
     prodIds: '',
-    intelligentType: '',
+    intelligentType: 'Hot',
     intelligentValue: [],
     maxProdNum: 10,
     hover: {

package/lib/composite-comp/dito/second-config-panels/RecommendSecondConfig/AIRecommendation/index.js

@@ -215,7 +215,7 @@ function (_super) {
     var _this = _super !== null && _super.apply(this, arguments) || this;
 
     _this.state = {
-      intelligentType: 'ALL',
+      intelligentType: 'Hot',
       intelligentValue: [],
       categoryData: [],
       brandData: [],
@@ -255,7 +255,7 @@ function (_super) {
               ];
               return [4
               /*yield*/
-              , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/offercatgs/list")];
+              , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/operation/v1/offercatgs/list")];
 
             case 1:
               res = _a.sent();
@@ -275,7 +275,7 @@ function (_super) {
               ];
               return [4
               /*yield*/
-              , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/brands/list")];
+              , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/operation/v1/brands/list")];
 
             case 3:
               res = _a.sent();
@@ -295,7 +295,7 @@ function (_super) {
               ];
               return [4
               /*yield*/
-              , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/labels/list")];
+              , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/operation/v1/labels/list")];
 
             case 5:
               res = _a.sent();
@@ -356,8 +356,6 @@ function (_super) {
       showSearch: true,
       value: intelligentType
     }, /*#__PURE__*/_react["default"].createElement(Option, {
-      value: "ALL"
-    }, (0, _locale.i18n)('ALL')), /*#__PURE__*/_react["default"].createElement(Option, {
       value: "Hot"
     }, (0, _locale.i18n)('HOT')), /*#__PURE__*/_react["default"].createElement(Option, {
       value: "Like"

package/lib/core/Designer/ConfigPanel/index.js

@@ -217,7 +217,7 @@ function (_super) {
     };
 
     _this.getSecondConfigName = function () {
-      var _a, _b, _c, _d, _e, _f;
+      var _a, _b, _c, _d, _e;
 
       var selectedNode = _this.state.selectedNode;
 
@@ -228,6 +228,9 @@ function (_super) {
       var panelProps = selectedNode.groupSource.find(function (src) {
         return src.id === _this.state.clickedGroup;
       });
+      var panelIndex = selectedNode.groupSource.findIndex(function (src) {
+        return src.id === _this.state.clickedGroup;
+      });
 
       if (!panelProps) {
         return;
@@ -249,14 +252,20 @@ function (_super) {
 
         case 'MOBILE_NAVIGATION':
         case 'PC_NAVIGATION':
-          groupName = ((_f = panelProps.groupName) === null || _f === void 0 ? void 0 : _f.title.text) || (0, _locale.i18n)('NAVIGATION_NAME');
+          groupName = (panelProps === null || panelProps === void 0 ? void 0 : panelProps.title.text) || (0, _locale.i18n)('NAVIGATION_NAME');
           break;
 
         case 'RECOMMEND':
           groupName = panelProps.groupName.text;
+          break;
+
+        case 'VIDEO':
+          groupName = 'Video' + (panelIndex + 1);
+          break;
 
         case 'TAG':
           groupName = '';
+          break;
       }
 
       return groupName || 'Group Name';

package/lib/utils/commonUtil.js

@@ -9,6 +9,7 @@ exports.checkFileName = exports.calcLastTime = void 0;
 exports.commonFetch = commonFetch;
 exports.convertImageUrl = convertImageUrl;
 exports.copy2ClipBoard = copy2ClipBoard;
+exports.covertKey = covertKey;
 exports.dragSource = void 0;
 exports.ensure = ensure;
 exports.getColorRgba = void 0;
@@ -22,6 +23,8 @@ exports.styleStringify = void 0;
 
 var _axios = _interopRequireDefault(require("axios"));
 
+var _lodash = require("lodash");
+
 var _qs = _interopRequireDefault(require("qs"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -463,4 +466,12 @@ function pushGA(data) {
     pageName_moduleName_groupName: 'pageName_moduleName_groupName' + random,
     pageName_moduleName_groupName_elementNam: 'pageName_moduleName_groupName_elementNam' + random
   }, data)); // }, 1000);
+}
+/** react key 计算 */
+
+
+function covertKey(data, func) {
+  var newData = (0, _lodash.cloneDeep)(data);
+  func(newData);
+  return JSON.stringify(newData);
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fonixtree/magic-design",
   "author": "Cylon Team",
-  "version": "0.0.132",
+  "version": "0.0.136",
   "description": "Magic Design",
   "license": "MIT",
   "module": "es/index.js",