@fonixtree/magic-design 2.0.123 → 2.0.126

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

@@ -235,25 +235,27 @@ var defaultData = [{
     url: _card["default"]
   },
   offerName: 'Product Name',
-  salesPrice: 18000000,
-  specialPrice: 18000000,
-  marketPrice: 19000000,
+  salesPrice: 10000,
+  specialPrice: 8000,
+  marketPrice: 20000,
   salePercent: 500,
   coupons: [{
     couponId: '1',
-    discountMethod: 'DISC'
+    discountMethod: 'DISC',
+    discountAmount: 30
   }, {
     couponId: '2',
-    discountMethod: 'AMT'
+    discountMethod: 'AMT',
+    discountAmount: 10000
   }]
 }, {
   imgUrlContent: {
     url: _card["default"]
   },
   offerName: 'Product Name',
-  salesPrice: 18000000,
-  specialPrice: 18000000,
-  marketPrice: 19000000,
+  salesPrice: 10000,
+  specialPrice: null,
+  marketPrice: 20000,
   salePercent: 500
 }, {
   imgUrlContent: {
@@ -263,6 +265,7 @@ var defaultData = [{
   salesPrice: 18000000,
   specialPrice: 18000000,
   marketPrice: 19000000,
+  discountPercent: 10,
   salePercent: 500
 }, {
   imgUrlContent: {
@@ -607,8 +610,8 @@ function (_super) {
         waitForImages: false,
         useOwnImageLoader: false,
         margin: {
-          x: 12,
-          y: 12
+          x: 16,
+          y: 16
         },
         columns: columns
       });
@@ -645,18 +648,7 @@ function (_super) {
     return _this;
   }
 
-  RecommendMobile.prototype.componentDidMount = function () {// const { panelProps } = this.props;
-    // const source = [];
-    // panelProps.groupSource.map(m => {
-    //   const show = m.image.open || m.groupName.open;
-    //   if (show) source.push(m);
-    // });
-    // this.setState({ groupSource: source }, () => {
-    //   this.initTab(0);
-    //   this.getProductList(0);
-    // });
-    // this.listenWidth();
-  };
+  RecommendMobile.prototype.componentDidMount = function () {};
 
   RecommendMobile.prototype.componentWillReceiveProps = function (nextProps) {
     var _this = this;
@@ -805,6 +797,8 @@ function (_super) {
       key: "macyContainer",
       className: "macyContainer macyContainer_" + panelProps.id
     }, _products.map(function (item) {
+      var _a;
+
       return /*#__PURE__*/_react["default"].createElement(_MonpayProductItem["default"], {
         key: item.productId,
         data: item,
@@ -824,7 +818,8 @@ function (_super) {
           (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || item.productId || ''));
         },
         panelProps: panelProps.content,
-        showProgress: false
+        showProgress: false,
+        intelligentType: (_a = groupSource[tabIndex]) === null || _a === void 0 ? void 0 : _a.intelligentType
       });
     })), _seeAll.open && _products.length > 0 && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
       className: "btnSeeAll",
@@ -837,6 +832,8 @@ function (_super) {
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "scrollProductList"
     }, _products.map(function (item) {
+      var _a;
+
       return /*#__PURE__*/_react["default"].createElement(_MonpayProductItem["default"], {
         key: "scroll_" + item.productId,
         data: item,
@@ -851,7 +848,8 @@ function (_super) {
           (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || item.productId || ''));
         },
         panelProps: panelProps.content,
-        showProgress: false
+        showProgress: false,
+        intelligentType: (_a = groupSource[tabIndex]) === null || _a === void 0 ? void 0 : _a.intelligentType
       });
     })), _seeAll.open && _products.length > 0 && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
       className: "btnSeeAll",

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

@@ -320,13 +320,14 @@ function (_super) {
       }
     };
 
-    _this.onShare = function () {};
+    _this.onShare = function () {
+      if (window.magicDesign.socialShare) window.magicDesign.socialShare('store', window.magicDesign.storeId);
+    };
 
     return _this;
   }
 
   SignBoardMobile.prototype.componentDidMount = function () {
-    window.magicDesign.storeId = 2;
     this.getStoreInfo();
   };
 
@@ -350,7 +351,7 @@ function (_super) {
     }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
       onClick: _commonUtil.navigateBack,
       color: "#000",
-      size: (0, _commonUtil.convertToRem)(20),
+      size: (0, _commonUtil.convertToRem)(16),
       type: "icon-outlined-left"
     }), ((_b = (_a = data.content) === null || _a === void 0 ? void 0 : _a.box) === null || _b === void 0 ? void 0 : _b.open) && /*#__PURE__*/_react["default"].createElement("div", {
       className: "input-wrap",
@@ -373,12 +374,7 @@ function (_super) {
       size: (0, _commonUtil.convertToRem)(20),
       fontWeight: 600,
       type: "icon-search2"
-    }))), /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
-      color: "#000",
-      size: (0, _commonUtil.convertToRem)(20),
-      type: "icon-share-points",
-      onClick: this.onShare
-    })), /*#__PURE__*/_react["default"].createElement("div", {
+    })))), /*#__PURE__*/_react["default"].createElement("div", {
       className: "store-info-wrap"
     }, /*#__PURE__*/_react["default"].createElement("img", {
       className: "store-logo",

package/lib/composite-comp/monpay/components/MonpaySignBoard/mobile/index.less

@@ -1,7 +1,6 @@
 .m-sign-board-wrap .header-wrap {
   display: flex;
   align-items: center;
-  justify-content: space-between;
   background-color: #fff;
   padding: 0.16rem 0.4rem;
   height: 1.14rem;
@@ -14,6 +13,7 @@
   display: flex;
   justify-content: space-between;
   align-items: center;
+  margin-left: 0.4rem;
 }
 .m-sign-board-wrap .header-wrap .input-wrap input {
   width: 3.7rem;

package/lib/constants/index.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.walletType = exports.urlTypeMap = exports.urlType = exports.tempTypeMap = exports.respCodeMap = exports.quickMenuCode = exports.personalInfoType = exports.partyTypeMap = exports.pageStateMap = exports.orderStatusType = exports.metaType = exports.metaInst = exports.metaInsType = exports.magicMode = exports.eventType = exports.deviceTypeWidthMap = exports.deviceTypeMap = exports.compInfoMap = exports.baseUrlMap = exports.STORE_KEY = exports.STORAGE_KEY = exports.ORDER_TYPE = exports.CREDIT_STATE = void 0;
 var STORAGE_KEY = {
-  LOCALE: 'magicLocale',
+  LOCALE: 'ZSMART_LOCALE',
   MAGIC_RENDER_HTML: 'MAGIC_RENDER_HTML',
   MAGIC_RENDER_PAGEDATA: 'MAGIC_RENDER_PAGEDATA',
   FONIXTREE_AI_IMG_HIS: 'fonixtree_ai_img_his'

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

@@ -113,7 +113,7 @@ function (_super) {
     };
 
     _this.isShowPublish = function () {
-      return (0, _coreUtil.isAutoAudit)() && _this.props.pageState === _constants.pageStateMap.DRAFT || !(0, _coreUtil.isAutoAudit)() && _this.props.pageState === _constants.pageStateMap.ACTIVE;
+      return window.magicDesign.templateType === _constants.tempTypeMap.TEMPLATE || (0, _coreUtil.isAutoAudit)() && _this.props.pageState === _constants.pageStateMap.DRAFT || !(0, _coreUtil.isAutoAudit)() && _this.props.pageState === _constants.pageStateMap.ACTIVE;
     }; // 审核失败和未审核状态展示 To Review 按钮
 
 
@@ -130,11 +130,10 @@ function (_super) {
     _this.isShowSetTemplate = function () {
       return _constants.pageStateMap.DRAFT === _this.props.pageState;
     }; // 拒绝审核 和 草稿状态展示保存按钮
-    // isShowSave = () => [pageStateMap.REJECTED, pageStateMap.DRAFT].includes(this.props.pageState)
 
 
     _this.isShowSave = function () {
-      return true;
+      return window.magicDesign.templateType === _constants.tempTypeMap.TEMPLATE || [_constants.pageStateMap.REJECTED, _constants.pageStateMap.DRAFT].includes(_this.props.pageState) || localStorage.getItem('DEV_MODE') === 'Y';
     };
 
     return _this;

package/lib/core/Renderer/index.js

@@ -157,7 +157,8 @@ var Renderer = function Renderer(props) {
     }
 
     return {
-      overflow: 'auto'
+      overflowY: 'auto',
+      overflowX: 'hidden'
     };
   };
 

package/lib/locale/en/en.json

@@ -1,4 +1,6 @@
 {
+  "SEARCH_BAR_PLACEHOLDER": "Search Bar Placeholder",
+  "INTER": "Inter",
   "STORE_SERVICES": "Store services",
   "SHIP_ON_TIME": "Ship on time",
   "COMMODITY_QUALITY": "Commodity Quality",

package/lib/locale/es/es.json

@@ -1,4 +1,6 @@
 {
+  "SEARCH_BAR_PLACEHOLDER": "Search Bar Placeholder",
+  "INTER": "Inter",
   "STORE_SERVICES": "Store services",
   "SHIP_ON_TIME": "Ship on time",
   "COMMODITY_QUALITY": "Commodity Quality",

package/lib/locale/id/id.json

@@ -1,4 +1,6 @@
 {
+  "SEARCH_BAR_PLACEHOLDER": "Search Bar Placeholder",
+  "INTER": "Inter",
   "STORE_SERVICES": "Store services",
   "SHIP_ON_TIME": "Ship on time",
   "COMMODITY_QUALITY": "Commodity Quality",

package/lib/locale/index.js

@@ -27,7 +27,8 @@ function i18n(key, args) {
     args = {};
   }
 
-  var tempString = localeMap[_mobx.store.locale || 'en'][key];
+  var locale = localeMap[_mobx.store.locale || 'en'] || _en["default"];
+  var tempString = locale[key];
 
   if (tempString) {
     var str_1 = tempString;

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

@@ -195,7 +195,9 @@ function (_super) {
         value: "Montserrat"
       }, (0, _locale.i18n)('MONTSERRAT')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
         value: "Open Sans"
-      }, (0, _locale.i18n)('OPEN_SANS')))), /*#__PURE__*/_react["default"].createElement(_common.Field, {
+      }, (0, _locale.i18n)('OPEN_SANS')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
+        value: "Inter"
+      }, (0, _locale.i18n)('INTER')))), /*#__PURE__*/_react["default"].createElement(_common.Field, {
         title: (0, _locale.i18n)('FONT_WEIGHT')
       }, /*#__PURE__*/_react["default"].createElement(_antd.Select, {
         onChange: function onChange(v) {

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

@@ -232,7 +232,9 @@ function (_super) {
         value: "Montserrat"
       }, (0, _locale.i18n)('MONTSERRAT')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
         value: "Open Sans"
-      }, (0, _locale.i18n)('OPEN_SANS')))), /*#__PURE__*/_react["default"].createElement(_common.Field, {
+      }, (0, _locale.i18n)('OPEN_SANS')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
+        value: "Inter"
+      }, (0, _locale.i18n)('INTER')))), /*#__PURE__*/_react["default"].createElement(_common.Field, {
         title: (0, _locale.i18n)('FONT_WEIGHT')
       }, /*#__PURE__*/_react["default"].createElement(_antd.Select, {
         onChange: function onChange(v) {
@@ -360,7 +362,10 @@ function (_super) {
 
     return /*#__PURE__*/_react["default"].createElement("div", {
       ref: this.containerRef,
-      className: "m-text-config"
+      className: "m-text-config",
+      style: {
+        paddingTop: 0
+      }
     }, /*#__PURE__*/_react["default"].createElement(_common.Collapse // divider="dashed"
     // headerSize="small"
     , {

package/lib/meta-comp/config-panels/TextConfig/index.less

@@ -2,7 +2,9 @@
   display: flex;
   flex-direction: column;
   padding: 0 12px;
+  padding-top: 12px;
   background-color: #F5F6F7;
+  border-radius: 6px;
 
   .edit-text-btn {
     margin: 8px auto;

package/lib/utils/currencyUtil.js

@@ -102,9 +102,17 @@ var formatCurrency = function formatCurrency(num) {
 exports.formatCurrency = formatCurrency;
 
 var formatCurrencyWithSymbol = function formatCurrencyWithSymbol(num) {
+  var _a;
+
   var ret = formatCurrency(num);
+
+  if ((_a = window.systemParams) === null || _a === void 0 ? void 0 : _a.isUnitBehind) {
+    return ret + " " + getPricePrefix();
+  }
+
   return getPricePrefix() + " " + ret;
-};
+}; // Nuri项目使用
+
 
 exports.formatCurrencyWithSymbol = formatCurrencyWithSymbol;
 

package/package.json

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