@titaui/pc 1.5.69-beta.18 → 1.5.69-beta.21

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

@@ -228,7 +228,7 @@ function UpvoteButton(_ref) {
   }, renderBuntton ? renderBuntton(upvoteState.type, upvoteState.count) : /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames2["default"])((_classnames = {
       "tu-icon-APP-zan1": !buttonType && upvoteState.type == 0
-    }, _defineProperty(_classnames, customUpvoteBtnCls, customUpvoteBtnCls), _defineProperty(_classnames, buttonType, buttonType), _defineProperty(_classnames, "feed-upvote-button", true), _classnames)),
+    }, _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;

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/like-ranking/column.js

@@ -51,6 +51,7 @@ var columns = function columns() {
   return [{
     title: "排名",
     dataIndex: "rankNum",
+    width: 100,
     key: "rankNum",
     className: "".concat(preCls, "__td ").concat(preCls, "__td-raking"),
     render: function render(text, data) {
@@ -60,6 +61,7 @@ var columns = function columns() {
     title: "姓名",
     dataIndex: "name",
     key: "name",
+    width: 100,
     className: "".concat(preCls, "__td"),
     render: function render(text, data) {
       var user = data.user; // const url = getUrlForUserPage({
@@ -81,13 +83,17 @@ var columns = function columns() {
         userId: user.userId
       })), /*#__PURE__*/_react["default"].createElement("span", {
         className: "".concat(preCls, "__td-name-text")
-      }, /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
-        id: user.userId,
-        name: user.name
+      }, /*#__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"),
@@ -98,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,60 +21,21 @@ 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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
-function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 var DepartMent = function DepartMent(_ref) {
   var setParma = _ref.setParma;
 
-  var _useState = (0, _react.useState)({}),
-      _useState2 = _slicedToArray(_useState, 2),
-      selected = _useState2[0],
-      setSelected = _useState2[1];
-
   var onDepartSelect = function onDepartSelect(keys, data) {
-    setSelected(keys);
-    var departments = keys.departments,
-        groups = keys.groups;
-    var depIds = "";
-    departments.forEach(function (item, key) {
-      depIds = depIds + item.id;
-
-      if (key != departments.length - 1) {
-        depIds = depIds + ",";
-      }
-    });
-    var groupIds = "";
-    groups.forEach(function (item, key) {
-      groupIds = groupIds + item.id;
-
-      if (key != groups.length - 1) {
-        groupIds = groupIds + ",";
-      }
-    });
-    setParma("departmets", {
-      depIds: depIds,
-      groupIds: groupIds
-    });
+    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,
     auth: true,
-    selectNodes: selected,
-    onOk: onDepartSelect,
+    departOnly: true,
+    isGetRoot: true // selectNodes={selected}
+    ,
+    onSelect: onDepartSelect,
     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;

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

@@ -9,6 +9,8 @@ var _react = _interopRequireDefault(require("react"));
 
 var _department = _interopRequireDefault(require("./department"));
 
+var _group = _interopRequireDefault(require("./group"));
+
 var _timer = _interopRequireDefault(require("./timer"));
 
 var _modular = _interopRequireDefault(require("./modular"));
@@ -21,14 +23,18 @@ var preCls = "filter-buttons";
 
 var FilterButton = function FilterButton(_ref) {
   var parmas = _ref.parmas,
-      setParma = _ref.setParma;
+      setParma = _ref.setParma,
+      setType = _ref.setType;
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(preCls)
   }, /*#__PURE__*/_react["default"].createElement(_department["default"], {
     setParma: setParma
+  }), /*#__PURE__*/_react["default"].createElement(_group["default"], {
+    setParma: setParma
   }), /*#__PURE__*/_react["default"].createElement(_timer["default"], {
     setParma: setParma,
-    parmas: parmas
+    parmas: parmas,
+    setType: setType
   }), /*#__PURE__*/_react["default"].createElement(_modular["default"], {
     setParma: setParma
   }));

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

@@ -25,12 +25,14 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 var Timer = function Timer(_ref) {
   var setParma = _ref.setParma,
-      parmas = _ref.parmas;
+      parmas = _ref.parmas,
+      setType = _ref.setType;
   var _parmas$date = parmas.date,
       createDate = _parmas$date.createDate,
       endDate = _parmas$date.endDate;
 
   var onStartDateConfirmHandler = function onStartDateConfirmHandler(data) {
+    setType("");
     var date = {
       createDate: data.startDate,
       endDate: data.endDate

package/lib/pages/like-ranking/index.css

@@ -96,7 +96,7 @@
 
 .like-ranking-page__content {
   flex: 1;
-  margin: 12px 20px 0px;
+  margin: 12px 8px 0  20px;
   background: #FFFFFF;
   box-shadow: 0px 0px 8px 0px #F7F9FB;
   border-radius: 6px;
@@ -138,7 +138,8 @@
 
 .like-ranking-table__td {
   font-size: 14px;
-  padding: 10px 4px;
+  overflow: hidden;
+  margin-right: 4px;
 }
 
 .like-ranking-table__td-raking {

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

@@ -56,17 +56,10 @@ var hasAuth = new _auth.DynamicManagerAuth();
 
 var LikeRanking = function LikeRanking() {
   var _useState = (0, _react.useState)(function () {
-    var department = {
-      depIds: "",
-      groupIds: ""
-    };
+    var depIds = "";
 
     if (hasAuth.isOnlyLeader()) {
-      var depId = (0, _bsGlobal.getUserInfo)().DepartmentId;
-      department = {
-        depIds: "" + depId,
-        groupIds: ""
-      };
+      depIds = "" + (0, _bsGlobal.getUserInfo)().DepartmentId;
     }
 
     return {
@@ -74,7 +67,7 @@ var LikeRanking = function LikeRanking() {
         createDate: "",
         endDate: ""
       },
-      departmets: department
+      depIds: depIds
     };
   }),
       _useState2 = _slicedToArray(_useState, 2),
@@ -115,14 +108,26 @@ var LikeRanking = function LikeRanking() {
     var obj = _objectSpread({}, parmas);
 
     obj[key] = value;
+
+    switch (key) {
+      case "depIds":
+        obj["groupIds"] = "";
+        break;
+
+      case "groupIds":
+        obj["depIds"] = "";
+        break;
+    }
+
+    setPageNum(1);
     setParmas(obj);
   };
 
   (0, _react.useEffect)(function () {
     setIsloading(true);
     (0, _requestApi.getRanking)({
-      ToDepIds: parmas["departmets"]["depIds"] || "",
-      ToGroupIds: parmas["departmets"]["groupIds"] || "",
+      ToDepIds: parmas["depIds"] || "",
+      ToGroupIds: parmas["groupIds"] || "",
       CreateDate: parmas["date"] ? parmas["date"]["createDate"] || "" : "",
       EndDate: parmas["date"] ? parmas["date"]["endDate"] || "" : "",
       ObjectType: parmas["ObjectType"] || "",
@@ -227,10 +232,12 @@ var LikeRanking = function LikeRanking() {
     className: "".concat(preCls, "__btns-left")
   }, /*#__PURE__*/_react["default"].createElement(_filterButtons["default"], {
     setParma: setParma,
-    parmas: parmas
+    parmas: parmas,
+    setType: setType
   }))), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(preCls, "__content")
   }, TabBar(), renderEmpty(), isLoadingPage(), !isLoading && /*#__PURE__*/_react["default"].createElement(_table["default"], {
+    tableLayout: "fixed",
     columns: (0, _column.columns)(),
     tableData: pariseInfos,
     total: total,

package/lib/utils/format-time.js

@@ -90,9 +90,10 @@ var getNextDayOfYear = function getNextDayOfYear() {
 exports.getNextDayOfYear = getNextDayOfYear;
 
 var showWeekFirstDay = function showWeekFirstDay() {
-  var Nowdate = new Date(); // @ts-ignore
+  var Nowdate = new Date();
+  var weekDay = Nowdate.getDay() || 7; // @ts-ignore
 
-  var WeekFirstDay = new Date(Nowdate - (Nowdate.getDay() - 1) * 86400000);
+  var WeekFirstDay = new Date(Nowdate - (weekDay - 1) * 86400000);
   var M = Number(WeekFirstDay.getMonth()) + 1;
   return WeekFirstDay.getFullYear() + "-" + M + "-" + WeekFirstDay.getDate();
 }; // 本周最后一天
@@ -101,9 +102,10 @@ var showWeekFirstDay = function showWeekFirstDay() {
 exports.showWeekFirstDay = showWeekFirstDay;
 
 var showWeekLastDay = function showWeekLastDay() {
-  var Nowdate = new Date(); // @ts-ignore
+  var Nowdate = new Date();
+  var weekDay = Nowdate.getDay() || 7; // @ts-ignore
 
-  var WeekFirstDay = new Date(Nowdate - (Nowdate.getDay() - 1) * 86400000); // @ts-ignore
+  var WeekFirstDay = new Date(Nowdate - (weekDay - 1) * 86400000); // @ts-ignore
 
   var WeekLastDay = new Date((WeekFirstDay / 1000 + 6 * 86400) * 1000);
   var M = Number(WeekLastDay.getMonth()) + 1;
@@ -114,9 +116,10 @@ var showWeekLastDay = function showWeekLastDay() {
 exports.showWeekLastDay = showWeekLastDay;
 
 var showNextWeekFirstDay = function showNextWeekFirstDay() {
-  var Nowdate = new Date(); // @ts-ignore
+  var Nowdate = new Date();
+  var weekDay = Nowdate.getDay() || 7; // @ts-ignore
 
-  var WeekFirstDay = new Date(Nowdate - (Nowdate.getDay() - 1) * 86400000); // @ts-ignore
+  var WeekFirstDay = new Date(Nowdate - (weekDay - 1) * 86400000); // @ts-ignore
 
   var WeekLastDay = new Date((WeekFirstDay / 1000 + 7 * 86400) * 1000);
   var M = Number(WeekLastDay.getMonth()) + 1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.5.69-beta.18",
+  "version": "1.5.69-beta.21",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",