@titaui/pc 1.12.77 → 1.12.78

package/lib/components/color-date-picker/index.js

@@ -58,7 +58,12 @@ var ColorDatePicker = function ColorDatePicker(_ref) {
       _ref$rowGap = _ref.rowGap,
       rowGap = _ref$rowGap === void 0 ? 0 : _ref$rowGap,
       _ref$colGap = _ref.colGap,
-      colGap = _ref$colGap === void 0 ? 0 : _ref$colGap;
+      colGap = _ref$colGap === void 0 ? 0 : _ref$colGap,
+      _ref$isTitle = _ref.isTitle,
+      isTitle = _ref$isTitle === void 0 ? true : _ref$isTitle,
+      _ref$isContent = _ref.isContent,
+      isContent = _ref$isContent === void 0 ? true : _ref$isContent,
+      marginTop = _ref.marginTop;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -90,29 +95,30 @@ var ColorDatePicker = function ColorDatePicker(_ref) {
     var result = [];
 
     if (type === _interface.EReportType.Daily) {
-      (0, _constant.getWeek)().forEach(function (item) {
-        result.push( /*#__PURE__*/_react["default"].createElement("div", {
-          className: "".concat(prefix, "__week-title")
-        }, item));
-      });
-      result.push.apply(result, _toConsumableArray(data.map(function (item) {
-        return /*#__PURE__*/_react["default"].createElement("div", {
-          className: (0, _classnames["default"])("".concat(prefix, "__content-daily"), _defineProperty({}, "".concat(prefix, "__content--disable"), !item.selectedBgColor)),
-          onClick: function onClick() {
-            return handleItemClick(item);
-          }
-        }, /*#__PURE__*/_react["default"].createElement("span", {
-          className: "".concat(prefix, "__content-daily-text"),
-          style: {
-            background: mouseOverItem === item && isMouseOver ? item.hoverbgColor : value === item.value ? item.selectedBgColor : item.bgColor,
-            color: value === item.value && item.bgColor ? "#ffffff" : item.color
-          },
-          onMouseOver: function onMouseOver() {
-            return handleMouseOverDate(item);
-          },
-          onMouseOut: handleMouseOutDate
-        }, item.text));
-      })));
+      if (isTitle) {
+        (0, _constant.getWeek)().forEach(function (item) {
+          result.push( /*#__PURE__*/_react["default"].createElement("div", {
+            className: "".concat(prefix, "__week-title")
+          }, item));
+        });
+      }
+
+      if (isContent) {
+        result.push.apply(result, _toConsumableArray(data.map(function (item) {
+          return /*#__PURE__*/_react["default"].createElement("div", {
+            className: (0, _classnames["default"])("".concat(prefix, "__content-daily"), _defineProperty({}, "".concat(prefix, "__content--disable"), !item.selectedBgColor)),
+            onClick: function onClick() {
+              return handleItemClick(item);
+            }
+          }, /*#__PURE__*/_react["default"].createElement("span", {
+            className: "".concat(prefix, "__content-daily-text"),
+            style: {
+              background: value === item.value ? item.selectedBgColor : item.bgColor,
+              color: value === item.value && item.bgColor ? "#ffffff" : item.color
+            }
+          }, item.text));
+        })));
+      }
     } else if (type === _interface.EReportType.Weekly) {
       result.push.apply(result, _toConsumableArray(data.map(function (item) {
         return /*#__PURE__*/_react["default"].createElement("div", {
@@ -127,7 +133,9 @@ var ColorDatePicker = function ColorDatePicker(_ref) {
           onMouseOver: function onMouseOver() {
             return handleMouseOverDate(item);
           },
-          onMouseOut: handleMouseOutDate
+          onMouseOut: handleMouseOutDate,
+          onFocus: function onFocus() {},
+          onBlur: function onBlur() {}
         }, /*#__PURE__*/_react["default"].createElement("span", {
           className: "".concat(prefix, "__content-weekly-text")
         }, item.text, /*#__PURE__*/_react["default"].createElement("span", {
@@ -148,7 +156,9 @@ var ColorDatePicker = function ColorDatePicker(_ref) {
           onMouseOver: function onMouseOver() {
             return handleMouseOverDate(item);
           },
-          onMouseOut: handleMouseOutDate
+          onMouseOut: handleMouseOutDate,
+          onFocus: function onFocus() {},
+          onBlur: function onBlur() {}
         }, item.text);
       })));
     }
@@ -160,7 +170,8 @@ var ColorDatePicker = function ColorDatePicker(_ref) {
     style: {
       gridTemplateColumns: "repeat(".concat(column, ", 1fr)"),
       rowGap: rowGap,
-      columnGap: colGap
+      columnGap: colGap,
+      marginTop: marginTop
     }
   }, renderContent);
 };

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

@@ -21,6 +21,8 @@ var _taskStatusSelect = _interopRequireDefault(require("../../search/task-status
 
 var _taskRelation = _interopRequireDefault(require("../../search/task-relation"));
 
+var _principal = _interopRequireDefault(require("../../search/principal"));
+
 var _formatTime = require("../../../../utils/format-time");
 
 var _getLocale = require("../../../../utils/getLocale");
@@ -76,19 +78,27 @@ function SearchForm(props) {
       keyWords = _useState6[0],
       setKeyWords = _useState6[1];
 
-  var _useState7 = (0, _react.useState)(0),
+  var _useState7 = (0, _react.useState)([]),
       _useState8 = _slicedToArray(_useState7, 2),
-      relation = _useState8[0],
-      setRelation = _useState8[1];
+      users = _useState8[0],
+      setUsers = _useState8[1];
+
+  var _useState9 = (0, _react.useState)(0),
+      _useState10 = _slicedToArray(_useState9, 2),
+      relation = _useState10[0],
+      setRelation = _useState10[1];
 
   var dilagRef = (0, _react.useRef)(document.createElement('div'));
   (0, _react.useEffect)(function () {
     onChange(_objectSpread({
       status: status,
       keyWords: keyWords,
-      relation: relation
+      relation: relation,
+      userIds: users.reduce(function (res, cur, index) {
+        return "".concat(res).concat(index == 0 ? '' : ',').concat(cur.userId);
+      }, '')
     }, cycle));
-  }, [status, keyWords, cycle, relation]);
+  }, [status, keyWords, cycle, relation, users]);
   return /*#__PURE__*/_react["default"].createElement("div", {
     ref: dilagRef
   }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -113,6 +123,14 @@ function SearchForm(props) {
     initValue: status
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: "rel-okr-tree__search-item"
+  }, /*#__PURE__*/_react["default"].createElement(_principal["default"], {
+    multiple: false,
+    onChange: setUsers,
+    position: "bottomLeft",
+    isInitSelf: true,
+    setRelation: setRelation
+  })), /*#__PURE__*/_react["default"].createElement("div", {
+    className: "rel-okr-tree__search-item"
   }, /*#__PURE__*/_react["default"].createElement(_taskRelation["default"], {
     onChange: setRelation,
     initValue: relation

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

@@ -33,7 +33,9 @@ var planTableTask = function planTableTask(params, pageNum, pageSize) {
       _params$status = params.status,
       status = _params$status === void 0 ? 10 : _params$status,
       _params$relation = params.relation,
-      relation = _params$relation === void 0 ? 0 : _params$relation;
+      relation = _params$relation === void 0 ? 0 : _params$relation,
+      _params$userIds = params.userIds,
+      userIds = _params$userIds === void 0 ? id : _params$userIds;
 
   if (status == 10) {
     status = '0,1,2,3,4,6';
@@ -46,6 +48,7 @@ var planTableTask = function planTableTask(params, pageNum, pageSize) {
   return (0, _request.rpost)('v2')(url, {
     type: 'personal',
     to_user_id: id,
+    userIds: userIds,
     StartDate: startDate,
     EndDate: endDate,
     startNum: pageNum,

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

@@ -17,8 +17,12 @@ var _openData = require("../../../utils/open-data");
 
 var _getLocale = require("../../../utils/getLocale");
 
+var _helpers = require("../../../utils/helpers");
+
 require("./search-dropdown/index.css");
 
+var _loginUser$UserAvatar;
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -37,6 +41,16 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
+var loginUser = (0, _helpers.getLoginUserInfo)();
+var user = {
+  userId: loginUser.Id,
+  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'
+  }
+};
+
 function Principal(props) {
   var onChange = props.onChange,
       _props$initValue = props.initValue,
@@ -45,7 +59,9 @@ function Principal(props) {
       _props$position = props.position,
       position = _props$position === void 0 ? 'bottom' : _props$position,
       _props$multiple = props.multiple,
-      multiple = _props$multiple === void 0 ? true : _props$multiple;
+      multiple = _props$multiple === void 0 ? true : _props$multiple,
+      _props$isInitSelf = props.isInitSelf,
+      isInitSelf = _props$isInitSelf === void 0 ? false : _props$isInitSelf;
 
   var _useState = (0, _react.useState)(initValue),
       _useState2 = _slicedToArray(_useState, 2),
@@ -79,6 +95,10 @@ function Principal(props) {
 
   (0, _react.useEffect)(function () {
     setIsInit(true);
+
+    if (isInitSelf) {
+      setUsers([user]);
+    }
   }, []);
   (0, _react.useEffect)(function () {
     setRelation(0);

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

@@ -60,14 +60,20 @@ function _default(props) {
       defaultExpandedKeys = _useState2[0];
 
   var _useState3 = (0, _react.useState)(function () {
-    if (props.selected) return props.selected;
+    if (props.initSelected) {
+      return props.initSelected;
+    } else if (props.selected) {
+      return props.selected;
+    }
   }),
       _useState4 = _slicedToArray(_useState3, 2),
       selected = _useState4[0],
       setSelected = _useState4[1];
 
   (0, _react.useEffect)(function () {
-    setSelected(props.selected);
+    if (props.selected) {
+      setSelected(props.selected);
+    }
   }, [props.selected]);
 
   var onSelectHandler = function onSelectHandler(keys, node) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.12.77",
+  "version": "1.12.78",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",