@fonixtree/magic-design 2.0.84 → 2.0.86

package/lib/composite-comp/dito/second-config-panels/PersonalInformationSecondConfig/index.js

@@ -109,8 +109,8 @@ function (_super) {
       }, (0, _locale.i18n)('WISHLIST')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
         value: _index.personalInfoType.STORES
       }, (0, _locale.i18n)('STORES')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
-        value: _index.personalInfoType.COUPONS
-      }, (0, _locale.i18n)('COUPONS')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
+        value: _index.personalInfoType.VOUCHERS
+      }, (0, _locale.i18n)('VOUCHERS')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
         value: _index.personalInfoType.VIEWED
       }, (0, _locale.i18n)('RECENTLY_VIEWED'))))));
     };

package/lib/constants/index.js

@@ -49,14 +49,14 @@ var orderStatusType = {
   PAY: 'To Pay',
   SHIP: 'To Ship',
   RECEIVE: 'To Receive',
-  RATING: 'Rating',
-  RETURN: 'Return'
+  DONE: 'Done',
+  CANCELLED: 'Cancelled'
 };
 exports.orderStatusType = orderStatusType;
 var personalInfoType = {
   WISHLIST: 'Wishlist',
   STORES: 'Stores',
-  COUPONS: 'Coupons',
+  VOUCHERS: 'Vouchers',
   VIEWED: 'Recently Viewed'
 };
 exports.personalInfoType = personalInfoType;

package/lib/core/Designer/ToolBarModal/index.js

@@ -153,7 +153,11 @@ function (_super) {
 
         _this.props.quillRef.format('list', currentListType == 'bullet' ? '' : 'bullet');
       } else if (type == 'link') {
-        _this.props.quillRef.format('link', JSON.stringify(value));
+        if (window.magicDesign.outputType === 'html') {
+          _this.props.quillRef.format('link', value.name);
+        } else {
+          _this.props.quillRef.format('link', JSON.stringify(value));
+        }
       } else if (type == 'size') {
         _this.props.quillRef.format('size', value + 'px');
       } else if (type == 'font') {

package/lib/core/Renderer/index.js

@@ -137,7 +137,9 @@ var Renderer = function Renderer(props) {
       };
     }
 
-    return {};
+    return {
+      overflow: 'auto'
+    };
   };
 
   return /*#__PURE__*/_react["default"].createElement("div", {

package/lib/decorator/compositeDecorator.js

@@ -87,7 +87,11 @@ function compositeDecorator(WrappedComponent) {
       }; // 复合组件点击事件
 
       _this.onCompositeCompClick = function (event) {
-        // 触发左侧楼层的滚动
+        if (window.magicDesign.mode === 'renderer') {
+          return;
+        } // 触发左侧楼层的滚动
+
+
         if (document.getElementById("card" + _this.props.nodeData.id)) {
           document.getElementById("card" + _this.props.nodeData.id).scrollIntoView({
             behavior: 'smooth'
@@ -115,19 +119,20 @@ function compositeDecorator(WrappedComponent) {
             device = _b.device,
             compWidth = _b.compWidth;
         var zIndex = '0';
+        var position = 'relative';
 
         if (nodeData.type === 'CAROUSEL' || nodeData.type === 'IMAGE_GALLERY' || nodeData.type === 'ORDERS') {
           zIndex = '1';
         } // 解决pc导航hover上去，类目被下面组件遮罩的问题
 
 
-        if (nodeData.type === 'PC_NAVIGATION') {
+        if (nodeData.type === 'PC_NAVIGATION' || nodeData.type === 'PERSONAL_INFOMATION') {
           zIndex = '2';
         }
 
         var wrapStyle = {
           border: 'none',
-          position: 'relative',
+          position: position,
           zIndex: zIndex,
           margin: '0 auto'
         }; // 复合组件内边距
@@ -205,8 +210,7 @@ function compositeDecorator(WrappedComponent) {
       };
 
       _this.getWrapStyle = function () {
-        var mode = window.magicDesign.mode; // const { nodeData } = this.props;
-
+        var mode = window.magicDesign.mode;
         var style = {
           position: 'relative',
           zIndex: '1'

package/lib/locale/en/en.json

@@ -1,13 +1,14 @@
 {
-  "RETURN": "Return",
-  "RATING": "Rating",
+  "SUBMIT": "Submit",
+  "CANCELLED": "Cancelled",
+  "DONE": "Done",
   "TO_RECEIVE": "To Receive",
   "TO_SHIP": "To ship",
   "TO_PAY": "To Pay",
   "VIEW_ALL_ORDERS": "View All Orders",
-  "ORDERS": "ORDERS",
+  "ORDERS": "Orders",
   "RECENTLY_VIEWED": "Recently Viewed",
-  "COUPONS": "Coupons",
+  "VOUCHERS": "Vouchers",
   "STORES": "Stores",
   "WISHLIST": "Wishlist",
   "IMAGE_NAME_IS_TOO_LONG": "Image name is too long",
@@ -128,7 +129,6 @@
   "MOVE_DOWN": "Move Down",
   "COPY": "Copy",
   "DELETE": "Delete",
-  "DONE": "Done",
   "ADD_COMPONENT": "Add Component",
   "ALL": "ALL",
   "HOT": "Hot",

package/lib/locale/es/es.json

@@ -1,13 +1,14 @@
 {
-  "RETURN": "Return",
-  "RATING": "Rating",
+  "SUBMIT": "Submit",
+  "CANCELLED": "Cancelled",
+  "DONE": "Hecho",
   "TO_RECEIVE": "To Receive",
   "TO_SHIP": "To ship",
   "TO_PAY": "To Pay",
   "VIEW_ALL_ORDERS": "View All Orders",
-  "ORDERS": "ORDERS",
+  "ORDERS": "Orders",
   "RECENTLY_VIEWED": "Recently Viewed",
-  "COUPONS": "Coupons",
+  "VOUCHERS": "Vouchers",
   "STORES": "Stores",
   "WISHLIST": "Wishlist",
   "IMAGE_NAME_IS_TOO_LONG": "Image name is too long",
@@ -128,7 +129,6 @@
   "MOVE_DOWN": "Mover hacia abajo",
   "COPY": "Copiar",
   "DELETE": "Eliminar",
-  "DONE": "Hecho",
   "ADD_COMPONENT": "Agregar Componente",
   "ALL": "TODO",
   "HOT": "Caliente",

package/lib/locale/id/id.json

@@ -1,13 +1,14 @@
 {
-  "RETURN": "Return",
-  "RATING": "Rating",
+  "SUBMIT": "Submit",
+  "CANCELLED": "Cancelled",
+  "DONE": "Done",
   "TO_RECEIVE": "To Receive",
   "TO_SHIP": "To ship",
   "TO_PAY": "To Pay",
   "VIEW_ALL_ORDERS": "View All Orders",
-  "ORDERS": "ORDERS",
+  "ORDERS": "Orders",
   "RECENTLY_VIEWED": "Recently Viewed",
-  "COUPONS": "Coupons",
+  "VOUCHERS": "Vouchers",
   "STORES": "Stores",
   "WISHLIST": "Wishlist",
   "IMAGE_NAME_IS_TOO_LONG": "Image name is too long",
@@ -128,7 +129,6 @@
   "MOVE_DOWN": "Move Down",
   "COPY": "Copy",
   "DELETE": "Delete",
-  "DONE": "Done",
   "ADD_COMPONENT": "Add Component",
   "ALL": "ALL",
   "HOT": "Hot",

package/lib/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/lib/utils/commonUtil.js

@@ -296,7 +296,7 @@ function commonFetch(url, data, method) {
   });
 }
 
-var navigateTo = function navigateTo(url) {
+var navigateTo = function navigateTo(url, state) {
   console.log(url);
 
   if (!url) {
@@ -305,13 +305,20 @@ var navigateTo = function navigateTo(url) {
 
   var _a = url.split(';'),
       h5Url = _a[0],
-      appUrl = _a[1]; // 未配置App路径并且h5绝对路径时直接跳转，其他情况让业务层处理
+      appUrl = _a[1];
+
+  if (appUrl && (0, _androidUtil.browserVersion)().isApp) {
+    window.location.href = appUrl;
+  } // 未配置App路径并且h5绝对路径时直接跳转，其他情况让业务层处理
 
 
   if (!appUrl && !h5Url.startsWith('/')) {
     window.location.href = h5Url;
   } else if (window.magicDesign.history) {
-    window.magicDesign.history.push(url);
+    window.magicDesign.history.push({
+      pathname: h5Url,
+      state: state
+    });
   } else if (window.magicDesign.navigatePreUrl) {
     // 预览模式跳转
     if (h5Url.startsWith('/')) {
@@ -349,7 +356,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
     });
@@ -752,7 +759,7 @@ function pushGA(data, eventName) {
         elementName: data.elementName
       };
       console.log('GA push', eventName, eventData);
-      window.gtag('event', eventName, eventData);
+      if (window.gtag) window.gtag('event', eventName, eventData);
     }
   } catch (error) {
     console.error(error);

package/lib/utils/coreUtil.js

@@ -341,11 +341,12 @@ 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')) {
-    // 兼容Nuri的 绝对路径跳转
+    var urlTemp = "" + params.link + (params.link.includes('?') ? '&' : '?') + "userToken=" + (localStorage.getItem('h5Token') || ''); // 兼容Nuri的 绝对路径跳转
+
     (0, _androidUtil.sendToAndroid)({
       type: 'jumpBrowser',
       params: {
-        url: params.link
+        url: urlTemp
       }
     });
   } else {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fonixtree/magic-design",
   "author": "Cylon Team",
-  "version": "2.0.84",
+  "version": "2.0.86",
   "description": "Magic Design",
   "license": "MIT",
   "module": "es/index.js",
@@ -36,6 +36,7 @@
     "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/composite-comp/dito/second-config-panels/CommonFunctionsSecondConfig/index.less

@@ -1 +0,0 @@
-.common_functions_second_conf_wrap {}

package/lib/composite-comp/dito/second-config-panels/CommonFunctionsSecondConfig/index.less

@@ -1 +0,0 @@
-.common_functions_second_conf_wrap {}