@fonixtree/magic-design 2.0.105 → 2.0.108

package/lib/common/LinkModal/index.js

@@ -53,6 +53,8 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+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); }
+
 var __assign = void 0 && (void 0).__assign || function () {
   __assign = Object.assign || function (t) {
     for (var s, i = 1, n = arguments.length; i < n; i++) {
@@ -216,23 +218,28 @@ var LinkModal = function LinkModal(props) {
   var onConfirm = props.onConfirm,
       onClose = props.onClose,
       visible = props.visible,
-      onlySpecificCode = props.onlySpecificCode;
+      onlySpecificCode = props.onlySpecificCode,
+      selfFetch = props.selfFetch,
+      _a = props.modalConfig,
+      modalConfig = _a === void 0 ? {} : _a;
+
+  var _b = (0, _react.useState)(''),
+      linkUrl = _b[0],
+      setLinkUrl = _b[1];
 
-  var _a = (0, _react.useState)(''),
-      linkUrl = _a[0],
-      setLinkUrl = _a[1];
+  var _c = (0, _react.useState)('Category'),
+      selected = _c[0],
+      setSelected = _c[1];
 
-  var _b = (0, _react.useState)('Category'),
-      selected = _b[0],
-      setSelected = _b[1];
+  var _d = (0, _react.useState)([]),
+      linkTypes = _d[0],
+      setLinkTypes = _d[1];
 
-  var _c = (0, _react.useState)([]),
-      linkTypes = _c[0],
-      setLinkTypes = _c[1];
+  var _fetch = selfFetch || _commonUtil.commonFetch;
 
-  var _d = (0, _react.useState)(0),
-      total = _d[0],
-      setTotal = _d[1];
+  var _e = (0, _react.useState)(0),
+      total = _e[0],
+      setTotal = _e[1];
 
   var getLinkTypes = function getLinkTypes() {
     return __awaiter(void 0, void 0, void 0, function () {
@@ -242,7 +249,7 @@ var LinkModal = function LinkModal(props) {
           case 0:
             return [4
             /*yield*/
-            , (0, _commonUtil.commonFetch)('/designer/v1/linktypes', {
+            , _fetch('/designer/v1/linktypes', {
               partyType: window.magicDesign.partyType
             })];
 
@@ -295,18 +302,18 @@ var LinkModal = function LinkModal(props) {
     setSelected(type);
   };
 
-  return /*#__PURE__*/_react["default"].createElement(_antd.Modal, {
+  return /*#__PURE__*/_react["default"].createElement(_antd.Modal, _extends({
     cancelText: (0, _locale.i18n)('CANCEL'),
     draggable: false,
     footer: null,
-    okText: "OK",
-    onCancel: onClose // onOk={onConfirm}
+    okText: "OK" // onOk={onConfirm}
     ,
+    onCancel: onClose,
     title: (0, _locale.i18n)('URL_SETUP'),
     visible: visible,
     width: "1000px",
     wrapClassName: "magicLinkModal"
-  }, /*#__PURE__*/_react["default"].createElement(_antd.Tabs, {
+  }, modalConfig), /*#__PURE__*/_react["default"].createElement(_antd.Tabs, {
     activeKey: selected,
     onChange: onTabsChange
   }, linkTypes.map(function (item) {
@@ -318,59 +325,73 @@ var LinkModal = function LinkModal(props) {
         setLinkUrl(value);
       }
     }), item.linkTypeCode === 'Category' && /*#__PURE__*/_react["default"].createElement(_CatgTable["default"], {
+      _fetch: _fetch,
       onChange: function onChange(value) {
         return setLinkUrl(value);
       }
     }), item.linkTypeCode === 'CustomizedPage' && /*#__PURE__*/_react["default"].createElement(_CustomTable["default"], {
+      _fetch: _fetch,
       onChange: function onChange(value) {
         return setLinkUrl(value);
       }
     }), item.linkTypeCode === 'ProductDetailPage' && /*#__PURE__*/_react["default"].createElement(_ProductDetailPage["default"], {
+      _fetch: _fetch,
       onChange: function onChange(url) {
         return setLinkUrl(url);
       }
     }), item.linkTypeCode === 'FilteredProduct' && /*#__PURE__*/_react["default"].createElement(_FilteredProductModal["default"], {
+      _fetch: _fetch,
       onDataChange: function onDataChange(url, t) {
         setLinkUrl(url);
         setTotal(t);
       }
     }), item.linkTypeCode === 'FunctionPage' && /*#__PURE__*/_react["default"].createElement(_FunctionTable["default"], {
+      _fetch: _fetch,
       onChange: function onChange(value) {
         return setLinkUrl(value);
       }
     }), item.linkTypeCode === 'Coupons' && /*#__PURE__*/_react["default"].createElement(_CouponTable["default"], {
+      _fetch: _fetch,
       onChange: function onChange(value) {
         return setLinkUrl(value);
       }
     }), item.linkTypeCode === 'BundleCampaign' && /*#__PURE__*/_react["default"].createElement(_BundleCampaign["default"], {
+      _fetch: _fetch,
       onChange: function onChange(value) {
         return setLinkUrl(value);
       }
     }), item.linkTypeCode === 'Video' && /*#__PURE__*/_react["default"].createElement(_SelectVideoModal["default"], {
+      _fetch: _fetch,
       setUrl: function setUrl(value) {
         return setLinkUrl(value);
       }
     }), item.linkTypeCode === 'ShareURL' && /*#__PURE__*/_react["default"].createElement(_ShareUrl["default"], {
+      _fetch: _fetch,
       onChange: function onChange(value) {
         return setLinkUrl(value);
       }
     }), item.linkTypeCode === 'MiniApp' && /*#__PURE__*/_react["default"].createElement(_MiniAppTable["default"], {
+      _fetch: _fetch,
       onChange: function onChange(value) {
         return setLinkUrl(value);
       }
     }), item.linkTypeCode === 'Store' && /*#__PURE__*/_react["default"].createElement(_StoreTable["default"], {
+      _fetch: _fetch,
       onChange: function onChange(value) {
         return setLinkUrl(value);
       }
     }), item.linkTypeCode === 'AffiliateProduct' && /*#__PURE__*/_react["default"].createElement(_AffiliateProductTable["default"], {
+      _fetch: _fetch,
       onChange: function onChange(value) {
         return setLinkUrl(value);
       }
     }), item.linkTypeCode === 'AffiliateStore' && /*#__PURE__*/_react["default"].createElement(_AffiliateStore["default"], {
+      _fetch: _fetch,
       onChange: function onChange(value) {
         return setLinkUrl(value);
       }
     }), item.linkTypeCode === 'MiniApi' && /*#__PURE__*/_react["default"].createElement(_MiniAppApi["default"], {
+      _fetch: _fetch,
       onChange: function onChange(value) {
         return setLinkUrl(value);
       }

package/lib/common/UrlPicker/index.js

@@ -82,7 +82,9 @@ function (_super) {
         value = _c.value,
         _onChange = _c.onChange,
         disabled = _c.disabled,
-        onlySpecificCode = _c.onlySpecificCode; // 弹框选择url不可编辑，需要先清除
+        onlySpecificCode = _c.onlySpecificCode,
+        selfFetch = _c.selfFetch,
+        modalConfig = _c.modalConfig; // 弹框选择url不可编辑，需要先清除
 
     var editable = !value || !value.type;
     var inputName = (value === null || value === void 0 ? void 0 : value.name) || '';
@@ -134,6 +136,7 @@ function (_super) {
       size: "20px",
       type: "icon-delete1"
     }))), visible && /*#__PURE__*/_react["default"].createElement(_LinkModal["default"], {
+      modalConfig: modalConfig,
       onClose: function onClose() {
         return _this.setState({
           visible: false
@@ -147,6 +150,7 @@ function (_super) {
         });
       },
       onlySpecificCode: onlySpecificCode,
+      selfFetch: selfFetch,
       visible: visible
     }), anchorModalVisible && /*#__PURE__*/_react["default"].createElement(_AnchorModal["default"], {
       initData: value,

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = void 0;
+exports.renderDiscount = exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
@@ -84,6 +84,26 @@ var __rest = void 0 && (void 0).__rest || function (s, e) {
   return t;
 };
 
+var renderDiscount = function renderDiscount(data) {
+  var AMT = data.discountMethod === 'AMT'; // 金额扣减
+
+  var DISC = data.discountMethod === 'DISC'; // 百分比
+
+  var text = '';
+
+  if (AMT) {
+    text = (0, _currencyUtil.formatCurrencyWithSymbol)(data.discountAmount);
+  } else if (DISC) {
+    var temp = (0, _currencyUtil.formatCurrency)(data.discountAmount, 2); // 折扣券处理：100 => 1%
+
+    text = parseInt(temp, 10) + "%";
+  }
+
+  return text;
+};
+
+exports.renderDiscount = renderDiscount;
+
 var ProductItem =
 /** @class */
 function (_super) {
@@ -253,7 +273,18 @@ function (_super) {
         text: "Sold " + (soldNumber || 0) + "+"
       }),
       readonly: true
-    }))), showProgress && /*#__PURE__*/_react["default"].createElement("div", {
+    }))), data.coupons && data.coupons.length > 0 && /*#__PURE__*/_react["default"].createElement("div", {
+      className: "coupons-list"
+    }, data.coupons.map(function (m) {
+      return /*#__PURE__*/_react["default"].createElement("div", {
+        key: m.couponId,
+        className: (0, _classnames["default"])('item', m.discountMethod)
+      }, /*#__PURE__*/_react["default"].createElement("div", {
+        className: "name"
+      }, "DISCOUNT"), /*#__PURE__*/_react["default"].createElement("div", {
+        className: "num"
+      }, renderDiscount(m)));
+    })), showProgress && /*#__PURE__*/_react["default"].createElement("div", {
       className: "progress-wrap"
     }, ((_j = panelProps.salesProgress) === null || _j === void 0 ? void 0 : _j.open) && /*#__PURE__*/_react["default"].createElement("div", {
       className: "progress-container"

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

@@ -153,6 +153,42 @@
       }
     }
 
+    .coupons-list {
+      display: flex;
+      flex-wrap: wrap;
+      margin-top: 8px;
+
+      .item {
+        width: 53px;
+        height: 20px;
+        color: #F47A46;
+        background: url('./imgs/coupon-orange.png') no-repeat center;
+        background-size: 100%;
+        margin-right: 6px;
+        margin-bottom: 4px;
+        line-height: 1;
+        text-align: center;
+        padding: 2px 0;
+
+        &.DISC {
+          color: #FF5757;
+          background: url('./imgs/coupon-red.png') no-repeat center;
+        }
+
+        .name {
+          font-size: 5px;
+          width: 40px;
+          margin-bottom: 1px;
+        }
+
+        .num {
+          font-size: 10px;
+          font-weight: 800;
+          width: 40px;
+        }
+      }
+    }
+
     .progress-wrap {
       margin-top: 10px;
 

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

@@ -377,7 +377,7 @@ function (_super) {
               , 6];
 
             case 3:
-              if (!(sourceType === 'recommend' || sourceType === 'cross')) return [3
+              if (!(sourceType === 'recommend')) return [3
               /*break*/
               , 5];
               return [4

package/lib/composite-comp/dito/components/SearchBar/defaultJSON.js

@@ -44,6 +44,7 @@ var getDefaultJSON = function getDefaultJSON() {
         }
       },
       keyword: {
+        id: (0, _uuid.v4)(),
         open: true,
         type: 'InputField',
         placeholder: 'Tshirt Woman',

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

@@ -351,7 +351,7 @@ function (_super) {
         cartNum = _t.cartNum,
         value = _t.value;
 
-    var style = __assign({}, (0, _Text.contentStyle)((_a = data.content.keyword) === null || _a === void 0 ? void 0 : _a.content));
+    var style = __assign({}, (0, _Text.contentStyle)(((_a = data.content.keyword) === null || _a === void 0 ? void 0 : _a.content) || {}));
 
     Reflect.deleteProperty(style, 'width');
     return /*#__PURE__*/_react["default"].createElement("div", {

package/lib/composite-comp/dito/components/SearchBar/pc/index.js

@@ -152,7 +152,7 @@ function (_super) {
     var data = this.props.data;
     var inputVal = this.state.inputVal;
 
-    var style = __assign({}, (0, _Text.contentStyle)((_a = data.content.keyword) === null || _a === void 0 ? void 0 : _a.content));
+    var style = __assign({}, (0, _Text.contentStyle)(((_a = data.content.keyword) === null || _a === void 0 ? void 0 : _a.content) || {}));
 
     Reflect.deleteProperty(style, 'width');
     return /*#__PURE__*/_react["default"].createElement("div", {

package/lib/composite-comp/dito/config-panels/SearchBarConfig/SearchBarConfigContent/index.js

@@ -126,7 +126,7 @@ function (_super) {
       metaOption: panelProps.box,
       toggleType: 'switch'
     }, {
-      key: panelProps.keyword.id,
+      key: 'search3',
       name: (0, _locale.i18n)('SEARCH_BAR_KEYWORD'),
       toggleType: 'switch',
       value: /*#__PURE__*/_react["default"].createElement("div", {
@@ -139,7 +139,7 @@ function (_super) {
       })),
       metaOption: panelProps.keyword
     }, {
-      key: panelProps.icon.id,
+      key: 'search4',
       name: (0, _locale.i18n)('ICON'),
       toggleType: 'triangle',
       value: /*#__PURE__*/_react["default"].createElement("div", {

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

@@ -111,9 +111,7 @@ function (_super) {
         value: "select"
       }, (0, _locale.i18n)('SELECT_PRODUCT')), _this.hasSource('A') && /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
         value: "recommend"
-      }, (0, _locale.i18n)('AI_RECOMMENDATION')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
-        value: "cross"
-      }, "Cross Selling"))), /*#__PURE__*/_react["default"].createElement("div", {
+      }, (0, _locale.i18n)('AI_RECOMMENDATION')))), /*#__PURE__*/_react["default"].createElement("div", {
         className: "greyBg"
       }, panelProps.sourceType === 'select' && /*#__PURE__*/_react["default"].createElement(_common.ProductSource, {
         onChange: function onChange(ids, type) {
@@ -124,7 +122,7 @@ function (_super) {
         },
         prodType: panelProps.prodType,
         value: panelProps.prodIds
-      }), (panelProps.sourceType === 'recommend' || panelProps.sourceType === 'cross') && /*#__PURE__*/_react["default"].createElement(_AIRecommendation["default"], {
+      }), panelProps.sourceType === 'recommend' && /*#__PURE__*/_react["default"].createElement(_AIRecommendation["default"], {
         onChange: function onChange(val) {
           panelProps.intelligentType = val.intelligentType;
           panelProps.intelligentValue = val.intelligentValue;
@@ -135,7 +133,7 @@ function (_super) {
           intelligentType: panelProps.intelligentType,
           intelligentValue: panelProps.intelligentValue
         }
-      }), (panelProps.sourceType === 'recommend' || panelProps.sourceType === 'cross') && /*#__PURE__*/_react["default"].createElement(_common.Field, {
+      }), panelProps.sourceType === 'recommend' && /*#__PURE__*/_react["default"].createElement(_common.Field, {
         title: (0, _locale.i18n)('PRODUCT_QUANTITY')
       }, /*#__PURE__*/_react["default"].createElement(_antd.Radio.Group, {
         onChange: function onChange(e) {

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

@@ -314,7 +314,7 @@ function (_super) {
                 interestName: res.interest.interestName,
                 list: list
               });
-              this.getMacy();
+              if (list.length > 0) this.getMacy();
               (0, _storeUtil.setMagicStore)("interestProducts_" + (window.magicDesign.pageId || '') + "_" + this.props.panelProps.id, list);
               return [2
               /*return*/
@@ -331,7 +331,10 @@ function (_super) {
     if (!(0, _coreUtil.isDesignMode)()) {
       this.getData();
     } else {
-      this.getMacy();
+      if (this.state.list.length > 0) this.getMacy();
+      this.setState({
+        interestName: 'Interest Name'
+      });
     }
   };
 
@@ -340,7 +343,7 @@ function (_super) {
     var _a = this.state,
         interestName = _a.interestName,
         list = _a.list;
-    return /*#__PURE__*/_react["default"].createElement("div", {
+    return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, list.length > 0 && /*#__PURE__*/_react["default"].createElement("div", {
       className: "monpay-interest-products-mobile"
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "interest-products-title"
@@ -361,7 +364,7 @@ function (_super) {
           (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || item.productId || ''));
         }
       });
-    })));
+    }))));
   };
 
   InterestProductsMobile.defaultProps = {

package/lib/composite-comp/monpay/components/MerchantSales/defaultJSON.js

@@ -47,7 +47,8 @@ var getDefaultJSON = function getDefaultJSON() {
           fontFamily: 'Open Sans',
           fontWeight: 400,
           fontSize: 14,
-          color: '#000'
+          color: '#000',
+          urlDisabled: true
         },
         underline: {
           open: false,

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

@@ -11,6 +11,8 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _commonUtil = require("../../../../../../utils/commonUtil");
 
+var _components = require("../../../../../../meta-comp/components");
+
 var _common = require("../../../../../../common");
 
 require("./index.less");
@@ -45,6 +47,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 __rest = void 0 && (void 0).__rest || function (s, e) {
   var t = {};
 
@@ -73,8 +91,9 @@ function (_super) {
   ProductItem.prototype.render = function () {
     var _a = this.props,
         data = _a.data,
+        panelProps = _a.panelProps,
         onItemClick = _a.onItemClick,
-        rest = __rest(_a, ["data", "onItemClick"]);
+        rest = __rest(_a, ["data", "panelProps", "onItemClick"]);
 
     return /*#__PURE__*/_react["default"].createElement("div", _extends({
       className: (0, _classnames["default"])('monpay-merchant-product-item-wrap'),
@@ -89,9 +108,12 @@ function (_super) {
       src: (0, _commonUtil.convertImageUrl)(data.productImg || data.imgUrlContent || data.productImageUrlContent)
     }), /*#__PURE__*/_react["default"].createElement("div", {
       className: "sale-tag"
-    })), /*#__PURE__*/_react["default"].createElement("div", {
-      className: "prodName"
-    }, data.offerName));
+    })), panelProps.merchantName.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
+      className: "prodName",
+      data: __assign(__assign({}, panelProps.merchantName), {
+        text: data.offerName
+      })
+    }));
   };
 
   ProductItem.defaultProps = {

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

@@ -284,7 +284,8 @@ function (_super) {
         data: item,
         onItemClick: function onItemClick() {
           (0, _coreUtil.clickUrl)("proDetail-" + item.offerId + "-" + (item.sppProductId || item.productId || ''));
-        }
+        },
+        panelProps: panelProps.content
       });
     }))));
   };

package/lib/composite-comp/monpay/components/MonpayFlashDeal/defaultJSON.js

@@ -115,6 +115,7 @@ var getDefaultJSON = function getDefaultJSON() {
         hover: null
       },
       sessionTime: {
+        id: (0, _uuid.v4)(),
         open: false
       }
     },
@@ -284,6 +285,7 @@ var getDefaultJSON = function getDefaultJSON() {
         color: '#FF8650'
       },
       stock: {
+        id: (0, _uuid.v4)(),
         open: true
       }
     },

package/lib/composite-comp/monpay/components/MonpayRecommend/defaultJSON.js

@@ -305,7 +305,8 @@ var getDefaultJSON = function getDefaultJSON() {
           fontFamily: 'Open Sans',
           fontWeight: 400,
           fontSize: 10,
-          color: '#545454'
+          color: '#545454',
+          urlDisabled: true
         },
         underline: {
           open: false,
@@ -328,7 +329,8 @@ var getDefaultJSON = function getDefaultJSON() {
           fontFamily: 'Open Sans',
           fontWeight: 400,
           fontSize: 10,
-          color: '#545454'
+          color: '#545454',
+          urlDisabled: true
         },
         underline: {
           open: false,