@titaui/pc 1.12.22-beta.4 → 1.12.22-beta.7

package/lib/components/attachments-preview/index.js

@@ -49,7 +49,9 @@ var AttachmentsPreview = function AttachmentsPreview(props) {
       case 'delete':
         {
           onChange(attachments.filter(function (f) {
-            return f.Id != attachments[index].Id;
+            var _attachments$index;
+
+            return f.Id !== attachments[index].Id || (f === null || f === void 0 ? void 0 : f.DocumentId) !== ((_attachments$index = attachments[index]) === null || _attachments$index === void 0 ? void 0 : _attachments$index.DocumentId);
           }));
           break;
         }
@@ -64,7 +66,9 @@ var AttachmentsPreview = function AttachmentsPreview(props) {
             });
             previewRef.current.show(i);
           } else {
-            window.open(attachments[index].ClientUrl);
+            var _attachments$index2, _attachments$index3;
+
+            window.open(((_attachments$index2 = attachments[index]) === null || _attachments$index2 === void 0 ? void 0 : _attachments$index2.ClientUrl) || ((_attachments$index3 = attachments[index]) === null || _attachments$index3 === void 0 ? void 0 : _attachments$index3.PreviewUrl));
           }
 
           break;

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

@@ -115,7 +115,11 @@ var RemindDialog = function RemindDialog(props) {
     };
     (0, _api.setSummaryEvaluate)(params).then(function (res) {
       if (res.Code === 1) {
-        closeDialog();
+        closeDialog({
+          remark: remark,
+          type: Number(evaluateType),
+          value: value
+        });
 
         _toast["default"].Success((0, _getLocale.getLocale)("Mod_Successfuloperat"));
       }
@@ -123,7 +127,7 @@ var RemindDialog = function RemindDialog(props) {
   };
 
   (0, _react.useEffect)(function () {
-    if (!isUpdated) {
+    if (!isUpdated && visible) {
       var params = {
         objectId: feedId,
         objectType: "8",
@@ -145,21 +149,23 @@ var RemindDialog = function RemindDialog(props) {
         }
       });
     }
+  }, [visible]);
+  var onCloseHandler = (0, _react.useCallback)(function () {
+    closeDialog();
   }, []);
   return /*#__PURE__*/_react["default"].createElement(_dialog["default"], {
-    visible: visible // visible={true}
-    ,
+    visible: visible,
     style: {
       width: 538
     },
-    onCancel: closeDialog,
+    onCancel: onCloseHandler,
     onOk: handleSubmit,
     noFooterLine: true,
     noHeadLine: true,
     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
+    onClose: onCloseHandler
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(precls, "-content")
   }, /*#__PURE__*/_react["default"].createElement(_form["default"], null, /*#__PURE__*/_react["default"].createElement(_regulationSettingItem["default"], {

package/lib/components/dynamic/dynamic-item/components/header/index.js

@@ -13,8 +13,6 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _avatar = _interopRequireDefault(require("../../../../avatar"));
 
-var _dropSelector = _interopRequireWildcard(require("../../../../drop-selector"));
-
 var _requestApi = require("../../../request-api");
 
 var _dialogConfirm = _interopRequireWildcard(require("../../../../dialog-confirm"));
@@ -23,8 +21,6 @@ var _toast = _interopRequireDefault(require("../../../../toast"));
 
 var _openData = require("../../../../../utils/open-data");
 
-var _conditionRender = _interopRequireDefault(require("../../../../condition-render"));
-
 var _tooltip = _interopRequireDefault(require("../../../../tooltip"));
 
 var _constant = require("../../../constant");
@@ -265,43 +261,7 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
       name: user.name,
       id: user.userId
     })
-  })), desc, suffixContent), /*#__PURE__*/_react["default"].createElement("div", {
-    className: "".concat(prefix, "__more-operate")
-  }, /*#__PURE__*/_react["default"].createElement(_dropSelector["default"], {
-    popupPlacement: "bottomRight",
-    checked: ["collect"],
-    onChange: onChangeHandler,
-    multi: false,
-    visible: selectVisible,
-    trigger: /*#__PURE__*/_react["default"].createElement("span", {
-      className: (0, _classnames["default"])("".concat(prefix, "-right"), "tu-icon-more1"),
-      onClick: handleShowDropSelector
-    })
-  }, /*#__PURE__*/_react["default"].createElement(_dropSelector.Item, {
-    name: "collect"
-  }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: "".concat(prefix, "__more-operate-selection")
-  }, /*#__PURE__*/_react["default"].createElement("i", {
-    className: (0, _classnames["default"])("tu-icon-APP-shoucang", "".concat(prefix, "__more-operate-selection-icon"))
-  }), nowIsCollect ? (0, _getLocale.getLocale)("Mod_CancCollection") : (0, _getLocale.getLocale)("Mod_Collection"))), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
-    condition: showTopping
-  }, /*#__PURE__*/_react["default"].createElement(_dropSelector.Item, {
-    name: "top",
-    onClick: handleTopOperateClick
-  }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: "".concat(prefix, "__more-operate-selection")
-  }, /*#__PURE__*/_react["default"].createElement("i", {
-    className: (0, _classnames["default"])("tu-icon-zhiding", "".concat(prefix, "__more-operate-selection-icon"))
-  }), nowIsTop ? (0, _getLocale.getLocale)("OKR_MyO_Unpinned") : (0, _getLocale.getLocale)("Feed_Top")))), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
-    condition: showDelete
-  }, /*#__PURE__*/_react["default"].createElement(_dropSelector.Item, {
-    name: "delete",
-    onClick: handleDeleteClick
-  }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: "".concat(prefix, "__more-operate-selection")
-  }, /*#__PURE__*/_react["default"].createElement("i", {
-    className: (0, _classnames["default"])("tu-icon-del", "".concat(prefix, "__more-operate-selection-icon"))
-  }), (0, _getLocale.getLocale)("Mod_Delete"))))))), /*#__PURE__*/_react["default"].createElement("div", {
+  })), desc, suffixContent)), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "-desc-time")
   }, createDate))), renderDialogConfirm);
 };

package/lib/components/dynamic/dynamic-item/components/okr-progress/index.js

@@ -1,5 +1,7 @@
 "use strict";
 
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -31,8 +33,6 @@ 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 _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-
 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."); }
@@ -59,17 +59,6 @@ var OkrProgress = function OkrProgress(_ref) {
       rowsData = _useState2[0],
       setRowsData = _useState2[1];
 
-  var renderTitle = (0, _react.useMemo)(function () {
-    if (type === 'day') {
-      return (0, _getLocale.getLocale)('Rep_NewS_ToOKRpro');
-    } else if (type === 'week') {
-      return (0, _getLocale.getLocale)('Rep_NewS_ThisOKRprogr');
-    } else if (type === 'month') {
-      return (0, _getLocale.getLocale)('Rep_NewS_TmonOKRpro');
-    }
-
-    return '';
-  }, [type]);
   var renderTable = (0, _react.useMemo)(function () {
     return /*#__PURE__*/_react["default"].createElement("table", null, /*#__PURE__*/_react["default"].createElement("thead", null, /*#__PURE__*/_react["default"].createElement("tr", {
       className: "".concat(prefix, "__table-title")
@@ -134,7 +123,7 @@ var OkrProgress = function OkrProgress(_ref) {
     })));
   }, [rowsData]);
   (0, _react.useEffect)(function () {
-    if (_typeof(data) !== 'object' && data !== '') {
+    if (typeof data === 'string' && data !== '') {
       setRowsData(JSON.parse(data));
     }
   }, [data]);

package/lib/components/dynamic/dynamic-item/components/summary-header/index.js

@@ -41,14 +41,24 @@ var _evalute = _interopRequireDefault(require("./img/evalute.png"));
 
 require("./index.css");
 
+var _requestApi2 = require("./request-api");
+
 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); }
 
 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 ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
 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); }); }; }
+
 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."); }
@@ -69,18 +79,20 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
       _ref$showDelete = _ref.showDelete,
       showDelete = _ref$showDelete === void 0 ? false : _ref$showDelete,
       _ref$showEdit = _ref.showEdit,
-      showEdit = _ref$showEdit === void 0 ? true : _ref$showEdit,
+      showEdit = _ref$showEdit === void 0 ? false : _ref$showEdit,
       _ref$showCollect = _ref.showCollect,
-      showCollect = _ref$showCollect === void 0 ? false : _ref$showCollect,
+      showCollect = _ref$showCollect === void 0 ? true : _ref$showCollect,
       _ref$showOperateRecor = _ref.showOperateRecord,
-      showOperateRecord = _ref$showOperateRecor === void 0 ? true : _ref$showOperateRecor,
+      showOperateRecord = _ref$showOperateRecor === void 0 ? false : _ref$showOperateRecor,
       data = _ref.data,
       _ref$desc = _ref.desc,
       desc = _ref$desc === void 0 ? "" : _ref$desc,
       user = _ref.user,
       _ref$suffixContent = _ref.suffixContent,
       suffixContent = _ref$suffixContent === void 0 ? "" : _ref$suffixContent,
-      canEvaluate = _ref.canEvaluate;
+      canEvaluate = _ref.canEvaluate,
+      _ref$setEvaluates = _ref.setEvaluates,
+      setEvaluates = _ref$setEvaluates === void 0 ? function () {} : _ref$setEvaluates;
   var createDate = data.createDate,
       feedId = data.feedId,
       _data$isCollect = data.isCollect,
@@ -209,9 +221,43 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
     window.open("#/summary/template?isCreate=false&hideNavTop=true&reportType=".concat(reportType, "&currentTime=").concat(dailyDate), "_blank");
   };
 
-  var handleCloseEvaluateDialog = function handleCloseEvaluateDialog() {
-    setEvaluateVisible(false);
-  };
+  var handleCloseEvaluateDialog = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(params) {
+      var _user;
+
+      return regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              if (!params) {
+                _context.next = 5;
+                break;
+              }
+
+              _context.next = 3;
+              return (0, _requestApi2.getUserById)(loginUserId);
+
+            case 3:
+              _user = _context.sent;
+              setEvaluates([_objectSpread(_objectSpread({}, params), {}, {
+                user: _user
+              })]);
+
+            case 5:
+              setEvaluateVisible(false);
+
+            case 6:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
+
+    return function handleCloseEvaluateDialog(_x) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
 
   var renderDialogConfirm = (0, _react.useMemo)(function () {
     return /*#__PURE__*/_react["default"].createElement(_dialogConfirm["default"], {

package/lib/components/dynamic/dynamic-item/components/summary-header/request-api.js

@@ -0,0 +1,17 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getUserById = void 0;
+
+var _request = require("../../../../../utils/request");
+
+// @ts-ignore
+var getUserById = function getUserById(userId) {
+  return (0, _request.rget)("v2")("user/GetById?touserid=".concat(userId)).then(function (res) {
+    return res.Data;
+  });
+};
+
+exports.getUserById = getUserById;

package/lib/components/dynamic/dynamic-item/components/task-progress/constant.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.EStatusStatus2ClassType = void 0;
+exports.EStatusStatus2ClassType = exports.EObjType = void 0;
 var EStatusStatus2ClassType = {
   2: "tu-icon-finished",
   1: "tu-icon-running",
@@ -13,4 +13,17 @@ var EStatusStatus2ClassType = {
   0: "tu-icon-notstart",
   5: "tu-icon-jiantou-right"
 };
-exports.EStatusStatus2ClassType = EStatusStatus2ClassType;
+exports.EStatusStatus2ClassType = EStatusStatus2ClassType;
+var EObjType;
+exports.EObjType = EObjType;
+
+(function (EObjType) {
+  EObjType[EObjType["Project"] = 4] = "Project";
+  EObjType[EObjType["Task"] = 7] = "Task";
+  EObjType[EObjType["O"] = 62] = "O";
+  EObjType[EObjType["Kr"] = 65] = "Kr";
+  EObjType[EObjType["Assess"] = 23] = "Assess";
+  EObjType[EObjType["MileStone"] = 27] = "MileStone";
+  EObjType[EObjType["KanBan"] = 66] = "KanBan";
+  EObjType[EObjType["Report"] = 8] = "Report";
+})(EObjType || (exports.EObjType = EObjType = {}));

package/lib/components/dynamic/dynamic-item/components/task-progress/index.css

@@ -131,6 +131,7 @@
   line-height: 22px;
   position: relative;
   overflow: hidden;
+  cursor: pointer;
 }
 
 .titaui-dynamic-summary-task-progress__statistic-item:last-child {
@@ -141,8 +142,17 @@
   background: rgba(0, 214, 133, 0.1);
 }
 
-.titaui-dynamic-summary-task-progress__statistic-item--finished::before {
-  content: '';
+.titaui-dynamic-summary-task-progress__statistic-item--finished-text {
+  color: #00d685;
+  font-size: 16px;
+}
+
+.titaui-dynamic-summary-task-progress__statistic-item--finished-active {
+  background: rgba(0, 214, 133, 0.3);
+}
+
+.titaui-dynamic-summary-task-progress__statistic-item--finished-active::before {
+  content: "";
   position: absolute;
   top: 0;
   left: 0;
@@ -152,50 +162,50 @@
   border-radius: 12px 0 0 12px;
 }
 
-.titaui-dynamic-summary-task-progress__statistic-item--finished-text {
-  color: #00D685;
-  font-size: 16px;
-}
-
 .titaui-dynamic-summary-task-progress__statistic-item--processing {
   background: rgba(40, 121, 255, 0.1);
 }
 
 .titaui-dynamic-summary-task-progress__statistic-item--processing-text {
-  color: #2879FF;
+  color: #2879ff;
   font-size: 16px;
 }
 
-.titaui-dynamic-summary-task-progress__statistic-item--overdue {
-  background: rgba(240, 94, 94, 0.1);
+.titaui-dynamic-summary-task-progress__statistic-item--processing-active {
+  background: rgba(40, 121, 255, 0.3);
 }
 
-.titaui-dynamic-summary-task-progress__statistic-item--overdue-text {
-  color: #F05E5E;
-  font-size: 16px;
+.titaui-dynamic-summary-task-progress__statistic-item--processing-active::before {
+  content: "";
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 4px;
+  height: 48px;
+  background: rgba(40, 121, 255, 0.3);
+  border-radius: 12px 0 0 12px;
 }
 
-.titaui-dynamic-summary-task-progress__import {
-  margin-top: 10px;
-  width: 60px;
-  height: 60px;
-  border-radius: 8px;
-  border: 1px solid #e9ecf0;
-  display: flex;
-  align-items: center;
-  justify-content: center;
+.titaui-dynamic-summary-task-progress__statistic-item--overdue {
+  background: rgba(240, 94, 94, 0.1);
 }
 
-.titaui-dynamic-summary-task-progress__import-icon {
-  font-size: 24px;
-  color: #BFC7D5;
+.titaui-dynamic-summary-task-progress__statistic-item--overdue-text {
+  color: #f05e5e;
+  font-size: 16px;
 }
 
-.titaui-dynamic-summary-task-progress__import:hover {
-  cursor: pointer;
-  border: 1px solid #2879ff;
+.titaui-dynamic-summary-task-progress__statistic-item--overdue-active {
+  background: rgba(240, 94, 94, 0.3);
 }
 
-.titaui-dynamic-summary-task-progress__import:hover .tu-icon-add1 {
-  color: #2879ff;
+.titaui-dynamic-summary-task-progress__statistic-item--overdue-active::before {
+  content: "";
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 4px;
+  height: 48px;
+  background: rgba(240, 94, 94, 0.3);
+  border-radius: 12px 0 0 12px;
 }