@fonixtree/magic-design 0.0.104 → 0.0.106

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

@@ -19,8 +19,6 @@ var _defaultJSON = require("../../../components/ImageText/defaultJSON");
 
 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); }
@@ -122,7 +120,7 @@ function (_super) {
   ImageTextConfigGroup.defaultProps = {
     source: []
   };
-  ImageTextConfigGroup = __decorate([(0, _mobxReact.inject)('store'), _mobxReact.observer, _decorator.updateConfigDecorator], ImageTextConfigGroup);
+  ImageTextConfigGroup = __decorate([(0, _mobxReact.inject)('store'), _mobxReact.observer], ImageTextConfigGroup);
   return ImageTextConfigGroup;
 }(_react["default"].Component);
 

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

@@ -164,7 +164,7 @@ function (_super) {
         }),
         metaOption: data.groupSource
       }, {
-        key: 'imageText3',
+        key: '2',
         name: (0, _locale.i18n)('SPACING'),
         value: /*#__PURE__*/_react["default"].createElement(_SpacingConfig["default"], {
           data: data.spacing
@@ -173,7 +173,6 @@ 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/config-panels/NewsletterConfig/index.js

@@ -9,8 +9,6 @@ var _react = _interopRequireDefault(require("react"));
 
 var _NewsletterContentSetting = _interopRequireDefault(require("./NewsletterContentSetting"));
 
-var _locale = require("../../../../locale");
-
 var _Collapse = _interopRequireDefault(require("../../../../common/Collapse"));
 
 var _CustomizeConfig = _interopRequireDefault(require("../../../common/config-panels/CustomizeConfig"));
@@ -30,26 +28,26 @@ function NewsletterConfig(props) {
     headerSize: "large",
     source: [{
       key: '1',
-      name: (0, _locale.i18n)('CONTENT'),
+      name: i18n('CONTENT'),
       value: /*#__PURE__*/_react["default"].createElement(_NewsletterContentSetting["default"], {
         panelProps: data.content
       })
     }, {
       key: '2',
-      name: (0, _locale.i18n)('SPACING'),
+      name: i18n('SPACING'),
       value: /*#__PURE__*/_react["default"].createElement(_SpacingConfig["default"], {
         data: data.spacing
       })
     }, {
       key: '3',
-      name: (0, _locale.i18n)('CUSTOMIZE'),
+      name: i18n('CUSTOMIZE'),
       value: /*#__PURE__*/_react["default"].createElement(_CustomizeConfig["default"], {
         data: data.customize,
         layoutSource: _layout.newsletterLayout
       })
     }, {
       key: '4',
-      name: (0, _locale.i18n)('BACKGROUND'),
+      name: i18n('BACKGROUND'),
       value: /*#__PURE__*/_react["default"].createElement(_BackgroundConfig["default"], {
         data: data.background
       })

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

@@ -7,7 +7,7 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _TagConfigGroup = _interopRequireDefault(require("../TagConfigGroup"));
+var _ButtonConfig = _interopRequireDefault(require("../../../../../meta-comp/config-panels/ButtonConfig"));
 
 var _coreUtil = require("../../../../../utils/coreUtil");
 
@@ -15,8 +15,6 @@ var _common = require("../../../../../common");
 
 var _ImageConfig = _interopRequireDefault(require("../../../../../meta-comp/config-panels/ImageConfig"));
 
-var _locale = require("../../../../../locale");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var __extends = void 0 && (void 0).__extends || function () {
@@ -65,9 +63,7 @@ function (_super) {
   }
 
   AComponent.prototype.render = function () {
-    var _a = this.props,
-        panelProps = _a.panelProps,
-        groupSource = _a.groupSource;
+    var panelProps = this.props.panelProps;
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "recommend_content"
     }, /*#__PURE__*/_react["default"].createElement(_common.Collapse, {
@@ -75,15 +71,27 @@ function (_super) {
       onRefresh: this.reRender,
       source: [{
         key: '1',
-        name: (0, _locale.i18n)('IMAGE_TAG'),
+        name: i18n('IMAGE_TAG'),
         value: /*#__PURE__*/_react["default"].createElement(_ImageConfig["default"], {
           data: panelProps.image
         }),
         metaOption: panelProps.image
+      }, {
+        key: '2',
+        name: i18n('BUTTON_TAG'),
+        value: /*#__PURE__*/_react["default"].createElement(_ButtonConfig["default"], {
+          data: panelProps.button
+        }),
+        metaOption: panelProps.button
+      }, {
+        key: '3',
+        name: i18n('SECONDARY_BUTTON_TAG'),
+        value: /*#__PURE__*/_react["default"].createElement(_ButtonConfig["default"], {
+          data: panelProps.secondaryButton
+        }),
+        metaOption: panelProps.secondaryButton
       }],
       type: "switch"
-    }), /*#__PURE__*/_react["default"].createElement(_TagConfigGroup["default"], {
-      source: groupSource
     }));
   };
 

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

@@ -19,8 +19,6 @@ var _Collapse = _interopRequireDefault(require("../../../../common/Collapse"));
 
 var _SpacingConfig = _interopRequireDefault(require("../../../common/config-panels/SpacingConfig"));
 
-var _locale = require("../../../../locale");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function TagCompConfig(props) {
@@ -30,20 +28,19 @@ function TagCompConfig(props) {
     headerSize: "large",
     source: [{
       key: '1',
-      name: (0, _locale.i18n)('CONTENT'),
+      name: i18n('CONTENT'),
       value: /*#__PURE__*/_react["default"].createElement(_TagConfigContent["default"], {
-        groupSource: data.groupSource,
         panelProps: data.content
       })
     }, {
       key: '2',
-      name: (0, _locale.i18n)('SPACING'),
+      name: i18n('SPACING'),
       value: /*#__PURE__*/_react["default"].createElement(_SpacingConfig["default"], {
         data: data.spacing
       })
     }, {
       key: '3',
-      name: (0, _locale.i18n)('CUSTOMIZE'),
+      name: i18n('CUSTOMIZE'),
       value: /*#__PURE__*/_react["default"].createElement(_CustomizeConfig["default"], {
         data: data.customize,
         layoutSource: [{
@@ -54,7 +51,7 @@ function TagCompConfig(props) {
       })
     }, {
       key: '4',
-      name: (0, _locale.i18n)('BACKGROUND'),
+      name: i18n('BACKGROUND'),
       value: /*#__PURE__*/_react["default"].createElement(_BackgroundConfig["default"], {
         data: data.background
       })

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

@@ -17,8 +17,6 @@ var _coreUtil = require("../../../../../utils/coreUtil");
 
 var _defaultJSON = require("../../../components/Text/defaultJSON");
 
-var _decorator = require("../../../../../decorator");
-
 require("./index.less");
 
 var _locale = require("../../../../../locale");
@@ -134,7 +132,7 @@ function (_super) {
   default_1.defaultProps = {
     source: []
   };
-  default_1 = __decorate([(0, _mobxReact.inject)('store'), _mobxReact.observer, _decorator.updateConfigDecorator], default_1);
+  default_1 = __decorate([(0, _mobxReact.inject)('store'), _mobxReact.observer], default_1);
   return default_1;
 }(_react["default"].Component);
 

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

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

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

@@ -7,6 +7,10 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
+var _locale = require("../../../../locale");
+
+var _Collapse = _interopRequireDefault(require("../../../../common/Collapse"));
+
 var _ImageConfig = _interopRequireDefault(require("../../../../meta-comp/config-panels/ImageConfig"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -51,13 +55,20 @@ function (_super) {
 
   ImageGallerySecondConfig.prototype.render = function () {
     var panelProps = this.props.panelProps;
+    console.log('panelProps...', panelProps);
     return /*#__PURE__*/_react["default"].createElement("div", {
-      className: "image_gallery_second_conf_wrap",
-      style: {
-        marginTop: '20px'
-      }
-    }, /*#__PURE__*/_react["default"].createElement(_ImageConfig["default"], {
-      data: panelProps.image
+      className: "image_gallery_second_conf_wrap"
+    }, /*#__PURE__*/_react["default"].createElement(_Collapse["default"], {
+      divider: "bold",
+      headerSize: "large",
+      source: [{
+        key: '1',
+        name: (0, _locale.i18n)('IMAGE'),
+        value: /*#__PURE__*/_react["default"].createElement(_ImageConfig["default"], {
+          data: panelProps.image
+        }),
+        metaOption: panelProps.image
+      }]
     }));
   };
 

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

@@ -25,8 +25,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 () {
@@ -123,15 +121,12 @@ function (_super) {
       }];
       return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_Collapse["default"], {
         headerSize: "middle",
-        noChange: !needHover,
         onRefresh: function onRefresh() {
           return (0, _coreUtil.renderPreview)();
         },
         showActiveColor: true,
         source: source,
         type: "switch"
-      }), /*#__PURE__*/_react["default"].createElement("div", {
-        className: "line"
       }), /*#__PURE__*/_react["default"].createElement(_common.Field, null, /*#__PURE__*/_react["default"].createElement(_BackgroundConfig["default"], {
         data: data.background
       })));
@@ -142,12 +137,12 @@ function (_super) {
 
       if (panelProps.hover.open) {
         var tempObj = {};
-        tempObj = (0, _lodash.cloneDeep)((0, _lodash.pick)(panelProps.button, ['buttonBorder', 'buttonIcon', 'buttonText', 'spacing', 'content', 'open', 'text']));
+        tempObj = (0, _lodash.cloneDeep)((0, _lodash.pick)(panelProps.button, ['buttonBorder', 'buttonIcon', 'buttonText', 'content', 'open', 'text']));
         panelProps.hover.button = __assign(__assign({}, panelProps.hover.button), tempObj);
-        tempObj = (0, _lodash.cloneDeep)((0, _lodash.pick)(panelProps.secondButton, ['buttonBorder', 'buttonIcon', 'buttonText', 'spacing', 'content', 'open', 'text']));
+        tempObj = (0, _lodash.cloneDeep)((0, _lodash.pick)(panelProps.secondButton, ['buttonBorder', 'buttonIcon', 'buttonText', 'content', 'open', 'text']));
         panelProps.hover.secondButton = __assign(__assign({}, panelProps.hover.secondButton), tempObj);
         tempObj = (0, _lodash.cloneDeep)((0, _lodash.pick)(panelProps.image, ['content', 'open']));
-        panelProps.hover.image = __assign(__assign({}, panelProps.hover.image), tempObj);
+        panelProps.hover.image = __assign(__assign({}, panelProps.image.secondButton), tempObj);
         tempObj = (0, _lodash.cloneDeep)((0, _lodash.pick)(panelProps.text, ['content', 'open', 'spacing', 'specialContent', 'text', 'underline', 'vertical']));
         panelProps.hover.text = __assign(__assign({}, panelProps.hover.text), tempObj);
         tempObj = (0, _lodash.cloneDeep)((0, _lodash.pick)(panelProps.title, ['content', 'open', 'spacing', 'specialContent', 'text', 'underline', 'vertical']));
@@ -162,7 +157,7 @@ function (_super) {
   ImageTextSecondConfig.prototype.render = function () {
     var panelProps = this.props.panelProps;
     return /*#__PURE__*/_react["default"].createElement("div", {
-      className: "imagetext_second_conf_wrap"
+      className: "banner_second_conf_wrap"
     }, /*#__PURE__*/_react["default"].createElement(_Collapse["default"], {
       divider: "bold",
       headerSize: "large",
@@ -174,7 +169,7 @@ function (_super) {
       }, {
         key: 'imageTextSecondConfig2',
         name: (0, _locale.i18n)('HOVER'),
-        value: this.getContentPanel(panelProps.hover),
+        value: this.getContentPanel(panelProps.hover, false),
         metaOption: panelProps.hover,
         toggleType: 'switch'
       }]

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

@@ -34,7 +34,6 @@
     right: 0;
   }
 
-
   &.position-6 {
     position: relative;
     float: left;

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

@@ -107,37 +107,16 @@ function (_super) {
         layout = _c.layout,
         imgHeight = _c.imgHeight,
         imgWidth = _c.imgWidth,
-        unknownPrice = _c.unknownPrice,
-        rest = __rest(_c, ["data", "panelProps", "onItemClick", "showProName", "showProgress", "fixHeight", "layout", "imgHeight", "imgWidth", "unknownPrice"]);
+        rest = __rest(_c, ["data", "panelProps", "onItemClick", "showProName", "showProgress", "fixHeight", "layout", "imgHeight", "imgWidth"]);
 
     var promotions = (0, _businessUtil.getPromotionList)(data);
-    var price = (0, _currencyUtil.formatCurrency)(data.salesPrice);
+    var price = (0, _currencyUtil.formatCurrencyWithSymbol)(data.salesPrice);
     /** 当是拼团时 显示价格 */
 
     if (data.sppType && promotions.length) {
-      price = data.specialPrice !== null ? (0, _currencyUtil.formatCurrency)(data.specialPrice) : (0, _currencyUtil.formatCurrency)(data.salesPrice);
+      price = data.specialPrice !== null ? (0, _currencyUtil.formatCurrencyWithSymbol)(data.specialPrice) : (0, _currencyUtil.formatCurrencyWithSymbol)(data.salesPrice);
     }
 
-    var integerPart = price;
-    var decimalPart = null;
-
-    if (unknownPrice) {
-      if (price.length > 5) {
-        integerPart = price.slice(0, -5).replace(/\d/g, '? ') + price.slice(-5);
-      } else {
-        integerPart = price.replace(/\d/, '? ');
-      }
-    } else if (Array.isArray(price)) {
-      integerPart = price[0];
-      decimalPart = price[1];
-    }
-
-    var pricePrefix = (0, _commonUtil.ensure)(function () {
-      return window.ecommerce.prefix;
-    }, 'Rp');
-
-    var _price = pricePrefix + " " + integerPart + " " + (decimalPart ? '.' + decimalPart : '');
-
     var oldPrice = data.marketPrice !== null ? (0, _currencyUtil.formatCurrencyWithSymbol)(data.marketPrice) : null;
     var discount = Number(data.discountPercent) || 0;
     var salePercent = Number(data.salePercent) / 100 || 0;
@@ -150,6 +129,7 @@ function (_super) {
     var prodLabels = ((_b = data.labels) === null || _b === void 0 ? void 0 : _b.filter(function (f) {
       return f.position === '6';
     })) || [];
+    console.log('imgLabels', imgLabels, prodLabels);
     return /*#__PURE__*/_react["default"].createElement("div", _extends({
       className: (0, _classnames["default"])('m-product-item-wrap', {
         fixHeight: fixHeight,
@@ -173,7 +153,7 @@ function (_super) {
       small: true
     })), /*#__PURE__*/_react["default"].createElement("div", {
       className: "content-wrap"
-    }, panelProps.label.open && /*#__PURE__*/_react["default"].createElement("div", {
+    }, panelProps.label.open && promotions.length > 0 && /*#__PURE__*/_react["default"].createElement("div", {
       className: "promotions-wrap"
     }, promotions.map(function (promot, index) {
       return /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
@@ -198,7 +178,7 @@ function (_super) {
     })), panelProps.activityPrice.open && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
       className: "price",
       data: __assign(__assign({}, panelProps.activityPrice), {
-        text: _price
+        text: price
       }),
       readonly: true
     }), oldPrice && panelProps.salesPrice.open && /*#__PURE__*/_react["default"].createElement("div", {

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

@@ -4,12 +4,15 @@
   background: #FFFFFF;
   border: 1px solid #D2D9E5;
   width: 142px;
-  cursor: pointer;
+  border-radius: 8px;
 
   .img-wrap {
     position: relative;
+    border-radius: 8px;
+    overflow: hidden;
 
     .product-img {
+      border-radius: 8px;
       width: 140px;
       height: 140px;
       object-fit: cover;
@@ -22,10 +25,10 @@
     .promotions-wrap {
       display: flex;
       flex-wrap: wrap;
+      margin-bottom: 5px;
 
       .promotion-item {
         margin-right: 5px;
-        margin-bottom: 5px;
 
         &:last-child {
           margin-right: 0;
@@ -34,7 +37,7 @@
     }
 
     .product-name-wrap {
-      margin-bottom: 3px;
+      margin-bottom: 5px;
       display: -webkit-box;
       -webkit-line-clamp: 2;
       -webkit-box-orient: vertical;
@@ -57,7 +60,7 @@
 
     .old-price-wrap {
       display: flex;
-      margin-top: 0px;
+      margin-top: 3px;
       align-items: baseline;
       white-space: nowrap;
       overflow: hidden;
@@ -68,11 +71,9 @@
         font-family: 'Montserrat';
         font-style: normal;
         font-weight: 700;
-        font-size: 8px;
+        font-size: 12px;
         line-height: 15px;
-        color: #fff;
-        padding: 0 4px;
-        background-color: #CE1126;
+        color: #2F3043;
       }
 
       .old-price {
@@ -130,9 +131,7 @@
 
   &.fixHeight {
     .promotions-wrap {
-      height: 30px;
-      flex-wrap: nowrap;
-      overflow: hidden;
+      height: 17px;
     }
 
     .product-name {

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

@@ -91,12 +91,21 @@ function (_super) {
       showRowNum: true
     };
 
-    _this.onInit = function (v) {
+    _this.layoutChange = function (v) {
       var _a;
 
       var _b = _this.props,
+          selectedLayoutFun = _b.selectedLayoutFun,
+          data = _b.data,
           component = _b.component,
-          id = _b.id; // 轮播组件特殊处理
+          id = _b.id;
+
+      if (selectedLayoutFun) {
+        selectedLayoutFun(v);
+      } else {
+        data.layout = v;
+      } // 轮播组件特殊处理
+
 
       if (component === 'carousel') {
         if (v === 'layout2') {
@@ -112,59 +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
-            });
-          }
-        }
-      } // imageGallery 第二种布局可选列数
+      } // 移动端导航特殊处理
 
 
-      if (component === 'imageGallery') {
-        if (v === 'layout2') {
+      if (component == 'mobileNavigation') {
+        if (v === 'tile') {
           _this.setState({
-            showRowNum: true
+            showRowNum: false
           });
         } else {
           _this.setState({
-            showRowNum: false
+            showRowNum: true
           });
         }
-      } // 移动端导航特殊处理
-      // 更改需求，两个布局都需 可选行数
-      // if (component == 'mobileNavigation') {
-      //   if (v === 'tile') {
-      //     this.setState({ showRowNum: false });
-      //   } else {
-      //     this.setState({ showRowNum: true });
-      //   }
-      // }
-
-    };
-
-    _this.layoutChange = function (v) {
-      var _a = _this.props,
-          selectedLayoutFun = _a.selectedLayoutFun,
-          data = _a.data;
-
-      if (selectedLayoutFun) {
-        selectedLayoutFun(v);
-      } else {
-        data.layout = v;
       }
 
-      _this.onInit(v);
-
       _this.selfRender(); // this.setState({});
 
     };
@@ -185,14 +156,16 @@ function (_super) {
   }
 
   CustomizeConfig.prototype.componentDidMount = function () {
-    var _a = this.props,
-        selectedLayoutFun = _a.selectedLayoutFun,
-        data = _a.data;
+    var _a;
 
-    if (selectedLayoutFun) {
-      this.onInit((0, _coreUtil.isPc)() ? data.layout.pcLayout : data.layout.h5Layout);
+    if (((_a = this.props.data) === null || _a === void 0 ? void 0 : _a.layout) === 'layout2') {
+      this.setState({
+        showRowNum: false
+      });
     } else {
-      this.onInit(data.layout);
+      this.setState({
+        showRowNum: true
+      });
     }
   };
 
@@ -219,7 +192,7 @@ function (_super) {
       rowNumArr.push(i);
     }
 
-    var _showRowNum = showRowNum && ((0, _coreUtil.isPc)() && data.pcRowNum || !(0, _coreUtil.isPc)() && data.rowNum);
+    var _showRowNum = showRowNum && ((0, _coreUtil.isPc)() && this.props.data.pcRowNum || !(0, _coreUtil.isPc)() && this.props.data.rowNum);
 
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "m-customize-config"