@fonixtree/magic-design 1.0.38 → 1.0.39

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/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.38",
+  "version": "1.0.39",
   "description": "Magic Design",
   "license": "MIT",
   "module": "es/index.js",