@fonixtree/magic-design 2.0.108 → 2.0.110

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

@@ -21,6 +21,8 @@ var _Iconfont = _interopRequireDefault(require("../../../common/Iconfont"));
 
 var _constants = require("../../../constants");
 
+var _coreUtil = require("../../../utils/coreUtil");
+
 var _locale = require("../../../locale");
 
 require("./index.less");
@@ -103,6 +105,34 @@ function (_super) {
       _this.onBtnClick(e);
 
       e.stopPropagation();
+    }; // 未开启自动审核，Draft 和 Rejected 状态下展示审核记录按钮
+
+
+    _this.isShowReviewRecord = function () {
+      return !(0, _coreUtil.isAutoAudit)() && [_constants.pageStateMap.REJECTED, _constants.pageStateMap.DRAFT].includes(_this.props.pageState);
+    };
+
+    _this.isShowPublish = function () {
+      return (0, _coreUtil.isAutoAudit)() && _this.props.pageState === _constants.pageStateMap.DRAFT || !(0, _coreUtil.isAutoAudit)() && _this.props.pageState === _constants.pageStateMap.ACTIVE;
+    }; // 审核失败和未审核状态展示 To Review 按钮
+
+
+    _this.isShowToReview = function () {
+      return !(0, _coreUtil.isAutoAudit)() && [_constants.pageStateMap.REJECTED, _constants.pageStateMap.DRAFT].includes(_this.props.pageState);
+    }; // 提交审核状态展示 Cancel 按钮
+
+
+    _this.isShowCancelReview = function () {
+      return _this.props.pageState === _constants.pageStateMap.PENDING;
+    }; // 草稿状态展示设置模版按钮
+
+
+    _this.isShowSetTemplate = function () {
+      return _constants.pageStateMap.DRAFT === _this.props.pageState;
+    };
+
+    _this.isShowSave = function () {
+      return !(0, _coreUtil.isAutoAudit)() && [_constants.pageStateMap.REJECTED, _constants.pageStateMap.DRAFT].includes(_this.props.pageState);
     };
 
     return _this;
@@ -183,28 +213,39 @@ function (_super) {
       type: "light"
     }, (0, _locale.i18n)('SAVE'))) : /*#__PURE__*/_react["default"].createElement("div", {
       className: "menu_right"
-    }, window.magicDesign.templateType === _constants.tempTypeMap.PAGE && /*#__PURE__*/_react["default"].createElement(_Button["default"], {
-      "data-code": _constants.quickMenuCode.SET_AS_TEMPLATE,
+    }, this.isShowReviewRecord() && /*#__PURE__*/_react["default"].createElement(_Button["default"], {
+      "data-code": _constants.quickMenuCode.REVIEW_RECORD,
+      icon: "icon-clock",
       onClick: this.onBtnClick,
-      type: "text"
-    }, (0, _locale.i18n)('SET_AS_TEMPLATE')), /*#__PURE__*/_react["default"].createElement(_Button["default"], {
+      title: "Review Record",
+      type: "icon"
+    }), /*#__PURE__*/_react["default"].createElement(_Button["default"], {
       "data-code": _constants.quickMenuCode.PREVIEW,
-      onClick: this.onBtnClick
-    }, (0, _locale.i18n)('PREVIEW')), /*#__PURE__*/_react["default"].createElement(_Button["default"], {
+      icon: "icon-eye1",
+      onClick: this.onBtnClick,
+      title: "Preview",
+      type: "icon"
+    }), this.isShowSave() && /*#__PURE__*/_react["default"].createElement(_Button["default"], {
       "data-code": _constants.quickMenuCode.SAVE,
       disabled: window.magicDesign.readOnly,
+      icon: "icon-save",
       onClick: this.onBtnClick,
       tip: "The page is in use. Please copy or create a new page",
+      title: "Save",
+      type: "icon"
+    }), this.isShowSetTemplate() && /*#__PURE__*/_react["default"].createElement(_Button["default"], {
+      "data-code": _constants.quickMenuCode.SET_AS_TEMPLATE,
+      onClick: this.onBtnClick,
       type: "light"
-    }, (0, _locale.i18n)('SAVE')), /*#__PURE__*/_react["default"].createElement("div", {
+    }, (0, _locale.i18n)('SET_AS_TEMPLATE')), /*#__PURE__*/_react["default"].createElement("div", {
       className: "publish_wrap"
-    }, /*#__PURE__*/_react["default"].createElement(_Button["default"], {
+    }, this.isShowPublish() && /*#__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_NOW'), window.magicDesign.templateType === 'Page' && /*#__PURE__*/_react["default"].createElement(_antd.Dropdown, {
+    }, (0, _locale.i18n)('PUBLISH_NOW'), window.magicDesign.templateType === _constants.tempTypeMap.PAGE && /*#__PURE__*/_react["default"].createElement(_antd.Dropdown, {
       getPopupContainer: function getPopupContainer() {
         return document.querySelector('.publish_wrap');
       },
@@ -226,7 +267,15 @@ function (_super) {
         padding: '8px 3px 8px 6px'
       },
       type: "icon-outlined-down"
-    }))))));
+    }))), this.isShowToReview() && /*#__PURE__*/_react["default"].createElement(_Button["default"], {
+      "data-code": _constants.quickMenuCode.TO_REVIEW,
+      onClick: this.onBtnClick,
+      type: "primary"
+    }, "To Review"), this.isShowCancelReview() && /*#__PURE__*/_react["default"].createElement(_Button["default"], {
+      "data-code": _constants.quickMenuCode.CANCEL_REVIEW,
+      onClick: this.onBtnClick,
+      type: "primary"
+    }, "Cancel"))));
   };
 
   return QuickMenuBar;

package/es/core/Designer/index.js

@@ -262,12 +262,14 @@ window.magicDesign = {
 };
 
 var setDesignConfig = function setDesignConfig(data) {
-  window.magicDesign = __assign(__assign(__assign({}, window.magicDesign), data), {
+  window.magicDesign = __assign(__assign(__assign(__assign({}, window.magicDesign), {
+    autoAudit: true
+  }), data), {
     designMode: true,
     compWidth: Number(data.compWidth),
     compSpacing: Number(data.compSpacing),
     MBaseUrl: data.MBaseUrl || 'operation/v1',
-    partyType: _constants.partyTypeMap[data.MBaseUrl] || 'P'
+    partyType: _constants.baseUrlMap[data.MBaseUrl] || 'P'
   });
 };
 
@@ -469,7 +471,10 @@ function (_super) {
           onSave = _a.onSave,
           onPreviews = _a.onPreviews,
           onPush = _a.onPush,
-          onSetAsTemp = _a.onSetAsTemp;
+          onSetAsTemp = _a.onSetAsTemp,
+          onToReview = _a.onToReview,
+          onCancelReview = _a.onCancelReview,
+          onReviewRecord = _a.onReviewRecord;
       var _b = _this.state,
           device = _b.device,
           MPageData = _b.MPageData;
@@ -546,6 +551,18 @@ function (_super) {
           _this.onSwitchDevice(_constants.deviceTypeMap.PHONE);
 
           break;
+
+        case _constants.quickMenuCode.TO_REVIEW:
+          onToReview(handleParams);
+          break;
+
+        case _constants.quickMenuCode.CANCEL_REVIEW:
+          onCancelReview();
+          break;
+
+        case _constants.quickMenuCode.REVIEW_RECORD:
+          onReviewRecord();
+          break;
       }
     };
 
@@ -601,6 +618,7 @@ function (_super) {
 
     _this.renderHeader = function () {
       return /*#__PURE__*/_react["default"].createElement(_QuickMenuBar["default"], {
+        auditState: _this.props.auditState,
         device: _this.state.device,
         language: _this.props.language,
         onBtnClick: _this.onQuickMenuClick,

package/es/core/SelectUrl/index.js

@@ -14,7 +14,6 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
 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); }
 
 var SelectUrl = function SelectUrl(props) {
-  console.log(props, 'props');
   var fishFetch = props.fishFetch,
       config = props.config,
       modalConfig = props.modalConfig;

package/es/utils/androidUtil.js

@@ -23,6 +23,9 @@ var browserVersion = function browserVersion() {
     qq: u.match(/\sQQ/i) == ' qq',
     isApp: u.indexOf('app/CYLON-APP') > -1,
     isNuriApp: u.indexOf('app/NURI-APP') > -1,
+    isDitoApp: u.indexOf('mydito') > -1,
+    ditoAndroidApp: u.indexOf('mydito') > -1 && (u.indexOf('Android') > -1 || u.indexOf('Adr') > -1),
+    ditoIosApp: u.indexOf('mydito') > -1 && !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/),
     isAshitaApp: u.indexOf('app/ASHITA-APP') > -1
   };
 };
@@ -136,9 +139,9 @@ var sendToApp = function sendToApp(params) {
 exports.sendToApp = sendToApp;
 
 var goToLoginApp = function goToLoginApp() {
-  if (browserVersion().androidApp) {
+  if (browserVersion().ditoAndroidApp) {
     window.dito.goToLogin();
-  } else if (browserVersion().iosApp) {
+  } else if (browserVersion().ditoIosApp) {
     window.dito.goToLogin();
   }
 };

package/es/utils/commonUtil.js

@@ -372,8 +372,8 @@ var checkLogin = function checkLogin(isLead, redirectUrl, replaceFlag) {
 
   if (!isLogin()) {
     if (isLead) {
-      if ((0, _androidUtil.browserVersion)().isApp) {
-        goToLoginApp();
+      if ((0, _androidUtil.browserVersion)().isDitoApp) {
+        (0, _androidUtil.goToLoginApp)();
       } else {
         var _a = window.location,
             pathname = _a.pathname,

package/es/utils/coreUtil.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setMagicDesign = exports.renderPreview = exports.isPc = exports.isDesignMode = exports.isActiveFloor = exports.getVideoCover = exports.copyNode = exports.clickUrl = void 0;
+exports.setMagicDesign = exports.renderPreview = exports.isPc = exports.isDesignMode = exports.isAutoAudit = exports.isActiveFloor = exports.getVideoCover = exports.copyNode = exports.clickUrl = void 0;
 
 var _uuid = require("uuid");
 
@@ -444,5 +444,15 @@ var copyNode = function copyNode(value, parentId) {
   });
   return newNode;
 };
+/**
+ * 是否开启自动审核
+ */
 
-exports.copyNode = copyNode;
+
+exports.copyNode = copyNode;
+
+var isAutoAudit = function isAutoAudit() {
+  return window.systemParams.autoAudit !== 'false' || window.partyType === _constants.partyTypeMap.PLATFORM;
+};
+
+exports.isAutoAudit = isAutoAudit;

package/lib/assets/fonts/magic-box-iconfont.css

@@ -1,9 +1,8 @@
 @font-face {
-  font-family: "magic-box-iconfont";
-  /* Project id 3317752 */
-  src: url('magic-box-iconfont.woff2?t=1716443961517') format('woff2'),
-    url('magic-box-iconfont.woff?t=1716443961517') format('woff'),
-    url('magic-box-iconfont.ttf?t=1716443961517') format('truetype');
+  font-family: "magic-box-iconfont"; /* Project id 3317752 */
+  src: url('magic-box-iconfont.woff2?t=1716881585254') format('woff2'),
+       url('magic-box-iconfont.woff?t=1716881585254') format('woff'),
+       url('magic-box-iconfont.ttf?t=1716881585254') format('truetype');
 }
 
 .magic-box-iconfont {
@@ -14,6 +13,22 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.magic-box-icon-save:before {
+  content: "\e646";
+}
+
+.magic-box-icon-eye1:before {
+  content: "\e647";
+}
+
+.magic-box-icon-clock:before {
+  content: "\e648";
+}
+
+.magic-box-icon-select2:before {
+  content: "\e67a";
+}
+
 .magic-box-icon-list-sort:before {
   content: "\e645";
 }
@@ -126,10 +141,6 @@
   content: "\e671";
 }
 
-.magic-box-icon-select2:before {
-  content: "\e67a";
-}
-
 .magic-box-icon-b-play-02:before {
   content: "\e672";
 }
@@ -572,4 +583,5 @@
 
 .magic-box-icon-image:before {
   content: "\e608";
-}
+}
+

package/lib/assets/fonts/magic-box-iconfont.css.bak

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "magic-box-iconfont"; /* Project id 3317752 */
-  src: url('magic-box-iconfont.woff2?t=1704245006151') format('woff2'),
-       url('magic-box-iconfont.woff?t=1704245006151') format('woff'),
-       url('magic-box-iconfont.ttf?t=1704245006151') format('truetype');
+  src: url('magic-box-iconfont.woff2?t=1716881585254') format('woff2'),
+       url('magic-box-iconfont.woff?t=1716881585254') format('woff'),
+       url('magic-box-iconfont.ttf?t=1716881585254') format('truetype');
 }
 
 .magic-box-iconfont {
@@ -13,6 +13,74 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-save:before {
+  content: "\e646";
+}
+
+.icon-eye1:before {
+  content: "\e647";
+}
+
+.icon-clock:before {
+  content: "\e648";
+}
+
+.icon-select2:before {
+  content: "\e67a";
+}
+
+.icon-list-sort:before {
+  content: "\e645";
+}
+
+.icon-check:before {
+  content: "\e644";
+}
+
+.icon-sale:before {
+  content: "\e78b";
+}
+
+.icon-bundle:before {
+  content: "\e6cb";
+}
+
+.icon-interests:before {
+  content: "\e829";
+}
+
+.icon-group-users:before {
+  content: "\e60a";
+}
+
+.icon-group-buy:before {
+  content: "\e643";
+}
+
+.icon-orders:before {
+  content: "\e64c";
+}
+
+.icon-function:before {
+  content: "\e6d1";
+}
+
+.icon-messages:before {
+  content: "\e600";
+}
+
+.icon-set:before {
+  content: "\e601";
+}
+
+.icon-cards_fill:before {
+  content: "\e7a6";
+}
+
+.icon-account:before {
+  content: "\e655";
+}
+
 .icon-anchor:before {
   content: "\e642";
 }
@@ -73,10 +141,6 @@
   content: "\e671";
 }
 
-.icon-select2:before {
-  content: "\e67a";
-}
-
 .icon-b-play-02:before {
   content: "\e672";
 }