@fonixtree/magic-design 0.0.63 → 0.0.65

package/es/composite-comp/bol/components/Button/index.js

@@ -77,7 +77,7 @@ function (_super) {
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: (0, _classnames["default"])('button-comp-wrap', (_a = {}, _a[nodeData.customize.layout] = true, _a[nodeData.customize.align] = true, _a)),
       onClick: this.onComponentClick
-    }, nodeData.groupSource.map(function (m) {
+    }, nodeData.groupSource && nodeData.groupSource.map(function (m) {
       return /*#__PURE__*/_react["default"].createElement("div", {
         className: "secondary-button"
       }, /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {

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

@@ -102,8 +102,7 @@ function (_super) {
   ImageTextMobile.prototype.render = function () {
     var _this = this;
 
-    var data = this.props.data; // const { ready } = this.state;
-    // console.log('----imagetext mobile', data);
+    var data = this.props.data; // console.log('----imagetext mobile', data);
 
     var wrapStyle = {};
     wrapStyle.textAlign = data.customize.align; // if (data.background.bgType === 'color') {

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

@@ -59,8 +59,8 @@
         }
         .card-btn-wrap {
           display: flex;
-          .card-first-btn {
-            margin-right: 12px;
+          .card-second-btn {
+            margin-left: 12px;
           }
         }
       }
@@ -94,8 +94,8 @@
         }
         .card-btn-wrap {
           display: flex;
-          .card-first-btn {
-            margin-right: 12px;
+          .card-second-btn {
+            margin-left: 12px;
           }
         }
       }
@@ -135,8 +135,8 @@
         flex-direction: column;
       }
 
-      .card-second-btn {
-        margin-top: 8px;
+      .card-first-btn, .card-second-btn {
+        margin-bottom: 8px;
       }
     }
     .card-margin-bottom {
@@ -170,8 +170,8 @@
         }
         .card-btn-wrap {
           display: flex;
-          .card-first-btn {
-            margin-right: 12px;
+          .card-second-btn {
+            margin-left: 12px;
           }
         }
       }

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

@@ -11,6 +11,8 @@ require("./index.less");
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _lodash = require("lodash");
+
 var _AlignSelector = require("../../../../../common/AlignSelector");
 
 var _components = require("../../../../../meta-comp/components");
@@ -63,7 +65,7 @@ var __assign = void 0 && (void 0).__assign || function () {
 
 var maxWidthAndHeight = {
   normal: 410,
-  outside: 100,
+  outside: 86,
   center: 410
 };
 
@@ -76,17 +78,26 @@ function (_super) {
     var _this = _super !== null && _super.apply(this, arguments) || this;
 
     _this.state = {
-      hoverIndex: -1
-    }; // componentDidMount() {
-    //   this.distroy = autorun(() => {
-    //     this.setState({
-    //       clickedGroup: store.clickedGroup,
-    //     });
-    //   });
-    // }
-    // componentWillUnmount() {
-    //   this.distroy();
-    // }
+      hoverIndex: -1,
+      currentMaxWidth: 410
+    };
+
+    _this.listenCardWidth = function () {
+      var _a;
+
+      var data = _this.props.data;
+
+      try {
+        var cardWidth = ((_a = document.querySelector('.group-wrap .one-card')) === null || _a === void 0 ? void 0 : _a.offsetWidth) - 40;
+        var maxLayoutWidth = maxWidthAndHeight[data.customize.layout.pcLayout];
+
+        _this.setState({
+          currentMaxWidth: Math.min(cardWidth, maxLayoutWidth)
+        });
+      } catch (error) {
+        console.log(error);
+      }
+    };
 
     _this.calcWidth = function (num) {
       return (100 - (num - 1) * 2) / num + "%";
@@ -114,14 +125,31 @@ function (_super) {
     return _this;
   }
 
+  ImageTextPc.prototype.componentDidMount = function () {
+    var data = this.props.data;
+    this.layout = data.customize.layout.pcLayout;
+    this.listenCardWidth();
+    window.addEventListener('resize', (0, _lodash.debounce)(this.listenCardWidth));
+  };
+
+  ImageTextPc.prototype.componentWillUnmount = function () {
+    window.removeEventListener('resize', this.listenCardWidth);
+  };
+
+  ImageTextPc.prototype.componentWillReceiveProps = function (nextProps) {
+    if (nextProps.data.customize.layout.pcLayout !== this.layout) {
+      this.layout = nextProps.data.customize.layout.pcLayout;
+      this.listenCardWidth();
+    }
+  };
+
   ImageTextPc.prototype.render = function () {
     var _this = this;
 
     var data = this.props.data;
-    var hoverIndex = this.state.hoverIndex; // console.log('====================================');
-    // console.log(data);
-    // console.log('====================================');
-
+    var _a = this.state,
+        hoverIndex = _a.hoverIndex,
+        currentMaxWidth = _a.currentMaxWidth;
     var wrapStyle = {};
     wrapStyle.alignItems = _AlignSelector.alignItemMap[data.customize.align];
     return /*#__PURE__*/_react["default"].createElement("div", {
@@ -156,7 +184,7 @@ function (_super) {
         data: hoverIndex == i ? source.hover.image : source.image,
         limitWidthHeight: true,
         maxHeight: maxWidthAndHeight[data.customize.layout.pcLayout],
-        maxWidth: maxWidthAndHeight[data.customize.layout.pcLayout],
+        maxWidth: currentMaxWidth,
         scale: 0.5
       })), (source.title.open && data.customize.layout.pcLayout !== 'center' && hoverIndex != i || hoverIndex == i && source.hover.title.open && data.customize.layout.pcLayout !== 'center') && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
         className: "card-title",

package/es/composite-comp/bol/components/Tag/index.js

@@ -81,7 +81,7 @@ function (_super) {
       className: "tag-image"
     }, /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
       data: nodeData.content.image
-    })), nodeData.groupSource.map(function (m) {
+    })), nodeData.groupSource && nodeData.groupSource.map(function (m) {
       return /*#__PURE__*/_react["default"].createElement("div", {
         className: "first-button"
       }, /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {

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

@@ -164,7 +164,7 @@ function (_super) {
         }),
         metaOption: data.groupSource
       }, {
-        key: '2',
+        key: 'imageText3',
         name: (0, _locale.i18n)('SPACING'),
         value: /*#__PURE__*/_react["default"].createElement(_SpacingConfig["default"], {
           data: data.spacing
@@ -173,6 +173,7 @@ function (_super) {
         key: 'imageText4',
         name: (0, _locale.i18n)('CUSTOMIZE'),
         value: /*#__PURE__*/_react["default"].createElement(_CustomizeConfig["default"], {
+          component: "imageText",
           data: data.customize,
           layoutSource: (0, _coreUtil.isPc)() ? _layout.imageTextLayoutPc : _layout.imageTextLayoutMobile,
           selectedLayoutFun: function selectedLayoutFun(v) {

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

@@ -85,40 +85,35 @@ function (_super) {
       value: /*#__PURE__*/_react["default"].createElement(_TextConfig["default"], {
         data: panelProps.title
       }),
-      metaOption: panelProps.title,
-      toggleType: 'switch'
+      metaOption: panelProps.title
     }, {
       key: '3',
       name: (0, _locale.i18n)('TEXT'),
       value: /*#__PURE__*/_react["default"].createElement(_TextConfig["default"], {
         data: panelProps.text
       }),
-      metaOption: panelProps.text,
-      toggleType: 'switch'
+      metaOption: panelProps.text
     }, {
       key: '4',
       name: (0, _locale.i18n)('IMAGE_TAG'),
       value: /*#__PURE__*/_react["default"].createElement(_ImageConfig["default"], {
         data: panelProps.imageTag
       }),
-      metaOption: panelProps.imageTag,
-      toggleType: 'switch'
+      metaOption: panelProps.imageTag
     }, {
       key: '5',
       name: (0, _locale.i18n)('BUTTON_TAG'),
       value: /*#__PURE__*/_react["default"].createElement(_ButtonConfig["default"], {
         data: panelProps.buttonTag
       }),
-      metaOption: panelProps.buttonTag,
-      toggleType: 'switch'
+      metaOption: panelProps.buttonTag
     }, {
       key: '6',
       name: (0, _locale.i18n)('SECONDARY_BUTTON_TAG'),
       value: /*#__PURE__*/_react["default"].createElement(_ButtonConfig["default"], {
         data: panelProps.secondButtonTag
       }),
-      metaOption: panelProps.secondButtonTag,
-      toggleType: 'switch'
+      metaOption: panelProps.secondButtonTag
     }];
 
     var _textSource = _mobx.store.CarouselStore[panelProps.compId] === 'layout2' ? textSource : [];
@@ -136,7 +131,8 @@ function (_super) {
           }),
           metaOption: panelProps.image,
           toggleType: 'switch'
-        }], _textSource)
+        }], _textSource),
+        type: "switch"
       });
     };
 
@@ -149,8 +145,7 @@ function (_super) {
         key: '1',
         name: (0, _locale.i18n)('CONTENT'),
         value: getConfig()
-      }],
-      type: "triangle"
+      }]
     }));
   };
 

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

@@ -121,6 +121,21 @@ function (_super) {
         _this.props.store.setState({
           CarouselStore: __assign(__assign({}, _mobx.store.CarouselStore), (_a = {}, _a[id] = v, _a))
         });
+      } // 图文组件，移动端，只有第3个组件可选列数
+
+
+      if (component === 'imageText') {
+        if (!(0, _coreUtil.isPc)()) {
+          if (v === 'normal3') {
+            _this.setState({
+              showRowNum: true
+            });
+          } else {
+            _this.setState({
+              showRowNum: false
+            });
+          }
+        }
       } // 移动端导航特殊处理
       // 更改需求，两个布局都需 可选行数
       // if (component == 'mobileNavigation') {

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

@@ -8,11 +8,13 @@ exports.getDefaultJSON = void 0;
 var _uuid = require("uuid");
 
 var getDefaultJSON = function getDefaultJSON() {
+  var contentId = (0, _uuid.v4)();
   return {
     id: (0, _uuid.v4)(),
     type: 'FLASH_DEAL',
     title: {
       icon: {
+        id: (0, _uuid.v4)(),
         open: true,
         url: '/get/resource/platform/conf/20220722/picture/组633391550411058986147840.png'
       },
@@ -23,6 +25,7 @@ var getDefaultJSON = function getDefaultJSON() {
         specialContent: [],
         text: 'Flash Deal',
         content: {
+          sizeType: 'Customize font styles',
           fontFamily: 'Open Sans',
           fontWeight: 600,
           fontSize: 14,
@@ -48,6 +51,7 @@ var getDefaultJSON = function getDefaultJSON() {
           backgroundColor: ''
         },
         buttonText: {
+          sizeType: 'Customize font styles',
           fontFamily: 'Open Sans',
           fontWeight: 600,
           fontSize: 12,
@@ -60,6 +64,20 @@ var getDefaultJSON = function getDefaultJSON() {
           borderColor: '',
           borderRadius: 6
         },
+        spacing: {
+          pc: {
+            paddingTop: 2,
+            paddingBottom: 2,
+            paddingLeft: 5,
+            paddingRight: 5
+          },
+          mobile: {
+            paddingTop: 2,
+            paddingBottom: 2,
+            paddingLeft: 5,
+            paddingRight: 5
+          }
+        },
         buttonIcon: {
           iconUrl: '/get/resource/platform/conf/20220719/picture/icon-arrow-right-s1549371733179686912.png',
           layout: 'right'
@@ -68,9 +86,11 @@ var getDefaultJSON = function getDefaultJSON() {
       }
     },
     content: {
+      id: contentId,
       sortType: '1',
       label: {
         id: (0, _uuid.v4)(),
+        contentId: contentId,
         open: true,
         type: 'BUTTON',
         text: 'Button',
@@ -79,6 +99,7 @@ var getDefaultJSON = function getDefaultJSON() {
           backgroundColor: '#CC1D20'
         },
         buttonText: {
+          sizeType: 'Customize font styles',
           fontFamily: 'Open Sans',
           fontWeight: 600,
           fontSize: 8,
@@ -91,6 +112,20 @@ var getDefaultJSON = function getDefaultJSON() {
           borderColor: '',
           borderRadius: 7
         },
+        spacing: {
+          pc: {
+            paddingTop: 2,
+            paddingBottom: 2,
+            paddingLeft: 3,
+            paddingRight: 3
+          },
+          mobile: {
+            paddingTop: 2,
+            paddingBottom: 2,
+            paddingLeft: 3,
+            paddingRight: 3
+          }
+        },
         buttonIcon: {
           iconUrl: '',
           layout: 'right'
@@ -99,11 +134,13 @@ var getDefaultJSON = function getDefaultJSON() {
       },
       productName: {
         id: (0, _uuid.v4)(),
+        contentId: contentId,
         open: true,
         type: 'Text',
         specialContent: [],
         text: 'Flash Deal',
         content: {
+          sizeType: 'Customize font styles',
           fontFamily: 'Open Sans',
           fontWeight: 500,
           fontSize: 14,
@@ -121,11 +158,13 @@ var getDefaultJSON = function getDefaultJSON() {
       },
       activityPrice: {
         id: (0, _uuid.v4)(),
+        contentId: contentId,
         open: true,
         type: 'Text',
         specialContent: [],
         text: 'Flash Deal',
         content: {
+          sizeType: 'Customize font styles',
           fontFamily: 'Open Sans',
           fontWeight: 600,
           fontSize: 14,
@@ -143,11 +182,13 @@ var getDefaultJSON = function getDefaultJSON() {
       },
       salesPrice: {
         id: (0, _uuid.v4)(),
+        contentId: contentId,
         open: true,
         type: 'Text',
         specialContent: [],
         text: 'Flash Deal',
         content: {
+          sizeType: 'Customize font styles',
           fontFamily: 'Open Sans',
           fontWeight: 500,
           fontSize: 10,

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

@@ -264,7 +264,7 @@ function (_super) {
     })), /*#__PURE__*/_react["default"].createElement("div", {
       className: "message-wrap"
     }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
-      color: "#262626",
+      color: "#fff",
       onClick: function onClick() {
         return (0, _coreUtil.clickUrl)('/message-center');
       },

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

@@ -19,6 +19,8 @@ var _common = require("../../../../../common");
 
 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 () {
@@ -116,14 +118,22 @@ function (_super) {
           data: panelProps.salesPrice
         }),
         metaOption: panelProps.salesPrice
-      }, {
-        key: '5',
-        name: (0, _locale.i18n)('SALES_PROGRESS'),
-        value: null,
-        metaOption: panelProps.salesProgressVisible
       }],
       type: "switch"
-    }));
+    }), /*#__PURE__*/_react["default"].createElement("div", {
+      className: "sales_progress_wrap"
+    }, /*#__PURE__*/_react["default"].createElement("span", {
+      className: "label"
+    }, (0, _locale.i18n)('SALES_PROGRESS')), /*#__PURE__*/_react["default"].createElement(_antd.Switch, {
+      checked: panelProps.salesProgressVisible.open,
+      onChange: function onChange(v) {
+        panelProps.salesProgressVisible = {
+          open: v
+        };
+
+        _this.reRender();
+      }
+    })));
   };
 
   AComponent.defaultProps = {

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

@@ -0,0 +1,20 @@
+.flash_sale_content {
+
+  .sales_progress_wrap {
+    border-top: 1px solid #EDF0F4;
+    padding-top: 20px;
+    padding-bottom: 10px;
+    display: flex;
+    justify-content: space-between;
+
+    .label {
+      font-size: 16px !important;
+      line-height: 24px !important;
+      height: 24px !important;
+      font-weight: 600 !important;
+      color: #232F46;
+      font-family: 'Open Sans';
+      font-style: normal;
+    }
+  }
+}

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

@@ -21,12 +21,19 @@ var _CustomizeConfig = _interopRequireDefault(require("../../../common/config-pa
 
 var _Collapse = _interopRequireDefault(require("../../../../common/Collapse"));
 
+var _mobx = require("../../../../mobx");
+
 var _locale = require("../../../../locale");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function FlashDealConfig(props) {
   var data = props.data;
+
+  var getIsContentActive = function getIsContentActive(content) {
+    return JSON.stringify(content).includes(_mobx.store.clickedMetaParent);
+  };
+
   return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_Collapse["default"], {
     divider: "bold",
     headerSize: "large",
@@ -41,7 +48,8 @@ function FlashDealConfig(props) {
       name: (0, _locale.i18n)('CONTENT'),
       value: /*#__PURE__*/_react["default"].createElement(_FlashDealConfigContent["default"], {
         panelProps: data.content
-      })
+      }),
+      active: getIsContentActive(data.content)
     }, {
       key: '3',
       name: (0, _locale.i18n)('SPACING'),

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

@@ -15,6 +15,8 @@ var _coreUtil = require("../../../utils/coreUtil");
 
 var _decorator = require("../../../decorator");
 
+var _commonUtil = require("../../../utils/commonUtil");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -117,7 +119,27 @@ function (_super) {
       border: data.buttonBorder.open && data.buttonBorder.borderColor ? "1px solid " + data.buttonBorder.borderColor : '1px solid transparent',
       borderRadius: data.buttonBorder.open ? data.buttonBorder.borderRadius : 0
     }, data.buttonText), {
-      fontSize: window.magicDesign.device == 'pc' ? data.buttonText.pcFontSize : data.buttonText.fontSize
+      fontSize: window.magicDesign.device == 'pc' ? data.buttonText.pcFontSize : data.buttonText.fontSize,
+      paddingTop: window.magicDesign.device == 'pc' ? (0, _commonUtil.ensure)(function () {
+        return data.spacing.pc.paddingTop;
+      }, 10) : (0, _commonUtil.ensure)(function () {
+        return data.spacing.mobile.paddingTop;
+      }, 10),
+      paddingBottom: window.magicDesign.device == 'pc' ? (0, _commonUtil.ensure)(function () {
+        return data.spacing.pc.paddingBottom;
+      }, 10) : (0, _commonUtil.ensure)(function () {
+        return data.spacing.mobile.paddingBottom;
+      }, 10),
+      paddingLeft: window.magicDesign.device == 'pc' ? (0, _commonUtil.ensure)(function () {
+        return data.spacing.pc.paddingLeft;
+      }, 10) : (0, _commonUtil.ensure)(function () {
+        return data.spacing.mobile.paddingLeft;
+      }, 10),
+      paddingRight: window.magicDesign.device == 'pc' ? (0, _commonUtil.ensure)(function () {
+        return data.spacing.pc.paddingRight;
+      }, 10) : (0, _commonUtil.ensure)(function () {
+        return data.spacing.mobile.paddingRight;
+      }, 10)
     });
 
     var iconUrl = data.buttonIcon.iconUrl;

package/lib/composite-comp/bol/components/Button/index.js

@@ -77,7 +77,7 @@ function (_super) {
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: (0, _classnames["default"])('button-comp-wrap', (_a = {}, _a[nodeData.customize.layout] = true, _a[nodeData.customize.align] = true, _a)),
       onClick: this.onComponentClick
-    }, nodeData.groupSource.map(function (m) {
+    }, nodeData.groupSource && nodeData.groupSource.map(function (m) {
       return /*#__PURE__*/_react["default"].createElement("div", {
         className: "secondary-button"
       }, /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {

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

@@ -102,8 +102,7 @@ function (_super) {
   ImageTextMobile.prototype.render = function () {
     var _this = this;
 
-    var data = this.props.data; // const { ready } = this.state;
-    // console.log('----imagetext mobile', data);
+    var data = this.props.data; // console.log('----imagetext mobile', data);
 
     var wrapStyle = {};
     wrapStyle.textAlign = data.customize.align; // if (data.background.bgType === 'color') {

package/lib/composite-comp/bol/components/ImageText/mobile/index.less

@@ -59,8 +59,8 @@
         }
         .card-btn-wrap {
           display: flex;
-          .card-first-btn {
-            margin-right: 12px;
+          .card-second-btn {
+            margin-left: 12px;
           }
         }
       }
@@ -94,8 +94,8 @@
         }
         .card-btn-wrap {
           display: flex;
-          .card-first-btn {
-            margin-right: 12px;
+          .card-second-btn {
+            margin-left: 12px;
           }
         }
       }
@@ -135,8 +135,8 @@
         flex-direction: column;
       }
 
-      .card-second-btn {
-        margin-top: 8px;
+      .card-first-btn, .card-second-btn {
+        margin-bottom: 8px;
       }
     }
     .card-margin-bottom {
@@ -170,8 +170,8 @@
         }
         .card-btn-wrap {
           display: flex;
-          .card-first-btn {
-            margin-right: 12px;
+          .card-second-btn {
+            margin-left: 12px;
           }
         }
       }

package/lib/composite-comp/bol/components/ImageText/pc/index.js

@@ -11,6 +11,8 @@ require("./index.less");
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _lodash = require("lodash");
+
 var _AlignSelector = require("../../../../../common/AlignSelector");
 
 var _components = require("../../../../../meta-comp/components");
@@ -63,7 +65,7 @@ var __assign = void 0 && (void 0).__assign || function () {
 
 var maxWidthAndHeight = {
   normal: 410,
-  outside: 100,
+  outside: 86,
   center: 410
 };
 
@@ -76,17 +78,26 @@ function (_super) {
     var _this = _super !== null && _super.apply(this, arguments) || this;
 
     _this.state = {
-      hoverIndex: -1
-    }; // componentDidMount() {
-    //   this.distroy = autorun(() => {
-    //     this.setState({
-    //       clickedGroup: store.clickedGroup,
-    //     });
-    //   });
-    // }
-    // componentWillUnmount() {
-    //   this.distroy();
-    // }
+      hoverIndex: -1,
+      currentMaxWidth: 410
+    };
+
+    _this.listenCardWidth = function () {
+      var _a;
+
+      var data = _this.props.data;
+
+      try {
+        var cardWidth = ((_a = document.querySelector('.group-wrap .one-card')) === null || _a === void 0 ? void 0 : _a.offsetWidth) - 40;
+        var maxLayoutWidth = maxWidthAndHeight[data.customize.layout.pcLayout];
+
+        _this.setState({
+          currentMaxWidth: Math.min(cardWidth, maxLayoutWidth)
+        });
+      } catch (error) {
+        console.log(error);
+      }
+    };
 
     _this.calcWidth = function (num) {
       return (100 - (num - 1) * 2) / num + "%";
@@ -114,14 +125,31 @@ function (_super) {
     return _this;
   }
 
+  ImageTextPc.prototype.componentDidMount = function () {
+    var data = this.props.data;
+    this.layout = data.customize.layout.pcLayout;
+    this.listenCardWidth();
+    window.addEventListener('resize', (0, _lodash.debounce)(this.listenCardWidth));
+  };
+
+  ImageTextPc.prototype.componentWillUnmount = function () {
+    window.removeEventListener('resize', this.listenCardWidth);
+  };
+
+  ImageTextPc.prototype.componentWillReceiveProps = function (nextProps) {
+    if (nextProps.data.customize.layout.pcLayout !== this.layout) {
+      this.layout = nextProps.data.customize.layout.pcLayout;
+      this.listenCardWidth();
+    }
+  };
+
   ImageTextPc.prototype.render = function () {
     var _this = this;
 
     var data = this.props.data;
-    var hoverIndex = this.state.hoverIndex; // console.log('====================================');
-    // console.log(data);
-    // console.log('====================================');
-
+    var _a = this.state,
+        hoverIndex = _a.hoverIndex,
+        currentMaxWidth = _a.currentMaxWidth;
     var wrapStyle = {};
     wrapStyle.alignItems = _AlignSelector.alignItemMap[data.customize.align];
     return /*#__PURE__*/_react["default"].createElement("div", {
@@ -156,7 +184,7 @@ function (_super) {
         data: hoverIndex == i ? source.hover.image : source.image,
         limitWidthHeight: true,
         maxHeight: maxWidthAndHeight[data.customize.layout.pcLayout],
-        maxWidth: maxWidthAndHeight[data.customize.layout.pcLayout],
+        maxWidth: currentMaxWidth,
         scale: 0.5
       })), (source.title.open && data.customize.layout.pcLayout !== 'center' && hoverIndex != i || hoverIndex == i && source.hover.title.open && data.customize.layout.pcLayout !== 'center') && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
         className: "card-title",

package/lib/composite-comp/bol/components/Tag/index.js

@@ -81,7 +81,7 @@ function (_super) {
       className: "tag-image"
     }, /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
       data: nodeData.content.image
-    })), nodeData.groupSource.map(function (m) {
+    })), nodeData.groupSource && nodeData.groupSource.map(function (m) {
       return /*#__PURE__*/_react["default"].createElement("div", {
         className: "first-button"
       }, /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {

package/lib/composite-comp/bol/config-panels/ImageTextConfig/index.js

@@ -164,7 +164,7 @@ function (_super) {
         }),
         metaOption: data.groupSource
       }, {
-        key: '2',
+        key: 'imageText3',
         name: (0, _locale.i18n)('SPACING'),
         value: /*#__PURE__*/_react["default"].createElement(_SpacingConfig["default"], {
           data: data.spacing
@@ -173,6 +173,7 @@ function (_super) {
         key: 'imageText4',
         name: (0, _locale.i18n)('CUSTOMIZE'),
         value: /*#__PURE__*/_react["default"].createElement(_CustomizeConfig["default"], {
+          component: "imageText",
           data: data.customize,
           layoutSource: (0, _coreUtil.isPc)() ? _layout.imageTextLayoutPc : _layout.imageTextLayoutMobile,
           selectedLayoutFun: function selectedLayoutFun(v) {

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

@@ -85,40 +85,35 @@ function (_super) {
       value: /*#__PURE__*/_react["default"].createElement(_TextConfig["default"], {
         data: panelProps.title
       }),
-      metaOption: panelProps.title,
-      toggleType: 'switch'
+      metaOption: panelProps.title
     }, {
       key: '3',
       name: (0, _locale.i18n)('TEXT'),
       value: /*#__PURE__*/_react["default"].createElement(_TextConfig["default"], {
         data: panelProps.text
       }),
-      metaOption: panelProps.text,
-      toggleType: 'switch'
+      metaOption: panelProps.text
     }, {
       key: '4',
       name: (0, _locale.i18n)('IMAGE_TAG'),
       value: /*#__PURE__*/_react["default"].createElement(_ImageConfig["default"], {
         data: panelProps.imageTag
       }),
-      metaOption: panelProps.imageTag,
-      toggleType: 'switch'
+      metaOption: panelProps.imageTag
     }, {
       key: '5',
       name: (0, _locale.i18n)('BUTTON_TAG'),
       value: /*#__PURE__*/_react["default"].createElement(_ButtonConfig["default"], {
         data: panelProps.buttonTag
       }),
-      metaOption: panelProps.buttonTag,
-      toggleType: 'switch'
+      metaOption: panelProps.buttonTag
     }, {
       key: '6',
       name: (0, _locale.i18n)('SECONDARY_BUTTON_TAG'),
       value: /*#__PURE__*/_react["default"].createElement(_ButtonConfig["default"], {
         data: panelProps.secondButtonTag
       }),
-      metaOption: panelProps.secondButtonTag,
-      toggleType: 'switch'
+      metaOption: panelProps.secondButtonTag
     }];
 
     var _textSource = _mobx.store.CarouselStore[panelProps.compId] === 'layout2' ? textSource : [];
@@ -136,7 +131,8 @@ function (_super) {
           }),
           metaOption: panelProps.image,
           toggleType: 'switch'
-        }], _textSource)
+        }], _textSource),
+        type: "switch"
       });
     };
 
@@ -149,8 +145,7 @@ function (_super) {
         key: '1',
         name: (0, _locale.i18n)('CONTENT'),
         value: getConfig()
-      }],
-      type: "triangle"
+      }]
     }));
   };
 

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

@@ -121,6 +121,21 @@ function (_super) {
         _this.props.store.setState({
           CarouselStore: __assign(__assign({}, _mobx.store.CarouselStore), (_a = {}, _a[id] = v, _a))
         });
+      } // 图文组件，移动端，只有第3个组件可选列数
+
+
+      if (component === 'imageText') {
+        if (!(0, _coreUtil.isPc)()) {
+          if (v === 'normal3') {
+            _this.setState({
+              showRowNum: true
+            });
+          } else {
+            _this.setState({
+              showRowNum: false
+            });
+          }
+        }
       } // 移动端导航特殊处理
       // 更改需求，两个布局都需 可选行数
       // if (component == 'mobileNavigation') {

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

@@ -8,11 +8,13 @@ exports.getDefaultJSON = void 0;
 var _uuid = require("uuid");
 
 var getDefaultJSON = function getDefaultJSON() {
+  var contentId = (0, _uuid.v4)();
   return {
     id: (0, _uuid.v4)(),
     type: 'FLASH_DEAL',
     title: {
       icon: {
+        id: (0, _uuid.v4)(),
         open: true,
         url: '/get/resource/platform/conf/20220722/picture/组633391550411058986147840.png'
       },
@@ -23,6 +25,7 @@ var getDefaultJSON = function getDefaultJSON() {
         specialContent: [],
         text: 'Flash Deal',
         content: {
+          sizeType: 'Customize font styles',
           fontFamily: 'Open Sans',
           fontWeight: 600,
           fontSize: 14,
@@ -48,6 +51,7 @@ var getDefaultJSON = function getDefaultJSON() {
           backgroundColor: ''
         },
         buttonText: {
+          sizeType: 'Customize font styles',
           fontFamily: 'Open Sans',
           fontWeight: 600,
           fontSize: 12,
@@ -60,6 +64,20 @@ var getDefaultJSON = function getDefaultJSON() {
           borderColor: '',
           borderRadius: 6
         },
+        spacing: {
+          pc: {
+            paddingTop: 2,
+            paddingBottom: 2,
+            paddingLeft: 5,
+            paddingRight: 5
+          },
+          mobile: {
+            paddingTop: 2,
+            paddingBottom: 2,
+            paddingLeft: 5,
+            paddingRight: 5
+          }
+        },
         buttonIcon: {
           iconUrl: '/get/resource/platform/conf/20220719/picture/icon-arrow-right-s1549371733179686912.png',
           layout: 'right'
@@ -68,9 +86,11 @@ var getDefaultJSON = function getDefaultJSON() {
       }
     },
     content: {
+      id: contentId,
       sortType: '1',
       label: {
         id: (0, _uuid.v4)(),
+        contentId: contentId,
         open: true,
         type: 'BUTTON',
         text: 'Button',
@@ -79,6 +99,7 @@ var getDefaultJSON = function getDefaultJSON() {
           backgroundColor: '#CC1D20'
         },
         buttonText: {
+          sizeType: 'Customize font styles',
           fontFamily: 'Open Sans',
           fontWeight: 600,
           fontSize: 8,
@@ -91,6 +112,20 @@ var getDefaultJSON = function getDefaultJSON() {
           borderColor: '',
           borderRadius: 7
         },
+        spacing: {
+          pc: {
+            paddingTop: 2,
+            paddingBottom: 2,
+            paddingLeft: 3,
+            paddingRight: 3
+          },
+          mobile: {
+            paddingTop: 2,
+            paddingBottom: 2,
+            paddingLeft: 3,
+            paddingRight: 3
+          }
+        },
         buttonIcon: {
           iconUrl: '',
           layout: 'right'
@@ -99,11 +134,13 @@ var getDefaultJSON = function getDefaultJSON() {
       },
       productName: {
         id: (0, _uuid.v4)(),
+        contentId: contentId,
         open: true,
         type: 'Text',
         specialContent: [],
         text: 'Flash Deal',
         content: {
+          sizeType: 'Customize font styles',
           fontFamily: 'Open Sans',
           fontWeight: 500,
           fontSize: 14,
@@ -121,11 +158,13 @@ var getDefaultJSON = function getDefaultJSON() {
       },
       activityPrice: {
         id: (0, _uuid.v4)(),
+        contentId: contentId,
         open: true,
         type: 'Text',
         specialContent: [],
         text: 'Flash Deal',
         content: {
+          sizeType: 'Customize font styles',
           fontFamily: 'Open Sans',
           fontWeight: 600,
           fontSize: 14,
@@ -143,11 +182,13 @@ var getDefaultJSON = function getDefaultJSON() {
       },
       salesPrice: {
         id: (0, _uuid.v4)(),
+        contentId: contentId,
         open: true,
         type: 'Text',
         specialContent: [],
         text: 'Flash Deal',
         content: {
+          sizeType: 'Customize font styles',
           fontFamily: 'Open Sans',
           fontWeight: 500,
           fontSize: 10,

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

@@ -264,7 +264,7 @@ function (_super) {
     })), /*#__PURE__*/_react["default"].createElement("div", {
       className: "message-wrap"
     }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
-      color: "#262626",
+      color: "#fff",
       onClick: function onClick() {
         return (0, _coreUtil.clickUrl)('/message-center');
       },

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

@@ -19,6 +19,8 @@ var _common = require("../../../../../common");
 
 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 () {
@@ -116,14 +118,22 @@ function (_super) {
           data: panelProps.salesPrice
         }),
         metaOption: panelProps.salesPrice
-      }, {
-        key: '5',
-        name: (0, _locale.i18n)('SALES_PROGRESS'),
-        value: null,
-        metaOption: panelProps.salesProgressVisible
       }],
       type: "switch"
-    }));
+    }), /*#__PURE__*/_react["default"].createElement("div", {
+      className: "sales_progress_wrap"
+    }, /*#__PURE__*/_react["default"].createElement("span", {
+      className: "label"
+    }, (0, _locale.i18n)('SALES_PROGRESS')), /*#__PURE__*/_react["default"].createElement(_antd.Switch, {
+      checked: panelProps.salesProgressVisible.open,
+      onChange: function onChange(v) {
+        panelProps.salesProgressVisible = {
+          open: v
+        };
+
+        _this.reRender();
+      }
+    })));
   };
 
   AComponent.defaultProps = {

package/lib/composite-comp/dito/config-panels/FlashDealConfig/FlashDealConfigContent/index.less

@@ -0,0 +1,20 @@
+.flash_sale_content {
+
+  .sales_progress_wrap {
+    border-top: 1px solid #EDF0F4;
+    padding-top: 20px;
+    padding-bottom: 10px;
+    display: flex;
+    justify-content: space-between;
+
+    .label {
+      font-size: 16px !important;
+      line-height: 24px !important;
+      height: 24px !important;
+      font-weight: 600 !important;
+      color: #232F46;
+      font-family: 'Open Sans';
+      font-style: normal;
+    }
+  }
+}

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

@@ -21,12 +21,19 @@ var _CustomizeConfig = _interopRequireDefault(require("../../../common/config-pa
 
 var _Collapse = _interopRequireDefault(require("../../../../common/Collapse"));
 
+var _mobx = require("../../../../mobx");
+
 var _locale = require("../../../../locale");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function FlashDealConfig(props) {
   var data = props.data;
+
+  var getIsContentActive = function getIsContentActive(content) {
+    return JSON.stringify(content).includes(_mobx.store.clickedMetaParent);
+  };
+
   return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_Collapse["default"], {
     divider: "bold",
     headerSize: "large",
@@ -41,7 +48,8 @@ function FlashDealConfig(props) {
       name: (0, _locale.i18n)('CONTENT'),
       value: /*#__PURE__*/_react["default"].createElement(_FlashDealConfigContent["default"], {
         panelProps: data.content
-      })
+      }),
+      active: getIsContentActive(data.content)
     }, {
       key: '3',
       name: (0, _locale.i18n)('SPACING'),

package/lib/meta-comp/components/Button/index.js

@@ -15,6 +15,8 @@ var _coreUtil = require("../../../utils/coreUtil");
 
 var _decorator = require("../../../decorator");
 
+var _commonUtil = require("../../../utils/commonUtil");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -117,7 +119,27 @@ function (_super) {
       border: data.buttonBorder.open && data.buttonBorder.borderColor ? "1px solid " + data.buttonBorder.borderColor : '1px solid transparent',
       borderRadius: data.buttonBorder.open ? data.buttonBorder.borderRadius : 0
     }, data.buttonText), {
-      fontSize: window.magicDesign.device == 'pc' ? data.buttonText.pcFontSize : data.buttonText.fontSize
+      fontSize: window.magicDesign.device == 'pc' ? data.buttonText.pcFontSize : data.buttonText.fontSize,
+      paddingTop: window.magicDesign.device == 'pc' ? (0, _commonUtil.ensure)(function () {
+        return data.spacing.pc.paddingTop;
+      }, 10) : (0, _commonUtil.ensure)(function () {
+        return data.spacing.mobile.paddingTop;
+      }, 10),
+      paddingBottom: window.magicDesign.device == 'pc' ? (0, _commonUtil.ensure)(function () {
+        return data.spacing.pc.paddingBottom;
+      }, 10) : (0, _commonUtil.ensure)(function () {
+        return data.spacing.mobile.paddingBottom;
+      }, 10),
+      paddingLeft: window.magicDesign.device == 'pc' ? (0, _commonUtil.ensure)(function () {
+        return data.spacing.pc.paddingLeft;
+      }, 10) : (0, _commonUtil.ensure)(function () {
+        return data.spacing.mobile.paddingLeft;
+      }, 10),
+      paddingRight: window.magicDesign.device == 'pc' ? (0, _commonUtil.ensure)(function () {
+        return data.spacing.pc.paddingRight;
+      }, 10) : (0, _commonUtil.ensure)(function () {
+        return data.spacing.mobile.paddingRight;
+      }, 10)
     });
 
     var iconUrl = data.buttonIcon.iconUrl;

package/package.json

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