@fonixtree/magic-design 0.0.84 → 0.0.85

package/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/lib/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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fonixtree/magic-design",
   "author": "Cylon Team",
-  "version": "0.0.84",
+  "version": "0.0.85",
   "description": "Magic Design",
   "license": "MIT",
   "module": "es/index.js",