@fonixtree/magic-design 0.0.99 → 0.0.101

package/es/composite-comp/bol/components/ImageGallery/mobile/index.js

@@ -7,11 +7,9 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _classnames = _interopRequireDefault(require("classnames"));
-
 require("./index.less");
 
-var _components = require("../../../../../meta-comp/components");
+var _mobx = require("../../../../../mobx");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -41,48 +39,6 @@ var __extends = void 0 && (void 0).__extends || function () {
   };
 }();
 
-var __spreadArrays = void 0 && (void 0).__spreadArrays || function () {
-  for (var s = 0, i = 0, il = arguments.length; i < il; i++) {
-    s += arguments[i].length;
-  }
-
-  for (var r = Array(s), k = 0, i = 0; i < il; i++) {
-    for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++) {
-      r[k] = a[j];
-    }
-  }
-
-  return r;
-};
-
-var MOBILE_IMG_SIZE = {
-  1: {
-    maxW: 343,
-    maxH: 258,
-    gap: 12
-  },
-  2: {
-    maxW: 165,
-    maxH: 124,
-    gap: 12
-  },
-  3: {
-    maxW: 106,
-    maxH: 80,
-    gap: 12
-  },
-  4: {
-    maxW: 77,
-    maxH: 56,
-    gap: 12
-  },
-  5: {
-    maxW: 62,
-    maxH: 45,
-    gap: 8
-  }
-};
-
 var ImageGalleryMobile =
 /** @class */
 function (_super) {
@@ -92,45 +48,27 @@ function (_super) {
     var _this = _super !== null && _super.apply(this, arguments) || this;
 
     _this.state = {};
+    _this.carouselRef = /*#__PURE__*/_react["default"].createRef();
+    _this.destroy = null;
     return _this;
   }
 
+  ImageGalleryMobile.prototype.componentDidMount = function () {
+    this.destroy = (0, _mobx.autorun)(function () {// this.init(this.props.data.groupSource);
+    });
+  };
+
+  ImageGalleryMobile.prototype.componentWillReceiveProps = function (nextProps) {// this.init(nextProps.data.groupSource);
+  };
+
+  ImageGalleryMobile.prototype.componentWillUnmount = function () {// this.destroy();
+  };
+
   ImageGalleryMobile.prototype.render = function () {
     var data = this.props.data;
-    var isHorizontal = data.customize.layout.h5Layout === 'layout2';
-    var colNum = isHorizontal ? data.customize.rowNum : 1;
-    var newData = data.groupSource.reduce(function (prev, curr, index) {
-      var i = Math.floor(index / colNum);
-      prev[i] = __spreadArrays(prev[i] || [], [curr]);
-      return prev;
-    }, []);
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "m-image-gallery-mobile"
-    }, /*#__PURE__*/_react["default"].createElement("div", {
-      className: "content"
-    }, newData.map(function (arr, index) {
-      return /*#__PURE__*/_react["default"].createElement("div", {
-        key: index,
-        className: (0, _classnames["default"])('line', {
-          isHorizontal: isHorizontal
-        }),
-        style: {
-          gap: MOBILE_IMG_SIZE[colNum].gap
-        }
-      }, arr.map(function (item) {
-        return /*#__PURE__*/_react["default"].createElement("div", {
-          key: item.id,
-          className: "img-wrap",
-          style: {
-            width: "calc((100% - " + MOBILE_IMG_SIZE[colNum].gap * (colNum - 1) + "px) / " + colNum + ")"
-          }
-        }, /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
-          data: item.image,
-          maxHeight: MOBILE_IMG_SIZE[colNum].maxH,
-          maxWidth: MOBILE_IMG_SIZE[colNum].maxW
-        }));
-      }));
-    })));
+    }, "image gallery");
   };
 
   ImageGalleryMobile.defaultProps = {

package/es/composite-comp/bol/components/ImageGallery/mobile/index.less

@@ -1,24 +1,72 @@
-.m-image-gallery-mobile {
-  .content {
-    max-width: 345px;
-    margin: 0 auto;
+.m-banner-mobile {
+  position: relative;
+  // .turnPage {
+  //   position: absolute;
+  //   top: 50%;
+  //   transform: translateY(-50%);
+  //   z-index: 3;
+  //   cursor: pointer;
+  // }
+  // .leftBtn {
+  //   left: 20px;
+  // }
+  // .rightBtn {
+  //   right: 20px;
+  // }
 
-    .line {
-      margin-bottom: 12px;
+  .carouselItem {
+    height: 386px;
+    position: relative;
+    display: flex;
 
-      &.isHorizontal {
-        display: flex;
-        justify-content: flex-start;
-      }
+    .carouseContent {
+      padding: 80px 28px 0;
+      position: relative;
+      z-index: 2;
+      display: flex;
+      flex-direction: column;
+      margin-bottom: auto;
+    }
+
+    .title {
+      margin-bottom: 8px;
+    }
+
+    .sub-title {
+      margin-bottom: 20px;
+    }
 
-      &:last-child {
-        margin-bottom: 0;
+    .btn-wrap {
+      display: flex;
+      align-items: center;
+      justify-content: flex-start;
+
+      .btn {
+        margin-right: 12px;
       }
+    }
+  }
+
+  .swiper-ban {
+    position: absolute;
+    width: 100%;
+    bottom: 10px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    .ban {
+      font-size: 16px;
+      width: 1.5em;
+      height: 0.3em;
+      background: #FFF;
+      cursor: inherit;
+      margin-right: 0.3em;
+      transition: all .5s;
 
-      .img-wrap {
-        display: flex;
-        align-items: center;
-        justify-content: center;
+      &.active {
+        width: 1.5em;
+        opacity: 1;
       }
     }
   }

package/es/composite-comp/bol/components/ImageText/defaultJSON.js

@@ -9,17 +9,12 @@ var _uuid = require("uuid");
 
 var ImageTextGroupSourceJSON = function ImageTextGroupSourceJSON() {
   var groupId = (0, _uuid.v4)();
-  var imageId = (0, _uuid.v4)();
-  var titleId = (0, _uuid.v4)();
-  var textId = (0, _uuid.v4)();
-  var buttonId = (0, _uuid.v4)();
-  var secButtonId = (0, _uuid.v4)();
   return {
     id: groupId,
     image: {
       parentId: groupId,
-      id: imageId,
-      open: true,
+      id: (0, _uuid.v4)(),
+      open: false,
       type: 'IMAGE',
       content: {
         h5Name: 'name2',
@@ -38,17 +33,18 @@ var ImageTextGroupSourceJSON = function ImageTextGroupSourceJSON() {
     },
     title: {
       parentId: groupId,
-      id: titleId,
+      id: (0, _uuid.v4)(),
       open: true,
       type: 'TEXT',
       specialContent: [],
       text: 'Title of this group',
       content: {
-        sizeType: 'Customize font styles',
+        sizeType: 'Headline 1',
         fontFamily: 'Open Sans',
         fontWeight: 600,
         fontSize: 12,
-        color: '#232F46'
+        color: '#232F46',
+        width: 0
       },
       underline: {
         open: false,
@@ -59,24 +55,25 @@ var ImageTextGroupSourceJSON = function ImageTextGroupSourceJSON() {
     },
     text: {
       parentId: groupId,
-      id: textId,
+      id: (0, _uuid.v4)(),
       open: true,
       type: 'TEXT',
       specialContent: [],
       text: 'Please enter a description',
       content: {
-        sizeType: 'Customize font styles',
+        sizeType: 'Headline 1',
         fontFamily: 'Open Sans',
         fontWeight: 400,
         fontSize: 10,
-        color: '#8493AF'
+        color: '#8493AF',
+        width: 0
       },
       underline: {},
       vertical: {}
     },
     button: {
       parentId: groupId,
-      id: buttonId,
+      id: (0, _uuid.v4)(),
       open: true,
       type: 'BUTTON',
       text: 'Button',
@@ -85,7 +82,7 @@ var ImageTextGroupSourceJSON = function ImageTextGroupSourceJSON() {
         backgroundColor: '#2F54EB'
       },
       buttonText: {
-        sizeType: 'Customize font styles',
+        sizeType: 'Headline 1',
         fontFamily: 'Open Sans',
         fontWeight: 400,
         fontSize: 10,
@@ -101,27 +98,13 @@ var ImageTextGroupSourceJSON = function ImageTextGroupSourceJSON() {
         iconUrl: '',
         layout: 'right'
       },
-      spacing: {
-        pc: {
-          paddingTop: 6,
-          paddingBottom: 6,
-          paddingLeft: 10,
-          paddingRight: 10
-        },
-        mobile: {
-          paddingTop: 6,
-          paddingBottom: 6,
-          paddingLeft: 10,
-          paddingRight: 10
-        }
-      },
       hover: {
         open: false,
         content: {
           backgroundColor: '#0d39ed'
         },
         buttonText: {
-          sizeType: 'Customize font styles',
+          sizeType: 'Headline 1',
           fontFamily: 'Open Sans',
           fontWeight: 600,
           fontSize: 14,
@@ -137,11 +120,15 @@ var ImageTextGroupSourceJSON = function ImageTextGroupSourceJSON() {
           iconUrl: '',
           layout: 'right'
         }
+      },
+      spacing: {
+        pc: {},
+        mobile: {}
       }
     },
     secondButton: {
       parentId: groupId,
-      id: secButtonId,
+      id: (0, _uuid.v4)(),
       open: true,
       type: 'BUTTON',
       text: 'More',
@@ -150,7 +137,7 @@ var ImageTextGroupSourceJSON = function ImageTextGroupSourceJSON() {
         backgroundColor: '#fff'
       },
       buttonText: {
-        sizeType: 'Customize font styles',
+        sizeType: 'Headline 1',
         fontFamily: 'Open Sans',
         fontWeight: 400,
         fontSize: 10,
@@ -166,27 +153,13 @@ var ImageTextGroupSourceJSON = function ImageTextGroupSourceJSON() {
         iconUrl: '',
         layout: 'right'
       },
-      spacing: {
-        pc: {
-          paddingTop: 6,
-          paddingBottom: 6,
-          paddingLeft: 10,
-          paddingRight: 10
-        },
-        mobile: {
-          paddingTop: 6,
-          paddingBottom: 6,
-          paddingLeft: 10,
-          paddingRight: 10
-        }
-      },
       hover: {
         open: false,
         content: {
           backgroundColor: '#E9F0FF'
         },
         buttonText: {
-          sizeType: 'Customize font styles',
+          sizeType: 'Headline 1',
           fontFamily: 'Open Sans',
           fontWeight: 600,
           fontSize: 14,
@@ -202,6 +175,10 @@ var ImageTextGroupSourceJSON = function ImageTextGroupSourceJSON() {
           iconUrl: '',
           layout: 'right'
         }
+      },
+      spacing: {
+        pc: {},
+        mobile: {}
       }
     },
     background: {
@@ -214,7 +191,7 @@ var ImageTextGroupSourceJSON = function ImageTextGroupSourceJSON() {
       open: false,
       image: {
         parentId: groupId,
-        id: imageId,
+        id: (0, _uuid.v4)(),
         open: false,
         type: 'IMAGE',
         content: {
@@ -234,7 +211,7 @@ var ImageTextGroupSourceJSON = function ImageTextGroupSourceJSON() {
       },
       title: {
         parentId: groupId,
-        id: titleId,
+        id: (0, _uuid.v4)(),
         open: true,
         type: 'TEXT',
         specialContent: [],
@@ -254,13 +231,13 @@ var ImageTextGroupSourceJSON = function ImageTextGroupSourceJSON() {
         vertical: {}
       },
       text: {
-        id: textId,
+        id: (0, _uuid.v4)(),
         open: true,
         type: 'TEXT',
         specialContent: [],
         text: '',
         content: {
-          sizeType: 'Customize font styles',
+          sizeType: 'Headline 1',
           fontFamily: 'Open Sans',
           fontWeight: 400,
           fontSize: 18,
@@ -271,7 +248,7 @@ var ImageTextGroupSourceJSON = function ImageTextGroupSourceJSON() {
         vertical: {}
       },
       button: {
-        id: buttonId,
+        id: (0, _uuid.v4)(),
         open: true,
         type: 'BUTTON',
         text: 'Button',
@@ -280,7 +257,7 @@ var ImageTextGroupSourceJSON = function ImageTextGroupSourceJSON() {
           backgroundColor: '#2F54EB'
         },
         buttonText: {
-          sizeType: 'Customize font styles',
+          sizeType: 'Headline 1',
           fontFamily: 'Open Sans',
           fontWeight: 600,
           fontSize: 14,
@@ -302,7 +279,7 @@ var ImageTextGroupSourceJSON = function ImageTextGroupSourceJSON() {
             backgroundColor: '#0d39ed'
           },
           buttonText: {
-            sizeType: 'Customize font styles',
+            sizeType: 'Headline 1',
             fontFamily: 'Open Sans',
             fontWeight: 600,
             fontSize: 14,
@@ -321,7 +298,7 @@ var ImageTextGroupSourceJSON = function ImageTextGroupSourceJSON() {
         }
       },
       secondButton: {
-        id: secButtonId,
+        id: (0, _uuid.v4)(),
         open: true,
         type: 'BUTTON',
         text: 'More',
@@ -330,7 +307,7 @@ var ImageTextGroupSourceJSON = function ImageTextGroupSourceJSON() {
           backgroundColor: '#fff'
         },
         buttonText: {
-          sizeType: 'Customize font styles',
+          sizeType: 'Headline 1',
           fontFamily: 'Open Sans',
           fontWeight: 600,
           fontSize: 14,
@@ -352,7 +329,7 @@ var ImageTextGroupSourceJSON = function ImageTextGroupSourceJSON() {
             backgroundColor: '#E9F0FF'
           },
           buttonText: {
-            sizeType: 'Customize font styles',
+            sizeType: 'Headline 1',
             fontFamily: 'Open Sans',
             fontWeight: 600,
             fontSize: 14,
@@ -386,6 +363,151 @@ var getDefaultJSON = function getDefaultJSON() {
   return {
     id: (0, _uuid.v4)(),
     type: 'IMAGE_TEXT',
+    // headline: {
+    //   id: uuidv4(),
+    //   open: true,
+    //   type: 'TEXT',
+    //   specialContent: [],
+    //   text: 'Digital Maturity',
+    //   content: {
+    //     sizeType: 'Headline 1',
+    //     fontFamily: 'Open Sans',
+    //     fontWeight: 600,
+    //     fontSize: 28,
+    //     color: '#232F46',
+    //     width: 0,
+    //   },
+    //   underline: {
+    //     open: false,
+    //     textDecorationColor: '',
+    //     textDecorationStyle: 'solid',
+    //   },
+    //   vertical: {
+    //   },
+    // },
+    // subtitle: {
+    //   id: uuidv4(),
+    //   open: true,
+    //   type: 'TEXT',
+    //   specialContent: [],
+    //   text: 'Freedom to innovate and create with ODA compliant B/OSS solutions',
+    //   content: {
+    //     sizeType: 'Headline 1',
+    //     fontFamily: 'Open Sans',
+    //     fontWeight: 400,
+    //     // textAlign: 'center',
+    //     fontSize: 16,
+    //     color: '#232F46',
+    //     width: 0,
+    //   },
+    //   underline: {
+    //     open: false,
+    //     textDecorationColor: '',
+    //     textDecorationStyle: 'solid',
+    //   },
+    //   vertical: {
+    //   },
+    // },
+    // button: {
+    //   id: uuidv4(),
+    //   open: true,
+    //   type: 'BUTTON',
+    //   text: 'Button',
+    //   content: {
+    //     url: '',
+    //     backgroundColor: '#2F54EB',
+    //   },
+    //   buttonText: {
+    //     sizeType: 'Headline 1',
+    //     fontFamily: 'Open Sans',
+    //     fontWeight: 600,
+    //     fontSize: 14,
+    //     fontStyle: 'normal',
+    //     color: '#fff',
+    //   },
+    //   buttonBorder: {
+    //     open: true,
+    //     borderColor: '',
+    //     borderRadius: 6,
+    //   },
+    //   buttonIcon: {
+    //     iconUrl: '',
+    //     layout: 'right',
+    //   },
+    //   hover: {
+    //     open: false,
+    //     content: {
+    //       backgroundColor: '#0d39ed',
+    //     },
+    //     buttonText: {
+    //       sizeType: 'Headline 1',
+    //       fontFamily: 'Open Sans',
+    //       fontWeight: 600,
+    //       fontSize: 14,
+    //       fontStyle: 'normal',
+    //       color: '#fff',
+    //     },
+    //     buttonBorder: {
+    //       open: true,
+    //       borderColor: '',
+    //       borderRadius: 6,
+    //     },
+    //     buttonIcon: {
+    //       iconUrl: '',
+    //       layout: 'right',
+    //     },
+    //   },
+    // },
+    // secondButton: {
+    //   id: uuidv4(),
+    //   open: false,
+    //   type: 'BUTTON',
+    //   text: 'Button',
+    //   content: {
+    //     url: '',
+    //     backgroundColor: '#FFFFFF',
+    //   },
+    //   buttonText: {
+    //     sizeType: 'Headline 1',
+    //     fontFamily: 'Open Sans',
+    //     fontWeight: 600,
+    //     fontSize: 14,
+    //     fontStyle: 'normal',
+    //     color: '#2F54EB',
+    //   },
+    //   buttonBorder: {
+    //     open: true,
+    //     borderColor: '#2F54EB',
+    //     borderRadius: 6,
+    //   },
+    //   buttonIcon: {
+    //     iconUrl: '',
+    //     layout: 'right',
+    //   },
+    //   hover: {
+    //     open: false,
+    //     content: {
+    //       backgroundColor: '#0d39ed',
+    //     },
+    //     buttonText: {
+    //       sizeType: 'Headline 1',
+    //       fontFamily: 'Open Sans',
+    //       fontWeight: 600,
+    //       fontSize: 14,
+    //       fontStyle: 'normal',
+    //       color: '#fff',
+    //     },
+    //     buttonBorder: {
+    //       open: true,
+    //       borderColor: '',
+    //       borderRadius: 6,
+    //     },
+    //     buttonIcon: {
+    //       iconUrl: '',
+    //       layout: 'right',
+    //     },
+    //   },
+    // },
     spacing: {
       pc: {
         paddingTop: 10,

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

@@ -15,6 +15,8 @@ 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 () {
@@ -102,9 +104,10 @@ function (_super) {
   ImageTextMobile.prototype.render = function () {
     var _this = this;
 
-    var data = this.props.data; // console.log('----imagetext mobile', data);
+    var data = this.props.data; // const { ready } = this.state;
+    // console.log('----imagetext mobile', data);
 
-    var wrapStyle = {};
+    var wrapStyle = (0, _businessUtil.computeStyle)(data, window.magicDesign.device);
     wrapStyle.textAlign = data.customize.align; // if (data.background.bgType === 'color') {
     //   wrapStyle.backgroundColor = data.background.color;
     //   wrapStyle.opacity = data.background.opacity ? data.background.opacity : 1;
@@ -123,7 +126,6 @@ function (_super) {
       cardBtnStyle.justifyContent = _AlignSelector.alignItemMap[data.customize.align];
     }
 
-    console.log('source', data);
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: (0, _classnames["default"])('image-text-mobile', data.customize.layout.h5Layout),
       style: wrapStyle

package/es/composite-comp/bol/components/ImageText/mobile/index.less

@@ -59,8 +59,8 @@
         }
         .card-btn-wrap {
           display: flex;
-          .card-second-btn {
-            margin-left: 12px;
+          .card-first-btn {
+            margin-right: 12px;
           }
         }
       }
@@ -94,8 +94,8 @@
         }
         .card-btn-wrap {
           display: flex;
-          .card-second-btn {
-            margin-left: 12px;
+          .card-first-btn {
+            margin-right: 12px;
           }
         }
       }
@@ -135,8 +135,8 @@
         flex-direction: column;
       }
 
-      .card-first-btn, .card-second-btn {
-        margin-bottom: 8px;
+      .card-second-btn {
+        margin-top: 8px;
       }
     }
     .card-margin-bottom {
@@ -170,8 +170,8 @@
         }
         .card-btn-wrap {
           display: flex;
-          .card-second-btn {
-            margin-left: 12px;
+          .card-first-btn {
+            margin-right: 12px;
           }
         }
       }