@fonixtree/magic-design 1.0.65 → 1.0.66

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,13 +16,11 @@ 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.navigateTo = exports.importAsync = exports.getUrlParams = void 0;
+exports.navigateToWithSearch = navigateToWithSearch;
+exports.nextTick = void 0;
 exports.pushGA = pushGA;
-exports.setDefaultAddressFromIP = exports.pxToRem = void 0;
+exports.pxToRem = void 0;
 exports.shareFacebook = shareFacebook;
 exports.shareLinkedin = shareLinkedin;
 exports.shareTwitter = shareTwitter;
@@ -37,14 +35,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 () {
@@ -296,29 +288,20 @@ function commonFetch(url, data, method) {
   });
 }
 
-var navigateTo = function navigateTo(url, state) {
-  console.log(url);
-
+var navigateTo = function navigateTo(url) {
   if (!url) {
     return;
   }
 
   var _a = url.split(';'),
       h5Url = _a[0],
-      appUrl = _a[1];
-
-  if (appUrl && (0, _androidUtil.browserVersion)().isApp) {
-    window.location.href = appUrl;
-  } // 未配置App路径并且h5绝对路径时直接跳转，其他情况让业务层处理
+      appUrl = _a[1]; // 未配置App路径并且h5绝对路径时直接跳转，其他情况让业务层处理
 
 
   if (!appUrl && !h5Url.startsWith('/')) {
     window.location.href = h5Url;
   } else if (window.magicDesign.history) {
-    window.magicDesign.history.push({
-      pathname: h5Url,
-      state: state
-    });
+    window.magicDesign.history.push(url);
   } else if (window.magicDesign.navigatePreUrl) {
     // 预览模式跳转
     if (h5Url.startsWith('/')) {
@@ -328,110 +311,20 @@ var navigateTo = function navigateTo(url, state) {
     }
   }
 };
-/** 判断是否登录状态 */
+/** 携带search 跳转 */
 
 
 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';
+function navigateToWithSearch(url, search, state) {
+  var _a;
 
-  if (replaceFlag) {
-    window.magicDesign.history.replace({
-      pathname: signUrl,
-      state: state
-    });
-  } else {
-    navigateTo(signUrl, state);
-  }
+  (_a = window.magicDesign) === null || _a === void 0 ? void 0 : _a.history.push({
+    pathname: url,
+    search: search,
+    state: state
+  });
 }
-/**
- * 检查是否登录 未登录返回登录页
- * @param {boolean?} isLead 是否引导登录
- * @returns boolean
- */
-
-
-var checkLogin = function checkLogin(isLead, redirectUrl, replaceFlag) {
-  if (isLead === void 0) {
-    isLead = true;
-  }
-
-  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;
 
 var addUrlQuery = function addUrlQuery(url, queryObj) {
   if (/\?/.test(url)) {
@@ -759,7 +652,7 @@ function pushGA(data, eventName) {
         elementName: data.elementName
       };
       console.log('GA push', eventName, eventData);
-      if (window.gtag) window.gtag('event', eventName, eventData);
+      window.gtag('event', eventName, eventData);
     }
   } catch (error) {
     console.error(error);
@@ -872,7 +765,8 @@ var asyncNextTick = function asyncNextTick(asyncFunc, interval, count) {
 exports.asyncNextTick = asyncNextTick;
 
 var convertToRem = function convertToRem(value) {
-  // return value; // PTO项目 解开注释
+  return value; // PTO项目 解开注释
+
   if (window.magicDesign.device === 'pc') {
     return value + "px";
   }
@@ -891,7 +785,8 @@ var convertToRem = function convertToRem(value) {
 exports.convertToRem = convertToRem;
 
 var pxToRem = function pxToRem(styleObj) {
-  // return styleObj; // PTO项目 解开注释
+  return styleObj; // PTO项目 解开注释
+
   if (window.magicDesign.device === 'pc') {
     return styleObj;
   }
@@ -1027,54 +922,4 @@ var convertCount = function convertCount(value) {
   return newValue;
 };
 
-exports.convertCount = convertCount;
-
-var onListenTouch = function onListenTouch(cls, leftFunc, rightFunc) {
-  var box = document.querySelector(cls); // 监听对象
-
-  var startTime = ''; // 触摸开始时间
-
-  var startDistanceX = ''; // 触摸开始X轴位置
-
-  var startDistanceY = ''; // 触摸开始Y轴位置
-
-  var endTime = ''; // 触摸结束时间
-
-  var endDistanceX = ''; // 触摸结束X轴位置
-
-  var endDistanceY = ''; // 触摸结束Y轴位置
-
-  var moveTime = ''; // 触摸时间
-
-  var moveDistanceX = ''; // 触摸移动X轴距离
-
-  var moveDistanceY = ''; // 触摸移动Y轴距离
-
-  box.addEventListener('touchstart', function (e) {
-    startTime = new Date().getTime();
-    startDistanceX = e.touches[0].screenX;
-    startDistanceY = e.touches[0].screenY;
-  });
-  box.addEventListener('touchend', function (e) {
-    endTime = new Date().getTime();
-    endDistanceX = e.changedTouches[0].screenX;
-    endDistanceY = e.changedTouches[0].screenY;
-    moveTime = endTime - startTime;
-    moveDistanceX = startDistanceX - endDistanceX;
-    moveDistanceY = startDistanceY - endDistanceY; // 判断滑动距离超过40 且 时间小于500毫秒
-
-    if ((Math.abs(moveDistanceX) > 40 || Math.abs(moveDistanceY) > 40) && moveTime < 500) {
-      // 判断X轴移动的距离是否大于Y轴移动的距离
-      if (Math.abs(moveDistanceX) > Math.abs(moveDistanceY)) {
-        // 左右
-        if (moveDistanceX > 0) leftFunc();else rightFunc();
-      } else {
-        // 上下
-        return moveDistanceY > 0 ? 'top' : 'bottom';
-      }
-    }
-  });
-  return null;
-};
-
-exports.onListenTouch = onListenTouch;
+exports.convertCount = convertCount;

package/lib/utils/coreUtil.js

@@ -286,22 +286,6 @@ 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) {
   if (url === void 0) {
     url = '';
@@ -326,17 +310,6 @@ var clickUrl = function clickUrl(url) {
       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;
-  }
 
   if ((0, _androidUtil.browserVersion)().isAshitaApp) {
     (0, _androidUtil.sendToApp)(data);
@@ -369,25 +342,9 @@ var clickUrl = function clickUrl(url) {
       }
 
       return;
-    } // 输入的是完整的跳转地址
-
-
-    if (isUrl(link)) {
-      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);
     }
+
+    (0, _commonUtil.navigateTo)(link);
   }
 };
 

package/lib/utils/currencyUtil.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.numberToFixed = exports.getPricePrefix = exports.getPrecision = exports.formatCurrencyWithSymbolNotSpace = exports.formatCurrencyWithSymbol = exports.formatCurrency = exports.formatBackendCurrency = exports.currencyToFont = exports.calcFloatCount = exports.addSeparators = void 0;
+exports.numberToFixed = exports.getPricePrefix = exports.getPrecision = exports.formatCurrencyWithSymbol = exports.formatCurrency = exports.formatBackendCurrency = exports.currencyToFont = exports.calcFloatCount = exports.addSeparators = void 0;
 
 var _divide = _interopRequireDefault(require("lodash/divide"));
 
@@ -105,13 +105,6 @@ var formatCurrencyWithSymbol = function formatCurrencyWithSymbol(num) {
   var ret = formatCurrency(num);
   return getPricePrefix() + " " + ret;
 };
-
-exports.formatCurrencyWithSymbol = formatCurrencyWithSymbol;
-
-var formatCurrencyWithSymbolNotSpace = function formatCurrencyWithSymbolNotSpace(num) {
-  var ret = formatCurrency(num);
-  return "" + getPricePrefix() + ret;
-};
 /**
  * TODO 未兼容科学计数法（小数点后7位）
  * 计算浮点位数
@@ -120,7 +113,7 @@ var formatCurrencyWithSymbolNotSpace = function formatCurrencyWithSymbolNotSpace
  */
 
 
-exports.formatCurrencyWithSymbolNotSpace = formatCurrencyWithSymbolNotSpace;
+exports.formatCurrencyWithSymbol = formatCurrencyWithSymbol;
 
 var calcFloatCount = function calcFloatCount(number) {
   var numbString = String(number);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fonixtree/magic-design",
   "author": "Cylon Team",
-  "version": "1.0.65",
+  "version": "1.0.66",
   "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",