@fonixtree/magic-design 0.0.83 → 0.0.85

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

@@ -91,21 +91,12 @@ function (_super) {
       showRowNum: true
     };
 
-    _this.layoutChange = function (v) {
+    _this.onInit = function (v) {
       var _a;
 
       var _b = _this.props,
-          selectedLayoutFun = _b.selectedLayoutFun,
-          data = _b.data,
           component = _b.component,
-          id = _b.id;
-
-      if (selectedLayoutFun) {
-        selectedLayoutFun(v);
-      } else {
-        data.layout = v;
-      } // 轮播组件特殊处理
-
+          id = _b.id; // 轮播组件特殊处理
 
       if (component === 'carousel') {
         if (v === 'layout2') {
@@ -136,6 +127,19 @@ function (_super) {
             });
           }
         }
+      } // imageGallery 第二种布局可选列数
+
+
+      if (component === 'imageGallery') {
+        if (v === 'layout2') {
+          _this.setState({
+            showRowNum: true
+          });
+        } else {
+          _this.setState({
+            showRowNum: false
+          });
+        }
       } // 移动端导航特殊处理
       // 更改需求，两个布局都需 可选行数
       // if (component == 'mobileNavigation') {
@@ -146,6 +150,20 @@ function (_super) {
       //   }
       // }
 
+    };
+
+    _this.layoutChange = function (v) {
+      var _a = _this.props,
+          selectedLayoutFun = _a.selectedLayoutFun,
+          data = _a.data;
+
+      if (selectedLayoutFun) {
+        selectedLayoutFun(v);
+      } else {
+        data.layout = v;
+      }
+
+      _this.onInit(v);
 
       _this.selfRender(); // this.setState({});
 
@@ -169,15 +187,7 @@ function (_super) {
   CustomizeConfig.prototype.componentDidMount = function () {
     var _a;
 
-    if (((_a = this.props.data) === null || _a === void 0 ? void 0 : _a.layout) === 'layout2') {
-      this.setState({
-        showRowNum: false
-      });
-    } else {
-      this.setState({
-        showRowNum: true
-      });
-    }
+    this.onInit((_a = this.props.data) === null || _a === void 0 ? void 0 : _a.layout);
   };
 
   CustomizeConfig.prototype.render = function () {

package/es/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/es/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/es/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 =

package/es/composite-comp/dito/components/FlashDeal/pc/index.less

@@ -92,6 +92,7 @@
     white-space: nowrap;
     display: flex;
     align-items: flex-start;
+    justify-content: flex-start;
     position: relative;
     flex: 1;
 

package/es/composite-comp/dito/components/SearchBar/mobile/index.js

@@ -232,6 +232,8 @@ function (_super) {
   };
 
   SearchMobile.prototype.render = function () {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+
     var data = this.props.data;
     console.log('----search ', data);
     var messageNum = this.state.messageNum; // let styleWrap = {};
@@ -253,22 +255,22 @@ function (_super) {
       className: "m-search-bar"
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "right"
-    }, data.content && data.content.box.open && /*#__PURE__*/_react["default"].createElement("div", {
+    }, data.content && ((_a = data.content.box) === null || _a === void 0 ? void 0 : _a.open) && /*#__PURE__*/_react["default"].createElement("div", {
       className: "search-input-wrap",
       onClick: function onClick() {
         return (0, _coreUtil.clickUrl)('/search-page');
       },
       style: {
-        borderColor: data.content.box.color.mobile
+        borderColor: (_c = (_b = data.content.box) === null || _b === void 0 ? void 0 : _b.color) === null || _c === void 0 ? void 0 : _c.mobile
       }
     }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
-      color: data.content.box.color.mobile,
+      color: (_e = (_d = data.content.box) === null || _d === void 0 ? void 0 : _d.color) === null || _e === void 0 ? void 0 : _e.mobile,
       size: 24,
       type: "icon-search2"
-    })), data.content && data.content.icon.open && /*#__PURE__*/_react["default"].createElement("div", {
+    })), data.content && ((_f = data.content.icon) === null || _f === void 0 ? void 0 : _f.open) && /*#__PURE__*/_react["default"].createElement("div", {
       className: "message-wrap"
     }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
-      color: data.content.icon.color.mobile,
+      color: (_h = (_g = data.content.icon) === null || _g === void 0 ? void 0 : _g.color) === null || _h === void 0 ? void 0 : _h.mobile,
       onClick: function onClick() {
         return (0, _coreUtil.clickUrl)('/message-center');
       },
@@ -276,7 +278,7 @@ function (_super) {
       type: "icon-ChatDots"
     }), !!messageNum && /*#__PURE__*/_react["default"].createElement("span", {
       className: "num"
-    }, messageNum))), data.content && data.content.logo.open && /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
+    }, messageNum))), data.content && ((_j = data.content.logo) === null || _j === void 0 ? void 0 : _j.open) && /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
       data: data.content.logo,
       style: {
         height: 30

package/es/constants/component-types.js

@@ -69,6 +69,8 @@ var _ImageTextSecondConfig = _interopRequireDefault(require("../composite-comp/b
 
 var _CarouselSecondConfig = _interopRequireDefault(require("../composite-comp/bol/second-config-panels/CarouselSecondConfig"));
 
+var _ImageGallerySecondConfig = _interopRequireDefault(require("../composite-comp/bol/second-config-panels/ImageGallerySecondConfig"));
+
 var _RecommendSecondConfig = _interopRequireDefault(require("../composite-comp/dito/second-config-panels/RecommendSecondConfig"));
 
 var _MobileNavigationSecondConfig = _interopRequireDefault(require("../composite-comp/dito/second-config-panels/MobileNavigationSecondConfig"));
@@ -99,5 +101,5 @@ var configPanelMap = (_b = {}, _b[_Banner["default"].type] = _BannerConfig["defa
  */
 
 exports.configPanelMap = configPanelMap;
-var secondConfigPanelMap = (_c = {}, _c[_Banner["default"].type] = _BannerSecondConfig["default"], _c[_Text["default"].type] = _TextSecondConfig["default"], _c[_ImageText["default"].type] = _ImageTextSecondConfig["default"], _c[_Recommend["default"].type] = _RecommendSecondConfig["default"], _c[_MobileNavigation["default"].type] = _MobileNavigationSecondConfig["default"], _c[_PcNavigation["default"].type] = _PcNavigationSecondConfig["default"], _c[_Carousel["default"].type] = _CarouselSecondConfig["default"], _c[_Tag["default"].type] = _TagSecondConfig["default"], _c[_Button["default"].type] = _ButtonSecondConfig["default"], _c);
+var secondConfigPanelMap = (_c = {}, _c[_Banner["default"].type] = _BannerSecondConfig["default"], _c[_Text["default"].type] = _TextSecondConfig["default"], _c[_ImageText["default"].type] = _ImageTextSecondConfig["default"], _c[_Recommend["default"].type] = _RecommendSecondConfig["default"], _c[_MobileNavigation["default"].type] = _MobileNavigationSecondConfig["default"], _c[_PcNavigation["default"].type] = _PcNavigationSecondConfig["default"], _c[_Carousel["default"].type] = _CarouselSecondConfig["default"], _c[_ImageGallery["default"].type] = _ImageGallerySecondConfig["default"], _c[_Tag["default"].type] = _TagSecondConfig["default"], _c[_Button["default"].type] = _ButtonSecondConfig["default"], _c);
 exports.secondConfigPanelMap = secondConfigPanelMap;

package/es/constants/index.js

@@ -43,6 +43,7 @@ var quickMenuCode = {
   PREVIEW: 'PREVIEW',
   SAVE: 'SAVE',
   PUBLISH: 'PUBLISH',
+  PUBLISH_LATER: 'PUBLISH_LATER',
   MODE_PC: 'MODE_PC',
   MODE_PHONE: 'MODE_PHONE'
 };

package/es/constants/layout.js

@@ -13,8 +13,6 @@ var _imageGalleryLayout = _interopRequireDefault(require("../assets/images/layou
 
 var _imageGalleryLayout2 = _interopRequireDefault(require("../assets/images/layout-icon/imageGalleryLayout2.png"));
 
-var _imageGalleryLayout3 = _interopRequireDefault(require("../assets/images/layout-icon/imageGalleryLayout3.png"));
-
 var _layoutImagetextM = _interopRequireDefault(require("../assets/images/layout-icon/layout-imagetext-m1-1.png"));
 
 var _layoutImagetextM2 = _interopRequireDefault(require("../assets/images/layout-icon/layout-imagetext-m1-2.png"));
@@ -55,6 +53,7 @@ var _layoutNavigationNormal = _interopRequireDefault(require("../assets/images/l
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
+// import imageGalleryLayout3 from '../assets/images/layout-icon/imageGalleryLayout3.png';
 // import p3 from '../assets/images/layout-icon/layout-imagetext-p3.png';
 var dividerLayout = [{
   id: 'layout1',
@@ -76,10 +75,6 @@ var imageGalleryLayout = [{
   id: 'layout2',
   name: 'layout2',
   image: _imageGalleryLayout2["default"]
-}, {
-  id: 'layout3',
-  name: 'layout3',
-  image: _imageGalleryLayout3["default"]
 }];
 exports.imageGalleryLayout = imageGalleryLayout;
 var carouselLayout = [{

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

@@ -0,0 +1,83 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = AppointmentModal;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _antd = require("antd");
+
+var _moment = _interopRequireDefault(require("moment"));
+
+var _locale = require("../../../locale");
+
+require("./index.less");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+// import { Button } from '../../../common';
+function AppointmentModal(props) {
+  var visible = props.visible,
+      onClose = props.onClose,
+      onConfirm = props.onConfirm;
+
+  var form = _antd.Form.useForm()[0];
+
+  var onConfirmPublish = function onConfirmPublish() {
+    form.submit();
+  };
+
+  var onFinish = function onFinish(values) {
+    console.log(values);
+    var dateString = values.date.format('YYYY-MM-DD HH:mm:ss');
+    onConfirm(dateString);
+  };
+
+  var disabledDate = function disabledDate(current) {
+    return current && current < (0, _moment["default"])().add(30, 'minutes');
+  };
+
+  return /*#__PURE__*/_react["default"].createElement(_antd.Modal, {
+    footer: /*#__PURE__*/_react["default"].createElement("div", {
+      className: "footer"
+    }, /*#__PURE__*/_react["default"].createElement(_antd.Button, {
+      onClick: function onClick() {
+        return onClose && onClose();
+      },
+      size: "small",
+      type: "light"
+    }, (0, _locale.i18n)('CANCEL')), /*#__PURE__*/_react["default"].createElement(_antd.Button, {
+      onClick: onConfirmPublish,
+      size: "small",
+      type: "primary"
+    }, (0, _locale.i18n)('CONFIRM'))),
+    maskClosable: false,
+    onCancel: onClose,
+    title: (0, _locale.i18n)('PUBLISH_LATER'),
+    visible: visible,
+    width: 500
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Form, {
+    autoComplete: "off",
+    form: form,
+    layout: "vertical",
+    onFinish: onFinish
+  }, /*#__PURE__*/_react["default"].createElement(_antd.Form.Item, {
+    label: (0, _locale.i18n)('PUBLISH_TIME'),
+    name: "date",
+    rules: [{
+      required: true
+    }]
+  }, /*#__PURE__*/_react["default"].createElement(_antd.DatePicker, {
+    disabledDate: disabledDate,
+    placeholder: "Select Time",
+    showNow: false,
+    showTime: true,
+    style: {
+      width: '100%'
+    }
+  })), /*#__PURE__*/_react["default"].createElement("div", {
+    className: "tips"
+  }, "Please select a time after 30 minutes and within 30 days")));
+}

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

@@ -0,0 +1,10 @@
+.footer {
+  display: flex;
+  justify-content: flex-end;
+}
+.tips {
+  font-size: 13px;
+  line-height: 18px;
+  color: #A3AEC3;
+  margin-bottom:40px;
+}

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

@@ -236,6 +236,7 @@ function (_super) {
       var groupName = '';
 
       switch (selectedNode.type) {
+        case 'IMAGE_GALLERY':
         case 'BANNER':
           groupName = (_a = panelProps.title) === null || _a === void 0 ? void 0 : _a.text;
 

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

@@ -23,6 +23,8 @@ require("./index.less");
 
 var _locale = require("../../../locale");
 
+var _antd = require("antd");
+
 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); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -95,6 +97,12 @@ function (_super) {
       _this.props.onBtnClick(code);
     };
 
+    _this.onPublishLater = function (e) {
+      _this.onBtnClick(e);
+
+      e.stopPropagation();
+    };
+
     return _this;
   }
 
@@ -170,13 +178,37 @@ function (_super) {
       onClick: this.onBtnClick,
       tip: "The page is in use. Please copy or create a new page",
       type: "light"
-    }, (0, _locale.i18n)('SAVE')), /*#__PURE__*/_react["default"].createElement(_Button["default"], {
+    }, (0, _locale.i18n)('SAVE')), /*#__PURE__*/_react["default"].createElement("div", {
+      className: "publish_wrap"
+    }, /*#__PURE__*/_react["default"].createElement(_Button["default"], {
       "data-code": _constants.quickMenuCode.PUBLISH,
       disabled: window.magicDesign.readOnly,
       onClick: this.onBtnClick,
       tip: "The page is in use. Please copy or create a new page",
       type: "primary"
-    }, (0, _locale.i18n)('PUBLISH'))));
+    }, (0, _locale.i18n)('PUBLISH_NOW'), /*#__PURE__*/_react["default"].createElement(_antd.Dropdown, {
+      getPopupContainer: function getPopupContainer() {
+        return document.querySelector('.publish_wrap');
+      },
+      overlay: /*#__PURE__*/_react["default"].createElement("div", {
+        className: "publish_later_wrap"
+      }, /*#__PURE__*/_react["default"].createElement("div", {
+        className: "publish_btn",
+        "data-code": _constants.quickMenuCode.PUBLISH_LATER,
+        onClick: this.onPublishLater
+      }, (0, _locale.i18n)('PUBLISH_LATER'))),
+      overlayClassName: "publish_later_drop",
+      trigger: "click"
+    }, /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
+      onClick: function onClick(e) {
+        return e.stopPropagation();
+      },
+      size: "14px",
+      style: {
+        padding: '8px 3px 8px 6px'
+      },
+      type: "icon-outlined-down"
+    }))))));
   };
 
   return QuickMenuBar;

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

@@ -72,5 +72,39 @@
 
   .menu_right {
     display: flex;
+    .publish_wrap {
+      position: relative;
+      margin-left: 12px;
+    }
+    .publish_later_drop {
+      width: 100%;
+      top: 56px !important;
+      left: 0 !important;
+      .publish_later_wrap {
+        box-shadow: 4px 4px 25px 4px rgba(35, 47, 70, 0.1);
+        border-radius: 10px;
+        padding: 4px 0;
+        background-color: #FFF;
+        position: absolute;
+        left: 0;
+        right: 0;
+        .publish_btn {
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          font-family: 'Open Sans';
+          font-style: normal;
+          font-weight: 600;
+          font-size: 16px;
+          height: 48px;
+          background-color: #E9F0FF;
+          color: #2F54EB;
+          cursor: pointer;
+          &:hover {
+            background-color: #D6E4FF;
+          }
+        }
+      }
+    }
   }
 }

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;
   }