@titaui/pc 1.11.48-beta.3 → 1.11.48-beta.4

package/lib/components/checkbox/index.css

@@ -9,6 +9,10 @@
   box-sizing: border-box;
 }
 
+.titaui-checkbox:hover {
+  border: 1px solid #2879ff;
+}
+
 .titaui-checkbox--checked {
   background: url(./checked.svg) transparent no-repeat 50% 50%;
   border: none;

package/lib/components/task-relation-modal/helper.js

@@ -37,6 +37,14 @@ var lableTypeMap = {
 };
 exports.lableTypeMap = lableTypeMap;
 
+var strFormat = function strFormat(num) {
+  if (num < 10) {
+    return '0' + num;
+  }
+
+  return num;
+};
+
 var timeFormat = function timeFormat(NowDate) {
   var date = new Date(NowDate);
   var y = date.getFullYear(); // 年
@@ -45,7 +53,7 @@ var timeFormat = function timeFormat(NowDate) {
 
   var d = date.getDate(); // 日
 
-  return "".concat(y, "/").concat(m, "/").concat(d);
+  return "".concat(y, "/").concat(strFormat(m), "/").concat(strFormat(d));
 };
 
 exports.timeFormat = timeFormat;

package/lib/components/task-relation-modal/okr-relation/relation-task-model/index.css

@@ -1,5 +1,5 @@
 .relation-task__content {
-  padding: 0 32px;
+  padding: 10px 32px 0;
 }
 
 .relation-task__content-tree {

package/lib/components/task-relation-modal/okr-relation/relation-task-model/index.js

@@ -168,7 +168,6 @@ function OkrRelationTaskModal(props) {
   };
 
   (0, _react.useEffect)(function () {
-    console.log(query);
     isQuery && getTaskData();
   }, [query, pageNum, pageSize]);
 

package/lib/components/task-relation-modal/okr-relation/request-api.js

@@ -23,7 +23,7 @@ var dealMessage = function dealMessage(res) {
 var id = (0, _helpers.getLoginUserInfo)().Id;
 
 var planTableTask = function planTableTask(params, pageNum, pageSize) {
-  var url = "PlanTableTask/PersionTask?to_user_id=".concat(id);
+  var url = "task/search";
   var _params$startDate = params.startDate,
       startDate = _params$startDate === void 0 ? '' : _params$startDate,
       _params$endDate = params.endDate,

package/lib/components/task-relation-modal/okr-relation/tree/task-tree/index.css

@@ -3,6 +3,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  color: #A4ACB9;
 }
 
 .okr-relation-tree__header {

package/lib/components/task-relation-modal/okr-relation/tree/task-tree/index.js

@@ -138,7 +138,7 @@ var TaskTree = function TaskTree(_ref) {
     className: "".concat(preCls, "__content")
   }, /*#__PURE__*/_react["default"].createElement(_scrollbar["default"].Mask, {
     style: scrollStyle,
-    maskHeight: 32
+    maskHeight: 16
   }, data.map(function (item) {
     var _item$principalUser, _item$principalUser2, _item$principalUser3, _item$principalUser4;
 

package/lib/components/task-relation-modal/search/principal.js

@@ -41,7 +41,9 @@ function Principal(props) {
       initValue = _props$initValue === void 0 ? [] : _props$initValue,
       setRelation = props.setRelation,
       _props$position = props.position,
-      position = _props$position === void 0 ? "bottom" : _props$position;
+      position = _props$position === void 0 ? "bottom" : _props$position,
+      _props$multiple = props.multiple,
+      multiple = _props$multiple === void 0 ? true : _props$multiple;
 
   var _useState = (0, _react.useState)(initValue),
       _useState2 = _slicedToArray(_useState, 2),
@@ -60,9 +62,22 @@ function Principal(props) {
 
   var userSelectorRef = (0, _react.useRef)(document.createElement("div"));
 
+  var singleSelect = function singleSelect(users) {
+    var _users$;
+
+    if (multiple || !users || !((_users$ = users[0]) !== null && _users$ !== void 0 && _users$.data)) return;
+    var user = users[0];
+    var data = user.data;
+    setUsers([{
+      avatar: data.avatar,
+      name: data.name,
+      userId: data.userId
+    }]);
+  };
+
   var onSelectUser = function onSelectUser(_ref) {
     var users = _ref.users;
-    return setUsers(users);
+    setUsers(users);
   };
 
   (0, _react.useEffect)(function () {
@@ -91,10 +106,11 @@ function Principal(props) {
   return /*#__PURE__*/_react["default"].createElement("div", {
     ref: userSelectorRef
   }, /*#__PURE__*/_react["default"].createElement(_userSelector["default"], {
-    multiple: true,
+    multiple: multiple,
     selectNodes: {
       users: users
     },
+    onSelect: singleSelect,
     onOk: onSelectUser,
     position: position,
     disabledDepartSelect: true,

package/lib/components/task-relation-modal/tree/okr-tree/search-form.js

@@ -54,7 +54,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 function SearchForm(props) {
-  var _loginUser$UserAvatar;
+  var _loginUser$UserAvatar, _loginUser$UserAvatar2;
 
   var loginUser = (0, _helpers.getLoginUserInfo)();
   var user = {
@@ -62,7 +62,7 @@ function SearchForm(props) {
     name: loginUser.Name,
     avatar: {
       original: loginUser === null || loginUser === void 0 ? void 0 : (_loginUser$UserAvatar = loginUser.UserAvatar) === null || _loginUser$UserAvatar === void 0 ? void 0 : _loginUser$UserAvatar.Original,
-      color: '#bc97eb'
+      color: loginUser === null || loginUser === void 0 ? void 0 : (_loginUser$UserAvatar2 = loginUser.UserAvatar) === null || _loginUser$UserAvatar2 === void 0 ? void 0 : _loginUser$UserAvatar2.Color
     }
   };
   var onChange = props.onChange;

package/lib/components/task-relation-modal/tree/work-list/search-form.js

@@ -97,6 +97,7 @@ function SearchForm(props) {
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: "rel-work-tree__search-item"
   }, /*#__PURE__*/_react["default"].createElement(_principal["default"], {
+    multiple: false,
     onChange: setUsers,
     position: "bottomLeft",
     initValue: initPerson,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.11.48-beta.3",
+  "version": "1.11.48-beta.4",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",