@fonixtree/magic-design 2.0.84 → 2.0.86

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

@@ -210,13 +210,13 @@ var orderData = {
     key: 'toReceiveNum',
     route: '/main/order/3'
   },
-  Rating: {
+  Done: {
     key: 'toRatingNum',
-    route: '/rating-list'
+    route: '/main/order/4'
   },
-  Return: {
+  Cancelled: {
     key: 'returnsNum',
-    route: '/aftersale-list'
+    route: '/main/order/5'
   }
 };
 exports.orderData = orderData;
@@ -234,8 +234,13 @@ function (_super) {
     };
 
     _this.onItemClick = function (v) {
-      var url = orderData[v].route;
-      (0, _commonUtil.navigateTo)(url);
+      var _a;
+
+      var routeUrl = (_a = orderData[v]) === null || _a === void 0 ? void 0 : _a.route;
+      var selfUrl = (0, _commonUtil.ensure)(function () {
+        return item.title.content.clickUrl.value || item.image.content.clickUrl.value;
+      }, '');
+      (0, _commonUtil.navigateTo)(routeUrl || selfUrl);
     };
 
     _this.getInit = function () {
@@ -266,7 +271,9 @@ function (_super) {
 
     _this.getImageHtml = function (item) {
       var orderStatus = _this.state.orderStatus;
-      var num = orderStatus[orderData[item.sourceType].key];
+      var num = (0, _commonUtil.ensure)(function () {
+        return orderStatus[orderData[item.sourceType].key];
+      }, '');
       return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
         data: item.image,
         maxWidth: "100%"
@@ -321,7 +328,9 @@ function (_super) {
       }, item.image.open && _this.getImageHtml(item)), item.title.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
         className: "title",
         data: item.title,
-        readonly: true
+        onTextInput: function onTextInput(text) {
+          item.title.text = text;
+        }
       }));
     }))));
   };

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

@@ -1,5 +1,5 @@
 .orders-mobile {
-  height: 1.4rem;
+  padding: 0 0.32rem;
 }
 .orders-mobile .fixed-wrap {
   display: flex;
@@ -8,11 +8,6 @@
   box-shadow: 0 0.06rem 0.12rem rgba(0, 0, 0, 0.16);
   border-radius: 0.32rem;
   width: auto;
-  position: absolute;
-  z-index: 3;
-  left: 0.32rem;
-  right: 0.32rem;
-  top: -1.4rem;
   padding: 0.32rem;
 }
 .orders-mobile .fixed-wrap .top {
@@ -44,6 +39,7 @@
   display: flex;
   flex-direction: row;
   justify-content: space-between;
+  height: 1.32rem;
   margin-top: 0.48rem;
   margin-bottom: 0.02rem;
 }

package/es/composite-comp/dito/components/PersonalInformation/defaultJSON.js

@@ -70,7 +70,7 @@ var getDefaultJSON = function getDefaultJSON() {
     login: {
       open: true
     },
-    groupSource: [PersonalInfoGroupSourceJSON('Wishlist'), PersonalInfoGroupSourceJSON('Stores'), PersonalInfoGroupSourceJSON('Coupons'), PersonalInfoGroupSourceJSON('Recently Viewed')],
+    groupSource: [PersonalInfoGroupSourceJSON('Wishlist'), PersonalInfoGroupSourceJSON('Stores'), PersonalInfoGroupSourceJSON('Vouchers'), PersonalInfoGroupSourceJSON('Recently Viewed')],
     spacing: {
       pc: {
         paddingTop: 0,

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setAccountPageValue = exports["default"] = void 0;
+exports.setAccountPageValue = exports.pInfoData = exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
@@ -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 }; }
@@ -218,7 +220,23 @@ var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
   }
 };
 
+var pInfoData = {
+  Wishlist: {
+    route: '/favourite/list'
+  },
+  Stores: {
+    route: '/collect-store'
+  },
+  Vouchers: {
+    route: '/my-coupon'
+  },
+  'Recently Viewed': {
+    route: '/review-list'
+  }
+};
+exports.pInfoData = pInfoData;
 var LPObj = (0, _storeUtil.getSessionStore)('channelPurchase') || {};
+var currentUser = JSON.parse(localStorage.getItem('currentUser')) || {};
 
 var setAccountPageValue = function setAccountPageValue(obj) {
   var accountPageValue = JSON.parse(localStorage.getItem('accountPageValue'));
@@ -237,7 +255,10 @@ function (_super) {
 
     _this.state = {
       messageNum: '',
-      userInfo: {}
+      userInfo: currentUser,
+      loading: false,
+      selectedImgFile: {},
+      editImgModalVisible: false
     };
 
     _this.getNum = function (v) {
@@ -247,7 +268,7 @@ function (_super) {
         return userInfo.userCollectionNum || 0;
       } else if (v === _index.personalInfoType.STORES) {
         return userInfo.userCollectionStoreNum || 0;
-      } else if (v === _index.personalInfoType.COUPONS) {
+      } else if (v === _index.personalInfoType.VOUCHERS) {
         return userInfo.couponNum || 0;
       } else if (v === _index.personalInfoType.VIEWED) {
         return userInfo.recentViewNum || 0;
@@ -264,8 +285,12 @@ function (_super) {
           return;
         }
 
-        setSelectedImgFile(file);
-        setEditImgModalVisible(true);
+        _this.hideBottomBar();
+
+        _this.setState({
+          editImgModalVisible: true,
+          selectedImgFile: file
+        });
       }
 
       e.target.value = '';
@@ -292,7 +317,7 @@ function (_super) {
     };
 
     _this.goLoginPage = function () {
-      if (browserVersion().isApp) {
+      if ((0, _androidUtil.browserVersion)().isApp) {
         (0, _androidUtil.goToLoginApp)();
       } else {
         (0, _commonUtil.goLogin)();
@@ -349,6 +374,101 @@ 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;
+
+      var routeUrl = (_a = pInfoData[v]) === null || _a === void 0 ? void 0 : _a.route;
+      var selfUrl = (0, _commonUtil.ensure)(function () {
+        return item.title.content.clickUrl.value || item.image.content.clickUrl.value;
+      }, '');
+      (0, _commonUtil.navigateTo)(routeUrl || selfUrl);
+    };
+
     return _this;
   }
 
@@ -366,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", {
@@ -386,7 +508,6 @@ function (_super) {
       }
     }), /*#__PURE__*/_react["default"].createElement("input", {
       accept: "image/*",
-      disabled: !(0, _lodash.isEmpty)(LPObj),
       id: "userPhoto",
       onChange: this.handleFileChange,
       type: "file"
@@ -395,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",
@@ -424,7 +547,10 @@ function (_super) {
       className: "bottom"
     }, data.groupSource.map(function (item) {
       return /*#__PURE__*/_react["default"].createElement("div", {
-        className: "item"
+        className: "item",
+        onClick: function onClick() {
+          return _this.onItemClick(item.sourceType);
+        }
       }, item.number.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
         className: "number",
         data: __assign(__assign({}, item.number), {
@@ -438,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,38 +1,42 @@
 .personal-information-mobile {
-  height: 4.6rem;
+  height: 3.24rem;
   padding: 0.32rem;
   box-sizing: border-box;
 }
-.top {
+.personal-information-mobile .top {
   display: flex;
   justify-content: space-between;
-  align-items: start;
+  align-items: flex-start;
 }
-.top .pInfoWrap {
+.personal-information-mobile .top .pInfoWrap {
   display: flex;
   align-items: center;
 }
-.top .pInfoWrap .photoWrap {
+.personal-information-mobile .top .pInfoWrap .photoWrap {
   position: relative;
   display: inline-block;
   vertical-align: middle;
+  margin-right: 0.3rem;
+  height: 0.88rem;
+  width: 0.88rem;
 }
-.top .pInfoWrap .photoWrap > input {
+.personal-information-mobile .top .pInfoWrap .photoWrap > input {
   position: absolute;
+  z-index: 1;
   top: 0;
   left: 0;
   width: 100%;
   height: 100%;
   opacity: 0;
 }
-.top .pInfoWrap .userInfo {
+.personal-information-mobile .top .pInfoWrap .userInfo {
   display: inline-block;
   vertical-align: middle;
 }
-.top .pInfoWrap .userInfo p {
+.personal-information-mobile .top .pInfoWrap .userInfo p {
   margin: 0;
 }
-.top .pInfoWrap .userInfo .name {
+.personal-information-mobile .top .pInfoWrap .userInfo .name {
   font-size: 0.28rem;
   font-weight: 500;
   color: #ffffff;
@@ -42,13 +46,13 @@
   overflow: hidden;
   word-break: break-all;
 }
-.top .pInfoWrap .userInfo .phone {
+.personal-information-mobile .top .pInfoWrap .userInfo .phone {
   font-size: 0.28rem;
   font-weight: 400;
   color: #ffffff;
   margin-top: 0.1rem;
 }
-.top .pInfoWrap .photo {
+.personal-information-mobile .top .pInfoWrap .photo {
   display: inline-block;
   width: 0.88rem;
   height: 0.88rem;
@@ -58,18 +62,18 @@
   margin-right: 0.3rem;
   border-radius: 50%;
 }
-.top .pInfoWrap .btnLogin {
+.personal-information-mobile .top .pInfoWrap .btnLogin {
   font-size: 0.28rem;
   font-weight: 400;
   color: #ffffff;
   font-family: Montserrat;
 }
-.top .btnGroup .iconWrap {
+.personal-information-mobile .top .btnGroup .iconWrap {
   display: inline-block;
   margin-left: 0.3rem;
   position: relative;
 }
-.top .btnGroup .num {
+.personal-information-mobile .top .btnGroup .num {
   position: absolute;
   top: -0.04rem;
   left: 0.28rem;
@@ -84,14 +88,14 @@
   font-size: 0.12rem;
   color: #ffffff;
 }
-.bottom {
+.personal-information-mobile .bottom {
   display: flex;
   flex-direction: row;
   justify-content: space-around;
   width: 100%;
   margin-top: 0.48rem;
 }
-.bottom .item {
+.personal-information-mobile .bottom .item {
   display: flex;
   flex-direction: column;
   justify-content: flex-start;
@@ -99,7 +103,7 @@
   flex: 1;
   position: relative;
 }
-.bottom .item:after {
+.personal-information-mobile .bottom .item:after {
   content: '';
   display: inline-block;
   width: 0.02rem;
@@ -109,16 +113,18 @@
   top: 0.12rem;
   background: #ccc;
 }
-.bottom .item:last-child:after {
+.personal-information-mobile .bottom .item:last-child:after {
   display: none;
 }
-.bottom .item .number {
+.personal-information-mobile .bottom .item .number {
+  width: 70% !important;
   font-size: 0.36rem;
   font-weight: 600;
   color: #ffffff;
   text-align: center;
 }
-.bottom .item .title {
+.personal-information-mobile .bottom .item .title {
+  width: 70% !important;
   font-size: 0.24rem;
   font-weight: 400;
   color: #ffffff;

package/es/composite-comp/dito/config-panels/OrdersConfig/ConfigGroup/index.js

@@ -97,7 +97,9 @@ function (_super) {
   }
 
   ImageTextConfigGroup.prototype.render = function () {
-    var source = this.props.source;
+    var _a = this.props,
+        source = _a.source,
+        maxNum = _a.maxNum;
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "banner_group"
     }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -111,6 +113,7 @@ function (_super) {
     })), /*#__PURE__*/_react["default"].createElement("div", {
       className: "btn_wrap"
     }, /*#__PURE__*/_react["default"].createElement(_Button["default"], {
+      disabled: source.length >= maxNum,
       icon: "icon-add",
       onClick: this.onAddClick,
       type: "primary"

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/composite-comp/dito/second-config-panels/OrdersSecondConfig/index.js

@@ -114,10 +114,10 @@ function (_super) {
       }, (0, _locale.i18n)('TO_SHIP')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
         value: _index.orderStatusType.RECEIVE
       }, (0, _locale.i18n)('TO_RECEIVE')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
-        value: _index.orderStatusType.RATING
-      }, (0, _locale.i18n)('RATING')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
-        value: _index.orderStatusType.RETURN
-      }, (0, _locale.i18n)('RETURN'))))));
+        value: _index.orderStatusType.DONE
+      }, (0, _locale.i18n)('DONE')), /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
+        value: _index.orderStatusType.CANCELLED
+      }, (0, _locale.i18n)('CANCELLED'))))));
     };
 
     return _this;

package/es/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/es/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/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,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",