@titaui/pc 1.6.15 → 1.6.16

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

@@ -4,7 +4,7 @@
   background: #ffffff;
   box-shadow: 0px 4px 24px 0px rgba(127, 145, 180, 0.2);
   border-radius: 24px;
-  padding: 16px 12px;
+  padding: 16px 16px 16px 12px;
 }
 
 .titaui-nav-top-user-own-menu__card-items {
@@ -46,6 +46,7 @@
   width: 16px;
   height: 16px;
   margin: 3px 8px 3px 0;
+  color: #3f4755;
 }
 
 .titaui-nav-top-user-own-menu__card-item-title {

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

@@ -52,9 +52,8 @@ var User = function User() {
       return /*#__PURE__*/_react["default"].createElement("li", {
         className: (0, _classnames["default"])("".concat(preCls, "__card-item")),
         key: item.id
-      }, /*#__PURE__*/_react["default"].createElement("img", {
-        src: item.url,
-        className: (0, _classnames["default"])("".concat(preCls, "__card-item-img"))
+      }, /*#__PURE__*/_react["default"].createElement("i", {
+        className: (0, _classnames["default"])("".concat(preCls, "__card-item-img"), item.url)
       }), /*#__PURE__*/_react["default"].createElement("a", {
         href: item.objUrl,
         className: (0, _classnames["default"])("".concat(preCls, "__card-item-title"))

package/lib/components/nav-top/components/user-own-menu/utils.js

@@ -9,20 +9,6 @@ var _auth = require("../../../../utils/auth");
 
 var _bsGlobal = require("../../../../utils/bs-global");
 
-var _manage = _interopRequireDefault(require("../../images/manage.svg"));
-
-var _ownHome = _interopRequireDefault(require("../../images/own-home.svg"));
-
-var _set = _interopRequireDefault(require("../../images/set.svg"));
-
-var _open = _interopRequireDefault(require("../../images/open.svg"));
-
-var _qiyeO = _interopRequireDefault(require("../../images/qiye-o.svg"));
-
-var _exit = _interopRequireDefault(require("../../images/exit.svg"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
 var userId = (0, _bsGlobal.getUserInfo)().Id;
 var apiServer = (0, _bsGlobal.getBSGlobal)("apiPath");
 var tm = (0, _bsGlobal.getBSGlobal)("tm");
@@ -32,34 +18,34 @@ var isManager = new _auth.BaseAuth().isManager();
 var getOwnSet = function getOwnSet() {
   var ownhandle = [{
     id: "ownHome",
-    url: _ownHome["default"],
+    url: "tu-icon-myhome",
     title: "个人信息",
     objUrl: "".concat(apiServer, "/u/").concat(userId, "/Home/#user-info")
   }, {
     id: "ownSet",
-    url: _set["default"],
+    url: "tu-icon-APP-shezhi",
     title: "个人设置",
     objUrl: "".concat(apiServer, "/u/").concat(userId, "/Home/#setting")
   }];
   var limit = [{
     id: "manage",
-    url: _manage["default"],
+    url: "tu-icon-myqyht",
     title: "企业管理后台",
     objUrl: "".concat(tm)
   }, {
     id: "open",
-    url: _open["default"],
+    url: "tu-icon-my-gjgn",
     title: "开启高级设置",
     objUrl: "".concat(tm, "/").concat(userId, "/TmHome#?iTalentFrameType=iframe&iTalentFrame=%2F%2Fadmin.tita.gift%2F500000036%2FindexV2%23%2FadvancedSettings")
   }, {
     id: "role",
-    url: _qiyeO["default"],
+    url: "tu-icon-gongsi",
     title: "企业管理规定",
     objUrl: "".concat(apiServer, "/u/").concat(userId, "/Home#setting?id=15709")
   }];
   var exit = [{
     id: "Logout",
-    url: _exit["default"],
+    url: "tu-icon-tuichu",
     title: "退出登录",
     objUrl: "".concat(apiServer, "/Account/Logout")
   }];

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.versionTextMap = exports.path = exports.popupAlignPhoto = exports.userInfoPath = exports.tm = exports.apiServer = exports.userId = void 0;
+exports.versionTextMap = exports.userInfoPath = exports.userId = exports.tm = exports.popupAlignPhoto = exports.apiServer = void 0;
 
 var _bsGlobal = require("../../utils/bs-global");
 
@@ -28,15 +28,7 @@ var popupAlignPhoto = {
     adjustY: true
   },
   targetOffset: [0, 0]
-}; //待办提醒任务
-
-exports.popupAlignPhoto = popupAlignPhoto;
-var path = {
-  todoPath: "todo/Get?app_type=-1&app_id=-1&page_num=1&page_size=50&status=1&pageNum=1",
-  remindPath: "remind/get",
-  informPath: "messages/Get?page_size=1000&page_num=1&status=1&app_type=-1&app_id=-1",
-  replyPath: "comment/messages?page_num=1&page_size=20&status=2"
 };
-exports.path = path;
+exports.popupAlignPhoto = popupAlignPhoto;
 var versionTextMap = (_versionTextMap = {}, _defineProperty(_versionTextMap, _constant.Versions.Standard, "项目版"), _defineProperty(_versionTextMap, _constant.Versions.WeixinAssess, "绩效版"), _defineProperty(_versionTextMap, _constant.Versions.Professional, "OKR版"), _defineProperty(_versionTextMap, _constant.Versions.Flagship, "旗舰版"), _versionTextMap);
 exports.versionTextMap = versionTextMap;

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

@@ -87,3 +87,58 @@
   width: 28px !important;
   height: 28px !important;
 }
+
+.tita-user-own-menu__popup-right-top-enter,
+.tita-user-own-menu__popup-right-top-appear {
+  opacity: 0;
+  animation-duration: 0.2s;
+  animation-fill-mode: both;
+  animation-timing-function: linear;
+  animation-play-state: paused;
+}
+
+.tita-user-own-menu__popup-right-top-leave {
+  animation-duration: 0.1s;
+  animation-fill-mode: both;
+  animation-timing-function: linear;
+  animation-play-state: paused;
+}
+
+.tita-user-own-menu__popup-right-top-enter.tita-user-own-menu__popup-right-top-enter-active,
+.tita-user-own-menu__popup-right-top-appear.tita-user-own-menu__popup-right-top-appear-active {
+  animation-name: titaPopupInRT;
+  animation-play-state: running;
+}
+
+.tita-user-own-menu__popup-right-top-leave.tita-user-own-menu__popup-right-top-leave-active {
+  animation-name: titaPopupOutRT;
+  animation-play-state: running;
+}
+
+@keyframes titaPopupInRT {
+  0% {
+    opacity: 0;
+    transform-origin: 100% 0%;
+    transform: scale(0, 0);
+  }
+
+  100% {
+    opacity: 1;
+    transform-origin: 100% 0%;
+    transform: scale(1, 1);
+  }
+}
+
+@keyframes titaPopupOutRT {
+  0% {
+    opacity: 1;
+    transform-origin: 100% 0%;
+    transform: scale(1, 1);
+  }
+
+  100% {
+    opacity: 0;
+    transform-origin: 100% 0%;
+    transform: scale(0, 0);
+  }
+}

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

@@ -80,7 +80,7 @@ var NavTop = function NavTop() {
 
     if (hash) {
       var activeMenu = menu.find(function (item) {
-        return hash.includes(item.href.split('#')[1]);
+        return hash.includes(item.href.split("#")[1]);
       });
 
       if (activeMenu) {
@@ -122,7 +122,8 @@ var NavTop = function NavTop() {
     className: (0, _classnames["default"])("".concat(preCls, "__version"))
   }, /*#__PURE__*/_react["default"].createElement(_version["default"], null)), /*#__PURE__*/_react["default"].createElement(_popup["default"], {
     popup: /*#__PURE__*/_react["default"].createElement(_userOwnMenu["default"], null),
-    popupAlign: _constant.popupAlignPhoto
+    popupAlign: _constant.popupAlignPhoto,
+    popupTransitionName: "tita-user-own-menu__popup-right-top"
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__photo"))
   }, /*#__PURE__*/_react["default"].createElement(_default2["default"], {

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

@@ -3,14 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getMessages = exports.getInforms = exports.getReminds = exports.getReplys = exports.getData = exports.getTodos = void 0;
+exports.getTodos = exports.getReplys = exports.getReminds = exports.getMessages = exports.getInforms = exports.getData = void 0;
 
 var _request = require("../../utils/request");
 
-var _constant = require("./constant");
-
 var getTodos = function getTodos(pageNum) {
-  return (0, _request.rget)("v1")("todo/Get?app_type=-1&app_id=-1&page_num=".concat(pageNum, "&page_size=20&status=1"));
+  return (0, _request.rget)("v1")("todo/Get?app_type=-1&app_id=-1&page_num=".concat(pageNum, "&page_size=10&status=1"));
 };
 
 exports.getTodos = getTodos;
@@ -24,19 +22,19 @@ var getData = function getData(url, saveData) {
 exports.getData = getData;
 
 var getReplys = function getReplys(pageNum) {
-  return (0, _request.rget)("v1")("comment/messages?page_num=".concat(pageNum, "&page_size=20&status=2"));
+  return (0, _request.rget)("v1")("comment/messages?page_num=".concat(pageNum, "&page_size=10&status=2"));
 };
 
 exports.getReplys = getReplys;
 
 var getReminds = function getReminds() {
-  return (0, _request.rget)("v2")(_constant.path.remindPath);
+  return (0, _request.rget)("v2")("remind/get");
 };
 
 exports.getReminds = getReminds;
 
 var getInforms = function getInforms(pageNum) {
-  return (0, _request.rget)("v1")("messages/Get?page_size=20&page_num=".concat(pageNum, "&status=1&app_type=-1&app_id=-1"));
+  return (0, _request.rget)("v1")("messages/Get?page_size=10&page_num=".concat(pageNum, "&status=1&app_type=-1&app_id=-1"));
 };
 
 exports.getInforms = getInforms;

package/lib/components/okr-detail/auth.js

@@ -5,7 +5,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "functi
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.EAuth = exports.KRAuth = exports.OAuth = exports.BaseAuth = void 0;
+exports.OAuth = exports.KRAuth = exports.EAuth = exports.BaseAuth = void 0;
 
 var _bsGlobal = require("../../utils/bs-global");
 

package/lib/components/okr-detail/base-info/util.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.findUserIndex = exports.findUser = exports.formatAvatarInfo = void 0;
+exports.formatAvatarInfo = exports.findUserIndex = exports.findUser = void 0;
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 

package/lib/components/okr-detail/components/okr-tree/tree-node/e-node/constant.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.EStatusClass2StatusTypeText = exports.EStatusStatus2ClassType = exports.EStatusClass2StatusType = void 0;
+exports.EStatusStatus2ClassType = exports.EStatusClass2StatusTypeText = exports.EStatusClass2StatusType = void 0;
 var EStatusClass2StatusType = {
   'tu-icon-finished': 2,
   'tu-icon-running': 1,

package/lib/components/okr-detail/components/okr-tree/tree-node/kr-node/kr-score-editor/style.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.IconEdit = exports.AvatarWrapper = exports.Add = exports.CallSomeoneSpan = exports.ScoreInfoSpanTextareaError = exports.ScoreInfoSpanTextarea = exports.ScoreInfoSpanText = exports.ScoreInfoWrapperError = exports.ScoreInfoWrapper = exports.ExtraWrapper = void 0;
+exports.ScoreInfoWrapperError = exports.ScoreInfoWrapper = exports.ScoreInfoSpanTextareaError = exports.ScoreInfoSpanTextarea = exports.ScoreInfoSpanText = exports.IconEdit = exports.ExtraWrapper = exports.CallSomeoneSpan = exports.AvatarWrapper = exports.Add = void 0;
 
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 

package/lib/components/okr-detail/context.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.defaultConfig = exports.GeneralDataContext = exports.EListContext = exports.OkrListContext = exports.CommonContext = void 0;
+exports.defaultConfig = exports.OkrListContext = exports.GeneralDataContext = exports.EListContext = exports.CommonContext = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 

package/lib/components/okr-detail/detail-header/actions.js

@@ -38,8 +38,8 @@ function getOkrHeadActions(data) {
   addExitButton(dataWithAuth, actions);
   addFinishOrReopenButton(dataWithAuth, actions);
   addCopyButton(dataWithAuth, actions);
-  addDeleteButton(dataWithAuth, actions);
-  addDetailButton(dataWithAuth, actions);
+  addDeleteButton(dataWithAuth, actions); // addDetailButton(dataWithAuth,actions)
+
   return actions;
 }
 

package/lib/components/okr-detail/detail-header/delete-confirm/style.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.Icon = exports.ButtonGroup = exports.Options = exports.DeleteTitle = exports.DeleteWrapper = void 0;
+exports.Options = exports.Icon = exports.DeleteWrapper = exports.DeleteTitle = exports.ButtonGroup = void 0;
 
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 

package/lib/components/okr-detail/detail-header/enums.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.OkrRole = exports.OkrStatus = void 0;
+exports.OkrStatus = exports.OkrRole = void 0;
 var OkrStatus;
 exports.OkrStatus = OkrStatus;
 

package/lib/components/okr-detail/e-list/constant.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.EStatusMap = exports.SortTypeMap = void 0;
+exports.SortTypeMap = exports.EStatusMap = void 0;
 var SortTypeMap = {
   'orderBySystem': {
     // 系统默认排序

package/lib/components/okr-detail/e-list/util.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.formatCondition = exports.formatEListDataToSelectTree = exports.formatTreeDataToNode = exports.getETreeNode = exports.toTree = void 0;
+exports.toTree = exports.getETreeNode = exports.formatTreeDataToNode = exports.formatEListDataToSelectTree = exports.formatCondition = void 0;
 
 var _cloneDeep = _interopRequireDefault(require("clone-deep"));
 

package/lib/components/okr-detail/okr-list/create-kr-item/style.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.OBadge = exports.Link = exports.Content = exports.InputTipsWrapper = exports.Option = exports.Options = exports.OptionsWrapper = exports.AddKrBtn = exports.InputWrapper = exports.Percent = exports.ProgressStatus = exports.ProgressDate = exports.Progress = exports.ProgressWrapper = exports.AvatarWrapper = exports.OScore = exports.ONameWrapper = exports.OName = exports.Toggle = exports.Item = exports.OClassify = exports.Icon = exports.IconGroup = exports.DivideLine = exports.Wrapper = void 0;
+exports.Wrapper = exports.Toggle = exports.ProgressWrapper = exports.ProgressStatus = exports.ProgressDate = exports.Progress = exports.Percent = exports.OptionsWrapper = exports.Options = exports.Option = exports.OScore = exports.ONameWrapper = exports.OName = exports.OClassify = exports.OBadge = exports.Link = exports.Item = exports.InputWrapper = exports.InputTipsWrapper = exports.IconGroup = exports.Icon = exports.DivideLine = exports.Content = exports.AvatarWrapper = exports.AddKrBtn = void 0;
 
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 

package/lib/components/okr-detail/okr-list/drag-order-kr.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.moveNext = exports.moveFront = exports.removeKr = void 0;
+exports.removeKr = exports.moveNext = exports.moveFront = void 0;
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 

package/lib/components/okr-detail/okr-list/index.js

@@ -412,7 +412,8 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
   var isShowAlignOkr = (0, _react.useMemo)(function () {
     return childOkrs && childOkrs.length > 0 || // 有子目标
-    parentOkr || !parentOkr && canEditOkr // 无父目标但有权限编辑
+    parentOkr || // 有父目标
+    !parentOkr && canEditOkr // 无父目标但有权限编辑
     ;
   }, [parentOkr, childOkrs, canEditOkr]);
 

package/lib/components/okr-detail/request-apis.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getRelWorks = exports.getRelProgress = exports.deleteProgressDesc = exports.updateProgressDesc = exports.getProgress = exports.addUserRelation = exports.updateVisibility = exports.updateOClassify = exports.transferPrincipal = exports.saveODesc = exports.updateOCommitType = exports.close = exports.start = exports.workDelete = exports.deleteUser = exports.addUser = exports.updateOkrVisibility = exports.addComment = exports.getOkrUsers = exports.remindAction = exports.krChangeOrder = exports.setTaskPriority = exports.cancelRel = exports.updateTaskStatus = exports.updateTaskDate = exports.updateTaskPrincipal = exports.updateKrName = exports.deleteKr = exports.getKrsByCondition = exports.getOrg = exports.cancelParentOkr = exports.updateParentId = exports.getFeedById = exports.cancelPraise = exports.addPraise = exports.getPraiseComments = exports.createNewKr = exports.updateProgress = exports.updateKrProgressAndStatus = exports.updateKrDate = exports.updateOkrPrincipal = exports.updateClassify = exports.getOkrDetail = exports.updateOkrName = exports.updateConfidenceIndex = exports.updateKrPrincipal = exports.getKrs = void 0;
+exports.workDelete = exports.updateVisibility = exports.updateTaskStatus = exports.updateTaskPrincipal = exports.updateTaskDate = exports.updateProgressDesc = exports.updateProgress = exports.updateParentId = exports.updateOkrVisibility = exports.updateOkrPrincipal = exports.updateOkrName = exports.updateOCommitType = exports.updateOClassify = exports.updateKrProgressAndStatus = exports.updateKrPrincipal = exports.updateKrName = exports.updateKrDate = exports.updateConfidenceIndex = exports.updateClassify = exports.transferPrincipal = exports.start = exports.setTaskPriority = exports.saveODesc = exports.remindAction = exports.krChangeOrder = exports.getRelWorks = exports.getRelProgress = exports.getProgress = exports.getPraiseComments = exports.getOrg = exports.getOkrUsers = exports.getOkrDetail = exports.getKrsByCondition = exports.getKrs = exports.getFeedById = exports.deleteUser = exports.deleteProgressDesc = exports.deleteKr = exports.createNewKr = exports.close = exports.cancelRel = exports.cancelPraise = exports.cancelParentOkr = exports.addUserRelation = exports.addUser = exports.addPraise = exports.addComment = void 0;
 
 var _qs = _interopRequireDefault(require("qs"));
 

package/lib/components/okr-detail/schedule/util.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getToNowTime = exports.isPrincipal = void 0;
+exports.isPrincipal = exports.getToNowTime = void 0;
 
 // @ts-nocheck
 var isPrincipal = function isPrincipal(principalUser) {

package/lib/components/okr-filter-drawer/filter-form.js

@@ -11,10 +11,14 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _checkbox = _interopRequireDefault(require("../checkbox"));
 
+var _bsGlobal = require("../../utils/bs-global");
+
 var _button = require("../button");
 
 var _form = _interopRequireWildcard(require("../form"));
 
+var _localStorage = require("../../utils/local-storage");
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -41,22 +45,32 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-function _objectDestructuringEmpty(obj) { if (obj == null) throw new TypeError("Cannot destructure undefined"); }
-
 var preCls = "tita-filter__form";
+var useLocalStorage = new _localStorage.localStorage();
 
 var Filter = function Filter(_ref) {
-  _objectDestructuringEmpty(_ref);
+  var onSearch = _ref.onSearch,
+      closeFilterDrawer = _ref.closeFilterDrawer;
 
-  var _useState = (0, _react.useState)({
-    targetType: "",
-    targetCategory: "",
-    targetSort: ""
+  var _useState = (0, _react.useState)(useLocalStorage.getItem('okr-filter-values') || {
+    okrType: "",
+    okrClassify: "",
+    orderType: "2"
   }),
       _useState2 = _slicedToArray(_useState, 2),
       formFieldValues = _useState2[0],
       setFormFieldValues = _useState2[1];
 
+  var _useState3 = (0, _react.useState)(false),
+      _useState4 = _slicedToArray(_useState3, 2),
+      isRemeber = _useState4[0],
+      setIsRemeber = _useState4[1];
+
+  var setting = (0, _bsGlobal.getBSGlobal)('OkrAdvancedSetting').KRSetting; // const openOkrType = setting.OkrTypeSetting;
+  // const openClassify = setting.OkrClassify;
+
+  var openOkrType = true;
+  var openClassify = true;
   var formContainerRef = (0, _react.useRef)();
   var formRef = (0, _react.useRef)();
 
@@ -66,53 +80,64 @@ var Filter = function Filter(_ref) {
 
   var resetValues = function resetValues() {
     setFormFieldValues({
-      targetType: "",
-      targetCategory: "",
-      targetSort: ""
+      okrType: "",
+      okrClassify: "",
+      orderType: "2"
     });
   };
 
   var handleRemember = function handleRemember(checked) {
-    if (checked) {} else {
-      console.log(1223);
+    setIsRemeber(checked);
+  };
+
+  var handleSubmit = function handleSubmit() {
+    if (isRemeber) {
+      useLocalStorage.setItem('okr-filter-values', formFieldValues);
     }
+
+    onSearch && onSearch({
+      okrType: formFieldValues.okrType,
+      okrClassify: formFieldValues.okrClassify,
+      orderType: formFieldValues.orderType
+    });
+    closeFilterDrawer && closeFilterDrawer();
   };
 
-  var targetTypeList = [{
+  var okrTypeList = [{
     label: "公司",
-    value: 1
+    value: 3
   }, {
     label: "部门",
     value: 2
   }, {
     label: "团队",
-    value: 3
+    value: 4
   }, {
     label: "个人",
-    value: 4
+    value: 1
   }];
-  var targetCategoryList = [{
+  var okrClassifyList = [{
     label: "承诺型",
     value: 1
   }, {
     label: "愿景型",
     value: 2
   }];
-  var targetSortList = [{
+  var orderTypeList = [{
     label: "创建时间最早",
-    value: 1
+    value: 2
   }, {
     label: "创建时间最晚",
-    value: 2
+    value: 1
   }, {
     label: "更新时间最早",
-    value: 3
+    value: 12
   }, {
     label: "更新时间最晚",
-    value: 4
+    value: 11
   }, {
     label: "按负责人排序",
-    value: 5
+    value: 13
   }];
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(preCls)
@@ -124,23 +149,23 @@ var Filter = function Filter(_ref) {
       return formContainerRef.current;
     },
     onFieldsChange: onFieldsChangeHandler
-  }, /*#__PURE__*/_react["default"].createElement(_form.FormFields.Radios, {
-    name: "targetType",
+  }, openOkrType ? /*#__PURE__*/_react["default"].createElement(_form.FormFields.Radios, {
+    name: "okrType",
     label: "\u76EE\u6807\u7C7B\u578B",
-    radios: targetTypeList,
-    value: formFieldValues.targetType,
+    radios: okrTypeList,
+    value: formFieldValues.okrType,
     radioClass: "".concat(preCls, "-radio")
-  }), /*#__PURE__*/_react["default"].createElement(_form.FormFields.Radios, {
-    name: "targetCategory",
-    label: "\u76EE\u6807\u7C7B\u578B",
-    radios: targetCategoryList,
-    value: formFieldValues.targetCategory,
+  }) : /*#__PURE__*/_react["default"].createElement("span", null), openClassify ? /*#__PURE__*/_react["default"].createElement(_form.FormFields.Radios, {
+    name: "okrClassify",
+    label: "\u76EE\u6807\u7C7B\u522B",
+    radios: okrClassifyList,
+    value: formFieldValues.okrClassify,
     radioClass: "".concat(preCls, "-radio")
-  }), /*#__PURE__*/_react["default"].createElement(_form.FormFields.Radios, {
-    name: "targetSort",
-    label: "\u76EE\u6807\u7C7B\u578B",
-    radios: targetSortList,
-    value: formFieldValues.targetSort,
+  }) : /*#__PURE__*/_react["default"].createElement("span", null), /*#__PURE__*/_react["default"].createElement(_form.FormFields.Radios, {
+    name: "orderType",
+    label: "\u76EE\u6807\u6392\u5E8F",
+    radios: orderTypeList,
+    value: formFieldValues.orderType,
     radioClass: "".concat(preCls, "-radio")
   }))), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(preCls, "__footer")
@@ -155,7 +180,8 @@ var Filter = function Filter(_ref) {
     onClick: resetValues
   }, "\u91CD\u7F6E"), /*#__PURE__*/_react["default"].createElement(_button.RectBtn, {
     className: "".concat(preCls, "__footer-sure"),
-    type: "primary"
+    type: "primary",
+    onClick: handleSubmit
   }, "\u786E\u5B9A")));
 };
 

package/lib/components/okr-filter-drawer/index.js

@@ -23,7 +23,14 @@ var Filter = function Filter(_ref) {
   var _ref$visible = _ref.visible,
       visible = _ref$visible === void 0 ? false : _ref$visible,
       _ref$setVisible = _ref.setVisible,
-      setVisible = _ref$setVisible === void 0 ? function () {} : _ref$setVisible;
+      setVisible = _ref$setVisible === void 0 ? function () {} : _ref$setVisible,
+      onSearch = _ref.onSearch;
+
+  // const [cycle, setCycle] = useState({});
+  // const [filterDrawerVisible, setFilterDrawerVisible] = useState(visible);
+  var openFilterDrawer = function openFilterDrawer() {
+    return setVisible(true);
+  };
 
   var closeFilterDrawer = function closeFilterDrawer() {
     return setVisible(false);
@@ -32,10 +39,15 @@ var Filter = function Filter(_ref) {
   return /*#__PURE__*/_react["default"].createElement(_react.Fragment, null, /*#__PURE__*/_react["default"].createElement(_drawer["default"], {
     visible: visible,
     onClose: closeFilterDrawer,
+    mask: true,
+    maskClosable: true,
     width: 372
   }, /*#__PURE__*/_react["default"].createElement(_drawer["default"].Header, {
     content: "\u9AD8\u7EA7\u7B5B\u9009"
-  }), /*#__PURE__*/_react["default"].createElement(_filterForm["default"], null)));
+  }), /*#__PURE__*/_react["default"].createElement(_filterForm["default"], {
+    onSearch: onSearch,
+    closeFilterDrawer: closeFilterDrawer
+  })));
 };
 
 var _default = Filter;

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

@@ -3,13 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.OkrSearchPanel = void 0;
 Object.defineProperty(exports, "checkTenantOkrExist", {
   enumerable: true,
   get: function get() {
     return _requestApis.checkTenantOkrExist;
   }
 });
-exports.OkrSearchPanel = void 0;
 
 var _okrSearchPanel = _interopRequireDefault(require("./export-modules/okr-search-panel"));
 

package/lib/components/okr-flow/mini-map/utils.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getRectOfNodes = exports.getBoundsofRects = exports.boxToRect = exports.rectToBox = void 0;
+exports.rectToBox = exports.getRectOfNodes = exports.getBoundsofRects = exports.boxToRect = void 0;
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }