@fonixtree/magic-design 0.0.71 → 0.0.72

package/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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 || 'null')] = true, _a.small = small, _a)),
+          className: (0, _classnames["default"])('image-label-wrap', 'img', (_a = {}, _a["position-" + (label.position || 'default')] = 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 || 'null')] = true, _b))
+        className: (0, _classnames["default"])('image-label-wrap', (_b = {}, _b["position-" + (label.position || 'default')] = true, _b))
       }, label.labelName);
     });
   };

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

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

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

@@ -4,11 +4,14 @@
   background: #FFFFFF;
   border: 1px solid #D2D9E5;
   width: 142px;
+  border-radius: 8px;
 
   .img-wrap {
     position: relative;
+    border-radius: 8px;
 
     .product-img {
+      border-radius: 8px;
       width: 140px;
       height: 140px;
       object-fit: cover;
@@ -21,10 +24,10 @@
     .promotions-wrap {
       display: flex;
       flex-wrap: wrap;
+      margin-bottom: 5px;
 
       .promotion-item {
         margin-right: 5px;
-        margin-bottom: 5px;
 
         &:last-child {
           margin-right: 0;
@@ -33,7 +36,7 @@
     }
 
     .product-name {
-      margin-bottom: 3px;
+      margin-bottom: 5px;
       // font-family: 'Montserrat';
       // font-style: normal;
       // font-weight: 500;
@@ -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,11 +131,11 @@
 
   &.fixHeight {
     .promotions-wrap {
-      // height: 17px;
+      height: 17px;
     }
 
     .product-name {
-      // height: 38px;
+      height: 38px;
     }
   }
 

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

@@ -121,32 +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') {
-      //   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({});
 
     };
@@ -203,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"

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

@@ -89,9 +89,9 @@ function (_super) {
       className: "padding-item"
     }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
       type: "icon-padding-top"
-    }), /*#__PURE__*/_react["default"].createElement(_antd.InputNumber, {
+    }), /*#__PURE__*/_react["default"].createElement(_antd.Input, {
       onChange: function onChange(e) {
-        obj.paddingTop = e;
+        obj.paddingTop = e.target.value;
 
         _this.selfRender();
       },
@@ -100,9 +100,9 @@ function (_super) {
       className: "padding-item"
     }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
       type: "icon-padding-bottom"
-    }), /*#__PURE__*/_react["default"].createElement(_antd.InputNumber, {
+    }), /*#__PURE__*/_react["default"].createElement(_antd.Input, {
       onChange: function onChange(e) {
-        obj.paddingBottom = e;
+        obj.paddingBottom = e.target.value;
 
         _this.selfRender();
       },
@@ -111,9 +111,9 @@ function (_super) {
       className: "padding-item"
     }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
       type: "icon-padding-left"
-    }), /*#__PURE__*/_react["default"].createElement(_antd.InputNumber, {
+    }), /*#__PURE__*/_react["default"].createElement(_antd.Input, {
       onChange: function onChange(e) {
-        obj.paddingLeft = e;
+        obj.paddingLeft = e.target.value;
 
         _this.selfRender();
       },
@@ -122,9 +122,9 @@ function (_super) {
       className: "padding-item"
     }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
       type: "icon-padding-right"
-    }), /*#__PURE__*/_react["default"].createElement(_antd.InputNumber, {
+    }), /*#__PURE__*/_react["default"].createElement(_antd.Input, {
       onChange: function onChange(e) {
-        obj.paddingRight = e;
+        obj.paddingRight = e.target.value;
 
         _this.selfRender();
       },

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

@@ -8,13 +8,11 @@ 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'
       },
@@ -25,7 +23,6 @@ var getDefaultJSON = function getDefaultJSON() {
         specialContent: [],
         text: 'Flash Deal',
         content: {
-          sizeType: 'Customize font styles',
           fontFamily: 'Open Sans',
           fontWeight: 600,
           fontSize: 14,
@@ -51,7 +48,6 @@ var getDefaultJSON = function getDefaultJSON() {
           backgroundColor: ''
         },
         buttonText: {
-          sizeType: 'Customize font styles',
           fontFamily: 'Open Sans',
           fontWeight: 600,
           fontSize: 12,
@@ -64,20 +60,6 @@ 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'
@@ -86,11 +68,9 @@ var getDefaultJSON = function getDefaultJSON() {
       }
     },
     content: {
-      id: contentId,
       sortType: '1',
       label: {
         id: (0, _uuid.v4)(),
-        contentId: contentId,
         open: true,
         type: 'BUTTON',
         text: 'Button',
@@ -99,7 +79,6 @@ var getDefaultJSON = function getDefaultJSON() {
           backgroundColor: '#CC1D20'
         },
         buttonText: {
-          sizeType: 'Customize font styles',
           fontFamily: 'Open Sans',
           fontWeight: 600,
           fontSize: 8,
@@ -112,20 +91,6 @@ 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'
@@ -134,13 +99,11 @@ 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,
@@ -158,13 +121,11 @@ 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,
@@ -182,13 +143,11 @@ 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,
@@ -208,28 +167,9 @@ 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: 'layout1',
-      align: 'left',
-      pcRowNum: 6,
-      pcMaxRowNum: 6,
-      pcMinRowNum: 5
+      layout: 'left',
+      align: 'left'
     },
     background: {
       opacity: 100,

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

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

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

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