@titaui/pc 1.5.69-beta.2 → 1.5.69-beta.23

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

@@ -70,32 +70,47 @@ var _default = function _default(props) {
 
   var openCreate = (0, _react.useCallback)( /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(name) {
+      var params;
       return regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              if (name == 'addTask') {
+              if (name == "addTask") {
+                params = {
+                  'objId': data.workId,
+                  'objType': 4,
+                  'AppId': 1,
+                  'AppType': 1,
+                  'TaskType': 0,
+                  'WorkMileStoneId': data.mileStoneId
+                };
+
+                if (data.mileStoneId > 0) {
+                  params.WorkMileStoneName = data.mileStoneName;
+                }
+
                 window.openCreateTaskPop(btnRef.current, {
-                  'createParams': {
-                    'objId': data.workId,
-                    'objType': 4,
-                    'AppId': 1,
-                    'AppType': 1,
-                    'TaskType': 0,
-                    'WorkMileStoneId': data.mileStoneId
-                  },
-                  'createTaskOption': {
-                    'allowObjectOptions': false
+                  "createParams": params,
+                  "createTaskOption": {
+                    "allowObjectOptions": false
                   }
                 }).then(function () {
-                  setTimeout(refreshEList, 500);
+                  _popDownNotification.Toast.Success("操作成功", {
+                    canClose: false
+                  });
+
+                  setTimeout(refreshEList, 2000);
                 });
               } else {
                 window.openCreateProjectFromOkrModal({
-                  'okrId': data.workId,
-                  'krId': data.mileStoneId
+                  "okrId": data.workId,
+                  "krId": data.mileStoneId
                 }).then(function () {
-                  setTimeout(refreshEList, 500);
+                  _popDownNotification.Toast.Success("操作成功", {
+                    canClose: false
+                  });
+
+                  setTimeout(refreshEList, 2000);
                 });
               }
 
@@ -112,12 +127,16 @@ var _default = function _default(props) {
     };
   }(), []);
   var openRelatePop = (0, _react.useCallback)(function (name) {
-    if (name == 'relateTask') {
+    if (name == "relateTask") {
       window.openRelateTaskPop(btnRef.current, {
-        'okrId': data.workId,
-        'krId': data.mileStoneId
+        "okrId": data.workId,
+        "krId": data.mileStoneId
       }).then(function () {
-        setTimeout(refreshEList, 500);
+        _popDownNotification.Toast.Success("操作成功", {
+          canClose: false
+        });
+
+        setTimeout(refreshEList, 2000);
       })["catch"](function (e) {
         _popDownNotification.Toast.Error(e.errorMsg, {
           canClose: false
@@ -125,10 +144,14 @@ var _default = function _default(props) {
       });
     } else {
       window.openRelateProjectPop(btnRef.current, {
-        'okrId': data.workId,
-        'krId': data.mileStoneId
+        "okrId": data.workId,
+        "krId": data.mileStoneId
       }).then(function () {
-        setTimeout(refreshEList, 500);
+        _popDownNotification.Toast.Success("操作成功", {
+          canClose: false
+        });
+
+        setTimeout(refreshEList, 2000);
       })["catch"](function (e) {
         _popDownNotification.Toast.Error(e.errorMsg, {
           canClose: false
@@ -144,7 +167,7 @@ var _default = function _default(props) {
   }, "KR", index + 1), /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__e-kr-node-title")),
     onClick: function onClick() {
-      data.mileStoneId && _manager["default"].open('krDetail', {
+      data.mileStoneId && _manager["default"].open("krDetail", {
         krId: data.mileStoneId
       });
     }
@@ -155,7 +178,7 @@ var _default = function _default(props) {
   })), okrInfo.status === 1 && (isParticipant || hasRelativeAuth) ? /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__e-kr-node-actions"))
   }, /*#__PURE__*/_react["default"].createElement(_dropdownLayer["default"], {
-    popupPlacement: 'bottomRight',
+    popupPlacement: "bottomRight",
     onChange: openCreate,
     trigger: /*#__PURE__*/_react["default"].createElement("span", {
       className: (0, _classnames["default"])("".concat(_precls["default"], "__e-kr-node-actions-create")),
@@ -172,7 +195,7 @@ var _default = function _default(props) {
     exIconClass: "e-kr-node-layer-icon",
     name: "addProject"
   }, /*#__PURE__*/_react["default"].createElement("span", null, "\u6DFB\u52A0\u9879\u76EE"))), /*#__PURE__*/_react["default"].createElement(_dropdownLayer["default"], {
-    popupPlacement: 'bottomRight',
+    popupPlacement: "bottomRight",
     onChange: openRelatePop,
     trigger: /*#__PURE__*/_react["default"].createElement("span", {
       className: (0, _classnames["default"])("".concat(_precls["default"], "__e-kr-node-actions-connect"))

package/lib/components/publish-dynamic-modal/publish-dynamic-modal.js

@@ -61,34 +61,72 @@ var PublishDynamicModal = function PublishDynamicModal(_ref) {
       isShare = _useState6[0],
       setIsShare = _useState6[1];
 
-  var onMblogSubmit = function onMblogSubmit(submitType, sentData) {
-    if (submitType === 'submit') {
+  var onMblogSubmit = function onMblogSubmit(submitType, sendData) {
+    sendData['FileUrls'] = sendData['FileUrl'];
+    sendData['Visibility'] = sendData['visibility'];
+    delete sendData['FileUrl'];
+    delete sendData['visibility'];
+
+    if (submitType === "submit") {
       setSubmitStatus(2);
-      (0, _requistApi.addShare)(sentData).then(function (resp) {
-        if (resp.Code === 1) {
-          _popDownNotification.Toast.Success('发布成功', {
-            canClose: false
-          });
 
-          localStorage.removeItem("mblogLocalStroage_".concat((0, _bsGlobal.getUserInfo)().Id, "_commentsTypeKey_").concat(isShare ? 'share' : 'announcement'));
-          setVisible(false);
-          setSubmitStatus(1); // @ts-ignore 跳到我的发布页签
+      if (isShare) {
+        (0, _requistApi.addShare)(sendData).then(function (resp) {
+          if (resp.Code === 1) {
+            _popDownNotification.Toast.Success("发布成功", {
+              canClose: false
+            });
+
+            localStorage.removeItem("mblogLocalStroage_".concat((0, _bsGlobal.getUserInfo)().Id, "_commentsTypeKey_").concat(isShare ? "share" : "announcement"));
+            setVisible(false);
+            setSubmitStatus(1);
+            setTimeout(function () {
+              // @ts-ignore 跳到我的发布页签
+              window.setTabsToPublish && window.setTabsToPublish();
+            }, 2000);
+          } else {
+            _popDownNotification.Toast.Error(resp.Message, {
+              canClose: false
+            });
+
+            setSubmitStatus(0);
+          }
+        })["catch"](function (err) {
+          setSubmitStatus(0);
 
-          window.setTabsToPuhlish && window.setTabsToPuhlish();
-        } else {
-          _popDownNotification.Toast.Error(resp.Message, {
+          _popDownNotification.Toast.Error(err, {
             canClose: false
           });
-
+        });
+      } else {
+        (0, _requistApi.addNotice)(sendData).then(function (resp) {
+          if (resp.Code === 1) {
+            _popDownNotification.Toast.Success("发布成功", {
+              canClose: false
+            });
+
+            localStorage.removeItem("mblogLocalStroage_".concat((0, _bsGlobal.getUserInfo)().Id, "_commentsTypeKey_").concat(isShare ? "share" : "announcement"));
+            setVisible(false);
+            setSubmitStatus(1);
+            setTimeout(function () {
+              // @ts-ignore 跳到我的发布页签
+              window.setTabsToPublish && window.setTabsToPublish();
+            }, 2000);
+          } else {
+            _popDownNotification.Toast.Error(resp.Message, {
+              canClose: false
+            });
+
+            setSubmitStatus(0);
+          }
+        })["catch"](function (err) {
           setSubmitStatus(0);
-        }
-      })["catch"](function (err) {
-        setSubmitStatus(0);
 
-        _popDownNotification.Toast.Error(err, {
-          canClose: false
+          _popDownNotification.Toast.Error(err, {
+            canClose: false
+          });
         });
-      });
+      }
     }
   };
 
@@ -120,14 +158,14 @@ var PublishDynamicModal = function PublishDynamicModal(_ref) {
     onClose: hidePublishDynamicModal,
     noFooter: true,
     style: {
-      width: '480px'
+      width: "480px"
     },
     destroyOnClose: true
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix
   }, /*#__PURE__*/_react["default"].createElement(_mblog["default"], {
-    defaultContent: isShare ? '' : "@[所有同事:all_members] ",
-    placeholderText: isShare ? "分享你此刻的想法" : '重要的通知可以发公告哦',
+    defaultContent: isShare ? "" : "@[所有同事:all_members] ",
+    placeholderText: isShare ? "分享你此刻的想法" : "重要的通知可以发公告哦",
     isHasPlaceholder: true,
     isShowRangeDropDown: true,
     isShowSendSms: false,
@@ -141,7 +179,7 @@ var PublishDynamicModal = function PublishDynamicModal(_ref) {
     privateValue: 1,
     userSelectorPopAlign: "top left",
     emotionsSelectorPopAlign: "top left",
-    commentsTypeKey: isShare ? 'share' : 'announcement',
+    commentsTypeKey: isShare ? "share" : "announcement",
     disableRangeSelect: false,
     submitStatus: submitStatus // 提交状态，0：失败，1：成功，2：提交中
     ,

package/lib/components/publish-dynamic-modal/requist-api.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.addShare = void 0;
+exports.addNotice = exports.addShare = void 0;
 
 var _qs = _interopRequireDefault(require("qs"));
 
@@ -30,4 +30,19 @@ var addShare = function addShare(data) {
   });
 };
 
-exports.addShare = addShare;
+exports.addShare = addShare;
+
+var addNotice = function addNotice(data) {
+  return (0, _request.rpost)('v2')("user/feed/addNotice", _objectSpread(_objectSpread({}, data), {}, {
+    ObjType: 0,
+    ObjId: 0,
+    IsSendSMS: false
+  }), {
+    'headers': {
+      'Content-Type': 'application/x-www-form-urlencoded'
+    },
+    'transformRequest': _qs["default"].stringify
+  });
+};
+
+exports.addNotice = addNotice;

package/lib/components/table/index.css

@@ -67,7 +67,6 @@
   font-weight: 400;
   padding-right: 20px;
   white-space: nowrap;
-  text-overflow: ellipsis;
   color: #3f4755;
   font-size: 14px;
   border-bottom: 1px solid #e9edf0;

package/lib/components/upload/style.js

@@ -25,7 +25,7 @@ var PreviewContent = _styledComponents["default"].div(_templateObject3 || (_temp
 
 exports.PreviewContent = PreviewContent;
 
-var PreviewImageWrapper = _styledComponents["default"].div(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  width: 36px;\n  height: 36px;\n  line-height: 36px;\n  margin-right: 8px;\n  text-align: center;\n\n  img {\n    max-width: 36px;\n    max-height: 36px;\n  }\n"])));
+var PreviewImageWrapper = _styledComponents["default"].div(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  width: 36px;\n  height: 36px;\n  line-height: 36px;\n  margin-right: 8px;\n  text-align: center;\n  border-radius: 4px;\n\n  img {\n    max-width: 36px;\n    max-height: 36px;\n    border-radius: 4px;\n  }\n"])));
 
 exports.PreviewImageWrapper = PreviewImageWrapper;
 

package/lib/components/upvote/index.js

@@ -15,12 +15,14 @@ var _selector = _interopRequireDefault(require("./selector"));
 
 var _attitude = _interopRequireDefault(require("./attitude"));
 
-var _classnames = _interopRequireDefault(require("classnames"));
+var _classnames2 = _interopRequireDefault(require("classnames"));
 
 var _requestApis = require("./request-apis");
 
 var _upvoteListModal = _interopRequireDefault(require("./upvoteListModal"));
 
+var _tooltip = _interopRequireDefault(require("../tooltip"));
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -31,6 +33,8 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
+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 asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -48,6 +52,8 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 function UpvoteButton(_ref) {
+  var _classnames;
+
   var type = _ref.type,
       count = _ref.count,
       style = _ref.style,
@@ -57,7 +63,11 @@ function UpvoteButton(_ref) {
       onChange = _ref.onChange,
       handleRequest = _ref.handleRequest,
       _ref$popAlign = _ref.popAlign,
-      popAlign = _ref$popAlign === void 0 ? 'right' : _ref$popAlign;
+      popAlign = _ref$popAlign === void 0 ? "right" : _ref$popAlign,
+      _ref$buttonType = _ref.buttonType,
+      buttonType = _ref$buttonType === void 0 ? '' : _ref$buttonType,
+      _ref$customUpvoteBtnC = _ref.customUpvoteBtnCls,
+      customUpvoteBtnCls = _ref$customUpvoteBtnC === void 0 ? '' : _ref$customUpvoteBtnC;
 
   var _useState = (0, _react.useState)({
     type: type,
@@ -216,10 +226,9 @@ function UpvoteButton(_ref) {
     })),
     ref: btnref
   }, renderBuntton ? renderBuntton(upvoteState.type, upvoteState.count) : /*#__PURE__*/_react["default"].createElement("div", {
-    className: (0, _classnames["default"])({
-      'tu-icon-APP-zan1': upvoteState.type == 0,
-      'feed-upvote-button': true
-    }),
+    className: (0, _classnames2["default"])((_classnames = {
+      "tu-icon-APP-zan1": !buttonType && upvoteState.type == 0
+    }, _defineProperty(_classnames, customUpvoteBtnCls, customUpvoteBtnCls && upvoteState.type == 0), _defineProperty(_classnames, buttonType, buttonType && upvoteState.type == 0), _defineProperty(_classnames, "feed-upvote-button", true), _classnames)),
     style: {
       backgroundImage: "url(".concat((_attitude["default"].find(function (a) {
         return a.type == upvoteState.type;
@@ -230,7 +239,10 @@ function UpvoteButton(_ref) {
     onClick: function onClick() {
       upvoteState.count > 0 && setModalVisible(true);
     }
-  }, renderCount ? renderCount(upvoteState.type, upvoteState.count) : upvoteState.count), /*#__PURE__*/_react["default"].createElement(_upvoteListModal["default"], {
+  }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+    overlay: "点赞记录",
+    placement: "top"
+  }, /*#__PURE__*/_react["default"].createElement("span", null, renderCount ? renderCount(upvoteState.type, upvoteState.count) : upvoteState.count))), /*#__PURE__*/_react["default"].createElement(_upvoteListModal["default"], {
     feedId: feedId,
     visible: modalVisible,
     onClose: function onClose() {
@@ -242,22 +254,22 @@ function UpvoteButton(_ref) {
 var UpvoteButtonForFeed = function UpvoteButtonForFeed(props) {
   return /*#__PURE__*/_react["default"].createElement(UpvoteButton, _extends({}, props, {
     renderBuntton: function renderBuntton(type) {
-      var text = !type ? '点赞' : '已赞';
+      var text = !type ? "点赞" : "已赞";
       return /*#__PURE__*/_react["default"].createElement("div", {
         style: {
-          display: 'flex',
-          alignItems: 'center'
+          display: "flex",
+          alignItems: "center"
         }
       }, /*#__PURE__*/_react["default"].createElement("div", {
-        className: (0, _classnames["default"])({
-          'tu-icon-APP-zan1': type == 0,
-          'feed-upvote-button': true
+        className: (0, _classnames2["default"])({
+          "tu-icon-APP-zan1": type == 0,
+          "feed-upvote-button": true
         }),
         style: {
           backgroundImage: "url(".concat((_attitude["default"].find(function (a) {
             return a.type == type;
           }) || {
-            img: ''
+            img: ""
           }).img, ")"),
           marginRight: 4
         }

package/lib/components/user-selector/export-modules/field-tree-selector/index.css

@@ -32,6 +32,10 @@
   text-overflow: ellipsis;
 }
 
+.persel-selector-field__text-holder {
+  color: #Bfc7D5;
+}
+
 .persel-selector-field__suffix {
   display: inline-block;
   float: right;

package/lib/components/user-selector/export-modules/field-tree-selector/index.js

@@ -103,7 +103,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       selected = _useState2[0],
       setSelected = _useState2[1];
 
-  var _useState3 = (0, _react.useState)(placeholder),
+  var _useState3 = (0, _react.useState)(''),
       _useState4 = _slicedToArray(_useState3, 2),
       selectedText = _useState4[0],
       setSelectedText = _useState4[1];
@@ -158,8 +158,8 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         name: data.name
       }));
     });
-    var text = texts.join("、");
-    if (!text) text = placeholder;
+    var text = texts.join("、"); // if (!text) text = placeholder;
+
     setSelectedText(text);
     setJsxDomValues(jsxDomValues);
     setSelected(selected);
@@ -233,8 +233,8 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       onSelect(selectNodes, wechartOpts);
     }
 
-    var text = texts.join("、");
-    if (!text) text = placeholder;
+    var text = texts.join("、"); // if (!text) text = placeholder;
+
     setSelectedText(text);
     setJsxDomValues(jsxDomValues);
   };
@@ -287,7 +287,9 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     }
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "persel-selector-field__text"
-  }, (0, _openData.isWechat)() ? jsxDomValues : selectedText), /*#__PURE__*/_react["default"].createElement("span", {
+  }, (0, _openData.isWechat)() ? jsxDomValues : selectedText ? selectedText : /*#__PURE__*/_react["default"].createElement("span", {
+    className: "persel-selector-field__text-holder"
+  }, placeholder)), /*#__PURE__*/_react["default"].createElement("span", {
     className: "persel-selector-field__suffix"
   })))));
 });

package/lib/index.js

@@ -5,7 +5,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "functi
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.FileList = exports.ImgViewer = exports.TaskRelationModal = exports.OkrCaseCard = exports.OkrCasesLibrary = exports.TitaWordsCloud = exports.TitaLiquidBall = exports.TitaPieChart = exports.HomePageDataList = exports.HomePage = exports.Dynamic = exports.DatePicker = exports.Confidence = exports.DynamicTop = exports.DynamicQuickOperation = exports.DateRangePickerPop = exports.Upvote = exports.OkrShare = exports.SlideInput = exports.RangePickerPop = exports.OkrFlow = exports.ChangeOkrModal = exports.Review = exports.EReportList = exports.OKrProgress = exports.FormFields = exports.Form = exports.OkrPeriodSelector = exports.Upload = exports.OperationRecord = exports.Mblog = exports.EmotionsSelector = exports.Communication = exports.PeriodSelector = exports.Pagination = exports.WordCloud = exports.DialogConfirm = exports.OkrProgressDetail = exports.RadioGroup = exports.Radio = exports.ErrorToolTip = exports.TooltipText = exports.Tooltip = exports.Dialog = exports.firework = exports.BaseInfo = exports.OkrDetail = exports.drawerManager = exports.Drawer = exports.TabPane = exports.Tabs = exports.openData = exports.DynamicLiking = exports.DynamicLikeNum = exports.LikeRankingPage = exports.UserGroupManagementPage = exports.OkrMapSharePage = exports.OkrMapPage = exports.Checkbox = exports.PasswordInput = exports.SearchInput = exports.Table = exports.Tree = exports.StatusTime = exports.EPriority = exports.LineProgress = exports.CircleProgress = exports.Switch = exports.Toast = exports.Popup = exports.SearchDropdownOption = exports.SearchDropdown = exports.TextAvatar = exports.NameAvatar = exports.DefautltAvatar = exports.SingleSelector = exports.DutiesSelector = exports.DepartSearchSelector = exports.GroupSelector = exports.FieldPersonSelector = exports.DropSelector = void 0;
+exports.FileList = exports.ImgViewer = exports.TaskRelationModal = exports.OkrCaseCard = exports.OkrCasesLibrary = exports.TitaWordsCloud = exports.TitaLiquidBall = exports.TitaPieChart = exports.HomePageDataList = exports.HomePage = exports.Dynamic = exports.DatePicker = exports.Confidence = exports.DynamicTop = exports.DynamicQuickOperation = exports.DateRangePickerPop = exports.Upvote = exports.OkrShare = exports.SlideInput = exports.RangePickerPop = exports.OkrFlow = exports.CreateOkrModal = exports.ChangeOkrModal = exports.Review = exports.EReportList = exports.OKrProgress = exports.FormFields = exports.Form = exports.OkrPeriodSelector = exports.Upload = exports.OperationRecord = exports.Mblog = exports.EmotionsSelector = exports.Communication = exports.PeriodSelector = exports.Pagination = exports.WordCloud = exports.DialogConfirm = exports.OkrProgressDetail = exports.RadioGroup = exports.Radio = exports.ErrorToolTip = exports.TooltipText = exports.Tooltip = exports.Dialog = exports.firework = exports.BaseInfo = exports.OkrDetail = exports.drawerManager = exports.Drawer = exports.TabPane = exports.Tabs = exports.openData = exports.DynamicLiking = exports.DynamicLikeNum = exports.LikeRankingPage = exports.UserGroupManagementPage = exports.OkrMapSharePage = exports.OkrMapPage = exports.Checkbox = exports.PasswordInput = exports.SearchInput = exports.Table = exports.Tree = exports.StatusTime = exports.EPriority = exports.LineProgress = exports.CircleProgress = exports.Switch = exports.Toast = exports.Popup = exports.SearchDropdownOption = exports.SearchDropdown = exports.TextAvatar = exports.NameAvatar = exports.DefautltAvatar = exports.SingleSelector = exports.DutiesSelector = exports.DepartSearchSelector = exports.GroupSelector = exports.FieldPersonSelector = exports.DropSelector = void 0;
 
 var _dialog = _interopRequireDefault(require("./components/dialog"));
 
@@ -41,6 +41,8 @@ var _checkbox = _interopRequireDefault(require("./components/checkbox"));
 
 var _changeOkr = _interopRequireDefault(require("./components/change-okr"));
 
+var _createOkr = _interopRequireDefault(require("./components/create-okr"));
+
 var _rangePickerPop = _interopRequireDefault(require("./components/range-picker-pop"));
 
 var _datePicker = _interopRequireDefault(require("./components/date-picker"));
@@ -284,6 +286,8 @@ var Review = _okrReview["default"];
 exports.Review = Review;
 var ChangeOkrModal = _changeOkr["default"];
 exports.ChangeOkrModal = ChangeOkrModal;
+var CreateOkrModal = _createOkr["default"];
+exports.CreateOkrModal = CreateOkrModal;
 var OkrFlow = _okrSearchPanel["default"];
 exports.OkrFlow = OkrFlow;
 var RangePickerPop = _rangePickerPop["default"];

package/lib/pages/dynamic/index.css

@@ -1,4 +1,5 @@
 .dynamic-page {
   height: 100%;
   background: #f0f4fa;
+  margin-right: -10px;
 }

package/lib/pages/like-ranking/column.js

@@ -46,24 +46,32 @@ var columns = function columns() {
         className: "".concat(preCls, "-ranking")
       }, num);
     }
-  }; // @ts-ignore
-
+  };
 
   return [{
     title: "排名",
-    dataIndex: "ranking",
-    key: "ranking",
+    dataIndex: "rankNum",
+    width: 100,
+    key: "rankNum",
     className: "".concat(preCls, "__td ").concat(preCls, "__td-raking"),
     render: function render(text, data) {
-      return formatRaking(data.ranking);
+      return formatRaking(data.rankNum);
     }
   }, {
     title: "姓名",
     dataIndex: "name",
     key: "name",
+    width: 100,
     className: "".concat(preCls, "__td"),
     render: function render(text, data) {
-      var user = data.user;
+      var user = data.user; // const url = getUrlForUserPage({
+      //   userId: user.userId,
+      //   userType: user.userType || 2,
+      // });
+      // const handleOpenUserPage = () => {
+      //   window.open(url, "_blank");
+      // };
+
       return /*#__PURE__*/_react["default"].createElement("span", {
         className: "".concat(preCls, "__td-name")
       }, /*#__PURE__*/_react["default"].createElement("span", {
@@ -73,13 +81,19 @@ var columns = function columns() {
         src: user.avatar.small,
         color: user.avatar.color,
         userId: user.userId
-      })), /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
-        id: user.userId,
-        name: user.name
-      }));
+      })), /*#__PURE__*/_react["default"].createElement("span", {
+        className: "".concat(preCls, "__td-name-text")
+      }, /*#__PURE__*/_react["default"].createElement(_tooltipText["default"], {
+        text: /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
+          id: user.userId,
+          name: user.name
+        }),
+        isPercent: true
+      })));
     }
   }, {
     title: "所属部门",
+    width: 100,
     dataIndex: "departmentName",
     key: "departmentName",
     className: "".concat(preCls, "__td"),
@@ -90,22 +104,27 @@ var columns = function columns() {
           id: user.departmentId,
           name: user.departmentName
         }),
-        maxWidth: 160
+        isPercent: true
       });
     }
   }, {
     title: "一级部门",
+    width: 100,
     dataIndex: "oneLevelDepName",
     key: "oneLevelDepName",
     className: "".concat(preCls, "__td"),
     render: function render(text, data) {
-      return /*#__PURE__*/_react["default"].createElement(_openData.OpenDepartmentName, {
-        id: data.oneLevelDepName,
-        name: data.oneLevelDepName
+      return /*#__PURE__*/_react["default"].createElement(_tooltipText["default"], {
+        text: /*#__PURE__*/_react["default"].createElement(_openData.OpenDepartmentName, {
+          id: data.oneLevelDepName,
+          name: data.oneLevelDepName
+        }),
+        isPercent: true
       });
     }
   }, {
     title: "点赞数",
+    width: 100,
     dataIndex: "pariseNums",
     key: "pariseNums",
     className: "".concat(preCls, "__td"),

package/lib/pages/like-ranking/filter-buttons/department.js

@@ -21,25 +21,22 @@ 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; }
 
-var preCls = 'filter-buttons';
+var DepartMent = function DepartMent(_ref) {
+  var setParma = _ref.setParma;
 
-var DepartMent = function DepartMent() {
   var onDepartSelect = function onDepartSelect(keys, data) {
-    console.log(keys, data);
+    setParma("depIds", keys[0]["id"]);
   };
 
   var departRef = (0, _react.useRef)();
   return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_userSelector.FieldPersonSelector, {
-    multiple: true,
-    departOnly: true,
     ref: departRef,
-    selectNodes: {},
+    auth: true,
+    departOnly: true,
+    isGetRoot: true // selectNodes={selected}
+    ,
     onSelect: onDepartSelect,
-    position: "bottomLeft",
-    panes: {
-      'depart': true,
-      'group': false
-    }
+    position: "bottomLeft"
   }, /*#__PURE__*/_react["default"].createElement(_searchDropdown["default"], null, "\u90E8\u95E8")));
 };
 

package/lib/pages/like-ranking/filter-buttons/group.js

@@ -0,0 +1,34 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _userSelector = require("../../../components/user-selector");
+
+var _searchDropdown = _interopRequireDefault(require("./search-dropdown"));
+
+require("./index.css");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+var DepartMent = function DepartMent(_ref) {
+  var setParma = _ref.setParma;
+
+  var onSelect = function onSelect(keys) {
+    setParma("groupIds", keys[0]["id"]);
+  };
+
+  return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_userSelector.GroupSelector, {
+    auth: true,
+    isGetRoot: true,
+    onSelect: onSelect,
+    position: "bottomLeft"
+  }, /*#__PURE__*/_react["default"].createElement("span", null, /*#__PURE__*/_react["default"].createElement(_searchDropdown["default"], null, "\u7FA4\u7EC4"))));
+};
+
+var _default = DepartMent;
+exports["default"] = _default;