@fonixtree/magic-design 2.0.128 → 2.0.130

package/es/composite-comp/monpay/components/MonpayRecommend/mobile/index.js

@@ -15,6 +15,8 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _card = _interopRequireDefault(require("./imgs/card.png"));
 
+var _emptyImg = _interopRequireDefault(require("./imgs/emptyImg.jpg"));
+
 var _SearchCondition = _interopRequireDefault(require("./SearchCondition"));
 
 var _mobx = require("../../../../../mobx");
@@ -727,7 +729,7 @@ function (_super) {
 
     var _products = products.length === 0 && (0, _coreUtil.isDesignMode)() ? defaultData : products;
 
-    var isDivide = groupSource.length <= 3;
+    var isDivide = groupSource.length <= 4;
 
     var _seeAll = (0, _commonUtil.ensure)(function () {
       return groupSource[tabIndex].seeAll;
@@ -746,7 +748,7 @@ function (_super) {
     }, 140);
     if (_layout === 'layout1-2' && contentWidth) imgHeight = (contentWidth - 12) / 2;
     if (_layout === 'layout1-3' && contentWidth) imgHeight = (contentWidth - 12 * 2) / 3;
-    return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, _products.length > 0 && /*#__PURE__*/_react["default"].createElement("div", {
+    return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, groupSource.length === 1 && _products.length > 0 || groupSource.length > 1 && /*#__PURE__*/_react["default"].createElement("div", {
       className: "monpay-recommend-mobile recommend_" + panelProps.id
     }, panelProps.title.headerImage.open && /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
       className: "headerImg",
@@ -824,7 +826,10 @@ function (_super) {
     })), _seeAll.open && _products.length > 0 && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
       className: "btnSeeAll",
       data: _seeAll
-    })) : /*#__PURE__*/_react["default"].createElement("div", {
+    }), _products.length === 0 && /*#__PURE__*/_react["default"].createElement("img", {
+      src: _emptyImg["default"],
+      alt: ""
+    })) : /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
       key: "scrollContainer",
       className: (0, _classnames["default"])('scrollContainer', {
         pl: layout === 'layout4'
@@ -854,6 +859,9 @@ function (_super) {
     })), _seeAll.open && _products.length > 0 && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
       className: "btnSeeAll",
       data: _seeAll
+    })), _products.length === 0 && /*#__PURE__*/_react["default"].createElement("img", {
+      src: _emptyImg["default"],
+      alt: ""
     }))));
   };
 

package/es/composite-comp/monpay/components/MonpaySignBoard/defaultJSON.js

@@ -29,7 +29,8 @@ var getDefaultJSON = function getDefaultJSON() {
           fontFamily: 'Open Sans',
           fontWeight: 600,
           fontSize: 16,
-          color: '#000'
+          color: '#000',
+          urlDisabled: true
         },
         underline: {
           open: false,
@@ -45,6 +46,7 @@ var getDefaultJSON = function getDefaultJSON() {
         text: 'Follow',
         content: {
           url: '',
+          urlDisabled: true,
           backgroundColor: '#FF8650'
         },
         buttonText: {

package/es/constants/index.js

@@ -125,7 +125,7 @@ var quickMenuCode = {
   SET_AS_TEMPLATE: 'SET_AS_TEMPLATE',
   REVIEW_RECORD: 'REVIEW_RECORD',
   TO_REVIEW: 'TO_REVIEW',
-  CANCEL_REVIEWL: 'CANCEL_REVIEW'
+  CANCEL_REVIEW: 'CANCEL_REVIEW'
 };
 exports.quickMenuCode = quickMenuCode;
 var compInfoMap = {

package/es/core/Designer/QuickMenuBar/index.js

@@ -72,10 +72,16 @@ var langBook = {
   },
   Spanish: {
     text: 'Spanish',
-    color: '#00AC50',
-    backColor: '#DFF3E0'
+    color: '#e74c3c',
+    backColor: '#fdedeb'
+  },
+  Mongolia: {
+    text: 'Mongolia',
+    color: '#3398da',
+    backColor: '#ebf5fb'
   }
 };
+var needScreenShot = [_constants.quickMenuCode.SAVE, _constants.quickMenuCode.PUBLISH, _constants.quickMenuCode.PUBLISH_LATER, _constants.quickMenuCode.TO_REVIEW, _constants.quickMenuCode.SET_AS_TEMPLATE];
 
 var QuickMenuBar =
 /** @class */
@@ -86,19 +92,21 @@ function (_super) {
     var _this = _super !== null && _super.apply(this, arguments) || this;
 
     _this.onBtnClick = function (event) {
-      var code = event.currentTarget.dataset.code; // 保存和发布时需要清空组件和元组件的选中状态，否则截图中会看到选中状态
+      var code = event.currentTarget.dataset.code; // 需要截图的操作，先清空元组件选中状态
 
-      if (code === _constants.quickMenuCode.SAVE || code === _constants.quickMenuCode.PUBLISH) {
+      if (needScreenShot.includes(code)) {
         _mobx.store.setState({
           clickedFloor: '',
           clickedGroup: '',
-          clickedMeta: ''
+          clickedMeta: '',
+          hoveredFloor: '',
+          hoveredMeta: ''
         });
       }
 
-      if (_this.props.device === _constants.deviceTypeMap.PC) {}
-
-      _this.props.onBtnClick(code);
+      setTimeout(function () {
+        _this.props.onBtnClick(code);
+      }, 100);
     };
 
     _this.onPublishLater = function (e) {

package/es/core/Designer/index.js

@@ -719,11 +719,9 @@ function (_super) {
       var stateObj = {
         imgGenVisible: _mobx.store.imgGenVisible,
         textModalState: _mobx.frameStore.textModalState
-      };
-
-      if (_this.state.locale != _mobx.store.locale) {
-        stateObj.locale = _mobx.store.locale;
-      }
+      }; // if (this.state.locale != store.locale) {
+      //   stateObj.locale = store.locale;
+      // }
 
       _this.setState(stateObj);
     });

package/es/locale/index.js

@@ -7,18 +7,20 @@ exports.i18n = i18n;
 
 var _en = _interopRequireDefault(require("./en/en.json"));
 
-var _id = _interopRequireDefault(require("./id/id.json"));
-
 var _es = _interopRequireDefault(require("./es/es.json"));
 
-var _mobx = require("../mobx");
+var _mn = _interopRequireDefault(require("./mn/mn.json"));
+
+var _constants = require("../constants");
+
+var _storeUtil = require("../utils/storeUtil");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var localeMap = {
   en: _en["default"],
-  id: _id["default"],
-  es: _es["default"]
+  es: _es["default"],
+  mn: _mn["default"]
 };
 /** 国际化 */
 
@@ -27,8 +29,9 @@ function i18n(key, args) {
     args = {};
   }
 
-  var locale = localeMap[_mobx.store.locale || 'en'] || _en["default"];
-  var tempString = locale[key];
+  var locale = (0, _storeUtil.getStore)(_constants.STORAGE_KEY.LOCALE);
+  var localeObj = localeMap[locale || 'en'] || _en["default"];
+  var tempString = localeObj[key];
 
   if (tempString) {
     var str_1 = tempString;

package/es/locale/{id/id.json → mn/mn.json}

@@ -155,8 +155,8 @@
   "IMAGES": "Images",
   "PUBLISH_TIME": "Publish Time",
   "CONFIRM": "Confirm",
-  "PUBLISH_LATER": "Publish Later",
-  "PUBLISH_NOW": "Publish Now",
+  "PUBLISH_LATER": "Дараа нийтлэх",
+  "PUBLISH_NOW": "Одоо нийтлэх",
   "SEARCH_BOX": "Search Box",
   "PLEASE_INPUT_KEYWORDS": "Please input keywords",
   "SHOPPING_CART": "Shopping Cart",
@@ -221,7 +221,7 @@
   "MOVE_DOWN": "Move Down",
   "COPY": "Copy",
   "DELETE": "Delete",
-  "ADD_COMPONENT": "Add Component",
+  "ADD_COMPONENT": "Бүрэлдэхүүн хэсэг нэмэх",
   "ALL": "ALL",
   "HOT": "Hot",
   "GUESS_YOU_LIKE": "Guess you like",

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

@@ -148,6 +148,7 @@ function (_super) {
       split: true,
       title: (0, _locale.i18n)('URL')
     }, /*#__PURE__*/_react["default"].createElement(_common.UrlPicker, {
+      disabled: data.content.urlDisabled,
       onChange: function onChange(value) {
         _this.updateAttr(data.content, 'url', value);
       },
@@ -362,6 +363,7 @@ function (_super) {
     data: {
       content: {
         url: '',
+        urlDisabled: false,
         backgroundColor: '#2F54EB'
       },
       buttonText: {

package/es/mobx/Store.js

@@ -7,8 +7,6 @@ exports.Store = void 0;
 
 var _mobx = require("mobx");
 
-var _constants = require("../constants");
-
 var _storeUtil = require("../utils/storeUtil");
 
 var debug = require('debug')('worker:mobx');
@@ -20,8 +18,6 @@ var Store =
 /** @class */
 function () {
   function Store() {
-    this.locale = (0, _storeUtil.getStore)(_constants.STORAGE_KEY.LOCALE); // 国际化语言
-
     this.hoveredMeta = ''; // hover的元组件Id
 
     this.clickedMeta = ''; // 点击的元组件Id
@@ -42,7 +38,6 @@ function () {
 
     (0, _mobx.makeObservable)(this, {
       MPageData: _mobx.observable,
-      locale: _mobx.observable,
       hoveredMeta: _mobx.observable,
       clickedMeta: _mobx.observable,
       clickedGroup: _mobx.observable,

package/es/utils/businessUtil.js

@@ -484,6 +484,7 @@ var getPromotionList = function getPromotionList(offer) {
     2: 'FLASH',
     4: 'Group',
     12: 'Bargain',
+    14: 'Discount',
     C: 'Discount',
     D: 'Discount',
     G: 'Gift'

package/lib/composite-comp/monpay/components/MonpayRecommend/mobile/index.js

@@ -15,6 +15,8 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _card = _interopRequireDefault(require("./imgs/card.png"));
 
+var _emptyImg = _interopRequireDefault(require("./imgs/emptyImg.jpg"));
+
 var _SearchCondition = _interopRequireDefault(require("./SearchCondition"));
 
 var _mobx = require("../../../../../mobx");
@@ -727,7 +729,7 @@ function (_super) {
 
     var _products = products.length === 0 && (0, _coreUtil.isDesignMode)() ? defaultData : products;
 
-    var isDivide = groupSource.length <= 3;
+    var isDivide = groupSource.length <= 4;
 
     var _seeAll = (0, _commonUtil.ensure)(function () {
       return groupSource[tabIndex].seeAll;
@@ -746,7 +748,7 @@ function (_super) {
     }, 140);
     if (_layout === 'layout1-2' && contentWidth) imgHeight = (contentWidth - 12) / 2;
     if (_layout === 'layout1-3' && contentWidth) imgHeight = (contentWidth - 12 * 2) / 3;
-    return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, _products.length > 0 && /*#__PURE__*/_react["default"].createElement("div", {
+    return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, groupSource.length === 1 && _products.length > 0 || groupSource.length > 1 && /*#__PURE__*/_react["default"].createElement("div", {
       className: "monpay-recommend-mobile recommend_" + panelProps.id
     }, panelProps.title.headerImage.open && /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
       className: "headerImg",
@@ -824,7 +826,10 @@ function (_super) {
     })), _seeAll.open && _products.length > 0 && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
       className: "btnSeeAll",
       data: _seeAll
-    })) : /*#__PURE__*/_react["default"].createElement("div", {
+    }), _products.length === 0 && /*#__PURE__*/_react["default"].createElement("img", {
+      src: _emptyImg["default"],
+      alt: ""
+    })) : /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
       key: "scrollContainer",
       className: (0, _classnames["default"])('scrollContainer', {
         pl: layout === 'layout4'
@@ -854,6 +859,9 @@ function (_super) {
     })), _seeAll.open && _products.length > 0 && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
       className: "btnSeeAll",
       data: _seeAll
+    })), _products.length === 0 && /*#__PURE__*/_react["default"].createElement("img", {
+      src: _emptyImg["default"],
+      alt: ""
     }))));
   };
 

package/lib/composite-comp/monpay/components/MonpaySignBoard/defaultJSON.js

@@ -29,7 +29,8 @@ var getDefaultJSON = function getDefaultJSON() {
           fontFamily: 'Open Sans',
           fontWeight: 600,
           fontSize: 16,
-          color: '#000'
+          color: '#000',
+          urlDisabled: true
         },
         underline: {
           open: false,
@@ -45,6 +46,7 @@ var getDefaultJSON = function getDefaultJSON() {
         text: 'Follow',
         content: {
           url: '',
+          urlDisabled: true,
           backgroundColor: '#FF8650'
         },
         buttonText: {

package/lib/constants/index.js

@@ -125,7 +125,7 @@ var quickMenuCode = {
   SET_AS_TEMPLATE: 'SET_AS_TEMPLATE',
   REVIEW_RECORD: 'REVIEW_RECORD',
   TO_REVIEW: 'TO_REVIEW',
-  CANCEL_REVIEWL: 'CANCEL_REVIEW'
+  CANCEL_REVIEW: 'CANCEL_REVIEW'
 };
 exports.quickMenuCode = quickMenuCode;
 var compInfoMap = {

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

@@ -72,10 +72,16 @@ var langBook = {
   },
   Spanish: {
     text: 'Spanish',
-    color: '#00AC50',
-    backColor: '#DFF3E0'
+    color: '#e74c3c',
+    backColor: '#fdedeb'
+  },
+  Mongolia: {
+    text: 'Mongolia',
+    color: '#3398da',
+    backColor: '#ebf5fb'
   }
 };
+var needScreenShot = [_constants.quickMenuCode.SAVE, _constants.quickMenuCode.PUBLISH, _constants.quickMenuCode.PUBLISH_LATER, _constants.quickMenuCode.TO_REVIEW, _constants.quickMenuCode.SET_AS_TEMPLATE];
 
 var QuickMenuBar =
 /** @class */
@@ -86,19 +92,21 @@ function (_super) {
     var _this = _super !== null && _super.apply(this, arguments) || this;
 
     _this.onBtnClick = function (event) {
-      var code = event.currentTarget.dataset.code; // 保存和发布时需要清空组件和元组件的选中状态，否则截图中会看到选中状态
+      var code = event.currentTarget.dataset.code; // 需要截图的操作，先清空元组件选中状态
 
-      if (code === _constants.quickMenuCode.SAVE || code === _constants.quickMenuCode.PUBLISH) {
+      if (needScreenShot.includes(code)) {
         _mobx.store.setState({
           clickedFloor: '',
           clickedGroup: '',
-          clickedMeta: ''
+          clickedMeta: '',
+          hoveredFloor: '',
+          hoveredMeta: ''
         });
       }
 
-      if (_this.props.device === _constants.deviceTypeMap.PC) {}
-
-      _this.props.onBtnClick(code);
+      setTimeout(function () {
+        _this.props.onBtnClick(code);
+      }, 100);
     };
 
     _this.onPublishLater = function (e) {

package/lib/core/Designer/index.js

@@ -719,11 +719,9 @@ function (_super) {
       var stateObj = {
         imgGenVisible: _mobx.store.imgGenVisible,
         textModalState: _mobx.frameStore.textModalState
-      };
-
-      if (_this.state.locale != _mobx.store.locale) {
-        stateObj.locale = _mobx.store.locale;
-      }
+      }; // if (this.state.locale != store.locale) {
+      //   stateObj.locale = store.locale;
+      // }
 
       _this.setState(stateObj);
     });

package/lib/locale/index.js

@@ -7,18 +7,20 @@ exports.i18n = i18n;
 
 var _en = _interopRequireDefault(require("./en/en.json"));
 
-var _id = _interopRequireDefault(require("./id/id.json"));
-
 var _es = _interopRequireDefault(require("./es/es.json"));
 
-var _mobx = require("../mobx");
+var _mn = _interopRequireDefault(require("./mn/mn.json"));
+
+var _constants = require("../constants");
+
+var _storeUtil = require("../utils/storeUtil");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var localeMap = {
   en: _en["default"],
-  id: _id["default"],
-  es: _es["default"]
+  es: _es["default"],
+  mn: _mn["default"]
 };
 /** 国际化 */
 
@@ -27,8 +29,9 @@ function i18n(key, args) {
     args = {};
   }
 
-  var locale = localeMap[_mobx.store.locale || 'en'] || _en["default"];
-  var tempString = locale[key];
+  var locale = (0, _storeUtil.getStore)(_constants.STORAGE_KEY.LOCALE);
+  var localeObj = localeMap[locale || 'en'] || _en["default"];
+  var tempString = localeObj[key];
 
   if (tempString) {
     var str_1 = tempString;

package/lib/locale/{id/id.json → mn/mn.json}

@@ -155,8 +155,8 @@
   "IMAGES": "Images",
   "PUBLISH_TIME": "Publish Time",
   "CONFIRM": "Confirm",
-  "PUBLISH_LATER": "Publish Later",
-  "PUBLISH_NOW": "Publish Now",
+  "PUBLISH_LATER": "Дараа нийтлэх",
+  "PUBLISH_NOW": "Одоо нийтлэх",
   "SEARCH_BOX": "Search Box",
   "PLEASE_INPUT_KEYWORDS": "Please input keywords",
   "SHOPPING_CART": "Shopping Cart",
@@ -221,7 +221,7 @@
   "MOVE_DOWN": "Move Down",
   "COPY": "Copy",
   "DELETE": "Delete",
-  "ADD_COMPONENT": "Add Component",
+  "ADD_COMPONENT": "Бүрэлдэхүүн хэсэг нэмэх",
   "ALL": "ALL",
   "HOT": "Hot",
   "GUESS_YOU_LIKE": "Guess you like",

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

@@ -148,6 +148,7 @@ function (_super) {
       split: true,
       title: (0, _locale.i18n)('URL')
     }, /*#__PURE__*/_react["default"].createElement(_common.UrlPicker, {
+      disabled: data.content.urlDisabled,
       onChange: function onChange(value) {
         _this.updateAttr(data.content, 'url', value);
       },
@@ -362,6 +363,7 @@ function (_super) {
     data: {
       content: {
         url: '',
+        urlDisabled: false,
         backgroundColor: '#2F54EB'
       },
       buttonText: {

package/lib/mobx/Store.js

@@ -7,8 +7,6 @@ exports.Store = void 0;
 
 var _mobx = require("mobx");
 
-var _constants = require("../constants");
-
 var _storeUtil = require("../utils/storeUtil");
 
 var debug = require('debug')('worker:mobx');
@@ -20,8 +18,6 @@ var Store =
 /** @class */
 function () {
   function Store() {
-    this.locale = (0, _storeUtil.getStore)(_constants.STORAGE_KEY.LOCALE); // 国际化语言
-
     this.hoveredMeta = ''; // hover的元组件Id
 
     this.clickedMeta = ''; // 点击的元组件Id
@@ -42,7 +38,6 @@ function () {
 
     (0, _mobx.makeObservable)(this, {
       MPageData: _mobx.observable,
-      locale: _mobx.observable,
       hoveredMeta: _mobx.observable,
       clickedMeta: _mobx.observable,
       clickedGroup: _mobx.observable,

package/lib/utils/businessUtil.js

@@ -484,6 +484,7 @@ var getPromotionList = function getPromotionList(offer) {
     2: 'FLASH',
     4: 'Group',
     12: 'Bargain',
+    14: 'Discount',
     C: 'Discount',
     D: 'Discount',
     G: 'Gift'

package/package.json

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