@fonixtree/magic-design 0.1.86 → 0.1.88

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 {
@@ -49,11 +44,15 @@
   margin-bottom: 0.02rem;
 }
 .orders-mobile .fixed-wrap .list .item {
+  display: flex;
+  flex: 1 1;
+}
+.orders-mobile .fixed-wrap .list .item .content-wrap {
+  width: 100%;
   display: flex;
   flex-direction: column;
   justify-content: center;
   align-items: center;
-  flex: 1;
 }
 .orders-mobile .fixed-wrap .list .item .img-wrap {
   position: relative;

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

@@ -11,6 +11,8 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _lodash = require("lodash");
 
+var _antd = require("antd");
+
 var _avatar = _interopRequireDefault(require("./images/avatar.png"));
 
 var _components = require("../../../../../meta-comp/components");
@@ -27,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 }; }
@@ -251,7 +255,10 @@ function (_super) {
 
     _this.state = {
       messageNum: '',
-      userInfo: currentUser
+      userInfo: currentUser,
+      loading: false,
+      selectedImgFile: {},
+      editImgModalVisible: false
     };
 
     _this.getNum = function (v) {
@@ -266,19 +273,28 @@ function (_super) {
       } else if (v === _index.personalInfoType.VIEWED) {
         return userInfo.recentViewNum || 0;
       }
-    }; // handleFileChange = e => {
-    //   const file = e.target.files[0];
-    //   if (file) {
-    //     if (file.name.length > 120) {
-    //       message.error(i18n('IMAGE_NAME_IS_TOO_LONG'));
-    //       return;
-    //     }
-    //     setSelectedImgFile(file);
-    //     setEditImgModalVisible(true);
-    //   }
-    //   e.target.value = '';
-    // };
+    };
+
+    _this.handleFileChange = function (e) {
+      var file = e.target.files[0];
+
+      if (file) {
+        if (file.name.length > 120) {
+          _antd.message.error((0, _locale.i18n)('IMAGE_NAME_IS_TOO_LONG'));
+
+          return;
+        }
 
+        _this.hideBottomBar();
+
+        _this.setState({
+          editImgModalVisible: true,
+          selectedImgFile: file
+        });
+      }
+
+      e.target.value = '';
+    };
 
     _this.goSettings = function () {
       if ((0, _commonUtil.checkLogin)()) {
@@ -358,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;
 
@@ -385,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", {
@@ -403,12 +506,19 @@ function (_super) {
         width: 44,
         background: userInfo.photo ? '#fff' : 'unset'
       }
+    }), /*#__PURE__*/_react["default"].createElement("input", {
+      accept: "image/*",
+      id: "userPhoto",
+      onChange: this.handleFileChange,
+      type: "file"
     })), /*#__PURE__*/_react["default"].createElement("div", {
       className: "userInfo"
     }, /*#__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",
@@ -441,6 +551,11 @@ function (_super) {
         onClick: function onClick() {
           return _this.onItemClick(item.sourceType);
         }
+      }, /*#__PURE__*/_react["default"].createElement("div", {
+        className: "content-wrap",
+        style: {
+          pointerEvents: window.magicDesign.mode == 'designer' ? 'auto' : 'none'
+        }
       }, item.number.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
         className: "number",
         data: __assign(__assign({}, item.number), {
@@ -453,8 +568,18 @@ function (_super) {
         onTextInput: function onTextInput(text) {
           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,6 +16,7 @@
   position: relative;
   display: inline-block;
   vertical-align: middle;
+  margin-right: 0.3rem;
   height: 0.88rem;
   width: 0.88rem;
 }
@@ -95,11 +96,6 @@
   margin-top: 0.48rem;
 }
 .personal-information-mobile .bottom .item {
-  display: flex;
-  flex-direction: column;
-  justify-content: flex-start;
-  align-items: center;
-  flex: 1;
   position: relative;
 }
 .personal-information-mobile .bottom .item:after {
@@ -115,6 +111,13 @@
 .personal-information-mobile .bottom .item:last-child:after {
   display: none;
 }
+.personal-information-mobile .bottom .item .content-wrap {
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-start;
+  align-items: center;
+  flex: 1;
+}
 .personal-information-mobile .bottom .item .number {
   width: 70% !important;
   font-size: 0.36rem;

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

@@ -641,8 +641,10 @@ function (_super) {
         onItemClick: function onItemClick() {
           /** PTO 定制GA */
           if (window.magicDesign.pushGA) {
-            window.magicDesign.pushGA(item, 'select_item', {
-              event_action: 'Select Item'
+            window.magicDesign.pushGA(item, 'GA_SENSOR_select_item', {
+              event_action: 'Select Item',
+              event_section: data.type,
+              promotion_name: item === null || item === void 0 ? void 0 : item.offerName
             });
           }
 

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

@@ -344,7 +344,19 @@ function (_super) {
     }), !!messageNum && /*#__PURE__*/_react["default"].createElement("span", {
       className: "num"
     }, messageNum))), data.content && ((_p = data.content.logo) === null || _p === void 0 ? void 0 : _p.open) && /*#__PURE__*/_react["default"].createElement("div", {
-      className: "logo"
+      className: "logo",
+      onClick: function onClick() {
+        var _a, _b;
+        /** PTO 定制GA */
+
+
+        if (window.magicDesign.pushGA) {
+          window.magicDesign.pushGA({}, 'select_promotion', {
+            event_section: data.type,
+            promotion_name: (_b = (_a = data.content.logo) === null || _a === void 0 ? void 0 : _a.content) === null || _b === void 0 ? void 0 : _b.h5Name
+          });
+        }
+      }
     }, /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
       data: data.content.logo,
       style: {

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/HeadNavigationSecondConfig/index.js

@@ -71,7 +71,7 @@ function (_super) {
         value: /*#__PURE__*/_react["default"].createElement(_ImageConfig["default"], {
           data: panelProps.image,
           needHover: false,
-          onlySpecificCode: "FunctionPage"
+          onlySpecificCode: ['CustomizedPage', 'FunctionPage']
         }),
         metaOption: panelProps.image
       }];

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

@@ -71,7 +71,7 @@ function (_super) {
         value: /*#__PURE__*/_react["default"].createElement(_ImageConfig["default"], {
           data: panelProps.image,
           needClickArea: false,
-          onlySpecificCode: "FunctionPage"
+          onlySpecificCode: ['CustomizedPage', 'FunctionPage']
         }),
         metaOption: panelProps.image
       }];

package/es/composite-comp/{dito → nuri}/components/AffiliateRecommend/mobile/index.js

@@ -314,8 +314,10 @@ function (_super) {
 
         var _this = this;
 
-        return __generator(this, function (_e) {
-          switch (_e.label) {
+        var _e;
+
+        return __generator(this, function (_f) {
+          switch (_f.label) {
             case 0:
               panelProps = this.props.panelProps;
               groupSource = this.state.groupSource;
@@ -341,10 +343,10 @@ function (_super) {
 
               _a = (groupSource[index] || {}).prodIds, prodIds = _a === void 0 ? '' : _a;
               newData = [];
-              _e.label = 1;
+              _f.label = 1;
 
             case 1:
-              _e.trys.push([1, 5,, 6]);
+              _f.trys.push([1, 5,, 6]);
 
               if (!(groupSource.length > 0)) return [3
               /*break*/
@@ -358,22 +360,22 @@ function (_super) {
 
               return [4
               /*yield*/
-              , (0, _commonUtil.commonFetch)('/designer/v1/h5/nuri/distribute/product', {
+              , (0, _commonUtil.commonFetch)('/designer/v1/h5/nuri/distribute/product/es/page', {
                 affiliateProductIds: prodIds,
                 pageIndex: 1,
                 pageSize: prodIds.split(',').length || 20
-              }, 'GET')];
+              }, 'POST')];
 
             case 2:
-              res = _e.sent();
-              newData = __spreadArrays(res.list);
+              res = _f.sent();
+              newData = __spreadArrays((_e = res.pageInfo) === null || _e === void 0 ? void 0 : _e.list);
               return [3
               /*break*/
               , 4];
 
             case 3:
               newData = [];
-              _e.label = 4;
+              _f.label = 4;
 
             case 4:
               return [3
@@ -381,7 +383,7 @@ function (_super) {
               , 6];
 
             case 5:
-              e_1 = _e.sent();
+              e_1 = _f.sent();
               newData = [];
               return [3
               /*break*/

package/{lib/composite-comp/dito → es/composite-comp/nuri}/components/AffiliateRecommend/pc/index.js

@@ -309,8 +309,10 @@ function (_super) {
 
         var _this = this;
 
-        return __generator(this, function (_e) {
-          switch (_e.label) {
+        var _e;
+
+        return __generator(this, function (_f) {
+          switch (_f.label) {
             case 0:
               panelProps = this.props.panelProps;
               groupSource = this.state.groupSource;
@@ -336,10 +338,10 @@ function (_super) {
 
               _a = (groupSource[index] || {}).prodIds, prodIds = _a === void 0 ? '' : _a;
               newData = [];
-              _e.label = 1;
+              _f.label = 1;
 
             case 1:
-              _e.trys.push([1, 5,, 6]);
+              _f.trys.push([1, 5,, 6]);
 
               if (!(groupSource.length > 0)) return [3
               /*break*/
@@ -353,22 +355,22 @@ function (_super) {
 
               return [4
               /*yield*/
-              , (0, _commonUtil.commonFetch)('/designer/v1/h5/nuri/distribute/product', {
+              , (0, _commonUtil.commonFetch)('/designer/v1/h5/nuri/distribute/product/es/page', {
                 affiliateProductIds: prodIds,
                 pageIndex: 1,
                 pageSize: prodIds.split(',').length || 20
-              }, 'GET')];
+              }, 'POST')];
 
             case 2:
-              res = _e.sent();
-              newData = __spreadArrays(res.list);
+              res = _f.sent();
+              newData = __spreadArrays((_e = res.pageInfo) === null || _e === void 0 ? void 0 : _e.list);
               return [3
               /*break*/
               , 4];
 
             case 3:
               newData = [];
-              _e.label = 4;
+              _f.label = 4;
 
             case 4:
               return [3
@@ -376,7 +378,7 @@ function (_super) {
               , 6];
 
             case 5:
-              e_1 = _e.sent();
+              e_1 = _f.sent();
               newData = [];
               return [3
               /*break*/

package/{lib/composite-comp/dito → es/composite-comp/nuri}/config-panels/AffiliateRecommendConfig/RecommendConfigGroup/index.js

@@ -15,7 +15,7 @@ var _Button = _interopRequireDefault(require("../../../../../common/Button"));
 
 var _GroupList = _interopRequireDefault(require("../../../../../common/GroupList"));
 
-var _defaultJSON = require("../../../components/Recommend/defaultJSON");
+var _defaultJSON = require("../../../../dito/components/Recommend/defaultJSON");
 
 var _coreUtil = require("../../../../../utils/coreUtil");
 

package/es/constants/component-types.js

@@ -41,7 +41,7 @@ var _SignBoard = _interopRequireDefault(require("../composite-comp/dito/componen
 
 var _Recommend = _interopRequireDefault(require("../composite-comp/dito/components/Recommend"));
 
-var _AffiliateRecommend = _interopRequireDefault(require("../composite-comp/dito/components/AffiliateRecommend"));
+var _AffiliateRecommend = _interopRequireDefault(require("../composite-comp/nuri/components/AffiliateRecommend"));
 
 var _MobileNavigation = _interopRequireDefault(require("../composite-comp/dito/components/MobileNavigation"));
 
@@ -93,7 +93,7 @@ var _SignBoardConfig = _interopRequireDefault(require("../composite-comp/dito/co
 
 var _RecommendConfig = _interopRequireDefault(require("../composite-comp/dito/config-panels/RecommendConfig"));
 
-var _AffiliateRecommendConfig = _interopRequireDefault(require("../composite-comp/dito/config-panels/AffiliateRecommendConfig"));
+var _AffiliateRecommendConfig = _interopRequireDefault(require("../composite-comp/nuri/config-panels/AffiliateRecommendConfig"));
 
 var _MobileNavigationConfig = _interopRequireDefault(require("../composite-comp/dito/config-panels/MobileNavigationConfig"));
 
@@ -131,7 +131,7 @@ var _WalletNuriSecondConfig = _interopRequireDefault(require("../composite-comp/
 
 var _RecommendSecondConfig = _interopRequireDefault(require("../composite-comp/dito/second-config-panels/RecommendSecondConfig"));
 
-var _AffiliateRecommendSecondConfig = _interopRequireDefault(require("../composite-comp/dito/second-config-panels/AffiliateRecommendSecondConfig"));
+var _AffiliateRecommendSecondConfig = _interopRequireDefault(require("../composite-comp/nuri/second-config-panels/AffiliateRecommendSecondConfig"));
 
 var _MobileNavigationSecondConfig = _interopRequireDefault(require("../composite-comp/dito/second-config-panels/MobileNavigationSecondConfig"));
 

package/es/constants/index.js

@@ -84,6 +84,7 @@ var urlTypeMap = {
   MINI_APP: 'MiniApp',
   STORE: 'Store',
   AFFILIATE_PRODUCT: 'AffiliateProduct',
+  AFFILIATE_STORE: 'AffiliateStore',
   ANCHOR: 'Anchor'
 };
 exports.urlTypeMap = urlTypeMap;

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

@@ -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/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/decorator/index.js

@@ -55,11 +55,14 @@ function shouldUpdate() {
     descriptor.value = function (nextProps, nextState) {
       var nowPropsJson = JSON.stringify(nextProps);
       var nowStateJson = JSON.stringify(nextState);
+      var nowDevice = window.magicDesign.device;
       var should1 = nowPropsJson != this.preProps;
       var should2 = nowStateJson != this.preState;
+      var should3 = nowDevice != this.preDevice;
       this.preProps = nowPropsJson;
       this.preState = nowStateJson;
-      var result = should1 || should2;
+      this.preDevice = nowDevice;
+      var result = should1 || should2 || should3;
       return result && fn.apply(this, {
         nextProps: nextProps
       });