@fonixtree/magic-design 1.0.219 → 1.0.221

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/dito/components/GroupedImage/defaultJSON.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.groupedImageGroupSourceJSON = exports.getDefaultJSON = void 0;
+exports.groupedImageGroupSourceJSON = exports.getDefaultJSON = exports.createImageMeta = void 0;
 
 var _uuid = require("uuid");
 
@@ -82,6 +82,8 @@ var createImageMeta = function createImageMeta(parentId) {
   };
 };
 
+exports.createImageMeta = createImageMeta;
+
 var groupedImageGroupSourceJSON = function groupedImageGroupSourceJSON(parentId, text) {
   var groupId = (0, _uuid.v4)();
   var baseImage = createImageMeta(groupId);
@@ -91,11 +93,8 @@ var groupedImageGroupSourceJSON = function groupedImageGroupSourceJSON(parentId,
     parentId: parentId,
     image: baseImage,
     groupName: baseGroupName,
-    title: createTextMeta(groupId, 'Group Title', '#CE1126', 16, 700),
-    image1: createImageMeta(groupId),
-    image2: createImageMeta(groupId),
-    image3: createImageMeta(groupId),
-    image4: createImageMeta(groupId),
+    title: createTextMeta(groupId, 'Group Title', '#CE1126', '16px', 700),
+    images: [createImageMeta(groupId), createImageMeta(groupId), createImageMeta(groupId), createImageMeta(groupId)],
     hover: {
       open: true,
       image: __assign(__assign({}, createImageMeta(groupId)), {
@@ -122,14 +121,14 @@ var getDefaultJSON = function getDefaultJSON() {
         paddingBottom: 0,
         paddingLeft: 0,
         paddingRight: 0,
-        marginBottom: window.magicDesign.compSpacing * 1.5
+        marginBottom: window.magicDesign.compSpacing ? window.magicDesign.compSpacing * 1.5 : 48
       },
       mobile: {
         paddingTop: 0,
         paddingBottom: 0,
         paddingLeft: 0,
         paddingRight: 0,
-        marginBottom: window.magicDesign.compSpacing
+        marginBottom: window.magicDesign.compSpacing || 32
       }
     },
     customize: {

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

@@ -17,6 +17,12 @@ var _commonUtil = require("../../../../../utils/commonUtil");
 
 var _mobx = require("../../../../../mobx");
 
+var _Iconfont = _interopRequireDefault(require("../../../../../common/Iconfont"));
+
+var _lodash = _interopRequireDefault(require("lodash.throttle"));
+
+var _coreUtil = require("../../../../../utils/coreUtil");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var __extends = void 0 && (void 0).__extends || function () {
@@ -53,11 +59,84 @@ function (_super) {
   function GroupedImagePc() {
     var _this = _super !== null && _super.apply(this, arguments) || this;
 
+    _this.scrollRef = /*#__PURE__*/_react["default"].createRef();
+    _this.preGroupSource = '';
     _this.state = {
       tabIndex: 0,
       tabLeft: 0,
       tabWidth: 0,
-      groupSource: []
+      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) {
+      if (resetPosition === void 0) {
+        resetPosition = false;
+      }
+
+      setTimeout(function () {
+        var scrollDom = _this.scrollRef.current;
+
+        if (scrollDom) {
+          // 如果需要重置位置，将滚动条重置到最左边
+          if (resetPosition) {
+            // 先禁用滚动监听，避免触发状态更新
+            scrollDom.onscroll = null; // 使用requestAnimationFrame延迟一帧，让tab切换的视觉效果先完成
+
+            requestAnimationFrame(function () {
+              if (scrollDom) {
+                // 使用scrollTo并设置behavior为'auto'，覆盖CSS的scroll-behavior: smooth
+                // 这样重置时不会有明显的滚动动画效果
+                scrollDom.scrollTo({
+                  left: 0,
+                  behavior: 'auto'
+                });
+              }
+            });
+          }
+
+          _this.setScrollDisabled(scrollDom);
+
+          scrollDom.onscroll = (0, _lodash["default"])(function () {
+            _this.setScrollDisabled(scrollDom);
+          }, 100);
+        }
+      }, 0);
+    };
+
+    _this.setScrollDisabled = function (scrollDom) {
+      var scrollToLeftDisabled = scrollDom.scrollLeft === 0;
+      var scrollToRightDisabled = scrollDom.clientWidth + scrollDom.scrollLeft >= scrollDom.scrollWidth - 1;
+
+      _this.setState({
+        scrollToLeftDisabled: scrollToLeftDisabled,
+        scrollToRightDisabled: scrollToRightDisabled
+      });
     };
 
     _this.initTab = function (index) {
@@ -81,19 +160,81 @@ function (_super) {
           tabIndex = _a.tabIndex,
           groupSource = _a.groupSource;
       if (tabIndex === index) return;
-      var tab = groupSource[index];
+      var tab = groupSource[index]; // 在切换tab之前，立即重置滚动位置到最左边，避免滚动效果
+
+      var scrollDom = _this.scrollRef.current;
+
+      if (scrollDom) {
+        scrollDom.onscroll = null; // 先禁用滚动监听
+
+        scrollDom.scrollLeft = 0; // 立即重置，不使用任何动画
+      } // 先更新本地状态，确保tabIndex立即更新
+
 
       _this.setState({
         tabIndex: index
       }, function () {
-        _this.initTab(index);
-      });
+        _this.initTab(index); // 重新初始化滚动（不重置位置，因为已经重置过了）
+
+
+        _this.initScroll(false);
+      }); // 然后更新store状态，触发props更新
+      // 使用setTimeout确保本地状态先更新完成
+
+
+      setTimeout(function () {
+        if (tab) {
+          _mobx.store.setState({
+            clickedGroup: tab.id,
+            clickedFloor: _mobx.store.getFloorIdByGroupId(tab.id)
+          });
+        }
+      }, 0);
+    };
+
+    _this.scrollToRight = function () {
+      var scrollDom = _this.scrollRef.current;
+
+      if (scrollDom) {
+        var _a = _this.state,
+            tabIndex = _a.tabIndex,
+            groupSource = _a.groupSource;
+        var current = groupSource[tabIndex] || {};
+        var images = current.images || []; // 如果当前tab的图片可以滚动，则滚动图片
+
+        if (scrollDom.clientWidth + scrollDom.scrollLeft < scrollDom.scrollWidth - 1) {
+          scrollDom.scrollTo({
+            left: scrollDom.scrollLeft + scrollDom.clientWidth,
+            behavior: 'smooth'
+          });
+        } else {
+          // 否则切换到下一个tab
+          var nextTabIndex = (tabIndex + 1) % groupSource.length;
+
+          _this.onTabClick(null, nextTabIndex);
+        }
+      }
+    };
+
+    _this.scrollToLeft = function () {
+      var scrollDom = _this.scrollRef.current;
 
-      if (tab) {
-        _mobx.store.setState({
-          clickedGroup: tab.id,
-          clickedFloor: _mobx.store.getFloorIdByGroupId(tab.id)
-        });
+      if (scrollDom) {
+        var _a = _this.state,
+            tabIndex = _a.tabIndex,
+            groupSource = _a.groupSource; // 如果当前tab的图片可以向左滚动，则滚动图片
+
+        if (scrollDom.scrollLeft > 0) {
+          scrollDom.scrollTo({
+            left: scrollDom.scrollLeft - scrollDom.clientWidth,
+            behavior: 'smooth'
+          });
+        } else {
+          // 否则切换到上一个tab
+          var prevTabIndex = (tabIndex - 1 + groupSource.length) % groupSource.length;
+
+          _this.onTabClick(null, prevTabIndex);
+        }
       }
     };
 
@@ -103,16 +244,22 @@ function (_super) {
   GroupedImagePc.prototype.componentDidMount = function () {
     var _this = this;
 
-    var panelProps = this.props.panelProps;
+    var panelProps = this.props.panelProps; // 数据迁移
+
+    this.migrateData(panelProps.groupSource);
     var source = [];
     panelProps.groupSource.forEach(function (m) {
       var show = m.image.open || m.groupName.open;
       if (show) source.push(m);
     });
+    var groupSource = source.length > 0 ? source : panelProps.groupSource;
+    this.preGroupSource = JSON.stringify(groupSource);
     this.setState({
-      groupSource: source.length > 0 ? source : panelProps.groupSource
+      groupSource: groupSource
     }, function () {
       _this.initTab(0);
+
+      _this.initScroll();
     });
   };
 
@@ -120,25 +267,39 @@ function (_super) {
     var _this = this;
 
     var tabIndex = this.state.tabIndex;
-    var panelProps = nextProps.panelProps;
+    var panelProps = nextProps.panelProps; // 数据迁移
+
+    this.migrateData(panelProps.groupSource);
     var source = [];
     panelProps.groupSource.forEach(function (m) {
       var show = m.image.open || m.groupName.open;
       if (show) source.push(m);
     });
     var groupSource = source.length > 0 ? source : panelProps.groupSource;
-    this.setState({
-      groupSource: groupSource
-    }, function () {
-      var newTabIndex = tabIndex;
-      if (tabIndex >= groupSource.length) newTabIndex = 0;
+    var groupSourceStr = JSON.stringify(groupSource); // 只有当groupSource真正变化时才更新状态
+
+    if (groupSourceStr !== this.preGroupSource) {
+      this.preGroupSource = groupSourceStr;
+      this.setState({
+        groupSource: groupSource
+      }, function () {
+        // 使用当前的tabIndex，确保获取最新状态
+        var currentTabIndex = _this.state.tabIndex;
+        var newTabIndex = currentTabIndex;
+        if (currentTabIndex >= groupSource.length) newTabIndex = 0;
 
-      _this.initTab(newTabIndex);
+        _this.initTab(newTabIndex);
 
-      _this.setState({
-        tabIndex: newTabIndex
+        _this.initScroll(); // 只有当tabIndex需要调整时才更新
+
+
+        if (newTabIndex !== currentTabIndex) {
+          _this.setState({
+            tabIndex: newTabIndex
+          });
+        }
       });
-    });
+    }
   };
 
   GroupedImagePc.prototype.render = function () {
@@ -148,15 +309,20 @@ function (_super) {
         tabIndex = _a.tabIndex,
         tabLeft = _a.tabLeft,
         tabWidth = _a.tabWidth,
-        groupSource = _a.groupSource;
+        groupSource = _a.groupSource,
+        scrollToLeftDisabled = _a.scrollToLeftDisabled,
+        scrollToRightDisabled = _a.scrollToRightDisabled;
     var current = groupSource[tabIndex] || {};
+    var images = current.images || [];
 
     var _image = current.hover && current.hover.open && current.hover.image.open ? current.hover.image : current.image;
 
     var _groupName = current.hover && current.hover.open && current.hover.groupName.open ? current.hover.groupName : current.groupName;
 
     return /*#__PURE__*/_react["default"].createElement("div", {
-      className: "m-grouped-image-pc"
+      className: (0, _classnames["default"])('m-grouped-image-pc', {
+        'less-than-4': images.length <= 4
+      })
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "tab-select-wrap"
     }, groupSource.map(function (tab, index) {
@@ -176,17 +342,68 @@ function (_super) {
       className: "title",
       data: current.title
     }), /*#__PURE__*/_react["default"].createElement("div", {
-      className: "image-list"
-    }, [current.image1, current.image2, current.image3, current.image4].map(function (img, idx) {
+      className: "image-list-wrapper"
+    }, images.length > 0 && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
+      className: "image-list",
+      ref: this.scrollRef
+    }, images.map(function (img, idx) {
       if (!img || !img.open) return null;
       return /*#__PURE__*/_react["default"].createElement("div", {
         key: (0, _commonUtil.ensure)(function () {
           return img.id;
         }, idx),
-        className: "image-item"
+        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'
+        }
       }, /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
         data: img
       }));
+    }))), images.length === 0 && /*#__PURE__*/_react["default"].createElement("div", {
+      className: "image-list"
+    }, /*#__PURE__*/_react["default"].createElement("div", {
+      className: "empty-placeholder"
+    }, "No images")))), /*#__PURE__*/_react["default"].createElement("div", {
+      className: "arrow-icon-wrapper"
+    }, /*#__PURE__*/_react["default"].createElement("div", {
+      className: (0, _classnames["default"])('arrow-icon', 'left', {
+        disabled: scrollToLeftDisabled && tabIndex === 0 && groupSource.length <= 1
+      }),
+      onClick: this.scrollToLeft
+    }, /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
+      color: "#fff",
+      size: 16,
+      type: "icon-outlined-left"
+    })), /*#__PURE__*/_react["default"].createElement("div", {
+      className: (0, _classnames["default"])('arrow-icon', 'right', {
+        disabled: scrollToRightDisabled && tabIndex === groupSource.length - 1 && groupSource.length <= 1
+      }),
+      onClick: this.scrollToRight
+    }, /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
+      color: "#fff",
+      size: 16,
+      type: "icon-outlined-right"
     }))));
   };
 

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

@@ -3,12 +3,22 @@
   flex-direction: column;
   position: relative;
 
+  &.less-than-4 {
+    .image-list-wrapper {
+      padding-left: 0!important;
+      .image-list {
+        width: fit-content;
+        margin: 0 auto;
+      }
+    }
+  }
+
   .tab-select-wrap {
     display: flex;
     align-items: center;
-    height: 50px;
+    gap: 16px;
     background: #ffffff;
-    overflow: auto;
+    // overflow: auto;
     position: relative;
     width: fit-content;
     margin: 0 auto 15px;
@@ -19,14 +29,13 @@
       text-align: center;
       padding: 0; // 无缝衔接：去掉左右间距
       width: fit-content;
-      height: 100%;
       justify-content: center;
       white-space: nowrap;
       flex-direction: column;
       cursor: pointer;
 
       img {
-        height: 50px;
+        max-height: 50px;
         margin-bottom: 2px;
       }
     }
@@ -38,15 +47,75 @@
       margin-bottom: 16px;
     }
 
-    .image-list {
+    .image-list-wrapper {
+      padding-left: 88px;
+      position: relative;
+
+      .image-list {
+        display: flex;
+        flex-direction: row;
+        gap: 16px;
+        overflow-x: auto;
+        overflow-y: hidden;
+        flex: 1;
+        scroll-behavior: smooth;
+        -webkit-overflow-scrolling: touch;
+
+        &::-webkit-scrollbar {
+          display: none;
+        }
+
+        scrollbar-width: none;
+
+        .image-item {
+          flex-shrink: 0;
+          width: 300px;
+
+          &:last-child {
+            margin-right: 40px;
+          }
+        }
+
+        .empty-placeholder {
+          width: 100%;
+          text-align: center;
+          color: #999;
+          padding: 40px 0;
+          font-size: 14px;
+        }
+      }
+    }
+  }
+
+  .arrow-icon-wrapper {
+    display: flex;
+    justify-content: end;
+    padding: 24px 0;
+    padding-right: 75px;
+
+    .arrow-icon {
       display: flex;
-      flex-direction: row;
+      align-items: center;
       justify-content: center;
-      gap: 16px;
+      width: 40px;
+      height: 40px;
+      background: #CE1126;
+      border-radius: 100px;
+      cursor: pointer;
+      flex-shrink: 0;
+      z-index: 1;
 
-      .image-item {
-        flex: 1;
-        max-width: 23%;
+      &.left {
+        margin-right: 16px;
+      }
+
+      &.right {
+        // margin-left: 15px;
+      }
+
+      &.disabled {
+        cursor: not-allowed;
+        opacity: 0.5;
       }
     }
   }

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;