@fonixtree/magic-design 0.0.78 → 0.0.80

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.js

@@ -71,14 +71,14 @@ function (_super) {
         return /*#__PURE__*/_react["default"].createElement("img", {
           key: label.imgUrl || label.labelPictureUrl,
           alt: "img",
-          className: (0, _classnames["default"])('image-label-wrap', 'img', (_a = {}, _a["position-" + (label.position || 'default')] = true, _a.small = small, _a)),
+          className: (0, _classnames["default"])('image-label-wrap', 'img', (_a = {}, _a["position-" + (label.position || 'null')] = true, _a.small = small, _a)),
           src: label.imgUrl || label.labelPictureUrl
         });
       }
 
       return /*#__PURE__*/_react["default"].createElement("div", {
         key: label.labelName,
-        className: (0, _classnames["default"])('image-label-wrap', (_b = {}, _b["position-" + (label.position || 'default')] = true, _b))
+        className: (0, _classnames["default"])('image-label-wrap', (_b = {}, _b["position-" + (label.position || 'null')] = true, _b))
       }, label.labelName);
     });
   };

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

@@ -12,8 +12,7 @@
     }
   }
 
-  &.position-1,
-  &.position-default {
+  &.position-1 {
     top: 0;
     left: 0;
   }
@@ -32,4 +31,9 @@
     bottom: 0;
     right: 0;
   }
+
+  &.position-null {
+    top: 0;
+    left: 0;
+  }
 }

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

@@ -144,7 +144,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, {

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

@@ -4,14 +4,12 @@
   background: #FFFFFF;
   border: 1px solid #D2D9E5;
   width: 142px;
-  border-radius: 8px;
+  cursor: pointer;
 
   .img-wrap {
     position: relative;
-    border-radius: 8px;
 
     .product-img {
-      border-radius: 8px;
       width: 140px;
       height: 140px;
       object-fit: cover;
@@ -24,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;
@@ -36,7 +34,7 @@
     }
 
     .product-name {
-      margin-bottom: 5px;
+      margin-bottom: 3px;
       // font-family: 'Montserrat';
       // font-style: normal;
       // font-weight: 500;
@@ -60,7 +58,7 @@
 
     .old-price-wrap {
       display: flex;
-      margin-top: 3px;
+      margin-top: 0px;
       align-items: baseline;
       white-space: nowrap;
       overflow: hidden;
@@ -71,9 +69,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 +131,7 @@
 
   &.fixHeight {
     .promotions-wrap {
-      height: 17px;
+      height: 30px;
     }
 
     .product-name {

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

@@ -121,21 +121,32 @@ 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') {
+      //   if (v === 'tile') {
+      //     this.setState({ showRowNum: false });
+      //   } else {
+      //     this.setState({ showRowNum: true });
+      //   }
+      // }
 
 
-      if (component == 'mobileNavigation') {
-        if (v === 'tile') {
-          _this.setState({
-            showRowNum: false
-          });
-        } else {
-          _this.setState({
-            showRowNum: true
-          });
-        }
-      }
-
       _this.selfRender(); // this.setState({});
 
     };
@@ -192,7 +203,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

@@ -65,14 +65,14 @@ function (_super) {
         configPaddingLR = _a.configPaddingLR,
         configCompSpace = _a.configCompSpace,
         configWidth = _a.configWidth;
-    var obj = data[window.magicDesign.device];
+    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;
 
@@ -89,46 +89,46 @@ 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
+      value: obj.paddingBottom || 0
     })), configPaddingLR && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__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
+      value: obj.paddingRight || 0
     }))))), configCompSpace && /*#__PURE__*/_react["default"].createElement(_common.Field, {
       title: (0, _locale.i18n)('COMPONENT_SPACING')
     }, /*#__PURE__*/_react["default"].createElement(_common.Slider, {
@@ -146,23 +146,23 @@ function (_super) {
   };
 
   SpacingConfig.defaultProps = {
-    configPaddingLR: false,
+    configPaddingLR: true,
     configCompSpace: true,
     configWidth: 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
       }
     }
   };

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,
@@ -167,9 +208,28 @@ var getDefaultJSON = function getDefaultJSON() {
         open: true
       }
     },
+    spacing: {
+      pc: {
+        paddingTop: 0,
+        paddingBottom: 0,
+        paddingLeft: 0,
+        paddingRight: 0,
+        marginBottom: window.magicDesign.compSpacing * 1.5
+      },
+      mobile: {
+        paddingTop: 0,
+        paddingBottom: 0,
+        paddingLeft: 0,
+        paddingRight: 0,
+        marginBottom: window.magicDesign.compSpacing
+      }
+    },
     customize: {
-      layout: 'left',
-      align: 'left'
+      layout: 'layout1',
+      align: 'left',
+      pcRowNum: 6,
+      pcMaxRowNum: 6,
+      pcMinRowNum: 5
     },
     background: {
       opacity: 100,

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

@@ -9,6 +9,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _mobile = _interopRequireDefault(require("./mobile"));
 
+var _pc = _interopRequireDefault(require("./pc"));
+
 var _defaultJSON = require("./defaultJSON");
 
 var _coreUtil = require("../../../../utils/coreUtil");
@@ -70,7 +72,9 @@ function (_super) {
 
   FlashDeal.prototype.render = function () {
     var nodeData = this.props.nodeData;
-    return /*#__PURE__*/_react["default"].createElement("div", null, (0, _coreUtil.isPc)() ? null : /*#__PURE__*/_react["default"].createElement(_mobile["default"], {
+    return /*#__PURE__*/_react["default"].createElement("div", null, (0, _coreUtil.isPc)() ? /*#__PURE__*/_react["default"].createElement(_pc["default"], {
+      panelProps: nodeData
+    }) : /*#__PURE__*/_react["default"].createElement(_mobile["default"], {
       panelProps: nodeData
     }));
   };

package/es/composite-comp/dito/components/FlashDeal/mobile/index.less

@@ -64,7 +64,6 @@
     overflow-x: auto;
     overflow-y: hidden;
     white-space: nowrap;
-    border-radius: 9px;
     display: flex;
     align-items: flex-start;
     position: relative;