@fonixtree/magic-design 0.1.86 → 0.1.88

package/es/decorator/metaDecorator.js

@@ -93,10 +93,14 @@ function metaDecorator(WrappedComponent) {
           var _c = _this.props,
               data = _c.data,
               GAData = _c.GAData;
-          (0, _commonUtil.pushGA)(__assign(__assign({}, GAData), {
+
+          var eventData = __assign(__assign({}, GAData), {
             elementId: data.id,
             elementName: data.text || (GAData === null || GAData === void 0 ? void 0 : GAData.groupName)
-          }));
+          });
+
+          (0, _commonUtil.pushGA)(eventData); // triggerBuryingPointEvent(eventData);
+
           return;
         } // 组织冒泡
 

package/es/locale/en/en.json

@@ -1,4 +1,5 @@
 {
+  "SUBMIT": "Submit",
   "CANCELLED": "Cancelled",
   "DONE": "Done",
   "TO_RECEIVE": "To Receive",
@@ -128,7 +129,6 @@
   "MOVE_DOWN": "Move Down",
   "COPY": "Copy",
   "DELETE": "Delete",
-  "DONE": "Done",
   "ADD_COMPONENT": "Add Component",
   "ALL": "ALL",
   "HOT": "Hot",

package/es/locale/es/es.json

@@ -1,6 +1,7 @@
 {
+  "SUBMIT": "Submit",
   "CANCELLED": "Cancelled",
-  "DONE": "Done",
+  "DONE": "Hecho",
   "TO_RECEIVE": "To Receive",
   "TO_SHIP": "To ship",
   "TO_PAY": "To Pay",
@@ -128,7 +129,6 @@
   "MOVE_DOWN": "Mover hacia abajo",
   "COPY": "Copiar",
   "DELETE": "Eliminar",
-  "DONE": "Hecho",
   "ADD_COMPONENT": "Agregar Componente",
   "ALL": "TODO",
   "HOT": "Caliente",

package/es/locale/id/id.json

@@ -1,4 +1,5 @@
 {
+  "SUBMIT": "Submit",
   "CANCELLED": "Cancelled",
   "DONE": "Done",
   "TO_RECEIVE": "To Receive",
@@ -128,7 +129,6 @@
   "MOVE_DOWN": "Move Down",
   "COPY": "Copy",
   "DELETE": "Delete",
-  "DONE": "Done",
   "ADD_COMPONENT": "Add Component",
   "ALL": "ALL",
   "HOT": "Hot",

package/es/meta-comp/config-panels/TextConfig/index.js

@@ -278,7 +278,7 @@ function (_super) {
         showBgColor: true,
         showTextAlign: true,
         value: textData
-      })), /*#__PURE__*/_react["default"].createElement(_common.Field, {
+      })), window.magicDesign.outputType != 'html' && /*#__PURE__*/_react["default"].createElement(_common.Field, {
         split: true,
         title: "URL"
       }, /*#__PURE__*/_react["default"].createElement(_common.UrlPicker, {

package/es/utils/androidUtil.js

@@ -22,6 +22,10 @@ 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
   };
 };

package/es/utils/businessUtil.js

@@ -28,7 +28,8 @@ var newParseUrl = function newParseUrl(urlObj) {
   var type = urlObj.type,
       value = urlObj.value,
       offerId = urlObj.offerId,
-      productId = urlObj.productId;
+      productId = urlObj.productId,
+      name = urlObj.name;
 
   switch (type) {
     // 锚点跳转
@@ -182,6 +183,18 @@ var newParseUrl = function newParseUrl(urlObj) {
       };
       break;
 
+    case _constants.urlTypeMap.AFFILIATE_STORE:
+      // 分销店铺
+      link = "/storeDetail/" + value;
+      params = {
+        action: 'jump',
+        params: {
+          type: 'AFFILIATE_STORE',
+          url: value
+        }
+      };
+      break;
+
     default:
       var map = {
         '/main/cart': 'CART',
@@ -204,8 +217,9 @@ var newParseUrl = function newParseUrl(urlObj) {
       params = {
         action: 'jump',
         params: {
-          type: map[link],
-          link: link
+          type: map[link] || name,
+          link: link,
+          url: link
         }
       };
   }

package/es/utils/commonUtil.js

@@ -28,6 +28,7 @@ exports.shareLinkedin = shareLinkedin;
 exports.shareTwitter = shareTwitter;
 exports.sleep = sleep;
 exports.styleStringify = void 0;
+exports.triggerBuryingPointEvent = triggerBuryingPointEvent;
 
 var _axios = _interopRequireDefault(require("axios"));
 
@@ -296,8 +297,8 @@ function commonFetch(url, data, method) {
   });
 }
 
-var navigateTo = function navigateTo(url) {
-  console.log(url);
+var navigateTo = function navigateTo(url, state) {
+  console.log('navigateTo', url);
 
   if (!url) {
     return;
@@ -311,7 +312,7 @@ var navigateTo = function navigateTo(url) {
   if (!appUrl && !h5Url.startsWith('/')) {
     window.location.href = h5Url;
   } else if (window.magicDesign.history) {
-    window.magicDesign.history.push(url);
+    window.magicDesign.history.push(url, state);
   } else if (window.magicDesign.navigatePreUrl) {
     // 预览模式跳转
     if (h5Url.startsWith('/')) {
@@ -349,7 +350,7 @@ function goLogin(state, replaceFlag) {
   var signUrl = isFromSf === 'Y' ? '/sign-in-opt' : '/sign-in';
 
   if (replaceFlag) {
-    Fishx.history.replace({
+    window.magicDesign.history.replace({
       pathname: signUrl,
       state: state
     });
@@ -750,14 +751,29 @@ function pushGA(data, eventName) {
         groupName: data.groupName,
         elementId: data.elementId,
         elementName: data.elementName
-      };
-      console.log('GA push', eventName, eventData);
+      }; // console.log('GA push', eventName, eventData);
+
       if (window.gtag) 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/es/utils/coreUtil.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setMagicDesign = exports.renderPreview = exports.isPc = exports.isDesignMode = exports.isActiveFloor = exports.getVideoCover = exports.copyNode = exports.clickUrl = void 0;
+exports.setMagicDesign = exports.renderPreview = exports.isPc = exports.isDesignMode = exports.isAutoAudit = exports.isActiveFloor = exports.getVideoCover = exports.copyNode = exports.clickUrl = void 0;
 
 var _uuid = require("uuid");
 
@@ -303,6 +303,8 @@ function isUrl(string) {
 }
 
 var clickUrl = function clickUrl(url) {
+  var _a;
+
   if (url === void 0) {
     url = '';
   }
@@ -313,19 +315,14 @@ var clickUrl = function clickUrl(url) {
     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
-    }
-  });
+  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') {
@@ -340,15 +337,29 @@ var clickUrl = function clickUrl(url) {
 
   if ((0, _androidUtil.browserVersion)().isAshitaApp) {
     (0, _androidUtil.sendToApp)(data);
-  } else if ((0, _androidUtil.browserVersion)().isApp && params.link && params.link.startsWith('http')) {
-    var urlTemp = "" + params.link + (params.link.includes('?') ? '&' : '?') + "userToken=" + (localStorage.getItem('h5Token') || ''); // 兼容Nuri的 绝对路径跳转
-
-    (0, _androidUtil.sendToAndroid)({
-      type: 'jumpBrowser',
-      params: {
-        url: urlTemp
-      }
-    });
+  } else if (params.link && params.link.startsWith('http')) {
+    // 跳转链接是个绝对路径
+    if (params.type === 'Gamezop') {
+      // Nuri 对接 Gamezop 特殊情况
+      (0, _androidUtil.sendToApp)(data);
+    } else if ((0, _androidUtil.browserVersion)().isApp || (0, _androidUtil.browserVersion)().isNuriApp) {
+      // Nuri 抽奖系统对接
+      var urlTemp = "" + params.link + (params.link.includes('?') ? '&' : '?') + "userToken=" + (localStorage.getItem('h5Token') || '');
+      (0, _androidUtil.sendToApp)({
+        type: 'jumpBrowser',
+        params: {
+          url: urlTemp
+        }
+      });
+    } else {
+      // 新开浏览器打开
+      (0, _androidUtil.sendToApp)({
+        type: 'jumpBrowser',
+        params: {
+          url: params.link
+        }
+      });
+    }
   } else {
     // 视频
     if (params.type === 'VIDEO') {
@@ -370,25 +381,33 @@ 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);
+    } // 判断是否是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 {
-          var a = link + "?userToken=" + (localStorage.getItem('h5Token') || '');
-          window.open(a);
+          window.open(link);
         }
       } else {
-        window.open(link);
+        (0, _commonUtil.navigateTo)(link);
       }
-    } else {
-      (0, _commonUtil.navigateTo)(link);
     }
+
+    (0, _commonUtil.navigateTo)(link);
   }
 };
 
@@ -434,5 +453,15 @@ var copyNode = function copyNode(value, parentId) {
   });
   return newNode;
 };
+/**
+ * 是否开启自动审核
+ */
+
+
+exports.copyNode = copyNode;
+
+var isAutoAudit = function isAutoAudit() {
+  return window.magicDesign.autoAudit !== 'false' || window.partyType === partyTypeMap.PLATFORM;
+};
 
-exports.copyNode = copyNode;
+exports.isAutoAudit = isAutoAudit;

package/lib/common/CountDown/index.js

@@ -57,9 +57,11 @@ function (_super) {
       hour: '00',
       min: '00',
       second: '00',
-      nowTime: _this.props.now
+      nowTime: Number(_this.props.now),
+      now: _this.props.now
     };
     _this.timer = null;
+    _this.preTime = '';
 
     _this.componentWillUnmount = function () {
       _this.clearTimer();
@@ -112,19 +114,26 @@ function (_super) {
     return _this;
   }
 
-  CountDown.prototype.componentWillReceiveProps = function (nextProps) {
-    var _this = this;
-
-    if (nextProps.now !== this.props.now) {
-      this.setState({
+  CountDown.getDerivedStateFromProps = function (nextProps, prevState) {
+    // 检查是否需要更新sortType
+    if (nextProps.now !== prevState.now) {
+      return {
+        now: nextProps.now,
         nowTime: nextProps.now
-      }, function () {
-        _this.clearTimer();
+      };
+    }
+
+    return null;
+  };
 
-        _this.calcLastTime();
+  CountDown.prototype.componentDidUpdate = function () {
+    var now = this.state.now;
 
-        _this.timer = setInterval(_this.calcLastTime, 1000);
-      });
+    if (this.preTime != now) {
+      this.preTime = now;
+      this.clearTimer();
+      this.calcLastTime();
+      this.timer = setInterval(this.calcLastTime, 1000);
     }
   };
 

package/lib/common/CropperModal/index.js

@@ -0,0 +1,126 @@
+"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/lib/common/CropperModal/index.less

@@ -0,0 +1,29 @@
+.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;
+      }
+    }
+  }
+}