@fonixtree/magic-design 2.0.72 → 2.0.73

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

@@ -17,6 +17,8 @@ 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); }
@@ -182,19 +184,6 @@ 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) {
@@ -232,12 +221,17 @@ var ProductDetailPage = function ProductDetailPage(props) {
       loading = _h[0],
       setLoading = _h[1];
 
-  var _j = (0, _react.useState)({
+  var _j = (0, _react.useState)('sku'),
+      proType = _j[0],
+      setProType = _j[1];
+
+  var _k = (0, _react.useState)({
     pageSize: 20,
-    pageIndex: 1
+    current: 1,
+    total: 0
   }),
-      paginationParams = _j[0],
-      setPaginationParams = _j[1];
+      paginationParams = _k[0],
+      setPaginationParams = _k[1];
 
   var columns = [{
     title: 'Image',
@@ -276,22 +270,68 @@ var ProductDetailPage = function ProductDetailPage(props) {
     type: 'radio'
   };
 
-  var queryGoods = function queryGoods(params) {
+  var queryGoods = function queryGoods() {
     return __awaiter(void 0, void 0, void 0, function () {
-      var res;
+      var _list, total, params, res, res_1;
+
       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 === 'sku')) return [3
+            /*break*/
+            , 2];
             return [4
             /*yield*/
-            , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/products", params, 'GET')];
+            , (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), {
+              offerCode: productCode,
+              isDefaultCover: 'Y',
+              onlyQryPublishSku: true,
+              auditState: 'S',
+              crmFlag: 'on'
+            }), 'GET')];
+
+          case 3:
+            res_1 = _a.sent();
+            _list = (0, _ProductModal.formatData)((0, _commonUtil.ensure)(function () {
+              return res_1.list.map(function (m) {
+                return __assign(__assign({}, m.products[0]), m);
+              });
+            }, []), proType);
+            total = res_1.total;
+            _a.label = 4;
+
+          case 4:
+            setProductList(_list);
             setLoading(false);
-            paginationParams.total = res.total;
-            setProductList(res.list);
-            window.MProductList = res.list;
+            window.MProductList = _list;
+            paginationParams.total = total;
+            setPaginationParams(__assign({}, paginationParams));
             return [2
             /*return*/
             ];
@@ -362,17 +402,20 @@ var ProductDetailPage = function ProductDetailPage(props) {
 
   (0, _react.useEffect)(function () {
     setLoading(true);
-
-    var total = paginationParams.total,
-        params = __rest(paginationParams, ["total"]);
-
-    queryGoods(params);
+    queryGoods();
     queryBrand();
 
     if ((0, _businessUtil.isPlatform)()) {
       queryStore();
     }
   }, []);
+  var proTypeOption = [{
+    label: 'SKU',
+    value: 'sku'
+  }, {
+    label: 'SPU',
+    value: 'spu'
+  }];
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "productDetailPage"
   }, /*#__PURE__*/_react["default"].createElement(_antd.Form, {
@@ -382,6 +425,20 @@ 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, {
@@ -395,7 +452,7 @@ var ProductDetailPage = function ProductDetailPage(props) {
   }))), /*#__PURE__*/_react["default"].createElement(_antd.Col, {
     span: 9
   }, /*#__PURE__*/_react["default"].createElement(_antd.Form.Item, {
-    label: "SKU Code"
+    label: proType === 'sku' ? 'SKU Code' : 'SPU Code'
   }, /*#__PURE__*/_react["default"].createElement(_antd.Input, {
     onChange: function onChange(e) {
       return setProductCode(e.target.value);
@@ -444,19 +501,8 @@ var ProductDetailPage = function ProductDetailPage(props) {
   }, /*#__PURE__*/_react["default"].createElement(_antd.Button, {
     onClick: function onClick() {
       setLoading(true);
-      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));
+      paginationParams.current = 1;
+      queryGoods();
     },
     size: "small",
     style: {
@@ -476,26 +522,15 @@ var ProductDetailPage = function ProductDetailPage(props) {
     pagination: __assign(__assign({}, paginationParams), {
       onChange: function onChange(page) {
         setLoading(true);
-        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));
+        paginationParams.current = page;
+        queryGoods();
       },
       showSizeChanger: false
     }),
-    rowKey: "productId",
+    rowKey: "id",
     rowSelection: rowSelection,
     scroll: {
-      y: 340
+      y: 300
     }
   }));
 };

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

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

package/lib/common/ProductModal/index.js

@@ -5,7 +5,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = void 0;
+exports.formatData = exports["default"] = void 0;
 
 var _antd = require("antd");
 
@@ -204,18 +204,26 @@ var __spreadArrays = void 0 && (void 0).__spreadArrays || function () {
   return r;
 };
 
-var formatData = function formatData(list) {
+var promType = {
+  FLASH_SALE: '2',
+  GROUP_BUY: '4'
+};
+var proTypeOption = [{
+  label: 'SKU',
+  value: 'sku'
+}, {
+  label: 'SPU',
+  value: 'spu'
+}];
+
+var formatData = function formatData(list, type) {
   list.map(function (item) {
-    item.preSalesPrice = (0, _currencyUtil.formatCurrencyWithSymbol)(item.salesPrice);
-    item.preMarketPrice = (0, _currencyUtil.formatCurrencyWithSymbol)(item.marketPrice);
+    item.id = type === 'spu' ? item.offerId : item.productId;
   });
   return list;
 };
 
-var promType = {
-  FLASH_SALE: '2',
-  GROUP_BUY: '4'
-};
+exports.formatData = formatData;
 var Option = _antd.Select.Option;
 var InputGroup = _antd.Input.Group;
 
@@ -223,14 +231,12 @@ var ProductModal = function ProductModal(props) {
   var handleModalSave = props.handleModalSave,
       closeModal = props.closeModal,
       visible = props.visible,
-      _a = props.defaultList,
-      defaultList = _a === void 0 ? [] : _a,
-      _b = props.maxSelect,
-      maxSelect = _b === void 0 ? 20 : _b;
-
-  var _c = (0, _react.useState)(defaultList),
-      selectedList = _c[0],
-      setSelectedList = _c[1];
+      _a = props.prodType,
+      prodType = _a === void 0 ? 'sku' : _a,
+      _b = props.defaultList,
+      defaultList = _b === void 0 ? [] : _b,
+      _c = props.maxSelect,
+      maxSelect = _c === void 0 ? 20 : _c;
 
   var _d = (0, _react.useState)([]),
       catgsList = _d[0],
@@ -292,15 +298,27 @@ var ProductModal = function ProductModal(props) {
       loading = _t[0],
       setLoading = _t[1];
 
-  var _u = (0, _react.useState)(defaultList.map(function (v) {
-    return v.productId;
-  })),
-      selectedRowKeys = _u[0],
-      setSelectedRowKeys = _u[1];
+  var _u = (0, _react.useState)(prodType),
+      proType = _u[0],
+      setProType = _u[1];
+
+  var _v = (0, _react.useState)(defaultList),
+      selectedList = _v[0],
+      setSelectedList = _v[1];
+
+  var _w = (0, _react.useState)({
+    pageSize: 20,
+    current: 1,
+    total: 0
+  }),
+      paginationParams = _w[0],
+      setPaginationParams = _w[1];
 
   var rowSelection = {
-    selectedRowKeys: selectedRowKeys,
-    onSelect: function onSelect(record, selected, selectedRows) {
+    selectedRowKeys: selectedList.map(function (v) {
+      return v.id;
+    }),
+    onSelect: function onSelect(record, selected) {
       if (selected) {
         if (selectedList.length === maxSelect) {
           _antd.message.warning("Max " + maxSelect);
@@ -309,17 +327,13 @@ var ProductModal = function ProductModal(props) {
         }
 
         if (selectedList.length < maxSelect) {
-          setSelectedList(__spreadArrays(selectedList, formatData([record])));
+          setSelectedList(__spreadArrays(selectedList, [record]));
         }
       } else {
         setSelectedList(selectedList.filter(function (v) {
-          return v.productId !== record.productId;
+          return v.id !== record.id;
         }));
       }
-
-      setSelectedRowKeys(selectedRows.map(function (v) {
-        return v === null || v === void 0 ? void 0 : v.productId;
-      }));
     },
     getCheckboxProps: function getCheckboxProps(record) {
       return {
@@ -328,41 +342,80 @@ var ProductModal = function ProductModal(props) {
     }
   };
 
-  var _v = (0, _react.useState)({
-    pageSize: 20,
-    current: 1,
-    total: 0
-  }),
-      paginationParams = _v[0],
-      setPaginationParams = _v[1];
-
   var delSelectedItem = function delSelectedItem(index) {
-    console.log(selectedRowKeys, index, 2223);
-    var rowKeys = JSON.parse(JSON.stringify(selectedRowKeys));
-    rowKeys.splice(index, 1);
-    setSelectedRowKeys(rowKeys);
     var rows = JSON.parse(JSON.stringify(selectedList));
     rows.splice(index, 1);
     setSelectedList(rows);
   }; // 请求商品列表
 
 
-  var queryGoods = function queryGoods(data) {
+  var queryGoods = function queryGoods() {
     return __awaiter(void 0, void 0, void 0, function () {
-      var res;
+      var _list, total, params, res, res_1;
+
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
+            setLoading(true);
+            setGoodsList([]);
+            _list = [];
+            total = 0;
+            params = {
+              productName: productName,
+              storeId: storeId,
+              cmpTypeId: promotions || '',
+              minPrice: (0, _currencyUtil.formatBackendCurrency)(minPrice),
+              maxPrice: (0, _currencyUtil.formatBackendCurrency)(maxPrice),
+              catgIds: selCatgsList.join(','),
+              brandIds: selBrandsList.join(','),
+              labelIds: selLabelData.value || '',
+              pageSize: paginationParams.pageSize,
+              pageIndex: paginationParams.current,
+              state: 'A'
+            };
+            if (!(proType === 'sku')) return [3
+            /*break*/
+            , 2];
             return [4
             /*yield*/
-            , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/products", data, 'GET')];
+            , (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), {
+              offerCode: productCode,
+              isDefaultCover: 'Y',
+              onlyQryPublishSku: true,
+              auditState: 'S',
+              crmFlag: 'on'
+            }), 'GET')];
+
+          case 3:
+            res_1 = _a.sent();
+            _list = formatData((0, _commonUtil.ensure)(function () {
+              return res_1.list.map(function (m) {
+                return __assign(__assign({}, m.products[0]), m);
+              });
+            }, []), proType);
+            total = res_1.total;
+            _a.label = 4;
+
+          case 4:
             setLoading(false);
-            paginationParams.total = res.total;
-            setPaginationParams(paginationParams);
-            setGoodsList(res.list || []);
+            setGoodsList(_list);
+            paginationParams.total = total;
+            setPaginationParams(__assign({}, paginationParams));
             return [2
             /*return*/
             ];
@@ -471,14 +524,15 @@ var ProductModal = function ProductModal(props) {
   }, []);
   (0, _react.useEffect)(function () {
     setSelectedList(defaultList);
-    setSelectedRowKeys(defaultList.map(function (v) {
-      return v.productId;
-    }));
 
     if (props.type === 'groupBuy') {
       setPromotions(promType.GROUP_BUY);
     }
   }, [visible]);
+  (0, _react.useEffect)(function () {
+    paginationParams.current = 1;
+    queryGoods();
+  }, [proType]);
 
   var reset = function reset() {
     setSelBrandsList([]);
@@ -510,8 +564,8 @@ var ProductModal = function ProductModal(props) {
     width: 120,
     ellipsis: true
   }, {
-    title: (0, _locale.i18n)('PRODUCT_CODE'),
-    dataIndex: 'productCode',
+    title: proType === 'sku' ? (0, _locale.i18n)('SKU_CODE') : (0, _locale.i18n)('SPU_CODE'),
+    dataIndex: proType === 'sku' ? 'productCode' : 'offerCode',
     width: 120,
     ellipsis: true
   }, _defineProperty({
@@ -599,7 +653,7 @@ var ProductModal = function ProductModal(props) {
       return setStoreId(value);
     },
     optionFilterProp: "children",
-    placeholder: "Please select",
+    placeholder: (0, _locale.i18n)('PLEASE_SELECT'),
     showSearch: true,
     value: storeId
   }, storeList && storeList.length > 0 && storeList.map(function (v) {
@@ -612,7 +666,6 @@ var ProductModal = function ProductModal(props) {
   }, /*#__PURE__*/_react["default"].createElement(_antd.Select, {
     defaultValue: selLabelData.children || null,
     onChange: function onChange(v, o) {
-      console.log(v, o, 33);
       setSelLabelData(o);
     },
     placeholder: (0, _locale.i18n)('PLEASE_SELECT'),
@@ -659,7 +712,7 @@ var ProductModal = function ProductModal(props) {
     size: "small",
     value: productName
   })), /*#__PURE__*/_react["default"].createElement(_antd.Form.Item, {
-    label: "SKU Code"
+    label: proType === 'sku' ? 'SKU Code' : 'SPU Code'
   }, /*#__PURE__*/_react["default"].createElement(_antd.Input, {
     className: "inputStyle",
     onChange: function onChange(e) {
@@ -693,20 +746,7 @@ var ProductModal = function ProductModal(props) {
     onClick: function onClick() {
       setLoading(true);
       paginationParams.current = 1;
-      queryGoods({
-        productName: productName,
-        productCode: productCode,
-        storeId: storeId,
-        cmpTypeId: promotions || '',
-        minPrice: (0, _currencyUtil.formatBackendCurrency)(minPrice),
-        maxPrice: (0, _currencyUtil.formatBackendCurrency)(maxPrice),
-        catgIds: selCatgsList.join(','),
-        brandIds: selBrandsList.join(','),
-        labelIds: selLabelData.value || '',
-        pageSize: paginationParams.pageSize,
-        pageIndex: paginationParams.current,
-        state: 'A'
-      });
+      queryGoods();
     },
     size: "small",
     style: {
@@ -715,7 +755,17 @@ var ProductModal = function ProductModal(props) {
     type: "primary"
   }, (0, _locale.i18n)('QUERY'))))), /*#__PURE__*/_react["default"].createElement("div", {
     className: "rightCot"
-  }, /*#__PURE__*/_react["default"].createElement(_antd.Table, {
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Radio.Group, {
+    buttonStyle: "solid",
+    className: "btn-select-type",
+    onChange: function onChange(e) {
+      setProType(e.target.value);
+      setSelectedList([]);
+    },
+    options: proTypeOption,
+    optionType: "button",
+    value: proType
+  }), /*#__PURE__*/_react["default"].createElement(_antd.Table, {
     columns: columns,
     dataSource: goodsList,
     loading: loading,
@@ -723,26 +773,13 @@ var ProductModal = function ProductModal(props) {
       onChange: function onChange(page) {
         setLoading(true);
         paginationParams.current = page;
-        setPaginationParams(paginationParams);
-        queryGoods({
-          productName: productName,
-          productCode: productCode,
-          cmpTypeId: promotions || '',
-          minPrice: (0, _currencyUtil.formatBackendCurrency)(minPrice),
-          maxPrice: (0, _currencyUtil.formatBackendCurrency)(maxPrice),
-          catgIds: selCatgsList.join(','),
-          brandIds: selBrandsList.join(','),
-          labelIds: selLabelData.value || '',
-          pageSize: paginationParams.pageSize,
-          pageIndex: paginationParams.current,
-          state: 'A'
-        });
+        queryGoods();
       }
     }),
-    rowKey: "productId",
+    rowKey: "id",
     rowSelection: rowSelection,
     scroll: {
-      y: 500
+      y: 420
     }
   }), /*#__PURE__*/_react["default"].createElement("div", {
     className: "selectedCot"
@@ -772,7 +809,7 @@ var ProductModal = function ProductModal(props) {
     className: "totalNum"
   }, selectedList.length, "/", maxSelect)), /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_antd.Button, {
     onClick: function onClick() {
-      handleModalSave && handleModalSave(selectedList);
+      handleModalSave && handleModalSave(selectedList, proType);
       closeModal && closeModal();
     },
     style: {

package/lib/common/ProductModal/index.less

@@ -17,7 +17,13 @@
         margin-left: 16px;
         display: flex;
         flex-direction: column;
-        justify-content: space-between;
+        justify-content: flex-start;
+
+
+        .btn-select-type {
+          text-align: right;
+          margin-bottom: 15px;
+        }
 
         .prodImg {
           display: inline-block;