@fonixtree/magic-design 1.0.67 → 1.0.68

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

@@ -300,7 +300,7 @@ function (_super) {
     _this.scrollRef = /*#__PURE__*/_react["default"].createRef();
     _this.state = {
       list: (0, _coreUtil.isDesignMode)() ? [] : (0, _commonUtil.ensure)(function () {
-        return (0, _storeUtil.getMagicStore)("flashSale_" + _this.props.panelProps.id);
+        return (0, _storeUtil.getMagicStore)("flashSale_" + (window.magicDesign.pageId || '') + "_" + _this.props.panelProps.id);
       }, []),
       effDate: '',
       expDate: '',
@@ -312,7 +312,7 @@ function (_super) {
 
     _this.getFlashData = function (pageSize, campaign) {
       return __awaiter(_this, void 0, void 0, function () {
-        var res;
+        var res, pageId;
         return __generator(this, function (_a) {
           switch (_a.label) {
             case 0:
@@ -327,6 +327,7 @@ function (_super) {
 
             case 1:
               res = _a.sent();
+              pageId = window.magicDesign.pageId || '';
 
               if (!res.list || res.list.length === 0) {
                 // 秒杀场次结束之后，清空列表数据，隐藏秒杀组件
@@ -335,7 +336,7 @@ function (_super) {
                 });
 
                 if (!(0, _coreUtil.isDesignMode)()) {
-                  (0, _storeUtil.setMagicStore)("flashSale_" + this.props.panelProps.id, []);
+                  (0, _storeUtil.setMagicStore)("flashSale_" + pageId + "_" + this.props.panelProps.id, []);
                 }
 
                 return [2
@@ -344,7 +345,7 @@ function (_super) {
               }
 
               if (!(0, _coreUtil.isDesignMode)()) {
-                (0, _storeUtil.setMagicStore)("flashSale_" + this.props.panelProps.id, res.list);
+                (0, _storeUtil.setMagicStore)("flashSale_" + pageId + "_" + this.props.panelProps.id, res.list);
               }
 
               this.setState({
@@ -364,7 +365,7 @@ function (_super) {
 
     _this.getNextFlashSale = function () {
       return __awaiter(_this, void 0, void 0, function () {
-        var data;
+        var data, pageId;
         return __generator(this, function (_a) {
           switch (_a.label) {
             case 0:
@@ -384,9 +385,10 @@ function (_super) {
                 this.setState({
                   list: []
                 });
+                pageId = window.magicDesign.pageId || '';
 
                 if (!(0, _coreUtil.isDesignMode)()) {
-                  (0, _storeUtil.setMagicStore)("flashSale_" + this.props.panelProps.id, []);
+                  (0, _storeUtil.setMagicStore)("flashSale_" + pageId + "_" + this.props.panelProps.id, []);
                 }
               }
 

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

@@ -0,0 +1,102 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.groupSourceHeadJSON = exports.getDefaultJSON = void 0;
+
+var _uuid = require("uuid");
+
+var _base = require("../../../../assets/images/base64");
+
+var defaultHeadName = [{
+  name: 'Home',
+  icon: _base.headHomeIcon,
+  clickUrl: {
+    value: '/',
+    name: 'Home',
+    type: 'FunctionPage'
+  }
+}, {
+  name: 'Inbox',
+  icon: _base.headInboxIcon,
+  clickUrl: {
+    remark: '/h5/users/inbox/unread/num',
+    value: '/message-center',
+    name: 'Message',
+    type: 'FunctionPage'
+  }
+}, {
+  name: 'Account',
+  icon: _base.headAccountIcon,
+  clickUrl: {
+    value: '/main/account',
+    name: 'Account',
+    type: 'FunctionPage'
+  }
+}];
+
+var groupSourceHeadJSON = function groupSourceHeadJSON(group) {
+  if (!group) group = defaultHeadName[0];
+  var itemId = (0, _uuid.v4)();
+  return {
+    id: itemId,
+    type: group.name,
+    image: {
+      parentId: itemId,
+      id: (0, _uuid.v4)(),
+      open: true,
+      type: 'IMAGE',
+      content: {
+        h5Name: 'name',
+        pcName: 'name',
+        h5ImgSrc: group.icon,
+        pcImgSrc: '',
+        clickUrl: group.clickUrl
+      }
+    }
+  };
+};
+
+exports.groupSourceHeadJSON = groupSourceHeadJSON;
+
+var getDefaultJSON = function getDefaultJSON() {
+  var groupId = (0, _uuid.v4)();
+  return {
+    id: groupId,
+    type: 'HEAD_NAVIGATION',
+    groupSource: defaultHeadName.map(function (group) {
+      return groupSourceHeadJSON(group);
+    }),
+    // displayPage: [
+    //   {
+    //     name: 'Store Home',
+    //     type: '/store-home',
+    //     state: true,
+    //   },
+    //   {
+    //     name: 'Product Detail',
+    //     type: '/product/list',
+    //     state: true,
+    //   },
+    //   {
+    //     name: 'Poster Page',
+    //     type: '/poster',
+    //     state: true,
+    //   },
+    //   {
+    //     name: 'Community',
+    //     type: '/main/community',
+    //     state: true,
+    //   },
+    // ],
+    background: {
+      opacity: 100,
+      color: '#fff',
+      image: '',
+      bgType: 'color'
+    }
+  };
+};
+
+exports.getDefaultJSON = getDefaultJSON;

package/lib/composite-comp/dito/components/HeadNavigation/index.js

@@ -0,0 +1,84 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _mobile = _interopRequireDefault(require("./mobile"));
+
+var _defaultJSON = require("./defaultJSON");
+
+var _compositeDecorator = _interopRequireDefault(require("../../../../decorator/compositeDecorator"));
+
+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); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
+var __extends = void 0 && (void 0).__extends || function () {
+  var _extendStatics = function extendStatics(d, b) {
+    _extendStatics = Object.setPrototypeOf || {
+      __proto__: []
+    } instanceof Array && function (d, b) {
+      d.__proto__ = b;
+    } || function (d, b) {
+      for (var p in b) {
+        if (b.hasOwnProperty(p)) d[p] = b[p];
+      }
+    };
+
+    return _extendStatics(d, b);
+  };
+
+  return function (d, b) {
+    _extendStatics(d, b);
+
+    function __() {
+      this.constructor = d;
+    }
+
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+  };
+}();
+
+var __decorate = void 0 && (void 0).__decorate || function (decorators, target, key, desc) {
+  var c = arguments.length,
+      r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc,
+      d;
+  if ((typeof Reflect === "undefined" ? "undefined" : _typeof(Reflect)) === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) {
+    if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+  }
+  return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+
+var HeadNavigation =
+/** @class */
+function (_super) {
+  __extends(HeadNavigation, _super);
+
+  function HeadNavigation() {
+    return _super !== null && _super.apply(this, arguments) || this;
+  }
+
+  HeadNavigation.prototype.render = function () {
+    var nodeData = this.props.nodeData;
+    return /*#__PURE__*/_react["default"].createElement("div", null, window.magicDesign.device === 'pc' ? null : /*#__PURE__*/_react["default"].createElement(_mobile["default"], {
+      data: nodeData
+    }));
+  };
+
+  HeadNavigation.defaultProps = {};
+  HeadNavigation.type = 'HEAD_NAVIGATION';
+  HeadNavigation.getDefaultJSON = _defaultJSON.getDefaultJSON;
+  HeadNavigation = __decorate([_compositeDecorator["default"]], HeadNavigation);
+  return HeadNavigation;
+}(_react.Component);
+
+var _default = HeadNavigation;
+exports["default"] = _default;

package/lib/composite-comp/dito/components/HeadNavigation/mobile/index.js

@@ -0,0 +1,112 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _components = require("../../../../../meta-comp/components");
+
+var _commonUtil = require("../../../../../utils/commonUtil");
+
+require("./index.less");
+
+var _common = require("../../../../../common");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+var __extends = void 0 && (void 0).__extends || function () {
+  var _extendStatics = function extendStatics(d, b) {
+    _extendStatics = Object.setPrototypeOf || {
+      __proto__: []
+    } instanceof Array && function (d, b) {
+      d.__proto__ = b;
+    } || function (d, b) {
+      for (var p in b) {
+        if (b.hasOwnProperty(p)) d[p] = b[p];
+      }
+    };
+
+    return _extendStatics(d, b);
+  };
+
+  return function (d, b) {
+    _extendStatics(d, b);
+
+    function __() {
+      this.constructor = d;
+    }
+
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+  };
+}();
+
+var HeadNavigationMobile =
+/** @class */
+function (_super) {
+  __extends(HeadNavigationMobile, _super);
+
+  function HeadNavigationMobile() {
+    var _this = _super !== null && _super.apply(this, arguments) || this;
+
+    _this.carouselRef = /*#__PURE__*/_react["default"].createRef();
+    _this.state = {
+      showNav: false
+    };
+    return _this;
+  }
+
+  HeadNavigationMobile.prototype.render = function () {
+    var _this = this;
+
+    var data = this.props.data;
+    var showNav = this.state.showNav; // console.log('---head data', data);
+
+    var GAData = (0, _commonUtil.getGAData)(data);
+    return /*#__PURE__*/_react["default"].createElement("div", {
+      className: "m-head-navigation"
+    }, /*#__PURE__*/_react["default"].createElement("div", {
+      className: "head-wrap"
+    }, /*#__PURE__*/_react["default"].createElement("div", {
+      className: "head-title"
+    }, "Direct Function"), /*#__PURE__*/_react["default"].createElement("div", {
+      className: "" + (showNav ? 'icon-wrap rotate' : 'icon-wrap'),
+      onClick: function onClick() {
+        _this.setState({
+          showNav: !showNav
+        });
+      }
+    }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
+      color: "#232F46",
+      size: 20,
+      type: "icon-more"
+    }))), /*#__PURE__*/_react["default"].createElement("div", {
+      className: showNav ? 'content-wrap item-padding-top' : 'content-wrap'
+    }, showNav && data.groupSource.map(function (group) {
+      return /*#__PURE__*/_react["default"].createElement("div", {
+        key: group.id,
+        className: "head-item",
+        onClick: function onClick() {
+          return _this.clickJump(group.title.text);
+        }
+      }, group.image.open && /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
+        data: group.image,
+        GAData: GAData,
+        maxWidth: 64,
+        minWidth: 64
+      }));
+    })));
+  };
+
+  HeadNavigationMobile.defaultProps = {
+    data: {
+      groupSource: []
+    }
+  };
+  return HeadNavigationMobile;
+}(_react["default"].Component);
+
+var _default = HeadNavigationMobile;
+exports["default"] = _default;

package/lib/composite-comp/dito/components/HeadNavigation/mobile/index.less

@@ -0,0 +1,34 @@
+.m-head-navigation {
+  width: 100%;
+}
+.m-head-navigation .head-wrap {
+  padding: 0.3rem;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-bottom: 0.02rem solid #E6EAF0;
+}
+.m-head-navigation .head-wrap .head-title {
+  font-family: Open Sans;
+  font-size: 0.28rem;
+  font-weight: 400;
+  line-height: 0.44rem;
+  color: #000;
+}
+.m-head-navigation .head-wrap .icon-wrap {
+  transition: all 0.1s;
+}
+.m-head-navigation .head-wrap .rotate {
+  transform: rotate(90deg);
+}
+.m-head-navigation .content-wrap {
+  display: flex;
+  flex-wrap: wrap;
+}
+.m-head-navigation .content-wrap .head-item {
+  margin-bottom: 0.16rem;
+  margin-left: 0.14rem;
+}
+.m-head-navigation .item-padding-top {
+  padding-top: 0.16rem;
+}

package/lib/composite-comp/dito/components/MenuNavigation/MenuNavMetaImage/index.js

@@ -0,0 +1,206 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
+require("./index.less");
+
+var _h5DefImg = _interopRequireDefault(require("../../../../../meta-comp/components/Image/image/h5DefImg.png"));
+
+var _pcDefImg = _interopRequireDefault(require("../../../../../meta-comp/components/Image/image/pcDefImg.png"));
+
+var _coreUtil = require("../../../../../utils/coreUtil");
+
+var _decorator = require("../../../../../decorator");
+
+var _commonUtil = require("../../../../../utils/commonUtil");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
+var __extends = void 0 && (void 0).__extends || function () {
+  var _extendStatics = function extendStatics(d, b) {
+    _extendStatics = Object.setPrototypeOf || {
+      __proto__: []
+    } instanceof Array && function (d, b) {
+      d.__proto__ = b;
+    } || function (d, b) {
+      for (var p in b) {
+        if (b.hasOwnProperty(p)) d[p] = b[p];
+      }
+    };
+
+    return _extendStatics(d, b);
+  };
+
+  return function (d, b) {
+    _extendStatics(d, b);
+
+    function __() {
+      this.constructor = d;
+    }
+
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+  };
+}();
+
+var __decorate = void 0 && (void 0).__decorate || function (decorators, target, key, desc) {
+  var c = arguments.length,
+      r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc,
+      d;
+  if ((typeof Reflect === "undefined" ? "undefined" : _typeof(Reflect)) === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) {
+    if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+  }
+  return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+
+var MetaImage =
+/** @class */
+function (_super) {
+  __extends(MetaImage, _super);
+
+  function MetaImage() {
+    var _this = _super !== null && _super.apply(this, arguments) || this;
+
+    _this.imgRef = /*#__PURE__*/_react["default"].createRef();
+    _this.state = {
+      // 当仅作为一个图片时，鼠标移上去，hover状态
+      hoverImgSrc: false
+    };
+
+    _this.getStyle = function () {
+      var _a, _b;
+
+      var _c = _this.props,
+          data = _c.data,
+          hoverState = _c.hoverState,
+          maxHeight = _c.maxHeight,
+          maxWidth = _c.maxWidth,
+          minHeight = _c.minHeight,
+          minWidth = _c.minWidth,
+          limitWidthHeight = _c.limitWidthHeight,
+          scale = _c.scale;
+      var hoverImgSrc = _this.state.hoverImgSrc;
+      var obj = {};
+
+      if (((_a = data === null || data === void 0 ? void 0 : data.hover) === null || _a === void 0 ? void 0 : _a.open) && ((_b = data === null || data === void 0 ? void 0 : data.hover) === null || _b === void 0 ? void 0 : _b.backgroundType) === 'enlarge' && (hoverState || hoverImgSrc)) {
+        // return { transform: `scale(${data.hover.magnification})` };
+        obj.transform = "scale(" + data.hover.magnification + ")";
+        obj.zIndex = '1';
+      }
+
+      if (maxHeight) {
+        obj.maxHeight = maxHeight;
+      }
+
+      if (maxWidth || maxWidth === 0) {
+        obj.maxWidth = maxWidth;
+      }
+
+      if (minHeight) {
+        obj.minHeight = minHeight;
+      }
+
+      if (minWidth) {
+        obj.minWidth = minWidth;
+      }
+
+      if (limitWidthHeight) {
+        if ((0, _coreUtil.isPc)()) {
+          if (data.content.pcImgWidth) obj.width = data.content.pcImgWidth * scale;
+
+          if (data.content.pcImgWidth > data.content.pcImgHeight) {
+            obj.height = 'auto';
+          } else if (data.content.pcImgHeight) obj.height = data.content.pcImgHeight * scale;
+        } else {
+          if (data.content.h5ImgWidth) obj.width = data.content.h5ImgWidth * scale; // if (data.content.h5ImgHeight) obj.height = data.content.h5ImgHeight * scale;
+
+          if (data.content.h5ImgWidth > data.content.h5ImgHeight || data.content.h5ImgHeight > maxHeight) {
+            obj.height = 'auto';
+          } else if (data.content.h5ImgHeight) obj.height = data.content.h5ImgHeight * scale;
+        }
+      }
+
+      return obj;
+    };
+
+    _this.mouseEnterImg = function () {
+      var _a;
+
+      var data = _this.props.data;
+
+      if ((_a = data === null || data === void 0 ? void 0 : data.hover) === null || _a === void 0 ? void 0 : _a.open) {
+        _this.setState({
+          hoverImgSrc: true
+        });
+      }
+    };
+
+    _this.mouseLeaveImg = function () {
+      var _a;
+
+      var data = _this.props.data;
+
+      if ((_a = data === null || data === void 0 ? void 0 : data.hover) === null || _a === void 0 ? void 0 : _a.open) {
+        _this.setState({
+          hoverImgSrc: false
+        });
+      }
+    };
+
+    return _this;
+  }
+
+  MetaImage.prototype.render = function () {
+    var _a, _b, _c, _d;
+
+    var _e = this.props,
+        data = _e.data,
+        hoverState = _e.hoverState;
+    var hoverImgSrc = this.state.hoverImgSrc;
+    var srcImg = (0, _coreUtil.isPc)() ? (_a = data.content) === null || _a === void 0 ? void 0 : _a.pcImgSrc : (_b = data.content) === null || _b === void 0 ? void 0 : _b.h5ImgSrc;
+
+    if (((_c = data === null || data === void 0 ? void 0 : data.hover) === null || _c === void 0 ? void 0 : _c.open) && ((_d = data === null || data === void 0 ? void 0 : data.hover) === null || _d === void 0 ? void 0 : _d.backgroundType) === 'new' && (hoverState || hoverImgSrc)) {
+      srcImg = (0, _coreUtil.isPc)() ? data.hover.pcImgHoverUrl : data.hover.h5ImgHoverUrl;
+    }
+
+    if (!srcImg) {
+      srcImg = (0, _coreUtil.isPc)() ? _pcDefImg["default"] : _h5DefImg["default"];
+    }
+
+    return /*#__PURE__*/_react["default"].createElement("div", {
+      className: (0, _classnames["default"])('menu-meta-image'),
+      onClick: function onClick() {
+        (0, _coreUtil.clickUrl)(data.content.clickUrl);
+      }
+    }, srcImg && /*#__PURE__*/_react["default"].createElement("img", {
+      ref: this.imgRef,
+      onMouseEnter: this.mouseEnterImg,
+      onMouseLeave: this.mouseLeaveImg,
+      src: srcImg,
+      style: (0, _commonUtil.pxToRem)(this.getStyle())
+    }));
+  };
+
+  MetaImage.defaultProps = {
+    data: {
+      content: {},
+      hover: {}
+    },
+    hoverState: false,
+    limitWidthHeight: false,
+    scale: 1
+  };
+  MetaImage = __decorate([_decorator.metaDecorator], MetaImage);
+  return MetaImage;
+}(_react["default"].Component);
+
+var _default = MetaImage;
+exports["default"] = _default;

package/lib/composite-comp/dito/components/MenuNavigation/MenuNavMetaImage/index.less

@@ -0,0 +1,25 @@
+.menu-meta-image {
+  position: relative;
+  width: 100%;
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  // overflow: hidden;
+  &>img {
+    width: 100%;
+    height: 100%;
+    // object-fit: contain;
+    transition: all .2s linear;
+    vertical-align: initial;
+    max-width: 100%;
+    object-fit: contain;
+  }
+
+  &.backgroundImg {
+    &>img {
+      // object-fit: cover;
+      // width: auto;
+      max-width: none;
+    }
+  }
+}