@fonixtree/magic-design 1.0.35 → 1.0.37

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (29) hide show
  1. package/es/assets/fonts/.DS_Store +0 -0
  2. package/es/common/LinkModal/FilteredProductModal/index.js +154 -104
  3. package/es/common/LinkModal/FilteredProductModal/index.less +7 -0
  4. package/es/common/LinkModal/ProductDetailPage/index.js +92 -57
  5. package/es/common/LinkModal/ProductDetailPage/index.less +6 -1
  6. package/es/common/ProductModal/index.js +124 -87
  7. package/es/common/ProductModal/index.less +7 -1
  8. package/es/common/ProductSource/index.js +65 -13
  9. package/es/composite-comp/dito/components/Recommend/mobile/index.js +26 -23
  10. package/es/composite-comp/dito/second-config-panels/RecommendSecondConfig/index.js +4 -2
  11. package/es/locale/en/en.json +10 -1
  12. package/es/locale/es/es.json +10 -1
  13. package/es/locale/id/id.json +10 -1
  14. package/es/utils/commonUtil.js +14 -6
  15. package/lib/assets/fonts/.DS_Store +0 -0
  16. package/lib/common/LinkModal/FilteredProductModal/index.js +154 -104
  17. package/lib/common/LinkModal/FilteredProductModal/index.less +7 -0
  18. package/lib/common/LinkModal/ProductDetailPage/index.js +92 -57
  19. package/lib/common/LinkModal/ProductDetailPage/index.less +6 -1
  20. package/lib/common/ProductModal/index.js +124 -87
  21. package/lib/common/ProductModal/index.less +7 -1
  22. package/lib/common/ProductSource/index.js +65 -13
  23. package/lib/composite-comp/dito/components/Recommend/mobile/index.js +26 -23
  24. package/lib/composite-comp/dito/second-config-panels/RecommendSecondConfig/index.js +4 -2
  25. package/lib/locale/en/en.json +10 -1
  26. package/lib/locale/es/es.json +10 -1
  27. package/lib/locale/id/id.json +10 -1
  28. package/lib/utils/commonUtil.js +14 -6
  29. package/package.json +1 -1
@@ -1,5 +1,10 @@
1
1
  .productDetailPage {
2
2
  height: 550px;
3
+
4
+ .btn-select-type {
5
+ margin-bottom: 10px;
6
+ }
7
+
3
8
  .prodImage {
4
9
  width: 36px;
5
10
  height: 36px;
@@ -7,4 +12,4 @@
7
12
  background-position: 50% 50%;
8
13
  background-size: contain;
9
14
  }
10
- }
15
+ }
@@ -5,7 +5,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
5
5
  Object.defineProperty(exports, "__esModule", {
6
6
  value: true
7
7
  });
8
- exports["default"] = void 0;
8
+ exports.formatData = exports["default"] = void 0;
9
9
 
10
10
  var _antd = require("antd");
11
11
 
@@ -204,18 +204,26 @@ var __spreadArrays = void 0 && (void 0).__spreadArrays || function () {
204
204
  return r;
205
205
  };
206
206
 
207
- var formatData = function formatData(list) {
207
+ var promType = {
208
+ FLASH_SALE: '2',
209
+ GROUP_BUY: '4'
210
+ };
211
+ var proTypeOption = [{
212
+ label: 'SKU',
213
+ value: 'sku'
214
+ }, {
215
+ label: 'SPU',
216
+ value: 'spu'
217
+ }];
218
+
219
+ var formatData = function formatData(list, type) {
208
220
  list.map(function (item) {
209
- item.preSalesPrice = (0, _currencyUtil.formatCurrencyWithSymbol)(item.salesPrice);
210
- item.preMarketPrice = (0, _currencyUtil.formatCurrencyWithSymbol)(item.marketPrice);
221
+ item.id = type === 'spu' ? item.offerId : item.productId;
211
222
  });
212
223
  return list;
213
224
  };
214
225
 
215
- var promType = {
216
- FLASH_SALE: '2',
217
- GROUP_BUY: '4'
218
- };
226
+ exports.formatData = formatData;
219
227
  var Option = _antd.Select.Option,
220
228
  OptGroup = _antd.Select.OptGroup;
221
229
  var InputGroup = _antd.Input.Group;
@@ -224,14 +232,12 @@ var ProductModal = function ProductModal(props) {
224
232
  var handleModalSave = props.handleModalSave,
225
233
  closeModal = props.closeModal,
226
234
  visible = props.visible,
227
- _a = props.defaultList,
228
- defaultList = _a === void 0 ? [] : _a,
229
- _b = props.maxSelect,
230
- maxSelect = _b === void 0 ? 20 : _b;
231
-
232
- var _c = (0, _react.useState)(defaultList),
233
- selectedList = _c[0],
234
- setSelectedList = _c[1];
235
+ _a = props.prodType,
236
+ prodType = _a === void 0 ? 'sku' : _a,
237
+ _b = props.defaultList,
238
+ defaultList = _b === void 0 ? [] : _b,
239
+ _c = props.maxSelect,
240
+ maxSelect = _c === void 0 ? 20 : _c;
235
241
 
236
242
  var _d = (0, _react.useState)([]),
237
243
  catgsList = _d[0],
@@ -293,15 +299,27 @@ var ProductModal = function ProductModal(props) {
293
299
  loading = _t[0],
294
300
  setLoading = _t[1];
295
301
 
296
- var _u = (0, _react.useState)(defaultList.map(function (v) {
297
- return v.productId;
298
- })),
299
- selectedRowKeys = _u[0],
300
- setSelectedRowKeys = _u[1];
302
+ var _u = (0, _react.useState)(prodType),
303
+ proType = _u[0],
304
+ setProType = _u[1];
305
+
306
+ var _v = (0, _react.useState)(defaultList),
307
+ selectedList = _v[0],
308
+ setSelectedList = _v[1];
309
+
310
+ var _w = (0, _react.useState)({
311
+ pageSize: 20,
312
+ current: 1,
313
+ total: 0
314
+ }),
315
+ paginationParams = _w[0],
316
+ setPaginationParams = _w[1];
301
317
 
302
318
  var rowSelection = {
303
- selectedRowKeys: selectedRowKeys,
304
- onSelect: function onSelect(record, selected, selectedRows) {
319
+ selectedRowKeys: selectedList.map(function (v) {
320
+ return v.id;
321
+ }),
322
+ onSelect: function onSelect(record, selected) {
305
323
  if (selected) {
306
324
  if (selectedList.length === maxSelect) {
307
325
  _antd.message.warning("Max " + maxSelect);
@@ -310,17 +328,13 @@ var ProductModal = function ProductModal(props) {
310
328
  }
311
329
 
312
330
  if (selectedList.length < maxSelect) {
313
- setSelectedList(__spreadArrays(selectedList, formatData([record])));
331
+ setSelectedList(__spreadArrays(selectedList, [record]));
314
332
  }
315
333
  } else {
316
334
  setSelectedList(selectedList.filter(function (v) {
317
- return v.productId !== record.productId;
335
+ return v.id !== record.id;
318
336
  }));
319
337
  }
320
-
321
- setSelectedRowKeys(selectedRows.map(function (v) {
322
- return v === null || v === void 0 ? void 0 : v.productId;
323
- }));
324
338
  },
325
339
  getCheckboxProps: function getCheckboxProps(record) {
326
340
  return {
@@ -329,41 +343,80 @@ var ProductModal = function ProductModal(props) {
329
343
  }
330
344
  };
331
345
 
332
- var _v = (0, _react.useState)({
333
- pageSize: 20,
334
- current: 1,
335
- total: 0
336
- }),
337
- paginationParams = _v[0],
338
- setPaginationParams = _v[1];
339
-
340
346
  var delSelectedItem = function delSelectedItem(index) {
341
- console.log(selectedRowKeys, index, 2223);
342
- var rowKeys = JSON.parse(JSON.stringify(selectedRowKeys));
343
- rowKeys.splice(index, 1);
344
- setSelectedRowKeys(rowKeys);
345
347
  var rows = JSON.parse(JSON.stringify(selectedList));
346
348
  rows.splice(index, 1);
347
349
  setSelectedList(rows);
348
350
  }; // 请求商品列表
349
351
 
350
352
 
351
- var queryGoods = function queryGoods(data) {
353
+ var queryGoods = function queryGoods() {
352
354
  return __awaiter(void 0, void 0, void 0, function () {
353
- var res;
355
+ var _list, total, params, res, res_1;
356
+
354
357
  return __generator(this, function (_a) {
355
358
  switch (_a.label) {
356
359
  case 0:
360
+ setLoading(true);
361
+ setGoodsList([]);
362
+ _list = [];
363
+ total = 0;
364
+ params = {
365
+ productName: productName,
366
+ storeId: storeId,
367
+ cmpTypeId: promotions || '',
368
+ minPrice: (0, _currencyUtil.formatBackendCurrency)(minPrice),
369
+ maxPrice: (0, _currencyUtil.formatBackendCurrency)(maxPrice),
370
+ catgIds: selCatgsList.join(','),
371
+ brandIds: selBrandsList.join(','),
372
+ labelIds: selLabelData.value || '',
373
+ pageSize: paginationParams.pageSize,
374
+ pageIndex: paginationParams.current,
375
+ state: 'A'
376
+ };
377
+ if (!(proType === 'sku')) return [3
378
+ /*break*/
379
+ , 2];
357
380
  return [4
358
381
  /*yield*/
359
- , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/products", data, 'GET')];
382
+ , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/products", __assign(__assign({}, params), {
383
+ productCode: productCode
384
+ }), 'GET')];
360
385
 
361
386
  case 1:
362
387
  res = _a.sent();
388
+ _list = formatData(res.list || []);
389
+ total = res.total;
390
+ return [3
391
+ /*break*/
392
+ , 4];
393
+
394
+ case 2:
395
+ return [4
396
+ /*yield*/
397
+ , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/offers", __assign(__assign({}, params), {
398
+ offerCode: productCode,
399
+ isDefaultCover: 'Y',
400
+ onlyQryPublishSku: true,
401
+ auditState: 'S',
402
+ crmFlag: 'on'
403
+ }), 'GET')];
404
+
405
+ case 3:
406
+ res_1 = _a.sent();
407
+ _list = formatData((0, _commonUtil.ensure)(function () {
408
+ return res_1.list.map(function (m) {
409
+ return __assign(__assign({}, m.products[0]), m);
410
+ });
411
+ }, []), proType);
412
+ total = res_1.total;
413
+ _a.label = 4;
414
+
415
+ case 4:
363
416
  setLoading(false);
364
- paginationParams.total = res.total;
365
- setPaginationParams(paginationParams);
366
- setGoodsList(res.list || []);
417
+ setGoodsList(_list);
418
+ paginationParams.total = total;
419
+ setPaginationParams(__assign({}, paginationParams));
367
420
  return [2
368
421
  /*return*/
369
422
  ];
@@ -472,14 +525,15 @@ var ProductModal = function ProductModal(props) {
472
525
  }, []);
473
526
  (0, _react.useEffect)(function () {
474
527
  setSelectedList(defaultList);
475
- setSelectedRowKeys(defaultList.map(function (v) {
476
- return v.productId;
477
- }));
478
528
 
479
529
  if (props.type === 'groupBuy') {
480
530
  setPromotions(promType.GROUP_BUY);
481
531
  }
482
532
  }, [visible]);
533
+ (0, _react.useEffect)(function () {
534
+ paginationParams.current = 1;
535
+ queryGoods();
536
+ }, [proType]);
483
537
 
484
538
  var reset = function reset() {
485
539
  setSelBrandsList([]);
@@ -511,8 +565,8 @@ var ProductModal = function ProductModal(props) {
511
565
  width: 120,
512
566
  ellipsis: true
513
567
  }, {
514
- title: (0, _locale.i18n)('PRODUCT_CODE'),
515
- dataIndex: 'productCode',
568
+ title: proType === 'sku' ? (0, _locale.i18n)('SKU_CODE') : (0, _locale.i18n)('SPU_CODE'),
569
+ dataIndex: proType === 'sku' ? 'productCode' : 'offerCode',
516
570
  width: 120,
517
571
  ellipsis: true
518
572
  }, _defineProperty({
@@ -600,7 +654,7 @@ var ProductModal = function ProductModal(props) {
600
654
  return setStoreId(value);
601
655
  },
602
656
  optionFilterProp: "children",
603
- placeholder: "Please select",
657
+ placeholder: (0, _locale.i18n)('PLEASE_SELECT'),
604
658
  showSearch: true,
605
659
  value: storeId
606
660
  }, storeList && storeList.length > 0 && storeList.map(function (v) {
@@ -613,7 +667,6 @@ var ProductModal = function ProductModal(props) {
613
667
  }, /*#__PURE__*/_react["default"].createElement(_antd.Select, {
614
668
  defaultValue: selLabelData.children || null,
615
669
  onChange: function onChange(v, o) {
616
- console.log(v, o, 33);
617
670
  setSelLabelData(o);
618
671
  },
619
672
  placeholder: (0, _locale.i18n)('PLEASE_SELECT'),
@@ -660,7 +713,7 @@ var ProductModal = function ProductModal(props) {
660
713
  size: "small",
661
714
  value: productName
662
715
  })), /*#__PURE__*/_react["default"].createElement(_antd.Form.Item, {
663
- label: "SKU Code"
716
+ label: proType === 'sku' ? 'SKU Code' : 'SPU Code'
664
717
  }, /*#__PURE__*/_react["default"].createElement(_antd.Input, {
665
718
  className: "inputStyle",
666
719
  onChange: function onChange(e) {
@@ -694,20 +747,7 @@ var ProductModal = function ProductModal(props) {
694
747
  onClick: function onClick() {
695
748
  setLoading(true);
696
749
  paginationParams.current = 1;
697
- queryGoods({
698
- productName: productName,
699
- productCode: productCode,
700
- storeId: storeId,
701
- cmpTypeId: promotions || '',
702
- minPrice: (0, _currencyUtil.formatBackendCurrency)(minPrice),
703
- maxPrice: (0, _currencyUtil.formatBackendCurrency)(maxPrice),
704
- catgIds: selCatgsList.join(','),
705
- brandIds: selBrandsList.join(','),
706
- labelIds: selLabelData.value || '',
707
- pageSize: paginationParams.pageSize,
708
- pageIndex: paginationParams.current,
709
- state: 'A'
710
- });
750
+ queryGoods();
711
751
  },
712
752
  size: "small",
713
753
  style: {
@@ -716,7 +756,17 @@ var ProductModal = function ProductModal(props) {
716
756
  type: "primary"
717
757
  }, (0, _locale.i18n)('QUERY'))))), /*#__PURE__*/_react["default"].createElement("div", {
718
758
  className: "rightCot"
719
- }, /*#__PURE__*/_react["default"].createElement(_antd.Table, {
759
+ }, /*#__PURE__*/_react["default"].createElement(_antd.Radio.Group, {
760
+ buttonStyle: "solid",
761
+ className: "btn-select-type",
762
+ onChange: function onChange(e) {
763
+ setProType(e.target.value);
764
+ setSelectedList([]);
765
+ },
766
+ options: proTypeOption,
767
+ optionType: "button",
768
+ value: proType
769
+ }), /*#__PURE__*/_react["default"].createElement(_antd.Table, {
720
770
  columns: columns,
721
771
  dataSource: goodsList,
722
772
  loading: loading,
@@ -724,26 +774,13 @@ var ProductModal = function ProductModal(props) {
724
774
  onChange: function onChange(page) {
725
775
  setLoading(true);
726
776
  paginationParams.current = page;
727
- setPaginationParams(paginationParams);
728
- queryGoods({
729
- productName: productName,
730
- productCode: productCode,
731
- cmpTypeId: promotions || '',
732
- minPrice: (0, _currencyUtil.formatBackendCurrency)(minPrice),
733
- maxPrice: (0, _currencyUtil.formatBackendCurrency)(maxPrice),
734
- catgIds: selCatgsList.join(','),
735
- brandIds: selBrandsList.join(','),
736
- labelIds: selLabelData.value || '',
737
- pageSize: paginationParams.pageSize,
738
- pageIndex: paginationParams.current,
739
- state: 'A'
740
- });
777
+ queryGoods();
741
778
  }
742
779
  }),
743
- rowKey: "productId",
780
+ rowKey: "id",
744
781
  rowSelection: rowSelection,
745
782
  scroll: {
746
- y: 500
783
+ y: 420
747
784
  }
748
785
  }), /*#__PURE__*/_react["default"].createElement("div", {
749
786
  className: "selectedCot"
@@ -773,7 +810,7 @@ var ProductModal = function ProductModal(props) {
773
810
  className: "totalNum"
774
811
  }, selectedList.length, "/", maxSelect)), /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_antd.Button, {
775
812
  onClick: function onClick() {
776
- handleModalSave && handleModalSave(selectedList);
813
+ handleModalSave && handleModalSave(selectedList, proType);
777
814
  closeModal && closeModal();
778
815
  },
779
816
  style: {
@@ -17,7 +17,13 @@
17
17
  margin-left: 16px;
18
18
  display: flex;
19
19
  flex-direction: column;
20
- justify-content: space-between;
20
+ justify-content: flex-start;
21
+
22
+
23
+ .btn-select-type {
24
+ text-align: right;
25
+ margin-bottom: 15px;
26
+ }
21
27
 
22
28
  .prodImg {
23
29
  display: inline-block;
@@ -15,7 +15,7 @@ var _commonUtil = require("../../utils/commonUtil");
15
15
 
16
16
  var _Button = _interopRequireDefault(require("../Button"));
17
17
 
18
- var _ProductModal = _interopRequireDefault(require("../ProductModal"));
18
+ var _ProductModal = _interopRequireWildcard(require("../ProductModal"));
19
19
 
20
20
  require("./index.less");
21
21
 
@@ -25,6 +25,22 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
25
25
 
26
26
  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; }
27
27
 
28
+ var __assign = void 0 && (void 0).__assign || function () {
29
+ __assign = Object.assign || function (t) {
30
+ for (var s, i = 1, n = arguments.length; i < n; i++) {
31
+ s = arguments[i];
32
+
33
+ for (var p in s) {
34
+ if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
35
+ }
36
+ }
37
+
38
+ return t;
39
+ };
40
+
41
+ return __assign.apply(this, arguments);
42
+ };
43
+
28
44
  var __awaiter = void 0 && (void 0).__awaiter || function (thisArg, _arguments, P, generator) {
29
45
  function adopt(value) {
30
46
  return value instanceof P ? value : new P(function (resolve) {
@@ -172,7 +188,8 @@ function ProductSource(_a) {
172
188
  var _this = this;
173
189
 
174
190
  var value = _a.value,
175
- onChange = _a.onChange;
191
+ onChange = _a.onChange,
192
+ prodType = _a.prodType;
176
193
 
177
194
  var _b = (0, _react.useState)([]),
178
195
  selectedProds = _b[0],
@@ -184,31 +201,65 @@ function ProductSource(_a) {
184
201
 
185
202
  var onSelectProduct = function onSelectProduct() {
186
203
  return __awaiter(_this, void 0, void 0, function () {
187
- var list;
204
+ var url, param, list, url, param, list_1;
188
205
  return __generator(this, function (_a) {
189
206
  switch (_a.label) {
190
207
  case 0:
191
208
  if (!(value && value.length > 0)) return [3
192
209
  /*break*/
210
+ , 5];
211
+ if (!(prodType === 'sku')) return [3
212
+ /*break*/
193
213
  , 2];
214
+ url = "/designer/v1/" + window.magicDesign.MBaseUrl + "/products";
215
+ param = {
216
+ products: value,
217
+ state: 'A'
218
+ };
194
219
  return [4
195
220
  /*yield*/
196
- , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/products", {
197
- products: value
198
- }, 'GET')];
221
+ , (0, _commonUtil.commonFetch)(url, param, 'GET')];
199
222
 
200
223
  case 1:
201
224
  list = _a.sent().list;
202
- setSelectedProds(list || []);
225
+ setSelectedProds((0, _ProductModal.formatData)(list || []));
203
226
  return [3
204
227
  /*break*/
205
- , 3];
228
+ , 4];
206
229
 
207
230
  case 2:
208
- setSelectedProds([]);
209
- _a.label = 3;
231
+ url = "/designer/v1/" + window.magicDesign.MBaseUrl + "/offers";
232
+ param = {
233
+ offers: value,
234
+ state: 'A',
235
+ isDefaultCover: 'Y',
236
+ onlyQryPublishSku: true,
237
+ auditState: 'S',
238
+ crmFlag: 'on'
239
+ };
240
+ return [4
241
+ /*yield*/
242
+ , (0, _commonUtil.commonFetch)(url, param, 'GET')];
210
243
 
211
244
  case 3:
245
+ list_1 = _a.sent().list;
246
+ setSelectedProds((0, _ProductModal.formatData)((0, _commonUtil.ensure)(function () {
247
+ return list_1.map(function (m) {
248
+ return __assign(__assign({}, m.products[0]), m);
249
+ });
250
+ }, []), prodType));
251
+ _a.label = 4;
252
+
253
+ case 4:
254
+ return [3
255
+ /*break*/
256
+ , 6];
257
+
258
+ case 5:
259
+ setSelectedProds([]);
260
+ _a.label = 6;
261
+
262
+ case 6:
212
263
  setVisbile(true);
213
264
  return [2
214
265
  /*return*/
@@ -218,11 +269,11 @@ function ProductSource(_a) {
218
269
  });
219
270
  };
220
271
 
221
- var handleModalSave = function handleModalSave(list) {
272
+ var handleModalSave = function handleModalSave(list, type) {
222
273
  var ids = list.map(function (prod) {
223
- return prod.productId;
274
+ return prod.id;
224
275
  }).join(',');
225
- onChange(ids);
276
+ onChange(ids, type);
226
277
  };
227
278
 
228
279
  var getLength = function getLength() {
@@ -249,6 +300,7 @@ function ProductSource(_a) {
249
300
  defaultList: selectedProds,
250
301
  handleModalSave: handleModalSave,
251
302
  maxSelect: 100,
303
+ prodType: prodType,
252
304
  visible: visible
253
305
  }));
254
306
  }
@@ -308,14 +308,14 @@ function (_super) {
308
308
 
309
309
  _this.getProductList = function (index) {
310
310
  return __awaiter(_this, void 0, void 0, function () {
311
- var panelProps, groupSource, recommendId, cache, _a, _b, sourceType, _c, prodIds, _d, intelligentType, _e, intelligentValue, _f, maxProdNum, newData, res, res, e_1, _cache;
311
+ var panelProps, groupSource, recommendId, cache, _a, _b, sourceType, _c, prodIds, _d, prodType, _e, intelligentType, _f, intelligentValue, _g, maxProdNum, newData, params, res, res, e_1, _cache;
312
312
 
313
- var _g, _h, _j;
313
+ var _h, _j, _k;
314
314
 
315
315
  var _this = this;
316
316
 
317
- return __generator(this, function (_k) {
318
- switch (_k.label) {
317
+ return __generator(this, function (_l) {
318
+ switch (_l.label) {
319
319
  case 0:
320
320
  panelProps = this.props.panelProps;
321
321
  groupSource = this.state.groupSource;
@@ -326,7 +326,7 @@ function (_super) {
326
326
 
327
327
  if (cache) {
328
328
  if ("products" + index in cache) {
329
- this.setState((_g = {}, _g["products" + index] = cache["products" + index], _g), function () {
329
+ this.setState((_h = {}, _h["products" + index] = cache["products" + index], _h), function () {
330
330
  _this.resetLayout();
331
331
  });
332
332
  /** 如果数据未过期 */
@@ -338,12 +338,12 @@ function (_super) {
338
338
  }
339
339
  }
340
340
 
341
- _a = groupSource[index] || {}, _b = _a.sourceType, sourceType = _b === void 0 ? '' : _b, _c = _a.prodIds, prodIds = _c === void 0 ? '' : _c, _d = _a.intelligentType, intelligentType = _d === void 0 ? '' : _d, _e = _a.intelligentValue, intelligentValue = _e === void 0 ? [] : _e, _f = _a.maxProdNum, maxProdNum = _f === void 0 ? 10 : _f;
341
+ _a = groupSource[index] || {}, _b = _a.sourceType, sourceType = _b === void 0 ? '' : _b, _c = _a.prodIds, prodIds = _c === void 0 ? '' : _c, _d = _a.prodType, prodType = _d === void 0 ? '' : _d, _e = _a.intelligentType, intelligentType = _e === void 0 ? '' : _e, _f = _a.intelligentValue, intelligentValue = _f === void 0 ? [] : _f, _g = _a.maxProdNum, maxProdNum = _g === void 0 ? 10 : _g;
342
342
  newData = [];
343
- _k.label = 1;
343
+ _l.label = 1;
344
344
 
345
345
  case 1:
346
- _k.trys.push([1, 9,, 10]);
346
+ _l.trys.push([1, 9,, 10]);
347
347
 
348
348
  if (!(groupSource.length > 0)) return [3
349
349
  /*break*/
@@ -351,22 +351,25 @@ function (_super) {
351
351
  if (!(sourceType === 'select')) return [3
352
352
  /*break*/
353
353
  , 3];
354
+ if (!prodIds) return [2
355
+ /*return*/
356
+ ];
357
+ params = {
358
+ state: 'A'
359
+ };
354
360
 
355
- if (!prodIds) {
356
- return [2
357
- /*return*/
358
- ];
361
+ if (prodType === 'spu') {
362
+ params.offers = prodIds;
363
+ } else {
364
+ params.products = prodIds;
359
365
  }
360
366
 
361
367
  return [4
362
368
  /*yield*/
363
- , (0, _commonUtil.commonFetch)('/designer/v1/h5/products', {
364
- products: prodIds,
365
- state: 'A'
366
- }, 'GET')];
369
+ , (0, _commonUtil.commonFetch)('/designer/v1/h5/products', params, 'GET')];
367
370
 
368
371
  case 2:
369
- res = _k.sent();
372
+ res = _l.sent();
370
373
  newData = __spreadArrays(res.list);
371
374
  return [3
372
375
  /*break*/
@@ -389,7 +392,7 @@ function (_super) {
389
392
  }, 'POST')];
390
393
 
391
394
  case 4:
392
- res = _k.sent();
395
+ res = _l.sent();
393
396
  newData = __spreadArrays(res.pageInfo.list);
394
397
  return [3
395
398
  /*break*/
@@ -397,7 +400,7 @@ function (_super) {
397
400
 
398
401
  case 5:
399
402
  newData = [];
400
- _k.label = 6;
403
+ _l.label = 6;
401
404
 
402
405
  case 6:
403
406
  return [3
@@ -406,7 +409,7 @@ function (_super) {
406
409
 
407
410
  case 7:
408
411
  newData = [];
409
- _k.label = 8;
412
+ _l.label = 8;
410
413
 
411
414
  case 8:
412
415
  return [3
@@ -414,7 +417,7 @@ function (_super) {
414
417
  , 10];
415
418
 
416
419
  case 9:
417
- e_1 = _k.sent();
420
+ e_1 = _l.sent();
418
421
  newData = [];
419
422
  return [3
420
423
  /*break*/
@@ -423,10 +426,10 @@ function (_super) {
423
426
  case 10:
424
427
  if (!(0, _coreUtil.isDesignMode)()) {
425
428
  _cache = (0, _storeUtil.getMagicStore)("recommend_" + recommendId);
426
- (0, _storeUtil.setMagicStore)("recommend_" + recommendId, __assign(__assign({}, _cache), (_h = {}, _h["products" + index] = newData, _h.endTime = Date.now() + 3 * 60 * 1000, _h)));
429
+ (0, _storeUtil.setMagicStore)("recommend_" + recommendId, __assign(__assign({}, _cache), (_j = {}, _j["products" + index] = newData, _j.endTime = Date.now() + 3 * 60 * 1000, _j)));
427
430
  }
428
431
 
429
- this.setState((_j = {}, _j["products" + index] = newData, _j), function () {
432
+ this.setState((_k = {}, _k["products" + index] = newData, _k), function () {
430
433
  _this.resetLayout();
431
434
  });
432
435
  return [2
@@ -114,11 +114,13 @@ function (_super) {
114
114
  }, (0, _locale.i18n)('AI_RECOMMENDATION')))), /*#__PURE__*/_react["default"].createElement("div", {
115
115
  className: "greyBg"
116
116
  }, panelProps.sourceType === 'select' && /*#__PURE__*/_react["default"].createElement(_common.ProductSource, {
117
- onChange: function onChange(v) {
118
- panelProps.prodIds = v;
117
+ onChange: function onChange(ids, type) {
118
+ panelProps.prodIds = ids;
119
+ panelProps.prodType = type;
119
120
 
120
121
  _this.selfRender();
121
122
  },
123
+ prodType: panelProps.prodType,
122
124
  value: panelProps.prodIds
123
125
  }), panelProps.sourceType === 'recommend' && /*#__PURE__*/_react["default"].createElement(_AIRecommendation["default"], {
124
126
  onChange: function onChange(val) {
@@ -1,4 +1,12 @@
1
1
  {
2
+ "PUSH": "Push",
3
+ "SET_AS_TEMPLATE": "Set as Template",
4
+ "DISPLAY_PAGE": "Display page",
5
+ "NAME": "Name",
6
+ "ADD_MENU": "Add Menu",
7
+ "TIPS": "Tips",
8
+ "AL": "AL",
9
+ "PEEK": "Peek",
2
10
  "ADDRESS": "Address",
3
11
  "LOCATION_LOGO": "Location Logo",
4
12
  "MESSAGE_ICON": "Message icon",
@@ -90,7 +98,8 @@
90
98
  "BANNER_HEIGHT": "Banner Height",
91
99
  "IMAGE": "Image",
92
100
  "PRODUCT_NAME": "Product Name",
93
- "PRODUCT_CODE": "Product Code",
101
+ "SKU_CODE": "SKU Code",
102
+ "SPU_CODE": "SPU Code",
94
103
  "SKU": "SKU",
95
104
  "PRICE": "Price",
96
105
  "BRAND": "Brand",