@titaui/pc 1.9.88 → 1.9.92

package/lib/components/change-okr-modal/Item.js

@@ -27,12 +27,6 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 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; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
@@ -53,6 +47,12 @@ 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); }
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 var colorMap = {
   1: "132,117,255",
   2: "79,115,255",
@@ -60,12 +60,48 @@ var colorMap = {
   4: "12,192,201"
 };
 
+var formatKeywordsFunc = function formatKeywordsFunc(str, key) {
+  var reg = new RegExp("(".concat(key, ")"), "g");
+  var newstr = str.replace(reg, "<span style=\"color: #2879ff;\">".concat(key, "</span>"));
+  return newstr;
+};
+
+var unFormatKeywordsFunc = function unFormatKeywordsFunc(str, key) {
+  var regExpKey = "<span style=\"color: #2879ff;\">".concat(key, "</span>");
+  var reg = new RegExp("(".concat(regExpKey, ")"), "g");
+  var newstr = str.replace(reg, key);
+  return newstr;
+};
+
+var htmlToText = function htmlToText(text) {
+  var div = document.createElement("div");
+  div.innerHTML = text;
+  var newtext = div.innerText || div.textContent;
+  return newtext;
+};
+
+var dealOkrData = function dealOkrData(data, keyWords) {
+  var newData = data;
+
+  if (keyWords) {
+    newData.workName = formatKeywordsFunc(data.workName, keyWords);
+    newData.Krs = newData.Krs.map(function (item) {
+      return _objectSpread(_objectSpread({}, item), {}, {
+        mileStoneName: formatKeywordsFunc(item.mileStoneName, keyWords)
+      });
+    });
+  }
+
+  return data;
+};
+
 var Item = /*#__PURE__*/function (_PureComponent) {
   _inherits(Item, _PureComponent);
 
   var _super = _createSuper(Item);
 
   // @ts-ignore
+  // const {data,keywords} = props
   function Item(props) {
     var _this;
 
@@ -74,31 +110,34 @@ var Item = /*#__PURE__*/function (_PureComponent) {
     _this = _super.call(this, props);
     _this.isObjectiveRelevanceKr = window.BSGlobal.OkrAdvancedSetting.KRSetting.ObjectiveRelevanceKr;
 
-    _this.onSelect = function (e, data) {
+    _this.onSelect = function (e, pdata) {
       e.stopPropagation();
       e.nativeEvent.stopImmediatePropagation();
-      var keywords = _this.props.keywords;
+      var _this$props = _this.props,
+          keywords = _this$props.keywords,
+          onSelect = _this$props.onSelect,
+          data = _this$props.data;
 
-      var unFormatData = _objectSpread({}, data);
+      var unFormatData = _objectSpread({}, pdata);
 
       if (keywords) {
         if (unFormatData.workName) {
-          unFormatData.workName = _this.unFormatKeywordsFunc(unFormatData.workName, keywords);
+          unFormatData.workName = unFormatKeywordsFunc(unFormatData.workName, keywords);
         } else {
-          unFormatData.mileStoneName = _this.unFormatKeywordsFunc(unFormatData.mileStoneName, keywords);
+          unFormatData.mileStoneName = unFormatKeywordsFunc(unFormatData.mileStoneName, keywords);
         }
       }
 
-      _this.props.onSelect({
+      onSelect({
         selectData: unFormatData,
-        okrInfo: _this.props.data
+        okrInfo: data
       });
     };
 
     _this.isExtend = function () {
-      var _this$props = _this.props,
-          data = _this$props.data,
-          active = _this$props.active;
+      var _this$props2 = _this.props,
+          data = _this$props2.data,
+          active = _this$props2.active;
       var isExpand = _this.state.isExpand;
 
       if (data.Krs.length > 0) {
@@ -112,13 +151,6 @@ var Item = /*#__PURE__*/function (_PureComponent) {
       }
     };
 
-    _this.htmlToText = function (text) {
-      var div = document.createElement("div");
-      div.innerHTML = text;
-      var newtext = div.innerText || div.textContent;
-      return newtext;
-    };
-
     _this.getCycleText = function () {
       var data = _this.props.data;
       var hzNum = [(0, _getLocale.getLocale)("OKR_MyO_Pop_1stQuarter"), (0, _getLocale.getLocale)("OKR_MyO_Pop_2ndQuarter"), (0, _getLocale.getLocale)("OKR_MyO_Pop_3rdQuarter"), (0, _getLocale.getLocale)("OKR_MyO_Pop_4thQuarter")];
@@ -144,33 +176,67 @@ var Item = /*#__PURE__*/function (_PureComponent) {
       }
     };
 
-    _this.formatKeywordsFunc = function (str, key) {
-      var reg = new RegExp("(".concat(key, ")"), "g");
-      var newstr = str.replace(reg, "<span style=\"color: #2879ff;\">".concat(key, "</span>"));
-      return newstr;
-    };
-
-    _this.unFormatKeywordsFunc = function (str, key) {
-      var regExpKey = "<span style=\"color: #2879ff;\">".concat(key, "</span>");
-      var reg = new RegExp("(".concat(regExpKey, ")"), "g");
-      var newstr = str.replace(reg, key);
-      return newstr;
-    };
+    _this.renderItemKr = function () {
+      var _this$props3 = _this.props,
+          data = _this$props3.data,
+          active = _this$props3.active,
+          isShowKr = _this$props3.isShowKr,
+          keywords = _this$props3.keywords;
+      var okrData = dealOkrData(data, keywords);
+
+      if (okrData.Krs.length > 0) {
+        return okrData.Krs.map(function (item, index) {
+          if (_this.isObjectiveRelevanceKr) {
+            return /*#__PURE__*/_react["default"].createElement(_styledComponents.ItemTop, {
+              key: item.mileStoneId
+            }, /*#__PURE__*/_react["default"].createElement(_styledComponents.Radio, {
+              onClick: function onClick(e) {
+                return _this.onSelect(e, data.Krs[index]);
+              },
+              active: active && item.mileStoneId === (active.workId || active.mileStoneId)
+            }), /*#__PURE__*/_react["default"].createElement(_styledComponents.WorkNameWrapper, {
+              isShowKr: isShowKr
+            }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+              placement: "top",
+              overlay: htmlToText(item.mileStoneName)
+            }, /*#__PURE__*/_react["default"].createElement(_styledComponents.OkrName, {
+              isKr: true,
+              isShowKr: isShowKr,
+              dangerouslySetInnerHTML: {
+                __html: "KR".concat(index + 1, "\uFF1A").concat(item.mileStoneName)
+              }
+            }))));
+          }
 
-    _this.dealOkrData = function (data, keyWords) {
-      var newData = data;
+          if (active && item.mileStoneId === (active.workId || active.mileStoneId)) {
+            return /*#__PURE__*/_react["default"].createElement(_styledComponents.ItemTop, {
+              key: item.mileStoneId
+            }, /*#__PURE__*/_react["default"].createElement(_styledComponents.Radio, {
+              onClick: function onClick(e) {
+                return _this.onSelect(e, data.Krs[index]);
+              },
+              active: active && item.mileStoneId === (active.workId || active.mileStoneId)
+            }), /*#__PURE__*/_react["default"].createElement(_styledComponents.WorkNameWrapper, {
+              isShowKr: isShowKr
+            }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+              placement: "top",
+              overlay: htmlToText(item.mileStoneName)
+            }, /*#__PURE__*/_react["default"].createElement(_styledComponents.OkrName, {
+              isKr: true,
+              isShowKr: isShowKr,
+              dangerouslySetInnerHTML: {
+                __html: "KR".concat(index + 1, "\uFF1A").concat(item.mileStoneName)
+              }
+            }))));
+          }
 
-      if (keyWords) {
-        newData.workName = _this.formatKeywordsFunc(data.workName, keyWords);
-        newData.Krs.forEach(function (item) {
-          item.mileStoneName = _this.formatKeywordsFunc(item.mileStoneName, keyWords);
+          return "";
         });
       }
 
-      return data;
+      return /*#__PURE__*/_react["default"].createElement("span", null);
     };
 
-    _this.okrData = _this.dealOkrData(_this.props.data, _this.props.keywords);
     _this.state = {
       isExpand: false
     };
@@ -192,11 +258,13 @@ var Item = /*#__PURE__*/function (_PureComponent) {
     value: function render() {
       var _this2 = this;
 
-      var _this$props2 = this.props,
-          data = _this$props2.data,
-          active = _this$props2.active,
-          isShowKr = _this$props2.isShowKr;
+      var _this$props4 = this.props,
+          data = _this$props4.data,
+          active = _this$props4.active,
+          isShowKr = _this$props4.isShowKr,
+          keywords = _this$props4.keywords;
       var isExpand = this.state.isExpand;
+      var okrData = dealOkrData(data, keywords);
       return /*#__PURE__*/_react["default"].createElement(_styledComponents.ItemWrapper, null, /*#__PURE__*/_react["default"].createElement(_styledComponents.ItemObjectiveContainer, {
         onClick: function onClick() {
           return _this2.setState({
@@ -214,59 +282,21 @@ var Item = /*#__PURE__*/function (_PureComponent) {
         isShowKr: isShowKr
       }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
         placement: "top",
-        overlay: this.htmlToText(this.okrData.workName)
+        overlay: htmlToText(okrData.workName)
       }, /*#__PURE__*/_react["default"].createElement(_styledComponents.OkrName, {
         isKr: false,
         isShowKr: isShowKr,
         dangerouslySetInnerHTML: {
-          __html: this.okrData.workName
+          __html: okrData.workName
         }
       }))), this.isObjectiveRelevanceKr && isShowKr && data.Krs.length > 0 && /*#__PURE__*/_react["default"].createElement("span", {
-        className: "".concat(this.state.isExpand ? "tu-icon-arrow-up" : "tu-icon-arrow-down")
+        className: "".concat(isExpand ? "tu-icon-arrow-up" : "tu-icon-arrow-down")
       })), /*#__PURE__*/_react["default"].createElement(_styledComponents.ItemBottom, null, !isShowKr && [/*#__PURE__*/_react["default"].createElement("span", null, (0, _constant.getTypeMap)()[data.okrType]), /*#__PURE__*/_react["default"].createElement(_styledComponents.Separator, null)], /*#__PURE__*/_react["default"].createElement(_styledComponents.PricipleName, null, /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
         name: data.principalUser.name,
         id: data.principalUser.userId
-      })), /*#__PURE__*/_react["default"].createElement(_styledComponents.Separator, null), /*#__PURE__*/_react["default"].createElement("span", null, data.startDate, "-", data.endDate), isShowKr && [/*#__PURE__*/_react["default"].createElement(_styledComponents.Separator, null), /*#__PURE__*/_react["default"].createElement("span", null, data.statusName)])), isShowKr && (this.isObjectiveRelevanceKr || !this.isObjectiveRelevanceKr && this.okrData.hasSub) && /*#__PURE__*/_react["default"].createElement(_styledComponents.ItemKrContainer, {
+      })), /*#__PURE__*/_react["default"].createElement(_styledComponents.Separator, null), /*#__PURE__*/_react["default"].createElement("span", null, data.startDate, "-", data.endDate), isShowKr && [/*#__PURE__*/_react["default"].createElement(_styledComponents.Separator, null), /*#__PURE__*/_react["default"].createElement("span", null, data.statusName)])), isShowKr && (this.isObjectiveRelevanceKr || !this.isObjectiveRelevanceKr && okrData.hasSub) && /*#__PURE__*/_react["default"].createElement(_styledComponents.ItemKrContainer, {
         className: "".concat(isExpand ? "slideIn" : "slideOut")
-      }, this.okrData.Krs.length > 0 && this.okrData.Krs.map(function (item, index) {
-        return _this2.isObjectiveRelevanceKr ? /*#__PURE__*/_react["default"].createElement(_styledComponents.ItemTop, {
-          key: item.mileStoneId
-        }, /*#__PURE__*/_react["default"].createElement(_styledComponents.Radio, {
-          onClick: function onClick(e) {
-            return _this2.onSelect(e, data.Krs[index]);
-          },
-          active: active && item.mileStoneId === (active.workId || active.mileStoneId)
-        }), /*#__PURE__*/_react["default"].createElement(_styledComponents.WorkNameWrapper, {
-          isShowKr: isShowKr
-        }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
-          placement: "top",
-          overlay: _this2.htmlToText(item.mileStoneName)
-        }, /*#__PURE__*/_react["default"].createElement(_styledComponents.OkrName, {
-          isKr: true,
-          isShowKr: isShowKr,
-          dangerouslySetInnerHTML: {
-            __html: "KR".concat(index + 1, "\uFF1A").concat(item.mileStoneName)
-          }
-        })))) : active && item.mileStoneId === (active.workId || active.mileStoneId) ? /*#__PURE__*/_react["default"].createElement(_styledComponents.ItemTop, {
-          key: item.mileStoneId
-        }, /*#__PURE__*/_react["default"].createElement(_styledComponents.Radio, {
-          onClick: function onClick(e) {
-            return _this2.onSelect(e, data.Krs[index]);
-          },
-          active: active && item.mileStoneId === (active.workId || active.mileStoneId)
-        }), /*#__PURE__*/_react["default"].createElement(_styledComponents.WorkNameWrapper, {
-          isShowKr: isShowKr
-        }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
-          placement: "top",
-          overlay: _this2.htmlToText(item.mileStoneName)
-        }, /*#__PURE__*/_react["default"].createElement(_styledComponents.OkrName, {
-          isKr: true,
-          isShowKr: isShowKr,
-          dangerouslySetInnerHTML: {
-            __html: "KR".concat(index + 1, "\uFF1A").concat(item.mileStoneName)
-          }
-        })))) : "";
-      })));
+      }, this.renderItemKr()));
     }
   }]);
 

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

@@ -48,10 +48,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var DemoMenus = function DemoMenus(props) {
   var _props$onSelect = props.onSelect,
       onSelect = _props$onSelect === void 0 ? function () {} : _props$onSelect,
-      history = props.history;
-  console.log({
-    history: history
-  });
+      history = props.history,
+      isManager = props.isManager;
   var menuRef = (0, _react.useRef)();
   var okrMenusData = (0, _react.useRef)(_menus.defaultRefObject);
 
@@ -60,13 +58,24 @@ var DemoMenus = function DemoMenus(props) {
       selectedMenuKeys = _useState2[0],
       setSelectedMenuKeys = _useState2[1];
 
-  var _useState3 = (0, _react.useState)(function () {
+  var _useState3 = (0, _react.useState)(["demofree"]),
+      _useState4 = _slicedToArray(_useState3, 2),
+      expandedKeys = _useState4[0],
+      setExpandedKeys = _useState4[1];
+
+  var _useState5 = (0, _react.useState)(function () {
     okrMenusData.current = new _menus["default"]();
     return okrMenusData.current.getMenus();
   }),
-      _useState4 = _slicedToArray(_useState3, 1),
-      menus = _useState4[0];
+      _useState6 = _slicedToArray(_useState5, 2),
+      menus = _useState6[0],
+      setMenus = _useState6[1];
 
+  (0, _react.useEffect)(function () {
+    okrMenusData.current = new _menus["default"](isManager === 1);
+    setMenus(okrMenusData.current.getMenus());
+    setExpandedKeys(["demofree"]);
+  }, [isManager]);
   var flipRef = (0, _react.useRef)({
     next: function next() {},
     goback: function goback() {}
@@ -78,6 +87,10 @@ var DemoMenus = function DemoMenus(props) {
     } else {
       menuRef.current.style.width = "";
     }
+  };
+
+  var onExpandHandler = function onExpandHandler(expandKeys) {
+    setExpandedKeys(expandKeys);
   }; // 判断路由高亮菜单
 
 
@@ -103,13 +116,15 @@ var DemoMenus = function DemoMenus(props) {
     collapseMenu: collapseMenu,
     ref: flipRef,
     defaultWidth: _getLocale.isEn ? 210 : 180
-  }, /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
+  }, /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "-appraisal-menus-tree"))
   }, /*#__PURE__*/_react["default"].createElement(_scrollbar["default"], null, /*#__PURE__*/_react["default"].createElement(_menuTree["default"], {
     data: menus,
     selectedKeys: selectedMenuKeys,
+    defaultExpandedKeys: expandedKeys,
+    onExpand: onExpandHandler,
     onSelect: onSelectHandler
-  })))), /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null)));
+  }))), /*#__PURE__*/_react["default"].createElement("div", null)));
 };
 
 var _default = (0, _reactRouter.withRouter)(DemoMenus);

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

@@ -31,19 +31,21 @@ exports.PAGE_IGNORED_DEMOFREE = PAGE_IGNORED_DEMOFREE;
 
 var DemoMenuData = /*#__PURE__*/function () {
   function DemoMenuData() {
+    var isManager = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+
     _classCallCheck(this, DemoMenuData);
 
-    this.isManager = localStorage.getItem('DEMO_USER_IS_MANAGER') === '1';
+    this.isManager = isManager;
     this.menus = [{
       icon: "kaohe",
-      label: "demofree",
-      key: 'demofree',
+      label: "任务状态",
+      key: "demofree",
       href: this.isManager ? "#/demofree/list?selected=unassigned" : "#/demofree/list?selected=assigned",
       isShow: true,
       children: [{
         icon: "",
         label: "未分配",
-        key: "unAssigned",
+        key: "unassigned",
         href: "#/demofree/list?selected=unassigned",
         isShow: this.isManager
       }, {
@@ -55,7 +57,7 @@ var DemoMenuData = /*#__PURE__*/function () {
       }, {
         icon: "",
         label: "已预约",
-        key: "observed",
+        key: "reserved",
         href: "#/demofree/list?selected=reserved",
         isShow: true
       }, {
@@ -116,18 +118,11 @@ var DemoMenuData = /*#__PURE__*/function () {
   }, {
     key: "formateToTreeNodeData",
     value: function formateToTreeNodeData(menus) {
-      var pid = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
-      var level = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
       var treeNodes = [];
 
-      for (var i = 0; i < menus.length; i++) {
+      for (var i = 0; i < menus.length; i += 1) {
         var menu = menus[i];
-        console.log(menu);
         var hasChildren = !!(menu.children && menu.children.length);
-        console.log({
-          hasChildren: hasChildren,
-          name: menu.label
-        });
         var isLeaf = menu.isLeaf !== undefined ? menu.isLeaf : !hasChildren;
         var nodeType = menu.type;
         if (!nodeType) nodeType = !isLeaf ? _index.PARENT_MENU_NODE : _index.SUB_MENU_ITEM_NOE;
@@ -138,7 +133,7 @@ var DemoMenuData = /*#__PURE__*/function () {
             title: menu.label,
             data: menu,
             isLeaf: isLeaf,
-            children: this.formateToTreeNodeData(menu.children || [], level + 1, menu.key),
+            children: this.formateToTreeNodeData(menu.children || []),
             nodeType: nodeType
           });
         }

package/lib/components/menus/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = _default;
+exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
@@ -29,24 +29,24 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 
 var preCls = "titaui-menus";
 
-function _default(props) {
+var Menus = function Menus(props) {
   var type = props.type,
       restProps = _objectWithoutProperties(props, _excluded);
 
   var renderMenuByType = function renderMenuByType() {
-    if (type == "okr") {
+    if (type === "okr") {
       return /*#__PURE__*/_react["default"].createElement(_okrMenus["default"], restProps);
     }
 
-    if (type == "appraisal") {
+    if (type === "appraisal") {
       return /*#__PURE__*/_react["default"].createElement(_appraisalMenus["default"], restProps);
     }
 
-    if (type == "manage") {
+    if (type === "manage") {
       return /*#__PURE__*/_react["default"].createElement(_manageMenus["default"], restProps);
     }
 
-    if (type == 'demofree') {
+    if (type === "demofree") {
       return /*#__PURE__*/_react["default"].createElement(_demoMenus["default"], restProps);
     }
 
@@ -56,4 +56,7 @@ function _default(props) {
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])(preCls)
   }, renderMenuByType());
-}
+};
+
+var _default = Menus;
+exports["default"] = _default;

package/lib/components/nav-top/constant.js

@@ -53,7 +53,7 @@ var DEMO_FREE_MENU_CONFIG = {
   menuPoint: null,
   orderId: 2000,
   originUrl: null,
-  signUrl: '',
+  signUrl: "",
   status: 0,
   tenantId: 0,
   title: "demofree",

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

@@ -73,39 +73,39 @@ var NavTop = function NavTop() {
       setActiveMenuId = _useState4[1];
 
   var ua = navigator.userAgent.toLowerCase();
-  var showWxInvite = (0, _bsGlobal.getTenantInfo)().mainCorpId && ua.indexOf("micromessenger") != -1;
+  var showWxInvite = (0, _bsGlobal.getTenantInfo)().mainCorpId && ua.indexOf("micromessenger") !== -1;
   var openWxInvite = (0, _react.useCallback)(function () {
-    // @ts-ignore
-    WeixinJSBridge // @ts-ignore
-    && WeixinJSBridge.invoke("selectPrivilegedContact", {
-      fromDepartmentId: -1,
-      // 必填，表示打开的通讯录从指定的部门开始展示，-1表示自己所在部门开始, 0表示从最上层开始
-      mode: "multi",
-      // 必填，选择模式，single表示单选，multi表示多选
-      selectedContextContact: 0 // 是否勾选当前环境的参与者。例如在群+号聊天附件栏打开，默认勾选当前群成员。
-      // "selectedOpenUserIds"["xxx","yyy"], // 非必填，已选用户OpenID列表。single模式忽略该参数。
-      // "selectedTickets"["ticket1","ticket2"] // 非必填，已选ticket列表。single模式忽略该参数
-
-    }, function (res) {
-      if (res.err_msg == "selectPrivilegedContact:ok") {
-        // var selectedUserList = res.result.userList; // 已选的成员列表
-        // for (var i = 0; i < selectedUserList.length; i++) {
-        //   var openUserId = selectedUserList[i].openUserId; //成员openUserId
-        // }
-        var selectedTicket = res.result.selectedTicket.replace(/['"]/g, ""); // 已选的集合Ticket
-
-        (0, _request.rpost)("v1")("wx/send/templateMessage?selectedTickets=".concat(selectedTicket)).then(function () {
-          _toast["default"].Success("邀请成功");
-        })["catch"](function (e) {
-          _toast["default"].Error("邀请失败");
-        });
-      } else {// console.log(res);
-      }
-    });
+    if (window.WeixinJSBridge !== undefined) {
+      window.WeixinJSBridge.invoke("selectPrivilegedContact", {
+        fromDepartmentId: -1,
+        // 必填，表示打开的通讯录从指定的部门开始展示，-1表示自己所在部门开始, 0表示从最上层开始
+        mode: "multi",
+        // 必填，选择模式，single表示单选，multi表示多选
+        selectedContextContact: 0 // 是否勾选当前环境的参与者。例如在群+号聊天附件栏打开，默认勾选当前群成员。
+        // "selectedOpenUserIds"["xxx","yyy"], // 非必填，已选用户OpenID列表。single模式忽略该参数。
+        // "selectedTickets"["ticket1","ticket2"] // 非必填，已选ticket列表。single模式忽略该参数
+
+      }, function (res) {
+        if (res.err_msg === "selectPrivilegedContact:ok") {
+          // var selectedUserList = res.result.userList; // 已选的成员列表
+          // for (var i = 0; i < selectedUserList.length; i++) {
+          //   var openUserId = selectedUserList[i].openUserId; //成员openUserId
+          // }
+          var selectedTicket = res.result.selectedTicket.replace(/['"]/g, ""); // 已选的集合Ticket
+
+          (0, _request.rpost)("v1")("wx/send/templateMessage?selectedTickets=".concat(selectedTicket)).then(function () {
+            _toast["default"].Success("邀请成功");
+          })["catch"](function () {
+            _toast["default"].Error("邀请失败");
+          });
+        } else {// console.log(res);
+        }
+      });
+    }
   }, []);
 
   var handleHashChange = function handleHashChange() {
-    var hash = location.hash.split("?")[0] || "";
+    var hash = window.location.hash.split("?")[0] || "";
 
     if (hash) {
       var activeMenu = menu.find(function (item) {
@@ -140,11 +140,13 @@ var NavTop = function NavTop() {
     className: (0, _classnames["default"])("".concat(preCls, "__left")),
     href: hasOKRApp ? "#homepage" : ""
   }, /*#__PURE__*/_react["default"].createElement("img", {
+    alt: "logo",
     src: Logo,
     className: (0, _classnames["default"])("".concat(preCls, "__left-logo"), _defineProperty({}, "".concat(preCls, "__left-logo--hover"), hasOKRApp))
   }), hasOKRApp && /*#__PURE__*/_react["default"].createElement("span", {
-    className: (0, _classnames["default"])("".concat(preCls, "__left-home"), (_classNames2 = {}, _defineProperty(_classNames2, "".concat(preCls, "__left-home--active"), activeMenuId == 99999), _defineProperty(_classNames2, "".concat(preCls, "__left-home--hover"), hasOKRApp), _classNames2))
+    className: (0, _classnames["default"])("".concat(preCls, "__left-home"), (_classNames2 = {}, _defineProperty(_classNames2, "".concat(preCls, "__left-home--active"), activeMenuId === 99999), _defineProperty(_classNames2, "".concat(preCls, "__left-home--hover"), hasOKRApp), _classNames2))
   }, /*#__PURE__*/_react["default"].createElement("img", {
+    alt: "home-img",
     src: _home["default"],
     className: (0, _classnames["default"])("".concat(preCls, "__left-home-img"))
   }))), /*#__PURE__*/_react["default"].createElement("div", {

package/lib/components/nav-top/request.apis.js

@@ -12,13 +12,13 @@ var _request = require("../../utils/request");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 // @ts-ignore
-var tenantId = BSGlobal && BSGlobal.tenantInfo.Id || 0; // @ts-ignore
+var tenantId = window.BSGlobal && window.BSGlobal.tenantInfo.Id || 0; // @ts-ignore
 
-var userId = BSGlobal && BSGlobal.loginUserInfo.Id || 0;
+var userId = window.BSGlobal && window.BSGlobal.loginUserInfo.Id || 0;
 
 var requestDomain = function requestDomain() {
   if (!window.location.hostname.match(/dev/)) return "";
-  return "".concat(location.protocol, "//www.tita.gift");
+  return "".concat(window.location.protocol, "//www.tita.gift");
 };
 
 var getTodos = function getTodos(pageNum) {
@@ -72,8 +72,8 @@ var getMessages = function getMessages() {
   var date = nowTime.getDate();
   return _axios["default"].get("".concat(requestDomain(), "/api/v1/").concat(tenantId, "/").concat(userId, "/RemindV2/Get?dateTime=").concat(year, "/").concat(month, "/").concat(date)).then(function (resp) {
     if (resp.code === 401) {
-      location.href = "/Account/Logout";
-      return;
+      window.location.href = "/Account/Logout";
+      return undefined;
     }
 
     return resp.data;

package/lib/components/nav-top/utils.js

@@ -3,26 +3,17 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getMenus = exports.getLogo = void 0;
+exports.transMetasToTableData = exports.getMenus = exports.getLogo = void 0;
 
 var _bsGlobal = require("../../utils/bs-global");
 
 var _logoWhite = _interopRequireDefault(require("./images/logo-white.png"));
 
-var _constant = require("./constant");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var getMenus = function getMenus() {
   // @ts-ignore
-  var navs = BSGlobal.newNavigation; // @ts-ignore
-  // 352728 561583
-
-  if (BSGlobal.tenantInfo.Id === 352728) {
-    localStorage.getItem("DEMOFREE_LOGIN_USER") === '1' && (_constant.DEMO_FREE_MENU_CONFIG.href = '#demofree/list?selected=unassigned');
-    navs = navs.concat(_constant.DEMO_FREE_MENU_CONFIG);
-  }
-
+  var navs = window.BSGlobal.newNavigation;
   navs.sort(function (pre, next) {
     return pre.orderId - next.orderId;
   });
@@ -37,4 +28,21 @@ var getLogo = function getLogo() {
   return tenantInfo.isNewIndex && /232637ab8a674427a1d6489329035d86_n/g.test(tenantInfo.Logo) || !tenantInfo.Logo ? _logoWhite["default"] : tenantInfo.Logo;
 };
 
-exports.getLogo = getLogo;
+exports.getLogo = getLogo;
+
+var transMetasToTableData = function transMetasToTableData() {
+  var dataSource = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var listData = [];
+  dataSource.forEach(function (dataItem) {
+    var data = {};
+    dataItem.forEach(function (field) {
+      var name = field.name,
+          value = field.value;
+      data[name] = value;
+    });
+    listData.push(data);
+  });
+  return listData;
+};
+
+exports.transMetasToTableData = transMetasToTableData;

package/lib/components/okr-flow/export-modal/index.js

@@ -119,7 +119,7 @@ var ExportMapModal = function ExportMapModal(props) {
 
               canvas = document.createElement("canvas"); // 创建一个canvas节点
 
-              scale = 10; // 定义任意放大倍数 支持小数   设置成20之后企业微信工作台导出不了
+              scale = 20; // 定义任意放大倍数 支持小数
 
               canvas.width = width * scale; // 定义canvas 宽度 * 缩放
 

package/lib/components/okr-period-selector/select-cycle.js

@@ -94,6 +94,13 @@ function CreateCycle(_ref) {
       setCycleSetting = _useState4[1];
 
   (0, _react.useEffect)(function () {
+    var settings = localStorage.getItem("OKR_CYCLE_SETTING");
+
+    if (settings) {
+      setCycleSetting(JSON.parse(settings));
+      return;
+    }
+
     var url = (0, _helper.getApiUrl)("okr/cycleSetting");
     (0, _helper.taker)(url, "GET").then(function (res) {
       if (res.Code == 1) {

package/lib/pages/demo-free/index.js

@@ -7,14 +7,10 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _dynamic = _interopRequireDefault(require("../../components/dynamic/dynamic"));
-
 var _errorBoundary = _interopRequireDefault(require("../../components/error-boundary"));
 
 var _errorLevel = _interopRequireDefault(require("../../utils/error-level"));
 
-require("./index.css");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var prefix = "dynamic-page";
@@ -24,7 +20,7 @@ var DemoFree = function DemoFree() {
     errorLevel: _errorLevel["default"].P0
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix
-  }, /*#__PURE__*/_react["default"].createElement(_dynamic["default"], null)));
+  }, /*#__PURE__*/_react["default"].createElement("div", null)));
 };
 
 var _default = DemoFree;

package/lib/pages/new-okr-list/init-cycle-setting.js

@@ -38,8 +38,10 @@ function InitCycleSetting(props) {
       setVisible = _useState2[1];
 
   (0, _react.useEffect)(function () {
-    if (localStorage.getItem("cycle_setting_stop_show".concat((0, _bsGlobal.getUserInfo)().Id)) == "true") return;
+    if (localStorage.getItem("cycle_setting_stop_show".concat((0, _bsGlobal.getUserInfo)().Id)) == 'true') return;
+    localStorage.removeItem("OKR_CYCLE_SETTING");
     (0, _requestApi.getCycleSetting)().then(function (res) {
+      localStorage.setItem("OKR_CYCLE_SETTING", JSON.stringify((res === null || res === void 0 ? void 0 : res.Data) || {}));
       var hasSetting = res.Data.hasSetting;
       if (!hasSetting) setVisible(true);
     });
@@ -50,7 +52,7 @@ function InitCycleSetting(props) {
       return setVisible(false);
     },
     onRefresh: function onRefresh() {
-      return location.reload();
+      return window.location.reload();
     }
   });
 }

package/lib/pages/new-okr-list/request-api.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.visitOkrCyclePag = exports.okrSearch = exports.okrList = exports.okrCrowd = exports.getUserInfoById = exports.getOkrSetting = exports.getOkrInfoWithListData = exports.getCycleSetting = void 0;
+exports.visitOkrCyclePag = exports.okrSearch = exports.okrList = exports.okrCrowd = exports.getUserInfoById = exports.getOkrInfoWithListData = exports.getCycleSetting = void 0;
 
 var _request = require("../../utils/request");
 
@@ -117,39 +117,14 @@ var getOkrInfoWithListData = /*#__PURE__*/function () {
 
 exports.getOkrInfoWithListData = getOkrInfoWithListData;
 
-var getOkrSetting = /*#__PURE__*/function () {
-  var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4() {
-    return regeneratorRuntime.wrap(function _callee4$(_context4) {
-      while (1) {
-        switch (_context4.prev = _context4.next) {
-          case 0:
-            return _context4.abrupt("return", (0, _request.rget)("v1")("okr/cycleSetting").then(function (res) {
-              return res.Data;
-            }));
-
-          case 1:
-          case "end":
-            return _context4.stop();
-        }
-      }
-    }, _callee4);
-  }));
-
-  return function getOkrSetting() {
-    return _ref4.apply(this, arguments);
-  };
-}();
-
-exports.getOkrSetting = getOkrSetting;
-
 var okrList = /*#__PURE__*/function () {
-  var _ref5 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5(param) {
+  var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4(param) {
     var res;
-    return regeneratorRuntime.wrap(function _callee5$(_context5) {
+    return regeneratorRuntime.wrap(function _callee4$(_context4) {
       while (1) {
-        switch (_context5.prev = _context5.next) {
+        switch (_context4.prev = _context4.next) {
           case 0:
-            _context5.next = 2;
+            _context4.next = 2;
             return (0, _request.rpost)("v1")("okr/list?toUserId=".concat(param.toUserId), _objectSpread({
               orderType: 2,
               // 默认创建时间正序
@@ -158,94 +133,94 @@ var okrList = /*#__PURE__*/function () {
             }, param));
 
           case 2:
-            res = _context5.sent;
+            res = _context4.sent;
 
             if (!(res.Code == 1)) {
-              _context5.next = 5;
+              _context4.next = 5;
               break;
             }
 
-            return _context5.abrupt("return", res.Data);
+            return _context4.abrupt("return", res.Data);
 
           case 5:
           case "end":
-            return _context5.stop();
+            return _context4.stop();
         }
       }
-    }, _callee5);
+    }, _callee4);
   }));
 
   return function okrList(_x4) {
-    return _ref5.apply(this, arguments);
+    return _ref4.apply(this, arguments);
   };
 }();
 
 exports.okrList = okrList;
 
 var getUserInfoById = /*#__PURE__*/function () {
-  var _ref6 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6(toUserId) {
-    return regeneratorRuntime.wrap(function _callee6$(_context6) {
+  var _ref5 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5(toUserId) {
+    return regeneratorRuntime.wrap(function _callee5$(_context5) {
       while (1) {
-        switch (_context6.prev = _context6.next) {
+        switch (_context5.prev = _context5.next) {
           case 0:
-            return _context6.abrupt("return", (0, _request.rget)("v2")("user/GetById?toUserid=".concat(toUserId)));
+            return _context5.abrupt("return", (0, _request.rget)("v2")("user/GetById?toUserid=".concat(toUserId)));
 
           case 1:
           case "end":
-            return _context6.stop();
+            return _context5.stop();
         }
       }
-    }, _callee6);
+    }, _callee5);
   }));
 
   return function getUserInfoById(_x5) {
-    return _ref6.apply(this, arguments);
+    return _ref5.apply(this, arguments);
   };
 }();
 
 exports.getUserInfoById = getUserInfoById;
 
 var visitOkrCyclePag = /*#__PURE__*/function () {
-  var _ref7 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee7(toUserId) {
-    return regeneratorRuntime.wrap(function _callee7$(_context7) {
+  var _ref6 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6(toUserId) {
+    return regeneratorRuntime.wrap(function _callee6$(_context6) {
       while (1) {
-        switch (_context7.prev = _context7.next) {
+        switch (_context6.prev = _context6.next) {
           case 0:
-            return _context7.abrupt("return", (0, _request.rpost)("v1")("okr/visitOkrCyclePag?toUserId=".concat(toUserId)));
+            return _context6.abrupt("return", (0, _request.rpost)("v1")("okr/visitOkrCyclePag?toUserId=".concat(toUserId)));
 
           case 1:
           case "end":
-            return _context7.stop();
+            return _context6.stop();
         }
       }
-    }, _callee7);
+    }, _callee6);
   }));
 
   return function visitOkrCyclePag(_x6) {
-    return _ref7.apply(this, arguments);
+    return _ref6.apply(this, arguments);
   };
 }();
 
 exports.visitOkrCyclePag = visitOkrCyclePag;
 
 var getCycleSetting = /*#__PURE__*/function () {
-  var _ref8 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee8() {
-    return regeneratorRuntime.wrap(function _callee8$(_context8) {
+  var _ref7 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee7() {
+    return regeneratorRuntime.wrap(function _callee7$(_context7) {
       while (1) {
-        switch (_context8.prev = _context8.next) {
+        switch (_context7.prev = _context7.next) {
           case 0:
-            return _context8.abrupt("return", (0, _request.rget)("v1")("okr/cycleSetting"));
+            return _context7.abrupt("return", (0, _request.rget)("v1")("okr/cycleSetting"));
 
           case 1:
           case "end":
-            return _context8.stop();
+            return _context7.stop();
         }
       }
-    }, _callee8);
+    }, _callee7);
   }));
 
   return function getCycleSetting() {
-    return _ref8.apply(this, arguments);
+    return _ref7.apply(this, arguments);
   };
 }();
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.9.88",
+  "version": "1.9.92",
   "nameCN": "",
   "description": "",
   "main": "src/index.js",
@@ -119,7 +119,6 @@
     "react-dom": "^17.0.2",
     "react-grid-layout": "^1.2.5",
     "react-perfect-scrollbar": "^1.5.8",
-    "react-router": "^6.2.1",
     "react-sizeme": "^3.0.1",
     "react-slick": "^0.28.1",
     "react-spring": "^9.2.4",

package/src/components/menus/export-modules/demo-menus/index.tsx

@@ -14,18 +14,23 @@ import { isEn } from "../../../../utils/getLocale";
 interface DemoMenusProps {
   onSelect: (node: any) => void;
   history: any;
+  isManager: number
 }
 const DemoMenus: React.FC<DemoMenusProps> = (props) => {
-  const { onSelect = () => { }, history } = props;
-
+  const { onSelect = () => { }, history, isManager } = props;
   const menuRef = useRef<any>();
   const okrMenusData = useRef<DemoMenusInt>(defaultRefObject);
   const [selectedMenuKeys, setSelectedMenuKeys] = useState<string[]>([]);
   const [expandedKeys, setExpandedKeys] = useState(["demofree"]);
-  const [menus] = useState(() => {
+  const [menus, setMenus] = useState(() => {
     okrMenusData.current = new DemoMenuData();
-    return okrMenusData.current.getMenus();
+    return okrMenusData.current.getMenus()
   });
+  useEffect(() => {
+    okrMenusData.current = new DemoMenuData(isManager === 1);
+    setMenus(okrMenusData.current.getMenus())
+    setExpandedKeys(["demofree"]);
+  }, [isManager])
   const flipRef = useRef<flipRefIns>({
     next: () => { },
     goback: () => { },
@@ -66,7 +71,7 @@ const DemoMenus: React.FC<DemoMenusProps> = (props) => {
             <MenuTree
               data={menus}
               selectedKeys={selectedMenuKeys}
-              expandedKeys={expandedKeys}
+              defaultExpandedKeys={expandedKeys}
               onExpand={onExpandHandler}
               onSelect={onSelectHandler}
             />

package/src/components/menus/export-modules/demo-menus/menus.tsx

@@ -26,8 +26,8 @@ export default class DemoMenuData {
 
   public isManager;
 
-  constructor() {
-    this.isManager = localStorage.getItem("DEMO_USER_IS_MANAGER") === "1";
+  constructor(isManager = false) {
+    this.isManager = isManager;
     this.menus = [
       {
         icon: "kaohe",