@fonixtree/magic-design 2.0.85 → 2.0.87

package/lib/core/Renderer/index.js

@@ -44,7 +44,8 @@ var __assign = void 0 && (void 0).__assign || function () {
 var setDesignConfig = function setDesignConfig(props) {
   var config = props.config,
       device = props.device,
-      isPreview = props.isPreview;
+      isPreview = props.isPreview,
+      projectCode = props.projectCode;
   window.magicDesign = __assign(__assign({
     pageBackground: '#f2f2f2',
     mode: 'renderer',
@@ -52,6 +53,7 @@ var setDesignConfig = function setDesignConfig(props) {
     designMode: isPreview,
     navigatePreUrl: ''
   }, config), {
+    projectCode: projectCode,
     compSpacing: Number(config.compSpacing),
     compWidth: Number(config.compWidth)
   });
@@ -137,7 +139,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,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/lib/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/lib/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/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

@@ -297,8 +297,6 @@ function commonFetch(url, data, method) {
 }
 
 var navigateTo = function navigateTo(url) {
-  console.log(url);
-
   if (!url) {
     return;
   }
@@ -349,7 +347,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
     });

package/lib/utils/coreUtil.js

@@ -303,6 +303,8 @@ function isUrl(string) {
 }
 
 var clickUrl = function clickUrl(url) {
+  var _a;
+
   if (url === void 0) {
     url = '';
   }
@@ -313,12 +315,12 @@ 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 = _typeof(url) === 'object' ? (0, _businessUtil.newParseUrl)(url) : (0, _businessUtil.parseUrl)(url),
+      link = _b.link,
+      data = _b.data;
 
-  var _b = data.params,
-      params = _b === void 0 ? {} : _b;
+  var _c = data.params,
+      params = _c === void 0 ? {} : _c;
   console.log('clicked data:', data);
   console.log({
     type: 'jumpBrowser',
@@ -341,11 +343,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 {
@@ -369,25 +372,30 @@ 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 (!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);
   }
 };
 

package/package.json

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