@fonixtree/magic-design 2.0.36 → 2.0.37

package/lib/composite-comp/bol/components/Wallet/mobile/index.less

@@ -1,27 +1,95 @@
 .m-Wallet-mobile .headline {
   margin-bottom: 0.14rem;
 }
-.m-Wallet-mobile .content {
+.m-Wallet-mobile .item-wrap .text-content {
+  position: relative;
   display: flex;
+  align-items: center;
+  justify-content: center;
   flex-wrap: wrap;
+  border-radius: 0.2rem;
+  padding: 0.4rem 0.8rem 1.8rem 0.8rem;
 }
-.m-Wallet-mobile .content.column_3 .item-wrap .title {
-  top: 13%;
+.m-Wallet-mobile .item-wrap .text-content .wallet-btn {
+  margin-top: 0.4rem;
 }
-.m-Wallet-mobile .content.column_3 .item-wrap .amount {
-  bottom: 13%;
+.m-Wallet-mobile .item-wrap .text-content .peek {
+  position: absolute;
+  bottom: 0.32rem;
+  width: 0.8rem !important;
+}
+.m-Wallet-mobile .item-wrap .text-content .peek.left {
+  left: 0.8rem;
 }
-.m-Wallet-mobile .content .item-wrap {
+.m-Wallet-mobile .item-wrap .text-content .peek.right {
+  right: 0.8rem;
+}
+.m-Wallet-mobile .column-layout {
+  display: flex;
+  flex-wrap: wrap;
+}
+.m-Wallet-mobile .column-layout .text-content {
+  padding: 0.2rem 0 1.2rem 0;
+}
+.m-Wallet-mobile .column-layout .text-content .wallet-btn {
+  margin-top: 0.2rem;
+}
+.m-Wallet-mobile .column-layout .text-content .peek {
+  bottom: 0.2rem;
+}
+.m-Wallet-mobile .column-layout .text-content .peek.left {
+  left: 0.32rem;
+}
+.m-Wallet-mobile .column-layout .text-content .peek.right {
+  right: 0.32rem;
+}
+.m-Wallet-mobile .carousel-layout .slick-track {
   display: flex;
-  align-items: center;
   justify-content: center;
-  position: relative;
-  border-radius: 0.2rem;
+  align-items: center;
 }
-.m-Wallet-mobile .content .item-wrap .image {
-  border-radius: 0.2rem;
-  overflow: hidden;
+.m-Wallet-mobile .carousel-layout .carousel-icon-left {
+  position: absolute;
+  left: 0.32rem;
+  top: 0;
+  bottom: 0;
+  margin: auto;
+  cursor: pointer;
+  z-index: 10;
+}
+.m-Wallet-mobile .carousel-layout .carousel-icon-right {
+  position: absolute;
+  right: 0.32rem;
+  top: 0;
+  bottom: 0;
+  margin: auto;
+  cursor: pointer;
 }
-.m-Wallet-mobile .content .item-wrap .text-content {
+.m-Wallet-mobile .carousel-layout .swiper-ban {
   position: absolute;
+  width: 100%;
+  bottom: 0.8rem;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.m-Wallet-mobile .carousel-layout .swiper-ban .ban {
+  font-size: 0.16rem;
+  width: 1em;
+  height: 1em;
+  border-radius: 50%;
+  background-color: #FFF;
+  cursor: inherit;
+  margin-right: 0.2rem;
+  transition: all 0.5s;
+  opacity: 0.4;
+}
+.m-Wallet-mobile .carousel-layout .swiper-ban .ban:last-child {
+  margin-right: 0;
+}
+.m-Wallet-mobile .carousel-layout .swiper-ban .ban.active {
+  width: 2em;
+  height: 1em;
+  border-radius: 2rem;
+  opacity: 1;
 }

package/lib/composite-comp/bol/config-panels/WalletConfig/WalletConfigImageGroup/index.js

@@ -17,8 +17,6 @@ var _Button = _interopRequireDefault(require("../../../../../common/Button"));
 
 var _defaultJSON = require("../../../components/Wallet/defaultJSON");
 
-var _defaultImg = _interopRequireDefault(require("../imgs/defaultImg.png"));
-
 var _locale = require("../../../../../locale");
 
 var _decorator = require("../../../../../decorator");
@@ -109,10 +107,7 @@ function (_super) {
 
       return /*#__PURE__*/_react["default"].createElement("div", {
         className: "card_wrap"
-      }, /*#__PURE__*/_react["default"].createElement("img", {
-        alt: "",
-        src: ((0, _coreUtil.isPc)() ? src.image.content.pcImgSrc : src.image.content.h5ImgSrc) || _defaultImg["default"]
-      }), /*#__PURE__*/_react["default"].createElement("div", {
+      }, /*#__PURE__*/_react["default"].createElement("div", {
         className: "name"
       }, (_a = src.title) === null || _a === void 0 ? void 0 : _a.text));
     };

package/lib/composite-comp/bol/config-panels/WalletConfig/WalletConfigSetting/index.js

@@ -0,0 +1,201 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _common = require("../../../../../common");
+
+require("./index.less");
+
+var _coreUtil = require("../../../../../utils/coreUtil");
+
+var _locale = require("../../../../../locale");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+var __extends = void 0 && (void 0).__extends || function () {
+  var _extendStatics = function extendStatics(d, b) {
+    _extendStatics = Object.setPrototypeOf || {
+      __proto__: []
+    } instanceof Array && function (d, b) {
+      d.__proto__ = b;
+    } || function (d, b) {
+      for (var p in b) {
+        if (b.hasOwnProperty(p)) d[p] = b[p];
+      }
+    };
+
+    return _extendStatics(d, b);
+  };
+
+  return function (d, b) {
+    _extendStatics(d, b);
+
+    function __() {
+      this.constructor = d;
+    }
+
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+  };
+}();
+
+var WalletConfigSetting =
+/** @class */
+function (_super) {
+  __extends(WalletConfigSetting, _super);
+
+  function WalletConfigSetting() {
+    var _this = _super !== null && _super.apply(this, arguments) || this;
+
+    _this.reRender = function () {
+      (0, _coreUtil.renderPreview)();
+
+      _this.setState({});
+    };
+
+    return _this;
+  }
+
+  WalletConfigSetting.prototype.render = function () {
+    var _this = this;
+
+    var setting = this.props.setting;
+
+    var autoplaySetting = /*#__PURE__*/_react["default"].createElement(_common.Field, {
+      title: (0, _locale.i18n)('HOW_LONG_BETWEEN_SLIDES_(SECS)')
+    }, /*#__PURE__*/_react["default"].createElement(_common.Slider, {
+      maxVal: 60,
+      minVal: 1,
+      onChange: function onChange(value) {
+        setting.autoplay.interval = value.count;
+
+        _this.reRender();
+      },
+      unit: "s",
+      value: {
+        count: setting.autoplay.interval
+      }
+    }));
+
+    var navigationSetting = /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_common.Field, {
+      title: (0, _locale.i18n)('NAVIGATION_ARROW')
+    }, /*#__PURE__*/_react["default"].createElement(_common.Slider, {
+      needColor: true,
+      onChange: function onChange(value) {
+        setting.navigation.size = value.count;
+        setting.navigation.color = value.color;
+
+        _this.reRender();
+      },
+      unit: "px",
+      value: {
+        count: setting.navigation.size,
+        color: setting.navigation.color
+      }
+    })), /*#__PURE__*/_react["default"].createElement(_common.Field, {
+      title: (0, _locale.i18n)('SELECTED_ARROW')
+    }, /*#__PURE__*/_react["default"].createElement(_common.Slider, {
+      needColor: true,
+      onChange: function onChange(value) {
+        setting.navigation.hoverSize = value.count;
+        setting.navigation.hoverColor = value.color;
+
+        _this.reRender();
+      },
+      unit: "px",
+      value: {
+        count: setting.navigation.hoverSize,
+        color: setting.navigation.hoverColor
+      }
+    })));
+
+    var dotsSetting = /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_common.Field, {
+      title: (0, _locale.i18n)('SLIDE_BUTTON')
+    }, /*#__PURE__*/_react["default"].createElement(_common.Slider, {
+      needColor: true,
+      onChange: function onChange(value) {
+        setting.dots.size = value.count;
+        setting.dots.color = value.color;
+
+        _this.reRender();
+      },
+      unit: "px",
+      value: {
+        count: setting.dots.size,
+        color: setting.dots.color
+      }
+    })), /*#__PURE__*/_react["default"].createElement(_common.Field, {
+      title: (0, _locale.i18n)('SELECTED_BUTTON')
+    }, /*#__PURE__*/_react["default"].createElement(_common.Slider, {
+      needColor: true,
+      onChange: function onChange(value) {
+        setting.dots.hoverSize = value.count;
+        setting.dots.hoverColor = value.color;
+
+        _this.reRender();
+      },
+      unit: "px",
+      value: {
+        count: setting.dots.hoverSize,
+        color: setting.dots.hoverColor
+      }
+    })));
+
+    return /*#__PURE__*/_react["default"].createElement("div", {
+      className: "carousel_setting"
+    }, /*#__PURE__*/_react["default"].createElement(_common.Collapse, {
+      divider: "dashed",
+      onRefresh: this.reRender,
+      source: [{
+        key: '1',
+        name: (0, _locale.i18n)('AUTOPLAYS'),
+        value: autoplaySetting,
+        metaOption: setting.autoplay,
+        toggleType: 'switch'
+      }, {
+        key: '2',
+        name: (0, _locale.i18n)('SHOW_NAVIGATION_ARROW'),
+        value: navigationSetting,
+        metaOption: setting.navigation,
+        toggleType: 'switch'
+      }, {
+        key: '3',
+        name: (0, _locale.i18n)('SHOW_SLIDE_BUTTON'),
+        value: dotsSetting,
+        metaOption: setting.dots,
+        toggleType: 'switch'
+      }]
+    }));
+  };
+
+  WalletConfigSetting.defaultProps = {
+    setting: {
+      autoplay: {
+        open: true,
+        interval: 3
+      },
+      navigation: {
+        open: true,
+        size: 16,
+        color: '#384966',
+        hoverSize: 16,
+        hoverColor: '#384966'
+      },
+      dots: {
+        open: true,
+        size: 16,
+        color: '#fff',
+        hoverSize: 16,
+        hoverColor: '#fff'
+      }
+    }
+  };
+  return WalletConfigSetting;
+}(_react["default"].Component);
+
+var _default = WalletConfigSetting;
+exports["default"] = _default;

package/lib/composite-comp/bol/config-panels/WalletConfig/WalletConfigSetting/index.less

@@ -0,0 +1,9 @@
+.carousel_setting {
+
+  .collapse_wrap {
+    .header_wrap {
+      font-weight: 600 !important;
+    }
+  }
+
+}

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

@@ -9,6 +9,8 @@ var _react = _interopRequireDefault(require("react"));
 
 var _WalletConfigImageGroup = _interopRequireDefault(require("./WalletConfigImageGroup"));
 
+var _WalletConfigSetting = _interopRequireDefault(require("./WalletConfigSetting"));
+
 var _WalletConfigContent = _interopRequireDefault(require("./WalletConfigContent"));
 
 var _Collapse = _interopRequireDefault(require("../../../../common/Collapse"));
@@ -44,20 +46,27 @@ function WalletConfig(props) {
       })
     }, {
       key: '3',
+      name: (0, _locale.i18n)('SETTING'),
+      value: /*#__PURE__*/_react["default"].createElement(_WalletConfigSetting["default"], {
+        setting: data.setting
+      })
+    }, {
+      key: '4',
       name: (0, _locale.i18n)('SPACING'),
       value: /*#__PURE__*/_react["default"].createElement(_SpacingConfig["default"], {
         data: data.spacing
       })
     }, {
-      key: '4',
+      key: '5',
       name: (0, _locale.i18n)('CUSTOMIZE'),
       value: /*#__PURE__*/_react["default"].createElement(_CustomizeConfig["default"], {
+        component: "wallet",
         data: data.customize,
         isHideAlign: true,
         layoutSource: _layout.WalletLayout
       })
     }, {
-      key: '5',
+      key: '6',
       name: (0, _locale.i18n)('BACKGROUND'),
       value: /*#__PURE__*/_react["default"].createElement(_BackgroundConfig["default"], {
         data: data.background

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

@@ -13,12 +13,14 @@ var _locale = require("../../../../locale");
 
 var _common = require("../../../../common");
 
-var _ImageConfig = _interopRequireDefault(require("../../../../meta-comp/config-panels/ImageConfig"));
-
 var _TextConfig = _interopRequireDefault(require("../../../../meta-comp/config-panels/TextConfig"));
 
+var _ButtonConfig = _interopRequireDefault(require("../../../../meta-comp/config-panels/ButtonConfig"));
+
 var _BaseConfig = _interopRequireDefault(require("../../../../meta-comp/config-panels/BaseConfig"));
 
+var _BackgroundConfig = _interopRequireDefault(require("../../../common/config-panels/BackgroundConfig"));
+
 var _coreUtil = require("../../../../utils/coreUtil");
 
 require("./index.less");
@@ -51,22 +53,6 @@ var __extends = void 0 && (void 0).__extends || function () {
   };
 }();
 
-var __assign = void 0 && (void 0).__assign || function () {
-  __assign = Object.assign || function (t) {
-    for (var s, i = 1, n = arguments.length; i < n; i++) {
-      s = arguments[i];
-
-      for (var p in s) {
-        if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
-      }
-    }
-
-    return t;
-  };
-
-  return __assign.apply(this, arguments);
-};
-
 var WalletSecondConfig =
 /** @class */
 function (_super) {
@@ -81,26 +67,41 @@ function (_super) {
       var panelProps = _this.props.panelProps;
       var defaultSource = [{
         key: 'defaultSource_1',
-        name: (0, _locale.i18n)('IMAGE'),
-        value: /*#__PURE__*/_react["default"].createElement(_ImageConfig["default"], {
-          data: panelProps.image
-        }),
-        metaOption: panelProps.image
-      }, {
-        key: 'defaultSource_2',
         name: (0, _locale.i18n)('TITLE'),
         value: /*#__PURE__*/_react["default"].createElement(_TextConfig["default"], {
           data: panelProps.title
         }),
         metaOption: panelProps.title
       }, {
-        key: 'defaultSource_3',
+        key: 'defaultSource_2',
         name: (0, _locale.i18n)('AMOUNT'),
         value: /*#__PURE__*/_react["default"].createElement(_TextConfig["default"], {
           data: panelProps.amount
         }),
         metaOption: panelProps.amount
       }];
+      var defaultSource2 = [{
+        key: 'defaultSource_3',
+        name: (0, _locale.i18n)('TEXT'),
+        value: /*#__PURE__*/_react["default"].createElement(_TextConfig["default"], {
+          data: panelProps.text
+        }),
+        metaOption: panelProps.text
+      }, {
+        key: 'defaultSource_4',
+        name: (0, _locale.i18n)('BUTTON'),
+        value: /*#__PURE__*/_react["default"].createElement(_ButtonConfig["default"], {
+          data: panelProps.button
+        }),
+        metaOption: panelProps.button
+      }, {
+        key: 'defaultSource_5',
+        name: (0, _locale.i18n)('PEEK'),
+        value: /*#__PURE__*/_react["default"].createElement(_TextConfig["default"], {
+          data: panelProps.peek
+        }),
+        metaOption: panelProps.peek
+      }];
       return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_common.Collapse, {
         divider: "dashed",
         headerSize: "middle",
@@ -123,81 +124,49 @@ function (_super) {
         },
         value: panelProps.sourceType
       }, /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
-        value: "Cashback"
-      }, (0, _locale.i18n)('Cashback')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
+        value: "Balance"
+      }, (0, _locale.i18n)('Balance')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
+        value: "B2B PayLater"
+      }, (0, _locale.i18n)('B2B PayLater')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
+        value: "Cenduit"
+      }, (0, _locale.i18n)('Cenduit')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
+        value: "BNPL"
+      }, (0, _locale.i18n)('BNPL')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
         value: "Credit"
       }, (0, _locale.i18n)('Credit')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
-        value: "BNPL"
-      }, (0, _locale.i18n)('BNPL'))))));
-    };
-
-    _this.resetHover = function () {
-      var panelProps = _this.props.panelProps;
-
-      if (panelProps.hover.open) {
-        panelProps.hover.image = __assign(__assign({}, panelProps.hover.image), JSON.parse(JSON.stringify(panelProps.image)));
-        panelProps.hover.title = __assign(__assign({}, panelProps.hover.title), JSON.parse(JSON.stringify(panelProps.title)));
-        panelProps.hover.amount = __assign(__assign({}, panelProps.hover.amount), JSON.parse(JSON.stringify(panelProps.amount)));
-      }
+        value: "Cashback"
+      }, (0, _locale.i18n)('Cashback'))))), /*#__PURE__*/_react["default"].createElement(_common.Collapse, {
+        divider: "dashed",
+        headerSize: "middle",
+        onRefresh: function onRefresh() {
+          return (0, _coreUtil.renderPreview)();
+        },
+        showActiveColor: true,
+        source: defaultSource2,
+        type: "switch"
+      }));
     };
 
     return _this;
   }
 
   WalletSecondConfig.prototype.render = function () {
-    var _this = this;
-
     var panelProps = this.props.panelProps;
-
-    var hoverPanel = /*#__PURE__*/_react["default"].createElement(_common.Collapse, {
-      divider: "dashed",
-      noChange: true,
-      onRefresh: function onRefresh() {
-        return (0, _coreUtil.renderPreview)();
-      },
-      source: [{
-        key: 'hoverSetting_1',
-        name: (0, _locale.i18n)('IMAGE'),
-        value: /*#__PURE__*/_react["default"].createElement(_ImageConfig["default"], {
-          data: panelProps.hover.image
-        }),
-        metaOption: panelProps.hover.image
-      }, {
-        key: 'hoverSetting_2',
-        name: (0, _locale.i18n)('TITLE'),
-        value: /*#__PURE__*/_react["default"].createElement(_TextConfig["default"], {
-          data: panelProps.hover.title
-        }),
-        metaOption: panelProps.hover.title
-      }, {
-        key: 'hoverSetting_3',
-        name: (0, _locale.i18n)('AMOUNT'),
-        value: /*#__PURE__*/_react["default"].createElement(_TextConfig["default"], {
-          data: panelProps.hover.amount
-        }),
-        metaOption: panelProps.hover.amount
-      }],
-      type: "switch"
-    });
-
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "Wallet_second_conf_wrap"
     }, /*#__PURE__*/_react["default"].createElement(_common.Collapse, {
       divider: "bold",
       headerSize: "large",
-      onRefresh: function onRefresh() {
-        return _this.resetHover();
-      },
       source: [{
         key: '1',
         name: (0, _locale.i18n)('CONTENT'),
         value: this.getContentPanel()
       }, {
         key: '2',
-        name: (0, _locale.i18n)('HOVER'),
-        value: hoverPanel,
-        metaOption: panelProps.hover,
-        toggleType: 'switch'
+        name: (0, _locale.i18n)('BACKGROUND'),
+        value: /*#__PURE__*/_react["default"].createElement(_BackgroundConfig["default"], {
+          data: panelProps.background
+        })
       }]
     }));
   };

package/lib/composite-comp/bol/second-config-panels/WalletSecondConfig/index.less

@@ -2,6 +2,8 @@
 
   .sourceOfAmount {
     border-top: 1px dashed #D2D9E5;
+    border-bottom: 1px dashed #D2D9E5;
     padding-top: 20px;
+    padding-bottom: 10px;
   }
 }

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

@@ -103,7 +103,8 @@ function (_super) {
         layout = _b.layout,
         imgHeight = _b.imgHeight,
         imgWidth = _b.imgWidth,
-        rest = __rest(_b, ["data", "panelProps", "onItemClick", "fixHeight", "layout", "imgHeight", "imgWidth"]);
+        customFont = _b.customFont,
+        rest = __rest(_b, ["data", "panelProps", "onItemClick", "fixHeight", "layout", "imgHeight", "imgWidth", "customFont"]);
 
     var imgStyle = {};
     if (imgWidth) imgStyle.width = imgWidth;
@@ -142,14 +143,14 @@ function (_super) {
       alt: "",
       src: _iconBalance["default"]
     }), /*#__PURE__*/_react["default"].createElement("div", {
-      className: "cashBackBox_text"
+      className: "cashBackBox_text " + (customFont ? 'custom_font' : '')
     }, "Cashback Saldo", /*#__PURE__*/_react["default"].createElement("span", null, (0, _currencyUtil.formatCurrencyWithSymbolNotSpace)(data.buyCommission || 0)))), /*#__PURE__*/_react["default"].createElement("div", {
       className: "cashBackBox_koin"
     }, /*#__PURE__*/_react["default"].createElement("img", {
       alt: "",
       src: _iconKoin["default"]
     }), /*#__PURE__*/_react["default"].createElement("div", {
-      className: "cashBackBox_text"
+      className: "cashBackBox_text " + (customFont ? 'custom_font' : '')
     }, "Cashback", /*#__PURE__*/_react["default"].createElement("span", null, (0, _currencyUtil.formatCurrency)(data.giftCommission || 0)), "Koin"))), panelProps.salesPrice.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
       className: "producItemPrice",
       data: __assign(__assign({}, panelProps.salesPrice), {
@@ -166,7 +167,8 @@ function (_super) {
     data: {},
     panelProps: {},
     fixHeight: false,
-    layout: 'vertical'
+    layout: 'vertical',
+    customFont: false
   };
   return AffiliateProductItem;
 }(_react["default"].Component);

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

@@ -49,6 +49,10 @@
           padding-left: 2px;
         }
       }
+      .custom_font {
+        font-size: 9px;
+        padding-left: 2px;
+      }
     }
     .cashBackBox_koin {
       display: flex;
@@ -71,6 +75,10 @@
           padding: 0 2px;
         }
       }
+      .custom_font {
+        font-size: 9px;
+        padding-left: 2px;
+      }
     }
   }
   .producItemPrice {

package/lib/composite-comp/common/config-panels/CustomizeConfig/index.js

@@ -135,6 +135,19 @@ function (_super) {
             showRowNum: false
           });
         }
+      } // wallet 第一种布局可选列数
+
+
+      if (component === 'wallet') {
+        if (v === 'layout2') {
+          _this.setState({
+            showRowNum: false
+          });
+        } else {
+          _this.setState({
+            showRowNum: true
+          });
+        }
       } // 移动端导航特殊处理
       // 更改需求，两个布局都需 可选行数
       // if (component == 'mobileNavigation') {

package/lib/composite-comp/common/config-panels/CustomizeConfig/index.less

@@ -4,15 +4,16 @@
     justify-content: space-between;
     align-items: center;
   }
+
   .selectWrap {
     position: relative;
     display: flex;
-    
+
     .iconNum {
       position: absolute;
       z-index: 9;
       left: 15px;
-      top: 10px;
+      top: 8px;
     }
 
     .cylon-select {