@fonixtree/magic-design 0.0.103 → 0.0.104

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

@@ -25,6 +25,8 @@ 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 () {
@@ -121,12 +123,15 @@ 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
       })));
@@ -137,12 +142,12 @@ function (_super) {
 
       if (panelProps.hover.open) {
         var tempObj = {};
-        tempObj = (0, _lodash.cloneDeep)((0, _lodash.pick)(panelProps.button, ['buttonBorder', 'buttonIcon', 'buttonText', 'content', 'open', 'text']));
+        tempObj = (0, _lodash.cloneDeep)((0, _lodash.pick)(panelProps.button, ['buttonBorder', 'buttonIcon', 'buttonText', 'spacing', 'content', 'open', 'text']));
         panelProps.hover.button = __assign(__assign({}, panelProps.hover.button), tempObj);
-        tempObj = (0, _lodash.cloneDeep)((0, _lodash.pick)(panelProps.secondButton, ['buttonBorder', 'buttonIcon', 'buttonText', 'content', 'open', 'text']));
+        tempObj = (0, _lodash.cloneDeep)((0, _lodash.pick)(panelProps.secondButton, ['buttonBorder', 'buttonIcon', 'buttonText', 'spacing', '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.image.secondButton), tempObj);
+        panelProps.hover.image = __assign(__assign({}, panelProps.hover.image), 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']));
@@ -157,7 +162,7 @@ function (_super) {
   ImageTextSecondConfig.prototype.render = function () {
     var panelProps = this.props.panelProps;
     return /*#__PURE__*/_react["default"].createElement("div", {
-      className: "banner_second_conf_wrap"
+      className: "imagetext_second_conf_wrap"
     }, /*#__PURE__*/_react["default"].createElement(_Collapse["default"], {
       divider: "bold",
       headerSize: "large",
@@ -169,7 +174,7 @@ function (_super) {
       }, {
         key: 'imageTextSecondConfig2',
         name: (0, _locale.i18n)('HOVER'),
-        value: this.getContentPanel(panelProps.hover, false),
+        value: this.getContentPanel(panelProps.hover),
         metaOption: panelProps.hover,
         toggleType: 'switch'
       }]

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

@@ -0,0 +1,8 @@
+.imagetext_second_conf_wrap {
+  .line {
+    height: 1px;
+    width: 100%;
+    background-color: #EDF0F4;
+    margin-bottom: 20px;
+  }
+}

package/es/composite-comp/bol/{config-panels/ButtonCompConfig/ButtonConfigContent → second-config-panels/TagSecondConfig}/index.js

@@ -7,13 +7,13 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _ButtonConfig = _interopRequireDefault(require("../../../../../meta-comp/config-panels/ButtonConfig"));
+var _coreUtil = require("../../../../utils/coreUtil");
 
-var _coreUtil = require("../../../../../utils/coreUtil");
+var _Collapse = _interopRequireDefault(require("../../../../common/Collapse"));
 
-var _common = require("../../../../../common");
+var _ButtonConfig = _interopRequireDefault(require("../../../../meta-comp/config-panels/ButtonConfig"));
 
-var _locale = require("../../../../../locale");
+var _locale = require("../../../../locale");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -43,59 +43,61 @@ var __extends = void 0 && (void 0).__extends || function () {
   };
 }();
 
-var AComponent =
+var debug = require('debug')('worker:TagSecondConfig');
+
+var TagSecondConfig =
 /** @class */
 function (_super) {
-  __extends(AComponent, _super);
+  __extends(TagSecondConfig, _super);
 
-  function AComponent() {
+  function TagSecondConfig() {
     var _this = _super !== null && _super.apply(this, arguments) || this;
 
     _this.state = {};
 
-    _this.reRender = function () {
-      (0, _coreUtil.renderPreview)();
-
-      _this.setState({});
+    _this.getContentPanel = function () {
+      var panelProps = _this.props.panelProps;
+      var source = [{
+        key: '1',
+        name: (0, _locale.i18n)('BUTTON_TAG'),
+        value: /*#__PURE__*/_react["default"].createElement(_ButtonConfig["default"], {
+          data: panelProps.button
+        }),
+        metaOption: panelProps.button
+      }];
+      return /*#__PURE__*/_react["default"].createElement(_Collapse["default"], {
+        headerSize: "middle",
+        onRefresh: function onRefresh() {
+          return (0, _coreUtil.renderPreview)();
+        },
+        showActiveColor: true,
+        source: source,
+        type: "switch"
+      });
     };
 
     return _this;
   }
 
-  AComponent.prototype.render = function () {
-    var panelProps = this.props.panelProps;
+  TagSecondConfig.prototype.render = function () {
     return /*#__PURE__*/_react["default"].createElement("div", {
-      className: "recommend_content"
-    }, /*#__PURE__*/_react["default"].createElement(_common.Collapse, {
-      headerSize: "middle",
-      onRefresh: this.reRender,
+      className: "tag_second_conf_wrap"
+    }, /*#__PURE__*/_react["default"].createElement(_Collapse["default"], {
+      divider: "bold",
+      headerSize: "large",
       source: [{
         key: '1',
-        name: (0, _locale.i18n)('BUTTON'),
-        value: /*#__PURE__*/_react["default"].createElement(_ButtonConfig["default"], {
-          data: panelProps.button
-        }),
-        metaOption: panelProps.button
-      }, {
-        key: '2',
-        name: (0, _locale.i18n)('SECONDARY_BUTTON'),
-        value: /*#__PURE__*/_react["default"].createElement(_ButtonConfig["default"], {
-          data: panelProps.secondaryButton
-        }),
-        metaOption: panelProps.secondaryButton
-      }],
-      type: "switch"
+        name: (0, _locale.i18n)('CONTENT'),
+        value: this.getContentPanel()
+      }]
     }));
   };
 
-  AComponent.defaultProps = {
-    panelProps: {
-      button: {},
-      secondaryButton: {}
-    }
+  TagSecondConfig.defaultProps = {
+    panelProps: {}
   };
-  return AComponent;
+  return TagSecondConfig;
 }(_react["default"].Component);
 
-var _default = AComponent;
+var _default = TagSecondConfig;
 exports["default"] = _default;

package/es/composite-comp/bol/second-config-panels/TagSecondConfig/index.less

@@ -0,0 +1,3 @@
+.tag_second_conf_wrap {
+  width: 354px;
+}

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

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

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

@@ -107,16 +107,37 @@ function (_super) {
         layout = _c.layout,
         imgHeight = _c.imgHeight,
         imgWidth = _c.imgWidth,
-        rest = __rest(_c, ["data", "panelProps", "onItemClick", "showProName", "showProgress", "fixHeight", "layout", "imgHeight", "imgWidth"]);
+        unknownPrice = _c.unknownPrice,
+        rest = __rest(_c, ["data", "panelProps", "onItemClick", "showProName", "showProgress", "fixHeight", "layout", "imgHeight", "imgWidth", "unknownPrice"]);
 
     var promotions = (0, _businessUtil.getPromotionList)(data);
-    var price = (0, _currencyUtil.formatCurrencyWithSymbol)(data.salesPrice);
+    var price = (0, _currencyUtil.formatCurrency)(data.salesPrice);
     /** 当是拼团时 显示价格 */
 
     if (data.sppType && promotions.length) {
-      price = data.specialPrice !== null ? (0, _currencyUtil.formatCurrencyWithSymbol)(data.specialPrice) : (0, _currencyUtil.formatCurrencyWithSymbol)(data.salesPrice);
+      price = data.specialPrice !== null ? (0, _currencyUtil.formatCurrency)(data.specialPrice) : (0, _currencyUtil.formatCurrency)(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;
@@ -129,7 +150,6 @@ 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,
@@ -153,7 +173,7 @@ function (_super) {
       small: true
     })), /*#__PURE__*/_react["default"].createElement("div", {
       className: "content-wrap"
-    }, panelProps.label.open && promotions.length > 0 && /*#__PURE__*/_react["default"].createElement("div", {
+    }, panelProps.label.open && /*#__PURE__*/_react["default"].createElement("div", {
       className: "promotions-wrap"
     }, promotions.map(function (promot, index) {
       return /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
@@ -178,7 +198,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,15 +4,12 @@
   background: #FFFFFF;
   border: 1px solid #D2D9E5;
   width: 142px;
-  border-radius: 8px;
+  cursor: pointer;
 
   .img-wrap {
     position: relative;
-    border-radius: 8px;
-    overflow: hidden;
 
     .product-img {
-      border-radius: 8px;
       width: 140px;
       height: 140px;
       object-fit: cover;
@@ -25,10 +22,10 @@
     .promotions-wrap {
       display: flex;
       flex-wrap: wrap;
-      margin-bottom: 5px;
 
       .promotion-item {
         margin-right: 5px;
+        margin-bottom: 5px;
 
         &:last-child {
           margin-right: 0;
@@ -37,7 +34,7 @@
     }
 
     .product-name-wrap {
-      margin-bottom: 5px;
+      margin-bottom: 3px;
       display: -webkit-box;
       -webkit-line-clamp: 2;
       -webkit-box-orient: vertical;
@@ -60,7 +57,7 @@
 
     .old-price-wrap {
       display: flex;
-      margin-top: 3px;
+      margin-top: 0px;
       align-items: baseline;
       white-space: nowrap;
       overflow: hidden;
@@ -71,9 +68,11 @@
         font-family: 'Montserrat';
         font-style: normal;
         font-weight: 700;
-        font-size: 12px;
+        font-size: 8px;
         line-height: 15px;
-        color: #2F3043;
+        color: #fff;
+        padding: 0 4px;
+        background-color: #CE1126;
       }
 
       .old-price {
@@ -131,7 +130,9 @@
 
   &.fixHeight {
     .promotions-wrap {
-      height: 17px;
+      height: 30px;
+      flex-wrap: nowrap;
+      overflow: hidden;
     }
 
     .product-name {

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

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

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

@@ -62,17 +62,17 @@ function (_super) {
 
     var _a = this.props,
         data = _a.data,
-        configPaddingLR = _a.configPaddingLR,
         configCompSpace = _a.configCompSpace,
-        configWidth = _a.configWidth;
-    var obj = data[window.magicDesign.device];
+        configWidth = _a.configWidth,
+        fillUpWidth = _a.fillUpWidth;
+    var obj = data[window.magicDesign.device] || {};
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "spacing-config-container"
     }, configWidth && /*#__PURE__*/_react["default"].createElement(_common.Field, {
       title: "Width"
     }, /*#__PURE__*/_react["default"].createElement(_common.Slider, {
       maxVal: window.magicDesign.device === 'pc' ? 1240 : 375,
-      minVal: window.magicDesign.device === 'pc' ? 1010 : 348,
+      minVal: window.magicDesign.device === 'pc' ? 806 : 348,
       onChange: function onChange(value) {
         obj.contentWidth = value.count;
 
@@ -81,6 +81,17 @@ function (_super) {
       value: {
         count: obj.contentWidth
       }
+    })), fillUpWidth && window.magicDesign.device === 'pc' && /*#__PURE__*/_react["default"].createElement(_common.Field, {
+      layout: "horizontal",
+      title: "Fill the page"
+    }, /*#__PURE__*/_react["default"].createElement(_antd.Checkbox, {
+      checked: obj.fillUp,
+      onChange: function onChange(e) {
+        console.log('ddd fill up', e.target.checked);
+        obj.fillUp = e.target.checked;
+
+        _this.selfRender();
+      }
     })), /*#__PURE__*/_react["default"].createElement(_common.Field, {
       title: (0, _locale.i18n)('PADDING')
     }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -89,47 +100,47 @@ function (_super) {
       className: "padding-item"
     }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
       type: "icon-padding-top"
-    }), /*#__PURE__*/_react["default"].createElement(_antd.Input, {
+    }), /*#__PURE__*/_react["default"].createElement(_antd.InputNumber, {
       onChange: function onChange(e) {
-        obj.paddingTop = e.target.value;
+        obj.paddingTop = e;
 
         _this.selfRender();
       },
-      value: obj.paddingTop
+      value: obj.paddingTop || 0
     })), /*#__PURE__*/_react["default"].createElement("div", {
       className: "padding-item"
     }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
       type: "icon-padding-bottom"
-    }), /*#__PURE__*/_react["default"].createElement(_antd.Input, {
+    }), /*#__PURE__*/_react["default"].createElement(_antd.InputNumber, {
       onChange: function onChange(e) {
-        obj.paddingBottom = e.target.value;
+        obj.paddingBottom = e;
 
         _this.selfRender();
       },
-      value: obj.paddingBottom
-    })), configPaddingLR && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
+      value: obj.paddingBottom || 0
+    })), /*#__PURE__*/_react["default"].createElement("div", {
       className: "padding-item"
     }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
       type: "icon-padding-left"
-    }), /*#__PURE__*/_react["default"].createElement(_antd.Input, {
+    }), /*#__PURE__*/_react["default"].createElement(_antd.InputNumber, {
       onChange: function onChange(e) {
-        obj.paddingLeft = e.target.value;
+        obj.paddingLeft = e;
 
         _this.selfRender();
       },
-      value: obj.paddingLeft
+      value: obj.paddingLeft || 0
     })), /*#__PURE__*/_react["default"].createElement("div", {
       className: "padding-item"
     }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
       type: "icon-padding-right"
-    }), /*#__PURE__*/_react["default"].createElement(_antd.Input, {
+    }), /*#__PURE__*/_react["default"].createElement(_antd.InputNumber, {
       onChange: function onChange(e) {
-        obj.paddingRight = e.target.value;
+        obj.paddingRight = e;
 
         _this.selfRender();
       },
-      value: obj.paddingRight
-    }))))), configCompSpace && /*#__PURE__*/_react["default"].createElement(_common.Field, {
+      value: obj.paddingRight || 0
+    })))), configCompSpace && /*#__PURE__*/_react["default"].createElement(_common.Field, {
       title: (0, _locale.i18n)('COMPONENT_SPACING')
     }, /*#__PURE__*/_react["default"].createElement(_common.Slider, {
       maxVal: 100,
@@ -146,23 +157,23 @@ function (_super) {
   };
 
   SpacingConfig.defaultProps = {
-    configPaddingLR: false,
     configCompSpace: true,
     configWidth: false,
+    fillUpWidth: false,
     data: {
       pc: {
-        paddingTop: 10,
-        paddingBottom: 10,
-        paddingLeft: 10,
-        paddingRight: 10,
-        marginBottom: 10
+        paddingTop: 0,
+        paddingBottom: 0,
+        paddingLeft: 0,
+        paddingRight: 0,
+        marginBottom: 0
       },
       mobile: {
-        paddingTop: 10,
-        paddingBottom: 10,
-        paddingLeft: 10,
-        paddingRight: 10,
-        marginBottom: 10
+        paddingTop: 0,
+        paddingBottom: 0,
+        paddingLeft: 0,
+        paddingRight: 0,
+        marginBottom: 0
       }
     }
   };