@fonixtree/magic-design 0.0.81 → 0.0.83

package/es/composite-comp/bol/components/Carousel/pc/index.less

@@ -1,30 +1,30 @@
 .m-carousel-pc {
   position: relative;
-  overflow-x: auto;
   width: 100%;
 
   .content {
     display: flex;
-    width: fit-content;
     margin: 0 auto;
   }
 
   .carousel-icon-left {
-    float: left;
-    margin-left: 10px;
+    margin-right: 20px;
+    cursor: pointer;
   }
 
   .carousel-icon-right {
-    float: right;
-    margin-right: 10px;
+    margin-left: 20px;
+    cursor: pointer;
   }
 
   .slider-wrap {
-    width: 100%;
-    padding: 30px 0;
+    width: calc(100% - 72px);
     margin: 0 auto;
+    line-height: 1;
 
     .img-wrap {
+      overflow-x: auto;
+
       .img {
         width: fit-content;
         height: fit-content;
@@ -46,6 +46,7 @@
 
       .tags {
         margin-top: 8px;
+        margin-bottom: 12px;
         display: flex;
         flex-direction: row;
         align-items: center;
@@ -70,7 +71,7 @@
   .swiper-ban {
     position: absolute;
     width: 100%;
-    bottom: 0;
+    bottom: 10px;
     left: 0;
     right: 0;
     display: flex;

package/es/composite-comp/bol/components/ImageText/defaultJSON.js

@@ -103,6 +103,20 @@ var ImageTextGroupSourceJSON = function ImageTextGroupSourceJSON() {
         iconUrl: '',
         layout: 'right'
       },
+      spacing: {
+        pc: {
+          paddingTop: 6,
+          paddingBottom: 6,
+          paddingLeft: 10,
+          paddingRight: 10
+        },
+        mobile: {
+          paddingTop: 6,
+          paddingBottom: 6,
+          paddingLeft: 10,
+          paddingRight: 10
+        }
+      },
       hover: {
         open: false,
         content: {
@@ -125,10 +139,6 @@ var ImageTextGroupSourceJSON = function ImageTextGroupSourceJSON() {
           iconUrl: '',
           layout: 'right'
         }
-      },
-      spacing: {
-        pc: {},
-        mobile: {}
       }
     },
     secondButton: {
@@ -158,6 +168,20 @@ var ImageTextGroupSourceJSON = function ImageTextGroupSourceJSON() {
         iconUrl: '',
         layout: 'right'
       },
+      spacing: {
+        pc: {
+          paddingTop: 6,
+          paddingBottom: 6,
+          paddingLeft: 10,
+          paddingRight: 10
+        },
+        mobile: {
+          paddingTop: 6,
+          paddingBottom: 6,
+          paddingLeft: 10,
+          paddingRight: 10
+        }
+      },
       hover: {
         open: false,
         content: {
@@ -180,10 +204,6 @@ var ImageTextGroupSourceJSON = function ImageTextGroupSourceJSON() {
           iconUrl: '',
           layout: 'right'
         }
-      },
-      spacing: {
-        pc: {},
-        mobile: {}
       }
     },
     background: {

package/es/composite-comp/bol/components/ImageText/mobile/index.js

@@ -123,6 +123,7 @@ function (_super) {
       cardBtnStyle.justifyContent = _AlignSelector.alignItemMap[data.customize.align];
     }
 
+    console.log('source', data);
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: (0, _classnames["default"])('image-text-mobile', data.customize.layout.h5Layout),
       style: wrapStyle

package/es/composite-comp/bol/components/Newsletter/index.less

@@ -16,7 +16,7 @@
       input {
         border: 1px solid #D2D9E5;
         width: 600px;
-        height: 56px;
+        height: 50px;
         padding: 0 20px;
         border-radius: 8px;
         background-color: #fff;

package/es/composite-comp/bol/config-panels/ButtonCompConfig/ButtonConfigGroup/index.js

@@ -21,6 +21,8 @@ require("./index.less");
 
 var _locale = require("../../../../../locale");
 
+var _decorator = require("../../../../../decorator");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 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); }
@@ -98,7 +100,7 @@ function (_super) {
         className: "card_wrap"
       }, /*#__PURE__*/_react["default"].createElement("div", {
         className: "name"
-      }, "Button Name"));
+      }, src.button.text));
     };
 
     return _this;
@@ -133,7 +135,7 @@ function (_super) {
   AComponent.defaultProps = {
     source: []
   };
-  AComponent = __decorate([(0, _mobxReact.inject)('store'), _mobxReact.observer], AComponent);
+  AComponent = __decorate([(0, _mobxReact.inject)('store'), _mobxReact.observer, _decorator.updateConfigDecorator], AComponent);
   return AComponent;
 }(_react["default"].Component);
 

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

@@ -47,7 +47,6 @@ function CarouselConfig(props) {
       key: '3',
       name: (0, _locale.i18n)('SPACING'),
       value: /*#__PURE__*/_react["default"].createElement(_SpacingConfig["default"], {
-        configWidth: true,
         data: data.spacing
       })
     }, {

package/es/composite-comp/bol/config-panels/TagCompConfig/TagConfigGroup/index.js

@@ -21,6 +21,8 @@ require("./index.less");
 
 var _locale = require("../../../../../locale");
 
+var _decorator = require("../../../../../decorator");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 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); }
@@ -98,7 +100,7 @@ function (_super) {
         className: "card_wrap"
       }, /*#__PURE__*/_react["default"].createElement("div", {
         className: "name"
-      }, "Button Tag"));
+      }, src.button.text));
     };
 
     return _this;
@@ -133,7 +135,7 @@ function (_super) {
   AComponent.defaultProps = {
     source: []
   };
-  AComponent = __decorate([(0, _mobxReact.inject)('store'), _mobxReact.observer], AComponent);
+  AComponent = __decorate([(0, _mobxReact.inject)('store'), _mobxReact.observer, _decorator.updateConfigDecorator], AComponent);
   return AComponent;
 }(_react["default"].Component);
 

package/es/composite-comp/common/components/ProductItem/index.less

@@ -4,6 +4,7 @@
   background: #FFFFFF;
   border: 1px solid #D2D9E5;
   width: 142px;
+  margin: 0 auto;
   cursor: pointer;
 
   .img-wrap {

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

@@ -62,7 +62,6 @@ function (_super) {
 
     var _a = this.props,
         data = _a.data,
-        configPaddingLR = _a.configPaddingLR,
         configCompSpace = _a.configCompSpace,
         configWidth = _a.configWidth;
     var obj = data[window.magicDesign.device] || {};
@@ -107,7 +106,7 @@ function (_super) {
         _this.selfRender();
       },
       value: obj.paddingBottom || 0
-    })), configPaddingLR && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
+    })), /*#__PURE__*/_react["default"].createElement("div", {
       className: "padding-item"
     }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
       type: "icon-padding-left"
@@ -129,7 +128,7 @@ function (_super) {
         _this.selfRender();
       },
       value: obj.paddingRight || 0
-    }))))), configCompSpace && /*#__PURE__*/_react["default"].createElement(_common.Field, {
+    })))), configCompSpace && /*#__PURE__*/_react["default"].createElement(_common.Field, {
       title: (0, _locale.i18n)('COMPONENT_SPACING')
     }, /*#__PURE__*/_react["default"].createElement(_common.Slider, {
       maxVal: 100,
@@ -146,7 +145,6 @@ function (_super) {
   };
 
   SpacingConfig.defaultProps = {
-    configPaddingLR: true,
     configCompSpace: true,
     configWidth: false,
     data: {

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

@@ -104,8 +104,7 @@ var getDefaultJSON = function getDefaultJSON() {
           fontWeight: 600,
           fontSize: 8,
           fontStyle: 'normal',
-          color: '#fff',
-          padding: '0 5px'
+          color: '#fff'
         },
         buttonBorder: {
           open: true,
@@ -114,16 +113,16 @@ var getDefaultJSON = function getDefaultJSON() {
         },
         spacing: {
           pc: {
-            paddingTop: 2,
-            paddingBottom: 2,
-            paddingLeft: 3,
-            paddingRight: 3
+            paddingTop: 0,
+            paddingBottom: 0,
+            paddingLeft: 4,
+            paddingRight: 4
           },
           mobile: {
-            paddingTop: 2,
-            paddingBottom: 2,
-            paddingLeft: 3,
-            paddingRight: 3
+            paddingTop: 0,
+            paddingBottom: 0,
+            paddingLeft: 4,
+            paddingRight: 4
           }
         },
         buttonIcon: {

package/es/composite-comp/dito/components/PcNavigation/pc/index.less

@@ -6,6 +6,7 @@
     width: fit-content;
     display: flex;
     align-items: center;
+    min-width: 130px;
 
     &:hover {
       @keyframes show-active{
@@ -89,8 +90,15 @@
   .category-group {
     margin-left: 180px;
     display: flex;
+    overflow-x: scroll;
+    flex: 1;
+    scroll-snap-type: x;
     .one-category {
       margin-right: 44px;
+      scroll-snap-align: end;
+      &:last-of-type {
+        margin-right: 0;
+      }
     }
   }
 

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

@@ -229,7 +229,7 @@ var __spreadArrays = void 0 && (void 0).__spreadArrays || function () {
 var LAYOUT_IMAGE_SIZE = {
   layout1: {
     w: '100%',
-    h: 164
+    h: ''
   },
   layout2: {
     w: 100,
@@ -237,7 +237,7 @@ var LAYOUT_IMAGE_SIZE = {
   },
   layout3: {
     w: '100%',
-    h: 104
+    h: ''
   },
   layout4: {
     w: 96,
@@ -568,12 +568,15 @@ function (_super) {
       return groupSource[tabIndex].seeAll;
     }, '');
 
-    var imgHeight = (0, _commonUtil.ensure)(function () {
-      return LAYOUT_IMAGE_SIZE[layout].h;
-    }, 140);
     var imgWidth = (0, _commonUtil.ensure)(function () {
       return LAYOUT_IMAGE_SIZE[layout].w;
     }, 140);
+    var imgHeight = (0, _commonUtil.ensure)(function () {
+      return LAYOUT_IMAGE_SIZE[layout].h;
+    }, 140);
+    var macyContainerDom = document.querySelector('.m-recommend-mobile');
+    if (layout === 'layout1' && macyContainerDom) imgHeight = (macyContainerDom.clientWidth - 32) / 2 - 6;
+    if (layout === 'layout3' && macyContainerDom) imgHeight = (macyContainerDom.clientWidth - 32) / 3 - 8;
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "m-recommend-mobile",
       style: bgStyle

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

@@ -233,7 +233,7 @@ var __spreadArrays = void 0 && (void 0).__spreadArrays || function () {
 var LAYOUT_IMAGE_SIZE = {
   layout1: {
     w: '100%',
-    h: 180
+    h: ''
   },
   layout2_col6: {
     w: 160,
@@ -636,12 +636,14 @@ function (_super) {
       return groupSource[tabIndex].seeAll;
     }, '');
 
-    var imgHeight = (0, _commonUtil.ensure)(function () {
-      return layout === 'layout1' ? LAYOUT_IMAGE_SIZE[layout].h : LAYOUT_IMAGE_SIZE[layout + "_col" + panelProps.customize.pcRowNum].h;
-    }, 140);
     var imgWidth = (0, _commonUtil.ensure)(function () {
       return layout === 'layout1' ? LAYOUT_IMAGE_SIZE[layout].w : LAYOUT_IMAGE_SIZE[layout + "_col" + panelProps.customize.pcRowNum].w;
     }, 140);
+    var imgHeight = (0, _commonUtil.ensure)(function () {
+      return layout === 'layout1' ? LAYOUT_IMAGE_SIZE[layout].h : LAYOUT_IMAGE_SIZE[layout + "_col" + panelProps.customize.pcRowNum].h;
+    }, 140);
+    var macyContainerDom = document.querySelector('.tab-list');
+    if (layout === 'layout1' && macyContainerDom) imgHeight = (macyContainerDom.clientWidth - 12 * (panelProps.customize.pcRowNum - 1)) / panelProps.customize.pcRowNum;
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "m-recommend-pc",
       style: bgStyle

package/es/composite-comp/dito/components/Recommend/pc/index.less

@@ -31,6 +31,7 @@
       justify-content: center;
       white-space: nowrap;
       flex-direction: column;
+      cursor: pointer;
 
       img {
         height: 16px;

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

@@ -42,7 +42,7 @@ var getDefaultJSON = function getDefaultJSON() {
         open: true,
         color: {
           pc: '#D92929',
-          mobile: '#232F46'
+          mobile: '#8493AF'
         }
       },
       icon: {
@@ -50,7 +50,7 @@ var getDefaultJSON = function getDefaultJSON() {
         open: true,
         color: {
           pc: '#D92929',
-          mobile: '#8493AF'
+          mobile: '#232F46'
         }
       }
     },

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

@@ -47,7 +47,6 @@ function FlashDealConfig(props) {
       name: (0, _locale.i18n)('SPACING'),
       value: /*#__PURE__*/_react["default"].createElement(_SpacingConfig["default"], {
         configCompSpace: true,
-        configPaddingLR: false,
         data: data.spacing
       })
     }, {

package/es/composite-comp/dito/config-panels/RecommendConfig/RecommendConfigGroup/index.js

@@ -82,7 +82,7 @@ function (_super) {
     };
 
     _this.onAddClick = function () {
-      var json = (0, _defaultJSON.recommendGroupSourceJSON)('', 'Tab');
+      var json = (0, _defaultJSON.recommendGroupSourceJSON)(_this.props.id, '', 'Tab');
 
       _this.props.source.push(json);
 

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

@@ -86,6 +86,7 @@ function (_super) {
     var _this = this;
 
     var data = this.props.data;
+    console.log('data', data);
     return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_Collapse["default"], {
       divider: "bold",
       headerSize: "large",
@@ -93,6 +94,7 @@ function (_super) {
         key: '1',
         name: (0, _locale.i18n)('GROUP'),
         value: /*#__PURE__*/_react["default"].createElement(_RecommendConfigGroup["default"], {
+          id: data.id,
           source: data.groupSource
         })
       }, {

package/es/core/Designer/CompListPanel/CompCard/index.js

@@ -9,6 +9,8 @@ var _react = _interopRequireDefault(require("react"));
 
 var _Iconfont = _interopRequireDefault(require("../../../../common/Iconfont"));
 
+var _constants = require("../../../../constants");
+
 require("./index.less");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -24,7 +26,7 @@ function CompCard(_a) {
     className: "comp-info"
   }, /*#__PURE__*/_react["default"].createElement("span", null, /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
     className: "comp-icon",
-    type: icon
+    type: icon || _constants.compInfoMap[type].icon
   }), /*#__PURE__*/_react["default"].createElement("span", {
     className: "comp-name"
   }, label)), /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {

package/es/core/Designer/CompListPanel/index.js

@@ -109,13 +109,13 @@ function (_super) {
       className: "title"
     }, (0, _locale.i18n)('ADD_COMPONENT')), /*#__PURE__*/_react["default"].createElement("div", {
       className: "component-list"
-    }, Object.keys(compSource).map(function (compCat) {
+    }, compSource.map(function (compCat) {
       return /*#__PURE__*/_react["default"].createElement("div", {
-        key: compCat,
+        key: compCat.moduleCatgId,
         className: "cat-list"
       }, /*#__PURE__*/_react["default"].createElement("h5", {
         className: "cat-name"
-      }, compCat, "(", "" + compSource[compCat].length, ")"), compSource[compCat].map(function (comp) {
+      }, compCat.category, "(", "" + (compCat.modules ? compCat.modules.length : '0'), ")"), compCat.modules && compCat.modules.map(function (comp) {
         return (0, _coreUtil.isActiveFloor)(comp.terminalType) ? /*#__PURE__*/_react["default"].createElement(_CompCard["default"], _extends({}, comp, {
           key: comp.moduleId,
           onAdd: function onAdd() {

package/es/decorator/compositeDecorator.js

@@ -90,13 +90,13 @@ function compositeDecorator(WrappedComponent) {
       };
 
       _this.getStyle = function () {
+        var nodeData = _this.props.nodeData;
         var wrapStyle = {
           border: 'none'
         };
         var _a = window.magicDesign,
             device = _a.device,
             mode = _a.mode;
-        var nodeData = _this.props.nodeData;
         var spacing = nodeData.spacing,
             background = nodeData.background; // 处理复合组件的选中状态
 
@@ -107,22 +107,25 @@ function compositeDecorator(WrappedComponent) {
           if (nodeData.id === _this.state.clickedFloor) {
             wrapStyle.border = '1px dashed red';
           }
-        } // 边距
+        } // banner的padding和background单独处理
 
 
-        if (spacing && spacing[device]) {
-          wrapStyle = __assign(__assign({}, wrapStyle), spacing[device]);
-        } // 背景
+        if (nodeData.type != 'BANNER') {
+          // 边距
+          if (spacing && spacing[device]) {
+            wrapStyle = __assign(__assign({}, wrapStyle), spacing[device]);
+          } // 背景
 
 
-        if (background) {
-          if (background.bgType === 'color') {
-            wrapStyle.backgroundColor = background.color;
-            wrapStyle.opacity = background.opacity ? background.opacity : 1;
-          } else {
-            wrapStyle.backgroundImage = "url(" + background.image + ")";
-            wrapStyle.backgroundPosition = 'center';
-            wrapStyle.backgroundSize = 'cover';
+          if (background) {
+            if (background.bgType === 'color') {
+              wrapStyle.backgroundColor = background.color;
+              wrapStyle.opacity = background.opacity ? background.opacity : 1;
+            } else {
+              wrapStyle.backgroundImage = "url(" + background.image + ")";
+              wrapStyle.backgroundPosition = 'center';
+              wrapStyle.backgroundSize = 'cover';
+            }
           }
         }
 

package/es/locale/en/en.json

@@ -32,8 +32,8 @@
   "BACKGROUND": "Background",
   "PLACEHOLDER": "Placeholder",
   "FONT_STYLE": "Font Style",
-  "FONT_FAMILY": "font Family",
-  "FONT_WEIGHT": "font Weight",
+  "FONT_FAMILY": "Font Family",
+  "FONT_WEIGHT": "Font Weight",
   "FONT_SIZE": "Font Size",
   "LINE_SPACING": "Line Spacing",
   "LINE_COLOR": "Line Color",

package/es/locale/id/id.json

@@ -32,8 +32,8 @@
   "BACKGROUND": "Background",
   "PLACEHOLDER": "Placeholder",
   "FONT_STYLE": "Font Style",
-  "FONT_FAMILY": "font Family",
-  "FONT_WEIGHT": "font Weight",
+  "FONT_FAMILY": "Font Family",
+  "FONT_WEIGHT": "Font Weight",
   "FONT_SIZE": "Font Size",
   "LINE_SPACING": "Line Spacing",
   "LINE_COLOR": "Line Color",

package/es/meta-comp/components/Image/index.js

@@ -78,6 +78,7 @@ function (_super) {
           hoverState = _a.hoverState,
           maxHeight = _a.maxHeight,
           maxWidth = _a.maxWidth,
+          minHeight = _a.minHeight,
           minWidth = _a.minWidth,
           limitWidthHeight = _a.limitWidthHeight,
           scale = _a.scale;
@@ -97,6 +98,10 @@ function (_super) {
         obj.maxWidth = maxWidth;
       }
 
+      if (minHeight) {
+        obj.minHeight = minHeight;
+      }
+
       if (minWidth) {
         obj.minWidth = minWidth;
       }

package/es/meta-comp/components/Image/index.less

@@ -16,8 +16,8 @@
 
   &.backgroundImg {
     &>img {
-      // object-fit: cover;
-      width: auto;
+      object-fit: cover;
+      // width: auto;
       max-width: none;
     }
   }

package/es/meta-comp/components/Text/index.less

@@ -1,5 +1,6 @@
 .m-meta-text {
   display: block;
+  margin: 0 auto;
 
   .select-container {
     position: relative;

package/es/utils/businessUtil.js

@@ -20,7 +20,7 @@ var parseUrl = function parseUrl(url) {
   switch (type) {
     // 商品详情
     case _constants.urlType.PRODUCT_DETAIL:
-      pcLink = "/offer-detail/" + arg1;
+      pcLink = "/product/detail/" + arg1 + "?productId=" + (arg2 !== null && arg2 !== void 0 ? arg2 : '');
       h5Link = "/product/detail/" + arg1 + "?productId=" + (arg2 !== null && arg2 !== void 0 ? arg2 : '');
       params = {
         type: 'PROD_DETAIL',
@@ -33,7 +33,7 @@ var parseUrl = function parseUrl(url) {
 
     case _constants.urlType.CATG_PROD_LIST:
       // 商品列表
-      pcLink = "/offer-list/catg/" + arg1;
+      pcLink = "/product/list/" + arg1;
       h5Link = "/product/list/" + arg1;
       params = {
         type: 'PROD_LIST',
@@ -57,7 +57,7 @@ var parseUrl = function parseUrl(url) {
 
     case _constants.urlType.CUSTOMIZED:
       // 自定义页面
-      pcLink = "/promotion/" + arg1;
+      pcLink = "/group/" + arg1;
       h5Link = "/group/" + arg1;
       params = {
         type: 'CUSTOMIZED',