@fonixtree/magic-design 1.0.142 → 1.0.145

package/lib/common/VideoPC/index.less

@@ -0,0 +1,79 @@
+.video-container {
+  position: relative;
+  height: 100%;
+  background-image: linear-gradient(0, rgba(0, 0, 0, .2), rgba(0, 0, 0, .1), rgba(0, 0, 0, .2));
+  &:empty {
+    height: 400px;
+  }
+
+  .video-cover-img {
+    position: absolute;
+    top: 0;
+    right: 0;
+    left: 0;
+    bottom: 0;
+    object-fit: cover;
+    width: 100%;
+    height: 100%;
+    z-index: 0;
+  }
+
+  .prism-player .prism-cover {
+    z-index: 0;
+  }
+  .prism-player video{
+    position:relative !important;
+    left: 0 !important;
+    top: 0 !important;
+    transform: none !important;
+    display: block !important;
+  }
+
+  .video-wrap {
+    width: 100%;
+    height: 100%;
+  }
+}
+
+.pc-video-modal-wrap {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 999;
+
+  .video-shadow-wrap {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    z-index: 1000;
+    opacity: .4;
+    background-color: #000;
+  }
+
+  .content-wrap {
+    width: 1100px;
+    max-width: 90%;
+    height: 600px;
+    // padding: 10px;
+    background: rgb(255 255 255);
+    border-radius: 5px;
+    z-index: 1001;
+    position: relative;
+
+    .close-img-wrap {
+      position: absolute;
+      right: 14px;
+      top: 14px;
+      width: 20px;
+      height: 20px;
+      cursor: pointer;
+    }
+  }
+}

package/lib/common/index.js

@@ -159,6 +159,12 @@ Object.defineProperty(exports, "Video", {
     return _Video["default"];
   }
 });
+Object.defineProperty(exports, "VideoPC", {
+  enumerable: true,
+  get: function get() {
+    return _VideoPC["default"];
+  }
+});
 Object.defineProperty(exports, "VideoUpload", {
   enumerable: true,
   get: function get() {
@@ -202,6 +208,8 @@ var _SystemNotification = _interopRequireDefault(require("./SystemNotification")
 
 var _Video = _interopRequireDefault(require("./Video"));
 
+var _VideoPC = _interopRequireDefault(require("./VideoPC"));
+
 var _SwiperBan = _interopRequireDefault(require("./SwiperBan"));
 
 var _InputNumber = _interopRequireDefault(require("./InputNumber"));

package/lib/composite-comp/dito/components/GroupedCarousel/pc/index.js

@@ -62,7 +62,6 @@ function (_super) {
       var nextIndex = groupSource.findIndex(function (item) {
         return item.id === _mobx.store.clickedGroup;
       });
-      console.log('nextIndex', nextIndex);
 
       if (nextIndex != -1 && nextIndex != _this.state.tabIndex) {
         _this.carouselImgRef.current.goTo(nextIndex);

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

@@ -71,7 +71,8 @@ var groupSourceJSON = function groupSourceJSON(parentId, type) {
         pcSize: 60,
         iconType: 'light-playicon-01',
         iconColor: 'Light'
-      }
+      },
+      clickUrl: ''
     };
   }
 };

package/lib/composite-comp/dito/components/SearchDITO/pc/components/VideoItem/index.js

@@ -104,8 +104,11 @@ function (_super) {
 
     var data = this.props.data;
     return /*#__PURE__*/_react["default"].createElement("div", {
-      className: "video-item-wrap"
-    }, /*#__PURE__*/_react["default"].createElement(_common.Video, {
+      className: "video-item-wrap",
+      style: {
+        cursor: data.clickUrl ? 'pointer' : 'auto'
+      }
+    }, /*#__PURE__*/_react["default"].createElement(_common.VideoPC, {
       ref: function ref(el) {
         if (!_this.videoRefMap[data.id]) {
           _this.videoRefMap[data.id] = {
@@ -116,6 +119,9 @@ function (_super) {
           _this.setState({});
         }
       },
+      onClick: function onClick() {
+        (0, _coreUtil.clickUrl)(data.clickUrl);
+      },
       onEnd: function onEnd() {
         _this.videoRefMap[data.id].playing = false;
 

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

@@ -1,5 +1,5 @@
 .video-item-wrap {
-  height: 700px;
+  // height: 700px;
   position: relative;
   margin-bottom: 10px;
 

package/lib/composite-comp/dito/components/SearchDITO/pc/index.js

@@ -589,7 +589,7 @@ function (_super) {
     }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
       color: (_h = (_g = data.content.icon) === null || _g === void 0 ? void 0 : _g.color) === null || _h === void 0 ? void 0 : _h.pc,
       onClick: function onClick() {
-        return (0, _coreUtil.clickUrl)('/search-page');
+        return (0, _coreUtil.clickUrl)('/search-page?from=home');
       },
       size: 24,
       type: "icon-search-short"
@@ -656,7 +656,6 @@ function (_super) {
       }, m.image && m.image.open && /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
         className: "bgImg",
         data: m.image,
-        imgCover: true,
         isBackground: true
       }), m.video && i === carouseIndex && /*#__PURE__*/_react["default"].createElement(_VideoItem["default"], {
         data: m

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

@@ -175,7 +175,7 @@
 
   .carousel-img {
     .bgImg {
-      height: 700px;
+      // height: 700px;
     }
   }
 

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

@@ -58,7 +58,7 @@ var groupSourceJSON = function groupSourceJSON(parentId) {
         fontWeight: 600,
         pcFontSize: 22,
         color: '#232F46',
-        textAlign: 'center'
+        textAlign: 'left'
       },
       underline: {
         open: false,
@@ -66,7 +66,8 @@ var groupSourceJSON = function groupSourceJSON(parentId) {
         textDecorationStyle: 'solid'
       },
       vertical: {}
-    }
+    },
+    clickUrl: ''
   };
 };
 

package/lib/composite-comp/dito/components/SlideImage/pc/components/CardItem/index.js

@@ -15,6 +15,8 @@ var _VideoItem = _interopRequireDefault(require("../VideoItem"));
 
 require("./index.less");
 
+var _coreUtil = require("../../../../../../../utils/coreUtil");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
@@ -75,14 +77,17 @@ function (_super) {
         rest = __rest(_a, ["data"]);
 
     return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", _extends({
-      className: (0, _classnames["default"])('slide-image-card-item-wrap')
+      className: (0, _classnames["default"])('slide-image-card-item-wrap'),
+      onClick: function onClick() {
+        return (0, _coreUtil.clickUrl)(data.clickUrl || '');
+      }
     }, rest), /*#__PURE__*/_react["default"].createElement(_VideoItem["default"], {
       data: data
     }), data.groupName.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
       className: "img-text",
       data: data.groupName,
       style: {
-        pointerEvents: 'none'
+        pointerEvents: (0, _coreUtil.isDesignMode)() ? 'unset' : 'none'
       }
     })));
   };

package/lib/composite-comp/dito/components/SlideImage/pc/components/ParallaxScroll/index.js

@@ -59,10 +59,12 @@ function ParallaxScroll(_a) {
   var translateThird = (0, _framerMotion.useTransform)(scrollYProgress, [0, 1], [0, colThreeScrollY]);
   (0, _react.useEffect)(function () {
     setTimeout(function () {
+      var _a, _b, _c;
+
       if (!(0, _coreUtil.isDesignMode)()) {
-        var colOneHeight = colOneRef.current.offsetHeight;
-        var colTwoHeight = colTwoRef.current.offsetHeight;
-        var colThreeHeight = colThreeRef.current.offsetHeight;
+        var colOneHeight = (_a = colOneRef.current) === null || _a === void 0 ? void 0 : _a.offsetHeight;
+        var colTwoHeight = (_b = colTwoRef.current) === null || _b === void 0 ? void 0 : _b.offsetHeight;
+        var colThreeHeight = (_c = colThreeRef.current) === null || _c === void 0 ? void 0 : _c.offsetHeight;
         var colHeights = [colOneHeight, colTwoHeight, colThreeHeight];
         var space = Math.max.apply(Math, colHeights) - Math.min.apply(Math, colHeights) - 20;
         var minHeightIndex = colHeights.indexOf(Math.min.apply(Math, colHeights));

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

@@ -202,6 +202,15 @@ function (_super) {
         },
         showNow: false,
         value: (0, _moment["default"])(panelProps.video.startAt / 60 + ":" + panelProps.video.startAt % 60, 'mm:ss')
+      })), /*#__PURE__*/_react["default"].createElement(_common.Field, {
+        title: "URL"
+      }, /*#__PURE__*/_react["default"].createElement(_common.UrlPicker, {
+        onChange: function onChange(v) {
+          panelProps.clickUrl = v;
+
+          _this.reRender();
+        },
+        value: panelProps.clickUrl
       })), /*#__PURE__*/_react["default"].createElement(_Collapse["default"], {
         headerSize: "middle",
         onRefresh: function onRefresh() {

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

@@ -182,7 +182,16 @@ function (_super) {
           _this.reRender();
         },
         value: panelProps.video.sourceUrl
-      }), /*#__PURE__*/_react["default"].createElement(_Collapse["default"], {
+      }), /*#__PURE__*/_react["default"].createElement(_common.Field, {
+        title: "URL"
+      }, /*#__PURE__*/_react["default"].createElement(_common.UrlPicker, {
+        onChange: function onChange(v) {
+          panelProps.clickUrl = v;
+
+          _this.reRender();
+        },
+        value: panelProps.clickUrl
+      })), /*#__PURE__*/_react["default"].createElement(_Collapse["default"], {
         headerSize: "middle",
         onRefresh: function onRefresh() {
           return (0, _coreUtil.renderPreview)();

package/lib/core/Renderer/index.js

@@ -46,7 +46,6 @@ var setDesignConfig = function setDesignConfig(props) {
       device = props.device,
       isPreview = props.isPreview,
       projectCode = props.projectCode;
-  console.log('window.magicDesign', props);
   window.magicDesign = __assign(__assign({
     pageBackground: '#f2f2f2',
     mode: 'renderer',

package/lib/utils/coreUtil.js

@@ -313,6 +313,7 @@ var createProdCardModal = function createProdCardModal(ids) {
     return __generator(this, function (_b) {
       switch (_b.label) {
         case 0:
+          console.log('ids', ids);
           if (ids.length === 0) return [2
           /*return*/
           ];
@@ -375,10 +376,9 @@ var clickUrl = function clickUrl(url, state) {
     createProdCardModal(params.offerIds);
     return;
   }
-
-  return;
   /** 锚点跳转 */
 
+
   if (params.type === 'ANCHOR') {
     ensure(function () {
       var nodeId = isPc() ? params.data.pcNodeId : params.data.mobileNodeId;

package/package.json

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