@fonixtree/magic-design 0.1.93 → 0.2.2

package/lib/utils/androidUtil.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.sendToJs = exports.sendToIos = exports.sendToApp = exports.sendToAndroid = exports.iosSendToJs = exports.goToLoginApp = exports.connectWebViewJavascriptBridge = exports.browserVersion = void 0;
+exports.sendToJs = exports.sendToIos = exports.sendToApp = exports.sendToAndroid = exports.iosSendToJs = exports.connectWebViewJavascriptBridge = exports.browserVersion = void 0;
 
 // 判断访问终端
 var browserVersion = function browserVersion() {
@@ -22,10 +22,6 @@ var browserVersion = function browserVersion() {
     weixin: u.indexOf('MicroMessenger') > -1,
     qq: u.match(/\sQQ/i) == ' qq',
     isApp: u.indexOf('app/CYLON-APP') > -1,
-    isNuriApp: u.indexOf('app/NURI-APP') > -1,
-    isDitoApp: u.indexOf('mydito') > -1,
-    ditoAndroidApp: u.indexOf('mydito') > -1 && (u.indexOf('Android') > -1 || u.indexOf('Adr') > -1),
-    ditoIosApp: u.indexOf('mydito') > -1 && !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/),
     isAshitaApp: u.indexOf('app/ASHITA-APP') > -1
   };
 };
@@ -133,17 +129,6 @@ var sendToApp = function sendToApp(params) {
   if (AlipayJSBridge) {
     AlipayJSBridge.call('mpaasAction', params);
   }
-}; // 拉起APP登录
-
-
-exports.sendToApp = sendToApp;
-
-var goToLoginApp = function goToLoginApp() {
-  if (browserVersion().androidApp) {
-    window.dito.goToLogin();
-  } else if (browserVersion().iosApp) {
-    window.dito.goToLogin();
-  }
 };
 
-exports.goToLoginApp = goToLoginApp;
+exports.sendToApp = sendToApp;

package/lib/utils/businessUtil.js

@@ -28,22 +28,10 @@ var newParseUrl = function newParseUrl(urlObj) {
   var type = urlObj.type,
       value = urlObj.value,
       offerId = urlObj.offerId,
-      productId = urlObj.productId,
-      name = urlObj.name;
+      productId = urlObj.productId;
 
   switch (type) {
-    // 锚点跳转
-    case _constants.urlTypeMap.ANCHOR:
-      params = {
-        action: 'operation',
-        params: {
-          type: 'ANCHOR',
-          data: value
-        }
-      };
-      break;
     // 商品详情
-
     case _constants.urlTypeMap.PRODUCT_DETAIL_PAGE:
       if (offerId) {
         link = "/product/detail/" + offerId + "?productId=" + (productId !== null && productId !== void 0 ? productId : '');
@@ -99,7 +87,7 @@ var newParseUrl = function newParseUrl(urlObj) {
     // 商品列表
 
     case _constants.urlTypeMap.FILTERED_PRODUCT:
-      link = "/product/list/?" + value;
+      link = "/product/list?" + value;
       params = {
         action: 'jump',
         params: {
@@ -183,42 +171,6 @@ var newParseUrl = function newParseUrl(urlObj) {
       };
       break;
 
-    case _constants.urlTypeMap.AFFILIATE_STORE:
-      // 分销店铺
-      link = "/storeDetail/" + value;
-      params = {
-        action: 'jump',
-        params: {
-          type: 'AFFILIATE_STORE',
-          url: value
-        }
-      };
-      break;
-
-    case _constants.urlTypeMap.MINI_API:
-      // 小程序API，演示使用
-      link = "mpaas://miniapp?api=" + value.replace('my.', '');
-      params = {
-        action: 'jump',
-        params: {
-          type: 'MINI_API',
-          url: value
-        }
-      };
-      break;
-
-    case _constants.urlTypeMap.AFFILIATE_PLATFORM:
-      // affiliate platform
-      link = "/platformDetail/" + value;
-      params = {
-        action: 'jump',
-        params: {
-          type: 'AFFILIATE_PLATFORM',
-          url: value
-        }
-      };
-      break;
-
     default:
       var map = {
         '/main/cart': 'CART',
@@ -241,9 +193,8 @@ var newParseUrl = function newParseUrl(urlObj) {
       params = {
         action: 'jump',
         params: {
-          type: map[link] || name,
-          link: link,
-          url: link
+          type: map[link],
+          link: link
         }
       };
   }
@@ -310,7 +261,7 @@ var parseUrl = function parseUrl(url) {
     // 商品列表
 
     case _constants.urlType.PROD_FILTER:
-      link = "/product/list/?" + arg1;
+      link = "/product/list?" + arg1;
       params = {
         action: 'jump',
         params: {

package/lib/utils/commonUtil.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.addZero = exports.addUrlQuery = void 0;
 exports.asyncDataURLtoImage = asyncDataURLtoImage;
-exports.checkLogin = exports.checkFileName = exports.calcLastTime = exports.asyncNextTick = void 0;
+exports.checkFileName = exports.calcLastTime = exports.asyncNextTick = void 0;
 exports.commonFetch = commonFetch;
 exports.convertCount = exports.compatibleNewPageData = void 0;
 exports.convertImageUrl = convertImageUrl;
@@ -16,19 +16,14 @@ exports.dragSource = exports.downloadBase64Image = void 0;
 exports.ensure = ensure;
 exports.getGAData = exports.getColorRgba = void 0;
 exports.getPageDataMap = getPageDataMap;
-exports.getUrlParams = void 0;
-exports.goLogin = goLogin;
-exports.importAsync = void 0;
-exports.isLogin = isLogin;
-exports.onListenTouch = exports.nextTick = exports.navigateTo = void 0;
+exports.onListenTouch = exports.nextTick = exports.navigateTo = exports.importAsync = exports.getUrlParams = void 0;
 exports.pushGA = pushGA;
-exports.setDefaultAddressFromIP = exports.pxToRem = void 0;
+exports.pxToRem = void 0;
 exports.shareFacebook = shareFacebook;
 exports.shareLinkedin = shareLinkedin;
 exports.shareTwitter = shareTwitter;
 exports.sleep = sleep;
 exports.styleStringify = void 0;
-exports.triggerBuryingPointEvent = triggerBuryingPointEvent;
 
 var _axios = _interopRequireDefault(require("axios"));
 
@@ -38,14 +33,8 @@ var _uuid = require("uuid");
 
 var _qs = _interopRequireDefault(require("qs"));
 
-var _androidUtil = require("./androidUtil");
-
-var _storeUtil = require("./storeUtil");
-
 var _constants = require("../constants");
 
-var _mobx = require("../mobx");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var __assign = void 0 && (void 0).__assign || function () {
@@ -297,135 +286,23 @@ function commonFetch(url, data, method) {
   });
 }
 
-var navigateTo = function navigateTo(url, state) {
-  console.log('navigateTo', url);
-
+var navigateTo = function navigateTo(url) {
   if (!url) {
     return;
   }
 
-  var _a = url.split(';'),
-      h5Url = _a[0],
-      appUrl = _a[1]; // 未配置App路径并且h5绝对路径时直接跳转，其他情况让业务层处理
-
-
-  if (!appUrl && !h5Url.startsWith('/')) {
-    window.location.href = h5Url;
-  } else if (window.magicDesign.history) {
-    window.magicDesign.history.push(url, state);
-  } else if (window.magicDesign.navigatePreUrl) {
-    // 预览模式跳转
-    if (h5Url.startsWith('/')) {
-      window.location.href = "" + window.magicDesign.navigatePreUrl + url;
+  if (url.startsWith('/')) {
+    if (window.magicDesign.history && !window.magicDesign.navigatePreUrl) {
+      window.magicDesign.history.push(url);
     } else {
-      window.location.href = h5Url;
+      window.location.href = "" + window.magicDesign.navigatePreUrl + url;
     }
-  }
-};
-/** 判断是否登录状态 */
-
-
-exports.navigateTo = navigateTo;
-
-function isLogin() {
-  return localStorage.getItem('isLogin') === 'Y';
-}
-/**
- * 跳转登陆页面
- * SF打开的页面，需要跳转到手机验证码登陆页面
- * @param {*} state
- */
-
-
-function goLogin(state, replaceFlag) {
-  if (state === void 0) {
-    state = {};
-  }
-
-  if (replaceFlag === void 0) {
-    replaceFlag = false;
-  }
-
-  var isFromSf = (0, _storeUtil.getStore)(_constants.STORE_KEY.IS_FROM_SF);
-  var signUrl = isFromSf === 'Y' ? '/sign-in-opt' : '/sign-in';
-
-  if (replaceFlag) {
-    window.magicDesign.history.replace({
-      pathname: signUrl,
-      state: state
-    });
   } else {
-    navigateTo(signUrl, state);
-  }
-}
-/**
- * 检查是否登录 未登录返回登录页
- * @param {boolean?} isLead 是否引导登录
- * @returns boolean
- */
-
-
-var checkLogin = function checkLogin(isLead, redirectUrl, replaceFlag) {
-  if (isLead === void 0) {
-    isLead = true;
+    window.location.href = url;
   }
-
-  if (!isLogin()) {
-    if (isLead) {
-      if ((0, _androidUtil.browserVersion)().isApp) {
-        goToLoginApp();
-      } else {
-        var _a = window.location,
-            pathname = _a.pathname,
-            search = _a.search,
-            hash = _a.hash;
-
-        var _redirectUrl = pathname + search + hash;
-
-        goLogin({
-          redirectUrl: redirectUrl || _redirectUrl
-        }, replaceFlag);
-      }
-    }
-
-    return false;
-  }
-
-  return true;
 };
-/**
- * TODO 根据IP获取地址信息
- */
 
-
-exports.checkLogin = checkLogin;
-
-var setDefaultAddressFromIP = function setDefaultAddressFromIP() {
-  /** 设置初始地址 */
-
-  /** 接口返回数据addrPath: "1|2|137088|137089|137090" 保留后两个再拼上contactStdId
-     * 未登陆造数据和真实数据一致使用countryId占位
-    */
-
-  /** 138375,138376,126065,126066 */
-  if (!_mobx.userState.state.userAddress) {
-    _mobx.userState.setState({
-      userAddress: {
-        _FROM: 'ip',
-        addrPath: 'countryId|countryId1T|countryId2T|138375|138376|126065',
-        city: 'CITY OF MANILA',
-        contactStdId: 126066,
-        // country: 'CITY OF MANILA',
-        district: 'SAN MIGUEL',
-        street: 'Barangay 637',
-        province: 'NCR, CITY OF MANILA, FIRST DISTRICT',
-        type: 'address'
-      }
-    });
-  }
-};
-
-exports.setDefaultAddressFromIP = setDefaultAddressFromIP;
+exports.navigateTo = navigateTo;
 
 var addUrlQuery = function addUrlQuery(url, queryObj) {
   if (/\?/.test(url)) {
@@ -751,29 +628,14 @@ function pushGA(data, eventName) {
         groupName: data.groupName,
         elementId: data.elementId,
         elementName: data.elementName
-      }; // console.log('GA push', eventName, eventData);
-
-      if (window.gtag) window.gtag('event', eventName, eventData);
+      };
+      console.log('GA push', eventName, eventData);
+      window.gtag('event', eventName, eventData);
     }
   } catch (error) {
     console.error(error);
   }
 }
-/** 触发埋点事件
- *
-  window.document.addEventListener('magic-design-burying-point', e => {
-    console.log(e.data);
-  });
- */
-
-
-function triggerBuryingPointEvent(data) {
-  var evt = new Event('magic-design-burying-point', {
-    bubbles: false
-  });
-  evt.data = data;
-  window.document.dispatchEvent(evt);
-}
 /** react key 计算 */
 
 

package/lib/utils/coreUtil.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setMagicDesign = exports.renderPreview = exports.isPc = exports.isDesignMode = exports.isAutoAudit = exports.isActiveFloor = exports.getVideoCover = exports.copyNode = exports.clickUrl = void 0;
+exports.setMagicDesign = exports.renderPreview = exports.isPc = exports.isDesignMode = exports.isActiveFloor = exports.getVideoCover = exports.copyNode = exports.clickUrl = void 0;
 
 var _uuid = require("uuid");
 
@@ -286,25 +286,7 @@ var getCoupon = function getCoupon(couponId) {
   });
 };
 
-function isUrl(string) {
-  // var pattern = new RegExp('^(https?:\\/\\/)?' + // 协议
-  //   '((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|' + // 域名
-  //   '((\\d{1,3}\\.){3}\\d{1,3}))' + // 或者 IP (v4) 地址
-  //   '(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*' + // 端口和路径
-  //   '(\\?[;&a-z\\d%_.~+=-]*)?' + // 查询字符串
-  //   '(\\#[-a-z\\d_]*)?$', 'i'); // fragment locator
-  // return !!pattern.test(string);
-  try {
-    new URL(string);
-    return true;
-  } catch (_) {
-    return false;
-  }
-}
-
 var clickUrl = function clickUrl(url) {
-  var _a;
-
   if (url === void 0) {
     url = '';
   }
@@ -315,43 +297,30 @@ var clickUrl = function clickUrl(url) {
     return;
   }
 
-  var _b = _typeof(url) === 'object' ? (0, _businessUtil.newParseUrl)(url) : (0, _businessUtil.parseUrl)(url),
-      link = _b.link,
-      data = _b.data;
-
-  var _c = data.params,
-      params = _c === void 0 ? {} : _c; // console.log('clicked data:', data);
-  // console.log({ type: 'jumpBrowser', params: { url: params.link } });
-
-  /** 锚点跳转 */
-
-  if (params.type === 'ANCHOR') {
-    (0, _commonUtil.ensure)(function () {
-      var nodeId = isPc() ? params.data.pcNodeId : params.data.mobileNodeId;
-      document.querySelector("#node-" + nodeId).scrollIntoView({
-        behavior: 'smooth'
-      });
-    });
-    return;
-  }
+  var _a = _typeof(url) === 'object' ? (0, _businessUtil.newParseUrl)(url) : (0, _businessUtil.parseUrl)(url),
+      link = _a.link,
+      data = _a.data;
+
+  var _b = data.params,
+      params = _b === void 0 ? {} : _b;
+  console.log('clicked data:', data);
+  console.log({
+    type: 'jumpBrowser',
+    params: {
+      url: params.link
+    }
+  });
 
   if ((0, _androidUtil.browserVersion)().isAshitaApp) {
     (0, _androidUtil.sendToApp)(data);
   } else if ((0, _androidUtil.browserVersion)().isApp && params.link && params.link.startsWith('http')) {
-    // 跳转链接是个绝对路径
-    if (params.type === 'Gamezop') {
-      // Nuri 对接 Gamezop 特殊情况
-      (0, _androidUtil.sendToApp)(data);
-    } else {
-      // Nuri 抽奖系统对接
-      var urlTemp = "" + params.link + (params.link.includes('?') ? '&' : '?') + "userToken=" + (localStorage.getItem('h5Token') || '');
-      (0, _androidUtil.sendToApp)({
-        type: 'jumpBrowser',
-        params: {
-          url: urlTemp
-        }
-      });
-    }
+    // 兼容Nuri的 绝对路径跳转
+    (0, _androidUtil.sendToAndroid)({
+      type: 'jumpBrowser',
+      params: {
+        url: params.link
+      }
+    });
   } else {
     // 视频
     if (params.type === 'VIDEO') {
@@ -373,33 +342,9 @@ var clickUrl = function clickUrl(url) {
       }
 
       return;
-    } // 判断是否是nuri， nuri跳外链需要带token
-
-
-    if (((_a = window === null || window === void 0 ? void 0 : window.magicDesign) === null || _a === void 0 ? void 0 : _a.projectCode) === 'nuri') {
-      // 输入的是完整的跳转地址
-      if (isUrl(link)) {
-        if (params.type === 'Gamezop') {
-          // Nuri 对接游戏页面
-          window.open(link);
-        } else if (!link.includes(window.location.host)) {
-          // 跳转外链 需要把userToken带上
-          if (link.includes('?')) {
-            var a = link + "&userToken=" + (localStorage.getItem('h5Token') || '');
-            window.open(a);
-          } else {
-            var a = link + "?userToken=" + (localStorage.getItem('h5Token') || '');
-            window.open(a);
-          }
-        } else {
-          window.open(link);
-        }
-      } else {
-        (0, _commonUtil.navigateTo)(link);
-      }
-    } else {
-      (0, _commonUtil.navigateTo)(link);
     }
+
+    (0, _commonUtil.navigateTo)(link);
   }
 };
 
@@ -445,15 +390,5 @@ var copyNode = function copyNode(value, parentId) {
   });
   return newNode;
 };
-/**
- * 是否开启自动审核
- */
-
-
-exports.copyNode = copyNode;
-
-var isAutoAudit = function isAutoAudit() {
-  return window.magicDesign.autoAudit || window.partyType === partyTypeMap.PLATFORM;
-};
 
-exports.isAutoAudit = isAutoAudit;
+exports.copyNode = copyNode;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fonixtree/magic-design",
   "author": "Cylon Team",
-  "version": "0.1.93",
+  "version": "0.2.2",
   "description": "Magic Design",
   "license": "MIT",
   "module": "es/index.js",
@@ -36,7 +36,6 @@
     "ramda": "^0.28.0",
     "react-ace": "^10.1.0",
     "react-color": "2.17.0",
-    "react-cropper": "^2.3.3",
     "react-router-dom": "5.3.0",
     "react-slick": "^0.29.0",
     "replace": "^1.2.1",

package/es/common/CropperModal/index.js

@@ -1,126 +0,0 @@
-"use strict";
-
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-
-var _react = _interopRequireWildcard(require("react"));
-
-var _reactCropper = _interopRequireDefault(require("react-cropper"));
-
-require("cropperjs/dist/cropper.css");
-
-require("./index.less");
-
-var _locale = require("../../locale");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-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); }
-
-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 __extends = void 0 && (void 0).__extends || function () {
-  var _extendStatics = function extendStatics(d, b) {
-    _extendStatics = Object.setPrototypeOf || {
-      __proto__: []
-    } instanceof Array && function (d, b) {
-      d.__proto__ = b;
-    } || function (d, b) {
-      for (var p in b) {
-        if (b.hasOwnProperty(p)) d[p] = b[p];
-      }
-    };
-
-    return _extendStatics(d, b);
-  };
-
-  return function (d, b) {
-    _extendStatics(d, b);
-
-    function __() {
-      this.constructor = d;
-    }
-
-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-  };
-}();
-
-var AComponent =
-/** @class */
-function (_super) {
-  __extends(AComponent, _super);
-
-  function AComponent() {
-    var _this = _super !== null && _super.apply(this, arguments) || this;
-
-    _this.state = {
-      src: ''
-    };
-
-    _this.onSubmit = function () {
-      _this.cropper.getCroppedCanvas().toBlob(function (blob) {
-        var fileName = _this.props.uploadedImageFile.name; // Vovi手机没有图片后缀
-
-        if (fileName && fileName.lastIndexOf('.') === -1) {
-          fileName = "file_" + new Date().getTime() + ".jpg";
-        }
-
-        var formData = new FormData();
-        formData.append('file', blob, fileName);
-
-        _this.props.onSubmit(formData);
-      });
-    };
-
-    return _this;
-  }
-
-  AComponent.prototype.componentDidMount = function () {
-    var _this = this;
-
-    var fileReader = new FileReader();
-
-    fileReader.onload = function (e) {
-      var dataURL = e.target.result;
-
-      _this.setState({
-        src: dataURL
-      });
-    };
-
-    fileReader.readAsDataURL(this.props.uploadedImageFile);
-  };
-
-  AComponent.prototype.render = function () {
-    var _this = this;
-
-    return /*#__PURE__*/_react["default"].createElement("div", {
-      className: "cropperModalWrap"
-    }, /*#__PURE__*/_react["default"].createElement(_reactCropper["default"], {
-      aspectRatio: 1,
-      className: "company-logo-cropper",
-      guides: false,
-      onInitialized: function onInitialized(cop) {
-        _this.cropper = cop;
-      },
-      src: this.state.src,
-      viewMode: 1,
-      zoomable: false
-    }), /*#__PURE__*/_react["default"].createElement("div", {
-      className: "btnWrap"
-    }, /*#__PURE__*/_react["default"].createElement("span", {
-      onClick: this.props.onClose
-    }, (0, _locale.i18n)('CANCEL')), /*#__PURE__*/_react["default"].createElement("span", {
-      onClick: this.onSubmit
-    }, (0, _locale.i18n)('SUBMIT'))));
-  };
-
-  return AComponent;
-}(_react.Component);
-
-var _default = AComponent;
-exports["default"] = _default;

package/es/common/CropperModal/index.less

@@ -1,29 +0,0 @@
-.cropperModalWrap {
-  background: #000;
-  position: fixed;
-  z-index: 1000;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-
-  .btnWrap {
-    span {
-      color: #fff;
-      font-size: 18px;
-      position: absolute;
-      bottom: 10px;
-
-      &:first-child {
-        left: 12px;
-      }
-
-      &:last-child {
-        right: 12px;
-      }
-    }
-  }
-}