@fonixtree/magic-design 2.0.71 → 2.0.73

package/es/common/AffiliateProductModal/index.js

@@ -431,7 +431,7 @@ var AffiliateProductModal = function AffiliateProductModal(props) {
     title: (0, _locale.i18n)('PRODUCT_SELECT'),
     visible: visible,
     width: "1200px",
-    wrapClassName: "modalCot"
+    wrapClassName: "affiliateModalCot"
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "proModalWrap"
   }, /*#__PURE__*/_react["default"].createElement("div", {

package/es/common/AffiliateProductModal/index.less

@@ -1,4 +1,4 @@
-.modalCot {
+.affiliateModalCot {
   width: 1200px;
   right: unset !important;
   left: unset !important;

package/es/common/Button/index.less

@@ -44,7 +44,6 @@
   }
   
   &.text {
-    background: #F5F6F7;
     color: #2F54EB;
     font-weight: 400;
   }

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

@@ -184,6 +184,14 @@ var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
   }
 };
 
+var proTypeOption = [{
+  label: 'SKU',
+  value: 'sku'
+}, {
+  label: 'SPU',
+  value: 'spu'
+}];
+
 var FilteredProductModal = function FilteredProductModal(props) {
   var onDataChange = props.onDataChange;
   var Option = _antd.Select.Option;
@@ -213,41 +221,41 @@ var FilteredProductModal = function FilteredProductModal(props) {
       labelData = _f[0],
       setLabelData = _f[1];
 
-  var _g = (0, _react.useState)(''),
-      storeName = _g[0],
-      setStoreName = _g[1];
+  var _g = (0, _react.useState)(window.magicDesign.storeId || ''),
+      storeId = _g[0],
+      setStoreId = _g[1];
 
-  var _h = (0, _react.useState)(window.magicDesign.storeId || ''),
-      storeId = _h[0],
-      setStoreId = _h[1];
+  var _h = (0, _react.useState)([]),
+      storeList = _h[0],
+      setStoreList = _h[1];
 
-  var _j = (0, _react.useState)([]),
-      storeList = _j[0],
-      setStoreList = _j[1];
+  var _j = (0, _react.useState)(''),
+      productName = _j[0],
+      setProductName = _j[1];
 
   var _k = (0, _react.useState)(''),
-      productName = _k[0],
-      setProductName = _k[1];
+      minimum = _k[0],
+      setMinimum = _k[1];
 
   var _l = (0, _react.useState)(''),
-      minimum = _l[0],
-      setMinimum = _l[1];
+      maximum = _l[0],
+      setMaximum = _l[1];
 
-  var _m = (0, _react.useState)(''),
-      maximum = _m[0],
-      setMaximum = _m[1];
+  var _m = (0, _react.useState)([]),
+      dataSource = _m[0],
+      setDataSource = _m[1];
 
-  var _o = (0, _react.useState)([]),
-      dataSource = _o[0],
-      setDataSource = _o[1];
+  var _o = (0, _react.useState)({}),
+      promotions = _o[0],
+      setPromotions = _o[1];
 
-  var _p = (0, _react.useState)({}),
-      promotions = _p[0],
-      setPromotions = _p[1];
+  var _p = (0, _react.useState)(false),
+      loading = _p[0],
+      setLoading = _p[1];
 
-  var _q = (0, _react.useState)(false),
-      loading = _q[0],
-      setLoading = _q[1];
+  var _q = (0, _react.useState)('sku'),
+      proType = _q[0],
+      setProType = _q[1];
 
   var _r = (0, _react.useState)({
     pageSize: 20,
@@ -282,7 +290,6 @@ var FilteredProductModal = function FilteredProductModal(props) {
     settBrandId([]);
     settLabelId({});
     setStoreId(window.magicDesign.storeId || '');
-    setStoreName('');
     setProductName('');
     setMinimum('');
     setMaximum('');
@@ -293,14 +300,14 @@ var FilteredProductModal = function FilteredProductModal(props) {
 
   var columns = [{
     title: 'Image',
-    dataIndex: 'imgUrl',
+    dataIndex: 'productImageUrl',
     key: 'imgUrl',
     width: 100,
     render: function render(imgUrl, record) {
       return /*#__PURE__*/_react["default"].createElement("div", {
         className: "prodImage",
         style: {
-          backgroundImage: "url(\"" + (0, _commonUtil.convertImageUrl)(record.productImg || record.imgUrlContent || record.productImgContent) + "\")"
+          backgroundImage: "url(\"" + (imgUrl || (0, _commonUtil.convertImageUrl)(record.productImg || record.imgUrlContent || record.productImgContent)) + "\")"
         }
       });
     }
@@ -309,13 +316,7 @@ var FilteredProductModal = function FilteredProductModal(props) {
     dataIndex: 'offerName',
     key: 'offerName',
     ellipsis: true
-  }, // {
-  //   title: 'SKU',
-  //   dataIndex: 'attrValues',
-  //   key: 'attrValues',
-  //   ellipsis: true,
-  // },
-  {
+  }, {
     title: 'Price',
     dataIndex: 'salesPrice',
     key: 'salesPrice',
@@ -439,72 +440,106 @@ var FilteredProductModal = function FilteredProductModal(props) {
   };
 
   var loadGoods = function loadGoods() {
-    setLoading(true);
-    return new Promise(function (resolve, reject) {
-      return __awaiter(void 0, void 0, void 0, function () {
-        var precision, params, res;
-        return __generator(this, function (_a) {
-          switch (_a.label) {
-            case 0:
-              precision = Math.pow(10, (0, _commonUtil.ensure)(function () {
-                return window.systemParams.precision;
-              }, '0'));
-              params = {
-                catgIds: tValue.join(','),
-                brandIds: brandId.map(function (v) {
-                  return v.key;
-                }).join(','),
-                labelIds: labelId.key,
-                q: productName,
-                // productName,
-                storeId: storeId,
-                startPrice: minimum * precision || '',
-                endPrice: maximum * precision || '',
-                // storeName:storeName,
-                campaignType: promotions.key || '',
-                pageSize: paginationParams.pageSize,
-                pageIndex: paginationParams.current,
-                state: 'A'
-              };
-              return [4
-              /*yield*/
-              , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/offers/es", params, 'POST')];
-
-            case 1:
-              res = _a.sent();
-              setLoading(false);
-              paginationParams.total = res.total;
-
-              if (res && res.list && res.list.length > 0) {
-                setDataSource(res.list);
-                resolve({
-                  url: JsonToUrl({
-                    catgIds: tValue.join(',') || '',
-                    brandIds: brandId.map(function (v) {
-                      return v.key;
-                    }).join(',') || '',
-                    labelIds: labelId.key || '',
-                    q: productName || '',
-                    minPrice: minimum * precision || '',
-                    maxPrice: maximum * precision || '',
-                    storeId: storeId || '',
-                    campaignType: promotions.key || '',
-                    state: 'A'
-                  }),
-                  total: res.total
-                });
-              } else {
-                setDataSource([]);
-                resolve({
-                  total: 0
-                });
-              }
-
-              return [2
-              /*return*/
-              ];
-          }
-        });
+    return __awaiter(void 0, void 0, void 0, function () {
+      var _list, total, params, res, params, res_1, h5UrlStr;
+
+      return __generator(this, function (_a) {
+        switch (_a.label) {
+          case 0:
+            setLoading(true);
+            _list = [];
+            total = 0;
+            if (!(proType === 'sku')) return [3
+            /*break*/
+            , 2];
+            params = {
+              catgIds: tValue.join(','),
+              brandIds: brandId.map(function (v) {
+                return v.key;
+              }).join(','),
+              labelIds: labelId.key,
+              q: productName,
+              storeId: storeId,
+              startPrice: (0, _currencyUtil.formatBackendCurrency)(minimum),
+              endPrice: (0, _currencyUtil.formatBackendCurrency)(maximum),
+              campaignType: promotions.key || '',
+              state: 'A',
+              pageSize: paginationParams.pageSize,
+              pageIndex: paginationParams.current
+            };
+            return [4
+            /*yield*/
+            , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/offers/es", params, 'POST')];
+
+          case 1:
+            res = _a.sent();
+            _list = res.list || [];
+            total = res.total;
+            return [3
+            /*break*/
+            , 4];
+
+          case 2:
+            params = {
+              catgIds: tValue.join(','),
+              brandIds: brandId.map(function (v) {
+                return v.key;
+              }).join(','),
+              labelIds: labelId.key,
+              productName: productName,
+              storeId: storeId,
+              minPrice: (0, _currencyUtil.formatBackendCurrency)(minimum),
+              maxPrice: (0, _currencyUtil.formatBackendCurrency)(maximum),
+              cmpTypeId: promotions.key || '',
+              state: 'A',
+              pageSize: paginationParams.pageSize,
+              pageIndex: paginationParams.current
+            };
+            return [4
+            /*yield*/
+            , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/offers", __assign(__assign({}, params), {
+              isDefaultCover: 'Y',
+              onlyQryPublishSku: true,
+              auditState: 'S',
+              crmFlag: 'on'
+            }), 'GET')];
+
+          case 3:
+            res_1 = _a.sent();
+            _list = (0, _commonUtil.ensure)(function () {
+              return res_1.list.map(function (m) {
+                return __assign(__assign({}, m.products[0]), m);
+              });
+            }, []);
+            total = res_1.total;
+            _a.label = 4;
+
+          case 4:
+            paginationParams.total = total;
+            setLoading(false);
+            setPaginationParams(__assign({}, paginationParams));
+            h5UrlStr = JsonToUrl({
+              catgIds: tValue.join(',') || '',
+              brandIds: brandId.map(function (v) {
+                return v.key;
+              }).join(',') || '',
+              labelIds: labelId.key || '',
+              q: productName || '',
+              storeId: storeId || '',
+              minPrice: (0, _currencyUtil.formatBackendCurrency)(minimum),
+              maxPrice: (0, _currencyUtil.formatBackendCurrency)(maximum),
+              campaignType: promotions.key || '',
+              state: 'A',
+              proType: proType
+            });
+            setDataSource(_list);
+            return [2
+            /*return*/
+            , {
+              url: h5UrlStr,
+              total: total
+            }];
+        }
       });
     });
   };
@@ -518,6 +553,10 @@ var FilteredProductModal = function FilteredProductModal(props) {
       queryStore();
     }
   }, []);
+  (0, _react.useEffect)(function () {
+    paginationParams.current = 1;
+    loadGoods();
+  }, [proType]);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "mFilteredProductModal"
   }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -664,13 +703,15 @@ var FilteredProductModal = function FilteredProductModal(props) {
     onClick: function onClick() {
       paginationParams.current = 1;
       loadGoods().then(function (res) {
+        console.log('res', res);
+
         if (res.total !== 0) {
           onDataChange({
             value: res.url,
             name: res.url
           }, res.total);
         } else {
-          onDataChange('', res.total); // message.warn('no goods!');
+          onDataChange('', res.total);
         }
       });
     },
@@ -686,7 +727,16 @@ var FilteredProductModal = function FilteredProductModal(props) {
     size: "small"
   }, (0, _locale.i18n)('CANCEL'))))), /*#__PURE__*/_react["default"].createElement("div", {
     className: "rightCot"
-  }, /*#__PURE__*/_react["default"].createElement(_antd.Table, {
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Radio.Group, {
+    buttonStyle: "solid",
+    className: "btn-select-type",
+    onChange: function onChange(e) {
+      setProType(e.target.value);
+    },
+    options: proTypeOption,
+    optionType: "button",
+    value: proType
+  }), /*#__PURE__*/_react["default"].createElement(_antd.Table, {
     columns: columns,
     dataSource: dataSource,
     loading: loading,
@@ -697,7 +747,7 @@ var FilteredProductModal = function FilteredProductModal(props) {
       }
     }),
     scroll: {
-      y: 400
+      y: 340
     }
   })))));
 };

package/es/common/LinkModal/FilteredProductModal/index.less

@@ -1,5 +1,6 @@
 .mFilteredProductModal {
   height: 550px;
+
   .proModalWrap {
     .info {
       background: #ecf1fd;
@@ -24,6 +25,12 @@
         width: calc(100% - 240px);
         margin-left: 16px;
 
+        .btn-select-type {
+          display: block;
+          text-align: right;
+          margin-bottom: 10px;
+        }
+
         .selectedCot {
           width: 722px;
           margin-left: 4px;

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

@@ -17,6 +17,8 @@ var _commonUtil = require("../../../utils/commonUtil");
 
 var _businessUtil = require("../../../utils/businessUtil");
 
+var _ProductModal = require("../../ProductModal");
+
 require("./index.less");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -182,19 +184,6 @@ var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
   }
 };
 
-var __rest = void 0 && (void 0).__rest || function (s, e) {
-  var t = {};
-
-  for (var p in s) {
-    if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
-  }
-
-  if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-    if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
-  }
-  return t;
-};
-
 var Option = _antd.Select.Option;
 
 var ProductDetailPage = function ProductDetailPage(props) {
@@ -232,12 +221,17 @@ var ProductDetailPage = function ProductDetailPage(props) {
       loading = _h[0],
       setLoading = _h[1];
 
-  var _j = (0, _react.useState)({
+  var _j = (0, _react.useState)('sku'),
+      proType = _j[0],
+      setProType = _j[1];
+
+  var _k = (0, _react.useState)({
     pageSize: 20,
-    pageIndex: 1
+    current: 1,
+    total: 0
   }),
-      paginationParams = _j[0],
-      setPaginationParams = _j[1];
+      paginationParams = _k[0],
+      setPaginationParams = _k[1];
 
   var columns = [{
     title: 'Image',
@@ -276,22 +270,68 @@ var ProductDetailPage = function ProductDetailPage(props) {
     type: 'radio'
   };
 
-  var queryGoods = function queryGoods(params) {
+  var queryGoods = function queryGoods() {
     return __awaiter(void 0, void 0, void 0, function () {
-      var res;
+      var _list, total, params, res, res_1;
+
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
+            _list = [];
+            total = 0;
+            params = {
+              productName: productName,
+              brandIds: brandId.map(function (v) {
+                return v.key;
+              }).join(',') || '',
+              storeId: storeId,
+              pageSize: paginationParams.pageSize,
+              pageIndex: paginationParams.current
+            };
+            if (!(proType === 'sku')) return [3
+            /*break*/
+            , 2];
             return [4
             /*yield*/
-            , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/products", params, 'GET')];
+            , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/products", __assign(__assign({}, params), {
+              productCode: productCode
+            }), 'GET')];
 
           case 1:
             res = _a.sent();
+            _list = (0, _ProductModal.formatData)(res.list || []);
+            total = res.total;
+            return [3
+            /*break*/
+            , 4];
+
+          case 2:
+            return [4
+            /*yield*/
+            , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/offers", __assign(__assign({}, params), {
+              offerCode: productCode,
+              isDefaultCover: 'Y',
+              onlyQryPublishSku: true,
+              auditState: 'S',
+              crmFlag: 'on'
+            }), 'GET')];
+
+          case 3:
+            res_1 = _a.sent();
+            _list = (0, _ProductModal.formatData)((0, _commonUtil.ensure)(function () {
+              return res_1.list.map(function (m) {
+                return __assign(__assign({}, m.products[0]), m);
+              });
+            }, []), proType);
+            total = res_1.total;
+            _a.label = 4;
+
+          case 4:
+            setProductList(_list);
             setLoading(false);
-            paginationParams.total = res.total;
-            setProductList(res.list);
-            window.MProductList = res.list;
+            window.MProductList = _list;
+            paginationParams.total = total;
+            setPaginationParams(__assign({}, paginationParams));
             return [2
             /*return*/
             ];
@@ -362,17 +402,20 @@ var ProductDetailPage = function ProductDetailPage(props) {
 
   (0, _react.useEffect)(function () {
     setLoading(true);
-
-    var total = paginationParams.total,
-        params = __rest(paginationParams, ["total"]);
-
-    queryGoods(params);
+    queryGoods();
     queryBrand();
 
     if ((0, _businessUtil.isPlatform)()) {
       queryStore();
     }
   }, []);
+  var proTypeOption = [{
+    label: 'SKU',
+    value: 'sku'
+  }, {
+    label: 'SPU',
+    value: 'spu'
+  }];
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "productDetailPage"
   }, /*#__PURE__*/_react["default"].createElement(_antd.Form, {
@@ -382,6 +425,20 @@ var ProductDetailPage = function ProductDetailPage(props) {
     layout: "horizontal"
   }, /*#__PURE__*/_react["default"].createElement(_antd.Row, {
     gutter: 24
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Col, {
+    offset: 20,
+    span: 4
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Radio.Group, {
+    buttonStyle: "solid",
+    className: "btn-select-type",
+    onChange: function onChange(e) {
+      setProType(e.target.value);
+    },
+    options: proTypeOption,
+    optionType: "button",
+    value: proType
+  }))), /*#__PURE__*/_react["default"].createElement(_antd.Row, {
+    gutter: 24
   }, /*#__PURE__*/_react["default"].createElement(_antd.Col, {
     span: 9
   }, /*#__PURE__*/_react["default"].createElement(_antd.Form.Item, {
@@ -395,7 +452,7 @@ var ProductDetailPage = function ProductDetailPage(props) {
   }))), /*#__PURE__*/_react["default"].createElement(_antd.Col, {
     span: 9
   }, /*#__PURE__*/_react["default"].createElement(_antd.Form.Item, {
-    label: "SKU Code"
+    label: proType === 'sku' ? 'SKU Code' : 'SPU Code'
   }, /*#__PURE__*/_react["default"].createElement(_antd.Input, {
     onChange: function onChange(e) {
       return setProductCode(e.target.value);
@@ -444,19 +501,8 @@ var ProductDetailPage = function ProductDetailPage(props) {
   }, /*#__PURE__*/_react["default"].createElement(_antd.Button, {
     onClick: function onClick() {
       setLoading(true);
-      paginationParams.pageIndex = 1;
-
-      var total = paginationParams.total,
-          params = __rest(paginationParams, ["total"]);
-
-      queryGoods(__assign({
-        productName: productName,
-        productCode: productCode,
-        brandIds: brandId.map(function (v) {
-          return v.key;
-        }).join(',') || '',
-        storeId: storeId
-      }, params));
+      paginationParams.current = 1;
+      queryGoods();
     },
     size: "small",
     style: {
@@ -476,26 +522,15 @@ var ProductDetailPage = function ProductDetailPage(props) {
     pagination: __assign(__assign({}, paginationParams), {
       onChange: function onChange(page) {
         setLoading(true);
-        paginationParams.pageIndex = page;
-
-        var total = paginationParams.total,
-            params = __rest(paginationParams, ["total"]);
-
-        queryGoods(__assign({
-          productName: productName,
-          productCode: productCode,
-          brandIds: brandId.map(function (v) {
-            return v.key;
-          }).join(',') || '',
-          storeId: storeId
-        }, params));
+        paginationParams.current = page;
+        queryGoods();
       },
       showSizeChanger: false
     }),
-    rowKey: "productId",
+    rowKey: "id",
     rowSelection: rowSelection,
     scroll: {
-      y: 340
+      y: 300
     }
   }));
 };

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

@@ -1,5 +1,10 @@
 .productDetailPage {
   height: 550px;
+
+  .btn-select-type {
+    margin-bottom: 10px;
+  }
+
   .prodImage {
     width: 36px;
     height: 36px;
@@ -7,4 +12,4 @@
     background-position: 50% 50%;
     background-size: contain;
   }
-}
+}