@fonixtree/magic-design 2.0.137 → 2.0.139

package/es/common/Collapse/index.js

@@ -158,6 +158,10 @@ function (_super) {
     _this.onSwitchChange = function (checked, panelInfo) {
       var _a;
 
+      if (!panelInfo.metaOption) {
+        panelInfo.metaOption = {};
+      }
+
       panelInfo.metaOption.open = checked;
 
       if (panelInfo.value) {

package/es/composite-comp/common/components/MonpayProductItem/index.less

@@ -158,6 +158,7 @@
       margin-top: 8px;
 
       .item {
+        display: block;
         width: 53px;
         height: 20px;
         color: #F47A46;

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

@@ -7,6 +7,8 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _uuid = require("uuid");
+
 var _mobile = _interopRequireDefault(require("./mobile"));
 
 var _pc = _interopRequireDefault(require("./pc"));
@@ -72,6 +74,14 @@ function (_super) {
 
   FlashDeal.prototype.render = function () {
     var nodeData = this.props.nodeData;
+
+    if (!nodeData.title.countDown) {
+      nodeData.title.countDown = {
+        open: true,
+        id: (0, _uuid.v4)()
+      };
+    }
+
     return /*#__PURE__*/_react["default"].createElement("div", null, (0, _coreUtil.isPc)() ? /*#__PURE__*/_react["default"].createElement(_pc["default"], {
       panelProps: nodeData
     }) : /*#__PURE__*/_react["default"].createElement(_mobile["default"], {

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

@@ -380,7 +380,6 @@ function (_super) {
     var _a, _b;
 
     var panelProps = this.props.panelProps;
-    console.log('flash deal panelProps: ', panelProps);
     var _c = this.state,
         list = _c.list,
         effDate = _c.effDate,

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

@@ -87,6 +87,8 @@
   display: flex;
   flex-direction: column;
   gap: 0.16rem;
+  max-height: 4.36rem;
+  overflow-y: auto;
 }
 .m-flash-deal-mobile .flash-deal-list-horizontal .m-product-item-wrap {
   width: 100%;

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

@@ -241,6 +241,7 @@ var defaultData = [{
   specialPrice: 8000,
   marketPrice: 20000,
   salePercent: 500,
+  discountPercent: 90,
   coupons: [{
     couponId: '1',
     discountMethod: 'DISC',
@@ -856,6 +857,7 @@ function (_super) {
           (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || item.productId || ''));
         },
         panelProps: panelProps.content,
+        showDiscountTag: true,
         showProgress: false
       });
     })), _seeAll.open && _products.length > 0 && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {

package/es/constants/index.js

@@ -159,7 +159,7 @@ var compInfoMap = {
     icon: 'icon-kanjia'
   },
   MONPAY_FLASH_DEAL: {
-    name: 'Monpay Flash Deal',
+    name: 'Flash Deal',
     icon: 'icon-flash-deal'
   },
   GROUP_BUY: {

package/es/locale/en/en.json

@@ -136,7 +136,6 @@
   "CHAT": "Chat",
   "FOLLOW": "Follow",
   "FOLLOWING": "Following",
-  "POSITIVE": "Positive",
   "SEARCH_IN_SHOP": "Search in shop",
   "IMAGE_AND_TEXT_NAME": "Image and Text Name",
   "BANNER_GROUP_NAME": "Banner Group Name",
@@ -172,13 +171,11 @@
   "HOME": "Home",
   "ADD_CLICKABLE_AREA": "Add Clickable Area",
   "ADD_AREA": "Add Area",
-  "VOUCHER_SUCCESS": "Coupon received successfully!",
   "NAVIGATION_NAME": "Navigation Name",
   "ADD_NAVIGATION": "Add Navigation",
   "SAVE": "Save",
   "GROUP_NAME": "Group Name",
   "SEE_ALL": "See All",
-  "SECOND_CATEGORY": "Secondary Category",
   "ADD_GROUP": "Add Group",
   "CONTENT_WIDTH": "Content Width",
   "MAGNIFICATION": "Magnification",
@@ -200,12 +197,10 @@
   "LINE_STYLE": "Line Style",
   "LINE_WIDTH": "Line Width",
   "HEIGHT_AND_COLOR": "Height And Color",
-  "HOW_LONG_BETWEEN_SLIDES(SECS)": "How long between slides(secs)",
   "NAVIGATION_ARROW": "Navigation arrow",
   "SELECTED_ARROW": "Selected arrow",
   "SLIDE_BUTTON": "Slide button",
   "SELECTED_BUTTON": "Selected button",
-  "BANNER_HEIGHT": "Banner Height",
   "IMAGE": "Image",
   "PRODUCT_NAME": "Product Name",
   "SKU_CODE": "SKU Code",
@@ -280,7 +275,6 @@
   "GROUP_BY": "Group By",
   "FLASH_SALE": "Flash Sale",
   "THE_PRODUCT_QUANTITY_WILL_BE_AUTOMATICALLY_UPDATED_WITH_THE_ITEMS_THAT_MEET_THE_CATEGORY_CONDITIONS": "The product quantity will be automatically updated with the items that meet the category conditions",
-  "LINK_TYPE": "Link Type",
   "LOOKS_LIKE_YOU_DO_NOT_HAVE_ANY_IMAGES_IN_YOUR_GALLERY__CHOOSE_IMAGES_TO_FEATURE_ON_THIS_PAGE_": "Looks like you do not have any images in your gallery. Choose images to feature on this page.",
   "EDIT": "Edit",
   "MINIMUM": "Minimum",
@@ -289,6 +283,5 @@
   "PLEASE_SELECT": "Please select",
   "PLEASE_SEARCH": "Please Search",
   "KEYWRODS": "Keywrods",
-  "TEXT": "Text",
-  "OKAY": "OKAY"
+  "TEXT": "Text"
 }

package/es/locale/es/es.json

@@ -136,7 +136,6 @@
   "CHAT": "Chat",
   "FOLLOW": "Follow",
   "FOLLOWING": "Following",
-  "POSITIVE": "Positive",
   "SEARCH_IN_SHOP": "Search in shop",
   "IMAGE_AND_TEXT_NAME": "Image and Text Name",
   "BANNER_GROUP_NAME": "Banner Group Name",
@@ -172,13 +171,11 @@
   "HOME": "Home",
   "ADD_CLICKABLE_AREA": "Add Clickable Area",
   "ADD_AREA": "Add Area",
-  "VOUCHER_SUCCESS": "Coupon received successfully!",
   "NAVIGATION_NAME": "Navigation Name",
   "ADD_NAVIGATION": "Add Navigation",
   "SAVE": "Guardar",
   "GROUP_NAME": "Nome do grupo",
   "SEE_ALL": "Ver todos",
-  "SECOND_CATEGORY": "Categoría secundaria",
   "ADD_GROUP": "Agregar Grupo",
   "CONTENT_WIDTH": "Ancho del contenido",
   "MAGNIFICATION": "Aumento",
@@ -200,12 +197,10 @@
   "LINE_STYLE": "Estilo de línea",
   "LINE_WIDTH": "Ancho de línea",
   "HEIGHT_AND_COLOR": "Altura y Color",
-  "HOW_LONG_BETWEEN_SLIDES(SECS)": "Cuánto tiempo entre diapositivas (secs)",
   "NAVIGATION_ARROW": "Flecha de navegación",
   "SELECTED_ARROW": "Flecha seleccionada",
   "SLIDE_BUTTON": "Botón deslizante",
   "SELECTED_BUTTON": "Botón seleccionado",
-  "BANNER_HEIGHT": "Altura del banner",
   "IMAGE": "Imagen",
   "PRODUCT_NAME": "Nombre del producto",
   "SKU_CODE": "Código SKU",
@@ -280,7 +275,6 @@
   "GROUP_BY": "Agrupar por",
   "FLASH_SALE": "Oferta relámpago",
   "THE_PRODUCT_QUANTITY_WILL_BE_AUTOMATICALLY_UPDATED_WITH_THE_ITEMS_THAT_MEET_THE_CATEGORY_CONDITIONS": "La cantidad del producto se actualizará automáticamente con los artículos que cumplan con las condiciones de la categoría",
-  "LINK_TYPE": "Tipo de enlace",
   "LOOKS_LIKE_YOU_DO_NOT_HAVE_ANY_IMAGES_IN_YOUR_GALLERY__CHOOSE_IMAGES_TO_FEATURE_ON_THIS_PAGE_": "Parece que no tiene ninguna imagen en su galería. Elija imágenes para mostrar en esta página.",
   "EDIT": "Editar",
   "MINIMUM": "Mínimo",
@@ -289,6 +283,5 @@
   "PLEASE_SELECT": "Por favor seleccione",
   "PLEASE_SEARCH": "Por favor busque",
   "KEYWRODS": "Palabras clave",
-  "TEXT": "Texto",
-  "OKAY": "OKAY"
+  "TEXT": "Texto"
 }

package/es/locale/mn/mn.json

@@ -136,7 +136,6 @@
   "CHAT": "Chat",
   "FOLLOW": "Follow",
   "FOLLOWING": "Following",
-  "POSITIVE": "Positive",
   "SEARCH_IN_SHOP": "Search in shop",
   "IMAGE_AND_TEXT_NAME": "Image and Text Name",
   "BANNER_GROUP_NAME": "Banner Group Name",
@@ -172,13 +171,11 @@
   "HOME": "Home",
   "ADD_CLICKABLE_AREA": "Add Clickable Area",
   "ADD_AREA": "Add Area",
-  "VOUCHER_SUCCESS": "Coupon received successfully!",
   "NAVIGATION_NAME": "Navigation Name",
   "ADD_NAVIGATION": "Add Navigation",
   "SAVE": "Save",
   "GROUP_NAME": "Group Name",
   "SEE_ALL": "See All",
-  "SECOND_CATEGORY": "Secondary Category",
   "ADD_GROUP": "Add Group",
   "CONTENT_WIDTH": "Content Width",
   "MAGNIFICATION": "Magnification",
@@ -200,12 +197,10 @@
   "LINE_STYLE": "Line Style",
   "LINE_WIDTH": "Line Width",
   "HEIGHT_AND_COLOR": "Height And Color",
-  "HOW_LONG_BETWEEN_SLIDES(SECS)": "How long between slides(secs)",
   "NAVIGATION_ARROW": "Navigation arrow",
   "SELECTED_ARROW": "Selected arrow",
   "SLIDE_BUTTON": "Slide button",
   "SELECTED_BUTTON": "Selected button",
-  "BANNER_HEIGHT": "Banner Height",
   "IMAGE": "Image",
   "PRODUCT_NAME": "Product Name",
   "SKU_CODE": "SKU Code",
@@ -280,7 +275,6 @@
   "GROUP_BY": "Group By",
   "FLASH_SALE": "Flash Sale",
   "THE_PRODUCT_QUANTITY_WILL_BE_AUTOMATICALLY_UPDATED_WITH_THE_ITEMS_THAT_MEET_THE_CATEGORY_CONDITIONS": "The product quantity will be automatically updated with the items that meet the category conditions",
-  "LINK_TYPE": "Link Type",
   "LOOKS_LIKE_YOU_DO_NOT_HAVE_ANY_IMAGES_IN_YOUR_GALLERY__CHOOSE_IMAGES_TO_FEATURE_ON_THIS_PAGE_": "Looks like you do not have any images in your gallery. Choose images to feature on this page.",
   "EDIT": "Edit",
   "MINIMUM": "Minimum",
@@ -289,6 +283,5 @@
   "PLEASE_SELECT": "Please select",
   "PLEASE_SEARCH": "Please Search",
   "KEYWRODS": "Keywrods",
-  "TEXT": "Text",
-  "OKAY": "OKAY"
+  "TEXT": "Text"
 }

package/lib/common/Collapse/index.js

@@ -158,6 +158,10 @@ function (_super) {
     _this.onSwitchChange = function (checked, panelInfo) {
       var _a;
 
+      if (!panelInfo.metaOption) {
+        panelInfo.metaOption = {};
+      }
+
       panelInfo.metaOption.open = checked;
 
       if (panelInfo.value) {

package/lib/composite-comp/common/components/MonpayProductItem/index.less

@@ -158,6 +158,7 @@
       margin-top: 8px;
 
       .item {
+        display: block;
         width: 53px;
         height: 20px;
         color: #F47A46;

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

@@ -7,6 +7,8 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _uuid = require("uuid");
+
 var _mobile = _interopRequireDefault(require("./mobile"));
 
 var _pc = _interopRequireDefault(require("./pc"));
@@ -72,6 +74,14 @@ function (_super) {
 
   FlashDeal.prototype.render = function () {
     var nodeData = this.props.nodeData;
+
+    if (!nodeData.title.countDown) {
+      nodeData.title.countDown = {
+        open: true,
+        id: (0, _uuid.v4)()
+      };
+    }
+
     return /*#__PURE__*/_react["default"].createElement("div", null, (0, _coreUtil.isPc)() ? /*#__PURE__*/_react["default"].createElement(_pc["default"], {
       panelProps: nodeData
     }) : /*#__PURE__*/_react["default"].createElement(_mobile["default"], {

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

@@ -380,7 +380,6 @@ function (_super) {
     var _a, _b;
 
     var panelProps = this.props.panelProps;
-    console.log('flash deal panelProps: ', panelProps);
     var _c = this.state,
         list = _c.list,
         effDate = _c.effDate,

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

@@ -87,6 +87,8 @@
   display: flex;
   flex-direction: column;
   gap: 0.16rem;
+  max-height: 4.36rem;
+  overflow-y: auto;
 }
 .m-flash-deal-mobile .flash-deal-list-horizontal .m-product-item-wrap {
   width: 100%;

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

@@ -241,6 +241,7 @@ var defaultData = [{
   specialPrice: 8000,
   marketPrice: 20000,
   salePercent: 500,
+  discountPercent: 90,
   coupons: [{
     couponId: '1',
     discountMethod: 'DISC',
@@ -856,6 +857,7 @@ function (_super) {
           (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || item.productId || ''));
         },
         panelProps: panelProps.content,
+        showDiscountTag: true,
         showProgress: false
       });
     })), _seeAll.open && _products.length > 0 && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {

package/lib/constants/index.js

@@ -159,7 +159,7 @@ var compInfoMap = {
     icon: 'icon-kanjia'
   },
   MONPAY_FLASH_DEAL: {
-    name: 'Monpay Flash Deal',
+    name: 'Flash Deal',
     icon: 'icon-flash-deal'
   },
   GROUP_BUY: {

package/lib/locale/en/en.json

@@ -136,7 +136,6 @@
   "CHAT": "Chat",
   "FOLLOW": "Follow",
   "FOLLOWING": "Following",
-  "POSITIVE": "Positive",
   "SEARCH_IN_SHOP": "Search in shop",
   "IMAGE_AND_TEXT_NAME": "Image and Text Name",
   "BANNER_GROUP_NAME": "Banner Group Name",
@@ -172,13 +171,11 @@
   "HOME": "Home",
   "ADD_CLICKABLE_AREA": "Add Clickable Area",
   "ADD_AREA": "Add Area",
-  "VOUCHER_SUCCESS": "Coupon received successfully!",
   "NAVIGATION_NAME": "Navigation Name",
   "ADD_NAVIGATION": "Add Navigation",
   "SAVE": "Save",
   "GROUP_NAME": "Group Name",
   "SEE_ALL": "See All",
-  "SECOND_CATEGORY": "Secondary Category",
   "ADD_GROUP": "Add Group",
   "CONTENT_WIDTH": "Content Width",
   "MAGNIFICATION": "Magnification",
@@ -200,12 +197,10 @@
   "LINE_STYLE": "Line Style",
   "LINE_WIDTH": "Line Width",
   "HEIGHT_AND_COLOR": "Height And Color",
-  "HOW_LONG_BETWEEN_SLIDES(SECS)": "How long between slides(secs)",
   "NAVIGATION_ARROW": "Navigation arrow",
   "SELECTED_ARROW": "Selected arrow",
   "SLIDE_BUTTON": "Slide button",
   "SELECTED_BUTTON": "Selected button",
-  "BANNER_HEIGHT": "Banner Height",
   "IMAGE": "Image",
   "PRODUCT_NAME": "Product Name",
   "SKU_CODE": "SKU Code",
@@ -280,7 +275,6 @@
   "GROUP_BY": "Group By",
   "FLASH_SALE": "Flash Sale",
   "THE_PRODUCT_QUANTITY_WILL_BE_AUTOMATICALLY_UPDATED_WITH_THE_ITEMS_THAT_MEET_THE_CATEGORY_CONDITIONS": "The product quantity will be automatically updated with the items that meet the category conditions",
-  "LINK_TYPE": "Link Type",
   "LOOKS_LIKE_YOU_DO_NOT_HAVE_ANY_IMAGES_IN_YOUR_GALLERY__CHOOSE_IMAGES_TO_FEATURE_ON_THIS_PAGE_": "Looks like you do not have any images in your gallery. Choose images to feature on this page.",
   "EDIT": "Edit",
   "MINIMUM": "Minimum",
@@ -289,6 +283,5 @@
   "PLEASE_SELECT": "Please select",
   "PLEASE_SEARCH": "Please Search",
   "KEYWRODS": "Keywrods",
-  "TEXT": "Text",
-  "OKAY": "OKAY"
+  "TEXT": "Text"
 }

package/lib/locale/es/es.json

@@ -136,7 +136,6 @@
   "CHAT": "Chat",
   "FOLLOW": "Follow",
   "FOLLOWING": "Following",
-  "POSITIVE": "Positive",
   "SEARCH_IN_SHOP": "Search in shop",
   "IMAGE_AND_TEXT_NAME": "Image and Text Name",
   "BANNER_GROUP_NAME": "Banner Group Name",
@@ -172,13 +171,11 @@
   "HOME": "Home",
   "ADD_CLICKABLE_AREA": "Add Clickable Area",
   "ADD_AREA": "Add Area",
-  "VOUCHER_SUCCESS": "Coupon received successfully!",
   "NAVIGATION_NAME": "Navigation Name",
   "ADD_NAVIGATION": "Add Navigation",
   "SAVE": "Guardar",
   "GROUP_NAME": "Nome do grupo",
   "SEE_ALL": "Ver todos",
-  "SECOND_CATEGORY": "Categoría secundaria",
   "ADD_GROUP": "Agregar Grupo",
   "CONTENT_WIDTH": "Ancho del contenido",
   "MAGNIFICATION": "Aumento",
@@ -200,12 +197,10 @@
   "LINE_STYLE": "Estilo de línea",
   "LINE_WIDTH": "Ancho de línea",
   "HEIGHT_AND_COLOR": "Altura y Color",
-  "HOW_LONG_BETWEEN_SLIDES(SECS)": "Cuánto tiempo entre diapositivas (secs)",
   "NAVIGATION_ARROW": "Flecha de navegación",
   "SELECTED_ARROW": "Flecha seleccionada",
   "SLIDE_BUTTON": "Botón deslizante",
   "SELECTED_BUTTON": "Botón seleccionado",
-  "BANNER_HEIGHT": "Altura del banner",
   "IMAGE": "Imagen",
   "PRODUCT_NAME": "Nombre del producto",
   "SKU_CODE": "Código SKU",
@@ -280,7 +275,6 @@
   "GROUP_BY": "Agrupar por",
   "FLASH_SALE": "Oferta relámpago",
   "THE_PRODUCT_QUANTITY_WILL_BE_AUTOMATICALLY_UPDATED_WITH_THE_ITEMS_THAT_MEET_THE_CATEGORY_CONDITIONS": "La cantidad del producto se actualizará automáticamente con los artículos que cumplan con las condiciones de la categoría",
-  "LINK_TYPE": "Tipo de enlace",
   "LOOKS_LIKE_YOU_DO_NOT_HAVE_ANY_IMAGES_IN_YOUR_GALLERY__CHOOSE_IMAGES_TO_FEATURE_ON_THIS_PAGE_": "Parece que no tiene ninguna imagen en su galería. Elija imágenes para mostrar en esta página.",
   "EDIT": "Editar",
   "MINIMUM": "Mínimo",
@@ -289,6 +283,5 @@
   "PLEASE_SELECT": "Por favor seleccione",
   "PLEASE_SEARCH": "Por favor busque",
   "KEYWRODS": "Palabras clave",
-  "TEXT": "Texto",
-  "OKAY": "OKAY"
+  "TEXT": "Texto"
 }

package/lib/locale/mn/mn.json

@@ -136,7 +136,6 @@
   "CHAT": "Chat",
   "FOLLOW": "Follow",
   "FOLLOWING": "Following",
-  "POSITIVE": "Positive",
   "SEARCH_IN_SHOP": "Search in shop",
   "IMAGE_AND_TEXT_NAME": "Image and Text Name",
   "BANNER_GROUP_NAME": "Banner Group Name",
@@ -172,13 +171,11 @@
   "HOME": "Home",
   "ADD_CLICKABLE_AREA": "Add Clickable Area",
   "ADD_AREA": "Add Area",
-  "VOUCHER_SUCCESS": "Coupon received successfully!",
   "NAVIGATION_NAME": "Navigation Name",
   "ADD_NAVIGATION": "Add Navigation",
   "SAVE": "Save",
   "GROUP_NAME": "Group Name",
   "SEE_ALL": "See All",
-  "SECOND_CATEGORY": "Secondary Category",
   "ADD_GROUP": "Add Group",
   "CONTENT_WIDTH": "Content Width",
   "MAGNIFICATION": "Magnification",
@@ -200,12 +197,10 @@
   "LINE_STYLE": "Line Style",
   "LINE_WIDTH": "Line Width",
   "HEIGHT_AND_COLOR": "Height And Color",
-  "HOW_LONG_BETWEEN_SLIDES(SECS)": "How long between slides(secs)",
   "NAVIGATION_ARROW": "Navigation arrow",
   "SELECTED_ARROW": "Selected arrow",
   "SLIDE_BUTTON": "Slide button",
   "SELECTED_BUTTON": "Selected button",
-  "BANNER_HEIGHT": "Banner Height",
   "IMAGE": "Image",
   "PRODUCT_NAME": "Product Name",
   "SKU_CODE": "SKU Code",
@@ -280,7 +275,6 @@
   "GROUP_BY": "Group By",
   "FLASH_SALE": "Flash Sale",
   "THE_PRODUCT_QUANTITY_WILL_BE_AUTOMATICALLY_UPDATED_WITH_THE_ITEMS_THAT_MEET_THE_CATEGORY_CONDITIONS": "The product quantity will be automatically updated with the items that meet the category conditions",
-  "LINK_TYPE": "Link Type",
   "LOOKS_LIKE_YOU_DO_NOT_HAVE_ANY_IMAGES_IN_YOUR_GALLERY__CHOOSE_IMAGES_TO_FEATURE_ON_THIS_PAGE_": "Looks like you do not have any images in your gallery. Choose images to feature on this page.",
   "EDIT": "Edit",
   "MINIMUM": "Minimum",
@@ -289,6 +283,5 @@
   "PLEASE_SELECT": "Please select",
   "PLEASE_SEARCH": "Please Search",
   "KEYWRODS": "Keywrods",
-  "TEXT": "Text",
-  "OKAY": "OKAY"
+  "TEXT": "Text"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fonixtree/magic-design",
   "author": "Cylon Team",
-  "version": "2.0.137",
+  "version": "2.0.139",
   "description": "Magic Design",
   "license": "MIT",
   "module": "es/index.js",
@@ -10,6 +10,7 @@
   "scripts": {
     "start": "node scripts/start.js",
     "cl": "node ./bin/createLocale.js create",
+    "rl": "node ./bin/removeUnusedLocale.js",
     "pub": "sh ./bin/publish.sh",
     "gulp": "npx gulp -f ./config/gulp.js",
     "build": "node scripts/build.js",