@titaui/pc 1.10.5 → 1.10.6-3.beta-1

package/lib/components/mblog/index.js

@@ -15,6 +15,8 @@ var _MblogContent = _interopRequireDefault(require("./components/MblogContent"))
 
 var _MblogAction = _interopRequireDefault(require("./components/MblogAction"));
 
+var _avatar = _interopRequireDefault(require("../avatar"));
+
 var _bsGlobal = require("../../utils/bs-global");
 
 var _index = require("./common/index");
@@ -25,6 +27,8 @@ var _platform = require("../../utils/platform");
 
 var _getLocale = require("../../utils/getLocale");
 
+require("./index.css");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 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); }
@@ -51,6 +55,8 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
+var prefix = 'titaui-mblog';
+
 var MBlog = /*#__PURE__*/function (_PureComponent) {
   _inherits(MBlog, _PureComponent);
 
@@ -163,17 +169,23 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
     };
 
     _this.handlerDealAttachemntData = function (uploadSuccessFilesPath) {
+      var _this$refs$textEditor2;
+
       var successFilesPath = uploadSuccessFilesPath.filter(function (item) {
         return item !== "";
       });
       var successFilesPathLen = successFilesPath.length; // @ts-ignore
 
-      var textareaInput = _this.refs.textEditor.refs.textareaInput;
+      var _this$refs$textEditor = (_this$refs$textEditor2 = _this.refs.textEditor) === null || _this$refs$textEditor2 === void 0 ? void 0 : _this$refs$textEditor2.refs,
+          textareaInput = _this$refs$textEditor.textareaInput;
+
       var textareaValue = _this.state.textareaValue; // textareaValue = dealWithLoadedFileTips(textareaValue, successFilesPathLen); // 更新输入框内容
 
       localStorage.setItem(_this.state.localStroageKey, textareaValue); // 将输入框内容进行本地缓存
 
-      textareaInput.focus();
+      if (textareaInput) {
+        textareaInput.focus();
+      }
 
       _this.setState({
         textareaValue: textareaValue,
@@ -186,9 +198,12 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
     _this.focus = function () {
       // @ts-ignore
       var textareaInput = _this.refs.textEditor.refs.textareaInput;
-      setTimeout(function () {
-        textareaInput.focus();
-      }, 300);
+
+      if (textareaInput) {
+        setTimeout(function () {
+          textareaInput.focus();
+        }, 300);
+      }
     };
 
     _this.allowSubmit = function (content) {
@@ -235,6 +250,11 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
         // 取消
         _this.props.onMblogSubmit(submitType);
       }
+
+      _this.setState({
+        textareaValue: '',
+        uploadSuccessFilesPath: []
+      });
     };
 
     _this._dropHandler = function (event) {
@@ -398,7 +418,8 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
           _this$props3$submitTe = _this$props3.submitText,
           submitText = _this$props3$submitTe === void 0 ? (0, _getLocale.getLocale)("Mod_Publish") : _this$props3$submitTe,
           setTextareaRef = _this$props3.setTextareaRef,
-          disableRangeSelect = _this$props3.disableRangeSelect;
+          disableRangeSelect = _this$props3.disableRangeSelect,
+          showUser = _this$props3.showUser;
       var _this$state2 = this.state,
           localStroageKey = _this$state2.localStroageKey,
           visibility = _this$state2.visibility,
@@ -411,7 +432,21 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
           isAtAll = _this$state2.isAtAll;
       var fSize = (0, _bsGlobal.getUploadMaxSize)();
       var fTip = attachmentTipText || (0, _getLocale.getLocale)("OKR_MyO_KRP_Draganddropu").replace("50MB", "".concat(fSize, "MB"));
-      return /*#__PURE__*/_react["default"].createElement(_style.MBlogBox, {
+      var user = (0, _bsGlobal.getUserInfo)();
+      return /*#__PURE__*/_react["default"].createElement("div", {
+        className: prefix
+      }, showUser && /*#__PURE__*/_react["default"].createElement("div", {
+        className: "".concat(prefix, "__avatar")
+      }, /*#__PURE__*/_react["default"].createElement(_avatar["default"], {
+        size: {
+          width: 28,
+          textNum: 1,
+          fontSize: 14
+        },
+        name: user.Name,
+        color: user.UserAvatar.Color,
+        src: user.UserAvatar.Medium
+      })), /*#__PURE__*/_react["default"].createElement(_style.MBlogBox, {
         className: className,
         ref: "mblogbox",
         onDrop: this._dropHandler,
@@ -490,7 +525,7 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
         id: this.previewid
       }), !(0, _platform.isPlatform)("wx") && isShowDragMask && /*#__PURE__*/_react["default"].createElement(_style.DragEffect, {
         className: "tu-icon-inbox-upload"
-      }));
+      })));
     }
   }]);
 
@@ -531,5 +566,6 @@ MBlog.defaultProps = {
   // 1公开，2私密 3部门
   isShowRangeDropDown: true,
   isShowBtnCancel: true,
-  submitStatus: 0
+  submitStatus: 0,
+  showUser: false
 };

package/lib/components/mblog/style.js

@@ -13,12 +13,12 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
 
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 
-var MBlogBox = _styledComponents["default"].div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  position: relative;\n\n  .uploadFile__preview__list {\n    padding-bottom: 10px;\n    background: #ffffff;\n    display: flex;\n    flex-wrap: wrap;\n    max-height: 300px;\n    overflow-y: auto;\n\n    .preview__content {\n      margin-top: 10px;\n      margin-right: 10px;\n      border-radius: 8px;\n    }\n  }\n"]))); // MblogContent
+var MBlogBox = _styledComponents["default"].div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  position: relative;\n  flex: 1;\n\n  .uploadFile__preview__list {\n    padding-bottom: 10px;\n    background: #ffffff;\n    display: flex;\n    flex-wrap: wrap;\n    max-height: 300px;\n    overflow-y: auto;\n\n    .preview__content {\n      margin-top: 10px;\n      margin-right: 10px;\n      border-radius: 8px;\n    }\n  }\n"]))); // MblogContent
 
 
 exports.MBlogBox = MBlogBox;
 
-var DivMblogContent = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  padding: 8px 10px 6px;\n  border: 1px solid #DFE3EA;\n  border-radius: 8px;\n  background-color: #fff;\n  position: relative;\n  transition: all .2s ease-in-out;\n  height: 120px;\n  box-sizing: border-box;\n\n  &.input_default-active {\n    box-shadow: inset 0px 0px 4px 0px rgba(40, 121, 255, 0.3);\n    border-color: #2879ff;\n  }\n"])));
+var DivMblogContent = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  padding: 8px 10px 6px;\n  border: 1px solid #DFE3EA;\n  border-radius: 12px;\n  background-color: #fff;\n  position: relative;\n  transition: all .2s ease-in-out;\n  height: 120px;\n  box-sizing: border-box;\n\n  &.input_default-active {\n    box-shadow: inset 0px 0px 4px 0px rgba(40, 121, 255, 0.3);\n    border-color: #2879ff;\n  }\n"])));
 
 exports.DivMblogContent = DivMblogContent;
 
@@ -47,7 +47,7 @@ var Tips = _styledComponents["default"].div(_templateObject7 || (_templateObject
 
 exports.Tips = Tips;
 
-var MblogActionWrapper = _styledComponents["default"].div(_templateObject8 || (_templateObject8 = _taggedTemplateLiteral(["\n  height: 30px;\n  padding: 28px 0 2px 0;\n  font-size: 13px;\n  line-height: 20px;\n  color: #565E66;\n  background-color: #ffffff;\n  display: flex;\n  align-items: center;\n  justify-content: space-between;\n"]))); // 左侧按钮
+var MblogActionWrapper = _styledComponents["default"].div(_templateObject8 || (_templateObject8 = _taggedTemplateLiteral(["\n  height: 30px;\n  padding: 16px 0 2px 0;\n  font-size: 13px;\n  line-height: 20px;\n  color: #565E66;\n  background-color: #ffffff;\n  display: flex;\n  align-items: center;\n  justify-content: space-between;\n"]))); // 左侧按钮
 
 
 exports.MblogActionWrapper = MblogActionWrapper;
@@ -66,7 +66,7 @@ var IconSpan = _styledComponents["default"].span(_templateObject11 || (_template
 
 exports.IconSpan = IconSpan;
 
-var RightBtnGroupWrapper = _styledComponents["default"].div(_templateObject12 || (_templateObject12 = _taggedTemplateLiteral(["\n  height: 100%;\n  display: flex;\n  align-items: center;\n\n  button {\n    min-width: 90px;\n    height: 32px;\n    box-sizing: border-box;\n    border-radius: 18px;\n    border: none;\n  }\n"])));
+var RightBtnGroupWrapper = _styledComponents["default"].div(_templateObject12 || (_templateObject12 = _taggedTemplateLiteral(["\n  height: 100%;\n  display: flex;\n  align-items: center;\n\n  button {\n    min-width: 80px;\n    height: 32px;\n    box-sizing: border-box;\n    border-radius: 18px;\n    border: none;\n  }\n"])));
 
 exports.RightBtnGroupWrapper = RightBtnGroupWrapper;
 

package/lib/components/menus/export-modules/demo-menus/index.js

@@ -64,7 +64,7 @@ var DemoMenus = function DemoMenus(props) {
       setExpandedKeys = _useState4[1];
 
   var _useState5 = (0, _react.useState)(function () {
-    okrMenusData.current = new _menus["default"]();
+    okrMenusData.current = new _menus["default"](isManager);
     return okrMenusData.current.getMenus();
   }),
       _useState6 = _slicedToArray(_useState5, 2),
@@ -72,7 +72,7 @@ var DemoMenus = function DemoMenus(props) {
       setMenus = _useState6[1];
 
   (0, _react.useEffect)(function () {
-    okrMenusData.current = new _menus["default"](isManager === 1);
+    okrMenusData.current = new _menus["default"](isManager);
     setMenus(okrMenusData.current.getMenus());
     setExpandedKeys(["demofree"]);
   }, [isManager]);

package/lib/components/menus/export-modules/demo-menus/menu-highlight.js

@@ -25,7 +25,7 @@ var _default = /*#__PURE__*/function () {
   _createClass(_default, [{
     key: "highlight",
     value: function highlight(cb) {
-      if (this.isUnAssigned()) cb(_menus.PAGE_UNASSIGNED_DEMOFREE);else if (this.isAssigned()) cb(_menus.PAGE_ASSIGNED_DEMOFREE);else if (this.isReserved()) cb(_menus.PAGE_RESERVED_DEMOFREE);else if (this.isDone()) cb(_menus.PAGE_DONE_DEMOFREE);else if (this.isIgnore()) cb(_menus.PAGE_IGNORED_DEMOFREE);else if (this.isChart()) cb(_menus.PAGE_CHARTS_DEMOFREE);
+      if (this.isUnAssigned()) cb(_menus.PAGE_UNASSIGNED_DEMOFREE);else if (this.isAssigned()) cb(_menus.PAGE_ASSIGNED_DEMOFREE);else if (this.isReserved()) cb(_menus.PAGE_RESERVED_DEMOFREE);else if (this.isDone()) cb(_menus.PAGE_DONE_DEMOFREE);else if (this.isIgnore()) cb(_menus.PAGE_IGNORED_DEMOFREE);else if (this.isChart()) cb(_menus.PAGE_CHARTS_DEMOFREE);else if (this.isRechargeList()) cb(_menus.PAGE_RECHARGE_LIST);else if (this.isRechargeStatistics()) cb(_menus.PAGE_RECHARGE_STATISTICS);else if (this.isRechargeStatus()) cb(_menus.PAGE_RECHARGE_STATUS);else if (this.isDueDateOrder()) cb(_menus.PAGE_DUEDATE_ORDER);
     }
   }, {
     key: "isChart",
@@ -33,6 +33,30 @@ var _default = /*#__PURE__*/function () {
       var pathname = this.history.location.pathname;
       return pathname.match(/demofree\/charts/);
     }
+  }, {
+    key: "isRechargeStatus",
+    value: function isRechargeStatus() {
+      var pathname = this.history.location.pathname;
+      return pathname.match(/demofree\/recharge\/status/);
+    }
+  }, {
+    key: "isDueDateOrder",
+    value: function isDueDateOrder() {
+      var pathname = this.history.location.pathname;
+      return pathname.match(/demofree\/recharge\/order/);
+    }
+  }, {
+    key: "isRechargeList",
+    value: function isRechargeList() {
+      var pathname = this.history.location.pathname;
+      return pathname.match(/demofree\/recharge\/list/);
+    }
+  }, {
+    key: "isRechargeStatistics",
+    value: function isRechargeStatistics() {
+      var pathname = this.history.location.pathname;
+      return pathname.match(/demofree\/recharge\/statistics/);
+    }
   }, {
     key: "isUnAssigned",
     value: function isUnAssigned() {

package/lib/components/menus/export-modules/demo-menus/menus.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.defaultRefObject = exports["default"] = exports.PAGE_UNASSIGNED_DEMOFREE = exports.PAGE_RESERVED_DEMOFREE = exports.PAGE_IGNORED_DEMOFREE = exports.PAGE_DONE_DEMOFREE = exports.PAGE_CHARTS_DEMOFREE = exports.PAGE_ASSIGNED_DEMOFREE = void 0;
+exports.defaultRefObject = exports["default"] = exports.PAGE_UNASSIGNED_DEMOFREE = exports.PAGE_RESERVED_DEMOFREE = exports.PAGE_RECHARGE_STATUS = exports.PAGE_RECHARGE_STATISTICS = exports.PAGE_RECHARGE_LIST = exports.PAGE_IGNORED_DEMOFREE = exports.PAGE_DUEDATE_ORDER = exports.PAGE_DONE_DEMOFREE = exports.PAGE_CHARTS_DEMOFREE = exports.PAGE_ASSIGNED_DEMOFREE = void 0;
 
 var _index = require("../../components/menu-tree/tree-node/index");
 
@@ -13,6 +13,16 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 
+var EManagerType;
+
+(function (EManagerType) {
+  EManagerType[EManagerType["Sales"] = 0] = "Sales";
+  EManagerType[EManagerType["Manager"] = 1] = "Manager";
+  EManagerType[EManagerType["Supervisor"] = 2] = "Supervisor";
+  EManagerType[EManagerType["ReCharge"] = 3] = "ReCharge";
+  EManagerType[EManagerType["DemoFreeReadOnly"] = 4] = "DemoFreeReadOnly";
+})(EManagerType || (EManagerType = {}));
+
 var defaultRefObject = {
   menus: [],
   getMenus: function getMenus() {}
@@ -30,11 +40,17 @@ var PAGE_IGNORED_DEMOFREE = "ignore";
 exports.PAGE_IGNORED_DEMOFREE = PAGE_IGNORED_DEMOFREE;
 var PAGE_CHARTS_DEMOFREE = "charts";
 exports.PAGE_CHARTS_DEMOFREE = PAGE_CHARTS_DEMOFREE;
+var PAGE_RECHARGE_LIST = "rechargeList";
+exports.PAGE_RECHARGE_LIST = PAGE_RECHARGE_LIST;
+var PAGE_DUEDATE_ORDER = "dueDateOrder";
+exports.PAGE_DUEDATE_ORDER = PAGE_DUEDATE_ORDER;
+var PAGE_RECHARGE_STATISTICS = "rechargeStatistics";
+exports.PAGE_RECHARGE_STATISTICS = PAGE_RECHARGE_STATISTICS;
+var PAGE_RECHARGE_STATUS = "rechargeStatus";
+exports.PAGE_RECHARGE_STATUS = PAGE_RECHARGE_STATUS;
 
 var DemoMenuData = /*#__PURE__*/function () {
-  function DemoMenuData() {
-    var isManager = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-
+  function DemoMenuData(isManager) {
     _classCallCheck(this, DemoMenuData);
 
     this.isManager = isManager;
@@ -43,44 +59,77 @@ var DemoMenuData = /*#__PURE__*/function () {
       label: "任务状态",
       key: "demofree",
       href: this.isManager ? "#/demofree/list?selected=unassigned" : "#/demofree/list?selected=assigned",
-      isShow: true,
+      isShow: this.isManager !== EManagerType.ReCharge,
       children: [{
         icon: "",
         label: "未分配",
         key: "unassigned",
         href: "#/demofree/list?selected=unassigned",
-        isShow: this.isManager
+        isShow: this.isManager === EManagerType.Manager
       }, {
         icon: "",
         label: "已分配",
         key: "assigned",
         href: "#/demofree/list?selected=assigned",
-        isShow: true
+        isShow: this.isManager !== EManagerType.ReCharge
       }, {
         icon: "",
         label: "已预约",
         key: "reserved",
         href: "#/demofree/list?selected=reserved",
-        isShow: true
+        isShow: this.isManager !== EManagerType.ReCharge
       }, {
         icon: "",
         label: "已完成",
         key: "done",
         href: "#/demofree/list?selected=done",
-        isShow: true
+        isShow: this.isManager !== EManagerType.ReCharge
       }, {
         icon: "",
         label: "已忽略",
         key: "ignore",
         href: "#/demofree/list?selected=ignore",
-        isShow: this.isManager
+        isShow: this.isManager === EManagerType.Manager
       }]
+    }, {
+      icon: "KH-help",
+      label: "客户续费",
+      key: "recharge",
+      href: "#/demofree/recharge",
+      isShow: this.isManager === EManagerType.ReCharge || this.isManager === EManagerType.Manager,
+      children: [{
+        icon: "",
+        label: "客户",
+        key: PAGE_RECHARGE_LIST,
+        href: "#/demofree/recharge/list",
+        isShow: this.isManager === EManagerType.ReCharge || this.isManager === EManagerType.Manager
+      }, {
+        icon: "",
+        label: "到期订单",
+        key: PAGE_DUEDATE_ORDER,
+        href: "#/demofree/recharge/order",
+        isShow: this.isManager === EManagerType.ReCharge || this.isManager === EManagerType.Manager
+      } // {
+      //   icon: "",
+      //   label: "续费状态",
+      //   key: PAGE_RECHARGE_STATUS,
+      //   href: "#/demofree/recharge/status",
+      //   isShow: this.isManager === EManagerType.ReCharge || this.isManager === EManagerType.Manager,
+      // },
+      // {
+      //   icon: "",
+      //   label: "数据统计",
+      //   key: PAGE_RECHARGE_STATISTICS,
+      //   href: "#/demofree/recharge/statistics",
+      //   isShow: this.isManager === EManagerType.ReCharge || this.isManager === EManagerType.Manager,
+      // },
+      ]
     }, {
       icon: "KH-help",
       label: "预约演示报表",
       key: "charts",
       href: "#/demofree/charts",
-      isShow: this.isManager,
+      isShow: this.isManager === EManagerType.Manager,
       children: [],
       type: _index.MENU_ITEM_NOE
     }];

package/lib/components/menus/export-modules/manage-menus/constant.js

@@ -8,7 +8,7 @@ exports.menus = void 0;
 var _i18n = require("../../i18n");
 
 var menus = [{
-  icon: "okr",
+  icon: "enterprise",
   label: _i18n.locale.menu_regulation_enterprise,
   key: "enterprise",
   href: "",

package/lib/components/menus/export-modules/manage-menus/index.css

@@ -0,0 +1,3 @@
+.titaui-menus-tree__parent-menu-node-icon.enterprise {
+  background-image: url("../../images/okr-gongsi.svg");
+}

package/lib/components/menus/images/okr-gongsi.svg

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>OKR-gongsi</title>
+    <g id="新" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="OKR-gongsi">
+            <rect id="矩形" fill-opacity="0" fill="#FFFFFF" x="0" y="0" width="18" height="18"></rect>
+            <g id="编组" transform="translate(3.000000, 1.875000)" fill="#141C28">
+                <path d="M4.10139571,0.207109154 C5.30548811,-0.332079068 6.71387503,0.21781894 7.24711594,1.43534073 C7.38177811,1.74280798 7.45134383,2.07535848 7.45134383,2.41162737 L7.45134383,2.41162737 L7.45134383,4.57179909 L8.31469627,5.11190194 C8.50972555,5.210975 8.64355884,5.41510258 8.64355884,5.65083722 C8.64355884,5.98373015 8.37667242,6.25359319 8.04745134,6.25359319 C7.93433435,6.25359319 7.82857621,6.22173481 7.73847398,6.16640762 L7.737,6.169 L6.54112363,5.41956638 C6.39501401,5.32796807 6.29659069,5.17813983 6.26784152,5.01002569 L6.25912882,4.90728246 L6.25912882,2.41162737 C6.25912882,2.24349293 6.22434596,2.07721768 6.15701487,1.92348405 L6.15701487,1.92348405 L6.14681255,1.9008124 C5.87280554,1.30793451 5.17867538,1.04314408 4.58415476,1.30936826 L4.58415476,1.30936826 L1.90167098,2.5105748 C1.47035103,2.70371832 1.19221501,3.13584938 1.19221501,3.61283391 L1.19221501,3.61283391 L1.19221501,11.8389761 C1.19221501,12.504762 1.72598786,13.0445078 2.38443003,13.0445078 L2.38443003,13.0445078 L7.995,13.044 L8.04745134,14.2401098 L9.74192999,14.2409586 C9.68587029,14.2458533 9.62924586,14.2488023 9.57212243,14.249738 L9.57212243,14.249738 L9.5377201,14.25 L2.38443003,14.25 C1.06754569,14.25 0,13.1705478 0,11.8389761 L0,11.8389761 L0,3.61283391 C0,2.65886485 0.556272039,1.79460272 1.41891194,1.4083157 L1.41891194,1.4083157 Z" id="形状结合" fill-rule="nonzero"></path>
+                <rect id="矩形" x="3.15" y="3.26067444" width="1.2" height="4.8" rx="0.6"></rect>
+            </g>
+            <g id="编组" transform="translate(7.275000, 8.775000)">
+                <path d="M2.65951382,0.134116403 L1.38451382,0.868914715 C0.643634524,1.29589264 0.1875,2.08321551 0.1875,2.93505159 L0.1875,4.41494841 C0.1875,5.26678449 0.643634524,6.05410736 1.38451382,6.48108529 L2.65951382,7.2158836 C3.40359267,7.64470547 4.32140733,7.64470547 5.06548618,7.2158836 L6.34048618,6.48108529 C7.08136548,6.05410736 7.5375,5.26678449 7.5375,4.41494841 L7.5375,2.93505159 C7.5375,2.08321551 7.08136548,1.29589264 6.34048618,0.868914715 L5.06548618,0.134116403 C4.32140733,-0.294705468 3.40359267,-0.294705468 2.65951382,0.134116403 Z M4.46399309,1.16718484 L5.73899309,1.90198315 C6.10943274,2.11547211 6.3375,2.50913355 6.3375,2.93505159 L6.3375,4.41494841 C6.3375,4.84086645 6.10943274,5.23452789 5.73899309,5.44801685 L4.46399309,6.18281516 C4.09195366,6.3972261 3.63304634,6.3972261 3.26100691,6.18281516 L1.98600691,5.44801685 C1.61556726,5.23452789 1.3875,4.84086645 1.3875,4.41494841 L1.3875,2.93505159 C1.3875,2.50913355 1.61556726,2.11547211 1.98600691,1.90198315 L3.26100691,1.16718484 C3.63304634,0.952773904 4.09195366,0.952773904 4.46399309,1.16718484 Z" id="多边形" fill="#141C28" fill-rule="nonzero" transform="translate(3.862500, 3.675000) rotate(-90.000000) translate(-3.862500, -3.675000) "></path>
+                <circle id="椭圆形" stroke="#2879FF" stroke-width="1.05" cx="3.8625" cy="3.675" r="1.0875"></circle>
+            </g>
+        </g>
+    </g>
+</svg>

package/lib/components/nav-top/components/menu/index.css

@@ -13,6 +13,7 @@
   font-weight: 600;
   cursor: pointer;
   color: #ffffff;
+  position: relative;
 }
 
 .titaui-nav-top-menu__menu-show:hover {
@@ -38,6 +39,29 @@
   transform: translate(-50%, 0);
 }
 
+.titaui-nav-top-menu__menu--hasNum {
+  position: absolute;
+  right: 4px;
+  top: 1px;
+  background: #fe5042;
+  border-radius: 18px;
+  height: 16px;
+  font-size: 12px;
+  color: #ffffff;
+  line-height: 18px;
+  padding: 0 4px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  min-width: 8px;
+  font-weight: 400;
+}
+
+.titaui-nav-top-menu__menu--hasNum-active {
+  right: 5px;
+  top: 3px;
+}
+
 .titaui-nav-top-menu__hide-menus {
   display: flex;
   flex-direction: column;

package/lib/components/nav-top/components/menu/index.js

@@ -19,6 +19,8 @@ var _popup = _interopRequireDefault(require("../../../popup"));
 
 var _conditionRender = _interopRequireDefault(require("../../../../components/condition-render"));
 
+var _useGlobalValue3 = _interopRequireDefault(require("../../useGlobalValue"));
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -60,6 +62,10 @@ var Menu = function Menu(_ref) {
       popupVisible = _useState2[0],
       setPopupVisible = _useState2[1];
 
+  var _useGlobalValue = (0, _useGlobalValue3["default"])(),
+      _useGlobalValue2 = _slicedToArray(_useGlobalValue, 1),
+      feedNum = _useGlobalValue2[0];
+
   var containerRef = (0, _react.useRef)();
   var apiPath = (0, _bsGlobal.getBSGlobal)("apiPath");
   var userId = (0, _bsGlobal.getUserInfo)().Id;
@@ -94,7 +100,9 @@ var Menu = function Menu(_ref) {
       onClick: function onClick() {
         return handleTracker(menu);
       }
-    }, menu.title)), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
+    }, menu.title, menu.href === "#dynamic" && feedNum > 0 && /*#__PURE__*/_react["default"].createElement("div", {
+      className: (0, _classnames["default"])("".concat(prefix, "__menu--hasNum"), _defineProperty({}, "".concat(prefix, "__menu--hasNum-active"), activeMenuId === menu.id && menu.href === "#dynamic"))
+    }, feedNum > 100 ? "99+" : feedNum))), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
       condition: menu.title === "Learning"
     }, /*#__PURE__*/_react["default"].createElement("span", {
       className: (0, _classnames["default"])("".concat(prefix, "__menu-show"), _defineProperty({}, "".concat(prefix, "__menu-show--active"), activeMenuId === menu.id)),

package/lib/components/nav-top/components/user-message/components/reply/index.js

@@ -56,8 +56,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var preCls = "titaui-user-message-msg-reply";
 
 function Reply(props) {
-  var onItemClick = props.onItemClick,
-      handleIntervalRequestMessageInfo = props.handleIntervalRequestMessageInfo;
+  var onItemClick = props.onItemClick;
 
   var _useState = (0, _react.useState)([]),
       _useState2 = _slicedToArray(_useState, 2),
@@ -108,6 +107,10 @@ function Reply(props) {
     }
   };
 
+  var handleDeleteReply = function handleDeleteReply(msgId) {
+    (0, _request.deleteReply)(msgId);
+  };
+
   (0, _react.useEffect)(function () {
     setTimeout(function () {
       (0, _request.getReplys)(1).then(function (res) {
@@ -118,17 +121,14 @@ function Reply(props) {
 
         setIsLoading(false);
       });
-      (0, _request.clearReplys)().then(function () {
-        return handleIntervalRequestMessageInfo();
-      });
     }, 300);
   }, []);
-  console.log(replys);
   return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
     condition: isLoading
   }, /*#__PURE__*/_react["default"].createElement("img", {
     src: _loading["default"],
-    className: (0, _classnames["default"])("".concat(preCls, "__loading"))
+    className: (0, _classnames["default"])("".concat(preCls, "__loading")),
+    alt: "\u6B63\u5728\u8BF7\u6C42"
   })), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
     condition: replys.length !== 0
   }, /*#__PURE__*/_react["default"].createElement("ul", {
@@ -144,7 +144,8 @@ function Reply(props) {
     return /*#__PURE__*/_react["default"].createElement(_replyItem["default"], {
       item: item,
       onItemClick: onItemClick,
-      replys: replys
+      replys: replys,
+      handleDeleteReply: handleDeleteReply
     });
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__footer"))

package/lib/components/nav-top/components/user-message/components/reply/reply-item.js

@@ -30,14 +30,17 @@ var preCls = "titaui-user-message-msg-reply";
 function Reply(props) {
   var item = props.item,
       onItemClick = props.onItemClick,
-      replys = props.replys;
+      replys = props.replys,
+      handleDeleteReply = props.handleDeleteReply;
 
   var handleReplyClick = function handleReplyClick() {
-    onItemClick && onItemClick(false);
+    if (onItemClick) {
+      onItemClick(false);
+    }
   };
 
   var getDescText = function getDescText() {
-    if (item.content.indexOf("@") != -1) {
+    if (item.content.indexOf("@") !== -1) {
       return "@我";
     }
 
@@ -56,8 +59,15 @@ function Reply(props) {
     return (0, _utils.deleteText)((0, _utils.htmlToText)(item.content));
   };
 
-  return /*#__PURE__*/_react["default"].createElement("li", {
-    className: (0, _classnames["default"])("".concat(preCls, "__item"), _defineProperty({}, "".concat(preCls, "__item--scroll"), replys.length >= 4))
+  var handleReplyItemClick = function handleReplyItemClick(msgId) {
+    handleDeleteReply(msgId);
+  };
+
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    className: (0, _classnames["default"])("".concat(preCls, "__item"), _defineProperty({}, "".concat(preCls, "__item--scroll"), replys.length >= 4)),
+    onClick: function onClick() {
+      return handleReplyItemClick(item.msgId);
+    }
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__item-photo"))
   }, /*#__PURE__*/_react["default"].createElement(_avatar["default"], {

package/lib/components/nav-top/components/user-message/index.css

@@ -26,15 +26,16 @@
 
 .titaui-user-message__msg-total {
   position: absolute;
-  background: #f05e5e;
-  box-shadow: 0px 2px 4px 0px rgba(240, 94, 94, 0.6), inset 0px 0px 2px 1px rgba(255, 255, 255, 0.4);
-  border-radius: 8px;
+  background: #fe5042;
+  border-radius: 18px;
   font-size: 12px;
   color: #ffffff;
   line-height: 16px;
   padding: 0 4px;
   top: -4px;
   left: 12px;
+  text-align: center;
+  min-width: 8px;
 }
 
 .titaui-user-message__popup-right-top-enter {

package/lib/components/nav-top/components/user-message/index.js

@@ -27,6 +27,8 @@ var _request = require("../../request.apis");
 
 var _bell3x = _interopRequireDefault(require("./images/bell@3x.png"));
 
+var _useGlobalValue = _interopRequireDefault(require("../../useGlobalValue"));
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -82,6 +84,8 @@ function UserMessage() {
       firstTab = _useState12[0],
       setFirstTab = _useState12[1];
 
+  var setFeedNum = (0, _useGlobalValue["default"])()[1];
+
   var handleShowInfos = function handleShowInfos() {
     setPopupVisible(true);
   };
@@ -137,18 +141,28 @@ function UserMessage() {
 
         var enterpriseMedalMsg = indicators.filter(function (item) {
           return item.messageType === 1 && item.indicatorType === 1969002;
-        }); // @ts-ignore
+        });
 
-        enterpriseMedalMsg.length > 0 && window.util.upaasEnterpriseMedal(); // upaas 勋章
+        if (enterpriseMedalMsg.length > 0) {
+          window.util.upaasEnterpriseMedal();
+        } // upaas 勋章
 
-        var medalDetail = (0, _bsGlobal.getBSGlobal)("medalDetail"); // @ts-ignore
 
-        medalDetail && window.util.upaasMedal()(medalDetail); // 红包
+        var medalDetail = (0, _bsGlobal.getBSGlobal)("medalDetail");
+
+        if (medalDetail) {
+          window.util.upaasMedal()(medalDetail);
+        } // 红包
+
 
         var mRedPackIndicator = indicators.filter(function (item) {
           return item.type === "mRedPackIndicator";
         });
-        mRedPackIndicator.length > 0 && setRedPackNum(mRedPackIndicator[0].value); // 祝福，拆礼物
+
+        if (mRedPackIndicator.length > 0) {
+          setRedPackNum(mRedPackIndicator[0].value);
+        } // 祝福，拆礼物
+
 
         var blessIndicator = indicators.filter(function (item) {
           return item.type === "mZhufu";
@@ -173,6 +187,18 @@ function UserMessage() {
 
           (_window = window) === null || _window === void 0 ? void 0 : _window.Talent.app.vent.trigger("open-weekly-report-modal");
         }
+
+        var feedInfo = indicators.find(function (item) {
+          return item.type === "feedAboutMeIndicator";
+        });
+
+        if (feedInfo) {
+          // @ts-ignore
+          setFeedNum(feedInfo.value);
+        } else {
+          // @ts-ignore
+          setFeedNum(0);
+        }
       }
     });
   };
@@ -203,7 +229,8 @@ function UserMessage() {
     className: (0, _classnames["default"])("".concat(prefixCls, "__msg-total"))
   }, infosNum > 100 ? "99+" : infosNum)), /*#__PURE__*/_react["default"].createElement("img", {
     src: _bell3x["default"],
-    className: (0, _classnames["default"])(_defineProperty({}, "".concat(prefixCls, "__msg-dot"), infosNum !== preData))
+    className: (0, _classnames["default"])(_defineProperty({}, "".concat(prefixCls, "__msg-dot"), infosNum !== preData)),
+    alt: ""
   }))), /*#__PURE__*/_react["default"].createElement(_redPack["default"], {
     redPackNum: redPackNum
   }));