@titaui/pc 1.12.7-beta.21 → 1.12.7-beta.24

package/lib/components/dynamic/dynamic-item/components/comments-dialog/api.js

@@ -0,0 +1,28 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.userId = exports.tenantId = exports.setSummaryEvaluate = exports.getSubordinatesList = void 0;
+
+var _request = require("@titaui/request");
+
+var tenantId = window.BSGlobal && window.BSGlobal.tenantInfo.Id || 0;
+exports.tenantId = tenantId;
+var userId = window.BSGlobal && window.BSGlobal.loginUserInfo.Id || 0; // 获取评价数据
+
+exports.userId = userId;
+
+var getSubordinatesList = function getSubordinatesList(data) {
+  return (0, _request.rpost)("v1")("summary/user/aggregate", data);
+}; // 添加/编辑 评论
+
+
+exports.getSubordinatesList = getSubordinatesList;
+
+var setSummaryEvaluate = function setSummaryEvaluate(data) {
+  console.log('data', data);
+  return (0, _request.rpost)("v1")("".concat(data.toUserId, "/summary/setSummaryEvaluate"), data);
+};
+
+exports.setSummaryEvaluate = setSummaryEvaluate;

package/lib/components/dynamic/dynamic-item/components/comments-dialog/index.css

@@ -66,3 +66,10 @@
 .encourage_container .curOverEnourageefforts {
   background: rgba(240, 94, 94, 0.2);
 }
+
+.titleDesc {
+  font-size: 12px;
+  font-weight: normal;
+  color: #A4ACB9;
+  line-height: 18px;
+}

package/lib/components/dynamic/dynamic-item/components/comments-dialog/index.js

@@ -15,11 +15,15 @@ var _form = _interopRequireDefault(require("../../../../form"));
 
 var _textarea = _interopRequireDefault(require("../../../../textarea"));
 
+var _toast = _interopRequireDefault(require("../../../../toast"));
+
 var _regulationSettingItem = _interopRequireDefault(require("../../../../regulation-setting-item"));
 
 var _getLocale = require("../../../../../utils/getLocale");
 
-var _rate = _interopRequireDefault(require("./rate"));
+var _rate = _interopRequireDefault(require("../../../../../components/rate"));
+
+var _api = require("./api");
 
 var _encourage = _interopRequireDefault(require("./encourage"));
 
@@ -47,7 +51,8 @@ var precls = "remind-dialog";
 
 var RemindDialog = function RemindDialog(props) {
   var visible = props.visible,
-      closeDialog = props.closeDialog;
+      closeDialog = props.closeDialog,
+      toUserId = props.toUserId;
 
   var _useState = (0, _react.useState)(""),
       _useState2 = _slicedToArray(_useState, 2),
@@ -80,25 +85,69 @@ var RemindDialog = function RemindDialog(props) {
     setRatingScore(0);
   };
 
-  return /*#__PURE__*/_react["default"].createElement(_dialog["default"], {
-    visible: visible,
+  var handleSubmit = function handleSubmit() {
+    if (!encourageState && ratingScore === 0) {
+      return _toast["default"].Warning("综合评分与奖章鼓励，任选其一");
+    }
+
+    var evaluateType = "";
+    var value = "";
+
+    if (encourageState) {
+      evaluateType = "2";
+      value = encourageState;
+    } else if (ratingScore !== 0) {
+      evaluateType = "1";
+      value = ratingScore * 2;
+    }
+
+    var params = {
+      objId: "300021_263_8_5_637891892779815335",
+      objType: "8",
+      // tenantId,
+      // userId,
+      toUserId: toUserId,
+      // evaluateType,
+      // evaluateValue,
+      remark: comments,
+      evaluateInfo: [{
+        evaluateType: evaluateType,
+        value: value
+      }]
+    };
+    (0, _api.setSummaryEvaluate)(params).then(function (res) {
+      if (res.Code === 1) {
+        closeDialog();
+      }
+    });
+  };
+
+  console.log('ratingScore', ratingScore);
+  console.log('encourageState', encourageState);
+  return /*#__PURE__*/_react["default"].createElement(_dialog["default"] // visible={visible}
+  , {
+    visible: true,
     style: {
       width: 538
     },
     onCancel: closeDialog,
-    onOk: closeDialog,
+    onOk: handleSubmit,
     noFooterLine: true,
     noHeadLine: true,
-    title: (0, _getLocale.getLocale)("Rep_NewS_Evaluation"),
+    title: /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("p", null, (0, _getLocale.getLocale)("Rep_NewS_Evaluation")), /*#__PURE__*/_react["default"].createElement("span", {
+      className: "titleDesc"
+    }, (0, _getLocale.getLocale)("Rep_NewS_ComhenRatin"))),
     onClose: closeDialog
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(precls, "-content")
   }, /*#__PURE__*/_react["default"].createElement(_form["default"], null, /*#__PURE__*/_react["default"].createElement(_regulationSettingItem["default"], {
     label: (0, _getLocale.getLocale)("Rep_NewS_OverallRating")
   }, /*#__PURE__*/_react["default"].createElement(_rate["default"], {
-    ratingScore: ratingScore,
-    changeRate: changeRate
-  })), /*#__PURE__*/_react["default"].createElement(_regulationSettingItem["default"], {
+    count: 5,
+    allowHalf: false,
+    value: ratingScore,
+    onChange: changeRate
+  }), ratingScore !== 0 && /*#__PURE__*/_react["default"].createElement("span", null, ratingScore * 2, (0, _getLocale.getLocale)("Per_Set_Form_Quantifier_Points"))), /*#__PURE__*/_react["default"].createElement(_regulationSettingItem["default"], {
     label: (0, _getLocale.getLocale)("Rep_NewS_MedalEncour")
   }, /*#__PURE__*/_react["default"].createElement(_encourage["default"], {
     encourageState: encourageState,

package/lib/components/import-modal/import-okr-modal/index.js

@@ -54,7 +54,8 @@ function ImportOKRModal(props) {
       _props$onCancel = props.onCancel,
       onCancel = _props$onCancel === void 0 ? function () {} : _props$onCancel,
       _props$lastSelected = props.lastSelected,
-      lastSelected = _props$lastSelected === void 0 ? [] : _props$lastSelected;
+      lastSelected = _props$lastSelected === void 0 ? [] : _props$lastSelected,
+      year = props.year;
 
   var _useState = (0, _react.useState)(isVisible),
       _useState2 = _slicedToArray(_useState, 2),
@@ -125,6 +126,7 @@ function ImportOKRModal(props) {
       e.nativeEvent.stopImmediatePropagation();
     }
   }, /*#__PURE__*/_react["default"].createElement(_okrTree["default"], {
+    year: year,
     selected: selected,
     addSelected: addSelected,
     removeSelected: removeSelected

package/lib/components/import-modal/tree/okr-tree/index.js

@@ -64,7 +64,8 @@ var OkrTree = function OkrTree(_ref) {
       _ref$addSelected = _ref.addSelected,
       addSelected = _ref$addSelected === void 0 ? function () {} : _ref$addSelected,
       _ref$removeSelected = _ref.removeSelected,
-      removeSelected = _ref$removeSelected === void 0 ? function () {} : _ref$removeSelected;
+      removeSelected = _ref$removeSelected === void 0 ? function () {} : _ref$removeSelected,
+      year = _ref.year;
 
   var _useState = (0, _react.useState)([]),
       _useState2 = _slicedToArray(_useState, 2),
@@ -231,7 +232,8 @@ var OkrTree = function OkrTree(_ref) {
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: precls
   }, /*#__PURE__*/_react["default"].createElement(_searchForm["default"], {
-    onChange: onQueryChangeHandler
+    onChange: onQueryChangeHandler,
+    year: year
   }), treeNodes.length == 0 && /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(precls, "__empty")
   }, (0, _getLocale.getLocale)('Tasks_Tab_MyS_NoOKRilable')), treeNodes.length > 0 && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {

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

@@ -69,10 +69,11 @@ function SearchForm(props) {
       hasAvatar: loginUser === null || loginUser === void 0 ? void 0 : (_loginUser$UserAvatar3 = loginUser.UserAvatar) === null || _loginUser$UserAvatar3 === void 0 ? void 0 : _loginUser$UserAvatar3.HasAvatar
     }
   };
-  var onChange = props.onChange;
+  var onChange = props.onChange,
+      year = props.year;
 
   var _useState = (0, _react.useState)({
-    annualNum: new Date().getFullYear(),
+    annualNum: year || new Date().getFullYear(),
     // 默认当前年份全部周期
     yqmNum: 0,
     cycleType: '-1'
@@ -118,6 +119,13 @@ function SearchForm(props) {
       okrClassify: classify
     }, cycle));
   }, [okrType, users, keyWords, cycle, relation, classify]);
+  (0, _react.useEffect)(function () {
+    if (year) {
+      setCycle(_objectSpread(_objectSpread({}, cycle), {}, {
+        annualNum: year
+      }));
+    }
+  }, [year]);
   return /*#__PURE__*/_react["default"].createElement("div", {
     ref: dilagRef
   }, /*#__PURE__*/_react["default"].createElement("div", {

package/lib/components/promise-confirm/index.js

@@ -97,7 +97,7 @@ var PromiseConfirm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   });
   return /*#__PURE__*/_react["default"].createElement(_dialogConfirm["default"], {
     visible: visible,
-    type: type
+    type: 'warning'
   }, /*#__PURE__*/_react["default"].createElement("span", {
     type: "title"
   }, title), content && /*#__PURE__*/_react["default"].createElement("span", {

package/lib/components/write-summary-modal/index.js

@@ -13,8 +13,6 @@ var _getLocale = require("../../utils/getLocale");
 
 var _dialog = _interopRequireDefault(require("../dialog"));
 
-var _interface = require("./interface");
-
 var _requestApi = require("./request-api");
 
 require("./index.css");
@@ -41,14 +39,16 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var prefix = "tita-ui-write-summary-modal";
 var WriteSummaryModal = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
-  var onSelect = _ref.onSelect;
+  var onSelect = _ref.onSelect,
+      onVisibileChange = _ref.onVisibileChange,
+      onCancel = _ref.onCancel;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
       visible = _useState2[0],
       setVisible = _useState2[1];
 
-  var _useState3 = (0, _react.useState)(_interface.EReportType.Daily),
+  var _useState3 = (0, _react.useState)(),
       _useState4 = _slicedToArray(_useState3, 2),
       reportType = _useState4[0],
       setReportType = _useState4[1];
@@ -59,10 +59,22 @@ var WriteSummaryModal = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref)
       setModalList = _useState6[1];
 
   var handleCloseModal = function handleCloseModal() {
+    if (onCancel) {
+      onCancel();
+    }
+
+    if (onVisibileChange) {
+      onVisibileChange(false);
+    }
+
     setVisible(false);
   };
 
   var handleShowModal = function handleShowModal(type) {
+    if (onVisibileChange) {
+      onVisibileChange(true);
+    }
+
     setVisible(true);
     setReportType(type);
   };
@@ -72,6 +84,10 @@ var WriteSummaryModal = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref)
       onSelect(selected);
     }
 
+    if (onVisibileChange) {
+      onVisibileChange(false);
+    }
+
     setVisible(false);
   };
 
@@ -82,7 +98,7 @@ var WriteSummaryModal = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref)
     };
   });
   (0, _react.useEffect)(function () {
-    if (visible) {
+    if (visible && reportType || visible && reportType === 0) {
       (0, _requestApi.getWriteSummaryModalList)(reportType).then(function (resp) {
         if (resp.Code === 1) {
           setModalList(resp.Data);

package/package.json

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