@fonixtree/magic-design 2.0.61 → 2.0.63

package/es/composite-comp/bol/components/Video/index.js

@@ -91,8 +91,7 @@ function (_super) {
 
 
   Video.prototype.render = function () {
-    var nodeData = this.props.nodeData; // console.log('---Video', nodeData);
-
+    var nodeData = this.props.nodeData;
     return /*#__PURE__*/_react["default"].createElement("div", null, window.magicDesign.device === 'pc' ? /*#__PURE__*/_react["default"].createElement(_pc["default"], {
       data: nodeData
     }) : /*#__PURE__*/_react["default"].createElement(_mobile["default"], {

package/es/composite-comp/common/components/AffiliateProductItem/index.less

@@ -11,28 +11,36 @@
   .product-img {
     flex-shrink: 0;
   }
+
   .productItemContent {
     padding: 4px 4px 0;
+
     .producItemName {
       overflow: hidden;
       text-overflow: ellipsis;
       display: -webkit-box;
       -webkit-box-orient: vertical;
       -webkit-line-clamp: 2;
+      line-height: 18px;
+      max-height: 40px;
     }
 
   }
+
   .cashBackBox {
     width: 100%;
     background: #F9F9F9;
     padding: 4px;
+
     .cashBackBox_cashBack {
       display: flex;
       align-items: center;
+
       img {
         width: 14px;
         height: 14px;
       }
+
       .cashBackBox_text {
         display: flex;
         align-items: center;
@@ -43,22 +51,27 @@
         font-style: normal;
         font-weight: 700;
         line-height: 12px;
+
         span {
           padding-left: 2px;
         }
       }
+
       .custom_font {
         font-size: 9px;
         padding-left: 2px;
       }
     }
+
     .cashBackBox_koin {
       display: flex;
       align-items: center;
+
       img {
         width: 14px;
         height: 14px;
       }
+
       .cashBackBox_text {
         color: #fa7539;
         font-family: Trueno;
@@ -69,16 +82,19 @@
         display: flex;
         align-items: center;
         padding-left: 4px;
+
         span {
           padding: 0 2px;
         }
       }
+
       .custom_font {
         font-size: 9px;
         padding-left: 2px;
       }
     }
   }
+
   .producItemPrice {
     padding: 4px;
   }
@@ -90,7 +106,7 @@
       overflow: hidden;
     }
 
-    .product-name-wrap {
+    .producItemName {
       height: 38px;
     }
   }

package/es/composite-comp/common/components/ProductItem/index.less

@@ -62,9 +62,11 @@
       text-overflow: ellipsis;
       flex-wrap: wrap;
       line-height: 15px;
+
       .old-price-wrap {
         display: flex;
         line-height: 13px;
+
         .discount {
           margin-right: 3px;
           font-family: 'Montserrat';
@@ -76,6 +78,7 @@
           padding: 0 4px;
           background-color: #CE1126;
         }
+
         .old-price {
           text-decoration: line-through;
           width: fit-content;
@@ -85,7 +88,7 @@
       .sold-count {
         color: #7b7b7b;
         font-size: 12px;
-        text-align: right ;
+        text-align: right;
         flex-grow: 1;
       }
     }

package/es/composite-comp/dito/components/AffiliateRecommend/mobile/index.js

@@ -262,7 +262,7 @@ function (_super) {
     _this.preContent = '';
     _this.preSpacing = '';
     _this._cache = (0, _coreUtil.isDesignMode)() ? {} : (0, _commonUtil.ensure)(function () {
-      return (0, _storeUtil.getMagicStore)("recommend_" + _this.props.panelProps.id);
+      return (0, _storeUtil.getMagicStore)("recommend_" + (window.magicDesign.pageId || '') + "_" + _this.props.panelProps.id);
     }, {});
     _this.state = __assign({
       contentWidth: 0,
@@ -308,7 +308,7 @@ function (_super) {
 
     _this.getProductList = function (index) {
       return __awaiter(_this, void 0, void 0, function () {
-        var panelProps, groupSource, recommendId, cache, _a, prodIds, newData, res, e_1, _cache;
+        var panelProps, groupSource, recommendId, pageId, cache, _a, prodIds, newData, res, e_1, _cache;
 
         var _b, _c, _d;
 
@@ -320,9 +320,10 @@ function (_super) {
               panelProps = this.props.panelProps;
               groupSource = this.state.groupSource;
               recommendId = panelProps.id;
+              pageId = window.magicDesign.pageId || '';
 
               if (!(0, _coreUtil.isDesignMode)()) {
-                cache = (0, _storeUtil.getMagicStore)("recommend_" + recommendId);
+                cache = (0, _storeUtil.getMagicStore)("recommend_" + pageId + "_" + recommendId);
 
                 if (cache) {
                   if ("products" + index in cache) {
@@ -388,8 +389,8 @@ function (_super) {
 
             case 6:
               if (!(0, _coreUtil.isDesignMode)()) {
-                _cache = (0, _storeUtil.getMagicStore)("recommend_" + recommendId);
-                (0, _storeUtil.setMagicStore)("recommend_" + recommendId, __assign(__assign({}, _cache), (_c = {}, _c["products" + index] = newData, _c.endTime = Date.now() + 3 * 60 * 1000, _c)));
+                _cache = (0, _storeUtil.getMagicStore)("recommend_" + pageId + "_" + recommendId);
+                (0, _storeUtil.setMagicStore)("recommend_" + pageId + "_" + recommendId, __assign(__assign({}, _cache), (_c = {}, _c["products" + index] = newData, _c.endTime = Date.now() + 3 * 60 * 1000, _c)));
               }
 
               this.setState((_d = {}, _d["products" + index] = newData, _d), function () {

package/es/composite-comp/dito/components/AffiliateRecommend/mobile/index.less

@@ -70,22 +70,11 @@
 .m-recommend-mobile .scrollContainer .scrollProductListRow {
   display: flex;
   flex-direction: row;
-  align-items: stretch;
+  align-items: flex-start;
 }
 .m-recommend-mobile .scrollContainer .scrollProductListRow .productCardRow {
   margin-right: 0.16rem;
 }
-.m-recommend-mobile .scrollContainer .scrollProductListRow .productCardRow .m-product-item-wrap {
-  height: 100%;
-}
-.m-recommend-mobile .scrollContainer .scrollProductListRow .productCardRow .m-product-item-wrap .contentWrap {
-  flex: 1;
-  flex-direction: column;
-  display: flex;
-}
-.m-recommend-mobile .scrollContainer .scrollProductListRow .productCardRow .m-product-item-wrap .contentWrap .cashBackBox {
-  margin-top: auto;
-}
 .m-recommend-mobile .btnSeeAll {
   display: block;
   width: fit-content;

package/es/composite-comp/dito/components/AffiliateRecommend/pc/index.js

@@ -245,7 +245,7 @@ function (_super) {
     _this.preContent = '';
     _this.preSpacing = '';
     _this._cache = (0, _coreUtil.isDesignMode)() ? {} : (0, _commonUtil.ensure)(function () {
-      return (0, _storeUtil.getMagicStore)("recommend_" + _this.props.panelProps.id);
+      return (0, _storeUtil.getMagicStore)("recommend_" + (window.magicDesign.pageId || '') + "_" + _this.props.panelProps.id);
     }, {});
     _this.scrollRef = /*#__PURE__*/_react["default"].createRef();
     _this.state = __assign({
@@ -303,7 +303,7 @@ function (_super) {
 
     _this.getProductList = function (index) {
       return __awaiter(_this, void 0, void 0, function () {
-        var panelProps, groupSource, recommendId, cache, _a, prodIds, newData, res, e_1, _cache;
+        var panelProps, groupSource, recommendId, pageId, cache, _a, prodIds, newData, res, e_1, _cache;
 
         var _b, _c, _d;
 
@@ -315,9 +315,10 @@ function (_super) {
               panelProps = this.props.panelProps;
               groupSource = this.state.groupSource;
               recommendId = panelProps.id;
+              pageId = window.magicDesign.pageId || '';
 
               if (!(0, _coreUtil.isDesignMode)()) {
-                cache = (0, _storeUtil.getMagicStore)("recommend_" + recommendId);
+                cache = (0, _storeUtil.getMagicStore)("recommend_" + pageId + "_" + recommendId);
 
                 if (cache) {
                   if ("products" + index in cache) {
@@ -383,8 +384,8 @@ function (_super) {
 
             case 6:
               if (!(0, _coreUtil.isDesignMode)()) {
-                _cache = (0, _storeUtil.getMagicStore)("recommend_" + recommendId);
-                (0, _storeUtil.setMagicStore)("recommend_" + recommendId, __assign(__assign({}, _cache), (_c = {}, _c["products" + index] = newData, _c.endTime = Date.now() + 3 * 60 * 1000, _c)));
+                _cache = (0, _storeUtil.getMagicStore)("recommend_" + pageId + "_" + recommendId);
+                (0, _storeUtil.setMagicStore)("recommend_" + pageId + "_" + recommendId, __assign(__assign({}, _cache), (_c = {}, _c["products" + index] = newData, _c.endTime = Date.now() + 3 * 60 * 1000, _c)));
               }
 
               this.setState((_d = {}, _d["products" + index] = newData, _d), function () {

package/es/composite-comp/dito/components/FlashDeal/mobile/index.js

@@ -261,7 +261,7 @@ function (_super) {
     _this.sortType = '';
     _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: '',
@@ -271,7 +271,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:
@@ -286,6 +286,7 @@ function (_super) {
 
             case 1:
               res = _a.sent();
+              pageId = window.magicDesign.pageId || '';
 
               if (!res.list || res.list.length === 0) {
                 // 秒杀场次结束之后，清空列表数据，隐藏秒杀组件
@@ -294,7 +295,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
@@ -303,7 +304,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({
@@ -323,7 +324,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:
@@ -343,9 +344,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/es/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/es/composite-comp/dito/components/HeadNavigation/defaultJSON.js

@@ -0,0 +1,87 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getDefaultJSON = void 0;
+
+var _uuid = require("uuid");
+
+var getDefaultJSON = function getDefaultJSON() {
+  return {
+    id: (0, _uuid.v4)(),
+    type: 'HEAD_NAVIGATION',
+    content: {
+      logo: {
+        id: (0, _uuid.v4)(),
+        open: true,
+        type: 'IMAGE',
+        content: {
+          h5Name: 'name2',
+          pcName: 'name2',
+          h5ImgSrc: '',
+          pcImgSrc: '',
+          clickUrl: ''
+        },
+        hover: {
+          open: false,
+          backgroundType: 'enlarge',
+          magnification: 1.5,
+          pcImgHoverUrl: '',
+          h5ImgHoverUrl: ''
+        }
+      },
+      box: {
+        id: (0, _uuid.v4)(),
+        open: true,
+        color: {
+          pc: '#D92929',
+          mobile: '#8493AF'
+        }
+      },
+      icon: {
+        id: (0, _uuid.v4)(),
+        open: true,
+        color: {
+          pc: '#D92929',
+          mobile: '#232F46'
+        },
+        cartIcon: {
+          pc: true,
+          mobile: true
+        },
+        messageIcon: {
+          pc: false,
+          mobile: true
+        }
+      }
+    },
+    spacing: {
+      pc: {
+        paddingTop: 20,
+        paddingBottom: 30,
+        marginBottom: window.magicDesign.compSpacing * 1.5,
+        fillUp: false
+      },
+      mobile: {
+        paddingTop: 8,
+        paddingBottom: 8,
+        paddingLeft: 15,
+        paddingRight: 15,
+        marginBottom: window.magicDesign.compSpacing
+      }
+    },
+    customize: {
+      layout: 'left',
+      align: 'left'
+    },
+    background: {
+      opacity: 100,
+      color: '#fff',
+      image: '',
+      bgType: 'color'
+    }
+  };
+};
+
+exports.getDefaultJSON = getDefaultJSON;

package/es/composite-comp/dito/components/MenuNavigation/defaultJSON.js

@@ -0,0 +1,79 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getDefaultJSON = void 0;
+
+var _uuid = require("uuid");
+
+var defaultMenuName = [{
+  name: 'Home',
+  icon: '',
+  selectedIcon: '',
+  clickUrl: ''
+}, {
+  name: 'Category',
+  icon: '',
+  selectedIcon: '',
+  clickUrl: ''
+}, {
+  name: 'Community',
+  icon: '',
+  selectedIcon: '',
+  clickUrl: ''
+}, {
+  name: 'Cart',
+  icon: '',
+  selectedIcon: '',
+  clickUrl: ''
+}, {
+  name: 'Account',
+  icon: '',
+  selectedIcon: '',
+  clickUrl: ''
+}];
+
+var getDefaultJSON = function getDefaultJSON() {
+  var groupId = (0, _uuid.v4)();
+  return {
+    id: groupId,
+    type: 'MENU_NAVIGATION',
+    groupSource: defaultMenuName.map(function (group) {
+      var itemId = (0, _uuid.v4)();
+      return {
+        id: itemId,
+        parentId: groupId,
+        type: group.name,
+        image: {
+          parentId: itemId,
+          id: (0, _uuid.v4)(),
+          open: true,
+          type: 'IMAGE',
+          content: {
+            h5Name: 'name2',
+            pcName: 'name2',
+            h5ImgSrc: '',
+            pcImgSrc: '',
+            clickUrl: ''
+          },
+          hover: {
+            open: true,
+            backgroundType: 'enlarge',
+            magnification: 1.5,
+            pcImgHoverUrl: '',
+            h5ImgHoverUrl: ''
+          }
+        }
+      };
+    }),
+    background: {
+      opacity: 100,
+      color: '#fff',
+      image: '',
+      bgType: 'color'
+    }
+  };
+};
+
+exports.getDefaultJSON = getDefaultJSON;

package/es/composite-comp/dito/components/Recommend/mobile/index.js

@@ -262,7 +262,7 @@ function (_super) {
     _this.preContent = '';
     _this.preSpacing = '';
     _this._cache = (0, _coreUtil.isDesignMode)() ? {} : (0, _commonUtil.ensure)(function () {
-      return (0, _storeUtil.getMagicStore)("recommend_" + _this.props.panelProps.id);
+      return (0, _storeUtil.getMagicStore)("recommend_" + (window.magicDesign.pageId || '') + "_" + _this.props.panelProps.id);
     }, {});
     _this.state = __assign({
       contentWidth: 0,
@@ -308,7 +308,7 @@ function (_super) {
 
     _this.getProductList = function (index) {
       return __awaiter(_this, void 0, void 0, function () {
-        var panelProps, groupSource, recommendId, cache, _a, _b, sourceType, _c, prodIds, _d, intelligentType, _e, intelligentValue, _f, maxProdNum, newData, res, res, e_1, _cache;
+        var panelProps, groupSource, recommendId, pageId, cache, _a, _b, sourceType, _c, prodIds, _d, intelligentType, _e, intelligentValue, _f, maxProdNum, newData, res, res, e_1, _cache;
 
         var _g, _h, _j;
 
@@ -320,9 +320,10 @@ function (_super) {
               panelProps = this.props.panelProps;
               groupSource = this.state.groupSource;
               recommendId = panelProps.id;
+              pageId = window.magicDesign.pageId || '';
 
               if (!(0, _coreUtil.isDesignMode)()) {
-                cache = (0, _storeUtil.getMagicStore)("recommend_" + recommendId);
+                cache = (0, _storeUtil.getMagicStore)("recommend_" + pageId + "_" + recommendId);
 
                 if (cache) {
                   if ("products" + index in cache) {
@@ -422,8 +423,8 @@ function (_super) {
 
             case 10:
               if (!(0, _coreUtil.isDesignMode)()) {
-                _cache = (0, _storeUtil.getMagicStore)("recommend_" + recommendId);
-                (0, _storeUtil.setMagicStore)("recommend_" + recommendId, __assign(__assign({}, _cache), (_h = {}, _h["products" + index] = newData, _h.endTime = Date.now() + 3 * 60 * 1000, _h)));
+                _cache = (0, _storeUtil.getMagicStore)("recommend_" + pageId + "_" + recommendId);
+                (0, _storeUtil.setMagicStore)("recommend_" + pageId + "_" + recommendId, __assign(__assign({}, _cache), (_h = {}, _h["products" + index] = newData, _h.endTime = Date.now() + 3 * 60 * 1000, _h)));
               }
 
               this.setState((_j = {}, _j["products" + index] = newData, _j), function () {

package/es/composite-comp/dito/components/Recommend/pc/index.js

@@ -245,7 +245,7 @@ function (_super) {
     _this.preContent = '';
     _this.preSpacing = '';
     _this._cache = (0, _coreUtil.isDesignMode)() ? {} : (0, _commonUtil.ensure)(function () {
-      return (0, _storeUtil.getMagicStore)("recommend_" + _this.props.panelProps.id);
+      return (0, _storeUtil.getMagicStore)("recommend_" + (window.magicDesign.pageId || '') + "_" + _this.props.panelProps.id);
     }, {});
     _this.scrollRef = /*#__PURE__*/_react["default"].createRef();
     _this.state = __assign({
@@ -303,7 +303,7 @@ function (_super) {
 
     _this.getProductList = function (index) {
       return __awaiter(_this, void 0, void 0, function () {
-        var panelProps, groupSource, recommendId, cache, _a, _b, sourceType, _c, prodIds, _d, intelligentType, _e, intelligentValue, _f, maxProdNum, newData, res, res, e_1, _cache;
+        var panelProps, groupSource, recommendId, pageId, cache, _a, _b, sourceType, _c, prodIds, _d, intelligentType, _e, intelligentValue, _f, maxProdNum, newData, res, res, e_1, _cache;
 
         var _g, _h, _j;
 
@@ -315,9 +315,10 @@ function (_super) {
               panelProps = this.props.panelProps;
               groupSource = this.state.groupSource;
               recommendId = panelProps.id;
+              pageId = window.magicDesign.pageId || '';
 
               if (!(0, _coreUtil.isDesignMode)()) {
-                cache = (0, _storeUtil.getMagicStore)("recommend_" + recommendId);
+                cache = (0, _storeUtil.getMagicStore)("recommend_" + pageId + "_" + recommendId);
 
                 if (cache) {
                   if ("products" + index in cache) {
@@ -417,8 +418,8 @@ function (_super) {
 
             case 10:
               if (!(0, _coreUtil.isDesignMode)()) {
-                _cache = (0, _storeUtil.getMagicStore)("recommend_" + recommendId);
-                (0, _storeUtil.setMagicStore)("recommend_" + recommendId, __assign(__assign({}, _cache), (_h = {}, _h["products" + index] = newData, _h.endTime = Date.now() + 3 * 60 * 1000, _h)));
+                _cache = (0, _storeUtil.getMagicStore)("recommend_" + pageId + "_" + recommendId);
+                (0, _storeUtil.setMagicStore)("recommend_" + pageId + "_" + recommendId, __assign(__assign({}, _cache), (_h = {}, _h["products" + index] = newData, _h.endTime = Date.now() + 3 * 60 * 1000, _h)));
               }
 
               this.setState((_j = {}, _j["products" + index] = newData, _j), function () {