@fonixtree/magic-design 0.0.110 → 0.0.112

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

@@ -8,21 +8,24 @@ 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'
       },
       headline: {
         id: (0, _uuid.v4)(),
         open: true,
-        type: 'Text',
+        type: 'TEXT',
         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,18 +99,32 @@ var getDefaultJSON = function getDefaultJSON() {
           backgroundColor: '#CC1D20'
         },
         buttonText: {
+          sizeType: 'Customize font styles',
           fontFamily: 'Open Sans',
           fontWeight: 600,
           fontSize: 8,
           fontStyle: 'normal',
-          color: '#fff',
-          padding: '0 5px'
+          color: '#fff'
         },
         buttonBorder: {
           open: true,
           borderColor: '',
           borderRadius: 7
         },
+        spacing: {
+          pc: {
+            paddingTop: 0,
+            paddingBottom: 0,
+            paddingLeft: 4,
+            paddingRight: 4
+          },
+          mobile: {
+            paddingTop: 0,
+            paddingBottom: 0,
+            paddingLeft: 4,
+            paddingRight: 4
+          }
+        },
         buttonIcon: {
           iconUrl: '',
           layout: 'right'
@@ -99,11 +133,13 @@ var getDefaultJSON = function getDefaultJSON() {
       },
       productName: {
         id: (0, _uuid.v4)(),
+        contentId: contentId,
         open: true,
-        type: 'Text',
+        type: 'TEXT',
         specialContent: [],
         text: 'Flash Deal',
         content: {
+          sizeType: 'Customize font styles',
           fontFamily: 'Open Sans',
           fontWeight: 500,
           fontSize: 14,
@@ -121,11 +157,13 @@ var getDefaultJSON = function getDefaultJSON() {
       },
       activityPrice: {
         id: (0, _uuid.v4)(),
+        contentId: contentId,
         open: true,
-        type: 'Text',
+        type: 'TEXT',
         specialContent: [],
         text: 'Flash Deal',
         content: {
+          sizeType: 'Customize font styles',
           fontFamily: 'Open Sans',
           fontWeight: 600,
           fontSize: 14,
@@ -143,11 +181,13 @@ var getDefaultJSON = function getDefaultJSON() {
       },
       salesPrice: {
         id: (0, _uuid.v4)(),
+        contentId: contentId,
         open: true,
-        type: 'Text',
+        type: 'TEXT',
         specialContent: [],
         text: 'Flash Deal',
         content: {
+          sizeType: 'Customize font styles',
           fontFamily: 'Open Sans',
           fontWeight: 500,
           fontSize: 10,
@@ -167,9 +207,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/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.js

@@ -9,11 +9,7 @@ var _react = _interopRequireDefault(require("react"));
 
 require("./index.less");
 
-var _defImg = _interopRequireDefault(require("./imgs/defImg1.png"));
-
-var _defImg2 = _interopRequireDefault(require("./imgs/defImg2.png"));
-
-var _defImg3 = _interopRequireDefault(require("./imgs/defImg3.png"));
+var _defImg = _interopRequireDefault(require("./imgs/defImg.png"));
 
 var _ProductItem = _interopRequireDefault(require("../../../../common/components/ProductItem"));
 
@@ -222,31 +218,34 @@ var defaultData = [{
   imgUrlContent: {
     url: _defImg["default"]
   },
-  offerName: 'DITO STARTER PACK + 3GB Data',
-  salesPrice: 49,
-  marketPrice: 100,
-  discountPercent: 51,
-  salePercent: 5000,
+  offerName: 'Product Name',
+  salesPrice: 18000000,
+  specialPrice: 18000000,
+  marketPrice: 19000000,
+  discountPercent: 10,
+  salePercent: 500,
   sppType: '2'
 }, {
   imgUrlContent: {
-    url: _defImg2["default"]
+    url: _defImg["default"]
   },
-  offerName: 'DITO Level Up 99 x 365 days',
-  salesPrice: 594,
-  marketPrice: 1188,
-  discountPercent: 50,
-  salePercent: 5000,
+  offerName: 'Product Name',
+  salesPrice: 18000000,
+  specialPrice: 18000000,
+  marketPrice: 19000000,
+  discountPercent: 10,
+  salePercent: 500,
   sppType: '2'
 }, {
   imgUrlContent: {
-    url: _defImg3["default"]
+    url: _defImg["default"]
   },
-  offerName: 'DITO Level-Up Pack 99 7GB',
-  salesPrice: 99,
-  marketPrice: 138,
-  discountPercent: 28,
-  salePercent: 5000,
+  offerName: 'Product Name',
+  salesPrice: 18000000,
+  specialPrice: 18000000,
+  marketPrice: 19000000,
+  discountPercent: 10,
+  salePercent: 500,
   sppType: '2'
 }];
 
@@ -384,22 +383,8 @@ function (_super) {
 
     var _list = list.length === 0 && (0, _coreUtil.isDesignMode)() ? defaultData : list;
 
-    var bgStyle = {};
-
-    if (panelProps.background.bgType === 'color') {
-      bgStyle = {
-        backgroundColor: (0, _commonUtil.getColorRgba)(panelProps.background.color || '#fff', panelProps.background.opacity / 100 || 1)
-      };
-    } else {
-      bgStyle = {
-        background: "url(" + panelProps.background.image + ") no-repeat center",
-        backgroundSize: '100%'
-      };
-    }
-
     return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, _list.length > 0 && /*#__PURE__*/_react["default"].createElement("div", {
-      className: "m-flash-deal-mobile",
-      style: bgStyle
+      className: "m-flash-deal-mobile"
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "flash-deal-title"
     }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -439,7 +424,8 @@ function (_super) {
 
           return (0, _coreUtil.clickUrl)("/product/detail/" + item.offerId + "?productId=" + ((_a = item.sppProductId) !== null && _a !== void 0 ? _a : ''));
         },
-        panelProps: panelProps.content
+        panelProps: panelProps.content,
+        unknownPrice: isWill
       });
     }))));
   };

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

@@ -64,9 +64,9 @@
     overflow-x: auto;
     overflow-y: hidden;
     white-space: nowrap;
-    border-radius: 9px;
     display: flex;
     align-items: flex-start;
+    justify-content: flex-start;
     position: relative;
 
     .loading-wrap {