@fonixtree/magic-design 1.0.65 → 1.0.67

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

@@ -9,8 +9,6 @@ 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"));
@@ -46,27 +44,20 @@ 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: '5',
+      key: '4',
       name: (0, _locale.i18n)('CUSTOMIZE'),
       value: /*#__PURE__*/_react["default"].createElement(_CustomizeConfig["default"], {
-        component: "wallet",
         data: data.customize,
         isHideAlign: true,
         layoutSource: _layout.WalletLayout
       })
     }, {
-      key: '6',
+      key: '5',
       name: (0, _locale.i18n)('BACKGROUND'),
       value: /*#__PURE__*/_react["default"].createElement(_BackgroundConfig["default"], {
         data: data.background

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

@@ -7,10 +7,10 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _pick = _interopRequireDefault(require("lodash/pick"));
-
 var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
 
+var _pick = _interopRequireDefault(require("lodash/pick"));
+
 var _Collapse = _interopRequireDefault(require("../../../../common/Collapse"));
 
 var _ImageConfig = _interopRequireDefault(require("../../../../meta-comp/config-panels/ImageConfig"));

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

@@ -9,22 +9,16 @@ var _react = _interopRequireDefault(require("react"));
 
 var _antd = require("antd");
 
-var _mobx = require("../../../../mobx");
-
 var _locale = require("../../../../locale");
 
 var _common = require("../../../../common");
 
-var _TextConfig = _interopRequireDefault(require("../../../../meta-comp/config-panels/TextConfig"));
-
-var _ButtonConfig = _interopRequireDefault(require("../../../../meta-comp/config-panels/ButtonConfig"));
+var _ImageConfig = _interopRequireDefault(require("../../../../meta-comp/config-panels/ImageConfig"));
 
-var _constants = require("../../../../constants");
+var _TextConfig = _interopRequireDefault(require("../../../../meta-comp/config-panels/TextConfig"));
 
 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");
@@ -57,6 +51,22 @@ 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) {
@@ -71,41 +81,26 @@ 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_2',
+        key: 'defaultSource_3',
         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",
@@ -121,59 +116,88 @@ function (_super) {
         title: (0, _locale.i18n)('SOURCE_OF_AMOUNT')
       }, /*#__PURE__*/_react["default"].createElement(_antd.Select, {
         onChange: function onChange(v) {
-          _mobx.frameStore.textModalState.close();
-
           panelProps.sourceType = v;
           panelProps.title.text = v;
-          panelProps.title.html = '';
 
           _this.selfRender();
         },
         value: panelProps.sourceType
       }, /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
-        value: _constants.walletType.BALANCE
-      }, (0, _locale.i18n)('Balance')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
-        value: _constants.walletType.B2B
-      }, (0, _locale.i18n)('B2B PayLater')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
-        value: _constants.walletType.CENDUIT
-      }, (0, _locale.i18n)('CenDuit')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
-        value: _constants.walletType.BNPL
-      }, (0, _locale.i18n)('BNPL')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
-        value: _constants.walletType.CREDIT
+        value: "Cashback"
+      }, (0, _locale.i18n)('Cashback')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
+        value: "Credit"
       }, (0, _locale.i18n)('Credit')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
-        value: _constants.walletType.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"
-      }));
+        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)));
+      }
     };
 
     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)('BACKGROUND'),
-        value: /*#__PURE__*/_react["default"].createElement(_BackgroundConfig["default"], {
-          data: panelProps.background
-        })
+        name: (0, _locale.i18n)('HOVER'),
+        value: hoverPanel,
+        metaOption: panelProps.hover,
+        toggleType: 'switch'
       }]
     }));
   };

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

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

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

@@ -19,8 +19,6 @@ var _ImageLabel = _interopRequireDefault(require("../ImageLabel"));
 
 var _components = require("../../../../meta-comp/components");
 
-var _businessUtil = require("../../../../utils/businessUtil");
-
 require("./index.less");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -95,26 +93,26 @@ function (_super) {
   }
 
   ProductItem.prototype.render = function () {
-    var _a, _b, _c;
-
-    var _d = this.props,
-        data = _d.data,
-        panelProps = _d.panelProps,
-        onItemClick = _d.onItemClick,
-        showProName = _d.showProName,
-        showProgress = _d.showProgress,
-        fixHeight = _d.fixHeight,
-        layout = _d.layout,
-        imgHeight = _d.imgHeight,
-        imgWidth = _d.imgWidth,
-        unknownPrice = _d.unknownPrice,
-        rest = __rest(_d, ["data", "panelProps", "onItemClick", "showProName", "showProgress", "fixHeight", "layout", "imgHeight", "imgWidth", "unknownPrice"]);
-
-    var promotions = (0, _businessUtil.getPromotionList)(data);
+    var _a, _b, _c, _d;
+
+    var _e = this.props,
+        data = _e.data,
+        panelProps = _e.panelProps,
+        onItemClick = _e.onItemClick,
+        showProName = _e.showProName,
+        showProgress = _e.showProgress,
+        fixHeight = _e.fixHeight,
+        layout = _e.layout,
+        imgHeight = _e.imgHeight,
+        imgWidth = _e.imgWidth,
+        unknownPrice = _e.unknownPrice,
+        rest = __rest(_e, ["data", "panelProps", "onItemClick", "showProName", "showProgress", "fixHeight", "layout", "imgHeight", "imgWidth", "unknownPrice"]); // const promotions = getPromotionList(data);
+
+
     var price = (0, _currencyUtil.formatCurrency)(data.salesPrice);
     /** 当是拼团时 显示价格 */
 
-    if (data.sppType && promotions.length) {
+    if (data.sppType) {
       price = data.specialPrice !== null ? (0, _currencyUtil.formatCurrency)(data.specialPrice) : (0, _currencyUtil.formatCurrency)(data.salesPrice);
     }
 
@@ -138,7 +136,7 @@ function (_super) {
 
     var _price = pricePrefix + " " + integerPart + " " + (decimalPart ? '.' + decimalPart : '');
 
-    var oldPrice = data.marketPrice !== null ? (0, _currencyUtil.formatCurrencyWithSymbol)(data.marketPrice) : null;
+    var oldPrice = data.marketPrice ? (0, _currencyUtil.formatCurrencyWithSymbol)(data.marketPrice) : null;
     var discount = Number(data.discountPercent) || 0;
     var salePercent = Number(data.salePercent) / 100 || 0;
     var imgStyle = {};
@@ -176,9 +174,9 @@ function (_super) {
       small: true
     })), /*#__PURE__*/_react["default"].createElement("div", {
       className: "content-wrap"
-    }, panelProps.label.open && /*#__PURE__*/_react["default"].createElement("div", {
+    }, panelProps.label.open && ((_d = data === null || data === void 0 ? void 0 : data.cmpBuygetnLabels) === null || _d === void 0 ? void 0 : _d.length) > 0 && /*#__PURE__*/_react["default"].createElement("div", {
       className: "promotions-wrap"
-    }, promotions.map(function (promot, index) {
+    }, data.cmpBuygetnLabels.map(function (promot, index) {
       return /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
         key: index,
         className: "promotion-item",

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

@@ -7,6 +7,8 @@
   cursor: pointer;
   position: relative;
 
+
+
   .img-wrap {
     position: relative;
 
@@ -19,14 +21,22 @@
 
   .content-wrap {
     padding: 8px;
+    width: 100%;
+    overflow: hidden;
 
     .promotions-wrap {
-      display: flex;
-      flex-wrap: wrap;
+      // display: flex;
+      // flex-wrap: wrap;
+      display: block;
+      width: 100%;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
 
       .promotion-item {
         margin-right: 5px;
         margin-bottom: 5px;
+        display: inline-flex;
 
         &:last-child {
           margin-right: 0;

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

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

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

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

package/es/composite-comp/common/config-panels/SpacingConfig/index.js

@@ -92,7 +92,6 @@ function (_super) {
         _this.selfRender();
       }
     })), /*#__PURE__*/_react["default"].createElement(_common.Field, {
-      split: "dashed",
       title: (0, _locale.i18n)('PADDING')
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "padding-wrap"

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

@@ -261,7 +261,7 @@ function (_super) {
     _this.sortType = '';
     _this.state = {
       list: (0, _coreUtil.isDesignMode)() ? [] : (0, _commonUtil.ensure)(function () {
-        return (0, _storeUtil.getMagicStore)("flashSale_" + (window.magicDesign.pageId || '') + "_" + _this.props.panelProps.id);
+        return (0, _storeUtil.getMagicStore)("flashSale_" + _this.props.panelProps.id);
       }, []),
       effDate: '',
       expDate: '',
@@ -271,7 +271,7 @@ function (_super) {
 
     _this.getFlashData = function (pageSize, campaign) {
       return __awaiter(_this, void 0, void 0, function () {
-        var res, pageId;
+        var res;
         return __generator(this, function (_a) {
           switch (_a.label) {
             case 0:
@@ -286,7 +286,6 @@ function (_super) {
 
             case 1:
               res = _a.sent();
-              pageId = window.magicDesign.pageId || '';
 
               if (!res.list || res.list.length === 0) {
                 // 秒杀场次结束之后，清空列表数据，隐藏秒杀组件
@@ -295,7 +294,7 @@ function (_super) {
                 });
 
                 if (!(0, _coreUtil.isDesignMode)()) {
-                  (0, _storeUtil.setMagicStore)("flashSale_" + pageId + "_" + this.props.panelProps.id, []);
+                  (0, _storeUtil.setMagicStore)("flashSale_" + this.props.panelProps.id, []);
                 }
 
                 return [2
@@ -304,7 +303,7 @@ function (_super) {
               }
 
               if (!(0, _coreUtil.isDesignMode)()) {
-                (0, _storeUtil.setMagicStore)("flashSale_" + pageId + "_" + this.props.panelProps.id, res.list);
+                (0, _storeUtil.setMagicStore)("flashSale_" + this.props.panelProps.id, res.list);
               }
 
               this.setState({
@@ -324,7 +323,7 @@ function (_super) {
 
     _this.getNextFlashSale = function () {
       return __awaiter(_this, void 0, void 0, function () {
-        var data, pageId;
+        var data;
         return __generator(this, function (_a) {
           switch (_a.label) {
             case 0:
@@ -344,10 +343,9 @@ function (_super) {
                 this.setState({
                   list: []
                 });
-                pageId = window.magicDesign.pageId || '';
 
                 if (!(0, _coreUtil.isDesignMode)()) {
-                  (0, _storeUtil.setMagicStore)("flashSale_" + pageId + "_" + this.props.panelProps.id, []);
+                  (0, _storeUtil.setMagicStore)("flashSale_" + this.props.panelProps.id, []);
                 }
               }