@fonixtree/magic-design 0.0.88 → 0.0.90

package/es/common/LinkModal/CustomTable/index.js

@@ -209,8 +209,8 @@ function CustomTable(props) {
     dataIndex: 'pageName'
   }];
   var rowSelection = {
-    onChange: function onChange(selectedRowKeys) {
-      _onChange("customized-" + selectedRowKeys[0]);
+    onChange: function onChange(selectedRowKeys, selectedRows) {
+      _onChange("customized-" + (selectedRows[0].pageCode || selectedRows[0].bdPageId || ''));
     },
     type: 'radio'
   };

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

@@ -105,16 +105,37 @@ function (_super) {
         layout = _a.layout,
         imgHeight = _a.imgHeight,
         imgWidth = _a.imgWidth,
-        rest = __rest(_a, ["data", "panelProps", "onItemClick", "showProName", "showProgress", "fixHeight", "layout", "imgHeight", "imgWidth"]);
+        unknownPrice = _a.unknownPrice,
+        rest = __rest(_a, ["data", "panelProps", "onItemClick", "showProName", "showProgress", "fixHeight", "layout", "imgHeight", "imgWidth", "unknownPrice"]);
 
     var promotions = (0, _businessUtil.getPromotionList)(data);
-    var price = (0, _currencyUtil.formatCurrencyWithSymbol)(data.salesPrice);
+    var price = (0, _currencyUtil.formatCurrency)(data.salesPrice);
     /** 当是拼团时 显示价格 */
 
     if (data.sppType && promotions.length) {
-      price = data.specialPrice !== null ? (0, _currencyUtil.formatCurrencyWithSymbol)(data.specialPrice) : (0, _currencyUtil.formatCurrencyWithSymbol)(data.salesPrice);
+      price = data.specialPrice !== null ? (0, _currencyUtil.formatCurrency)(data.specialPrice) : (0, _currencyUtil.formatCurrency)(data.salesPrice);
     }
 
+    var integerPart = price;
+    var decimalPart = null;
+
+    if (unknownPrice) {
+      if (price.length > 5) {
+        integerPart = price.slice(0, -5).replace(/\d/g, '? ') + price.slice(-5);
+      } else {
+        integerPart = price.replace(/\d/, '? ');
+      }
+    } else if (Array.isArray(price)) {
+      integerPart = price[0];
+      decimalPart = price[1];
+    }
+
+    var pricePrefix = (0, _commonUtil.ensure)(function () {
+      return window.ecommerce.prefix;
+    }, 'Rp');
+
+    var _price = pricePrefix + " " + integerPart + " " + (decimalPart ? '.' + decimalPart : '');
+
     var oldPrice = data.marketPrice !== null ? (0, _currencyUtil.formatCurrencyWithSymbol)(data.marketPrice) : null;
     var discount = Number(data.discountPercent) || 0;
     var salePercent = Number(data.salePercent) / 100 || 0;
@@ -164,7 +185,7 @@ function (_super) {
     }), panelProps.activityPrice.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
       className: "price",
       data: __assign(__assign({}, panelProps.activityPrice), {
-        text: price
+        text: _price
       }),
       readonly: true
     }), oldPrice && panelProps.salesPrice.open && /*#__PURE__*/_react["default"].createElement("div", {

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

@@ -13,6 +13,8 @@ var _defImg = _interopRequireDefault(require("./imgs/defImg1.png"));
 
 var _defImg2 = _interopRequireDefault(require("./imgs/defImg2.png"));
 
+var _defImg3 = _interopRequireDefault(require("./imgs/defImg3.png"));
+
 var _ProductItem = _interopRequireDefault(require("../../../../common/components/ProductItem"));
 
 var _coreUtil = require("../../../../../utils/coreUtil");
@@ -221,11 +223,10 @@ var defaultData = [{
     url: _defImg["default"]
   },
   offerName: 'DITO STARTER PACK + 3GB Data',
-  salesPrice: 49,
+  salesPrice: 1100,
   marketPrice: 100,
   discountPercent: 51,
-  salePercent: 5000,
-  sppType: '2'
+  salePercent: 5000
 }, {
   imgUrlContent: {
     url: _defImg2["default"]
@@ -236,6 +237,16 @@ var defaultData = [{
   discountPercent: 50,
   salePercent: 5000,
   sppType: '2'
+}, {
+  imgUrlContent: {
+    url: _defImg3["default"]
+  },
+  offerName: 'DITO Level-Up Pack 99 7GB',
+  salesPrice: 99,
+  marketPrice: 138,
+  discountPercent: 28,
+  salePercent: 5000,
+  sppType: '2'
 }];
 
 var FlashDealMobile =
@@ -255,7 +266,7 @@ function (_super) {
       effDate: '',
       expDate: '',
       now: '',
-      isWill: false
+      isWill: true
     };
 
     _this.getFlashData = function (pageSize, campaign) {
@@ -427,7 +438,8 @@ function (_super) {
 
           return (0, _coreUtil.clickUrl)("/product/detail/" + item.offerId + "?productId=" + ((_a = item.sppProductId) !== null && _a !== void 0 ? _a : ''));
         },
-        panelProps: panelProps.content
+        panelProps: panelProps.content,
+        unknownPrice: isWill
       });
     }))));
   };

package/lib/common/LinkModal/CustomTable/index.js

@@ -209,8 +209,8 @@ function CustomTable(props) {
     dataIndex: 'pageName'
   }];
   var rowSelection = {
-    onChange: function onChange(selectedRowKeys) {
-      _onChange("customized-" + selectedRowKeys[0]);
+    onChange: function onChange(selectedRowKeys, selectedRows) {
+      _onChange("customized-" + (selectedRows[0].pageCode || selectedRows[0].bdPageId || ''));
     },
     type: 'radio'
   };

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

@@ -105,16 +105,37 @@ function (_super) {
         layout = _a.layout,
         imgHeight = _a.imgHeight,
         imgWidth = _a.imgWidth,
-        rest = __rest(_a, ["data", "panelProps", "onItemClick", "showProName", "showProgress", "fixHeight", "layout", "imgHeight", "imgWidth"]);
+        unknownPrice = _a.unknownPrice,
+        rest = __rest(_a, ["data", "panelProps", "onItemClick", "showProName", "showProgress", "fixHeight", "layout", "imgHeight", "imgWidth", "unknownPrice"]);
 
     var promotions = (0, _businessUtil.getPromotionList)(data);
-    var price = (0, _currencyUtil.formatCurrencyWithSymbol)(data.salesPrice);
+    var price = (0, _currencyUtil.formatCurrency)(data.salesPrice);
     /** 当是拼团时 显示价格 */
 
     if (data.sppType && promotions.length) {
-      price = data.specialPrice !== null ? (0, _currencyUtil.formatCurrencyWithSymbol)(data.specialPrice) : (0, _currencyUtil.formatCurrencyWithSymbol)(data.salesPrice);
+      price = data.specialPrice !== null ? (0, _currencyUtil.formatCurrency)(data.specialPrice) : (0, _currencyUtil.formatCurrency)(data.salesPrice);
     }
 
+    var integerPart = price;
+    var decimalPart = null;
+
+    if (unknownPrice) {
+      if (price.length > 5) {
+        integerPart = price.slice(0, -5).replace(/\d/g, '? ') + price.slice(-5);
+      } else {
+        integerPart = price.replace(/\d/, '? ');
+      }
+    } else if (Array.isArray(price)) {
+      integerPart = price[0];
+      decimalPart = price[1];
+    }
+
+    var pricePrefix = (0, _commonUtil.ensure)(function () {
+      return window.ecommerce.prefix;
+    }, 'Rp');
+
+    var _price = pricePrefix + " " + integerPart + " " + (decimalPart ? '.' + decimalPart : '');
+
     var oldPrice = data.marketPrice !== null ? (0, _currencyUtil.formatCurrencyWithSymbol)(data.marketPrice) : null;
     var discount = Number(data.discountPercent) || 0;
     var salePercent = Number(data.salePercent) / 100 || 0;
@@ -164,7 +185,7 @@ function (_super) {
     }), panelProps.activityPrice.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
       className: "price",
       data: __assign(__assign({}, panelProps.activityPrice), {
-        text: price
+        text: _price
       }),
       readonly: true
     }), oldPrice && panelProps.salesPrice.open && /*#__PURE__*/_react["default"].createElement("div", {

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

@@ -13,6 +13,8 @@ var _defImg = _interopRequireDefault(require("./imgs/defImg1.png"));
 
 var _defImg2 = _interopRequireDefault(require("./imgs/defImg2.png"));
 
+var _defImg3 = _interopRequireDefault(require("./imgs/defImg3.png"));
+
 var _ProductItem = _interopRequireDefault(require("../../../../common/components/ProductItem"));
 
 var _coreUtil = require("../../../../../utils/coreUtil");
@@ -221,11 +223,10 @@ var defaultData = [{
     url: _defImg["default"]
   },
   offerName: 'DITO STARTER PACK + 3GB Data',
-  salesPrice: 49,
+  salesPrice: 1100,
   marketPrice: 100,
   discountPercent: 51,
-  salePercent: 5000,
-  sppType: '2'
+  salePercent: 5000
 }, {
   imgUrlContent: {
     url: _defImg2["default"]
@@ -236,6 +237,16 @@ var defaultData = [{
   discountPercent: 50,
   salePercent: 5000,
   sppType: '2'
+}, {
+  imgUrlContent: {
+    url: _defImg3["default"]
+  },
+  offerName: 'DITO Level-Up Pack 99 7GB',
+  salesPrice: 99,
+  marketPrice: 138,
+  discountPercent: 28,
+  salePercent: 5000,
+  sppType: '2'
 }];
 
 var FlashDealMobile =
@@ -255,7 +266,7 @@ function (_super) {
       effDate: '',
       expDate: '',
       now: '',
-      isWill: false
+      isWill: true
     };
 
     _this.getFlashData = function (pageSize, campaign) {
@@ -427,7 +438,8 @@ function (_super) {
 
           return (0, _coreUtil.clickUrl)("/product/detail/" + item.offerId + "?productId=" + ((_a = item.sppProductId) !== null && _a !== void 0 ? _a : ''));
         },
-        panelProps: panelProps.content
+        panelProps: panelProps.content,
+        unknownPrice: isWill
       });
     }))));
   };

package/package.json

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