@fonixtree/magic-design 2.0.85 → 2.0.86

package/es/composite-comp/dito/components/PersonalInformation/mobile/index.js

@@ -29,6 +29,8 @@ var _index = require("../../../../../constants/index");
 
 var _storeUtil = require("../../../../../utils/storeUtil");
 
+var _common = require("../../../../../common");
+
 require("./index.less");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -253,7 +255,10 @@ function (_super) {
 
     _this.state = {
       messageNum: '',
-      userInfo: currentUser
+      userInfo: currentUser,
+      loading: false,
+      selectedImgFile: {},
+      editImgModalVisible: false
     };
 
     _this.getNum = function (v) {
@@ -280,8 +285,12 @@ function (_super) {
           return;
         }
 
-        setSelectedImgFile(file);
-        setEditImgModalVisible(true);
+        _this.hideBottomBar();
+
+        _this.setState({
+          editImgModalVisible: true,
+          selectedImgFile: file
+        });
       }
 
       e.target.value = '';
@@ -365,6 +374,91 @@ function (_super) {
       });
     };
 
+    _this.modifyPhoto = function (params) {
+      return __awaiter(_this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+          switch (_a.label) {
+            case 0:
+              return [4
+              /*yield*/
+              , (0, _commonUtil.commonFetch)('/designer/v1/h5/users/modify', params, 'POST')];
+
+            case 1:
+              _a.sent();
+
+              this.showBottomBar();
+              this.setState(function (preState, props) {
+                return {
+                  userInfo: __assign(__assign({}, preState.userInfo), {
+                    photo: params.photo
+                  }),
+                  loading: false,
+                  editImgModalVisible: false
+                };
+              });
+              return [2
+              /*return*/
+              ];
+          }
+        });
+      });
+    };
+
+    _this.hideBottomBar = function () {
+      var homeNavBar = document.querySelector('.home-navigation');
+      console.log('homeNavBar', homeNavBar);
+      if (homeNavBar) homeNavBar.style.visibility = 'hidden';
+    };
+
+    _this.showBottomBar = function () {
+      var homeNavBar = document.querySelector('.home-navigation');
+      if (homeNavBar) homeNavBar.style.visibility = 'visible';
+    };
+
+    _this.onUploadImg = function (formData) {
+      if (_this.state.loading) return;
+
+      _this.setState({
+        loading: true
+      });
+
+      fetch('/designer/v1/h5/image', {
+        method: 'POST',
+        body: formData
+      }).then(function (response) {
+        return response.json();
+      }).then(function (responseData) {
+        var _a;
+
+        if (((_a = responseData === null || responseData === void 0 ? void 0 : responseData.fileUrl) === null || _a === void 0 ? void 0 : _a.length) > 120) {
+          _antd.message.toast({
+            type: 'error',
+            message: (0, _locale.i18n)('IMAGE_NAME_IS_TOO_LONG'),
+            duration: 3000
+          });
+
+          return;
+        }
+
+        _this.modifyPhoto({
+          photo: responseData.fileUrl
+        });
+      })["catch"](function (err) {
+        _antd.message.toast({
+          type: 'error',
+          message: err === null || err === void 0 ? void 0 : err.data,
+          duration: 5000
+        });
+
+        _this.showBottomBar();
+
+        _this.setState({
+          editImgModalVisible: false,
+          loading: false
+        });
+      });
+    };
+
     _this.onItemClick = function (v) {
       var _a;
 
@@ -392,7 +486,9 @@ function (_super) {
     var data = this.props.data;
     var _a = this.state,
         messageNum = _a.messageNum,
-        userInfo = _a.userInfo;
+        userInfo = _a.userInfo,
+        editImgModalVisible = _a.editImgModalVisible,
+        selectedImgFile = _a.selectedImgFile;
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: (0, _classnames["default"])('personal-information-mobile')
     }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -412,7 +508,6 @@ function (_super) {
       }
     }), /*#__PURE__*/_react["default"].createElement("input", {
       accept: "image/*",
-      disabled: !(0, _lodash.isEmpty)(LPObj),
       id: "userPhoto",
       onChange: this.handleFileChange,
       type: "file"
@@ -421,7 +516,9 @@ function (_super) {
     }, /*#__PURE__*/_react["default"].createElement("p", {
       className: "name",
       onClick: this.clickName
-    }, userInfo.firstName || userInfo.nickName))) : /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
+    }, userInfo.firstName || userInfo.nickName), /*#__PURE__*/_react["default"].createElement("p", {
+      className: "phone"
+    }, userInfo.mobilePhone))) : /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
       className: "photo"
     }, /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
       color: "#fff",
@@ -467,7 +564,17 @@ function (_super) {
           item.title.text = text;
         }
       }));
-    })));
+    })), editImgModalVisible && /*#__PURE__*/_react["default"].createElement(_common.CropperModal, {
+      onClose: function onClose() {
+        _this.setState({
+          editImgModalVisible: false
+        });
+
+        _this.showBottomBar();
+      },
+      onSubmit: this.onUploadImg,
+      uploadedImageFile: selectedImgFile
+    }));
   };
 
   PersonalInfoMobile.defaultProps = {

package/es/composite-comp/dito/components/PersonalInformation/mobile/index.less

@@ -1,12 +1,12 @@
 .personal-information-mobile {
-  height: 4.6rem;
+  height: 3.24rem;
   padding: 0.32rem;
   box-sizing: border-box;
 }
 .personal-information-mobile .top {
   display: flex;
   justify-content: space-between;
-  align-items: start;
+  align-items: flex-start;
 }
 .personal-information-mobile .top .pInfoWrap {
   display: flex;
@@ -16,9 +16,13 @@
   position: relative;
   display: inline-block;
   vertical-align: middle;
+  margin-right: 0.3rem;
+  height: 0.88rem;
+  width: 0.88rem;
 }
 .personal-information-mobile .top .pInfoWrap .photoWrap > input {
   position: absolute;
+  z-index: 1;
   top: 0;
   left: 0;
   width: 100%;

package/es/composite-comp/dito/second-config-panels/CommonFunctionsSecondConfig/index.js

@@ -17,8 +17,6 @@ var _coreUtil = require("../../../../utils/coreUtil");
 
 var _locale = require("../../../../locale");
 
-require("./index.less");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var __extends = void 0 && (void 0).__extends || function () {
@@ -47,6 +45,7 @@ var __extends = void 0 && (void 0).__extends || function () {
   };
 }();
 
+// import './index.less';
 var CommonFunctionsSecondConfig =
 /** @class */
 function (_super) {

package/es/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/es/core/Renderer/index.js

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

package/es/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/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/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
     });

package/es/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/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;
+      }
+    }
+  }
+}