@fonixtree/magic-design 0.0.54 → 0.0.56

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

@@ -15,8 +15,6 @@ var _AlignSelector = require("../../../../../common/AlignSelector");
 
 var _components = require("../../../../../meta-comp/components");
 
-var _businessUtil = require("../../../../../utils/businessUtil");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var __extends = void 0 && (void 0).__extends || function () {
@@ -107,7 +105,7 @@ function (_super) {
     var data = this.props.data; // const { ready } = this.state;
     // console.log('----imagetext mobile', data);
 
-    var wrapStyle = (0, _businessUtil.computeStyle)(data, window.magicDesign.device);
+    var wrapStyle = {};
     wrapStyle.textAlign = data.customize.align; // if (data.background.bgType === 'color') {
     //   wrapStyle.backgroundColor = data.background.color;
     //   wrapStyle.opacity = data.background.opacity ? data.background.opacity : 1;

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

@@ -122,7 +122,7 @@ function (_super) {
     // console.log(data);
     // console.log('====================================');
 
-    var wrapStyle = (0, _businessUtil.computeStyle)(data, window.magicDesign.device);
+    var wrapStyle = {};
     wrapStyle.alignItems = _AlignSelector.alignItemMap[data.customize.align];
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: (0, _classnames["default"])('image-text-pc', data.customize.layout.pcLayout),

package/lib/composite-comp/bol/components/Newsletter/defaultJSON.js

@@ -111,12 +111,12 @@ var getDefaultJSON = function getDefaultJSON() {
       pc: {
         paddingTop: 10,
         paddingBottom: 10,
-        marginBottom: 0
+        marginBottom: window.magicDesign.compSpacing * 1.5
       },
       mobile: {
         paddingTop: 10,
         paddingBottom: 10,
-        marginBottom: 0
+        marginBottom: window.magicDesign.compSpacing
       }
     },
     customize: {

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

@@ -19,8 +19,6 @@ var _Text = require("../../../../meta-comp/components/Text");
 
 require("./index.less");
 
-var _businessUtil = require("../../../../utils/businessUtil");
-
 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); }
@@ -90,15 +88,12 @@ function (_super) {
     //   wrapStyle.backgroundPosition = 'center';
     // }
 
-    var wrapStyle = (0, _businessUtil.computeStyle)(nodeData, window.magicDesign.device);
-
     var style = __assign({}, (0, _Text.contentStyle)(nodeData.content.inputField.content));
 
     Reflect.deleteProperty(style, 'width');
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: (0, _classnames["default"])('newsletter-wrap', (_a = {}, _a[nodeData.customize.layout] = true, _a[nodeData.customize.align] = true, _a[window.magicDesign.device] = true, _a)),
-      onClick: this.onComponentClick,
-      style: wrapStyle
+      onClick: this.onComponentClick
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "top-wrap"
     }, nodeData.content.inputField.open && /*#__PURE__*/_react["default"].createElement("div", {

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

@@ -88,12 +88,12 @@ var getDefaultJSON = function getDefaultJSON() {
       pc: {
         paddingTop: 10,
         paddingBottom: 10,
-        marginBottom: 0
+        marginBottom: window.magicDesign.compSpacing * 1.5
       },
       mobile: {
         paddingTop: 10,
         paddingBottom: 10,
-        marginBottom: 0
+        marginBottom: window.magicDesign.compSpacing
       }
     },
     customize: {

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

@@ -15,8 +15,6 @@ var _components = require("../../../../meta-comp/components");
 
 var _compositeDecorator = _interopRequireDefault(require("../../../../decorator/compositeDecorator"));
 
-var _businessUtil = require("../../../../utils/businessUtil");
-
 require("./index.less");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -76,11 +74,9 @@ function (_super) {
     var _a;
 
     var nodeData = this.props.nodeData;
-    var wrapStyle = (0, _businessUtil.computeStyle)(nodeData, window.magicDesign.device);
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: (0, _classnames["default"])('tag-comp-wrap', (_a = {}, _a[nodeData.customize.layout] = true, _a[nodeData.customize.align] = true, _a)),
-      onClick: this.onComponentClick,
-      style: wrapStyle
+      onClick: this.onComponentClick
     }, nodeData.content.image.open && /*#__PURE__*/_react["default"].createElement("div", {
       className: "tag-image"
     }, /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {

package/lib/composite-comp/bol/components/Text/defaultJSON.js

@@ -103,7 +103,7 @@ var getDefaultJSON = function getDefaultJSON() {
       headline: __assign(__assign({}, getDefaultMetaTextJson()), {
         text: 'Title use, click modify text.',
         content: {
-          sizeType: 'Headline 1',
+          sizeType: 'Customize font styles',
           fontFamily: 'Montserrat',
           fontWeight: 600,
           fontSize: 28,
@@ -130,12 +130,12 @@ var getDefaultJSON = function getDefaultJSON() {
       pc: {
         paddingTop: 10,
         paddingBottom: 10,
-        marginBottom: 0
+        marginBottom: window.magicDesign.compSpacing * 1.5
       },
       mobile: {
         paddingTop: 10,
         paddingBottom: 10,
-        marginBottom: 0
+        marginBottom: window.magicDesign.compSpacing
       }
     },
     customize: {

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

@@ -15,8 +15,6 @@ var _components = require("../../../../meta-comp/components");
 
 var _compositeDecorator = _interopRequireDefault(require("../../../../decorator/compositeDecorator"));
 
-var _businessUtil = require("../../../../utils/businessUtil");
-
 require("./index.less");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -76,11 +74,9 @@ function (_super) {
     var _a;
 
     var nodeData = this.props.nodeData;
-    var wrapStyle = (0, _businessUtil.computeStyle)(nodeData, window.magicDesign.device);
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "m-text",
-      onClick: this.onComponentClick,
-      style: wrapStyle
+      onClick: this.onComponentClick
     }, nodeData.title.headline.open && /*#__PURE__*/_react["default"].createElement("div", {
       className: "title-wrap"
     }, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {

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

@@ -15,6 +15,8 @@ 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 () {
@@ -71,21 +73,21 @@ function (_super) {
       onRefresh: this.reRender,
       source: [{
         key: '1',
-        name: i18n('IMAGE_TAG'),
+        name: (0, _locale.i18n)('IMAGE_TAG'),
         value: /*#__PURE__*/_react["default"].createElement(_ImageConfig["default"], {
           data: panelProps.image
         }),
         metaOption: panelProps.image
       }, {
         key: '2',
-        name: i18n('BUTTON_TAG'),
+        name: (0, _locale.i18n)('BUTTON_TAG'),
         value: /*#__PURE__*/_react["default"].createElement(_ButtonConfig["default"], {
           data: panelProps.button
         }),
         metaOption: panelProps.button
       }, {
         key: '3',
-        name: i18n('SECONDARY_BUTTON_TAG'),
+        name: (0, _locale.i18n)('SECONDARY_BUTTON_TAG'),
         value: /*#__PURE__*/_react["default"].createElement(_ButtonConfig["default"], {
           data: panelProps.secondaryButton
         }),

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

@@ -19,6 +19,8 @@ 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) {
@@ -28,19 +30,19 @@ function TagCompConfig(props) {
     headerSize: "large",
     source: [{
       key: '1',
-      name: i18n('CONTENT'),
+      name: (0, _locale.i18n)('CONTENT'),
       value: /*#__PURE__*/_react["default"].createElement(_TagConfigContent["default"], {
         panelProps: data.content
       })
     }, {
       key: '2',
-      name: i18n('SPACING'),
+      name: (0, _locale.i18n)('SPACING'),
       value: /*#__PURE__*/_react["default"].createElement(_SpacingConfig["default"], {
         data: data.spacing
       })
     }, {
       key: '3',
-      name: i18n('CUSTOMIZE'),
+      name: (0, _locale.i18n)('CUSTOMIZE'),
       value: /*#__PURE__*/_react["default"].createElement(_CustomizeConfig["default"], {
         data: data.customize,
         layoutSource: [{
@@ -51,7 +53,7 @@ function TagCompConfig(props) {
       })
     }, {
       key: '4',
-      name: i18n('BACKGROUND'),
+      name: (0, _locale.i18n)('BACKGROUND'),
       value: /*#__PURE__*/_react["default"].createElement(_BackgroundConfig["default"], {
         data: data.background
       })

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

@@ -192,7 +192,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/lib/composite-comp/dito/components/FlashDeal/defaultJSON.js

@@ -168,8 +168,11 @@ var getDefaultJSON = function getDefaultJSON() {
       }
     },
     customize: {
-      layout: 'left',
-      align: 'left'
+      layout: 'layout1',
+      align: 'left',
+      pcRowNum: 6,
+      pcMaxRowNum: 6,
+      pcMinRowNum: 5
     },
     background: {
       opacity: 100,

package/lib/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/lib/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;