@fonixtree/magic-design 2.0.22 → 2.0.24

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 (17) hide show
  1. package/es/common/ImagePicker/index.js +1 -1
  2. package/es/common/LinkModal/BundleCampaign/index.js +2 -2
  3. package/es/common/LinkModal/CouponTable/index.js +10 -2
  4. package/es/common/LinkModal/FilteredProductModal/index.js +1 -2
  5. package/es/common/LinkModal/ProductDetailPage/index.js +2 -2
  6. package/es/common/ProductModal/index.js +2 -2
  7. package/es/core/Designer/index.js +1 -1
  8. package/es/utils/coreUtil.js +14 -0
  9. package/lib/common/ImagePicker/index.js +1 -1
  10. package/lib/common/LinkModal/BundleCampaign/index.js +2 -2
  11. package/lib/common/LinkModal/CouponTable/index.js +10 -2
  12. package/lib/common/LinkModal/FilteredProductModal/index.js +1 -2
  13. package/lib/common/LinkModal/ProductDetailPage/index.js +2 -2
  14. package/lib/common/ProductModal/index.js +2 -2
  15. package/lib/core/Designer/index.js +1 -1
  16. package/lib/utils/coreUtil.js +14 -0
  17. package/package.json +1 -1
package/es/common/ImagePicker/index.js CHANGED
@@ -281,7 +281,7 @@ function (_super) {
281
281
  key: v.key,
282
282
  value: v.key
283
283
  }, v.value);
284
- })), /*#__PURE__*/_react["default"].createElement("div", {
284
+ })), window.magicDesign.needAi && /*#__PURE__*/_react["default"].createElement("div", {
285
285
  className: "ai-btn",
286
286
  onClick: this.onAiImageClick
287
287
  }, /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
package/es/common/LinkModal/BundleCampaign/index.js CHANGED
@@ -179,7 +179,7 @@ var BundleCampaign = function BundleCampaign(props) {
179
179
  campaignName = _b[0],
180
180
  setCampaignName = _b[1];
181
181
 
182
- var _c = (0, _react.useState)(''),
182
+ var _c = (0, _react.useState)(window.magicDesign.storeId ? window.magicDesign.storeId : ''),
183
183
  storeId = _c[0],
184
184
  setStoreId = _c[1];
185
185
 
@@ -241,7 +241,7 @@ var BundleCampaign = function BundleCampaign(props) {
241
241
 
242
242
  var reset = function reset() {
243
243
  setCampaignName('');
244
- setStoreId('');
244
+ setStoreId(window.magicDesign.storeId ? window.magicDesign.storeId : '');
245
245
  setCmpState('A,B');
246
246
  };
247
247
 
package/es/common/LinkModal/CouponTable/index.js CHANGED
@@ -246,14 +246,22 @@ function CouponTable(props) {
246
246
 
247
247
  var getCoupons = function getCoupons(params) {
248
248
  return __awaiter(_this, void 0, void 0, function () {
249
- var res, list;
249
+ var newParams, res, list;
250
250
  return __generator(this, function (_a) {
251
251
  switch (_a.label) {
252
252
  case 0:
253
253
  setLoading(true);
254
+ newParams = __assign(__assign({}, params), {
255
+ tableFlag: 'effective',
256
+ isPublic: 'Y',
257
+ state: 'A',
258
+ couponLocation: 'Promotion',
259
+ pageTotal: false,
260
+ storeId: window.magicDesign.storeId ? window.magicDesign.storeId : ''
261
+ });
254
262
  return [4
255
263
  /*yield*/
256
- , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/coupons/couponList/page?tableFlag=effective&isPublic=Y&state=A&pageTotal=false&couponLocation=Promotion", params, 'GET')];
264
+ , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/coupons/couponList/page", newParams, 'GET')];
257
265
 
258
266
  case 1:
259
267
  res = _a.sent();
package/es/common/LinkModal/FilteredProductModal/index.js CHANGED
@@ -471,8 +471,7 @@ var FilteredProductModal = function FilteredProductModal(props) {
471
471
  , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/offers/es", params, 'POST')];
472
472
 
473
473
  case 1:
474
- res = _a.sent(); // const res = await commonFetch(`/designer/v1/products`, params, 'GET');
475
-
474
+ res = _a.sent();
476
475
  setLoading(false);
477
476
  paginationParams.total = res.total;
478
477
 
package/es/common/LinkModal/ProductDetailPage/index.js CHANGED
@@ -220,7 +220,7 @@ var ProductDetailPage = function ProductDetailPage(props) {
220
220
  productName = _e[0],
221
221
  setProductName = _e[1];
222
222
 
223
- var _f = (0, _react.useState)(window.magicDesign.storeId ? [window.magicDesign.storeId] : []),
223
+ var _f = (0, _react.useState)(''),
224
224
  storeId = _f[0],
225
225
  setStoreId = _f[1];
226
226
 
@@ -357,7 +357,7 @@ var ProductDetailPage = function ProductDetailPage(props) {
357
357
  setProductName('');
358
358
  setProductCode('');
359
359
  setBrandId([]);
360
- setStoreId([]);
360
+ setStoreId('');
361
361
  };
362
362
 
363
363
  (0, _react.useEffect)(function () {
package/es/common/ProductModal/index.js CHANGED
@@ -271,7 +271,7 @@ var ProductModal = function ProductModal(props) {
271
271
  productCode = _m[0],
272
272
  setProductCode = _m[1];
273
273
 
274
- var _o = (0, _react.useState)(window.magicDesign.storeId ? [window.magicDesign.storeId] : []),
274
+ var _o = (0, _react.useState)(''),
275
275
  storeId = _o[0],
276
276
  setStoreId = _o[1];
277
277
 
@@ -491,7 +491,7 @@ var ProductModal = function ProductModal(props) {
491
491
  setSelCatgsList([]);
492
492
  setSelLabelData([]);
493
493
  setProductName('');
494
- setStoreId(window.magicDesign.storeId ? [window.magicDesign.storeId] : []);
494
+ setStoreId('');
495
495
  setProductCode('');
496
496
  setMinPrice('');
497
497
  setMaxPrice('');
package/es/core/Designer/index.js CHANGED
@@ -761,7 +761,7 @@ function (_super) {
761
761
  magic_design: ""
762
762
  }, /*#__PURE__*/_react["default"].createElement("div", {
763
763
  className: "designer-wrap"
764
- }, /*#__PURE__*/_react["default"].createElement(_ChatRobot["default"], null), /*#__PURE__*/_react["default"].createElement(_PageCompList["default"], {
764
+ }, window.magicDesign.needAi && /*#__PURE__*/_react["default"].createElement(_ChatRobot["default"], null), /*#__PURE__*/_react["default"].createElement(_PageCompList["default"], {
765
765
  onAdd: this.onAdd,
766
766
  pageData: MPageData,
767
767
  pageName: pageName,
package/es/utils/coreUtil.js CHANGED
@@ -303,9 +303,23 @@ var clickUrl = function clickUrl(url) {
303
303
 
304
304
  var _b = data.params,
305
305
  params = _b === void 0 ? {} : _b;
306
+ console.log('clicked data:', data);
307
+ console.log({
308
+ type: 'jumpBrowser',
309
+ params: {
310
+ url: params.link
311
+ }
312
+ });
306
313
 
307
314
  if ((0, _androidUtil.browserVersion)().isAshitaApp) {
308
315
  (0, _androidUtil.sendToApp)(data);
316
+ } else if ((0, _androidUtil.browserVersion)().isApp && data.action === 'jump') {
317
+ (0, _androidUtil.sendToAndroid)({
318
+ type: 'jumpBrowser',
319
+ params: {
320
+ url: params.link
321
+ }
322
+ });
309
323
  } else {
310
324
  // 视频
311
325
  if (params.type === 'VIDEO') {
package/lib/common/ImagePicker/index.js CHANGED
@@ -281,7 +281,7 @@ function (_super) {
281
281
  key: v.key,
282
282
  value: v.key
283
283
  }, v.value);
284
- })), /*#__PURE__*/_react["default"].createElement("div", {
284
+ })), window.magicDesign.needAi && /*#__PURE__*/_react["default"].createElement("div", {
285
285
  className: "ai-btn",
286
286
  onClick: this.onAiImageClick
287
287
  }, /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
package/lib/common/LinkModal/BundleCampaign/index.js CHANGED
@@ -179,7 +179,7 @@ var BundleCampaign = function BundleCampaign(props) {
179
179
  campaignName = _b[0],
180
180
  setCampaignName = _b[1];
181
181
 
182
- var _c = (0, _react.useState)(''),
182
+ var _c = (0, _react.useState)(window.magicDesign.storeId ? window.magicDesign.storeId : ''),
183
183
  storeId = _c[0],
184
184
  setStoreId = _c[1];
185
185
 
@@ -241,7 +241,7 @@ var BundleCampaign = function BundleCampaign(props) {
241
241
 
242
242
  var reset = function reset() {
243
243
  setCampaignName('');
244
- setStoreId('');
244
+ setStoreId(window.magicDesign.storeId ? window.magicDesign.storeId : '');
245
245
  setCmpState('A,B');
246
246
  };
247
247
 
package/lib/common/LinkModal/CouponTable/index.js CHANGED
@@ -246,14 +246,22 @@ function CouponTable(props) {
246
246
 
247
247
  var getCoupons = function getCoupons(params) {
248
248
  return __awaiter(_this, void 0, void 0, function () {
249
- var res, list;
249
+ var newParams, res, list;
250
250
  return __generator(this, function (_a) {
251
251
  switch (_a.label) {
252
252
  case 0:
253
253
  setLoading(true);
254
+ newParams = __assign(__assign({}, params), {
255
+ tableFlag: 'effective',
256
+ isPublic: 'Y',
257
+ state: 'A',
258
+ couponLocation: 'Promotion',
259
+ pageTotal: false,
260
+ storeId: window.magicDesign.storeId ? window.magicDesign.storeId : ''
261
+ });
254
262
  return [4
255
263
  /*yield*/
256
- , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/coupons/couponList/page?tableFlag=effective&isPublic=Y&state=A&pageTotal=false&couponLocation=Promotion", params, 'GET')];
264
+ , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/coupons/couponList/page", newParams, 'GET')];
257
265
 
258
266
  case 1:
259
267
  res = _a.sent();
package/lib/common/LinkModal/FilteredProductModal/index.js CHANGED
@@ -471,8 +471,7 @@ var FilteredProductModal = function FilteredProductModal(props) {
471
471
  , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/offers/es", params, 'POST')];
472
472
 
473
473
  case 1:
474
- res = _a.sent(); // const res = await commonFetch(`/designer/v1/products`, params, 'GET');
475
-
474
+ res = _a.sent();
476
475
  setLoading(false);
477
476
  paginationParams.total = res.total;
478
477
 
package/lib/common/LinkModal/ProductDetailPage/index.js CHANGED
@@ -220,7 +220,7 @@ var ProductDetailPage = function ProductDetailPage(props) {
220
220
  productName = _e[0],
221
221
  setProductName = _e[1];
222
222
 
223
- var _f = (0, _react.useState)(window.magicDesign.storeId ? [window.magicDesign.storeId] : []),
223
+ var _f = (0, _react.useState)(''),
224
224
  storeId = _f[0],
225
225
  setStoreId = _f[1];
226
226
 
@@ -357,7 +357,7 @@ var ProductDetailPage = function ProductDetailPage(props) {
357
357
  setProductName('');
358
358
  setProductCode('');
359
359
  setBrandId([]);
360
- setStoreId([]);
360
+ setStoreId('');
361
361
  };
362
362
 
363
363
  (0, _react.useEffect)(function () {
package/lib/common/ProductModal/index.js CHANGED
@@ -271,7 +271,7 @@ var ProductModal = function ProductModal(props) {
271
271
  productCode = _m[0],
272
272
  setProductCode = _m[1];
273
273
 
274
- var _o = (0, _react.useState)(window.magicDesign.storeId ? [window.magicDesign.storeId] : []),
274
+ var _o = (0, _react.useState)(''),
275
275
  storeId = _o[0],
276
276
  setStoreId = _o[1];
277
277
 
@@ -491,7 +491,7 @@ var ProductModal = function ProductModal(props) {
491
491
  setSelCatgsList([]);
492
492
  setSelLabelData([]);
493
493
  setProductName('');
494
- setStoreId(window.magicDesign.storeId ? [window.magicDesign.storeId] : []);
494
+ setStoreId('');
495
495
  setProductCode('');
496
496
  setMinPrice('');
497
497
  setMaxPrice('');
package/lib/core/Designer/index.js CHANGED
@@ -761,7 +761,7 @@ function (_super) {
761
761
  magic_design: ""
762
762
  }, /*#__PURE__*/_react["default"].createElement("div", {
763
763
  className: "designer-wrap"
764
- }, /*#__PURE__*/_react["default"].createElement(_ChatRobot["default"], null), /*#__PURE__*/_react["default"].createElement(_PageCompList["default"], {
764
+ }, window.magicDesign.needAi && /*#__PURE__*/_react["default"].createElement(_ChatRobot["default"], null), /*#__PURE__*/_react["default"].createElement(_PageCompList["default"], {
765
765
  onAdd: this.onAdd,
766
766
  pageData: MPageData,
767
767
  pageName: pageName,
package/lib/utils/coreUtil.js CHANGED
@@ -303,9 +303,23 @@ var clickUrl = function clickUrl(url) {
303
303
 
304
304
  var _b = data.params,
305
305
  params = _b === void 0 ? {} : _b;
306
+ console.log('clicked data:', data);
307
+ console.log({
308
+ type: 'jumpBrowser',
309
+ params: {
310
+ url: params.link
311
+ }
312
+ });
306
313
 
307
314
  if ((0, _androidUtil.browserVersion)().isAshitaApp) {
308
315
  (0, _androidUtil.sendToApp)(data);
316
+ } else if ((0, _androidUtil.browserVersion)().isApp && data.action === 'jump') {
317
+ (0, _androidUtil.sendToAndroid)({
318
+ type: 'jumpBrowser',
319
+ params: {
320
+ url: params.link
321
+ }
322
+ });
309
323
  } else {
310
324
  // 视频
311
325
  if (params.type === 'VIDEO') {
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@fonixtree/magic-design",
3
3
  "author": "Cylon Team",
4
- "version": "2.0.22",
4
+ "version": "2.0.24",
5
5
  "description": "Magic Design",
6
6
  "license": "MIT",
7
7
  "module": "es/index.js",