@fonixtree/magic-design 0.0.49 → 0.0.51

package/es/common/LinkModal/ProductDetailPage/index.js

@@ -206,9 +206,9 @@ var ProductDetailPage = function ProductDetailPage(props) {
       brandData = _b[0],
       setBrandData = _b[1];
 
-  var _c = (0, _react.useState)({}),
+  var _c = (0, _react.useState)([]),
       brandId = _c[0],
-      settBrandId = _c[1];
+      setBrandId = _c[1];
 
   var _d = (0, _react.useState)(''),
       productCode = _d[0],
@@ -218,16 +218,24 @@ var ProductDetailPage = function ProductDetailPage(props) {
       productName = _e[0],
       setProductName = _e[1];
 
-  var _f = (0, _react.useState)(false),
-      loading = _f[0],
-      setLoading = _f[1];
+  var _f = (0, _react.useState)([]),
+      storeId = _f[0],
+      setStoreId = _f[1];
 
-  var _g = (0, _react.useState)({
+  var _g = (0, _react.useState)([]),
+      storeList = _g[0],
+      setStoreList = _g[1];
+
+  var _h = (0, _react.useState)(false),
+      loading = _h[0],
+      setLoading = _h[1];
+
+  var _j = (0, _react.useState)({
     pageSize: 20,
     current: 1
   }),
-      paginationParams = _g[0],
-      setPaginationParams = _g[1];
+      paginationParams = _j[0],
+      setPaginationParams = _j[1];
 
   var columns = [{
     title: 'Image',
@@ -250,7 +258,7 @@ var ProductDetailPage = function ProductDetailPage(props) {
     dataIndex: 'attrValues',
     ellipsis: true
   }, {
-    title: 'Merchant',
+    title: 'Store',
     dataIndex: 'storeName',
     width: 150,
     ellipsis: true
@@ -307,16 +315,44 @@ var ProductDetailPage = function ProductDetailPage(props) {
         }
       });
     });
+  }; // 请求店铺列表
+
+
+  var queryStore = function queryStore() {
+    return __awaiter(void 0, void 0, void 0, function () {
+      var res;
+      return __generator(this, function (_a) {
+        switch (_a.label) {
+          case 0:
+            return [4
+            /*yield*/
+            , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/stores/list", {}, 'GET')];
+
+          case 1:
+            res = _a.sent();
+            setStoreList(res);
+            return [2
+            /*return*/
+            ];
+        }
+      });
+    });
   };
 
   var handleBrandChange = function handleBrandChange(value, node) {
-    settBrandId(node);
+    setBrandId(node.map(function (v) {
+      return {
+        key: v.key,
+        value: v.value
+      };
+    }));
   };
 
   var reset = function reset() {
     setProductName('');
     setProductCode('');
-    settBrandId({});
+    setBrandId([]);
+    setStoreId([]);
   };
 
   (0, _react.useEffect)(function () {
@@ -327,6 +363,7 @@ var ProductDetailPage = function ProductDetailPage(props) {
 
     queryGoods(params);
     queryBrand();
+    queryStore();
   }, []);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "productDetailPage"
@@ -340,17 +377,23 @@ var ProductDetailPage = function ProductDetailPage(props) {
   }, /*#__PURE__*/_react["default"].createElement(_antd.Col, {
     span: 9
   }, /*#__PURE__*/_react["default"].createElement(_antd.Form.Item, {
-    label: "Product Name",
-    name: "productName"
+    label: "Product Name"
   }, /*#__PURE__*/_react["default"].createElement(_antd.Input, {
-    size: "small"
+    onChange: function onChange(e) {
+      return setProductName(e.target.value);
+    },
+    size: "small",
+    value: productName
   }))), /*#__PURE__*/_react["default"].createElement(_antd.Col, {
     span: 9
   }, /*#__PURE__*/_react["default"].createElement(_antd.Form.Item, {
-    label: "SKU Code",
-    name: "productCode"
+    label: "SKU Code"
   }, /*#__PURE__*/_react["default"].createElement(_antd.Input, {
-    size: "small"
+    onChange: function onChange(e) {
+      return setProductCode(e.target.value);
+    },
+    size: "small",
+    value: productCode
   }))), /*#__PURE__*/_react["default"].createElement(_antd.Col, {
     span: 6
   }, /*#__PURE__*/_react["default"].createElement(_antd.Button, {
@@ -364,7 +407,10 @@ var ProductDetailPage = function ProductDetailPage(props) {
       queryGoods(__assign({
         productName: productName,
         productCode: productCode,
-        brandIds: brandId.key || ''
+        brandIds: brandId.map(function (v) {
+          return v.key;
+        }).join(',') || '',
+        storeId: storeId
       }, params));
     },
     size: "small",
@@ -380,16 +426,40 @@ var ProductDetailPage = function ProductDetailPage(props) {
   }, (0, _locale.i18n)('CANCEL'))), /*#__PURE__*/_react["default"].createElement(_antd.Col, {
     span: 9
   }, /*#__PURE__*/_react["default"].createElement(_antd.Form.Item, {
-    label: "Brand",
-    name: "brandId"
+    label: "Brand"
   }, /*#__PURE__*/_react["default"].createElement(_antd.Select, {
+    defaultValue: [],
+    mode: "multiple",
+    onChange: handleBrandChange,
     placeholder: (0, _locale.i18n)('PLEASE_SELECT'),
-    size: "small"
+    size: "small",
+    value: brandId.map(function (v) {
+      return v.value;
+    })
   }, brandData && brandData.length > 0 && brandData.map(function (v) {
     return /*#__PURE__*/_react["default"].createElement(Option, {
       key: v.brandId,
       value: v.brandName
     }, v.brandName);
+  })))), /*#__PURE__*/_react["default"].createElement(_antd.Col, {
+    span: 9
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Form.Item, {
+    label: "Store"
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Select, {
+    defaultValue: [],
+    onChange: function onChange(value) {
+      return setStoreId(value);
+    },
+    optionFilterProp: "children",
+    placeholder: "Please select",
+    showSearch: true,
+    size: "small",
+    value: storeId
+  }, storeList && storeList.length > 0 && storeList.map(function (v) {
+    return /*#__PURE__*/_react["default"].createElement(Option, {
+      key: v.storeId,
+      value: v.storeId
+    }, v.storeName);
   })))))), /*#__PURE__*/_react["default"].createElement(_antd.Table, {
     bordered: false,
     columns: columns,
@@ -406,7 +476,10 @@ var ProductDetailPage = function ProductDetailPage(props) {
         queryGoods(__assign({
           productName: productName,
           productCode: productCode,
-          brandIds: brandId.key || ''
+          brandIds: brandId.map(function (v) {
+            return v.key;
+          }).join(',') || '',
+          storeId: storeId
         }, params));
       },
       showSizeChanger: false
@@ -414,7 +487,7 @@ var ProductDetailPage = function ProductDetailPage(props) {
     rowKey: "productId",
     rowSelection: rowSelection,
     scroll: {
-      y: 290
+      y: 340
     }
   }));
 };

package/es/common/LinkModal/index.js

@@ -23,6 +23,8 @@ var _CatgTable = _interopRequireDefault(require("./CatgTable"));
 
 var _CustomTable = _interopRequireDefault(require("./CustomTable"));
 
+var _BundleCampaign = _interopRequireDefault(require("./BundleCampaign"));
+
 var _locale = require("../../locale");
 
 require("./index.less");
@@ -46,7 +48,7 @@ var LinkModal = function LinkModal(props) {
       selected = _b[0],
       setSelected = _b[1];
 
-  var list = ['Category', 'Customized Page', 'Product Details Page', 'Filtered Products', 'Function Page', 'Coupons'];
+  var list = ['Category', 'Customized Page', 'Product Details Page', 'Filtered Products', 'Function Page', 'Coupons', 'Bundle Campaign'];
 
   var _c = (0, _react.useState)(0),
       total = _c[0],
@@ -118,6 +120,10 @@ var LinkModal = function LinkModal(props) {
     onChange: function onChange(value) {
       return setLinkUrl(value);
     }
+  }), selected === 'Bundle Campaign' && /*#__PURE__*/_react["default"].createElement(_BundleCampaign["default"], {
+    setUrl: function setUrl(url) {
+      return setLinkUrl(url);
+    }
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: "footer"
   }, selected === 'Filtered Products' ? /*#__PURE__*/_react["default"].createElement("div", {

package/es/common/LinkModal/index.less

@@ -10,7 +10,7 @@
     font-size: 14px;
     line-height: 22px;
     color: #232F46;
-    height: 600px;
+    height: 680px;
 
     .linkType {
       display: flex;

package/es/common/ProductModal/index.js

@@ -257,39 +257,47 @@ var ProductModal = function ProductModal(props) {
       selLabelData = _j[0],
       setSelLabelData = _j[1];
 
-  var _k = (0, _react.useState)(''),
-      productName = _k[0],
-      setProductName = _k[1];
+  var _k = (0, _react.useState)([]),
+      storeList = _k[0],
+      setStoreList = _k[1];
 
   var _l = (0, _react.useState)(''),
-      productCode = _l[0],
-      setProductCode = _l[1];
+      productName = _l[0],
+      setProductName = _l[1];
 
   var _m = (0, _react.useState)(''),
-      minPrice = _m[0],
-      setMinPrice = _m[1];
+      productCode = _m[0],
+      setProductCode = _m[1];
 
-  var _o = (0, _react.useState)(''),
-      maxPrice = _o[0],
-      setMaxPrice = _o[1];
+  var _o = (0, _react.useState)([]),
+      storeId = _o[0],
+      setStoreId = _o[1];
 
-  var _p = (0, _react.useState)([]),
-      promotions = _p[0],
-      setPromotions = _p[1];
+  var _p = (0, _react.useState)(''),
+      minPrice = _p[0],
+      setMinPrice = _p[1];
 
-  var _q = (0, _react.useState)([]),
-      goodsList = _q[0],
-      setGoodsList = _q[1];
+  var _q = (0, _react.useState)(''),
+      maxPrice = _q[0],
+      setMaxPrice = _q[1];
 
-  var _r = (0, _react.useState)(false),
-      loading = _r[0],
-      setLoading = _r[1];
+  var _r = (0, _react.useState)([]),
+      promotions = _r[0],
+      setPromotions = _r[1];
 
-  var _s = (0, _react.useState)(defaultList.map(function (v) {
+  var _s = (0, _react.useState)([]),
+      goodsList = _s[0],
+      setGoodsList = _s[1];
+
+  var _t = (0, _react.useState)(false),
+      loading = _t[0],
+      setLoading = _t[1];
+
+  var _u = (0, _react.useState)(defaultList.map(function (v) {
     return v.productId;
   })),
-      selectedRowKeys = _s[0],
-      setSelectedRowKeys = _s[1];
+      selectedRowKeys = _u[0],
+      setSelectedRowKeys = _u[1];
 
   var rowSelection = {
     selectedRowKeys: selectedRowKeys,
@@ -321,13 +329,13 @@ var ProductModal = function ProductModal(props) {
     }
   };
 
-  var _t = (0, _react.useState)({
+  var _v = (0, _react.useState)({
     pageSize: 20,
     current: 1,
     total: 0
   }),
-      paginationParams = _t[0],
-      setPaginationParams = _t[1];
+      paginationParams = _v[0],
+      setPaginationParams = _v[1];
 
   var delSelectedItem = function delSelectedItem(index) {
     console.log(selectedRowKeys, index, 2223);
@@ -432,12 +440,35 @@ var ProductModal = function ProductModal(props) {
         }
       });
     });
+  }; // 请求店铺列表
+
+
+  var queryStore = function queryStore() {
+    return __awaiter(void 0, void 0, void 0, function () {
+      var res;
+      return __generator(this, function (_a) {
+        switch (_a.label) {
+          case 0:
+            return [4
+            /*yield*/
+            , (0, _commonUtil.commonFetch)(window.magicDesign.MBaseUrl + "/stores/list", {}, 'GET')];
+
+          case 1:
+            res = _a.sent();
+            setStoreList(res);
+            return [2
+            /*return*/
+            ];
+        }
+      });
+    });
   };
 
   (0, _react.useEffect)(function () {
     queryOfferCatgs();
     queryBrands();
     queryLabel();
+    queryStore();
   }, []);
   (0, _react.useEffect)(function () {
     setSelectedList(defaultList);
@@ -455,6 +486,7 @@ var ProductModal = function ProductModal(props) {
     setSelCatgsList([]);
     setSelLabelData([]);
     setProductName('');
+    setStoreId([]);
     setProductCode('');
     setMinPrice('');
     setMaxPrice('');
@@ -507,17 +539,6 @@ var ProductModal = function ProductModal(props) {
     width: 100,
     ellipsis: true
   }];
-
-  var onResetQryCondition = function onResetQryCondition() {
-    setProductName('');
-    setPromotions(null);
-    setMinPrice('');
-    setMaxPrice('');
-    setSelBrandsList([]);
-    setSelCatgsList([]);
-    setSelLabelData([]);
-  };
-
   return /*#__PURE__*/_react["default"].createElement(_antd.Modal, {
     cancelText: (0, _locale.i18n)('CANCEL'),
     draggable: false,
@@ -572,6 +593,23 @@ var ProductModal = function ProductModal(props) {
       key: item.catgId,
       value: item.brandId
     }, item.brandName);
+  }))), /*#__PURE__*/_react["default"].createElement(_antd.Form.Item, {
+    label: "Store"
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Select, {
+    className: "inputStyle",
+    defaultValue: [],
+    onChange: function onChange(value) {
+      return setStoreId(value);
+    },
+    optionFilterProp: "children",
+    placeholder: "Please select",
+    showSearch: true,
+    value: storeId
+  }, storeList && storeList.length > 0 && storeList.map(function (v) {
+    return /*#__PURE__*/_react["default"].createElement(Option, {
+      key: v.storeId,
+      value: v.storeId
+    }, v.storeName);
   }))), /*#__PURE__*/_react["default"].createElement(_antd.Form.Item, {
     label: "Lable"
   }, /*#__PURE__*/_react["default"].createElement(_antd.Select, {
@@ -661,6 +699,7 @@ var ProductModal = function ProductModal(props) {
       queryGoods({
         productName: productName,
         productCode: productCode,
+        storeId: storeId,
         cmpTypeId: promotions || '',
         minPrice: minPrice === '' ? '' : minPrice * Math.pow(10, precision),
         maxPrice: maxPrice === '' ? '' : maxPrice * Math.pow(10, precision),

package/es/common/ProductSource/index.js

@@ -240,7 +240,9 @@ function ProductSource(_a) {
     type: "primary"
   }, (0, _locale.i18n)('SELECT_PRODUCT')), /*#__PURE__*/_react["default"].createElement("div", {
     className: "total"
-  }, "Total ", getLength(), " products"), visible && /*#__PURE__*/_react["default"].createElement(_ProductModal["default"], {
+  }, (0, _locale.i18n)('TOTAL_PRODUCTS', {
+    count: getLength()
+  })), visible && /*#__PURE__*/_react["default"].createElement(_ProductModal["default"], {
     closeModal: function closeModal() {
       return setVisbile(false);
     },

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

@@ -71,14 +71,14 @@ function (_super) {
         return /*#__PURE__*/_react["default"].createElement("img", {
           key: label.imgUrl || label.labelPictureUrl,
           alt: "img",
-          className: (0, _classnames["default"])('image-label-wrap', 'img', (_a = {}, _a["position-" + (label.position || 'default')] = true, _a.small = small, _a)),
+          className: (0, _classnames["default"])('image-label-wrap', 'img', (_a = {}, _a["position-" + (label.position || 'null')] = true, _a.small = small, _a)),
           src: label.imgUrl || label.labelPictureUrl
         });
       }
 
       return /*#__PURE__*/_react["default"].createElement("div", {
         key: label.labelName,
-        className: (0, _classnames["default"])('image-label-wrap', (_b = {}, _b["position-" + (label.position || 'default')] = true, _b))
+        className: (0, _classnames["default"])('image-label-wrap', (_b = {}, _b["position-" + (label.position || 'null')] = true, _b))
       }, label.labelName);
     });
   };

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

@@ -12,8 +12,7 @@
     }
   }
 
-  &.position-1,
-  &.position-default {
+  &.position-1 {
     top: 0;
     left: 0;
   }
@@ -32,4 +31,9 @@
     bottom: 0;
     right: 0;
   }
+
+  &.position-null {
+    top: 0;
+    left: 0;
+  }
 }

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

@@ -4,14 +4,11 @@
   background: #FFFFFF;
   border: 1px solid #D2D9E5;
   width: 142px;
-  border-radius: 8px;
 
   .img-wrap {
     position: relative;
-    border-radius: 8px;
 
     .product-img {
-      border-radius: 8px;
       width: 140px;
       height: 140px;
       object-fit: cover;
@@ -36,7 +33,7 @@
     }
 
     .product-name {
-      margin-bottom: 5px;
+      margin-bottom: 3px;
       // font-family: 'Montserrat';
       // font-style: normal;
       // font-weight: 500;
@@ -60,7 +57,7 @@
 
     .old-price-wrap {
       display: flex;
-      margin-top: 3px;
+      margin-top: 0px;
       align-items: baseline;
       white-space: nowrap;
       overflow: hidden;
@@ -71,9 +68,11 @@
         font-family: 'Montserrat';
         font-style: normal;
         font-weight: 700;
-        font-size: 12px;
+        font-size: 8px;
         line-height: 15px;
-        color: #2F3043;
+        color: #fff;
+        padding: 0 4px;
+        background-color: #CE1126;
       }
 
       .old-price {

package/es/composite-comp/dito/components/Recommend/defaultJSON.js

@@ -279,8 +279,14 @@ var getDefaultJSON = function getDefaultJSON() {
       }
     },
     customize: {
-      layout: 'left',
-      align: 'left'
+      layout: {
+        pcLayout: 'layout1',
+        h5Layout: 'layout1'
+      },
+      align: 'left',
+      pcRowNum: 6,
+      pcMaxRowNum: 6,
+      pcMinRowNum: 5
     },
     background: {
       opacity: 100,

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

@@ -9,6 +9,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _mobile = _interopRequireDefault(require("./mobile"));
 
+var _pc = _interopRequireDefault(require("./pc"));
+
 var _defaultJSON = require("./defaultJSON");
 
 var _coreUtil = require("../../../../utils/coreUtil");
@@ -75,7 +77,9 @@ function (_super) {
     var wrapStyle = (0, _businessUtil.computeStyle)(nodeData, window.magicDesign.device);
     return /*#__PURE__*/_react["default"].createElement("div", {
       style: wrapStyle
-    }, (0, _coreUtil.isPc)() ? null : /*#__PURE__*/_react["default"].createElement(_mobile["default"], {
+    }, (0, _coreUtil.isPc)() ? /*#__PURE__*/_react["default"].createElement(_pc["default"], {
+      panelProps: nodeData
+    }) : /*#__PURE__*/_react["default"].createElement(_mobile["default"], {
       panelProps: nodeData
     }));
   };

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

@@ -227,10 +227,6 @@ var __spreadArrays = void 0 && (void 0).__spreadArrays || function () {
 };
 
 var LAYOUT_IMAGE_SIZE = {
-  left: {
-    w: '100%',
-    h: 165
-  },
   layout1: {
     w: '100%',
     h: 164
@@ -416,10 +412,8 @@ function (_super) {
     };
 
     _this.resetLayout = function () {
-      var layout = _this.props.panelProps.customize.layout.h5Layout || _this.props.panelProps.customize.layout; // 后面删除
-
+      var layout = _this.props.panelProps.customize.layout.h5Layout;
       var LAYOUT_COLUMN = {
-        left: 2,
         layout1: 2,
         layout2: 1,
         layout3: 3
@@ -543,7 +537,7 @@ function (_super) {
         hideTabs: hideTabs
       });
     });
-    var curLayout = panelProps.customize.layout.h5Layout || panelProps.customize.layout; // 后面删除
+    var curLayout = panelProps.customize.layout.h5Layout;
 
     if (curLayout !== this.preLayout) {
       this.resetLayout();
@@ -565,8 +559,11 @@ function (_super) {
     var bgStyle = this.getBackgroundStyle();
     var products = this.state["products" + tabIndex] || [];
     var isDivide = groupSource.length <= 3;
-    var layout = panelProps.customize.layout.h5Layout || panelProps.customize.layout; // 后面删除
-    // const _seeAll = ensure(() => groupSource[tabIndex].seeAll, '');
+    var layout = panelProps.customize.layout.h5Layout;
+
+    var _seeAll = (0, _commonUtil.ensure)(function () {
+      return groupSource[tabIndex].seeAll;
+    }, '');
 
     var imgHeight = (0, _commonUtil.ensure)(function () {
       return LAYOUT_IMAGE_SIZE[layout].h;
@@ -614,7 +611,27 @@ function (_super) {
         transform: "translateX(" + tabLeft + "px)",
         background: this.getTabBarActiveColor(panelProps)
       }
-    })), ['layout4', 'layout5'].includes(layout) ? /*#__PURE__*/_react["default"].createElement("div", {
+    })), ['layout1', 'layout2', 'layout3'].includes(layout) ? /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
+      key: "macyContainer",
+      className: "macyContainer"
+    }, products.map(function (item) {
+      return /*#__PURE__*/_react["default"].createElement(_ProductItem["default"], {
+        key: item.productId,
+        data: item,
+        fixHeight: layout === 'layout3',
+        imgHeight: imgHeight,
+        imgWidth: imgWidth,
+        layout: layout === 'layout2' ? 'horizontal' : 'vertical',
+        onItemClick: function onItemClick() {
+          return (0, _coreUtil.clickUrl)("/product/detail/" + item.offerId + "?productId=" + (item.sppProductId || item.productId || ''));
+        },
+        panelProps: panelProps.content,
+        showProgress: false
+      });
+    })), _seeAll.open && products.length > 0 && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
+      className: "btnSeeAll",
+      data: _seeAll
+    })) : /*#__PURE__*/_react["default"].createElement("div", {
       key: "scrollContainer",
       className: (0, _classnames["default"])('scrollContainer', {
         pl_100: layout === 'layout5'
@@ -634,24 +651,10 @@ function (_super) {
         panelProps: panelProps.content,
         showProgress: false
       }));
-    })) : /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
-      key: "macyContainer",
-      className: "macyContainer"
-    }, products.map(function (item) {
-      return /*#__PURE__*/_react["default"].createElement(_ProductItem["default"], {
-        key: item.productId,
-        data: item,
-        fixHeight: layout === 'layout3',
-        imgHeight: imgHeight,
-        imgWidth: imgWidth,
-        layout: layout === 'layout2' ? 'horizontal' : 'vertical',
-        onItemClick: function onItemClick() {
-          return (0, _coreUtil.clickUrl)("/product/detail/" + item.offerId + "?productId=" + (item.sppProductId || item.productId || ''));
-        },
-        panelProps: panelProps.content,
-        showProgress: false
-      });
-    }))));
+    }), _seeAll.open && products.length > 0 && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
+      className: "btnSeeAll",
+      data: _seeAll
+    })));
   };
 
   RecommendMobile.defaultProps = {