@fonixtree/magic-design 2.0.210 → 2.0.212

package/es/composite-comp/bol/components/Banner/defaultJSON.js

@@ -16,10 +16,10 @@ var bannerGroupSourceJSON = function bannerGroupSourceJSON() {
   var defaultFontFamily = _constants.projectFontFamily[(_a = window.systemParams) === null || _a === void 0 ? void 0 : _a.projectCode] || 'Open Sans';
   return {
     id: groupId,
-    adult: {
-      id: (0, _uuid.v4)(),
-      open: false
-    },
+    // adult: {
+    //   id: uuidv4(),
+    //   open: false,
+    // },
     image: {
       parentId: groupId,
       id: (0, _uuid.v4)(),

package/es/composite-comp/bol/components/Banner/mobile/index.js

@@ -191,10 +191,12 @@ function (_super) {
       autoplay = false;
     }
 
-    var userIsAdult = localStorage.getItem('userIsAdult') === 'Y';
+    var userIsAdult = localStorage.getItem('userIsAdult') !== 'N';
 
     var _groupSource = data.groupSource.filter(function (f) {
-      return userIsAdult || !f.adult.open;
+      var _a;
+
+      return userIsAdult || !((_a = f.adult) === null || _a === void 0 ? void 0 : _a.open);
     });
 
     return /*#__PURE__*/_react["default"].createElement("div", {

package/es/composite-comp/bol/components/Banner/pc/index.js

@@ -228,10 +228,12 @@ function (_super) {
     }
 
     var GAData = (0, _commonUtil.getGAData)(data);
-    var userIsAdult = localStorage.getItem('userIsAdult') === 'Y';
+    var userIsAdult = localStorage.getItem('userIsAdult') !== 'N';
 
     var _groupSource = data.groupSource.filter(function (f) {
-      return userIsAdult || !f.adult.open;
+      var _a;
+
+      return userIsAdult || !((_a = f.adult) === null || _a === void 0 ? void 0 : _a.open);
     });
 
     return /*#__PURE__*/_react["default"].createElement("div", {

package/es/composite-comp/bol/components/Carousel/mobile/index.js

@@ -179,10 +179,12 @@ function (_super) {
     var _a = data.customize,
         layout = _a.layout,
         rowNum = _a.rowNum;
-    var userIsAdult = localStorage.getItem('userIsAdult') === 'Y';
+    var userIsAdult = localStorage.getItem('userIsAdult') !== 'N';
 
     var _groupSource = data.groupSource.filter(function (f) {
-      return userIsAdult || !f.adult.open;
+      var _a;
+
+      return userIsAdult || !((_a = f.adult) === null || _a === void 0 ? void 0 : _a.open);
     });
 
     var colNum = 1;

package/es/composite-comp/bol/components/Carousel/pc/index.js

@@ -200,10 +200,12 @@ function (_super) {
     var _a = data.customize,
         layout = _a.layout,
         pcRowNum = _a.pcRowNum;
-    var userIsAdult = localStorage.getItem('userIsAdult') === 'Y';
+    var userIsAdult = localStorage.getItem('userIsAdult') !== 'N';
 
     var _groupSource = data.groupSource.filter(function (f) {
-      return userIsAdult || !f.adult.open;
+      var _a;
+
+      return userIsAdult || !((_a = f.adult) === null || _a === void 0 ? void 0 : _a.open);
     });
 
     var colNum = 1;

package/es/composite-comp/bol/components/ImageGallery/mobile/index.js

@@ -116,10 +116,12 @@ function (_super) {
     var isHorizontal = data.customize.layout.h5Layout === 'layout2';
     var isFluidLayout = data.customize.layout.h5Layout === 'layout3' || data.customize.layout.h5Layout === 'layout4';
     var colNum = isHorizontal ? data.customize.rowNum : 1;
-    var userIsAdult = localStorage.getItem('userIsAdult') === 'Y';
+    var userIsAdult = localStorage.getItem('userIsAdult') !== 'N';
 
     var _groupSource = data.groupSource.filter(function (f) {
-      return userIsAdult || !f.adult.open;
+      var _a;
+
+      return userIsAdult || !((_a = f.adult) === null || _a === void 0 ? void 0 : _a.open);
     });
 
     var newData = _groupSource.reduce(function (prev, curr, index) {

package/es/composite-comp/bol/components/ImageGallery/pc/index.js

@@ -133,10 +133,12 @@ function (_super) {
     var GAData = (0, _commonUtil.getGAData)(data);
     var isHorizontal = data.customize.layout.pcLayout === 'layout2';
     var colNum = isHorizontal ? data.customize.pcRowNum : 1;
-    var userIsAdult = localStorage.getItem('userIsAdult') === 'Y';
+    var userIsAdult = localStorage.getItem('userIsAdult') !== 'N';
 
     var _groupSource = data.groupSource.filter(function (f) {
-      return userIsAdult || !f.adult.open;
+      var _a;
+
+      return userIsAdult || !((_a = f.adult) === null || _a === void 0 ? void 0 : _a.open);
     });
 
     var newData = _groupSource.reduce(function (prev, curr, index) {

package/es/composite-comp/bol/second-config-panels/BannerSecondConfig/index.js

@@ -7,6 +7,8 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
+var _uuid = require("uuid");
+
 var _coreUtil = require("../../../../utils/coreUtil");
 
 var _Collapse = _interopRequireDefault(require("../../../../common/Collapse"));
@@ -62,9 +64,19 @@ function (_super) {
     _this.state = {};
 
     _this.getContentPanel = function () {
+      var _a;
+
       var panelProps = _this.props.panelProps;
+
+      if (!panelProps.adult) {
+        panelProps.adult = {
+          id: (0, _uuid.v4)(),
+          open: false
+        };
+      }
+
       var source = [{
-        key: panelProps.adult.id,
+        key: ((_a = panelProps.adult) === null || _a === void 0 ? void 0 : _a.id) || 'adult',
         name: (0, _locale.i18n)('ADULT'),
         value: null,
         metaOption: panelProps.adult

package/es/composite-comp/bol/second-config-panels/CarouselSecondConfig/index.js

@@ -7,6 +7,8 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
+var _uuid = require("uuid");
+
 var _coreUtil = require("../../../../utils/coreUtil");
 
 var _Collapse = _interopRequireDefault(require("../../../../common/Collapse"));
@@ -297,14 +299,23 @@ function (_super) {
 
     var size = this.getImageRecommendSize(parentNode.customize);
 
+    if (!panelProps.adult) {
+      panelProps.adult = {
+        id: (0, _uuid.v4)(),
+        open: false
+      };
+    }
+
     var getConfig = function getConfig() {
+      var _a;
+
       return /*#__PURE__*/_react["default"].createElement(_Collapse["default"], {
         headerSize: "middle",
         onRefresh: function onRefresh() {
           return (0, _coreUtil.renderPreview)();
         },
         source: __spreadArrays([{
-          key: panelProps.adult.id,
+          key: ((_a = panelProps.adult) === null || _a === void 0 ? void 0 : _a.id) || 'adult',
           name: (0, _locale.i18n)('ADULT'),
           value: null,
           metaOption: panelProps.adult

package/es/composite-comp/bol/second-config-panels/ImageGallerySecondConfig/index.js

@@ -7,6 +7,8 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
+var _uuid = require("uuid");
+
 var _Collapse = _interopRequireDefault(require("../../../../common/Collapse"));
 
 var _ImageConfig = _interopRequireDefault(require("../../../../meta-comp/config-panels/ImageConfig"));
@@ -162,12 +164,22 @@ function (_super) {
   }
 
   ImageGallerySecondConfig.prototype.render = function () {
-    var _a = this.props,
-        panelProps = _a.panelProps,
-        parentNode = _a.parentNode;
+    var _a;
+
+    var _b = this.props,
+        panelProps = _b.panelProps,
+        parentNode = _b.parentNode;
     var size = this.getImageRecommendSize(parentNode.customize);
+
+    if (!panelProps.adult) {
+      panelProps.adult = {
+        id: (0, _uuid.v4)(),
+        open: false
+      };
+    }
+
     var source = [{
-      key: panelProps.adult.id,
+      key: ((_a = panelProps.adult) === null || _a === void 0 ? void 0 : _a.id) || 'adult',
       name: (0, _locale.i18n)('ADULT'),
       value: null,
       metaOption: panelProps.adult

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

@@ -93,10 +93,12 @@ function (_super) {
     //   wrapStyle.backgroundPosition = 'center';
     // }
 
-    var userIsAdult = localStorage.getItem('userIsAdult') === 'Y';
+    var userIsAdult = localStorage.getItem('userIsAdult') !== 'N';
 
     var _groupSource = data === null || data === void 0 ? void 0 : data.groupSource.filter(function (f) {
-      return userIsAdult || !f.adult.open;
+      var _a;
+
+      return userIsAdult || !((_a = f.adult) === null || _a === void 0 ? void 0 : _a.open);
     });
 
     return /*#__PURE__*/_react["default"].createElement("div", {

package/es/composite-comp/dito/second-config-panels/MobileNavigationSecondConfig/index.js

@@ -7,6 +7,8 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
+var _uuid = require("uuid");
+
 var _Collapse = _interopRequireDefault(require("../../../../common/Collapse"));
 
 var _ImageConfig = _interopRequireDefault(require("../../../../meta-comp/config-panels/ImageConfig"));
@@ -118,12 +120,21 @@ function (_super) {
     };
 
     _this.getContentPanel = function (data, needHover) {
+      var _a;
+
       var parentNode = _this.props.parentNode;
 
       var size = _this.getImageRecommendSize(parentNode.customize);
 
+      if (!data.adult) {
+        data.adult = {
+          id: (0, _uuid.v4)(),
+          open: false
+        };
+      }
+
       var source = [{
-        key: data.adult.id,
+        key: ((_a = data.adult) === null || _a === void 0 ? void 0 : _a.id) || 'adult',
         name: (0, _locale.i18n)('ADULT'),
         value: null,
         metaOption: data.adult

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

@@ -21,6 +21,8 @@ var _locale = require("../../../../../../locale");
 
 var _constants = require("../../../../../../constants");
 
+var _WatermarkLabel = _interopRequireDefault(require("../../../../../common/components/WatermarkLabel"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
@@ -124,7 +126,9 @@ function (_super) {
       color: "#fff",
       size: 18,
       type: "icon-a-EssentionalUI"
-    }), /*#__PURE__*/_react["default"].createElement("span", null, (0, _locale.i18n)('GIFT'))), this.isSpecialPrice() && data.discountPercent && !isGift && /*#__PURE__*/_react["default"].createElement("div", {
+    }), /*#__PURE__*/_react["default"].createElement("span", null, (0, _locale.i18n)('GIFT'))), /*#__PURE__*/_react["default"].createElement(_WatermarkLabel["default"], {
+      show: data.targetCustomer === 'A'
+    }), this.isSpecialPrice() && data.discountPercent && !isGift && /*#__PURE__*/_react["default"].createElement("div", {
       className: "discount-tag"
     }, data.discountPercent, "% ", (0, _locale.i18n)('OFF'))), /*#__PURE__*/_react["default"].createElement("div", {
       className: "content-wrap"

package/lib/composite-comp/bol/components/Banner/defaultJSON.js

@@ -16,10 +16,10 @@ var bannerGroupSourceJSON = function bannerGroupSourceJSON() {
   var defaultFontFamily = _constants.projectFontFamily[(_a = window.systemParams) === null || _a === void 0 ? void 0 : _a.projectCode] || 'Open Sans';
   return {
     id: groupId,
-    adult: {
-      id: (0, _uuid.v4)(),
-      open: false
-    },
+    // adult: {
+    //   id: uuidv4(),
+    //   open: false,
+    // },
     image: {
       parentId: groupId,
       id: (0, _uuid.v4)(),

package/lib/composite-comp/bol/components/Banner/mobile/index.js

@@ -191,10 +191,12 @@ function (_super) {
       autoplay = false;
     }
 
-    var userIsAdult = localStorage.getItem('userIsAdult') === 'Y';
+    var userIsAdult = localStorage.getItem('userIsAdult') !== 'N';
 
     var _groupSource = data.groupSource.filter(function (f) {
-      return userIsAdult || !f.adult.open;
+      var _a;
+
+      return userIsAdult || !((_a = f.adult) === null || _a === void 0 ? void 0 : _a.open);
     });
 
     return /*#__PURE__*/_react["default"].createElement("div", {

package/lib/composite-comp/bol/components/Banner/pc/index.js

@@ -228,10 +228,12 @@ function (_super) {
     }
 
     var GAData = (0, _commonUtil.getGAData)(data);
-    var userIsAdult = localStorage.getItem('userIsAdult') === 'Y';
+    var userIsAdult = localStorage.getItem('userIsAdult') !== 'N';
 
     var _groupSource = data.groupSource.filter(function (f) {
-      return userIsAdult || !f.adult.open;
+      var _a;
+
+      return userIsAdult || !((_a = f.adult) === null || _a === void 0 ? void 0 : _a.open);
     });
 
     return /*#__PURE__*/_react["default"].createElement("div", {

package/lib/composite-comp/bol/components/Carousel/mobile/index.js

@@ -179,10 +179,12 @@ function (_super) {
     var _a = data.customize,
         layout = _a.layout,
         rowNum = _a.rowNum;
-    var userIsAdult = localStorage.getItem('userIsAdult') === 'Y';
+    var userIsAdult = localStorage.getItem('userIsAdult') !== 'N';
 
     var _groupSource = data.groupSource.filter(function (f) {
-      return userIsAdult || !f.adult.open;
+      var _a;
+
+      return userIsAdult || !((_a = f.adult) === null || _a === void 0 ? void 0 : _a.open);
     });
 
     var colNum = 1;

package/lib/composite-comp/bol/components/Carousel/pc/index.js

@@ -200,10 +200,12 @@ function (_super) {
     var _a = data.customize,
         layout = _a.layout,
         pcRowNum = _a.pcRowNum;
-    var userIsAdult = localStorage.getItem('userIsAdult') === 'Y';
+    var userIsAdult = localStorage.getItem('userIsAdult') !== 'N';
 
     var _groupSource = data.groupSource.filter(function (f) {
-      return userIsAdult || !f.adult.open;
+      var _a;
+
+      return userIsAdult || !((_a = f.adult) === null || _a === void 0 ? void 0 : _a.open);
     });
 
     var colNum = 1;

package/lib/composite-comp/bol/components/ImageGallery/mobile/index.js

@@ -116,10 +116,12 @@ function (_super) {
     var isHorizontal = data.customize.layout.h5Layout === 'layout2';
     var isFluidLayout = data.customize.layout.h5Layout === 'layout3' || data.customize.layout.h5Layout === 'layout4';
     var colNum = isHorizontal ? data.customize.rowNum : 1;
-    var userIsAdult = localStorage.getItem('userIsAdult') === 'Y';
+    var userIsAdult = localStorage.getItem('userIsAdult') !== 'N';
 
     var _groupSource = data.groupSource.filter(function (f) {
-      return userIsAdult || !f.adult.open;
+      var _a;
+
+      return userIsAdult || !((_a = f.adult) === null || _a === void 0 ? void 0 : _a.open);
     });
 
     var newData = _groupSource.reduce(function (prev, curr, index) {

package/lib/composite-comp/bol/components/ImageGallery/pc/index.js

@@ -133,10 +133,12 @@ function (_super) {
     var GAData = (0, _commonUtil.getGAData)(data);
     var isHorizontal = data.customize.layout.pcLayout === 'layout2';
     var colNum = isHorizontal ? data.customize.pcRowNum : 1;
-    var userIsAdult = localStorage.getItem('userIsAdult') === 'Y';
+    var userIsAdult = localStorage.getItem('userIsAdult') !== 'N';
 
     var _groupSource = data.groupSource.filter(function (f) {
-      return userIsAdult || !f.adult.open;
+      var _a;
+
+      return userIsAdult || !((_a = f.adult) === null || _a === void 0 ? void 0 : _a.open);
     });
 
     var newData = _groupSource.reduce(function (prev, curr, index) {

package/lib/composite-comp/bol/second-config-panels/BannerSecondConfig/index.js

@@ -7,6 +7,8 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
+var _uuid = require("uuid");
+
 var _coreUtil = require("../../../../utils/coreUtil");
 
 var _Collapse = _interopRequireDefault(require("../../../../common/Collapse"));
@@ -62,9 +64,19 @@ function (_super) {
     _this.state = {};
 
     _this.getContentPanel = function () {
+      var _a;
+
       var panelProps = _this.props.panelProps;
+
+      if (!panelProps.adult) {
+        panelProps.adult = {
+          id: (0, _uuid.v4)(),
+          open: false
+        };
+      }
+
       var source = [{
-        key: panelProps.adult.id,
+        key: ((_a = panelProps.adult) === null || _a === void 0 ? void 0 : _a.id) || 'adult',
         name: (0, _locale.i18n)('ADULT'),
         value: null,
         metaOption: panelProps.adult

package/lib/composite-comp/bol/second-config-panels/CarouselSecondConfig/index.js

@@ -7,6 +7,8 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
+var _uuid = require("uuid");
+
 var _coreUtil = require("../../../../utils/coreUtil");
 
 var _Collapse = _interopRequireDefault(require("../../../../common/Collapse"));
@@ -297,14 +299,23 @@ function (_super) {
 
     var size = this.getImageRecommendSize(parentNode.customize);
 
+    if (!panelProps.adult) {
+      panelProps.adult = {
+        id: (0, _uuid.v4)(),
+        open: false
+      };
+    }
+
     var getConfig = function getConfig() {
+      var _a;
+
       return /*#__PURE__*/_react["default"].createElement(_Collapse["default"], {
         headerSize: "middle",
         onRefresh: function onRefresh() {
           return (0, _coreUtil.renderPreview)();
         },
         source: __spreadArrays([{
-          key: panelProps.adult.id,
+          key: ((_a = panelProps.adult) === null || _a === void 0 ? void 0 : _a.id) || 'adult',
           name: (0, _locale.i18n)('ADULT'),
           value: null,
           metaOption: panelProps.adult

package/lib/composite-comp/bol/second-config-panels/ImageGallerySecondConfig/index.js

@@ -7,6 +7,8 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
+var _uuid = require("uuid");
+
 var _Collapse = _interopRequireDefault(require("../../../../common/Collapse"));
 
 var _ImageConfig = _interopRequireDefault(require("../../../../meta-comp/config-panels/ImageConfig"));
@@ -162,12 +164,22 @@ function (_super) {
   }
 
   ImageGallerySecondConfig.prototype.render = function () {
-    var _a = this.props,
-        panelProps = _a.panelProps,
-        parentNode = _a.parentNode;
+    var _a;
+
+    var _b = this.props,
+        panelProps = _b.panelProps,
+        parentNode = _b.parentNode;
     var size = this.getImageRecommendSize(parentNode.customize);
+
+    if (!panelProps.adult) {
+      panelProps.adult = {
+        id: (0, _uuid.v4)(),
+        open: false
+      };
+    }
+
     var source = [{
-      key: panelProps.adult.id,
+      key: ((_a = panelProps.adult) === null || _a === void 0 ? void 0 : _a.id) || 'adult',
       name: (0, _locale.i18n)('ADULT'),
       value: null,
       metaOption: panelProps.adult

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

@@ -93,10 +93,12 @@ function (_super) {
     //   wrapStyle.backgroundPosition = 'center';
     // }
 
-    var userIsAdult = localStorage.getItem('userIsAdult') === 'Y';
+    var userIsAdult = localStorage.getItem('userIsAdult') !== 'N';
 
     var _groupSource = data === null || data === void 0 ? void 0 : data.groupSource.filter(function (f) {
-      return userIsAdult || !f.adult.open;
+      var _a;
+
+      return userIsAdult || !((_a = f.adult) === null || _a === void 0 ? void 0 : _a.open);
     });
 
     return /*#__PURE__*/_react["default"].createElement("div", {

package/lib/composite-comp/dito/second-config-panels/MobileNavigationSecondConfig/index.js

@@ -7,6 +7,8 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
+var _uuid = require("uuid");
+
 var _Collapse = _interopRequireDefault(require("../../../../common/Collapse"));
 
 var _ImageConfig = _interopRequireDefault(require("../../../../meta-comp/config-panels/ImageConfig"));
@@ -118,12 +120,21 @@ function (_super) {
     };
 
     _this.getContentPanel = function (data, needHover) {
+      var _a;
+
       var parentNode = _this.props.parentNode;
 
       var size = _this.getImageRecommendSize(parentNode.customize);
 
+      if (!data.adult) {
+        data.adult = {
+          id: (0, _uuid.v4)(),
+          open: false
+        };
+      }
+
       var source = [{
-        key: data.adult.id,
+        key: ((_a = data.adult) === null || _a === void 0 ? void 0 : _a.id) || 'adult',
         name: (0, _locale.i18n)('ADULT'),
         value: null,
         metaOption: data.adult

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

@@ -21,6 +21,8 @@ var _locale = require("../../../../../../locale");
 
 var _constants = require("../../../../../../constants");
 
+var _WatermarkLabel = _interopRequireDefault(require("../../../../../common/components/WatermarkLabel"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
@@ -124,7 +126,9 @@ function (_super) {
       color: "#fff",
       size: 18,
       type: "icon-a-EssentionalUI"
-    }), /*#__PURE__*/_react["default"].createElement("span", null, (0, _locale.i18n)('GIFT'))), this.isSpecialPrice() && data.discountPercent && !isGift && /*#__PURE__*/_react["default"].createElement("div", {
+    }), /*#__PURE__*/_react["default"].createElement("span", null, (0, _locale.i18n)('GIFT'))), /*#__PURE__*/_react["default"].createElement(_WatermarkLabel["default"], {
+      show: data.targetCustomer === 'A'
+    }), this.isSpecialPrice() && data.discountPercent && !isGift && /*#__PURE__*/_react["default"].createElement("div", {
       className: "discount-tag"
     }, data.discountPercent, "% ", (0, _locale.i18n)('OFF'))), /*#__PURE__*/_react["default"].createElement("div", {
       className: "content-wrap"

package/package.json

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