@fonixtree/magic-design 1.0.60 → 1.0.64

package/es/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/es/common/CropperModal/index.js

@@ -13,7 +13,7 @@ var _reactCropper = _interopRequireDefault(require("react-cropper"));
 
 require("cropperjs/dist/cropper.css");
 
-var _indexModule = _interopRequireDefault(require("./index.module.less"));
+require("./index.less");
 
 var _locale = require("../../locale");
 
@@ -99,7 +99,7 @@ function (_super) {
     var _this = this;
 
     return /*#__PURE__*/_react["default"].createElement("div", {
-      className: _indexModule["default"].cropperModalWrap
+      className: "cropperModalWrap"
     }, /*#__PURE__*/_react["default"].createElement(_reactCropper["default"], {
       aspectRatio: 1,
       className: "company-logo-cropper",
@@ -111,7 +111,7 @@ function (_super) {
       viewMode: 1,
       zoomable: false
     }), /*#__PURE__*/_react["default"].createElement("div", {
-      className: _indexModule["default"].btnWrap
+      className: "btnWrap"
     }, /*#__PURE__*/_react["default"].createElement("span", {
       onClick: this.props.onClose
     }, (0, _locale.i18n)('CANCEL')), /*#__PURE__*/_react["default"].createElement("span", {

package/es/common/CropperModal/{index.module.less → index.less}

@@ -3,7 +3,7 @@
   position: fixed;
   z-index: 1000;
   top: 0;
-  bottom: 0;
+  bottom: 60px;
   left: 0;
   right: 0;
   display: flex;
@@ -16,9 +16,11 @@
       font-size: 18px;
       position: absolute;
       bottom: 10px;
+
       &:first-child {
         left: 12px;
       }
+
       &:last-child {
         right: 12px;
       }

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

@@ -255,7 +255,10 @@ function (_super) {
 
     _this.state = {
       messageNum: '',
-      userInfo: currentUser
+      userInfo: currentUser,
+      loading: false,
+      selectedImgFile: {},
+      editImgModalVisible: false
     };
 
     _this.getNum = function (v) {
@@ -385,7 +388,9 @@ function (_super) {
                 return {
                   userInfo: __assign(__assign({}, preState.userInfo), {
                     photo: params.photo
-                  })
+                  }),
+                  loading: false,
+                  editImgModalVisible: false
                 };
               });
               return [2
@@ -397,6 +402,12 @@ function (_super) {
     };
 
     _this.onUploadImg = function (formData) {
+      if (_this.state.loading) return;
+
+      _this.setState({
+        loading: true
+      });
+
       fetch('/designer/v1/h5/image', {
         method: 'POST',
         body: formData
@@ -415,10 +426,6 @@ function (_super) {
           return;
         }
 
-        _this.setState({
-          editImgModalVisible: false
-        });
-
         _this.modifyPhoto({
           photo: responseData.fileUrl
         });
@@ -428,6 +435,10 @@ function (_super) {
           message: err === null || err === void 0 ? void 0 : err.data,
           duration: 5000
         });
+
+        _this.setState({
+          loading: false
+        });
       });
     };
 
@@ -548,10 +559,7 @@ function (_super) {
   };
 
   PersonalInfoMobile.defaultProps = {
-    data: {
-      selectedImgFile: {},
-      editImgModalVisible: false
-    }
+    data: {}
   };
   return PersonalInfoMobile;
 }(_react["default"].Component);

package/es/utils/commonUtil.js

@@ -305,16 +305,19 @@ var navigateTo = function navigateTo(url, state) {
 
   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: url,
-      state: __assign({}, state)
+      pathname: h5Url,
+      state: state
     });
   } else if (window.magicDesign.navigatePreUrl) {
     // 预览模式跳转

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

@@ -13,7 +13,7 @@ var _reactCropper = _interopRequireDefault(require("react-cropper"));
 
 require("cropperjs/dist/cropper.css");
 
-var _indexModule = _interopRequireDefault(require("./index.module.less"));
+require("./index.less");
 
 var _locale = require("../../locale");
 
@@ -99,7 +99,7 @@ function (_super) {
     var _this = this;
 
     return /*#__PURE__*/_react["default"].createElement("div", {
-      className: _indexModule["default"].cropperModalWrap
+      className: "cropperModalWrap"
     }, /*#__PURE__*/_react["default"].createElement(_reactCropper["default"], {
       aspectRatio: 1,
       className: "company-logo-cropper",
@@ -111,7 +111,7 @@ function (_super) {
       viewMode: 1,
       zoomable: false
     }), /*#__PURE__*/_react["default"].createElement("div", {
-      className: _indexModule["default"].btnWrap
+      className: "btnWrap"
     }, /*#__PURE__*/_react["default"].createElement("span", {
       onClick: this.props.onClose
     }, (0, _locale.i18n)('CANCEL')), /*#__PURE__*/_react["default"].createElement("span", {

package/lib/common/CropperModal/{index.module.less → index.less}

@@ -3,7 +3,7 @@
   position: fixed;
   z-index: 1000;
   top: 0;
-  bottom: 0;
+  bottom: 60px;
   left: 0;
   right: 0;
   display: flex;
@@ -16,9 +16,11 @@
       font-size: 18px;
       position: absolute;
       bottom: 10px;
+
       &:first-child {
         left: 12px;
       }
+
       &:last-child {
         right: 12px;
       }

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

@@ -255,7 +255,10 @@ function (_super) {
 
     _this.state = {
       messageNum: '',
-      userInfo: currentUser
+      userInfo: currentUser,
+      loading: false,
+      selectedImgFile: {},
+      editImgModalVisible: false
     };
 
     _this.getNum = function (v) {
@@ -385,7 +388,9 @@ function (_super) {
                 return {
                   userInfo: __assign(__assign({}, preState.userInfo), {
                     photo: params.photo
-                  })
+                  }),
+                  loading: false,
+                  editImgModalVisible: false
                 };
               });
               return [2
@@ -397,6 +402,12 @@ function (_super) {
     };
 
     _this.onUploadImg = function (formData) {
+      if (_this.state.loading) return;
+
+      _this.setState({
+        loading: true
+      });
+
       fetch('/designer/v1/h5/image', {
         method: 'POST',
         body: formData
@@ -415,10 +426,6 @@ function (_super) {
           return;
         }
 
-        _this.setState({
-          editImgModalVisible: false
-        });
-
         _this.modifyPhoto({
           photo: responseData.fileUrl
         });
@@ -428,6 +435,10 @@ function (_super) {
           message: err === null || err === void 0 ? void 0 : err.data,
           duration: 5000
         });
+
+        _this.setState({
+          loading: false
+        });
       });
     };
 
@@ -548,10 +559,7 @@ function (_super) {
   };
 
   PersonalInfoMobile.defaultProps = {
-    data: {
-      selectedImgFile: {},
-      editImgModalVisible: false
-    }
+    data: {}
   };
   return PersonalInfoMobile;
 }(_react["default"].Component);

package/lib/utils/commonUtil.js

@@ -305,16 +305,19 @@ var navigateTo = function navigateTo(url, state) {
 
   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: url,
-      state: __assign({}, state)
+      pathname: h5Url,
+      state: state
     });
   } else if (window.magicDesign.navigatePreUrl) {
     // 预览模式跳转

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fonixtree/magic-design",
   "author": "Cylon Team",
-  "version": "1.0.60",
+  "version": "1.0.64",
   "description": "Magic Design",
   "license": "MIT",
   "module": "es/index.js",