@fonixtree/magic-design 0.0.84 → 0.0.85

package/es/core/Designer/ViewArea/index.js

@@ -13,6 +13,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _isEmpty = _interopRequireDefault(require("lodash/isEmpty"));
 
+var _antd = require("antd");
+
 var _constants = require("../../../constants");
 
 var _componentTypes = require("../../../constants/component-types");
@@ -106,6 +108,26 @@ function (_super) {
       return source;
     };
 
+    _this.onCancelClick = function () {
+      var onCancelPublish = _this.props.onCancelPublish;
+
+      _antd.Modal.confirm({
+        title: 'Cancel Publish Later',
+        content: 'Do you want to cancel publishing later?',
+        okText: 'Yes',
+        cancelText: 'No',
+        onOk: function onOk() {
+          return new Promise(function (resolve) {
+            if (onCancelPublish) {
+              onCancelPublish();
+            }
+
+            resolve();
+          });
+        }
+      });
+    };
+
     return _this;
   }
 
@@ -127,12 +149,20 @@ function (_super) {
     var _a = this.props,
         device = _a.device,
         renderHeader = _a.renderHeader,
-        pageData = _a.pageData;
+        pageData = _a.pageData,
+        appointmentDate = _a.appointmentDate;
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: (0, _classnames["default"])('design-area-wrap', {
         'phone-edit': this.isPhoneEdit()
       })
-    }, renderHeader(), /*#__PURE__*/_react["default"].createElement("div", {
+    }, renderHeader(), appointmentDate && /*#__PURE__*/_react["default"].createElement("div", {
+      className: "appointment_wrap"
+    }, /*#__PURE__*/_react["default"].createElement("div", {
+      className: "appointment_tip"
+    }, "This page will be published at " + appointmentDate + ", If you need to edit it, please cancel the publishing later"), /*#__PURE__*/_react["default"].createElement("div", {
+      className: "cancel_btn",
+      onClick: this.onCancelClick
+    }, "Cancel Publish Later")), /*#__PURE__*/_react["default"].createElement("div", {
       className: device === _constants.deviceTypeMap.PC ? 'pc_view_area' : 'phone_view_area'
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "device_border",

package/es/core/Designer/ViewArea/index.less

@@ -8,6 +8,35 @@
   transition-property: all;
   transition-duration: .3s;
   transition-timing-function: ease;
+  .appointment_wrap {
+    height: 44px;
+    background-color: #FFF8F0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    .appointment_tip{
+      font-family: 'Open Sans';
+      font-style: normal;
+      font-weight: 400;
+      font-size: 13px;
+      color:#FF8541;
+    }
+    .cancel_btn {
+      font-family: 'Open Sans';
+      font-style: normal;
+      font-weight: 400;
+      font-size: 14px;
+      margin-left: 10px;
+      display: flex;
+      align-items: center;
+      padding: 0 12px;
+      height: 22px;
+      background-color: #2F54EB;
+      border-radius: 4px;
+      color: #FFF;
+      cursor: pointer;
+    }
+  }
   &.phone-edit {
     margin-left: 355px;
   }

package/es/core/Designer/index.js

@@ -27,6 +27,8 @@ var _ViewArea = _interopRequireDefault(require("./ViewArea"));
 
 var _History = _interopRequireDefault(require("./History"));
 
+var _AppointmentModal = _interopRequireDefault(require("./AppointmentModal"));
+
 var _componentTypes = require("../../constants/component-types");
 
 var _mobx = require("../../mobx");
@@ -317,6 +319,8 @@ function (_super) {
         });
       };
 
+      console.log(code);
+
       switch (code) {
         case _constants.quickMenuCode.UNDO:
           _this.history.undo(callback);
@@ -332,6 +336,13 @@ function (_super) {
           onPublish(handleParams);
           break;
 
+        case _constants.quickMenuCode.PUBLISH_LATER:
+          _this.setState({
+            appointmentVisible: true
+          });
+
+          break;
+
         case _constants.quickMenuCode.PREVIEW:
           onPreviews(handleParams);
           break;
@@ -362,6 +373,22 @@ function (_super) {
       });
     };
 
+    _this.onAppointmentConfirm = function (date) {
+      var onPublish = _this.props.onPublish;
+      var _a = _this.state,
+          device = _a.device,
+          MPageData = _a.MPageData;
+      var handleParams = {
+        pageData: {
+          id: (0, _uuid.v4)(),
+          childNodes: MPageData
+        },
+        device: device,
+        appointmentDete: date
+      };
+      onPublish(handleParams);
+    };
+
     var pageData = props.pageData,
         config = props.config,
         locale = props.locale;
@@ -378,7 +405,8 @@ function (_super) {
 
     _this.state = {
       MPageData: MPageData,
-      device: _constants.deviceTypeMap.PHONE
+      device: _constants.deviceTypeMap.PHONE,
+      appointmentVisible: false
     };
     setDesignConfig(config);
     return _this;
@@ -440,11 +468,13 @@ function (_super) {
 
     var _a = this.state,
         MPageData = _a.MPageData,
-        device = _a.device;
+        device = _a.device,
+        appointmentVisible = _a.appointmentVisible;
     var _b = this.props,
         pagesManager = _b.pagesManager,
         compSource = _b.compSource,
-        pageName = _b.pageName;
+        pageName = _b.pageName,
+        onCancelPublish = _b.onCancelPublish;
     return /*#__PURE__*/_react["default"].createElement(_mobxReact.Provider, {
       store: _mobx.store
     }, /*#__PURE__*/_react["default"].createElement(_antd.ConfigProvider, {
@@ -475,10 +505,20 @@ function (_super) {
       pageData: MPageData
     }), /*#__PURE__*/_react["default"].createElement(_ViewArea["default"] // ref={this.viewAreaRef}
     , {
+      appointmentDate: this.props.appointmentDate,
       device: device,
+      onCancelPublish: onCancelPublish,
       pageData: MPageData,
       renderHeader: this.renderHeader
-    })))));
+    })), /*#__PURE__*/_react["default"].createElement(_AppointmentModal["default"], {
+      onClose: function onClose() {
+        return _this.setState({
+          appointmentVisible: false
+        });
+      },
+      onConfirm: this.onAppointmentConfirm,
+      visible: appointmentVisible
+    }))));
   };
 
   return Designer;

package/es/decorator/metaDecorator.js

@@ -143,7 +143,7 @@ function metaDecorator(WrappedComponent) {
         var style = {
           boxSizing: 'border-box',
           height: '100%',
-          border: '1px solid transparent'
+          border: 'none'
         };
 
         if (window.magicDesign.mode === 'renderer') {

package/es/locale/en/en.json

@@ -1,5 +1,9 @@
 {
   "IMAGES": "Images",
+  "PUBLISH_TIME": "Publish Time",
+  "CONFIRM": "Confirm",
+  "PUBLISH_LATER": "Publish Later",
+  "PUBLISH_NOW": "Publish Now",
   "SEARCH_BOX": "Search Box",
   "PLEASE_INPUT_KEYWORDS": "Please input keywords",
   "SHOPPING_CART": "Shopping Cart",

package/es/locale/es/es.json

@@ -1,5 +1,9 @@
 {
   "IMAGES": "Images",
+  "PUBLISH_TIME": "Publish Time",
+  "CONFIRM": "Confirm",
+  "PUBLISH_LATER": "Publish Later",
+  "PUBLISH_NOW": "Publish Now",
   "SEARCH_BOX": "Search Box",
   "PLEASE_INPUT_KEYWORDS": "Please input keywords",
   "SHOPPING_CART": "Shopping Cart",

package/es/locale/id/id.json

@@ -1,5 +1,9 @@
 {
   "IMAGES": "Images",
+  "PUBLISH_TIME": "Publish Time",
+  "CONFIRM": "Confirm",
+  "PUBLISH_LATER": "Publish Later",
+  "PUBLISH_NOW": "Publish Now",
   "SEARCH_BOX": "Search Box",
   "PLEASE_INPUT_KEYWORDS": "Please input keywords",
   "SHOPPING_CART": "Shopping Cart",

package/lib/assets/less/button.less

@@ -6,4 +6,27 @@
   &.ant-btn-sm  {
     height: @small !important;
   }
+  &.ant-btn-primary {
+    background-color: #2F54EB !important;
+    border-color:#2F54EB !important;
+    &:hover {
+      background-color: #1D39C4 !important;
+      border-color:#1D39C4 !important;
+    }
+  }
+  &.ant-btn-default {
+    &:hover {
+      border-color:#1D39C4 !important;
+      color:#1D39C4 !important;
+    }
+  }
+  &.ant-btn-light {
+    border: none;
+    background-color: #E9F0FF;
+    color: #2F54EB;
+    &:hover {
+      background-color: #D6E4FF;
+      color: #2F54EB;
+    }
+  }
 }

package/lib/assets/less/datepicker.less

@@ -0,0 +1,11 @@
+.ant-picker {
+  &:hover {
+    border-color: #2F54EB !important;
+  }
+  &.ant-picker-focused {
+    border-color: #2F54EB !important;
+  }
+}
+.ant-picker-time-panel-column > li.ant-picker-time-panel-cell-selected .ant-picker-time-panel-cell-inner {
+  background-color: #E9F0FF !important;
+}

package/lib/assets/less/index.less

@@ -9,4 +9,5 @@
 @import './modal.less';
 @import './input.less';
 @import './button.less';
-@import './form.less';
+@import './form.less';
+@import './datepicker.less';

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

@@ -29,14 +29,10 @@ require("slick-carousel/slick/slick.css");
 
 require("slick-carousel/slick/slick-theme.css");
 
-var _ref, _ref2, _ref3, _ref4;
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 var __extends = void 0 && (void 0).__extends || function () {
   var _extendStatics = function extendStatics(d, b) {
     _extendStatics = Object.setPrototypeOf || {
@@ -73,19 +69,27 @@ var PC_IMG_SIZE = [{
   maxW: 524,
   minH: 150,
   maxH: 524
-}, (_ref = {
+}, {
   minW: 100,
-  maxW: 341
-}, _defineProperty(_ref, "minW", 100), _defineProperty(_ref, "maxW", 341), _ref), (_ref2 = {
+  maxW: 341,
+  minH: 100,
+  maxH: 341
+}, {
   minW: 100,
-  maxW: 251
-}, _defineProperty(_ref2, "minW", 100), _defineProperty(_ref2, "maxW", 251), _ref2), (_ref3 = {
+  maxW: 251,
+  minH: 100,
+  maxH: 251
+}, {
   minW: 100,
-  maxW: 195
-}, _defineProperty(_ref3, "minW", 100), _defineProperty(_ref3, "maxW", 195), _ref3), (_ref4 = {
+  maxW: 195,
+  minH: 100,
+  maxH: 195
+}, {
   minW: 100,
-  maxW: 168
-}, _defineProperty(_ref4, "minW", 100), _defineProperty(_ref4, "maxW", 168), _ref4)];
+  maxW: 168,
+  minH: 100,
+  maxH: 168
+}];
 
 var CarouselPc =
 /** @class */

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

@@ -59,7 +59,10 @@ var getDefaultJSON = function getDefaultJSON() {
       }
     },
     customize: {
-      layout: 'layout1',
+      layout: {
+        h5Layout: 'layout1',
+        pcLayout: 'layout1'
+      },
       align: 'left',
       pcRowNum: 2,
       rowNum: 2,

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

@@ -7,6 +7,8 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _pc = _interopRequireDefault(require("./pc"));
+
 var _mobile = _interopRequireDefault(require("./mobile"));
 
 var _defaultJSON = require("./defaultJSON");
@@ -68,7 +70,9 @@ function (_super) {
 
   ImageGallery.prototype.render = function () {
     var nodeData = this.props.nodeData;
-    return /*#__PURE__*/_react["default"].createElement("div", null, window.magicDesign.device === 'pc' ? null : /*#__PURE__*/_react["default"].createElement(_mobile["default"], {
+    return /*#__PURE__*/_react["default"].createElement("div", null, window.magicDesign.device === 'pc' ? /*#__PURE__*/_react["default"].createElement(_pc["default"], {
+      data: nodeData
+    }) : /*#__PURE__*/_react["default"].createElement(_mobile["default"], {
       data: nodeData
     }));
   };

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

@@ -83,7 +83,7 @@ function (_super) {
 
   ImageGalleryMobile.prototype.render = function () {
     var data = this.props.data;
-    var isHorizontal = data.customize.layout === 'layout2';
+    var isHorizontal = data.customize.layout.h5Layout === 'layout2';
     var colNum = isHorizontal ? data.customize.rowNum : 1;
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "m-image-gallery-mobile"

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

@@ -0,0 +1,138 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
+require("./index.less");
+
+var _components = require("../../../../../meta-comp/components");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+var __extends = void 0 && (void 0).__extends || function () {
+  var _extendStatics = function extendStatics(d, b) {
+    _extendStatics = Object.setPrototypeOf || {
+      __proto__: []
+    } instanceof Array && function (d, b) {
+      d.__proto__ = b;
+    } || function (d, b) {
+      for (var p in b) {
+        if (b.hasOwnProperty(p)) d[p] = b[p];
+      }
+    };
+
+    return _extendStatics(d, b);
+  };
+
+  return function (d, b) {
+    _extendStatics(d, b);
+
+    function __() {
+      this.constructor = d;
+    }
+
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+  };
+}();
+
+var PC_IMG_SIZE = {
+  1: {
+    minW: 150,
+    maxW: '100%',
+    minH: 150,
+    maxH: 960,
+    gap: 20
+  },
+  2: {
+    minW: 150,
+    maxW: 628,
+    minH: 150,
+    maxH: 471,
+    gap: 24
+  },
+  3: {
+    minW: 100,
+    maxW: 410,
+    minH: 100,
+    maxH: 308,
+    gap: 24
+  },
+  4: {
+    minW: 100,
+    maxW: 302,
+    minH: 100,
+    maxH: 227,
+    gap: 24
+  },
+  5: {
+    minW: 100,
+    maxW: 236,
+    minH: 100,
+    maxH: 177,
+    gap: 24
+  },
+  6: {
+    minW: 100,
+    maxW: 193,
+    minH: 100,
+    maxH: 145,
+    gap: 24
+  }
+};
+
+var ImageGalleryPc =
+/** @class */
+function (_super) {
+  __extends(ImageGalleryPc, _super);
+
+  function ImageGalleryPc() {
+    var _this = _super !== null && _super.apply(this, arguments) || this;
+
+    _this.state = {};
+    return _this;
+  }
+
+  ImageGalleryPc.prototype.render = function () {
+    var data = this.props.data;
+    var isHorizontal = data.customize.layout.pcLayout === 'layout2';
+    var colNum = isHorizontal ? data.customize.pcRowNum : 1;
+    return /*#__PURE__*/_react["default"].createElement("div", {
+      className: "m-image-gallery-pc"
+    }, /*#__PURE__*/_react["default"].createElement("div", {
+      className: (0, _classnames["default"])('content', {
+        horizontal: isHorizontal
+      }),
+      style: {
+        gap: PC_IMG_SIZE[colNum].gap
+      }
+    }, data.groupSource.map(function (m) {
+      return /*#__PURE__*/_react["default"].createElement("div", {
+        key: m.id,
+        className: "img-wrap",
+        style: {
+          width: PC_IMG_SIZE[colNum].maxW
+        }
+      }, /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
+        data: m.image,
+        maxHeight: PC_IMG_SIZE[colNum].maxH,
+        maxWidth: PC_IMG_SIZE[colNum].maxW
+      }));
+    })));
+  };
+
+  ImageGalleryPc.defaultProps = {
+    data: {
+      groupSource: []
+    }
+  };
+  return ImageGalleryPc;
+}(_react["default"].Component);
+
+var _default = ImageGalleryPc;
+exports["default"] = _default;

package/lib/composite-comp/bol/components/ImageGallery/pc/index.less

@@ -0,0 +1,21 @@
+.m-image-gallery-pc {
+  overflow-x: auto;
+
+  .content {
+    display: flex;
+    flex-direction: column;
+    flex-wrap: wrap;
+    width: 1280px;
+    margin: 0 auto;
+
+    &.horizontal {
+      flex-direction: row;
+    }
+
+    .img-wrap {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+  }
+}

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

@@ -17,6 +17,8 @@ var _CustomizeConfig = _interopRequireDefault(require("../../../common/config-pa
 
 var _layout = require("../../../../constants/layout");
 
+var _coreUtil = require("../../../../utils/coreUtil");
+
 var _SpacingConfig = _interopRequireDefault(require("../../../common/config-panels/SpacingConfig"));
 
 var _locale = require("../../../../locale");
@@ -25,6 +27,15 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
 
 function ImageGalleryConfig(props) {
   var data = props.data;
+
+  var getLayout = function getLayout(v) {
+    if ((0, _coreUtil.isPc)()) {
+      data.customize.layout.pcLayout = v;
+    } else {
+      data.customize.layout.h5Layout = v;
+    }
+  };
+
   return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_Collapse["default"], {
     divider: "bold",
     headerSize: "large",
@@ -46,7 +57,11 @@ function ImageGalleryConfig(props) {
       value: /*#__PURE__*/_react["default"].createElement(_CustomizeConfig["default"], {
         component: "imageGallery",
         data: data.customize,
-        layoutSource: _layout.imageGalleryLayout
+        isHideAlign: true,
+        layoutSource: _layout.imageGalleryLayout,
+        selectedLayoutFun: function selectedLayoutFun(v) {
+          return getLayout(v);
+        }
       })
     }, {
       key: '4',

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

@@ -4,7 +4,6 @@
   background: #FFFFFF;
   border: 1px solid #D2D9E5;
   width: 142px;
-  margin: 0 auto;
   cursor: pointer;
 
   .img-wrap {

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

@@ -13,8 +13,6 @@ var _defImg = _interopRequireDefault(require("./imgs/defImg1.png"));
 
 var _defImg2 = _interopRequireDefault(require("./imgs/defImg2.png"));
 
-var _defImg3 = _interopRequireDefault(require("./imgs/defImg3.png"));
-
 var _ProductItem = _interopRequireDefault(require("../../../../common/components/ProductItem"));
 
 var _coreUtil = require("../../../../../utils/coreUtil");
@@ -238,16 +236,6 @@ var defaultData = [{
   discountPercent: 50,
   salePercent: 5000,
   sppType: '2'
-}, {
-  imgUrlContent: {
-    url: _defImg3["default"]
-  },
-  offerName: 'DITO Level-Up Pack 99 7GB',
-  salesPrice: 99,
-  marketPrice: 138,
-  discountPercent: 28,
-  salePercent: 5000,
-  sppType: '2'
 }];
 
 var FlashDealMobile =

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

@@ -66,6 +66,7 @@
     white-space: nowrap;
     display: flex;
     align-items: flex-start;
+    justify-content: flex-start;
     position: relative;
 
     .loading-wrap {

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

@@ -15,8 +15,6 @@ var _defImg = _interopRequireDefault(require("./imgs/defImg1.png"));
 
 var _defImg2 = _interopRequireDefault(require("./imgs/defImg2.png"));
 
-var _defImg3 = _interopRequireDefault(require("./imgs/defImg3.png"));
-
 var _ProductItem = _interopRequireDefault(require("../../../../common/components/ProductItem"));
 
 var _coreUtil = require("../../../../../utils/coreUtil");
@@ -242,46 +240,6 @@ var defaultData = [{
   discountPercent: 50,
   salePercent: 5000,
   sppType: '2'
-}, {
-  imgUrlContent: {
-    url: _defImg3["default"]
-  },
-  offerName: 'DITO Level-Up Pack 99 7GB',
-  salesPrice: 99,
-  marketPrice: 138,
-  discountPercent: 28,
-  salePercent: 5000,
-  sppType: '2'
-}, {
-  imgUrlContent: {
-    url: _defImg3["default"]
-  },
-  offerName: 'DITO Level-Up Pack 99 7GB',
-  salesPrice: 99,
-  marketPrice: 138,
-  discountPercent: 28,
-  salePercent: 5000,
-  sppType: '2'
-}, {
-  imgUrlContent: {
-    url: _defImg3["default"]
-  },
-  offerName: 'DITO Level-Up Pack 99 7GB',
-  salesPrice: 99,
-  marketPrice: 138,
-  discountPercent: 28,
-  salePercent: 5000,
-  sppType: '2'
-}, {
-  imgUrlContent: {
-    url: _defImg3["default"]
-  },
-  offerName: 'DITO Level-Up Pack 99 7GB',
-  salesPrice: 99,
-  marketPrice: 138,
-  discountPercent: 28,
-  salePercent: 5000,
-  sppType: '2'
 }];
 
 var FlashDealPc =