@fonixtree/magic-design 1.0.37 → 1.0.39

package/es/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;
@@ -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);
@@ -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/es/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/es/common/LinkModal/ProductDetailPage/index.js

@@ -272,7 +272,7 @@ var ProductDetailPage = function ProductDetailPage(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) {
@@ -288,24 +288,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,7 +301,7 @@ var ProductDetailPage = function ProductDetailPage(props) {
               crmFlag: 'on'
             }), 'GET')];
 
-          case 3:
+          case 1:
             res_1 = _a.sent();
             _list = (0, _ProductModal.formatData)((0, _commonUtil.ensure)(function () {
               return res_1.list.map(function (m) {
@@ -324,6 +309,21 @@ var ProductDetailPage = function ProductDetailPage(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), {
+              productCode: productCode
+            }), 'GET')];
+
+          case 3:
+            res = _a.sent();
+            _list = (0, _ProductModal.formatData)(res.list || []);
+            total = res.total;
             _a.label = 4;
 
           case 4:
@@ -401,14 +401,17 @@ var ProductDetailPage = function ProductDetailPage(props) {
   };
 
   (0, _react.useEffect)(function () {
-    setLoading(true);
-    queryGoods();
     queryBrand();
 
     if ((0, _businessUtil.isPlatform)()) {
       queryStore();
     }
   }, []);
+  (0, _react.useEffect)(function () {
+    setLoading(true);
+    paginationParams.current = 1;
+    queryGoods();
+  }, [proType]);
   var proTypeOption = [{
     label: 'SKU',
     value: 'sku'
@@ -452,7 +455,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);

package/es/common/ProductModal/index.js

@@ -352,7 +352,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) {
@@ -374,24 +374,9 @@ var ProductModal = function ProductModal(props) {
               pageIndex: paginationParams.current,
               state: 'A'
             };
-            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), {
@@ -402,7 +387,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) {
@@ -410,6 +395,21 @@ 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), {
+              productCode: productCode
+            }), 'GET')];
+
+          case 3:
+            res = _a.sent();
+            _list = formatData(res.list || []);
+            total = res.total;
             _a.label = 4;
 
           case 4:
@@ -565,8 +565,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({
@@ -713,7 +713,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/es/common/ProductSource/index.js

@@ -201,33 +201,16 @@ function ProductSource(_a) {
 
   var onSelectProduct = function onSelectProduct() {
     return __awaiter(_this, void 0, void 0, function () {
-      var url, param, list, url, param, list_1;
+      var url, param, list_1, url, param, list;
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
             if (!(value && value.length > 0)) return [3
             /*break*/
             , 5];
-            if (!(prodType === 'sku')) return [3
+            if (!(prodType === 'spu')) return [3
             /*break*/
             , 2];
-            url = "/designer/v1/" + window.magicDesign.MBaseUrl + "/products";
-            param = {
-              products: value,
-              state: 'A'
-            };
-            return [4
-            /*yield*/
-            , (0, _commonUtil.commonFetch)(url, param, 'GET')];
-
-          case 1:
-            list = _a.sent().list;
-            setSelectedProds((0, _ProductModal.formatData)(list || []));
-            return [3
-            /*break*/
-            , 4];
-
-          case 2:
             url = "/designer/v1/" + window.magicDesign.MBaseUrl + "/offers";
             param = {
               offers: value,
@@ -241,13 +224,30 @@ function ProductSource(_a) {
             /*yield*/
             , (0, _commonUtil.commonFetch)(url, param, 'GET')];
 
-          case 3:
+          case 1:
             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*/
+            , 4];
+
+          case 2:
+            url = "/designer/v1/" + window.magicDesign.MBaseUrl + "/products";
+            param = {
+              products: value,
+              state: 'A'
+            };
+            return [4
+            /*yield*/
+            , (0, _commonUtil.commonFetch)(url, param, 'GET')];
+
+          case 3:
+            list = _a.sent().list;
+            setSelectedProds((0, _ProductModal.formatData)(list || []));
             _a.label = 4;
 
           case 4:

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;
@@ -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);
@@ -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

@@ -272,7 +272,7 @@ var ProductDetailPage = function ProductDetailPage(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) {
@@ -288,24 +288,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,7 +301,7 @@ var ProductDetailPage = function ProductDetailPage(props) {
               crmFlag: 'on'
             }), 'GET')];
 
-          case 3:
+          case 1:
             res_1 = _a.sent();
             _list = (0, _ProductModal.formatData)((0, _commonUtil.ensure)(function () {
               return res_1.list.map(function (m) {
@@ -324,6 +309,21 @@ var ProductDetailPage = function ProductDetailPage(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), {
+              productCode: productCode
+            }), 'GET')];
+
+          case 3:
+            res = _a.sent();
+            _list = (0, _ProductModal.formatData)(res.list || []);
+            total = res.total;
             _a.label = 4;
 
           case 4:
@@ -401,14 +401,17 @@ var ProductDetailPage = function ProductDetailPage(props) {
   };
 
   (0, _react.useEffect)(function () {
-    setLoading(true);
-    queryGoods();
     queryBrand();
 
     if ((0, _businessUtil.isPlatform)()) {
       queryStore();
     }
   }, []);
+  (0, _react.useEffect)(function () {
+    setLoading(true);
+    paginationParams.current = 1;
+    queryGoods();
+  }, [proType]);
   var proTypeOption = [{
     label: 'SKU',
     value: 'sku'
@@ -452,7 +455,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);

package/lib/common/ProductModal/index.js

@@ -352,7 +352,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) {
@@ -374,24 +374,9 @@ var ProductModal = function ProductModal(props) {
               pageIndex: paginationParams.current,
               state: 'A'
             };
-            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), {
@@ -402,7 +387,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) {
@@ -410,6 +395,21 @@ 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), {
+              productCode: productCode
+            }), 'GET')];
+
+          case 3:
+            res = _a.sent();
+            _list = formatData(res.list || []);
+            total = res.total;
             _a.label = 4;
 
           case 4:
@@ -565,8 +565,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({
@@ -713,7 +713,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

@@ -201,33 +201,16 @@ function ProductSource(_a) {
 
   var onSelectProduct = function onSelectProduct() {
     return __awaiter(_this, void 0, void 0, function () {
-      var url, param, list, url, param, list_1;
+      var url, param, list_1, url, param, list;
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
             if (!(value && value.length > 0)) return [3
             /*break*/
             , 5];
-            if (!(prodType === 'sku')) return [3
+            if (!(prodType === 'spu')) return [3
             /*break*/
             , 2];
-            url = "/designer/v1/" + window.magicDesign.MBaseUrl + "/products";
-            param = {
-              products: value,
-              state: 'A'
-            };
-            return [4
-            /*yield*/
-            , (0, _commonUtil.commonFetch)(url, param, 'GET')];
-
-          case 1:
-            list = _a.sent().list;
-            setSelectedProds((0, _ProductModal.formatData)(list || []));
-            return [3
-            /*break*/
-            , 4];
-
-          case 2:
             url = "/designer/v1/" + window.magicDesign.MBaseUrl + "/offers";
             param = {
               offers: value,
@@ -241,13 +224,30 @@ function ProductSource(_a) {
             /*yield*/
             , (0, _commonUtil.commonFetch)(url, param, 'GET')];
 
-          case 3:
+          case 1:
             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*/
+            , 4];
+
+          case 2:
+            url = "/designer/v1/" + window.magicDesign.MBaseUrl + "/products";
+            param = {
+              products: value,
+              state: 'A'
+            };
+            return [4
+            /*yield*/
+            , (0, _commonUtil.commonFetch)(url, param, 'GET')];
+
+          case 3:
+            list = _a.sent().list;
+            setSelectedProds((0, _ProductModal.formatData)(list || []));
             _a.label = 4;
 
           case 4:

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fonixtree/magic-design",
   "author": "Cylon Team",
-  "version": "1.0.37",
+  "version": "1.0.39",
   "description": "Magic Design",
   "license": "MIT",
   "module": "es/index.js",