@fonixtree/magic-design 2.0.73 → 2.0.75

package/lib/common/LinkModal/BundleCampaign/index.js

@@ -179,7 +179,7 @@ var BundleCampaign = function BundleCampaign(props) {
       campaignName = _b[0],
       setCampaignName = _b[1];
 
-  var _c = (0, _react.useState)(window.magicDesign.storeId ? window.magicDesign.storeId : ''),
+  var _c = (0, _react.useState)(window.magicDesign.storeId >= 0 ? window.magicDesign.storeId : ''),
       storeId = _c[0],
       setStoreId = _c[1];
 
@@ -241,7 +241,7 @@ var BundleCampaign = function BundleCampaign(props) {
 
   var reset = function reset() {
     setCampaignName('');
-    setStoreId(window.magicDesign.storeId ? window.magicDesign.storeId : '');
+    setStoreId(window.magicDesign.storeId >= 0 ? window.magicDesign.storeId : '');
     setCmpState('A,B');
   };
 

package/lib/common/LinkModal/CouponTable/index.js

@@ -257,7 +257,7 @@ function CouponTable(props) {
               state: 'A',
               couponLocation: 'Promotion',
               pageTotal: false,
-              storeId: window.magicDesign.storeId ? window.magicDesign.storeId : ''
+              storeId: window.magicDesign.storeId >= 0 ? window.magicDesign.storeId : ''
             });
             return [4
             /*yield*/

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

@@ -184,14 +184,6 @@ 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;
@@ -221,7 +213,7 @@ var FilteredProductModal = function FilteredProductModal(props) {
       labelData = _f[0],
       setLabelData = _f[1];
 
-  var _g = (0, _react.useState)(window.magicDesign.storeId || ''),
+  var _g = (0, _react.useState)(window.magicDesign.storeId >= 0 ? window.magicDesign.storeId : ''),
       storeId = _g[0],
       setStoreId = _g[1];
 
@@ -253,17 +245,13 @@ var FilteredProductModal = function FilteredProductModal(props) {
       loading = _p[0],
       setLoading = _p[1];
 
-  var _q = (0, _react.useState)('sku'),
-      proType = _q[0],
-      setProType = _q[1];
-
-  var _r = (0, _react.useState)({
+  var _q = (0, _react.useState)({
     pageSize: 20,
     current: 1,
     total: 0
   }),
-      paginationParams = _r[0],
-      setPaginationParams = _r[1];
+      paginationParams = _q[0],
+      setPaginationParams = _q[1];
 
   var onChange = function onChange(value) {
     settVal(value);
@@ -289,7 +277,7 @@ var FilteredProductModal = function FilteredProductModal(props) {
     settVal([]);
     settBrandId([]);
     settLabelId({});
-    setStoreId(window.magicDesign.storeId || '');
+    setStoreId(window.magicDesign.storeId >= 0 ? window.magicDesign.storeId : '');
     setProductName('');
     setMinimum('');
     setMaximum('');
@@ -307,7 +295,7 @@ var FilteredProductModal = function FilteredProductModal(props) {
       return /*#__PURE__*/_react["default"].createElement("div", {
         className: "prodImage",
         style: {
-          backgroundImage: "url(\"" + (imgUrl || (0, _commonUtil.convertImageUrl)(record.productImg || record.imgUrlContent || record.productImgContent)) + "\")"
+          backgroundImage: "url(\"" + (0, _commonUtil.convertImageUrl)(record.productImg || record.imgUrlContent || record.productImgContent) + "\")"
         }
       });
     }
@@ -441,17 +429,11 @@ var FilteredProductModal = function FilteredProductModal(props) {
 
   var loadGoods = function loadGoods() {
     return __awaiter(void 0, void 0, void 0, function () {
-      var _list, total, params, res, params, res_1, h5UrlStr;
-
+      var params, res, 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) {
@@ -473,51 +455,10 @@ var FilteredProductModal = function FilteredProductModal(props) {
 
           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);
+            setDataSource(res.list || []);
+            paginationParams.total = res.total;
             setPaginationParams(__assign({}, paginationParams));
+            setLoading(false);
             h5UrlStr = JsonToUrl({
               catgIds: tValue.join(',') || '',
               brandIds: brandId.map(function (v) {
@@ -529,15 +470,13 @@ var FilteredProductModal = function FilteredProductModal(props) {
               minPrice: (0, _currencyUtil.formatBackendCurrency)(minimum),
               maxPrice: (0, _currencyUtil.formatBackendCurrency)(maximum),
               campaignType: promotions.key || '',
-              state: 'A',
-              proType: proType
+              state: 'A'
             });
-            setDataSource(_list);
             return [2
             /*return*/
             , {
               url: h5UrlStr,
-              total: total
+              total: res.total
             }];
         }
       });
@@ -553,10 +492,6 @@ 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", {
@@ -727,16 +662,7 @@ var FilteredProductModal = function FilteredProductModal(props) {
     size: "small"
   }, (0, _locale.i18n)('CANCEL'))))), /*#__PURE__*/_react["default"].createElement("div", {
     className: "rightCot"
-  }, /*#__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, {
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Table, {
     columns: columns,
     dataSource: dataSource,
     loading: loading,
@@ -747,7 +673,7 @@ var FilteredProductModal = function FilteredProductModal(props) {
       }
     }),
     scroll: {
-      y: 340
+      y: 400
     }
   })))));
 };

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

@@ -25,12 +25,6 @@
         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/lib/common/LinkModal/ProductDetailPage/index.js

@@ -17,8 +17,6 @@ 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); }
@@ -187,7 +185,7 @@ var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
 var Option = _antd.Select.Option;
 
 var ProductDetailPage = function ProductDetailPage(props) {
-  var _onChange = props.onChange;
+  var onChange = props.onChange;
 
   var _a = (0, _react.useState)([]),
       productList = _a[0],
@@ -225,13 +223,21 @@ var ProductDetailPage = function ProductDetailPage(props) {
       proType = _j[0],
       setProType = _j[1];
 
-  var _k = (0, _react.useState)({
+  var _k = (0, _react.useState)(false),
+      flag = _k[0],
+      setFlag = _k[1];
+
+  var _l = (0, _react.useState)({}),
+      selectedPro = _l[0],
+      setSelectedPro = _l[1];
+
+  var _m = (0, _react.useState)({
     pageSize: 20,
     current: 1,
     total: 0
   }),
-      paginationParams = _k[0],
-      setPaginationParams = _k[1];
+      paginationParams = _m[0],
+      setPaginationParams = _m[1];
 
   var columns = [{
     title: 'Image',
@@ -260,19 +266,21 @@ var ProductDetailPage = function ProductDetailPage(props) {
     ellipsis: true
   }];
   var rowSelection = {
+    selectedRowKeys: [(selectedPro === null || selectedPro === void 0 ? void 0 : selectedPro.productId) || ''],
     onChange: function onChange(selectedRowKeys, selectedRows) {
-      _onChange({
+      var selected = {
         offerId: selectedRows[0].offerId,
         productId: selectedRows[0].productId,
         name: selectedRows[0].productName
-      });
+      };
+      setSelectedPro(selected);
     },
     type: 'radio'
   };
 
   var queryGoods = function queryGoods() {
     return __awaiter(void 0, void 0, void 0, function () {
-      var _list, total, params, res, res_1;
+      var _list, total, params, res_1, res;
 
       return __generator(this, function (_a) {
         switch (_a.label) {
@@ -288,24 +296,9 @@ var ProductDetailPage = function ProductDetailPage(props) {
               pageSize: paginationParams.pageSize,
               pageIndex: paginationParams.current
             };
-            if (!(proType === 'sku')) return [3
+            if (!(proType === 'spu')) return [3
             /*break*/
             , 2];
-            return [4
-            /*yield*/
-            , (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), {
@@ -316,14 +309,30 @@ var ProductDetailPage = function ProductDetailPage(props) {
               crmFlag: 'on'
             }), 'GET')];
 
-          case 3:
+          case 1:
             res_1 = _a.sent();
-            _list = (0, _ProductModal.formatData)((0, _commonUtil.ensure)(function () {
+            _list = (0, _commonUtil.ensure)(function () {
               return res_1.list.map(function (m) {
                 return __assign(__assign({}, m.products[0]), m);
               });
-            }, []), proType);
+            }, []);
             total = res_1.total;
+            return [3
+            /*break*/
+            , 4];
+
+          case 2:
+            return [4
+            /*yield*/
+            , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/products", __assign(__assign({}, params), {
+              state: 'A',
+              productCode: productCode
+            }), 'GET')];
+
+          case 3:
+            res = _a.sent();
+            _list = res.list || [];
+            total = res.total;
             _a.label = 4;
 
           case 4:
@@ -401,14 +410,25 @@ var ProductDetailPage = function ProductDetailPage(props) {
   };
 
   (0, _react.useEffect)(function () {
-    setLoading(true);
-    queryGoods();
     queryBrand();
 
     if ((0, _businessUtil.isPlatform)()) {
       queryStore();
     }
   }, []);
+  (0, _react.useEffect)(function () {
+    onChange(selectedPro);
+  }, [selectedPro]);
+  (0, _react.useEffect)(function () {
+    setLoading(true);
+    reset();
+    setSelectedPro({});
+    paginationParams.current = 1;
+    setFlag(!flag);
+  }, [proType]);
+  (0, _react.useEffect)(function () {
+    queryGoods();
+  }, [flag]);
   var proTypeOption = [{
     label: 'SKU',
     value: 'sku'
@@ -452,7 +472,7 @@ var ProductDetailPage = function ProductDetailPage(props) {
   }))), /*#__PURE__*/_react["default"].createElement(_antd.Col, {
     span: 9
   }, /*#__PURE__*/_react["default"].createElement(_antd.Form.Item, {
-    label: proType === 'sku' ? 'SKU Code' : 'SPU Code'
+    label: proType === 'spu' ? 'SPU Code' : 'SKU Code'
   }, /*#__PURE__*/_react["default"].createElement(_antd.Input, {
     onChange: function onChange(e) {
       return setProductCode(e.target.value);
@@ -527,7 +547,7 @@ var ProductDetailPage = function ProductDetailPage(props) {
       },
       showSizeChanger: false
     }),
-    rowKey: "id",
+    rowKey: "productId",
     rowSelection: rowSelection,
     scroll: {
       y: 300

package/lib/common/MagicLink/index.js

@@ -7,9 +7,9 @@ exports.onAClick = exports.getLinkUrl = exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _businessUtil = require("src/components/utils/businessUtil");
+var _coreUtil = require("../../utils/coreUtil");
 
-var _coreUtil = require("src/components/utils/coreUtil");
+var _businessUtil = require("../../utils/businessUtil");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 

package/lib/common/ProductModal/index.js

@@ -302,17 +302,21 @@ var ProductModal = function ProductModal(props) {
       proType = _u[0],
       setProType = _u[1];
 
-  var _v = (0, _react.useState)(defaultList),
-      selectedList = _v[0],
-      setSelectedList = _v[1];
+  var _v = (0, _react.useState)(false),
+      flag = _v[0],
+      setFlag = _v[1];
 
-  var _w = (0, _react.useState)({
+  var _w = (0, _react.useState)(defaultList),
+      selectedList = _w[0],
+      setSelectedList = _w[1];
+
+  var _x = (0, _react.useState)({
     pageSize: 20,
     current: 1,
     total: 0
   }),
-      paginationParams = _w[0],
-      setPaginationParams = _w[1];
+      paginationParams = _x[0],
+      setPaginationParams = _x[1];
 
   var rowSelection = {
     selectedRowKeys: selectedList.map(function (v) {
@@ -351,7 +355,7 @@ var ProductModal = function ProductModal(props) {
 
   var queryGoods = function queryGoods() {
     return __awaiter(void 0, void 0, void 0, function () {
-      var _list, total, params, res, res_1;
+      var _list, total, params, res_1, res;
 
       return __generator(this, function (_a) {
         switch (_a.label) {
@@ -370,27 +374,11 @@ var ProductModal = function ProductModal(props) {
               brandIds: selBrandsList.join(','),
               labelIds: selLabelData.value || '',
               pageSize: paginationParams.pageSize,
-              pageIndex: paginationParams.current,
-              state: 'A'
+              pageIndex: paginationParams.current
             };
-            if (!(proType === 'sku')) return [3
+            if (!(proType === 'spu')) return [3
             /*break*/
             , 2];
-            return [4
-            /*yield*/
-            , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/products", __assign(__assign({}, params), {
-              productCode: productCode
-            }), 'GET')];
-
-          case 1:
-            res = _a.sent();
-            _list = 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), {
@@ -401,7 +389,7 @@ var ProductModal = function ProductModal(props) {
               crmFlag: 'on'
             }), 'GET')];
 
-          case 3:
+          case 1:
             res_1 = _a.sent();
             _list = formatData((0, _commonUtil.ensure)(function () {
               return res_1.list.map(function (m) {
@@ -409,6 +397,22 @@ var ProductModal = function ProductModal(props) {
               });
             }, []), proType);
             total = res_1.total;
+            return [3
+            /*break*/
+            , 4];
+
+          case 2:
+            return [4
+            /*yield*/
+            , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/products", __assign(__assign({}, params), {
+              state: 'A',
+              productCode: productCode
+            }), 'GET')];
+
+          case 3:
+            res = _a.sent();
+            _list = formatData(res.list || []);
+            total = res.total;
             _a.label = 4;
 
           case 4:
@@ -513,6 +517,18 @@ var ProductModal = function ProductModal(props) {
     });
   };
 
+  var reset = function reset() {
+    setSelBrandsList([]);
+    setSelCatgsList([]);
+    setSelLabelData([]);
+    setProductName('');
+    setStoreId('');
+    setProductCode('');
+    setMinPrice('');
+    setMaxPrice('');
+    setPromotions(props.type === 'groupBuy' ? promType.GROUP_BUY : null);
+  };
+
   (0, _react.useEffect)(function () {
     queryOfferCatgs();
     queryBrands();
@@ -530,22 +546,13 @@ var ProductModal = function ProductModal(props) {
     }
   }, [visible]);
   (0, _react.useEffect)(function () {
+    reset();
     paginationParams.current = 1;
-    queryGoods();
+    setFlag(!flag);
   }, [proType]);
-
-  var reset = function reset() {
-    setSelBrandsList([]);
-    setSelCatgsList([]);
-    setSelLabelData([]);
-    setProductName('');
-    setStoreId('');
-    setProductCode('');
-    setMinPrice('');
-    setMaxPrice('');
-    setPromotions(props.type === 'groupBuy' ? promType.GROUP_BUY : null);
-  };
-
+  (0, _react.useEffect)(function () {
+    queryGoods();
+  }, [flag]);
   var columns = [{
     title: (0, _locale.i18n)('IMAGE'),
     dataIndex: 'productImageUrl',
@@ -564,8 +571,8 @@ var ProductModal = function ProductModal(props) {
     width: 120,
     ellipsis: true
   }, {
-    title: proType === 'sku' ? (0, _locale.i18n)('SKU_CODE') : (0, _locale.i18n)('SPU_CODE'),
-    dataIndex: proType === 'sku' ? 'productCode' : 'offerCode',
+    title: proType === 'spu' ? (0, _locale.i18n)('SPU_CODE') : (0, _locale.i18n)('SKU_CODE'),
+    dataIndex: proType === 'spu' ? 'offerCode' : 'productCode',
     width: 120,
     ellipsis: true
   }, _defineProperty({
@@ -712,7 +719,7 @@ var ProductModal = function ProductModal(props) {
     size: "small",
     value: productName
   })), /*#__PURE__*/_react["default"].createElement(_antd.Form.Item, {
-    label: proType === 'sku' ? 'SKU Code' : 'SPU Code'
+    label: proType === 'spu' ? 'SPU Code' : 'SKU Code'
   }, /*#__PURE__*/_react["default"].createElement(_antd.Input, {
     className: "inputStyle",
     onChange: function onChange(e) {

package/lib/common/ProductSource/index.js

@@ -204,7 +204,7 @@ function ProductSource(_a) {
 
   var onSelectProduct = function onSelectProduct() {
     return __awaiter(_this, void 0, void 0, function () {
-      var url, param, list, url, param, list, url, param, list_1;
+      var url, param, list, url, param, list_1, url, param, list;
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
@@ -232,46 +232,45 @@ function ProductSource(_a) {
             , 6];
 
           case 2:
-            if (!(prodType === 'sku')) return [3
+            if (!(prodType === 'spu')) return [3
             /*break*/
             , 4];
-            url = "/designer/v1/" + window.magicDesign.MBaseUrl + "/products";
+            url = "/designer/v1/" + window.magicDesign.MBaseUrl + "/offers";
             param = {
-              products: value,
-              state: 'A'
+              offers: value,
+              isDefaultCover: 'Y',
+              onlyQryPublishSku: true,
+              auditState: 'S',
+              crmFlag: 'on'
             };
             return [4
             /*yield*/
             , (0, _commonUtil.commonFetch)(url, param, 'GET')];
 
           case 3:
-            list = _a.sent().list;
-            setSelectedProds((0, _ProductModal.formatData)(list || []));
+            list_1 = _a.sent().list;
+            setSelectedProds((0, _ProductModal.formatData)((0, _commonUtil.ensure)(function () {
+              return list_1.map(function (m) {
+                return __assign(__assign({}, m.products[0]), m);
+              });
+            }, []), prodType));
             return [3
             /*break*/
             , 6];
 
           case 4:
-            url = "/designer/v1/" + window.magicDesign.MBaseUrl + "/offers";
+            url = "/designer/v1/" + window.magicDesign.MBaseUrl + "/products";
             param = {
-              offers: value,
-              state: 'A',
-              isDefaultCover: 'Y',
-              onlyQryPublishSku: true,
-              auditState: 'S',
-              crmFlag: 'on'
+              products: value,
+              state: 'A'
             };
             return [4
             /*yield*/
             , (0, _commonUtil.commonFetch)(url, param, 'GET')];
 
           case 5:
-            list_1 = _a.sent().list;
-            setSelectedProds((0, _ProductModal.formatData)((0, _commonUtil.ensure)(function () {
-              return list_1.map(function (m) {
-                return __assign(__assign({}, m.products[0]), m);
-              });
-            }, []), prodType));
+            list = _a.sent().list;
+            setSelectedProds((0, _ProductModal.formatData)(list || []));
             _a.label = 6;
 
           case 6: