@fonixtree/magic-design 1.0.4 → 1.0.6

package/es/composite-comp/bol/second-config-panels/CarouselSecondConfig/index.js

@@ -74,11 +74,188 @@ function (_super) {
     var _this = _super !== null && _super.apply(this, arguments) || this;
 
     _this.state = {};
+
+    _this.getImageRecommendSize = function (customize) {
+      var obj = null;
+
+      if ((0, _coreUtil.isPc)()) {
+        if ((customize === null || customize === void 0 ? void 0 : customize.layout) == 'layout3') {
+          switch (customize === null || customize === void 0 ? void 0 : customize.pcRowNum) {
+            case 6:
+              obj = {
+                width: 149,
+                height: 120
+              };
+              break;
+
+            case 5:
+              obj = {
+                width: 183,
+                height: 147
+              };
+              break;
+
+            case 4:
+              obj = {
+                width: 233,
+                height: 188
+              };
+              break;
+
+            case 3:
+              obj = {
+                width: 315,
+                height: 256
+              };
+              break;
+
+            case 2:
+              obj = {
+                width: 478,
+                height: 393
+              };
+              break;
+
+            case 1:
+              obj = {
+                width: 960,
+                height: 680
+              };
+              break;
+          }
+        } else {
+          switch (customize === null || customize === void 0 ? void 0 : customize.pcRowNum) {
+            case 6:
+              obj = {
+                width: 159,
+                height: 120
+              };
+              break;
+
+            case 5:
+              obj = {
+                width: 195,
+                height: 147
+              };
+              break;
+
+            case 4:
+              obj = {
+                width: 251,
+                height: 188
+              };
+              break;
+
+            case 3:
+              obj = {
+                width: 341,
+                height: 256
+              };
+              break;
+
+            case 2:
+              obj = {
+                width: 524,
+                height: 393
+              };
+              break;
+
+            case 1:
+              obj = {
+                width: 1072,
+                height: 680
+              };
+              break;
+          }
+        }
+      } else {
+        if ((customize === null || customize === void 0 ? void 0 : customize.layout) == 'layout3') {
+          switch (customize === null || customize === void 0 ? void 0 : customize.rowNum) {
+            case 5:
+              obj = {
+                width: 64,
+                height: 50
+              };
+              break;
+
+            case 4:
+              obj = {
+                width: 77,
+                height: 66
+              };
+              break;
+
+            case 3:
+              obj = {
+                width: 105,
+                height: 87
+              };
+              break;
+
+            case 2:
+              obj = {
+                width: 160,
+                height: 137
+              };
+              break;
+
+            case 1:
+              obj = {
+                width: 327,
+                height: 282
+              };
+              break;
+          }
+        } else {
+          switch (customize === null || customize === void 0 ? void 0 : customize.rowNum) {
+            case 5:
+              obj = {
+                width: 66,
+                height: 50
+              };
+              break;
+
+            case 4:
+              obj = {
+                width: 85,
+                height: 66
+              };
+              break;
+
+            case 3:
+              obj = {
+                width: 117,
+                height: 87
+              };
+              break;
+
+            case 2:
+              obj = {
+                width: 182,
+                height: 137
+              };
+              break;
+
+            case 1:
+              obj = {
+                width: 375,
+                height: 282
+              };
+              break;
+          }
+        }
+      }
+
+      return obj;
+    };
+
     return _this;
   }
 
   CarouselSecondConfig.prototype.render = function () {
-    var panelProps = this.props.panelProps;
+    var _a = this.props,
+        panelProps = _a.panelProps,
+        parentNode = _a.parentNode;
     var textSource = [{
       key: '2',
       name: (0, _locale.i18n)('TITLE'),
@@ -118,6 +295,8 @@ function (_super) {
 
     var _textSource = _mobx.store.CarouselStore[panelProps.compId] === 'layout2' ? textSource : [];
 
+    var size = this.getImageRecommendSize(parentNode.customize);
+
     var getConfig = function getConfig() {
       return /*#__PURE__*/_react["default"].createElement(_Collapse["default"], {
         headerSize: "middle",
@@ -128,7 +307,8 @@ function (_super) {
           key: '1',
           name: (0, _locale.i18n)('IMAGE'),
           value: /*#__PURE__*/_react["default"].createElement(_ImageConfig["default"], {
-            data: panelProps.image
+            data: panelProps.image,
+            recommendImgSize: size
           }),
           metaOption: panelProps.image,
           toggleType: 'switch'

package/es/composite-comp/bol/second-config-panels/ImageGallerySecondConfig/index.js

@@ -9,6 +9,8 @@ var _react = _interopRequireDefault(require("react"));
 
 var _ImageConfig = _interopRequireDefault(require("../../../../meta-comp/config-panels/ImageConfig"));
 
+var _coreUtil = require("../../../../utils/coreUtil");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var __extends = void 0 && (void 0).__extends || function () {
@@ -46,18 +48,128 @@ function (_super) {
     var _this = _super !== null && _super.apply(this, arguments) || this;
 
     _this.state = {};
+
+    _this.getImageRecommendSize = function (customize) {
+      var _a, _b;
+
+      var obj = null;
+
+      if ((0, _coreUtil.isPc)()) {
+        switch ((_a = customize === null || customize === void 0 ? void 0 : customize.layout) === null || _a === void 0 ? void 0 : _a.pcLayout) {
+          case 'layout1':
+            obj = {
+              width: 1440,
+              height: 912
+            };
+            break;
+
+          case 'layout2':
+            {
+              switch (customize === null || customize === void 0 ? void 0 : customize.pcRowNum) {
+                case 6:
+                  obj = {
+                    width: 220,
+                    height: 166
+                  };
+                  break;
+
+                case 5:
+                  obj = {
+                    width: 268,
+                    height: 202
+                  };
+                  break;
+
+                case 4:
+                  obj = {
+                    width: 342,
+                    height: 256
+                  };
+                  break;
+
+                case 3:
+                  obj = {
+                    width: 464,
+                    height: 348
+                  };
+                  break;
+
+                case 2:
+                  obj = {
+                    width: 708,
+                    height: 531
+                  };
+                  break;
+              }
+
+              break;
+            }
+        }
+      } else {
+        switch ((_b = customize === null || customize === void 0 ? void 0 : customize.layout) === null || _b === void 0 ? void 0 : _b.h5Layout) {
+          case 'layout1':
+            obj = {
+              width: 375,
+              height: 282
+            };
+            break;
+
+          case 'layout2':
+            {
+              switch (customize === null || customize === void 0 ? void 0 : customize.rowNum) {
+                case 5:
+                  obj = {
+                    width: 69,
+                    height: 50
+                  };
+                  break;
+
+                case 4:
+                  obj = {
+                    width: 85,
+                    height: 66
+                  };
+                  break;
+
+                case 3:
+                  obj = {
+                    width: 117,
+                    height: 87
+                  };
+                  break;
+
+                case 2:
+                  obj = {
+                    width: 182,
+                    height: 137
+                  };
+                  break;
+              }
+
+              break;
+            }
+        }
+      }
+
+      return obj;
+    };
+
     return _this;
   }
 
   ImageGallerySecondConfig.prototype.render = function () {
-    var panelProps = this.props.panelProps;
+    var _a = this.props,
+        panelProps = _a.panelProps,
+        parentNode = _a.parentNode;
+    var size = this.getImageRecommendSize(parentNode.customize);
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "image_gallery_second_conf_wrap",
       style: {
         marginTop: '20px'
       }
     }, /*#__PURE__*/_react["default"].createElement(_ImageConfig["default"], {
-      data: panelProps.image
+      data: panelProps.image,
+      recommendImgSize: size
     }));
   };
 

package/es/composite-comp/bol/second-config-panels/ImageTextSecondConfig/index.js

@@ -81,13 +81,123 @@ function (_super) {
 
     _this.state = {};
 
+    _this.getImageRecommendSize = function (customize) {
+      var _a, _b, _c;
+
+      var obj = null;
+
+      if ((0, _coreUtil.isPc)()) {
+        if (((_a = customize === null || customize === void 0 ? void 0 : customize.layout) === null || _a === void 0 ? void 0 : _a.pcLayout) == 'normal' || ((_b = customize === null || customize === void 0 ? void 0 : customize.layout) === null || _b === void 0 ? void 0 : _b.pcLayout) == 'center') {
+          switch (customize === null || customize === void 0 ? void 0 : customize.pcRowNum) {
+            case 5:
+              obj = {
+                width: 119,
+                height: 90
+              };
+              break;
+
+            case 4:
+              obj = {
+                width: 150,
+                height: 112
+              };
+              break;
+
+            case 3:
+              obj = {
+                width: 205,
+                height: 154
+              };
+              break;
+
+            case 2:
+              obj = {
+                width: 314,
+                height: 236
+              };
+              break;
+
+            case 1:
+              obj = {
+                width: 640,
+                height: 480
+              };
+              break;
+          }
+        } else {
+          obj = {
+            width: 65,
+            height: 65
+          };
+        }
+      } else {
+        switch ((_c = customize === null || customize === void 0 ? void 0 : customize.layout) === null || _c === void 0 ? void 0 : _c.h5Layout) {
+          case 'normal2':
+            obj = {
+              width: 190,
+              height: 142
+            };
+            break;
+
+          case 'normal3':
+            {
+              switch (customize === null || customize === void 0 ? void 0 : customize.rowNum) {
+                case 4:
+                  obj = {
+                    width: 61,
+                    height: 61
+                  };
+                  break;
+
+                case 3:
+                  obj = {
+                    width: 91,
+                    height: 91
+                  };
+                  break;
+
+                case 2:
+                  obj = {
+                    width: 150,
+                    height: 150
+                  };
+                  break;
+
+                case 1:
+                  obj = {
+                    width: 327,
+                    height: 327
+                  };
+                  break;
+              }
+
+              break;
+            }
+
+          default:
+            obj = {
+              width: 38,
+              height: 38
+            };
+            break;
+        }
+      }
+
+      return obj;
+    };
+
     _this.getContentPanel = function (data, needHover) {
+      var parentNode = _this.props.parentNode;
+
+      var size = _this.getImageRecommendSize(parentNode.customize);
+
       var source = [{
         key: 'imageTextSecondContent1',
         name: (0, _locale.i18n)('IMAGE'),
         value: /*#__PURE__*/_react["default"].createElement(_ImageConfig["default"], {
           data: data.image,
-          needHover: needHover
+          needHover: needHover,
+          recommendImgSize: size
         }),
         metaOption: data.image
       }, {
@@ -182,7 +292,8 @@ function (_super) {
   };
 
   ImageTextSecondConfig.defaultProps = {
-    panelProps: {}
+    panelProps: {},
+    parentNode: {}
   };
   return ImageTextSecondConfig;
 }(_react["default"].Component);

package/es/composite-comp/bol/second-config-panels/VideoSecondConfig/index.js

@@ -23,6 +23,8 @@ var _ButtonConfig = _interopRequireDefault(require("../../../../meta-comp/config
 
 var _TextConfig = _interopRequireDefault(require("../../../../meta-comp/config-panels/TextConfig"));
 
+var _PlayIconConfig = _interopRequireDefault(require("../../../../meta-comp/config-panels/PlayIconConfig"));
+
 var _locale = require("../../../../locale");
 
 require("./index.less");
@@ -73,8 +75,59 @@ function (_super) {
       _this.setState({});
     };
 
+    _this.getImageRecommendSize = function (customize) {
+      var _a;
+
+      var obj = null;
+      console.log(customize);
+
+      if ((0, _coreUtil.isPc)()) {
+        switch ((_a = customize === null || customize === void 0 ? void 0 : customize.layout) === null || _a === void 0 ? void 0 : _a.pcLayout) {
+          case 'layout1':
+            obj = {
+              width: 1280,
+              height: 600
+            };
+            break;
+
+          case 'layout2':
+            obj = {
+              width: 640,
+              height: 600
+            };
+            break;
+
+          case 'layout3':
+            obj = {
+              width: 410,
+              height: 300
+            };
+            break;
+
+          default:
+            obj = {
+              width: 440,
+              height: 272
+            };
+            break;
+        }
+      } else {
+        obj = {
+          width: 343,
+          height: 212
+        };
+      }
+
+      return obj;
+    };
+
     _this.getContentPanel = function () {
-      var panelProps = _this.props.panelProps;
+      var _a = _this.props,
+          panelProps = _a.panelProps,
+          parentNode = _a.parentNode;
+
+      var size = _this.getImageRecommendSize(parentNode.customize);
+
       var source = [{
         key: '1',
         name: 'Overlay',
@@ -82,7 +135,8 @@ function (_super) {
           data: panelProps.overilay,
           needClickArea: false,
           needHover: false,
-          needURL: false
+          needURL: false,
+          recommendImgSize: size
         }),
         metaOption: panelProps.overilay
       }, {
@@ -114,12 +168,19 @@ function (_super) {
         }),
         metaOption: panelProps.title
       }, {
-        key: '5',
+        key: '6',
         name: 'Text',
         value: /*#__PURE__*/_react["default"].createElement(_TextConfig["default"], {
           data: panelProps.text
         }),
         metaOption: panelProps.text
+      }, {
+        key: '7',
+        name: 'Play Icon',
+        value: /*#__PURE__*/_react["default"].createElement(_PlayIconConfig["default"], {
+          data: panelProps.playIcon
+        }),
+        metaOption: panelProps.playIcon
       }];
       return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_common.Field, {
         title: "Select Video"

package/es/composite-comp/common/config-panels/BackgroundConfig/index.js

@@ -85,8 +85,18 @@ function (_super) {
       },
       value: data.color
     }) : /*#__PURE__*/_react["default"].createElement(_common.ImagePicker, {
-      onChange: function onChange(v) {
-        data.image = v.url;
+      imageSelectedWay: data.imageSelectedWay || {
+        pc: '',
+        mobile: ''
+      },
+      onChange: function onChange(v, way) {
+        if (v) {
+          data.image = v.url;
+        }
+
+        if (way) {
+          data.imageSelectedWay = way;
+        }
 
         _this.selfRender();
       },

package/es/composite-comp/common/config-panels/CustomizeConfig/index.js

@@ -199,7 +199,8 @@ function (_super) {
         isHideAlign = _a.isHideAlign,
         layoutSource = _a.layoutSource,
         selectedLayoutFun = _a.selectedLayoutFun,
-        showVertical = _a.showVertical;
+        showVertical = _a.showVertical,
+        defaultVertical = _a.defaultVertical;
     var showRowNum = this.state.showRowNum;
     var layoutVal = data.layout;
 
@@ -246,7 +247,7 @@ function (_super) {
 
         _this.selfRender();
       },
-      value: (data === null || data === void 0 ? void 0 : data.vertical) || 'top'
+      value: (data === null || data === void 0 ? void 0 : data.vertical) || defaultVertical
     }))), _showRowNum && /*#__PURE__*/_react["default"].createElement("div", {
       className: "selectWrap"
     }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
@@ -278,7 +279,8 @@ function (_super) {
     isHideAlign: false,
     layoutObj: null,
     component: '',
-    showVertical: false
+    showVertical: false,
+    defaultVertical: 'top'
   };
   CustomizeConfig = __decorate([(0, _mobxReact.inject)('store'), _mobxReact.observer], CustomizeConfig);
   return CustomizeConfig;