@fonixtree/magic-design 2.0.202 → 2.0.204

package/lib/core/Designer/ConfigPanel/index.js

@@ -73,6 +73,15 @@ var getSecondConfigName = function getSecondConfigName(selectedNode, clickedGrou
     return src.id === clickedGroup;
   });
 
+  if (!panelProps && selectedNode.groupSource2) {
+    panelProps = selectedNode.groupSource2.find(function (src) {
+      return src.id === clickedGroup;
+    });
+    panelIndex = selectedNode.groupSource2.findIndex(function (src) {
+      return src.id === clickedGroup;
+    });
+  }
+
   if (!panelProps) {
     return;
   }
@@ -133,7 +142,6 @@ var getSecondConfigName = function getSecondConfigName(selectedNode, clickedGrou
       break;
 
     case 'PERSONAL_INFOMATION':
-    case 'ORDERS':
       groupName = panelProps.sourceType;
       break;
   }
@@ -291,6 +299,14 @@ function (_super) {
         });
       }, null);
 
+      if (!panelProps && (selectedNode === null || selectedNode === void 0 ? void 0 : selectedNode.groupSource2)) {
+        panelProps = (0, _commonUtil.ensure)(function () {
+          return selectedNode === null || selectedNode === void 0 ? void 0 : selectedNode.groupSource2.find(function (src) {
+            return src.id === _this.state.clickedGroup;
+          });
+        }, null);
+      }
+
       if (panelProps) {
         var instance = Clazz ? /*#__PURE__*/_react["default"].createElement(Clazz, {
           panelProps: panelProps,

package/lib/core/Renderer/index.js

@@ -45,7 +45,8 @@ var setDesignConfig = function setDesignConfig(props) {
   var config = props.config,
       device = props.device,
       isPreview = props.isPreview,
-      projectCode = props.projectCode;
+      projectCode = props.projectCode,
+      showRecommendAds = props.showRecommendAds;
   window.magicDesign = __assign(__assign({
     pageBackground: '#f2f2f2',
     mode: 'renderer',
@@ -55,7 +56,8 @@ var setDesignConfig = function setDesignConfig(props) {
   }, config), {
     projectCode: projectCode,
     compSpacing: Number(config.compSpacing),
-    compWidth: Number(config.compWidth)
+    compWidth: Number(config.compWidth),
+    showRecommendAds: showRecommendAds
   });
 };
 /**
@@ -77,6 +79,14 @@ var Renderer = function Renderer(props) {
       modalState = _b[0],
       setModalState = _b[1];
 
+  var _c = (0, _react.useState)(_mobx.frameStore.pcProdCardModalState),
+      pcProdCardModalState = _c[0],
+      setPcProdCardModalState = _c[1];
+
+  var _d = (0, _react.useState)(_mobx.frameStore.toastState),
+      toastState = _d[0],
+      setToastState = _d[1];
+
   if (!noSetWindow) {
     setDesignConfig(props);
   }
@@ -132,6 +142,8 @@ var Renderer = function Renderer(props) {
   (0, _react.useEffect)(function () {
     var disposer = (0, _mobx.autorun)(function () {
       setModalState(_mobx.frameStore.modalState);
+      setPcProdCardModalState(_mobx.frameStore.pcProdCardModalState);
+      setToastState(_mobx.frameStore.toastState);
     });
     return function () {
       disposer();
@@ -148,6 +160,25 @@ var Renderer = function Renderer(props) {
     });
   };
 
+  var onCloseProdCardModal = function onCloseProdCardModal() {
+    document.body.classList.remove('no-scroll');
+
+    _mobx.frameStore.setState({
+      pcProdCardModalState: {
+        visible: false,
+        data: []
+      }
+    });
+  };
+
+  var onCloseToast = function onCloseToast() {
+    _mobx.frameStore.setState({
+      toastState: {
+        visible: false
+      }
+    });
+  };
+
   var getRestStyle = function getRestStyle() {
     if (modalState.visible) {
       return {
@@ -193,6 +224,10 @@ var Renderer = function Renderer(props) {
     isPreview: isPreview
   }, modalState, {
     onClose: onCloseModal
+  })), pcProdCardModalState.visible && /*#__PURE__*/_react["default"].createElement(_common.ProductCardModal, _extends({}, pcProdCardModalState, {
+    onClose: onCloseProdCardModal
+  })), toastState.visible && /*#__PURE__*/_react["default"].createElement(_common.Toast, _extends({}, toastState, {
+    onClose: onCloseToast
   })));
 };
 

package/lib/decorator/compositeDecorator.js

@@ -146,7 +146,7 @@ function compositeDecorator(WrappedComponent) {
         var zIndex = '0';
         var position = 'relative';
 
-        if (nodeData.type === 'CAROUSEL' || nodeData.type === 'IMAGE_GALLERY' || nodeData.type === 'ORDERS' || nodeData.type === 'MONPAY_RECOMMEND') {
+        if (nodeData.type === 'CAROUSEL' || nodeData.type === 'IMAGE_GALLERY' || nodeData.type === 'MONPAY_RECOMMEND' || nodeData.type === 'SEARCH_DITO') {
           zIndex = '1';
         } // 解决pc导航hover上去，类目被下面组件遮罩的问题
 
@@ -198,6 +198,10 @@ function compositeDecorator(WrappedComponent) {
           }
         }
 
+        if (nodeData.type === 'SLIDE_IMAGE') {
+          wrapStyle.overflow = 'hidden';
+        }
+
         return wrapStyle;
       };
 

package/lib/decorator/metaDecorator.js

@@ -224,8 +224,7 @@ function metaDecorator(WrappedComponent) {
           className = _a.className,
           rest = __rest(_a, ["className"]);
 
-      var hoverStyle = this.getInteractStyle(); // console.log(rest);
-
+      var hoverStyle = this.getInteractStyle();
       return /*#__PURE__*/_react["default"].createElement("div", {
         className: className,
         style: this.getStyle()

package/lib/locale/ar/ar.json

@@ -1,4 +1,15 @@
 {
+  "COLLECT_VOUCHER_SUCCESS": "Voucher collection successful!",
+  "MOVE_IN_LOGO": "Move In Logo",
+  "SEARCH_BAR_BACKGROUND": "Search Bar Background",
+  "CONFIRM_TO_LOGOUT": "Confirm to Logout",
+  "LOG_OUT": "Log Out",
+  "MY_ACCOUNT": "My Account",
+  "LOGIN_BUTTON": "Login Button",
+  "SEARCH_ICON": "Search Icon",
+  "NAVIGATION": "Navigation",
+  "COLUMN_SPACING": "Column spacing",
+  "LINE_SPACING": "Line Spacing",
   "CHATBOT_ICON": "Chatbot icon",
   "FESTIVAL_DECORATION": "Festival Decoration",
   "PRICE_REDUCTION": "Price Reduction",
@@ -297,7 +308,6 @@
   "FONT_FAMILY": "Font Family",
   "FONT_WEIGHT": "Font Weight",
   "FONT_SIZE": "Font Size",
-  "LINE_SPACING": "Line Spacing",
   "LINE_COLOR": "Line Color",
   "LINE_WEIGHT": "Line Weight",
   "LINE_STYLE": "Line Style",

package/lib/locale/en/en.json

@@ -1,4 +1,15 @@
 {
+  "COLLECT_VOUCHER_SUCCESS": "Voucher collection successful!",
+  "MOVE_IN_LOGO": "Move In Logo",
+  "SEARCH_BAR_BACKGROUND": "Search Bar Background",
+  "CONFIRM_TO_LOGOUT": "Confirm to Logout",
+  "LOG_OUT": "Log Out",
+  "MY_ACCOUNT": "My Account",
+  "LOGIN_BUTTON": "Login Button",
+  "SEARCH_ICON": "Search Icon",
+  "NAVIGATION": "Navigation",
+  "COLUMN_SPACING": "Column spacing",
+  "LINE_SPACING": "Line Spacing",
   "CHATBOT_ICON": "Chatbot icon",
   "FESTIVAL_DECORATION": "Festival Decoration",
   "PRICE_REDUCTION": "Price Reduction",
@@ -297,7 +308,6 @@
   "FONT_FAMILY": "Font Family",
   "FONT_WEIGHT": "Font Weight",
   "FONT_SIZE": "Font Size",
-  "LINE_SPACING": "Line Spacing",
   "LINE_COLOR": "Line Color",
   "LINE_WEIGHT": "Line Weight",
   "LINE_STYLE": "Line Style",

package/lib/locale/es/es.json

@@ -1,4 +1,15 @@
 {
+  "COLLECT_VOUCHER_SUCCESS": "Voucher collection successful!",
+  "MOVE_IN_LOGO": "Move In Logo",
+  "SEARCH_BAR_BACKGROUND": "Search Bar Background",
+  "CONFIRM_TO_LOGOUT": "Confirm to Logout",
+  "LOG_OUT": "Log Out",
+  "MY_ACCOUNT": "My Account",
+  "LOGIN_BUTTON": "Login Button",
+  "SEARCH_ICON": "Search Icon",
+  "NAVIGATION": "Navigation",
+  "COLUMN_SPACING": "Column spacing",
+  "LINE_SPACING": "Espaciado entre líneas",
   "CHATBOT_ICON": "Chatbot icon",
   "FESTIVAL_DECORATION": "Festival Decoration",
   "PRICE_REDUCTION": "Price Reduction",
@@ -297,7 +308,6 @@
   "FONT_FAMILY": "Familia de fuentes",
   "FONT_WEIGHT": "Peso de fuente",
   "FONT_SIZE": "Tamaño de fuente",
-  "LINE_SPACING": "Espaciado entre líneas",
   "LINE_COLOR": "Color de línea",
   "LINE_WEIGHT": "Grosor de línea",
   "LINE_STYLE": "Estilo de línea",

package/lib/meta-comp/components/Button/editable.js

@@ -95,7 +95,8 @@ function (_super) {
 
     var _a = this.props,
         data = _a.data,
-        readonly = _a.readonly;
+        readonly = _a.readonly,
+        onTextInput = _a.onTextInput;
     this.preData = JSON.stringify(data);
     this.preDevice = window.magicDesign.device;
     return /*#__PURE__*/_react["default"].createElement("span", {
@@ -104,6 +105,7 @@ function (_super) {
       onInput: function onInput(e) {
         var text = e.target.textContent;
         data.text = text;
+        onTextInput(text);
         /** 主动更新历史数据避免render */
 
         _this.preData = JSON.stringify(__assign(__assign({}, JSON.parse(_this.preData)), {

package/lib/meta-comp/components/Button/index.js

@@ -104,7 +104,8 @@ function (_super) {
 
     var _b = this.props,
         data = _b.data,
-        className = _b.className;
+        className = _b.className,
+        iconHeight = _b.iconHeight;
     var hover = this.state.hover;
     this.preData = JSON.stringify(data);
     this.preDevice = window.magicDesign.device;
@@ -162,15 +163,23 @@ function (_super) {
       })
     }, (iconLayout === 'right' || iconLayout === 'bottom') && /*#__PURE__*/_react["default"].createElement(_editable["default"], this.props), iconUrl && /*#__PURE__*/_react["default"].createElement("img", {
       alt: "",
-      className: "icon",
-      src: iconUrl
+      className: (0, _classnames["default"])('icon', {
+        ml: iconLayout === 'right',
+        mr: iconLayout === 'left'
+      }),
+      src: iconUrl,
+      style: {
+        height: iconHeight + "px"
+      }
     }), (iconLayout === 'left' || iconLayout === 'top') && /*#__PURE__*/_react["default"].createElement(_editable["default"], this.props)));
   };
 
   Button.defaultProps = {
     data: {},
     className: '',
-    readonly: false
+    readonly: false,
+    onTextInput: function onTextInput() {},
+    iconHeight: 20
   };
 
   __decorate([(0, _decorator.shouldUpdate)()], Button.prototype, "shouldComponentUpdate", null);

package/lib/meta-comp/components/Button/index.less

@@ -15,7 +15,14 @@
 
     img {
       height: 20px;
-      margin: 0 5px;
+
+      &.ml {
+        margin-left: 5px;
+      }
+
+      &.mr {
+        margin-right: 5px;
+      }
     }
   }
 }

package/lib/meta-comp/components/Image/index.js

@@ -13,6 +13,8 @@ require("./index.less");
 
 var _h5DefRectImg = _interopRequireDefault(require("./image/h5DefRectImg.png"));
 
+var _defaultImg = _interopRequireDefault(require("./image/default-img.png"));
+
 var _h5DefImg = _interopRequireDefault(require("./image/h5DefImg.png"));
 
 var _pcDefImg = _interopRequireDefault(require("./image/pcDefImg.png"));
@@ -175,6 +177,7 @@ function (_super) {
     var _e = this.props,
         data = _e.data,
         isBackground = _e.isBackground,
+        imgCover = _e.imgCover,
         hoverState = _e.hoverState,
         notNeedLazy = _e.notNeedLazy,
         isRect = _e.isRect;
@@ -191,13 +194,14 @@ function (_super) {
 
 
     if (!srcImg) {
-      srcImg = (0, _coreUtil.isPc)() ? _pcDefImg["default"] : isRect ? _h5DefRectImg["default"] : _h5DefImg["default"];
+      srcImg = (0, _coreUtil.isPc)() ? isRect ? _defaultImg["default"] : _pcDefImg["default"] : isRect ? _h5DefRectImg["default"] : _h5DefImg["default"];
     }
 
     var areas = data.content.openHotArea && ((0, _coreUtil.isPc)() ? data.content.pcAreas : data.content.h5Areas);
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: (0, _classnames["default"])('m-meta-image', {
-        backgroundImg: isBackground
+        backgroundImg: isBackground,
+        cover: imgCover
       }),
       onClick: function onClick() {
         (0, _coreUtil.clickUrl)(data.content.clickUrl);
@@ -252,6 +256,7 @@ function (_super) {
       hover: {}
     },
     isBackground: false,
+    imgCover: false,
     hoverState: false,
     limitWidthHeight: false,
     scale: 1,

package/lib/meta-comp/components/Image/index.less

@@ -4,6 +4,7 @@
   height: 100%;
   display: flex;
   justify-content: center;
+
   // overflow: hidden;
   &>img {
     width: 100%;
@@ -22,4 +23,10 @@
       max-width: none;
     }
   }
+
+  &.cover {
+    &>img {
+      object-fit: cover;
+    }
+  }
 }

package/lib/meta-comp/components/Text/index.js

@@ -263,7 +263,9 @@ function (_super) {
         }
       }, /*#__PURE__*/_react["default"].createElement("div", {
         ref: this.textRef,
-        className: (0, _classnames["default"])('m-meta-text', className),
+        className: (0, _classnames["default"])('m-meta-text', className, {
+          cursor: data.content.clickUrl
+        }),
         dangerouslySetInnerHTML: {
           __html: data.html || data.text
         },
@@ -279,7 +281,9 @@ function (_super) {
 
     return /*#__PURE__*/_react["default"].createElement("div", {
       ref: this.textRef,
-      className: (0, _classnames["default"])('m-meta-text', 'quill-text-content-wrap', className),
+      className: (0, _classnames["default"])('m-meta-text', 'quill-text-content-wrap', className, {
+        cursor: data.content.clickUrl
+      }),
       dangerouslySetInnerHTML: {
         __html: data.html || data.text
       },

package/lib/meta-comp/components/Text/index.less

@@ -56,6 +56,9 @@
 .m-meta-text {
   display: block;
 
+  &.cursor {
+    cursor: pointer;
+  }
 
   ol,
   ul,

package/lib/mobx/Frame.js

@@ -60,10 +60,21 @@ function () {
       onOk: function onOk() {},
       close: function close() {}
     };
+    this.pcProdCardModalState = {
+      visible: false,
+      data: []
+    };
+    this.toastState = {
+      visible: false,
+      message: '',
+      onClose: function onClose() {}
+    };
     (0, _mobx.makeObservable)(this, {
       confirmState: _mobx.observable,
       textModalState: _mobx.observable,
-      modalState: _mobx.observable
+      modalState: _mobx.observable,
+      pcProdCardModalState: _mobx.observable,
+      toastState: _mobx.observable
     });
   }
   /** 修改状态 */

package/lib/mobx/Store.js

@@ -79,6 +79,18 @@ function () {
       });
       return !!group;
     });
+
+    if (!componentFloor) {
+      componentFloor = this.MPageData.find(function (floor) {
+        var _a;
+
+        var group = (_a = floor.groupSource2) === null || _a === void 0 ? void 0 : _a.find(function (grp) {
+          return grp.id === id;
+        });
+        return !!group;
+      });
+    }
+
     return componentFloor === null || componentFloor === void 0 ? void 0 : componentFloor.id;
   };
   /**

package/lib/utils/androidUtil.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.sendToJs = exports.sendToIos = exports.sendToApp = exports.sendToAndroid = exports.iosSendToJs = exports.goToLoginApp = exports.connectWebViewJavascriptBridge = exports.browserVersion = void 0;
 
+var _commonUtil = require("./commonUtil");
+
 // 判断访问终端
 var browserVersion = function browserVersion() {
   var u = navigator.userAgent;
@@ -142,9 +144,15 @@ exports.sendToApp = sendToApp;
 
 var goToLoginApp = function goToLoginApp() {
   if (browserVersion().ditoAndroidApp) {
-    window.dito.goToLogin();
+    var deviceInfo = JSON.parse(window.dito.ocSetDeviceInfo());
+
+    if ((0, _commonUtil.compareVersion)(deviceInfo.AppVersion, '2.11.22') < 0) {
+      window.dito.goToLogin();
+    } else {
+      window.dito.goToLogin('');
+    }
   } else if (browserVersion().ditoIosApp) {
-    window.dito.goToLogin();
+    window.dito.goToLogin(window.location.href);
   }
 };