@fonixtree/magic-design 1.0.221 → 1.0.224

package/es/common/GroupList/index.js

@@ -114,12 +114,16 @@ function (_super) {
       e.stopPropagation();
       var _a = _this.props,
           source = _a.source,
-          max = _a.max;
+          max = _a.max,
+          parentId = _a.parentId;
       if (source.length >= max) return;
       var index = source.findIndex(function (src) {
         return src.id === item.id;
-      });
-      source.splice(index, 0, (0, _coreUtil.copyNode)(item));
+      }); // 传递 parentId 给 copyNode，如果提供了 parentId，复制的节点会有正确的 parentId
+      // 如果没有提供 parentId，copyNode 会使用原节点的 parentId
+
+      var copiedItem = (0, _coreUtil.copyNode)(item, parentId);
+      source.splice(index, 0, copiedItem);
 
       _this.setState({});
 
@@ -211,7 +215,8 @@ function (_super) {
     onClickItem: function onClickItem() {},
     reRender: function reRender() {},
     renderCard: renderCardDefault,
-    max: 99
+    max: 99,
+    parentId: undefined
   };
   return GroupList;
 }(_react["default"].Component);

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.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

@@ -59,9 +59,10 @@ var createTextMeta = function createTextMeta(parentId, text, color, fontSize, fo
   };
 };
 
-var createImageMeta = function createImageMeta(parentId) {
+var createImageMeta = function createImageMeta(parentId, grandId) {
   return {
     parentId: parentId,
+    grandId: grandId,
     id: (0, _uuid.v4)(),
     open: true,
     type: 'IMAGE',
@@ -94,7 +95,7 @@ var groupedImageGroupSourceJSON = function groupedImageGroupSourceJSON(parentId,
     image: baseImage,
     groupName: baseGroupName,
     title: createTextMeta(groupId, 'Group Title', '#CE1126', '16px', 700),
-    images: [createImageMeta(groupId), createImageMeta(groupId), createImageMeta(groupId), createImageMeta(groupId)],
+    images: [createImageMeta(groupId, parentId), createImageMeta(groupId, parentId), createImageMeta(groupId, parentId), createImageMeta(groupId, parentId)],
     hover: {
       open: true,
       image: __assign(__assign({}, createImageMeta(groupId)), {

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

@@ -68,30 +68,6 @@ function (_super) {
       groupSource: [],
       scrollToLeftDisabled: true,
       scrollToRightDisabled: true
-    }; // 数据迁移：将旧的image1-4迁移到images数组
-
-    _this.migrateData = function (groupSource) {
-      groupSource.forEach(function (group) {
-        // 如果存在旧的image1-4字段且没有images数组，进行迁移
-        if (!group.images && (group.image1 || group.image2 || group.image3 || group.image4)) {
-          group.images = [];
-          [group.image1, group.image2, group.image3, group.image4].forEach(function (img) {
-            if (img) {
-              group.images.push(img);
-            }
-          }); // 删除旧字段
-
-          delete group.image1;
-          delete group.image2;
-          delete group.image3;
-          delete group.image4;
-        } // 确保images数组存在
-
-
-        if (!group.images) {
-          group.images = [];
-        }
-      });
     };
 
     _this.initScroll = function (resetPosition) {
@@ -244,9 +220,8 @@ function (_super) {
   GroupedImagePc.prototype.componentDidMount = function () {
     var _this = this;
 
-    var panelProps = this.props.panelProps; // 数据迁移
-
-    this.migrateData(panelProps.groupSource);
+    var panelProps = this.props.panelProps;
+    console.log('panelProps......', panelProps);
     var source = [];
     panelProps.groupSource.forEach(function (m) {
       var show = m.image.open || m.groupName.open;
@@ -267,9 +242,7 @@ function (_super) {
     var _this = this;
 
     var tabIndex = this.state.tabIndex;
-    var panelProps = nextProps.panelProps; // 数据迁移
-
-    this.migrateData(panelProps.groupSource);
+    var panelProps = nextProps.panelProps;
     var source = [];
     panelProps.groupSource.forEach(function (m) {
       var show = m.image.open || m.groupName.open;
@@ -353,27 +326,6 @@ function (_super) {
           return img.id;
         }, idx),
         className: "image-item",
-        onClick: function onClick(e) {
-          // 只在设计模式下才触发联动
-          if (!(0, _coreUtil.isDesignMode)()) {
-            return;
-          } // 点击图片时，联动到第三级属性面板
-
-
-          e.stopPropagation();
-          e.preventDefault(); // 获取当前tab的group id和楼层id
-
-          var panelProps = _this.props.panelProps;
-          var currentGroupId = current.id; // panelProps.id 就是楼层ID
-
-          var floorId = panelProps.id; // 一次性设置所有需要的状态，确保联动正常
-
-          _mobx.store.setState({
-            clickedGroup: currentGroupId,
-            clickedFloor: floorId,
-            clickedImage: img.id
-          });
-        },
         style: {
           cursor: (0, _coreUtil.isDesignMode)() ? 'pointer' : 'default'
         }

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,7 +16,6 @@
     display: flex;
     align-items: center;
     gap: 16px;
-    background: #ffffff;
     // overflow: auto;
     position: relative;
     width: fit-content;
@@ -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/Recommend/pc/index.js

@@ -642,9 +642,27 @@ function (_super) {
     var colNumber = layout === 'layout1' ? panelProps.customize.pcRowNum : panelProps.customize.pcRowNum + 0.5;
     var spaceNumber = layout === 'layout1' ? panelProps.customize.pcRowNum - 1 : panelProps.customize.pcRowNum;
     if (contentWidth) imgSize = (contentWidth - 24 * spaceNumber - otherWidth) / colNumber;
+    var background = panelProps.background.tabBackground;
+    var tabStyle = {};
+
+    if (background) {
+      if (background.tabBgType === 'color') {
+        tabStyle.backgroundColor = background.color;
+        tabStyle.opacity = background.opacity ? background.opacity : 1;
+      } else {
+        tabStyle.backgroundImage = "url(" + background.image + ")";
+        tabStyle.backgroundPosition = 'center center';
+        tabStyle.backgroundSize = 'cover';
+        tabStyle.backgroundRepeat = 'no-repeat';
+      }
+    }
+
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "m-recommend-pc"
     }, !hideTabs && /*#__PURE__*/_react["default"].createElement("div", {
+      className: "recommend-tab-select-bg",
+      style: tabStyle
+    }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "recommend-tab-select-wrap"
     }, groupSource.map(function (tab, index) {
       var _image = index == tabIndex && tab.hover.open && tab.hover.image.open ? tab.hover.image : tab.image;
@@ -681,7 +699,7 @@ function (_super) {
         transform: "translateX(" + tabLeft + "px)",
         background: this.getTabBarActiveColor(panelProps)
       }
-    })), /*#__PURE__*/_react["default"].createElement("div", {
+    }))), /*#__PURE__*/_react["default"].createElement("div", {
       className: "tab-content"
     }, layout !== 'layout1' && /*#__PURE__*/_react["default"].createElement("div", {
       className: "arrow-icon left",
@@ -704,10 +722,9 @@ function (_super) {
         data: item,
         fixHeight: true,
         imgHeight: imgSize,
-        imgWidth: "100%" // onItemClick={() => clickUrl(`/product/detail/${item.offerId}`)}
-        ,
+        imgWidth: "100%",
         onItemClick: function onItemClick() {
-          return (0, _coreUtil.clickUrl)("proDetail-" + item.offerId);
+          (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || item.productId || ''));
         },
         panelProps: panelProps.content,
         showProgress: false
@@ -733,10 +750,9 @@ function (_super) {
         data: item,
         fixHeight: true,
         imgHeight: imgSize,
-        imgWidth: imgSize // onItemClick={() => clickUrl(`/product/detail/${item.offerId}`)}
-        ,
+        imgWidth: imgSize,
         onItemClick: function onItemClick() {
-          return (0, _coreUtil.clickUrl)("proDetail-" + item.offerId);
+          (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || item.productId || ''));
         },
         panelProps: panelProps.content,
         showProgress: false

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

@@ -12,17 +12,19 @@
   //   height: 0;
   //   display: none;
   // }
+  
+  .recommend-tab-select-bg {
+    margin-bottom: 15px;
+  }
 
   .recommend-tab-select-wrap {
     display: flex;
     align-items: center;
-    height: 50px;
-    background: rgb(255 255 255);
+    // height: 50px;
     // overflow: auto;
     position: relative;
     width: fit-content;
     margin: 0 auto;
-    margin-bottom: 15px;
 
     .tabTitle {
       display: flex;
@@ -97,6 +99,10 @@
     margin: 0;
   }
 
+  .scrollContainer::-webkit-scrollbar {
+    display: none; /* Chrome, Safari, Opera */
+  }
+
   .scrollContainer {
     display: flex;
     flex-direction: row;
@@ -104,6 +110,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/GroupedImageSecondConfig/index.js

@@ -95,29 +95,7 @@ function (_super) {
   __extends(GroupedImageSecondConfig, _super);
 
   function GroupedImageSecondConfig() {
-    var _this = _super !== null && _super.apply(this, arguments) || this; // 数据迁移：将旧的image1-4迁移到images数组
-
-
-    _this.migrateData = function (panelProps) {
-      if (!panelProps.images && (panelProps.image1 || panelProps.image2 || panelProps.image3 || panelProps.image4)) {
-        panelProps.images = [];
-        [panelProps.image1, panelProps.image2, panelProps.image3, panelProps.image4].forEach(function (img) {
-          if (img) {
-            panelProps.images.push(img);
-          }
-        }); // 删除旧字段
-
-        delete panelProps.image1;
-        delete panelProps.image2;
-        delete panelProps.image3;
-        delete panelProps.image4;
-      } // 确保images数组存在
-
-
-      if (!panelProps.images) {
-        panelProps.images = [];
-      }
-    };
+    var _this = _super !== null && _super.apply(this, arguments) || this;
 
     _this.getContentPanel = function () {
       var panelProps = _this.props.panelProps;
@@ -149,9 +127,9 @@ function (_super) {
 
     _this.getImagePanel = function () {
       var panelProps = _this.props.panelProps;
-      var clickedImage = _mobx.store.clickedImage; // 如果选中了图片，不显示图片列表，由ConfigPanel统一处理第三级面板
+      var clickedSecondGroup = _mobx.store.clickedSecondGroup; // 如果选中了图片，不显示图片列表，由ConfigPanel统一处理第三级面板
 
-      if (clickedImage) {
+      if (clickedSecondGroup) {
         return null;
       } // 显示图片列表
 
@@ -171,7 +149,7 @@ function (_super) {
 
       var onClickItem = function onClickItem(node) {
         _mobx.store.setState({
-          clickedImage: node.id
+          clickedSecondGroup: node.id
         });
       };
 
@@ -200,7 +178,8 @@ function (_super) {
         onClickItem: onClickItem,
         renderCard: renderCard,
         reRender: reRender,
-        source: panelProps.images || []
+        source: panelProps.images || [],
+        parentId: panelProps.id
       })), /*#__PURE__*/_react["default"].createElement("div", {
         className: "btn_wrap"
       }, /*#__PURE__*/_react["default"].createElement(_Button["default"], {
@@ -221,15 +200,9 @@ function (_super) {
     return _this;
   }
 
-  GroupedImageSecondConfig.prototype.componentDidMount = function () {
-    var panelProps = this.props.panelProps;
-    this.migrateData(panelProps);
-  };
+  GroupedImageSecondConfig.prototype.componentDidMount = function () {};
 
-  GroupedImageSecondConfig.prototype.componentWillReceiveProps = function (nextProps) {
-    var panelProps = nextProps.panelProps;
-    this.migrateData(panelProps);
-  };
+  GroupedImageSecondConfig.prototype.componentWillReceiveProps = function (nextProps) {};
 
   GroupedImageSecondConfig.prototype.render = function () {
     var _this = this;

package/es/composite-comp/dito/third-config-panels/GroupedImageThirdConfig/index.js

@@ -0,0 +1,72 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _ImageConfig = _interopRequireDefault(require("../../../../meta-comp/config-panels/ImageConfig"));
+
+var _BaseConfig = _interopRequireDefault(require("../../../../meta-comp/config-panels/BaseConfig"));
+
+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 GroupedImageThirdConfig =
+/** @class */
+function (_super) {
+  __extends(GroupedImageThirdConfig, _super);
+
+  function GroupedImageThirdConfig() {
+    return _super !== null && _super.apply(this, arguments) || this;
+  }
+
+  GroupedImageThirdConfig.prototype.render = function () {
+    var panelProps = this.props.panelProps;
+
+    if (!panelProps) {
+      return null;
+    }
+
+    return /*#__PURE__*/_react["default"].createElement("div", {
+      className: "grouped_image_third_conf_wrap"
+    }, /*#__PURE__*/_react["default"].createElement(_ImageConfig["default"], {
+      data: panelProps
+    }));
+  };
+
+  GroupedImageThirdConfig.defaultProps = {
+    panelProps: {}
+  };
+  return GroupedImageThirdConfig;
+}(_BaseConfig["default"]);
+
+var _default = GroupedImageThirdConfig;
+exports["default"] = _default;

package/es/constants/component-types.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.secondConfigPanelMap = exports.configPanelMap = exports.componentMap = void 0;
+exports.thirdConfigPanelMap = exports.secondConfigPanelMap = exports.configPanelMap = exports.componentMap = void 0;
 
 var _Banner = _interopRequireDefault(require("../composite-comp/bol/components/Banner"));
 
@@ -197,9 +197,11 @@ var _NewsSecondConfig = _interopRequireDefault(require("../composite-comp/dito/s
 
 var _CampaignSecondConfig = _interopRequireDefault(require("../composite-comp/dito/second-config-panels/CampaignSecondConfig"));
 
+var _GroupedImageThirdConfig = _interopRequireDefault(require("../composite-comp/dito/third-config-panels/GroupedImageThirdConfig"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-var _a, _b, _c; // 组件
+var _a, _b, _c, _d; // 组件
 
 
 /**
@@ -218,4 +220,6 @@ var configPanelMap = (_b = {}, _b[_Banner["default"].type] = _BannerConfig["defa
 
 exports.configPanelMap = configPanelMap;
 var secondConfigPanelMap = (_c = {}, _c[_Banner["default"].type] = _BannerSecondConfig["default"], _c[_Video["default"].type] = _VideoSecondConfig["default"], _c[_Text["default"].type] = _TextSecondConfig["default"], _c[_ImageText["default"].type] = _ImageTextSecondConfig["default"], _c[_Recommend["default"].type] = _RecommendSecondConfig["default"], _c[_AffiliateRecommend["default"].type] = _AffiliateRecommendSecondConfig["default"], _c[_MobileNavigation["default"].type] = _MobileNavigationSecondConfig["default"], _c[_PcNavigation["default"].type] = _PcNavigationSecondConfig["default"], _c[_MenuNavigation["default"].type] = _MenuNavigationSecondConfig["default"], _c[_HeadNavigation["default"].type] = _HeadNavigationSecondConfig["default"], _c[_PersonalInformation["default"].type] = _PersonalInformationSecondConfig2["default"], _c[_PersonalInformationSecond["default"].type] = _PersonalInformationSecondSecondConfig["default"], _c[_CommonFunctions["default"].type] = _CommonFunctionsSecondConfig["default"], _c[_Carousel["default"].type] = _CarouselSecondConfig["default"], _c[_ImageGallery["default"].type] = _ImageGallerySecondConfig["default"], _c[_Tag["default"].type] = _TagSecondConfig["default"], _c[_Button["default"].type] = _ButtonSecondConfig["default"], _c[_Wallet["default"].type] = _WalletSecondConfig["default"], _c[_WalletNuri["default"].type] = _WalletNuriSecondConfig["default"], _c[_SearchBanner["default"].type] = _SearchBannerSecondConfig["default"], _c[_GroupedCarousel["default"].type] = _GroupedCarouselSecondConfig["default"], _c[_GroupedImage["default"].type] = _GroupedImageSecondConfig["default"], _c[_SlideImage["default"].type] = _SlideImageSecondConfig["default"], _c[_SearchDITO["default"].type] = _SearchDITOSecondConfig["default"], _c[_News["default"].type] = _NewsSecondConfig["default"], _c[_Campaign["default"].type] = _CampaignSecondConfig["default"], _c);
-exports.secondConfigPanelMap = secondConfigPanelMap;
+exports.secondConfigPanelMap = secondConfigPanelMap;
+var thirdConfigPanelMap = (_d = {}, _d[_GroupedImage["default"].type] = _GroupedImageThirdConfig["default"], _d);
+exports.thirdConfigPanelMap = thirdConfigPanelMap;