@fonixtree/magic-design 1.0.39 → 1.0.41

package/es/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/es/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/es/common/LinkModal/FilteredProductModal/index.js

@@ -213,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];
 
@@ -277,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('');

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

@@ -225,13 +225,17 @@ 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)({
     pageSize: 20,
     current: 1,
     total: 0
   }),
-      paginationParams = _k[0],
-      setPaginationParams = _k[1];
+      paginationParams = _l[0],
+      setPaginationParams = _l[1];
 
   var columns = [{
     title: 'Image',
@@ -317,6 +321,7 @@ var ProductDetailPage = function ProductDetailPage(props) {
             return [4
             /*yield*/
             , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/products", __assign(__assign({}, params), {
+              state: 'A',
               productCode: productCode
             }), 'GET')];
 
@@ -409,9 +414,13 @@ var ProductDetailPage = function ProductDetailPage(props) {
   }, []);
   (0, _react.useEffect)(function () {
     setLoading(true);
+    reset();
     paginationParams.current = 1;
-    queryGoods();
+    setFlag(!flag);
   }, [proType]);
+  (0, _react.useEffect)(function () {
+    queryGoods();
+  }, [flag]);
   var proTypeOption = [{
     label: 'SKU',
     value: 'sku'

package/es/common/ProductModal/index.js

@@ -303,17 +303,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) {
@@ -371,8 +375,7 @@ var ProductModal = function ProductModal(props) {
               brandIds: selBrandsList.join(','),
               labelIds: selLabelData.value || '',
               pageSize: paginationParams.pageSize,
-              pageIndex: paginationParams.current,
-              state: 'A'
+              pageIndex: paginationParams.current
             };
             if (!(proType === 'spu')) return [3
             /*break*/
@@ -403,6 +406,7 @@ var ProductModal = function ProductModal(props) {
             return [4
             /*yield*/
             , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/products", __assign(__assign({}, params), {
+              state: 'A',
               productCode: productCode
             }), 'GET')];
 
@@ -514,6 +518,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();
@@ -531,22 +547,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',

package/es/common/ProductSource/index.js

@@ -214,7 +214,6 @@ function ProductSource(_a) {
             url = "/designer/v1/" + window.magicDesign.MBaseUrl + "/offers";
             param = {
               offers: value,
-              state: 'A',
               isDefaultCover: 'Y',
               onlyQryPublishSku: true,
               auditState: 'S',

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

@@ -388,7 +388,7 @@ function (_super) {
                 intelligentType: intelligentType,
                 intelligentValue: intelligentValue.join(','),
                 aggregation: false,
-                storeId: window.magicDesign.storeId || ''
+                storeId: window.magicDesign.storeId >= 0 ? window.magicDesign.storeId : ''
               }, 'POST')];
 
             case 4:

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

@@ -380,7 +380,7 @@ function (_super) {
                 intelligentType: intelligentType,
                 intelligentValue: intelligentValue.join(','),
                 aggregation: false,
-                storeId: window.magicDesign.storeId || ''
+                storeId: window.magicDesign.storeId >= 0 ? window.magicDesign.storeId : ''
               }, 'POST')];
 
             case 4:

package/es/utils/businessUtil.js

@@ -82,7 +82,7 @@ var newParseUrl = function newParseUrl(urlObj) {
     // 商品列表
 
     case _constants.urlTypeMap.FILTERED_PRODUCT:
-      link = "/product/list?" + value;
+      link = "/product/list/?" + value;
       params = {
         action: 'jump',
         params: {
@@ -251,7 +251,7 @@ var parseUrl = function parseUrl(url) {
     // 商品列表
 
     case _constants.urlType.PROD_FILTER:
-      link = "/product/list?" + arg1;
+      link = "/product/list/?" + arg1;
       params = {
         action: 'jump',
         params: {

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

@@ -213,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];
 
@@ -277,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('');

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

@@ -225,13 +225,17 @@ 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)({
     pageSize: 20,
     current: 1,
     total: 0
   }),
-      paginationParams = _k[0],
-      setPaginationParams = _k[1];
+      paginationParams = _l[0],
+      setPaginationParams = _l[1];
 
   var columns = [{
     title: 'Image',
@@ -317,6 +321,7 @@ var ProductDetailPage = function ProductDetailPage(props) {
             return [4
             /*yield*/
             , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/products", __assign(__assign({}, params), {
+              state: 'A',
               productCode: productCode
             }), 'GET')];
 
@@ -409,9 +414,13 @@ var ProductDetailPage = function ProductDetailPage(props) {
   }, []);
   (0, _react.useEffect)(function () {
     setLoading(true);
+    reset();
     paginationParams.current = 1;
-    queryGoods();
+    setFlag(!flag);
   }, [proType]);
+  (0, _react.useEffect)(function () {
+    queryGoods();
+  }, [flag]);
   var proTypeOption = [{
     label: 'SKU',
     value: 'sku'

package/lib/common/ProductModal/index.js

@@ -303,17 +303,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) {
@@ -371,8 +375,7 @@ var ProductModal = function ProductModal(props) {
               brandIds: selBrandsList.join(','),
               labelIds: selLabelData.value || '',
               pageSize: paginationParams.pageSize,
-              pageIndex: paginationParams.current,
-              state: 'A'
+              pageIndex: paginationParams.current
             };
             if (!(proType === 'spu')) return [3
             /*break*/
@@ -403,6 +406,7 @@ var ProductModal = function ProductModal(props) {
             return [4
             /*yield*/
             , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/products", __assign(__assign({}, params), {
+              state: 'A',
               productCode: productCode
             }), 'GET')];
 
@@ -514,6 +518,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();
@@ -531,22 +547,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',

package/lib/common/ProductSource/index.js

@@ -214,7 +214,6 @@ function ProductSource(_a) {
             url = "/designer/v1/" + window.magicDesign.MBaseUrl + "/offers";
             param = {
               offers: value,
-              state: 'A',
               isDefaultCover: 'Y',
               onlyQryPublishSku: true,
               auditState: 'S',

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

@@ -388,7 +388,7 @@ function (_super) {
                 intelligentType: intelligentType,
                 intelligentValue: intelligentValue.join(','),
                 aggregation: false,
-                storeId: window.magicDesign.storeId || ''
+                storeId: window.magicDesign.storeId >= 0 ? window.magicDesign.storeId : ''
               }, 'POST')];
 
             case 4:

package/lib/composite-comp/dito/components/Recommend/pc/index.js

@@ -380,7 +380,7 @@ function (_super) {
                 intelligentType: intelligentType,
                 intelligentValue: intelligentValue.join(','),
                 aggregation: false,
-                storeId: window.magicDesign.storeId || ''
+                storeId: window.magicDesign.storeId >= 0 ? window.magicDesign.storeId : ''
               }, 'POST')];
 
             case 4:

package/lib/utils/businessUtil.js

@@ -82,7 +82,7 @@ var newParseUrl = function newParseUrl(urlObj) {
     // 商品列表
 
     case _constants.urlTypeMap.FILTERED_PRODUCT:
-      link = "/product/list?" + value;
+      link = "/product/list/?" + value;
       params = {
         action: 'jump',
         params: {
@@ -251,7 +251,7 @@ var parseUrl = function parseUrl(url) {
     // 商品列表
 
     case _constants.urlType.PROD_FILTER:
-      link = "/product/list?" + arg1;
+      link = "/product/list/?" + arg1;
       params = {
         action: 'jump',
         params: {

package/package.json

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