@fonixtree/magic-design 1.0.109 → 1.0.111

package/es/common/ErrorBoundary/index.js

@@ -0,0 +1,90 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+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 ErrorBoundary =
+/** @class */
+function (_super) {
+  __extends(ErrorBoundary, _super);
+
+  function ErrorBoundary(props) {
+    var _this = _super.call(this, props) || this;
+
+    _this.state = {
+      hasError: false
+    };
+    return _this;
+  }
+
+  ErrorBoundary.getDerivedStateFromError = function (error) {
+    // 更新 state 以触发备用 UI 渲染
+    return {
+      hasError: true
+    };
+  };
+
+  ErrorBoundary.prototype.componentDidCatch = function (error, errorInfo) {
+    // 可以在这里将错误信息发送给日志系统
+    console.error('Error caught by ErrorBoundary:', error, errorInfo);
+  };
+
+  ErrorBoundary.prototype.render = function () {
+    if (this.state.hasError) {
+      // 自定义错误 UI
+      if (window.magicDesign.mode === 'renderer') {
+        return null;
+      }
+
+      return /*#__PURE__*/_react["default"].createElement("div", {
+        style: {
+          textAlign: 'center',
+          padding: '10px'
+        }
+      }, /*#__PURE__*/_react["default"].createElement("h2", null, this.props.name, " Components updated"), /*#__PURE__*/_react["default"].createElement("p", null, "Please delete the component and add it again!"));
+    }
+
+    return this.props.children;
+  };
+
+  return ErrorBoundary;
+}(_react.Component);
+
+var _default = ErrorBoundary;
+exports["default"] = _default;

package/es/common/index.js

@@ -45,6 +45,12 @@ Object.defineProperty(exports, "CropperModal", {
     return _CropperModal["default"];
   }
 });
+Object.defineProperty(exports, "ErrorBoundary", {
+  enumerable: true,
+  get: function get() {
+    return _ErrorBoundary["default"];
+  }
+});
 Object.defineProperty(exports, "Field", {
   enumerable: true,
   get: function get() {
@@ -204,4 +210,6 @@ var _CropperModal = _interopRequireDefault(require("./CropperModal"));
 
 var _NewImg = _interopRequireDefault(require("./NewImg"));
 
+var _ErrorBoundary = _interopRequireDefault(require("./ErrorBoundary"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }

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

@@ -163,7 +163,7 @@ function (_super) {
         return onItemClick();
       },
       style: {
-        width: imgWidth + 2
+        width: imgWidth
       }
     }, rest), /*#__PURE__*/_react["default"].createElement("div", {
       className: "img-wrap"

package/es/composite-comp/common/config-panels/BackgroundConfig/index.js

@@ -58,9 +58,23 @@ function (_super) {
   BackgroundConfig.prototype.render = function () {
     var _this = this;
 
-    var data = this.props.data;
+    var _a, _b, _c, _d, _e;
+
+    var _f = this.props,
+        data = _f.data,
+        component = _f.component;
+
+    if (!data.tabBackground) {
+      data.tabBackground = {
+        opacity: 100,
+        color: '#232F46',
+        image: '',
+        tabBgType: 'color'
+      };
+    }
+
     return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_common.Field, {
-      title: (0, _locale.i18n)('BACKGROUND')
+      title: component === 'recommend' ? (0, _locale.i18n)('PRODUCT_BACKGROUND') : (0, _locale.i18n)('BACKGROUND')
     }, /*#__PURE__*/_react["default"].createElement(_antd.Select, {
       onChange: function onChange(bgType) {
         data.bgType = bgType;
@@ -101,6 +115,48 @@ function (_super) {
         _this.selfRender();
       },
       value: data.image
+    })), component === 'recommend' && /*#__PURE__*/_react["default"].createElement(_common.Field, {
+      title: (0, _locale.i18n)('TAB_BACKGROUND')
+    }, /*#__PURE__*/_react["default"].createElement(_antd.Select, {
+      onChange: function onChange(tabBgType) {
+        data.tabBackground.tabBgType = tabBgType;
+
+        _this.selfRender();
+      },
+      style: {
+        marginBottom: '15px'
+      },
+      value: (_a = data.tabBackground) === null || _a === void 0 ? void 0 : _a.tabBgType
+    }, /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
+      value: "color"
+    }, (0, _locale.i18n)('COLOR')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
+      value: "image"
+    }, (0, _locale.i18n)('IMAGE'))), ((_b = data.tabBackground) === null || _b === void 0 ? void 0 : _b.tabBgType) === 'color' ? /*#__PURE__*/_react["default"].createElement(_common.ColorPickerInput, {
+      colorType: "rgba",
+      onChange: function onChange(v) {
+        data.tabBackground.opacity = 1;
+        data.tabBackground.color = v;
+
+        _this.selfRender();
+      },
+      value: (_c = data.tabBackground) === null || _c === void 0 ? void 0 : _c.color
+    }) : /*#__PURE__*/_react["default"].createElement(_common.ImagePicker, {
+      imageSelectedWay: ((_d = data.tabBackground) === null || _d === void 0 ? void 0 : _d.imageSelectedWay) || {
+        pc: '',
+        mobile: ''
+      },
+      onChange: function onChange(v, way) {
+        if (v) {
+          data.tabBackground.image = v.url;
+        }
+
+        if (way) {
+          data.tabBackground.imageSelectedWay = way;
+        }
+
+        _this.selfRender();
+      },
+      value: (_e = data.tabBackground) === null || _e === void 0 ? void 0 : _e.image
     })));
   };
 
@@ -109,7 +165,13 @@ function (_super) {
       opacity: 100,
       color: '#232F46',
       image: '',
-      bgType: 'color'
+      bgType: 'color',
+      tabBackground: {
+        opacity: 100,
+        color: '#232F46',
+        image: '',
+        tabBgType: 'color'
+      }
     }
   };
   return BackgroundConfig;

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

@@ -551,7 +551,7 @@ function (_super) {
     if (layout === 'layout1' && contentWidth) imgHeight = (contentWidth - 12) / 2;
     if (layout === 'layout3' && contentWidth) imgHeight = (contentWidth - 12 * 2) / 3;
     return /*#__PURE__*/_react["default"].createElement("div", {
-      className: "m-recommend-mobile recommend_" + panelProps.id
+      className: "m-affiliate-recommend-mobile recommend_" + panelProps.id
     }, !hideTabs && /*#__PURE__*/_react["default"].createElement("div", {
       className: "tab-select-wrap"
     }, groupSource.map(function (tab, index) {

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

@@ -1,16 +1,16 @@
-.m-recommend-mobile {
+.m-affiliate-recommend-mobile {
   display: flex;
   flex-direction: column;
 }
-.m-recommend-mobile .cylon-tabs-nav-operations {
+.m-affiliate-recommend-mobile .cylon-tabs-nav-operations {
   display: none !important;
 }
-.m-recommend-mobile ::-webkit-scrollbar {
+.m-affiliate-recommend-mobile ::-webkit-scrollbar {
   width: 0;
   height: 0;
   display: none;
 }
-.m-recommend-mobile .tab-select-wrap {
+.m-affiliate-recommend-mobile .tab-select-wrap {
   display: flex;
   align-items: center;
   height: 1rem;
@@ -19,7 +19,7 @@
   position: relative;
   margin-bottom: 0.3rem;
 }
-.m-recommend-mobile .tab-select-wrap .tabTitle {
+.m-affiliate-recommend-mobile .tab-select-wrap .tabTitle {
   display: flex;
   align-items: center;
   text-align: center;
@@ -30,12 +30,12 @@
   white-space: nowrap;
   flex-direction: column;
 }
-.m-recommend-mobile .tab-select-wrap .tabTitle img {
+.m-affiliate-recommend-mobile .tab-select-wrap .tabTitle img {
   height: 0.4rem;
   width: 0.4rem;
   margin-bottom: 0.04rem;
 }
-.m-recommend-mobile .tab-select-wrap .active-line {
+.m-affiliate-recommend-mobile .tab-select-wrap .active-line {
   position: absolute;
   bottom: 0;
   width: 4rem;
@@ -44,11 +44,11 @@
   transition: 0.2s all linear;
   border-radius: 0.03rem;
 }
-.m-recommend-mobile .macyContainer {
+.m-affiliate-recommend-mobile .macyContainer {
   display: flex;
   margin: 0 0.32rem;
 }
-.m-recommend-mobile .scrollContainer {
+.m-affiliate-recommend-mobile .scrollContainer {
   display: flex;
   flex-direction: row;
   align-items: center;
@@ -56,26 +56,26 @@
   overflow-x: auto;
   padding-bottom: 0.3rem;
 }
-.m-recommend-mobile .scrollContainer.pl_140 {
+.m-affiliate-recommend-mobile .scrollContainer.pl_140 {
   padding-left: 2.8rem;
 }
-.m-recommend-mobile .scrollContainer .scrollProductList {
+.m-affiliate-recommend-mobile .scrollContainer .scrollProductList {
   display: flex;
   flex-direction: row;
   align-items: flex-start;
 }
-.m-recommend-mobile .scrollContainer .scrollProductList .productCard {
+.m-affiliate-recommend-mobile .scrollContainer .scrollProductList .productCard {
   margin-right: 0.24rem;
 }
-.m-recommend-mobile .scrollContainer .scrollProductListRow {
+.m-affiliate-recommend-mobile .scrollContainer .scrollProductListRow {
   display: flex;
   flex-direction: row;
   align-items: flex-start;
 }
-.m-recommend-mobile .scrollContainer .scrollProductListRow .productCardRow {
+.m-affiliate-recommend-mobile .scrollContainer .scrollProductListRow .productCardRow {
   margin-right: 0.16rem;
 }
-.m-recommend-mobile .btnSeeAll {
+.m-affiliate-recommend-mobile .btnSeeAll {
   display: block;
   width: fit-content;
   min-width: 1.6rem;

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

@@ -78,10 +78,12 @@
 .m-flash-deal-mobile .flash-deal-list-vertical .m-product-item-wrap {
   width: 2.44rem;
   margin-right: 0.16rem;
+  border-radius: 0.16rem;
 }
 .m-flash-deal-mobile .flash-deal-list-vertical .m-product-item-wrap .product-img {
   height: 2.4rem;
   width: 2.4rem;
+  border-radius: 0.16rem 0.16rem 0 0;
 }
 .m-flash-deal-mobile .flash-deal-list-horizontal {
   display: flex;
@@ -92,6 +94,10 @@
 }
 .m-flash-deal-mobile .flash-deal-list-horizontal .m-product-item-wrap {
   width: 100%;
+  border-radius: 0.16rem;
+}
+.m-flash-deal-mobile .flash-deal-list-horizontal .m-product-item-wrap .product-img {
+  border-radius: 0.16rem 0 0 0.16rem;
 }
 .m-flash-deal-mobile .flash-deal-list-horizontal .m-product-item-wrap .content-wrap {
   flex: 1;

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

@@ -246,8 +246,11 @@ function (_super) {
     _this.getData = function () {
       return __awaiter(_this, void 0, void 0, function () {
         var res;
-        return __generator(this, function (_a) {
-          switch (_a.label) {
+
+        var _a, _b;
+
+        return __generator(this, function (_c) {
+          switch (_c.label) {
             case 0:
               return [4
               /*yield*/
@@ -256,14 +259,14 @@ function (_super) {
               }, 'GET')];
 
             case 1:
-              res = _a.sent();
+              res = _c.sent();
 
               if (!(0, _coreUtil.isDesignMode)()) {
-                (0, _storeUtil.setMagicStore)("groupBuy_" + (window.magicDesign.pageId || '') + "_" + this.props.panelProps.id, res.pageInfo.list);
+                (0, _storeUtil.setMagicStore)("groupBuy_" + (window.magicDesign.pageId || '') + "_" + this.props.panelProps.id, (_a = res.pageInfo) === null || _a === void 0 ? void 0 : _a.list);
               }
 
               this.setState({
-                list: res.pageInfo.list
+                list: (_b = res.pageInfo) === null || _b === void 0 ? void 0 : _b.list
               });
               return [2
               /*return*/

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

@@ -304,7 +304,13 @@ var getDefaultJSON = function getDefaultJSON() {
       opacity: 100,
       color: '#fff',
       image: '',
-      bgType: 'color'
+      bgType: 'color',
+      tabBackground: {
+        opacity: 100,
+        color: '#fff',
+        image: '',
+        tabBgType: 'color'
+      }
     }
   };
 };

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

@@ -587,10 +587,26 @@ function (_super) {
     }, 140);
     if (layout === 'layout1' && contentWidth) imgHeight = (contentWidth - 12) / 2;
     if (layout === 'layout3' && contentWidth) imgHeight = (contentWidth - 12 * 2) / 3;
+    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-mobile recommend_" + panelProps.id
     }, !hideTabs && /*#__PURE__*/_react["default"].createElement("div", {
-      className: "tab-select-wrap"
+      className: "tab-select-wrap",
+      style: tabStyle
     }, groupSource.map(function (tab, index) {
       var _image = index == tabIndex && tab.hover.open && tab.hover.image.open ? tab.hover.image : tab.image;
 

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

@@ -65,7 +65,7 @@
   align-items: flex-start;
 }
 .m-recommend-mobile .scrollContainer .scrollProductList .productCard {
-  margin-right: 0.24rem;
+  margin-right: 0.16rem;
 }
 .m-recommend-mobile .btnSeeAll {
   display: block;
@@ -74,3 +74,15 @@
   margin: 0 auto;
   flex: none;
 }
+.m-recommend-mobile .m-product-item-wrap {
+  border-radius: 0.16rem;
+}
+.m-recommend-mobile .m-product-item-wrap .img-wrap .product-img {
+  border-radius: 0.16rem 0.16rem 0 0;
+}
+.m-recommend-mobile .m-product-item-wrap.horizontal .img-wrap .product-img {
+  border-radius: 0.16rem 0 0 0.16rem;
+}
+.m-recommend-mobile .scrollContainer .m-product-item-wrap {
+  border: none;
+}

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

@@ -124,6 +124,7 @@ function (_super) {
         key: '5',
         name: (0, _locale.i18n)('BACKGROUND'),
         value: /*#__PURE__*/_react["default"].createElement(_BackgroundConfig["default"], {
+          component: "recommend",
           data: data.background
         })
       }],

package/es/core/Designer/index.js

@@ -386,6 +386,8 @@ function (_super) {
 
       _this.closeConfigPanel();
 
+      window.magicDesign.device = device;
+
       _this.setState(__assign(__assign({}, _this.state), {
         device: device
       }));
@@ -395,8 +397,6 @@ function (_super) {
       _mobx.store.setState({
         clickedFloor: ''
       });
-
-      window.magicDesign.device = device;
     };
 
     _this.onAdd = function () {

package/es/decorator/compositeDecorator.js

@@ -15,6 +15,10 @@ var _constants = require("../constants");
 
 var _commonUtil = require("../utils/commonUtil");
 
+var _storeUtil = require("../utils/storeUtil");
+
+var _common = require("../common");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -84,8 +88,27 @@ function compositeDecorator(WrappedComponent) {
       _this.state = {
         clickedFloor: '',
         hoveredFloor: ''
+      };
+
+      _this.switchLanguage = function (value) {
+        // const lang = 'ar';
+        (0, _storeUtil.setStore)(STORAGE_KEY.LOCALE, value); // 实时更新问题待优化;
+      };
+
+      _this.getUserAddress = function (value) {
+        // const info = {
+        //   address: '简短地址',
+        //   customer: '客户名称',
+        //   tel: '客户手机号',
+        //   longitude: '经度',
+        //   latitude: '纬度',
+        // };
+        _mobx.store.setState({
+          locationInfo: value || {}
+        });
       }; // 复合组件点击事件
 
+
       _this.onCompositeCompClick = function (event) {
         if (window.magicDesign.mode === 'renderer') {
           return;
@@ -274,7 +297,7 @@ function compositeDecorator(WrappedComponent) {
     };
 
     Wrapper.prototype.render = function () {
-      var _a;
+      var _a, _b;
 
       var nodeData = this.props.nodeData;
       var clickedFloor = this.state.clickedFloor;
@@ -291,7 +314,9 @@ function compositeDecorator(WrappedComponent) {
         style: floorNameStyle
       }, (_a = _constants.compInfoMap[nodeData.type]) === null || _a === void 0 ? void 0 : _a.name)), /*#__PURE__*/_react["default"].createElement("div", {
         style: (0, _commonUtil.pxToRem)(this.getWrapStyle())
-      }, /*#__PURE__*/_react["default"].createElement(WrappedComponent, this.props)));
+      }, /*#__PURE__*/_react["default"].createElement(_common.ErrorBoundary, {
+        name: (_b = _constants.compInfoMap[nodeData.type]) === null || _b === void 0 ? void 0 : _b.name
+      }, /*#__PURE__*/_react["default"].createElement(WrappedComponent, this.props))));
     };
 
     Wrapper.getDefaultJSON = WrappedComponent.getDefaultJSON;

package/es/locale/en/en.json

@@ -1,4 +1,6 @@
 {
+  "TAB_BACKGROUND": "Tab Background",
+  "PRODUCT_BACKGROUND": "Product Background",
   "MISSION_NAME": "Mission Name",
   "COUNT_DOWN": "Count Down",
   "SEARCH_BAR_PLACEHOLDER": "Search Bar Placeholder",

package/es/locale/es/es.json

@@ -1,4 +1,6 @@
 {
+  "TAB_BACKGROUND": "Tab Background",
+  "PRODUCT_BACKGROUND": "Product Background",
   "MISSION_NAME": "Mission Name",
   "COUNT_DOWN": "Count Down",
   "SEARCH_BAR_PLACEHOLDER": "Search Bar Placeholder",

package/es/locale/id/id.json

@@ -1,4 +1,6 @@
 {
+  "TAB_BACKGROUND": "Tab Background",
+  "PRODUCT_BACKGROUND": "Product Background",
   "MISSION_NAME": "Mission Name",
   "COUNT_DOWN": "Count Down",
   "SEARCH_BAR_PLACEHOLDER": "Search Bar Placeholder",

package/lib/common/ErrorBoundary/index.js

@@ -0,0 +1,90 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+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 ErrorBoundary =
+/** @class */
+function (_super) {
+  __extends(ErrorBoundary, _super);
+
+  function ErrorBoundary(props) {
+    var _this = _super.call(this, props) || this;
+
+    _this.state = {
+      hasError: false
+    };
+    return _this;
+  }
+
+  ErrorBoundary.getDerivedStateFromError = function (error) {
+    // 更新 state 以触发备用 UI 渲染
+    return {
+      hasError: true
+    };
+  };
+
+  ErrorBoundary.prototype.componentDidCatch = function (error, errorInfo) {
+    // 可以在这里将错误信息发送给日志系统
+    console.error('Error caught by ErrorBoundary:', error, errorInfo);
+  };
+
+  ErrorBoundary.prototype.render = function () {
+    if (this.state.hasError) {
+      // 自定义错误 UI
+      if (window.magicDesign.mode === 'renderer') {
+        return null;
+      }
+
+      return /*#__PURE__*/_react["default"].createElement("div", {
+        style: {
+          textAlign: 'center',
+          padding: '10px'
+        }
+      }, /*#__PURE__*/_react["default"].createElement("h2", null, this.props.name, " Components updated"), /*#__PURE__*/_react["default"].createElement("p", null, "Please delete the component and add it again!"));
+    }
+
+    return this.props.children;
+  };
+
+  return ErrorBoundary;
+}(_react.Component);
+
+var _default = ErrorBoundary;
+exports["default"] = _default;

package/lib/common/index.js

@@ -45,6 +45,12 @@ Object.defineProperty(exports, "CropperModal", {
     return _CropperModal["default"];
   }
 });
+Object.defineProperty(exports, "ErrorBoundary", {
+  enumerable: true,
+  get: function get() {
+    return _ErrorBoundary["default"];
+  }
+});
 Object.defineProperty(exports, "Field", {
   enumerable: true,
   get: function get() {
@@ -204,4 +210,6 @@ var _CropperModal = _interopRequireDefault(require("./CropperModal"));
 
 var _NewImg = _interopRequireDefault(require("./NewImg"));
 
+var _ErrorBoundary = _interopRequireDefault(require("./ErrorBoundary"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }

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

@@ -163,7 +163,7 @@ function (_super) {
         return onItemClick();
       },
       style: {
-        width: imgWidth + 2
+        width: imgWidth
       }
     }, rest), /*#__PURE__*/_react["default"].createElement("div", {
       className: "img-wrap"

package/lib/composite-comp/common/config-panels/BackgroundConfig/index.js

@@ -58,9 +58,23 @@ function (_super) {
   BackgroundConfig.prototype.render = function () {
     var _this = this;
 
-    var data = this.props.data;
+    var _a, _b, _c, _d, _e;
+
+    var _f = this.props,
+        data = _f.data,
+        component = _f.component;
+
+    if (!data.tabBackground) {
+      data.tabBackground = {
+        opacity: 100,
+        color: '#232F46',
+        image: '',
+        tabBgType: 'color'
+      };
+    }
+
     return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_common.Field, {
-      title: (0, _locale.i18n)('BACKGROUND')
+      title: component === 'recommend' ? (0, _locale.i18n)('PRODUCT_BACKGROUND') : (0, _locale.i18n)('BACKGROUND')
     }, /*#__PURE__*/_react["default"].createElement(_antd.Select, {
       onChange: function onChange(bgType) {
         data.bgType = bgType;
@@ -101,6 +115,48 @@ function (_super) {
         _this.selfRender();
       },
       value: data.image
+    })), component === 'recommend' && /*#__PURE__*/_react["default"].createElement(_common.Field, {
+      title: (0, _locale.i18n)('TAB_BACKGROUND')
+    }, /*#__PURE__*/_react["default"].createElement(_antd.Select, {
+      onChange: function onChange(tabBgType) {
+        data.tabBackground.tabBgType = tabBgType;
+
+        _this.selfRender();
+      },
+      style: {
+        marginBottom: '15px'
+      },
+      value: (_a = data.tabBackground) === null || _a === void 0 ? void 0 : _a.tabBgType
+    }, /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
+      value: "color"
+    }, (0, _locale.i18n)('COLOR')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
+      value: "image"
+    }, (0, _locale.i18n)('IMAGE'))), ((_b = data.tabBackground) === null || _b === void 0 ? void 0 : _b.tabBgType) === 'color' ? /*#__PURE__*/_react["default"].createElement(_common.ColorPickerInput, {
+      colorType: "rgba",
+      onChange: function onChange(v) {
+        data.tabBackground.opacity = 1;
+        data.tabBackground.color = v;
+
+        _this.selfRender();
+      },
+      value: (_c = data.tabBackground) === null || _c === void 0 ? void 0 : _c.color
+    }) : /*#__PURE__*/_react["default"].createElement(_common.ImagePicker, {
+      imageSelectedWay: ((_d = data.tabBackground) === null || _d === void 0 ? void 0 : _d.imageSelectedWay) || {
+        pc: '',
+        mobile: ''
+      },
+      onChange: function onChange(v, way) {
+        if (v) {
+          data.tabBackground.image = v.url;
+        }
+
+        if (way) {
+          data.tabBackground.imageSelectedWay = way;
+        }
+
+        _this.selfRender();
+      },
+      value: (_e = data.tabBackground) === null || _e === void 0 ? void 0 : _e.image
     })));
   };
 
@@ -109,7 +165,13 @@ function (_super) {
       opacity: 100,
       color: '#232F46',
       image: '',
-      bgType: 'color'
+      bgType: 'color',
+      tabBackground: {
+        opacity: 100,
+        color: '#232F46',
+        image: '',
+        tabBgType: 'color'
+      }
     }
   };
   return BackgroundConfig;

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

@@ -551,7 +551,7 @@ function (_super) {
     if (layout === 'layout1' && contentWidth) imgHeight = (contentWidth - 12) / 2;
     if (layout === 'layout3' && contentWidth) imgHeight = (contentWidth - 12 * 2) / 3;
     return /*#__PURE__*/_react["default"].createElement("div", {
-      className: "m-recommend-mobile recommend_" + panelProps.id
+      className: "m-affiliate-recommend-mobile recommend_" + panelProps.id
     }, !hideTabs && /*#__PURE__*/_react["default"].createElement("div", {
       className: "tab-select-wrap"
     }, groupSource.map(function (tab, index) {

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

@@ -1,16 +1,16 @@
-.m-recommend-mobile {
+.m-affiliate-recommend-mobile {
   display: flex;
   flex-direction: column;
 }
-.m-recommend-mobile .cylon-tabs-nav-operations {
+.m-affiliate-recommend-mobile .cylon-tabs-nav-operations {
   display: none !important;
 }
-.m-recommend-mobile ::-webkit-scrollbar {
+.m-affiliate-recommend-mobile ::-webkit-scrollbar {
   width: 0;
   height: 0;
   display: none;
 }
-.m-recommend-mobile .tab-select-wrap {
+.m-affiliate-recommend-mobile .tab-select-wrap {
   display: flex;
   align-items: center;
   height: 1rem;
@@ -19,7 +19,7 @@
   position: relative;
   margin-bottom: 0.3rem;
 }
-.m-recommend-mobile .tab-select-wrap .tabTitle {
+.m-affiliate-recommend-mobile .tab-select-wrap .tabTitle {
   display: flex;
   align-items: center;
   text-align: center;
@@ -30,12 +30,12 @@
   white-space: nowrap;
   flex-direction: column;
 }
-.m-recommend-mobile .tab-select-wrap .tabTitle img {
+.m-affiliate-recommend-mobile .tab-select-wrap .tabTitle img {
   height: 0.4rem;
   width: 0.4rem;
   margin-bottom: 0.04rem;
 }
-.m-recommend-mobile .tab-select-wrap .active-line {
+.m-affiliate-recommend-mobile .tab-select-wrap .active-line {
   position: absolute;
   bottom: 0;
   width: 4rem;
@@ -44,11 +44,11 @@
   transition: 0.2s all linear;
   border-radius: 0.03rem;
 }
-.m-recommend-mobile .macyContainer {
+.m-affiliate-recommend-mobile .macyContainer {
   display: flex;
   margin: 0 0.32rem;
 }
-.m-recommend-mobile .scrollContainer {
+.m-affiliate-recommend-mobile .scrollContainer {
   display: flex;
   flex-direction: row;
   align-items: center;
@@ -56,26 +56,26 @@
   overflow-x: auto;
   padding-bottom: 0.3rem;
 }
-.m-recommend-mobile .scrollContainer.pl_140 {
+.m-affiliate-recommend-mobile .scrollContainer.pl_140 {
   padding-left: 2.8rem;
 }
-.m-recommend-mobile .scrollContainer .scrollProductList {
+.m-affiliate-recommend-mobile .scrollContainer .scrollProductList {
   display: flex;
   flex-direction: row;
   align-items: flex-start;
 }
-.m-recommend-mobile .scrollContainer .scrollProductList .productCard {
+.m-affiliate-recommend-mobile .scrollContainer .scrollProductList .productCard {
   margin-right: 0.24rem;
 }
-.m-recommend-mobile .scrollContainer .scrollProductListRow {
+.m-affiliate-recommend-mobile .scrollContainer .scrollProductListRow {
   display: flex;
   flex-direction: row;
   align-items: flex-start;
 }
-.m-recommend-mobile .scrollContainer .scrollProductListRow .productCardRow {
+.m-affiliate-recommend-mobile .scrollContainer .scrollProductListRow .productCardRow {
   margin-right: 0.16rem;
 }
-.m-recommend-mobile .btnSeeAll {
+.m-affiliate-recommend-mobile .btnSeeAll {
   display: block;
   width: fit-content;
   min-width: 1.6rem;

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

@@ -78,10 +78,12 @@
 .m-flash-deal-mobile .flash-deal-list-vertical .m-product-item-wrap {
   width: 2.44rem;
   margin-right: 0.16rem;
+  border-radius: 0.16rem;
 }
 .m-flash-deal-mobile .flash-deal-list-vertical .m-product-item-wrap .product-img {
   height: 2.4rem;
   width: 2.4rem;
+  border-radius: 0.16rem 0.16rem 0 0;
 }
 .m-flash-deal-mobile .flash-deal-list-horizontal {
   display: flex;
@@ -92,6 +94,10 @@
 }
 .m-flash-deal-mobile .flash-deal-list-horizontal .m-product-item-wrap {
   width: 100%;
+  border-radius: 0.16rem;
+}
+.m-flash-deal-mobile .flash-deal-list-horizontal .m-product-item-wrap .product-img {
+  border-radius: 0.16rem 0 0 0.16rem;
 }
 .m-flash-deal-mobile .flash-deal-list-horizontal .m-product-item-wrap .content-wrap {
   flex: 1;

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

@@ -246,8 +246,11 @@ function (_super) {
     _this.getData = function () {
       return __awaiter(_this, void 0, void 0, function () {
         var res;
-        return __generator(this, function (_a) {
-          switch (_a.label) {
+
+        var _a, _b;
+
+        return __generator(this, function (_c) {
+          switch (_c.label) {
             case 0:
               return [4
               /*yield*/
@@ -256,14 +259,14 @@ function (_super) {
               }, 'GET')];
 
             case 1:
-              res = _a.sent();
+              res = _c.sent();
 
               if (!(0, _coreUtil.isDesignMode)()) {
-                (0, _storeUtil.setMagicStore)("groupBuy_" + (window.magicDesign.pageId || '') + "_" + this.props.panelProps.id, res.pageInfo.list);
+                (0, _storeUtil.setMagicStore)("groupBuy_" + (window.magicDesign.pageId || '') + "_" + this.props.panelProps.id, (_a = res.pageInfo) === null || _a === void 0 ? void 0 : _a.list);
               }
 
               this.setState({
-                list: res.pageInfo.list
+                list: (_b = res.pageInfo) === null || _b === void 0 ? void 0 : _b.list
               });
               return [2
               /*return*/

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

@@ -304,7 +304,13 @@ var getDefaultJSON = function getDefaultJSON() {
       opacity: 100,
       color: '#fff',
       image: '',
-      bgType: 'color'
+      bgType: 'color',
+      tabBackground: {
+        opacity: 100,
+        color: '#fff',
+        image: '',
+        tabBgType: 'color'
+      }
     }
   };
 };

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

@@ -587,10 +587,26 @@ function (_super) {
     }, 140);
     if (layout === 'layout1' && contentWidth) imgHeight = (contentWidth - 12) / 2;
     if (layout === 'layout3' && contentWidth) imgHeight = (contentWidth - 12 * 2) / 3;
+    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-mobile recommend_" + panelProps.id
     }, !hideTabs && /*#__PURE__*/_react["default"].createElement("div", {
-      className: "tab-select-wrap"
+      className: "tab-select-wrap",
+      style: tabStyle
     }, groupSource.map(function (tab, index) {
       var _image = index == tabIndex && tab.hover.open && tab.hover.image.open ? tab.hover.image : tab.image;
 

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

@@ -65,7 +65,7 @@
   align-items: flex-start;
 }
 .m-recommend-mobile .scrollContainer .scrollProductList .productCard {
-  margin-right: 0.24rem;
+  margin-right: 0.16rem;
 }
 .m-recommend-mobile .btnSeeAll {
   display: block;
@@ -74,3 +74,15 @@
   margin: 0 auto;
   flex: none;
 }
+.m-recommend-mobile .m-product-item-wrap {
+  border-radius: 0.16rem;
+}
+.m-recommend-mobile .m-product-item-wrap .img-wrap .product-img {
+  border-radius: 0.16rem 0.16rem 0 0;
+}
+.m-recommend-mobile .m-product-item-wrap.horizontal .img-wrap .product-img {
+  border-radius: 0.16rem 0 0 0.16rem;
+}
+.m-recommend-mobile .scrollContainer .m-product-item-wrap {
+  border: none;
+}

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

@@ -124,6 +124,7 @@ function (_super) {
         key: '5',
         name: (0, _locale.i18n)('BACKGROUND'),
         value: /*#__PURE__*/_react["default"].createElement(_BackgroundConfig["default"], {
+          component: "recommend",
           data: data.background
         })
       }],

package/lib/core/Designer/index.js

@@ -386,6 +386,8 @@ function (_super) {
 
       _this.closeConfigPanel();
 
+      window.magicDesign.device = device;
+
       _this.setState(__assign(__assign({}, _this.state), {
         device: device
       }));
@@ -395,8 +397,6 @@ function (_super) {
       _mobx.store.setState({
         clickedFloor: ''
       });
-
-      window.magicDesign.device = device;
     };
 
     _this.onAdd = function () {

package/lib/decorator/compositeDecorator.js

@@ -15,6 +15,10 @@ var _constants = require("../constants");
 
 var _commonUtil = require("../utils/commonUtil");
 
+var _storeUtil = require("../utils/storeUtil");
+
+var _common = require("../common");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -84,8 +88,27 @@ function compositeDecorator(WrappedComponent) {
       _this.state = {
         clickedFloor: '',
         hoveredFloor: ''
+      };
+
+      _this.switchLanguage = function (value) {
+        // const lang = 'ar';
+        (0, _storeUtil.setStore)(STORAGE_KEY.LOCALE, value); // 实时更新问题待优化;
+      };
+
+      _this.getUserAddress = function (value) {
+        // const info = {
+        //   address: '简短地址',
+        //   customer: '客户名称',
+        //   tel: '客户手机号',
+        //   longitude: '经度',
+        //   latitude: '纬度',
+        // };
+        _mobx.store.setState({
+          locationInfo: value || {}
+        });
       }; // 复合组件点击事件
 
+
       _this.onCompositeCompClick = function (event) {
         if (window.magicDesign.mode === 'renderer') {
           return;
@@ -274,7 +297,7 @@ function compositeDecorator(WrappedComponent) {
     };
 
     Wrapper.prototype.render = function () {
-      var _a;
+      var _a, _b;
 
       var nodeData = this.props.nodeData;
       var clickedFloor = this.state.clickedFloor;
@@ -291,7 +314,9 @@ function compositeDecorator(WrappedComponent) {
         style: floorNameStyle
       }, (_a = _constants.compInfoMap[nodeData.type]) === null || _a === void 0 ? void 0 : _a.name)), /*#__PURE__*/_react["default"].createElement("div", {
         style: (0, _commonUtil.pxToRem)(this.getWrapStyle())
-      }, /*#__PURE__*/_react["default"].createElement(WrappedComponent, this.props)));
+      }, /*#__PURE__*/_react["default"].createElement(_common.ErrorBoundary, {
+        name: (_b = _constants.compInfoMap[nodeData.type]) === null || _b === void 0 ? void 0 : _b.name
+      }, /*#__PURE__*/_react["default"].createElement(WrappedComponent, this.props))));
     };
 
     Wrapper.getDefaultJSON = WrappedComponent.getDefaultJSON;

package/lib/locale/en/en.json

@@ -1,4 +1,6 @@
 {
+  "TAB_BACKGROUND": "Tab Background",
+  "PRODUCT_BACKGROUND": "Product Background",
   "MISSION_NAME": "Mission Name",
   "COUNT_DOWN": "Count Down",
   "SEARCH_BAR_PLACEHOLDER": "Search Bar Placeholder",

package/lib/locale/es/es.json

@@ -1,4 +1,6 @@
 {
+  "TAB_BACKGROUND": "Tab Background",
+  "PRODUCT_BACKGROUND": "Product Background",
   "MISSION_NAME": "Mission Name",
   "COUNT_DOWN": "Count Down",
   "SEARCH_BAR_PLACEHOLDER": "Search Bar Placeholder",

package/lib/locale/id/id.json

@@ -1,4 +1,6 @@
 {
+  "TAB_BACKGROUND": "Tab Background",
+  "PRODUCT_BACKGROUND": "Product Background",
   "MISSION_NAME": "Mission Name",
   "COUNT_DOWN": "Count Down",
   "SEARCH_BAR_PLACEHOLDER": "Search Bar Placeholder",

package/package.json

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