@fonixtree/magic-design 2.0.71 → 2.0.73

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;

package/lib/common/ProductSource/index.js

@@ -15,7 +15,7 @@ var _commonUtil = require("../../utils/commonUtil");
 
 var _Button = _interopRequireDefault(require("../Button"));
 
-var _ProductModal = _interopRequireDefault(require("../ProductModal"));
+var _ProductModal = _interopRequireWildcard(require("../ProductModal"));
 
 require("./index.less");
 
@@ -27,6 +27,22 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+var __assign = void 0 && (void 0).__assign || function () {
+  __assign = Object.assign || function (t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+
+      for (var p in s) {
+        if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+      }
+    }
+
+    return t;
+  };
+
+  return __assign.apply(this, arguments);
+};
+
 var __awaiter = void 0 && (void 0).__awaiter || function (thisArg, _arguments, P, generator) {
   function adopt(value) {
     return value instanceof P ? value : new P(function (resolve) {
@@ -175,7 +191,8 @@ function ProductSource(_a) {
 
   var value = _a.value,
       onChange = _a.onChange,
-      isAffiliate = _a.isAffiliate;
+      isAffiliate = _a.isAffiliate,
+      prodType = _a.prodType;
 
   var _b = (0, _react.useState)([]),
       selectedProds = _b[0],
@@ -187,27 +204,22 @@ function ProductSource(_a) {
 
   var onSelectProduct = function onSelectProduct() {
     return __awaiter(_this, void 0, void 0, function () {
-      var url, param, list;
+      var url, param, list, url, param, list, url, param, list_1;
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
             if (!(value && value.length > 0)) return [3
             /*break*/
+            , 7];
+            if (!isAffiliate) return [3
+            /*break*/
             , 2];
-            url = "/designer/v1/" + window.magicDesign.MBaseUrl + "/products";
+            url = "/designer/v1/" + window.magicDesign.MBaseUrl + "/distributor/product/list";
             param = {
-              products: value
+              affiliateProductIds: value,
+              pageSize: value.length,
+              pageIndex: 1
             };
-
-            if (isAffiliate) {
-              url = "/designer/v1/" + window.magicDesign.MBaseUrl + "/distributor/product/list";
-              param = {
-                affiliateProductIds: value,
-                pageSize: value.length,
-                pageIndex: 1
-              };
-            }
-
             return [4
             /*yield*/
             , (0, _commonUtil.commonFetch)(url, param, 'GET')];
@@ -217,13 +229,61 @@ function ProductSource(_a) {
             setSelectedProds(list || []);
             return [3
             /*break*/
-            , 3];
+            , 6];
 
           case 2:
-            setSelectedProds([]);
-            _a.label = 3;
+            if (!(prodType === 'sku')) return [3
+            /*break*/
+            , 4];
+            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 || []));
+            return [3
+            /*break*/
+            , 6];
+
+          case 4:
+            url = "/designer/v1/" + window.magicDesign.MBaseUrl + "/offers";
+            param = {
+              offers: value,
+              state: 'A',
+              isDefaultCover: 'Y',
+              onlyQryPublishSku: true,
+              auditState: 'S',
+              crmFlag: 'on'
+            };
+            return [4
+            /*yield*/
+            , (0, _commonUtil.commonFetch)(url, param, 'GET')];
+
+          case 5:
+            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));
+            _a.label = 6;
+
+          case 6:
+            return [3
+            /*break*/
+            , 8];
+
+          case 7:
+            setSelectedProds([]);
+            _a.label = 8;
+
+          case 8:
             setVisbile(true);
             return [2
             /*return*/
@@ -233,7 +293,7 @@ function ProductSource(_a) {
     });
   };
 
-  var handleModalSave = function handleModalSave(list) {
+  var handleModalSave = function handleModalSave(list, type) {
     var ids = '';
 
     if (isAffiliate) {
@@ -242,11 +302,11 @@ function ProductSource(_a) {
       }).join(',');
     } else {
       ids = list.map(function (prod) {
-        return prod.productId;
+        return prod.id;
       }).join(',');
     }
 
-    onChange(ids);
+    onChange(ids, type);
   };
 
   var getLength = function getLength() {
@@ -281,6 +341,7 @@ function ProductSource(_a) {
     defaultList: selectedProds,
     handleModalSave: handleModalSave,
     maxSelect: 100,
+    prodType: prodType,
     visible: visible
   })));
 }

package/lib/composite-comp/dito/components/HeadNavigation/defaultJSON.js

@@ -68,23 +68,28 @@ var getDefaultJSON = function getDefaultJSON() {
     groupSource: defaultHeadName.map(function (group) {
       return groupSourceHeadJSON(group);
     }),
-    displayPage: [{
-      name: 'Store Home',
-      type: '/store-home',
-      state: true
-    }, {
-      name: 'Product Detail',
-      type: '/product/list',
-      state: true
-    }, {
-      name: 'Poster Page',
-      type: '/poster',
-      state: true
-    }, {
-      name: 'Community',
-      type: '/main/community',
-      state: true
-    }],
+    // displayPage: [
+    //   {
+    //     name: 'Store Home',
+    //     type: '/store-home',
+    //     state: true,
+    //   },
+    //   {
+    //     name: 'Product Detail',
+    //     type: '/product/list',
+    //     state: true,
+    //   },
+    //   {
+    //     name: 'Poster Page',
+    //     type: '/poster',
+    //     state: true,
+    //   },
+    //   {
+    //     name: 'Community',
+    //     type: '/main/community',
+    //     state: true,
+    //   },
+    // ],
     background: {
       opacity: 100,
       color: '#fff',

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

@@ -62,8 +62,8 @@ function (_super) {
     var _this = this;
 
     var data = this.props.data;
-    var showNav = this.state.showNav;
-    console.log('---head data', data);
+    var showNav = this.state.showNav; // console.log('---head data', data);
+
     var GAData = (0, _commonUtil.getGAData)(data);
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "m-head-navigation"