@fonixtree/magic-design 0.1.93 → 0.2.2

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: "affiliateModalCot"
+    wrapClassName: "modalCot"
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "proModalWrap"
   }, /*#__PURE__*/_react["default"].createElement("div", {

package/es/common/AffiliateProductModal/index.less

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

package/es/common/Button/index.less

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

package/es/common/CountDown/index.js

@@ -57,11 +57,9 @@ function (_super) {
       hour: '00',
       min: '00',
       second: '00',
-      nowTime: Number(_this.props.now),
-      now: _this.props.now
+      nowTime: _this.props.now
     };
     _this.timer = null;
-    _this.preTime = '';
 
     _this.componentWillUnmount = function () {
       _this.clearTimer();
@@ -114,26 +112,19 @@ function (_super) {
     return _this;
   }
 
-  CountDown.getDerivedStateFromProps = function (nextProps, prevState) {
-    // 检查是否需要更新sortType
-    if (nextProps.now !== prevState.now) {
-      return {
-        now: nextProps.now,
-        nowTime: nextProps.now
-      };
-    }
+  CountDown.prototype.componentWillReceiveProps = function (nextProps) {
+    var _this = this;
 
-    return null;
-  };
+    if (nextProps.now !== this.props.now) {
+      this.setState({
+        nowTime: nextProps.now
+      }, function () {
+        _this.clearTimer();
 
-  CountDown.prototype.componentDidUpdate = function () {
-    var now = this.state.now;
+        _this.calcLastTime();
 
-    if (this.preTime != now) {
-      this.preTime = now;
-      this.clearTimer();
-      this.calcLastTime();
-      this.timer = setInterval(this.calcLastTime, 1000);
+        _this.timer = setInterval(_this.calcLastTime, 1000);
+      });
     }
   };
 

package/es/common/GroupList/index.js

@@ -52,11 +52,8 @@ var renderCardDefault = function renderCardDefault(src) {
     alt: "",
     src: ((0, _coreUtil.isPc)() ? src.image.content.pcImgSrc : src.image.content.h5ImgSrc) || _defaultImg["default"]
   }), /*#__PURE__*/_react["default"].createElement("div", {
-    className: "name",
-    dangerouslySetInnerHTML: {
-      __html: src.title.text
-    }
-  }));
+    className: "name"
+  }, src.title.text));
 };
 
 var GroupList =
@@ -121,8 +118,6 @@ function (_super) {
       _this.setState({});
 
       (0, _coreUtil.renderPreview)();
-
-      _this.props.reRender();
     };
 
     _this.deleteItem = function (e, item) {

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 >= 0 ? window.magicDesign.storeId : ''),
+  var _c = (0, _react.useState)(window.magicDesign.storeId ? 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 >= 0 ? window.magicDesign.storeId : '');
+    setStoreId(window.magicDesign.storeId ? 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 >= 0 ? window.magicDesign.storeId : ''
+              storeId: window.magicDesign.storeId ? window.magicDesign.storeId : ''
             });
             return [4
             /*yield*/

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

@@ -198,7 +198,6 @@ function CustomTable(props) {
 
   (0, _react.useEffect)(function () {
     queryCus({
-      templateType: 'Page',
       pageType: 'Customized',
       verType: 'Formal',
       configVersion: 'V2',

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

@@ -213,45 +213,49 @@ var FilteredProductModal = function FilteredProductModal(props) {
       labelData = _f[0],
       setLabelData = _f[1];
 
-  var _g = (0, _react.useState)(window.magicDesign.storeId >= 0 ? window.magicDesign.storeId : ''),
-      storeId = _g[0],
-      setStoreId = _g[1];
+  var _g = (0, _react.useState)(''),
+      storeName = _g[0],
+      setStoreName = _g[1];
 
-  var _h = (0, _react.useState)([]),
-      storeList = _h[0],
-      setStoreList = _h[1];
+  var _h = (0, _react.useState)(window.magicDesign.storeId || ''),
+      storeId = _h[0],
+      setStoreId = _h[1];
 
-  var _j = (0, _react.useState)(''),
-      productName = _j[0],
-      setProductName = _j[1];
+  var _j = (0, _react.useState)([]),
+      storeList = _j[0],
+      setStoreList = _j[1];
 
   var _k = (0, _react.useState)(''),
-      minimum = _k[0],
-      setMinimum = _k[1];
+      productName = _k[0],
+      setProductName = _k[1];
 
   var _l = (0, _react.useState)(''),
-      maximum = _l[0],
-      setMaximum = _l[1];
+      minimum = _l[0],
+      setMinimum = _l[1];
 
-  var _m = (0, _react.useState)([]),
-      dataSource = _m[0],
-      setDataSource = _m[1];
+  var _m = (0, _react.useState)(''),
+      maximum = _m[0],
+      setMaximum = _m[1];
 
-  var _o = (0, _react.useState)({}),
-      promotions = _o[0],
-      setPromotions = _o[1];
+  var _o = (0, _react.useState)([]),
+      dataSource = _o[0],
+      setDataSource = _o[1];
 
-  var _p = (0, _react.useState)(false),
-      loading = _p[0],
-      setLoading = _p[1];
+  var _p = (0, _react.useState)({}),
+      promotions = _p[0],
+      setPromotions = _p[1];
 
-  var _q = (0, _react.useState)({
+  var _q = (0, _react.useState)(false),
+      loading = _q[0],
+      setLoading = _q[1];
+
+  var _r = (0, _react.useState)({
     pageSize: 20,
     current: 1,
     total: 0
   }),
-      paginationParams = _q[0],
-      setPaginationParams = _q[1];
+      paginationParams = _r[0],
+      setPaginationParams = _r[1];
 
   var onChange = function onChange(value) {
     settVal(value);
@@ -277,7 +281,8 @@ var FilteredProductModal = function FilteredProductModal(props) {
     settVal([]);
     settBrandId([]);
     settLabelId({});
-    setStoreId(window.magicDesign.storeId >= 0 ? window.magicDesign.storeId : '');
+    setStoreId(window.magicDesign.storeId || '');
+    setStoreName('');
     setProductName('');
     setMinimum('');
     setMaximum('');
@@ -288,7 +293,7 @@ var FilteredProductModal = function FilteredProductModal(props) {
 
   var columns = [{
     title: 'Image',
-    dataIndex: 'productImageUrl',
+    dataIndex: 'imgUrl',
     key: 'imgUrl',
     width: 100,
     render: function render(imgUrl, record) {
@@ -304,7 +309,13 @@ 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',
@@ -428,57 +439,72 @@ var FilteredProductModal = function FilteredProductModal(props) {
   };
 
   var loadGoods = function loadGoods() {
-    return __awaiter(void 0, void 0, void 0, function () {
-      var params, res, h5UrlStr;
-      return __generator(this, function (_a) {
-        switch (_a.label) {
-          case 0:
-            setLoading(true);
-            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();
-            setDataSource(res.list || []);
-            paginationParams.total = res.total;
-            setPaginationParams(__assign({}, paginationParams));
-            setLoading(false);
-            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'
-            });
-            return [2
-            /*return*/
-            , {
-              url: h5UrlStr,
-              total: res.total
-            }];
-        }
+    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*/
+              ];
+          }
+        });
       });
     });
   };
@@ -638,15 +664,13 @@ 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);
+          onDataChange('', res.total); // message.warn('no goods!');
         }
       });
     },

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

@@ -1,6 +1,5 @@
 .mFilteredProductModal {
   height: 550px;
-
   .proModalWrap {
     .info {
       background: #ecf1fd;

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

@@ -182,10 +182,23 @@ 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) {
-  var onChange = props.onChange;
+  var _onChange = props.onChange;
 
   var _a = (0, _react.useState)([]),
       productList = _a[0],
@@ -219,25 +232,12 @@ var ProductDetailPage = function ProductDetailPage(props) {
       loading = _h[0],
       setLoading = _h[1];
 
-  var _j = (0, _react.useState)('sku'),
-      proType = _j[0],
-      setProType = _j[1];
-
-  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)({
+  var _j = (0, _react.useState)({
     pageSize: 20,
-    current: 1,
-    total: 0
+    pageIndex: 1
   }),
-      paginationParams = _m[0],
-      setPaginationParams = _m[1];
+      paginationParams = _j[0],
+      setPaginationParams = _j[1];
 
   var columns = [{
     title: 'Image',
@@ -266,81 +266,32 @@ var ProductDetailPage = function ProductDetailPage(props) {
     ellipsis: true
   }];
   var rowSelection = {
-    selectedRowKeys: [(selectedPro === null || selectedPro === void 0 ? void 0 : selectedPro.productId) || ''],
     onChange: function onChange(selectedRowKeys, selectedRows) {
-      var selected = {
+      _onChange({
         offerId: selectedRows[0].offerId,
         productId: selectedRows[0].productId,
         name: selectedRows[0].productName
-      };
-      setSelectedPro(selected);
+      });
     },
     type: 'radio'
   };
 
-  var queryGoods = function queryGoods() {
+  var queryGoods = function queryGoods(params) {
     return __awaiter(void 0, void 0, void 0, function () {
-      var _list, total, params, res_1, res;
-
+      var res;
       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 === 'spu')) return [3
-            /*break*/
-            , 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')];
+            , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/products", params, 'GET')];
 
           case 1:
-            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;
-            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:
-            setProductList(_list);
             setLoading(false);
-            window.MProductList = _list;
-            paginationParams.total = total;
-            setPaginationParams(__assign({}, paginationParams));
+            paginationParams.total = res.total;
+            setProductList(res.list);
+            window.MProductList = res.list;
             return [2
             /*return*/
             ];
@@ -410,32 +361,18 @@ var ProductDetailPage = function ProductDetailPage(props) {
   };
 
   (0, _react.useEffect)(function () {
+    setLoading(true);
+
+    var total = paginationParams.total,
+        params = __rest(paginationParams, ["total"]);
+
+    queryGoods(params);
     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'
-  }, {
-    label: 'SPU',
-    value: 'spu'
-  }];
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "productDetailPage"
   }, /*#__PURE__*/_react["default"].createElement(_antd.Form, {
@@ -445,20 +382,6 @@ 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, {
@@ -472,7 +395,7 @@ var ProductDetailPage = function ProductDetailPage(props) {
   }))), /*#__PURE__*/_react["default"].createElement(_antd.Col, {
     span: 9
   }, /*#__PURE__*/_react["default"].createElement(_antd.Form.Item, {
-    label: proType === 'spu' ? 'SPU Code' : 'SKU Code'
+    label: "SKU Code"
   }, /*#__PURE__*/_react["default"].createElement(_antd.Input, {
     onChange: function onChange(e) {
       return setProductCode(e.target.value);
@@ -521,8 +444,19 @@ var ProductDetailPage = function ProductDetailPage(props) {
   }, /*#__PURE__*/_react["default"].createElement(_antd.Button, {
     onClick: function onClick() {
       setLoading(true);
-      paginationParams.current = 1;
-      queryGoods();
+      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));
     },
     size: "small",
     style: {
@@ -542,15 +476,26 @@ var ProductDetailPage = function ProductDetailPage(props) {
     pagination: __assign(__assign({}, paginationParams), {
       onChange: function onChange(page) {
         setLoading(true);
-        paginationParams.current = page;
-        queryGoods();
+        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));
       },
       showSizeChanger: false
     }),
     rowKey: "productId",
     rowSelection: rowSelection,
     scroll: {
-      y: 300
+      y: 340
     }
   }));
 };

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

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