@fonixtree/magic-design 0.0.83 → 0.0.85

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,4 +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,4 +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,4 +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.83",
+  "version": "0.0.85",
   "description": "Magic Design",
   "license": "MIT",
   "module": "es/index.js",