@fonixtree/magic-design 1.0.41 → 1.0.43

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

@@ -17,8 +17,6 @@ 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); }
@@ -187,7 +185,7 @@ var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
 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],
@@ -229,13 +227,17 @@ var ProductDetailPage = function ProductDetailPage(props) {
       flag = _k[0],
       setFlag = _k[1];
 
-  var _l = (0, _react.useState)({
+  var _l = (0, _react.useState)({}),
+      selectedPro = _l[0],
+      setSelectedPro = _l[1];
+
+  var _m = (0, _react.useState)({
     pageSize: 20,
     current: 1,
     total: 0
   }),
-      paginationParams = _l[0],
-      setPaginationParams = _l[1];
+      paginationParams = _m[0],
+      setPaginationParams = _m[1];
 
   var columns = [{
     title: 'Image',
@@ -264,12 +266,14 @@ var ProductDetailPage = function ProductDetailPage(props) {
     ellipsis: true
   }];
   var rowSelection = {
+    selectedRowKeys: [(selectedPro === null || selectedPro === void 0 ? void 0 : selectedPro.productId) || ''],
     onChange: function onChange(selectedRowKeys, selectedRows) {
-      _onChange({
+      var selected = {
         offerId: selectedRows[0].offerId,
         productId: selectedRows[0].productId,
         name: selectedRows[0].productName
-      });
+      };
+      setSelectedPro(selected);
     },
     type: 'radio'
   };
@@ -307,11 +311,11 @@ var ProductDetailPage = function ProductDetailPage(props) {
 
           case 1:
             res_1 = _a.sent();
-            _list = (0, _ProductModal.formatData)((0, _commonUtil.ensure)(function () {
+            _list = (0, _commonUtil.ensure)(function () {
               return res_1.list.map(function (m) {
                 return __assign(__assign({}, m.products[0]), m);
               });
-            }, []), proType);
+            }, []);
             total = res_1.total;
             return [3
             /*break*/
@@ -327,7 +331,7 @@ var ProductDetailPage = function ProductDetailPage(props) {
 
           case 3:
             res = _a.sent();
-            _list = (0, _ProductModal.formatData)(res.list || []);
+            _list = res.list || [];
             total = res.total;
             _a.label = 4;
 
@@ -412,9 +416,13 @@ var ProductDetailPage = function ProductDetailPage(props) {
       queryStore();
     }
   }, []);
+  (0, _react.useEffect)(function () {
+    onChange(selectedPro);
+  }, [selectedPro]);
   (0, _react.useEffect)(function () {
     setLoading(true);
     reset();
+    setSelectedPro({});
     paginationParams.current = 1;
     setFlag(!flag);
   }, [proType]);
@@ -539,7 +547,7 @@ var ProductDetailPage = function ProductDetailPage(props) {
       },
       showSizeChanger: false
     }),
-    rowKey: "id",
+    rowKey: "productId",
     rowSelection: rowSelection,
     scroll: {
       y: 300

package/es/composite-comp/common/components/ProductItem/index.js

@@ -19,8 +19,6 @@ var _ImageLabel = _interopRequireDefault(require("../ImageLabel"));
 
 var _components = require("../../../../meta-comp/components");
 
-var _businessUtil = require("../../../../utils/businessUtil");
-
 require("./index.less");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -95,26 +93,26 @@ function (_super) {
   }
 
   ProductItem.prototype.render = function () {
-    var _a, _b, _c;
-
-    var _d = this.props,
-        data = _d.data,
-        panelProps = _d.panelProps,
-        onItemClick = _d.onItemClick,
-        showProName = _d.showProName,
-        showProgress = _d.showProgress,
-        fixHeight = _d.fixHeight,
-        layout = _d.layout,
-        imgHeight = _d.imgHeight,
-        imgWidth = _d.imgWidth,
-        unknownPrice = _d.unknownPrice,
-        rest = __rest(_d, ["data", "panelProps", "onItemClick", "showProName", "showProgress", "fixHeight", "layout", "imgHeight", "imgWidth", "unknownPrice"]);
-
-    var promotions = (0, _businessUtil.getPromotionList)(data);
+    var _a, _b, _c, _d;
+
+    var _e = this.props,
+        data = _e.data,
+        panelProps = _e.panelProps,
+        onItemClick = _e.onItemClick,
+        showProName = _e.showProName,
+        showProgress = _e.showProgress,
+        fixHeight = _e.fixHeight,
+        layout = _e.layout,
+        imgHeight = _e.imgHeight,
+        imgWidth = _e.imgWidth,
+        unknownPrice = _e.unknownPrice,
+        rest = __rest(_e, ["data", "panelProps", "onItemClick", "showProName", "showProgress", "fixHeight", "layout", "imgHeight", "imgWidth", "unknownPrice"]); // const promotions = getPromotionList(data);
+
+
     var price = (0, _currencyUtil.formatCurrency)(data.salesPrice);
     /** 当是拼团时 显示价格 */
 
-    if (data.sppType && promotions.length) {
+    if (data.sppType) {
       price = data.specialPrice !== null ? (0, _currencyUtil.formatCurrency)(data.specialPrice) : (0, _currencyUtil.formatCurrency)(data.salesPrice);
     }
 
@@ -176,9 +174,9 @@ function (_super) {
       small: true
     })), /*#__PURE__*/_react["default"].createElement("div", {
       className: "content-wrap"
-    }, panelProps.label.open && /*#__PURE__*/_react["default"].createElement("div", {
+    }, panelProps.label.open && ((_d = data === null || data === void 0 ? void 0 : data.cmpBuygetnLabels) === null || _d === void 0 ? void 0 : _d.length) > 0 && /*#__PURE__*/_react["default"].createElement("div", {
       className: "promotions-wrap"
-    }, promotions.map(function (promot, index) {
+    }, data.cmpBuygetnLabels.map(function (promot, index) {
       return /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
         key: index,
         className: "promotion-item",

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

@@ -17,8 +17,6 @@ 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); }
@@ -187,7 +185,7 @@ var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
 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],
@@ -229,13 +227,17 @@ var ProductDetailPage = function ProductDetailPage(props) {
       flag = _k[0],
       setFlag = _k[1];
 
-  var _l = (0, _react.useState)({
+  var _l = (0, _react.useState)({}),
+      selectedPro = _l[0],
+      setSelectedPro = _l[1];
+
+  var _m = (0, _react.useState)({
     pageSize: 20,
     current: 1,
     total: 0
   }),
-      paginationParams = _l[0],
-      setPaginationParams = _l[1];
+      paginationParams = _m[0],
+      setPaginationParams = _m[1];
 
   var columns = [{
     title: 'Image',
@@ -264,12 +266,14 @@ var ProductDetailPage = function ProductDetailPage(props) {
     ellipsis: true
   }];
   var rowSelection = {
+    selectedRowKeys: [(selectedPro === null || selectedPro === void 0 ? void 0 : selectedPro.productId) || ''],
     onChange: function onChange(selectedRowKeys, selectedRows) {
-      _onChange({
+      var selected = {
         offerId: selectedRows[0].offerId,
         productId: selectedRows[0].productId,
         name: selectedRows[0].productName
-      });
+      };
+      setSelectedPro(selected);
     },
     type: 'radio'
   };
@@ -307,11 +311,11 @@ var ProductDetailPage = function ProductDetailPage(props) {
 
           case 1:
             res_1 = _a.sent();
-            _list = (0, _ProductModal.formatData)((0, _commonUtil.ensure)(function () {
+            _list = (0, _commonUtil.ensure)(function () {
               return res_1.list.map(function (m) {
                 return __assign(__assign({}, m.products[0]), m);
               });
-            }, []), proType);
+            }, []);
             total = res_1.total;
             return [3
             /*break*/
@@ -327,7 +331,7 @@ var ProductDetailPage = function ProductDetailPage(props) {
 
           case 3:
             res = _a.sent();
-            _list = (0, _ProductModal.formatData)(res.list || []);
+            _list = res.list || [];
             total = res.total;
             _a.label = 4;
 
@@ -412,9 +416,13 @@ var ProductDetailPage = function ProductDetailPage(props) {
       queryStore();
     }
   }, []);
+  (0, _react.useEffect)(function () {
+    onChange(selectedPro);
+  }, [selectedPro]);
   (0, _react.useEffect)(function () {
     setLoading(true);
     reset();
+    setSelectedPro({});
     paginationParams.current = 1;
     setFlag(!flag);
   }, [proType]);
@@ -539,7 +547,7 @@ var ProductDetailPage = function ProductDetailPage(props) {
       },
       showSizeChanger: false
     }),
-    rowKey: "id",
+    rowKey: "productId",
     rowSelection: rowSelection,
     scroll: {
       y: 300

package/lib/composite-comp/common/components/ProductItem/index.js

@@ -19,8 +19,6 @@ var _ImageLabel = _interopRequireDefault(require("../ImageLabel"));
 
 var _components = require("../../../../meta-comp/components");
 
-var _businessUtil = require("../../../../utils/businessUtil");
-
 require("./index.less");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -95,26 +93,26 @@ function (_super) {
   }
 
   ProductItem.prototype.render = function () {
-    var _a, _b, _c;
-
-    var _d = this.props,
-        data = _d.data,
-        panelProps = _d.panelProps,
-        onItemClick = _d.onItemClick,
-        showProName = _d.showProName,
-        showProgress = _d.showProgress,
-        fixHeight = _d.fixHeight,
-        layout = _d.layout,
-        imgHeight = _d.imgHeight,
-        imgWidth = _d.imgWidth,
-        unknownPrice = _d.unknownPrice,
-        rest = __rest(_d, ["data", "panelProps", "onItemClick", "showProName", "showProgress", "fixHeight", "layout", "imgHeight", "imgWidth", "unknownPrice"]);
-
-    var promotions = (0, _businessUtil.getPromotionList)(data);
+    var _a, _b, _c, _d;
+
+    var _e = this.props,
+        data = _e.data,
+        panelProps = _e.panelProps,
+        onItemClick = _e.onItemClick,
+        showProName = _e.showProName,
+        showProgress = _e.showProgress,
+        fixHeight = _e.fixHeight,
+        layout = _e.layout,
+        imgHeight = _e.imgHeight,
+        imgWidth = _e.imgWidth,
+        unknownPrice = _e.unknownPrice,
+        rest = __rest(_e, ["data", "panelProps", "onItemClick", "showProName", "showProgress", "fixHeight", "layout", "imgHeight", "imgWidth", "unknownPrice"]); // const promotions = getPromotionList(data);
+
+
     var price = (0, _currencyUtil.formatCurrency)(data.salesPrice);
     /** 当是拼团时 显示价格 */
 
-    if (data.sppType && promotions.length) {
+    if (data.sppType) {
       price = data.specialPrice !== null ? (0, _currencyUtil.formatCurrency)(data.specialPrice) : (0, _currencyUtil.formatCurrency)(data.salesPrice);
     }
 
@@ -176,9 +174,9 @@ function (_super) {
       small: true
     })), /*#__PURE__*/_react["default"].createElement("div", {
       className: "content-wrap"
-    }, panelProps.label.open && /*#__PURE__*/_react["default"].createElement("div", {
+    }, panelProps.label.open && ((_d = data === null || data === void 0 ? void 0 : data.cmpBuygetnLabels) === null || _d === void 0 ? void 0 : _d.length) > 0 && /*#__PURE__*/_react["default"].createElement("div", {
       className: "promotions-wrap"
-    }, promotions.map(function (promot, index) {
+    }, data.cmpBuygetnLabels.map(function (promot, index) {
       return /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
         key: index,
         className: "promotion-item",

package/package.json

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