@fonixtree/magic-design 0.1.90 → 0.1.92

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 (5) hide show
  1. package/es/common/LinkModal/AffiliatePlatform/index.js +4 -3
  2. package/es/utils/coreUtil.js +6 -5
  3. package/lib/common/LinkModal/AffiliatePlatform/index.js +4 -3
  4. package/lib/utils/coreUtil.js +6 -5
  5. package/package.json +1 -1
package/es/common/LinkModal/AffiliatePlatform/index.js CHANGED
@@ -11,6 +11,8 @@ var _react = _interopRequireWildcard(require("react"));
11
11
 
12
12
  var _antd = require("antd");
13
13
 
14
+ var _commonUtil = require("../../../utils/commonUtil");
15
+
14
16
  var _locale = require("../../../locale");
15
17
 
16
18
  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); }
@@ -184,8 +186,7 @@ var paginationParams = {
184
186
  function AffiliatePlatform(props) {
185
187
  var _this = this;
186
188
 
187
- var _onChange = props.onChange,
188
- _fetch = props._fetch;
189
+ var _onChange = props.onChange;
189
190
 
190
191
  var _a = (0, _react.useState)([]),
191
192
  platformList = _a[0],
@@ -208,7 +209,7 @@ function AffiliatePlatform(props) {
208
209
  setLoading(true);
209
210
  return [4
210
211
  /*yield*/
211
- , _fetch("/designer/v1/" + window.magicDesign.MBaseUrl + "/distribution/platform/page", params, 'GET')];
212
+ , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/distribution/platform/page", params, 'GET')];
212
213
 
213
214
  case 1:
214
215
  res = _a.sent();
package/es/utils/coreUtil.js CHANGED
@@ -310,9 +310,10 @@ var clickUrl = function clickUrl(url) {
310
310
  }
311
311
 
312
312
  console.log('clickUrl...', url); // 只读模式，设计模式，url为空，邮箱模版
313
- // if (window.magicDesign.readOnly || window.magicDesign.mode !== 'renderer' || !url || window.magicDesign.outputType == 'html') {
314
- // return;
315
- // }
313
+
314
+ if (window.magicDesign.readOnly || window.magicDesign.mode !== 'renderer' || !url || window.magicDesign.outputType == 'html') {
315
+ return;
316
+ }
316
317
 
317
318
  var _b = _typeof(url) === 'object' ? (0, _businessUtil.newParseUrl)(url) : (0, _businessUtil.parseUrl)(url),
318
319
  link = _b.link,
@@ -396,9 +397,9 @@ var clickUrl = function clickUrl(url) {
396
397
  } else {
397
398
  (0, _commonUtil.navigateTo)(link);
398
399
  }
400
+ } else {
401
+ (0, _commonUtil.navigateTo)(link);
399
402
  }
400
-
401
- (0, _commonUtil.navigateTo)(link);
402
403
  }
403
404
  };
404
405
 
package/lib/common/LinkModal/AffiliatePlatform/index.js CHANGED
@@ -11,6 +11,8 @@ var _react = _interopRequireWildcard(require("react"));
11
11
 
12
12
  var _antd = require("antd");
13
13
 
14
+ var _commonUtil = require("../../../utils/commonUtil");
15
+
14
16
  var _locale = require("../../../locale");
15
17
 
16
18
  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); }
@@ -184,8 +186,7 @@ var paginationParams = {
184
186
  function AffiliatePlatform(props) {
185
187
  var _this = this;
186
188
 
187
- var _onChange = props.onChange,
188
- _fetch = props._fetch;
189
+ var _onChange = props.onChange;
189
190
 
190
191
  var _a = (0, _react.useState)([]),
191
192
  platformList = _a[0],
@@ -208,7 +209,7 @@ function AffiliatePlatform(props) {
208
209
  setLoading(true);
209
210
  return [4
210
211
  /*yield*/
211
- , _fetch("/designer/v1/" + window.magicDesign.MBaseUrl + "/distribution/platform/page", params, 'GET')];
212
+ , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/distribution/platform/page", params, 'GET')];
212
213
 
213
214
  case 1:
214
215
  res = _a.sent();
package/lib/utils/coreUtil.js CHANGED
@@ -310,9 +310,10 @@ var clickUrl = function clickUrl(url) {
310
310
  }
311
311
 
312
312
  console.log('clickUrl...', url); // 只读模式，设计模式，url为空，邮箱模版
313
- // if (window.magicDesign.readOnly || window.magicDesign.mode !== 'renderer' || !url || window.magicDesign.outputType == 'html') {
314
- // return;
315
- // }
313
+
314
+ if (window.magicDesign.readOnly || window.magicDesign.mode !== 'renderer' || !url || window.magicDesign.outputType == 'html') {
315
+ return;
316
+ }
316
317
 
317
318
  var _b = _typeof(url) === 'object' ? (0, _businessUtil.newParseUrl)(url) : (0, _businessUtil.parseUrl)(url),
318
319
  link = _b.link,
@@ -396,9 +397,9 @@ var clickUrl = function clickUrl(url) {
396
397
  } else {
397
398
  (0, _commonUtil.navigateTo)(link);
398
399
  }
400
+ } else {
401
+ (0, _commonUtil.navigateTo)(link);
399
402
  }
400
-
401
- (0, _commonUtil.navigateTo)(link);
402
403
  }
403
404
  };
404
405
 
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@fonixtree/magic-design",
3
3
  "author": "Cylon Team",
4
- "version": "0.1.90",
4
+ "version": "0.1.92",
5
5
  "description": "Magic Design",
6
6
  "license": "MIT",
7
7
  "module": "es/index.js",