@fonixtree/magic-design 1.0.220 → 1.0.223

package/es/common/PictureModal/index.js

@@ -29,7 +29,7 @@ function PictureModal(_a) {
     draggable: false
   }), /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
     className: "closeIcon",
-    color: "#929292",
+    color: "#fff",
     onClick: onClose,
     size: 20,
     type: "icon-close"

package/es/composite-comp/bol/components/Banner/pc/index.less

@@ -53,7 +53,7 @@
       }
 
       &.active {
-        border-radius: 20px;
+        border-radius: 0;
       }
     }
   }

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

@@ -107,22 +107,22 @@ function (_super) {
   };
 
   ProductItem.prototype.render = function () {
-    var _a, _b, _c, _d, _e, _f, _g;
-
-    var _h = this.props,
-        data = _h.data,
-        type = _h.type,
-        panelProps = _h.panelProps,
-        onItemClick = _h.onItemClick,
-        showProName = _h.showProName,
-        showProgress = _h.showProgress,
-        fixHeight = _h.fixHeight,
-        layout = _h.layout,
-        imgHeight = _h.imgHeight,
-        imgWidth = _h.imgWidth,
-        unknownPrice = _h.unknownPrice,
-        hideLabels = _h.hideLabels,
-        rest = __rest(_h, ["data", "type", "panelProps", "onItemClick", "showProName", "showProgress", "fixHeight", "layout", "imgHeight", "imgWidth", "unknownPrice", "hideLabels"]);
+    var _a, _b, _c, _d, _e, _f;
+
+    var _g = this.props,
+        data = _g.data,
+        type = _g.type,
+        panelProps = _g.panelProps,
+        onItemClick = _g.onItemClick,
+        showProName = _g.showProName,
+        showProgress = _g.showProgress,
+        fixHeight = _g.fixHeight,
+        layout = _g.layout,
+        imgHeight = _g.imgHeight,
+        imgWidth = _g.imgWidth,
+        unknownPrice = _g.unknownPrice,
+        hideLabels = _g.hideLabels,
+        rest = __rest(_g, ["data", "type", "panelProps", "onItemClick", "showProName", "showProgress", "fixHeight", "layout", "imgHeight", "imgWidth", "unknownPrice", "hideLabels"]);
 
     var promotions = (0, _businessUtil.getPromotionList)(data);
     var price = (0, _currencyUtil.formatCurrency)(data.salesPrice);
@@ -198,10 +198,8 @@ function (_super) {
     })) || [];
     var prodLabels = ((_b = data.labels) === null || _b === void 0 ? void 0 : _b.filter(function (f) {
       return f.position === '6';
-    })) || [];
-    var priceLabels = ((_c = data.labels) === null || _c === void 0 ? void 0 : _c.filter(function (f) {
-      return f.position === '7';
-    })) || []; // ad 卡片
+    })) || []; // const priceLabels = data.labels?.filter(f => f.position === '7') || [];
+    // ad 卡片
 
     if (data.type === 'ad') {
       return /*#__PURE__*/_react["default"].createElement("div", {
@@ -289,14 +287,11 @@ function (_super) {
         text: _price
       }),
       readonly: true
-    }), priceLabels.length > 0 && !hideLabels && /*#__PURE__*/_react["default"].createElement(_ImageLabel["default"], {
-      labels: priceLabels,
-      small: true
     })), panelProps.salesPrice.open && (!!discount || oldPrice) && /*#__PURE__*/_react["default"].createElement("div", {
       className: "price-sold-wrap"
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "old-price-wrap"
-    }, !!discount && ((_d = panelProps.discountLabel) === null || _d === void 0 ? void 0 : _d.open) && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
+    }, !!discount && ((_c = panelProps.discountLabel) === null || _c === void 0 ? void 0 : _c.open) && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
       className: "discount",
       data: __assign(__assign({}, panelProps.discountLabel), {
         text: "-" + discount + "%"
@@ -311,9 +306,9 @@ function (_super) {
       style: {
         color: panelProps.salesPrice.content.color
       }
-    })), type !== 'groupBuy' && !showProgress && data.salesCnt > 0 && data.displaySalesCntFlag === 'Y' && ((_e = panelProps.sold) === null || _e === void 0 ? void 0 : _e.open) && /*#__PURE__*/_react["default"].createElement("div", {
+    })), type !== 'groupBuy' && !showProgress && data.salesCnt > 0 && data.displaySalesCntFlag === 'Y' && ((_d = panelProps.sold) === null || _d === void 0 ? void 0 : _d.open) && /*#__PURE__*/_react["default"].createElement("div", {
       className: "sold-count"
-    }, (0, _commonUtil.convertCount)(data.salesCnt), " sold"))), showProgress && ((_f = panelProps.salesProgressVisible) === null || _f === void 0 ? void 0 : _f.open) && /*#__PURE__*/_react["default"].createElement("div", {
+    }, (0, _commonUtil.convertCount)(data.salesCnt), " sold"))), showProgress && ((_e = panelProps.salesProgressVisible) === null || _e === void 0 ? void 0 : _e.open) && /*#__PURE__*/_react["default"].createElement("div", {
       className: "progress-wrap"
     }, /*#__PURE__*/_react["default"].createElement("span", {
       className: "text"
@@ -323,7 +318,7 @@ function (_super) {
       className: "progress",
       style: {
         width: salePercent + "%",
-        backgroundColor: (_g = panelProps.salesProgressVisible) === null || _g === void 0 ? void 0 : _g.color
+        backgroundColor: (_f = panelProps.salesProgressVisible) === null || _f === void 0 ? void 0 : _f.color
       }
     })))));
   };

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

@@ -101,7 +101,7 @@
 
       .old-price-wrap {
         display: flex;
-        line-height: 13px;
+        line-height: 15px;
 
         .discount {
           margin-right: 3px;

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

@@ -93,7 +93,7 @@ var groupedImageGroupSourceJSON = function groupedImageGroupSourceJSON(parentId,
     parentId: parentId,
     image: baseImage,
     groupName: baseGroupName,
-    title: createTextMeta(groupId, 'Group Title', '#CE1126', 16, 700),
+    title: createTextMeta(groupId, 'Group Title', '#CE1126', '16px', 700),
     images: [createImageMeta(groupId), createImageMeta(groupId), createImageMeta(groupId), createImageMeta(groupId)],
     hover: {
       open: true,

package/es/composite-comp/dito/components/GroupedImage/pc/index.less

@@ -5,7 +5,6 @@
 
   &.less-than-4 {
     .image-list-wrapper {
-      padding-left: 0!important;
       .image-list {
         width: fit-content;
         margin: 0 auto;
@@ -17,8 +16,7 @@
     display: flex;
     align-items: center;
     gap: 16px;
-    background: #ffffff;
-    overflow: auto;
+    // overflow: auto;
     position: relative;
     width: fit-content;
     margin: 0 auto 15px;
@@ -48,7 +46,6 @@
     }
 
     .image-list-wrapper {
-      padding-left: 88px;
       position: relative;
 
       .image-list {
@@ -60,20 +57,15 @@
         flex: 1;
         scroll-behavior: smooth;
         -webkit-overflow-scrolling: touch;
+        scrollbar-width: none;
 
         &::-webkit-scrollbar {
           display: none;
         }
 
-        scrollbar-width: none;
-
         .image-item {
           flex-shrink: 0;
           width: 300px;
-
-          &:last-child {
-            margin-right: 40px;
-          }
         }
 
         .empty-placeholder {

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

@@ -4,10 +4,12 @@
   height: 100%;
   display: flex;
   justify-content: center;
+  max-height: 65px;
+
   // overflow: hidden;
   &>img {
     width: 100%;
-    height: 100%;
+    // height: 100%;
     // object-fit: contain;
     transition: all .2s linear;
     vertical-align: initial;

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

@@ -303,14 +303,14 @@ function (_super) {
 
     _this.getProductList = function (index) {
       return __awaiter(_this, void 0, void 0, function () {
-        var panelProps, groupSource, recommendId, pageId, 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, prodType, _e, intelligentType, _f, intelligentValue, _g, maxProdNum, newData, params, res, res, e_1, _cache;
 
-        var _g, _h, _j;
+        var _h, _j, _k;
 
         var _this = this;
 
-        return __generator(this, function (_k) {
-          switch (_k.label) {
+        return __generator(this, function (_l) {
+          switch (_l.label) {
             case 0:
               panelProps = this.props.panelProps;
               groupSource = this.state.groupSource;
@@ -322,7 +322,7 @@ function (_super) {
 
                 if (cache) {
                   if ("products" + index in cache) {
-                    this.setState((_g = {}, _g["products" + index] = cache["products" + index], _g), function () {
+                    this.setState((_h = {}, _h["products" + index] = cache["products" + index], _h), function () {
                       _this.resetLayout();
                     });
                     /** 如果数据未过期 */
@@ -334,12 +334,12 @@ function (_super) {
                 }
               }
 
-              _a = groupSource[index] || {}, _b = _a.sourceType, sourceType = _b === void 0 ? '' : _b, _c = _a.prodIds, prodIds = _c === void 0 ? '' : _c, _d = _a.intelligentType, intelligentType = _d === void 0 ? '' : _d, _e = _a.intelligentValue, intelligentValue = _e === void 0 ? [] : _e, _f = _a.maxProdNum, maxProdNum = _f === void 0 ? 10 : _f;
+              _a = groupSource[index] || {}, _b = _a.sourceType, sourceType = _b === void 0 ? '' : _b, _c = _a.prodIds, prodIds = _c === void 0 ? '' : _c, _d = _a.prodType, prodType = _d === void 0 ? '' : _d, _e = _a.intelligentType, intelligentType = _e === void 0 ? '' : _e, _f = _a.intelligentValue, intelligentValue = _f === void 0 ? [] : _f, _g = _a.maxProdNum, maxProdNum = _g === void 0 ? 10 : _g;
               newData = [];
-              _k.label = 1;
+              _l.label = 1;
 
             case 1:
-              _k.trys.push([1, 9,, 10]);
+              _l.trys.push([1, 9,, 10]);
 
               if (!(groupSource.length > 0)) return [3
               /*break*/
@@ -347,22 +347,25 @@ function (_super) {
               if (!(sourceType === 'select')) return [3
               /*break*/
               , 3];
+              if (!prodIds) return [2
+              /*return*/
+              ];
+              params = {
+                state: 'A'
+              };
 
-              if (!prodIds) {
-                return [2
-                /*return*/
-                ];
+              if (prodType === 'spu') {
+                params.offers = prodIds;
+              } else {
+                params.products = prodIds;
               }
 
               return [4
               /*yield*/
-              , (0, _commonUtil.commonFetch)('/designer/v1/h5/products', {
-                products: prodIds,
-                state: 'A'
-              }, 'GET')];
+              , (0, _commonUtil.commonFetch)('/designer/v1/h5/products', params, 'GET')];
 
             case 2:
-              res = _k.sent();
+              res = _l.sent();
               newData = __spreadArrays(res.list);
               return [3
               /*break*/
@@ -385,7 +388,7 @@ function (_super) {
               }, 'POST')];
 
             case 4:
-              res = _k.sent();
+              res = _l.sent();
               newData = __spreadArrays(res.pageInfo.list);
               return [3
               /*break*/
@@ -393,7 +396,7 @@ function (_super) {
 
             case 5:
               newData = [];
-              _k.label = 6;
+              _l.label = 6;
 
             case 6:
               return [3
@@ -402,7 +405,7 @@ function (_super) {
 
             case 7:
               newData = [];
-              _k.label = 8;
+              _l.label = 8;
 
             case 8:
               return [3
@@ -410,7 +413,7 @@ function (_super) {
               , 10];
 
             case 9:
-              e_1 = _k.sent();
+              e_1 = _l.sent();
               newData = [];
               return [3
               /*break*/
@@ -419,10 +422,10 @@ function (_super) {
             case 10:
               if (!(0, _coreUtil.isDesignMode)()) {
                 _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)));
+                (0, _storeUtil.setMagicStore)("recommend_" + pageId + "_" + recommendId, __assign(__assign({}, _cache), (_j = {}, _j["products" + index] = newData, _j.endTime = Date.now() + 3 * 60 * 1000, _j)));
               }
 
-              this.setState((_j = {}, _j["products" + index] = newData, _j), function () {
+              this.setState((_k = {}, _k["products" + index] = newData, _k), function () {
                 _this.resetLayout();
               });
               return [2

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

@@ -16,9 +16,8 @@
   .recommend-tab-select-wrap {
     display: flex;
     align-items: center;
-    height: 50px;
-    background: rgb(255 255 255);
-    overflow: auto;
+    // height: 50px;
+    // overflow: auto;
     position: relative;
     width: fit-content;
     margin: 0 auto;
@@ -62,6 +61,14 @@
     .tab-list {
       width: 100%;
     }
+
+    .m-product-item-wrap {
+      border-radius: 8px;
+
+      .img-wrap {
+        border-radius: 8px 8px 0 0;
+      }
+    }
   }
 
   .arrow-icon {
@@ -89,6 +96,10 @@
     margin: 0;
   }
 
+  .scrollContainer::-webkit-scrollbar {
+    display: none; /* Chrome, Safari, Opera */
+  }
+
   .scrollContainer {
     display: flex;
     flex-direction: row;
@@ -96,6 +107,8 @@
     flex: 1;
     margin: 0;
     overflow-x: auto;
+    scrollbar-width: none; /* Firefox */
+    -ms-overflow-style: none; /* IE 和 Edge */
     padding-bottom: 15px;
 
     &.pl_100 {

package/es/composite-comp/dito/second-config-panels/MenuNavigationSecondConfig/index.js

@@ -71,7 +71,7 @@ function (_super) {
         value: /*#__PURE__*/_react["default"].createElement(_ImageConfig["default"], {
           data: panelProps.image,
           needClickArea: false,
-          onlySpecificCode: "FunctionPage"
+          onlySpecificCode: ['CustomizedPage', 'FunctionPage']
         }),
         metaOption: panelProps.image
       }];

package/es/core/Renderer/index.js

@@ -102,6 +102,17 @@ var Renderer = function Renderer(props) {
       toastState = _e[0],
       setToastState = _e[1];
 
+  var timerRef = (0, _react.useRef)(null);
+  var isMountedRef = (0, _react.useRef)(true); // 使用 useMemo 来稳定 pageData 的引用，避免不必要的重新渲染
+
+  var pageDataKey = (0, _react.useMemo)(function () {
+    if (!pageData || !pageData.childNodes) return ''; // 创建一个稳定的标识符，基于 childNodes 的内容
+
+    return pageData.childNodes.map(function (node) {
+      return node.id + "-" + node.type;
+    }).join(',');
+  }, [pageData]);
+
   if (!noSetWindow) {
     setDesignConfig(props);
   }
@@ -109,11 +120,21 @@ var Renderer = function Renderer(props) {
   window.magicDesignPageData = pageData;
   var pageBackground = window.magicDesign.pageBackground;
   (0, _react.useEffect)(function () {
-    console.log('----pageData change', pageData);
+    isMountedRef.current = true; // 清除之前的定时器
+
+    if (timerRef.current) {
+      clearTimeout(timerRef.current);
+      timerRef.current = null;
+    }
+
     var filterData = [];
 
     if (pageData && pageData.childNodes && pageData.childNodes.length) {
-      var graduallySetFloors = function graduallySetFloors(data, step, interval, start) {
+      filterData = pageData.childNodes.filter(function (node) {
+        return (0, _coreUtil.isActiveFloor)(node.activeTerminal);
+      });
+
+      var graduallySetFloors_1 = function graduallySetFloors_1(data, step, interval, start) {
         if (step === void 0) {
           step = 5;
         }
@@ -124,6 +145,11 @@ var Renderer = function Renderer(props) {
 
         if (start === void 0) {
           start = 0;
+        } // 检查组件是否仍然挂载
+
+
+        if (!isMountedRef.current) {
+          return;
         } // 计算这一步应该显示的最终索引
 
 
@@ -132,18 +158,29 @@ var Renderer = function Renderer(props) {
         setFloors(data.slice(0, end)); // 如果还有更多楼层要显示，设置一个定时器来递归调用此函数
 
         if (end < data.length) {
-          setTimeout(function () {
-            graduallySetFloors(data, step, interval, end);
+          timerRef.current = setTimeout(function () {
+            graduallySetFloors_1(data, step, interval, end);
           }, interval);
+        } else {
+          timerRef.current = null;
         }
       };
 
-      filterData = pageData.childNodes.filter(function (node) {
-        return (0, _coreUtil.isActiveFloor)(node.activeTerminal);
-      });
-      graduallySetFloors(filterData);
-    }
-  }, [pageData]);
+      graduallySetFloors_1(filterData);
+    } else {
+      setFloors([]);
+    } // 清理函数：清除所有未完成的定时器
+
+
+    return function () {
+      isMountedRef.current = false;
+
+      if (timerRef.current) {
+        clearTimeout(timerRef.current);
+        timerRef.current = null;
+      }
+    };
+  }, [pageDataKey]);
   (0, _react.useEffect)(function () {
     setTimeout(function () {
       var _a;
@@ -219,7 +256,6 @@ var Renderer = function Renderer(props) {
     };
   };
 
-  console.log('window.magicDesign.designMode', window.magicDesign.designMode);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "render_wrap",
     magic_design: "",
@@ -239,13 +275,17 @@ var Renderer = function Renderer(props) {
       console.error("[MagicBox] Can not find type " + nodeData.type);
       return;
     }
-    /** 添加模块需要 给GA使用 */
 
+    console.log('----nodeData', nodeData, moduleIndex);
+    /** 添加模块需要 给GA使用 */
+    // 避免直接修改原始 nodeData，创建新对象
 
-    nodeData.moduleIndex = moduleIndex + 1;
+    var nodeDataWithIndex = __assign(__assign({}, nodeData), {
+      moduleIndex: moduleIndex + 1
+    });
 
-    var newInstanceProps = __assign(__assign({}, nodeData), {
-      nodeData: nodeData,
+    var newInstanceProps = __assign(__assign({}, nodeDataWithIndex), {
+      nodeData: nodeDataWithIndex,
       mode: 'renderer',
       outputType: outputType
     });

package/es/meta-comp/config-panels/ButtonConfig/index.js

@@ -146,6 +146,10 @@ function (_super) {
       };
     }
 
+    if (!data.buttonText.pcFontSize) {
+      data.buttonText.pcFontSize = 14;
+    }
+
     var contentSetting = /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_common.Field, {
       split: true,
       title: "URL"

package/es/meta-comp/config-panels/ImageConfig/index.js

@@ -379,7 +379,7 @@ function (_super) {
     })), /*#__PURE__*/_react["default"].createElement(_common.Field, {
       title: (0, _locale.i18n)('BORDER_RADIUS')
     }, /*#__PURE__*/_react["default"].createElement(_common.Slider, {
-      maxVal: 30,
+      maxVal: 200,
       minVal: 0,
       onChange: function onChange(_a) {
         var count = _a.count;

package/es/meta-comp/config-panels/TextConfig/index.js

@@ -287,7 +287,7 @@ function (_super) {
         },
         unit: "px",
         value: {
-          count: window.magicDesign.device == 'pc' ? textData.pcFontSize : textData.fontSize
+          count: window.magicDesign.device == 'pc' ? textData.pcFontSize || textData.fontSize : textData.fontSize
         }
       }))), /*#__PURE__*/_react["default"].createElement(_common.Field, {
         title: ""

package/es/utils/coreUtil.js

@@ -350,8 +350,7 @@ var createProdCardModal = function createProdCardModal(ids) {
 exports.createProdCardModal = createProdCardModal;
 
 var createPictureModal = function createPictureModal(url) {
-  if (!url) return;
-  document.body.classList.add('no-scroll');
+  if (!url) return; // document.body.classList.add('no-scroll');
 
   _mobx.frameStore.setState({
     pictureModalState: {
@@ -368,8 +367,9 @@ var clickUrl = function clickUrl(url, state) {
 
   if (url === void 0) {
     url = '';
-  } // 只读模式，设计模式，url为空，邮箱模版
+  }
 
+  console.log('clickUrl....', url); // 只读模式，设计模式，url为空，邮箱模版
 
   if (window.magicDesign.readOnly || window.magicDesign.mode !== 'renderer' || !url || window.magicDesign.outputType == 'html') {
     return;

package/lib/common/PictureModal/index.js

@@ -29,7 +29,7 @@ function PictureModal(_a) {
     draggable: false
   }), /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
     className: "closeIcon",
-    color: "#929292",
+    color: "#fff",
     onClick: onClose,
     size: 20,
     type: "icon-close"

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

@@ -53,7 +53,7 @@
       }
 
       &.active {
-        border-radius: 20px;
+        border-radius: 0;
       }
     }
   }

package/lib/composite-comp/common/components/ProductItem/index.js

@@ -107,22 +107,22 @@ function (_super) {
   };
 
   ProductItem.prototype.render = function () {
-    var _a, _b, _c, _d, _e, _f, _g;
-
-    var _h = this.props,
-        data = _h.data,
-        type = _h.type,
-        panelProps = _h.panelProps,
-        onItemClick = _h.onItemClick,
-        showProName = _h.showProName,
-        showProgress = _h.showProgress,
-        fixHeight = _h.fixHeight,
-        layout = _h.layout,
-        imgHeight = _h.imgHeight,
-        imgWidth = _h.imgWidth,
-        unknownPrice = _h.unknownPrice,
-        hideLabels = _h.hideLabels,
-        rest = __rest(_h, ["data", "type", "panelProps", "onItemClick", "showProName", "showProgress", "fixHeight", "layout", "imgHeight", "imgWidth", "unknownPrice", "hideLabels"]);
+    var _a, _b, _c, _d, _e, _f;
+
+    var _g = this.props,
+        data = _g.data,
+        type = _g.type,
+        panelProps = _g.panelProps,
+        onItemClick = _g.onItemClick,
+        showProName = _g.showProName,
+        showProgress = _g.showProgress,
+        fixHeight = _g.fixHeight,
+        layout = _g.layout,
+        imgHeight = _g.imgHeight,
+        imgWidth = _g.imgWidth,
+        unknownPrice = _g.unknownPrice,
+        hideLabels = _g.hideLabels,
+        rest = __rest(_g, ["data", "type", "panelProps", "onItemClick", "showProName", "showProgress", "fixHeight", "layout", "imgHeight", "imgWidth", "unknownPrice", "hideLabels"]);
 
     var promotions = (0, _businessUtil.getPromotionList)(data);
     var price = (0, _currencyUtil.formatCurrency)(data.salesPrice);
@@ -198,10 +198,8 @@ function (_super) {
     })) || [];
     var prodLabels = ((_b = data.labels) === null || _b === void 0 ? void 0 : _b.filter(function (f) {
       return f.position === '6';
-    })) || [];
-    var priceLabels = ((_c = data.labels) === null || _c === void 0 ? void 0 : _c.filter(function (f) {
-      return f.position === '7';
-    })) || []; // ad 卡片
+    })) || []; // const priceLabels = data.labels?.filter(f => f.position === '7') || [];
+    // ad 卡片
 
     if (data.type === 'ad') {
       return /*#__PURE__*/_react["default"].createElement("div", {
@@ -289,14 +287,11 @@ function (_super) {
         text: _price
       }),
       readonly: true
-    }), priceLabels.length > 0 && !hideLabels && /*#__PURE__*/_react["default"].createElement(_ImageLabel["default"], {
-      labels: priceLabels,
-      small: true
     })), panelProps.salesPrice.open && (!!discount || oldPrice) && /*#__PURE__*/_react["default"].createElement("div", {
       className: "price-sold-wrap"
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "old-price-wrap"
-    }, !!discount && ((_d = panelProps.discountLabel) === null || _d === void 0 ? void 0 : _d.open) && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
+    }, !!discount && ((_c = panelProps.discountLabel) === null || _c === void 0 ? void 0 : _c.open) && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
       className: "discount",
       data: __assign(__assign({}, panelProps.discountLabel), {
         text: "-" + discount + "%"
@@ -311,9 +306,9 @@ function (_super) {
       style: {
         color: panelProps.salesPrice.content.color
       }
-    })), type !== 'groupBuy' && !showProgress && data.salesCnt > 0 && data.displaySalesCntFlag === 'Y' && ((_e = panelProps.sold) === null || _e === void 0 ? void 0 : _e.open) && /*#__PURE__*/_react["default"].createElement("div", {
+    })), type !== 'groupBuy' && !showProgress && data.salesCnt > 0 && data.displaySalesCntFlag === 'Y' && ((_d = panelProps.sold) === null || _d === void 0 ? void 0 : _d.open) && /*#__PURE__*/_react["default"].createElement("div", {
       className: "sold-count"
-    }, (0, _commonUtil.convertCount)(data.salesCnt), " sold"))), showProgress && ((_f = panelProps.salesProgressVisible) === null || _f === void 0 ? void 0 : _f.open) && /*#__PURE__*/_react["default"].createElement("div", {
+    }, (0, _commonUtil.convertCount)(data.salesCnt), " sold"))), showProgress && ((_e = panelProps.salesProgressVisible) === null || _e === void 0 ? void 0 : _e.open) && /*#__PURE__*/_react["default"].createElement("div", {
       className: "progress-wrap"
     }, /*#__PURE__*/_react["default"].createElement("span", {
       className: "text"
@@ -323,7 +318,7 @@ function (_super) {
       className: "progress",
       style: {
         width: salePercent + "%",
-        backgroundColor: (_g = panelProps.salesProgressVisible) === null || _g === void 0 ? void 0 : _g.color
+        backgroundColor: (_f = panelProps.salesProgressVisible) === null || _f === void 0 ? void 0 : _f.color
       }
     })))));
   };

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

@@ -101,7 +101,7 @@
 
       .old-price-wrap {
         display: flex;
-        line-height: 13px;
+        line-height: 15px;
 
         .discount {
           margin-right: 3px;

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

@@ -93,7 +93,7 @@ var groupedImageGroupSourceJSON = function groupedImageGroupSourceJSON(parentId,
     parentId: parentId,
     image: baseImage,
     groupName: baseGroupName,
-    title: createTextMeta(groupId, 'Group Title', '#CE1126', 16, 700),
+    title: createTextMeta(groupId, 'Group Title', '#CE1126', '16px', 700),
     images: [createImageMeta(groupId), createImageMeta(groupId), createImageMeta(groupId), createImageMeta(groupId)],
     hover: {
       open: true,

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

@@ -5,7 +5,6 @@
 
   &.less-than-4 {
     .image-list-wrapper {
-      padding-left: 0!important;
       .image-list {
         width: fit-content;
         margin: 0 auto;
@@ -17,8 +16,7 @@
     display: flex;
     align-items: center;
     gap: 16px;
-    background: #ffffff;
-    overflow: auto;
+    // overflow: auto;
     position: relative;
     width: fit-content;
     margin: 0 auto 15px;
@@ -48,7 +46,6 @@
     }
 
     .image-list-wrapper {
-      padding-left: 88px;
       position: relative;
 
       .image-list {
@@ -60,20 +57,15 @@
         flex: 1;
         scroll-behavior: smooth;
         -webkit-overflow-scrolling: touch;
+        scrollbar-width: none;
 
         &::-webkit-scrollbar {
           display: none;
         }
 
-        scrollbar-width: none;
-
         .image-item {
           flex-shrink: 0;
           width: 300px;
-
-          &:last-child {
-            margin-right: 40px;
-          }
         }
 
         .empty-placeholder {

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

@@ -4,10 +4,12 @@
   height: 100%;
   display: flex;
   justify-content: center;
+  max-height: 65px;
+
   // overflow: hidden;
   &>img {
     width: 100%;
-    height: 100%;
+    // height: 100%;
     // object-fit: contain;
     transition: all .2s linear;
     vertical-align: initial;

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

@@ -303,14 +303,14 @@ function (_super) {
 
     _this.getProductList = function (index) {
       return __awaiter(_this, void 0, void 0, function () {
-        var panelProps, groupSource, recommendId, pageId, 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, prodType, _e, intelligentType, _f, intelligentValue, _g, maxProdNum, newData, params, res, res, e_1, _cache;
 
-        var _g, _h, _j;
+        var _h, _j, _k;
 
         var _this = this;
 
-        return __generator(this, function (_k) {
-          switch (_k.label) {
+        return __generator(this, function (_l) {
+          switch (_l.label) {
             case 0:
               panelProps = this.props.panelProps;
               groupSource = this.state.groupSource;
@@ -322,7 +322,7 @@ function (_super) {
 
                 if (cache) {
                   if ("products" + index in cache) {
-                    this.setState((_g = {}, _g["products" + index] = cache["products" + index], _g), function () {
+                    this.setState((_h = {}, _h["products" + index] = cache["products" + index], _h), function () {
                       _this.resetLayout();
                     });
                     /** 如果数据未过期 */
@@ -334,12 +334,12 @@ function (_super) {
                 }
               }
 
-              _a = groupSource[index] || {}, _b = _a.sourceType, sourceType = _b === void 0 ? '' : _b, _c = _a.prodIds, prodIds = _c === void 0 ? '' : _c, _d = _a.intelligentType, intelligentType = _d === void 0 ? '' : _d, _e = _a.intelligentValue, intelligentValue = _e === void 0 ? [] : _e, _f = _a.maxProdNum, maxProdNum = _f === void 0 ? 10 : _f;
+              _a = groupSource[index] || {}, _b = _a.sourceType, sourceType = _b === void 0 ? '' : _b, _c = _a.prodIds, prodIds = _c === void 0 ? '' : _c, _d = _a.prodType, prodType = _d === void 0 ? '' : _d, _e = _a.intelligentType, intelligentType = _e === void 0 ? '' : _e, _f = _a.intelligentValue, intelligentValue = _f === void 0 ? [] : _f, _g = _a.maxProdNum, maxProdNum = _g === void 0 ? 10 : _g;
               newData = [];
-              _k.label = 1;
+              _l.label = 1;
 
             case 1:
-              _k.trys.push([1, 9,, 10]);
+              _l.trys.push([1, 9,, 10]);
 
               if (!(groupSource.length > 0)) return [3
               /*break*/
@@ -347,22 +347,25 @@ function (_super) {
               if (!(sourceType === 'select')) return [3
               /*break*/
               , 3];
+              if (!prodIds) return [2
+              /*return*/
+              ];
+              params = {
+                state: 'A'
+              };
 
-              if (!prodIds) {
-                return [2
-                /*return*/
-                ];
+              if (prodType === 'spu') {
+                params.offers = prodIds;
+              } else {
+                params.products = prodIds;
               }
 
               return [4
               /*yield*/
-              , (0, _commonUtil.commonFetch)('/designer/v1/h5/products', {
-                products: prodIds,
-                state: 'A'
-              }, 'GET')];
+              , (0, _commonUtil.commonFetch)('/designer/v1/h5/products', params, 'GET')];
 
             case 2:
-              res = _k.sent();
+              res = _l.sent();
               newData = __spreadArrays(res.list);
               return [3
               /*break*/
@@ -385,7 +388,7 @@ function (_super) {
               }, 'POST')];
 
             case 4:
-              res = _k.sent();
+              res = _l.sent();
               newData = __spreadArrays(res.pageInfo.list);
               return [3
               /*break*/
@@ -393,7 +396,7 @@ function (_super) {
 
             case 5:
               newData = [];
-              _k.label = 6;
+              _l.label = 6;
 
             case 6:
               return [3
@@ -402,7 +405,7 @@ function (_super) {
 
             case 7:
               newData = [];
-              _k.label = 8;
+              _l.label = 8;
 
             case 8:
               return [3
@@ -410,7 +413,7 @@ function (_super) {
               , 10];
 
             case 9:
-              e_1 = _k.sent();
+              e_1 = _l.sent();
               newData = [];
               return [3
               /*break*/
@@ -419,10 +422,10 @@ function (_super) {
             case 10:
               if (!(0, _coreUtil.isDesignMode)()) {
                 _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)));
+                (0, _storeUtil.setMagicStore)("recommend_" + pageId + "_" + recommendId, __assign(__assign({}, _cache), (_j = {}, _j["products" + index] = newData, _j.endTime = Date.now() + 3 * 60 * 1000, _j)));
               }
 
-              this.setState((_j = {}, _j["products" + index] = newData, _j), function () {
+              this.setState((_k = {}, _k["products" + index] = newData, _k), function () {
                 _this.resetLayout();
               });
               return [2

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

@@ -16,9 +16,8 @@
   .recommend-tab-select-wrap {
     display: flex;
     align-items: center;
-    height: 50px;
-    background: rgb(255 255 255);
-    overflow: auto;
+    // height: 50px;
+    // overflow: auto;
     position: relative;
     width: fit-content;
     margin: 0 auto;
@@ -62,6 +61,14 @@
     .tab-list {
       width: 100%;
     }
+
+    .m-product-item-wrap {
+      border-radius: 8px;
+
+      .img-wrap {
+        border-radius: 8px 8px 0 0;
+      }
+    }
   }
 
   .arrow-icon {
@@ -89,6 +96,10 @@
     margin: 0;
   }
 
+  .scrollContainer::-webkit-scrollbar {
+    display: none; /* Chrome, Safari, Opera */
+  }
+
   .scrollContainer {
     display: flex;
     flex-direction: row;
@@ -96,6 +107,8 @@
     flex: 1;
     margin: 0;
     overflow-x: auto;
+    scrollbar-width: none; /* Firefox */
+    -ms-overflow-style: none; /* IE 和 Edge */
     padding-bottom: 15px;
 
     &.pl_100 {

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

@@ -71,7 +71,7 @@ function (_super) {
         value: /*#__PURE__*/_react["default"].createElement(_ImageConfig["default"], {
           data: panelProps.image,
           needClickArea: false,
-          onlySpecificCode: "FunctionPage"
+          onlySpecificCode: ['CustomizedPage', 'FunctionPage']
         }),
         metaOption: panelProps.image
       }];

package/lib/core/Renderer/index.js

@@ -102,6 +102,17 @@ var Renderer = function Renderer(props) {
       toastState = _e[0],
       setToastState = _e[1];
 
+  var timerRef = (0, _react.useRef)(null);
+  var isMountedRef = (0, _react.useRef)(true); // 使用 useMemo 来稳定 pageData 的引用，避免不必要的重新渲染
+
+  var pageDataKey = (0, _react.useMemo)(function () {
+    if (!pageData || !pageData.childNodes) return ''; // 创建一个稳定的标识符，基于 childNodes 的内容
+
+    return pageData.childNodes.map(function (node) {
+      return node.id + "-" + node.type;
+    }).join(',');
+  }, [pageData]);
+
   if (!noSetWindow) {
     setDesignConfig(props);
   }
@@ -109,11 +120,21 @@ var Renderer = function Renderer(props) {
   window.magicDesignPageData = pageData;
   var pageBackground = window.magicDesign.pageBackground;
   (0, _react.useEffect)(function () {
-    console.log('----pageData change', pageData);
+    isMountedRef.current = true; // 清除之前的定时器
+
+    if (timerRef.current) {
+      clearTimeout(timerRef.current);
+      timerRef.current = null;
+    }
+
     var filterData = [];
 
     if (pageData && pageData.childNodes && pageData.childNodes.length) {
-      var graduallySetFloors = function graduallySetFloors(data, step, interval, start) {
+      filterData = pageData.childNodes.filter(function (node) {
+        return (0, _coreUtil.isActiveFloor)(node.activeTerminal);
+      });
+
+      var graduallySetFloors_1 = function graduallySetFloors_1(data, step, interval, start) {
         if (step === void 0) {
           step = 5;
         }
@@ -124,6 +145,11 @@ var Renderer = function Renderer(props) {
 
         if (start === void 0) {
           start = 0;
+        } // 检查组件是否仍然挂载
+
+
+        if (!isMountedRef.current) {
+          return;
         } // 计算这一步应该显示的最终索引
 
 
@@ -132,18 +158,29 @@ var Renderer = function Renderer(props) {
         setFloors(data.slice(0, end)); // 如果还有更多楼层要显示，设置一个定时器来递归调用此函数
 
         if (end < data.length) {
-          setTimeout(function () {
-            graduallySetFloors(data, step, interval, end);
+          timerRef.current = setTimeout(function () {
+            graduallySetFloors_1(data, step, interval, end);
           }, interval);
+        } else {
+          timerRef.current = null;
         }
       };
 
-      filterData = pageData.childNodes.filter(function (node) {
-        return (0, _coreUtil.isActiveFloor)(node.activeTerminal);
-      });
-      graduallySetFloors(filterData);
-    }
-  }, [pageData]);
+      graduallySetFloors_1(filterData);
+    } else {
+      setFloors([]);
+    } // 清理函数：清除所有未完成的定时器
+
+
+    return function () {
+      isMountedRef.current = false;
+
+      if (timerRef.current) {
+        clearTimeout(timerRef.current);
+        timerRef.current = null;
+      }
+    };
+  }, [pageDataKey]);
   (0, _react.useEffect)(function () {
     setTimeout(function () {
       var _a;
@@ -219,7 +256,6 @@ var Renderer = function Renderer(props) {
     };
   };
 
-  console.log('window.magicDesign.designMode', window.magicDesign.designMode);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "render_wrap",
     magic_design: "",
@@ -239,13 +275,17 @@ var Renderer = function Renderer(props) {
       console.error("[MagicBox] Can not find type " + nodeData.type);
       return;
     }
-    /** 添加模块需要 给GA使用 */
 
+    console.log('----nodeData', nodeData, moduleIndex);
+    /** 添加模块需要 给GA使用 */
+    // 避免直接修改原始 nodeData，创建新对象
 
-    nodeData.moduleIndex = moduleIndex + 1;
+    var nodeDataWithIndex = __assign(__assign({}, nodeData), {
+      moduleIndex: moduleIndex + 1
+    });
 
-    var newInstanceProps = __assign(__assign({}, nodeData), {
-      nodeData: nodeData,
+    var newInstanceProps = __assign(__assign({}, nodeDataWithIndex), {
+      nodeData: nodeDataWithIndex,
       mode: 'renderer',
       outputType: outputType
     });

package/lib/meta-comp/config-panels/ButtonConfig/index.js

@@ -146,6 +146,10 @@ function (_super) {
       };
     }
 
+    if (!data.buttonText.pcFontSize) {
+      data.buttonText.pcFontSize = 14;
+    }
+
     var contentSetting = /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_common.Field, {
       split: true,
       title: "URL"

package/lib/meta-comp/config-panels/ImageConfig/index.js

@@ -379,7 +379,7 @@ function (_super) {
     })), /*#__PURE__*/_react["default"].createElement(_common.Field, {
       title: (0, _locale.i18n)('BORDER_RADIUS')
     }, /*#__PURE__*/_react["default"].createElement(_common.Slider, {
-      maxVal: 30,
+      maxVal: 200,
       minVal: 0,
       onChange: function onChange(_a) {
         var count = _a.count;

package/lib/meta-comp/config-panels/TextConfig/index.js

@@ -287,7 +287,7 @@ function (_super) {
         },
         unit: "px",
         value: {
-          count: window.magicDesign.device == 'pc' ? textData.pcFontSize : textData.fontSize
+          count: window.magicDesign.device == 'pc' ? textData.pcFontSize || textData.fontSize : textData.fontSize
         }
       }))), /*#__PURE__*/_react["default"].createElement(_common.Field, {
         title: ""

package/lib/utils/coreUtil.js

@@ -350,8 +350,7 @@ var createProdCardModal = function createProdCardModal(ids) {
 exports.createProdCardModal = createProdCardModal;
 
 var createPictureModal = function createPictureModal(url) {
-  if (!url) return;
-  document.body.classList.add('no-scroll');
+  if (!url) return; // document.body.classList.add('no-scroll');
 
   _mobx.frameStore.setState({
     pictureModalState: {
@@ -368,8 +367,9 @@ var clickUrl = function clickUrl(url, state) {
 
   if (url === void 0) {
     url = '';
-  } // 只读模式，设计模式，url为空，邮箱模版
+  }
 
+  console.log('clickUrl....', url); // 只读模式，设计模式，url为空，邮箱模版
 
   if (window.magicDesign.readOnly || window.magicDesign.mode !== 'renderer' || !url || window.magicDesign.outputType == 'html') {
     return;

package/package.json

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