@titaui/pc 1.15.28 → 1.15.29

package/lib/components/dynamic/dynamic-item/dynamic-new-report/index.js

@@ -47,7 +47,7 @@ var _bsGlobal = require("../../../../utils/bs-global");
 
 require("./index.css");
 
-var _excluded = ["data"];
+var _excluded = ["data", "isFold"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -91,6 +91,8 @@ var DynamicReply = function DynamicReply(_ref) {
   var _classNames;
 
   var data = _ref.data,
+      _ref$isFold = _ref.isFold,
+      isFold = _ref$isFold === void 0 ? true : _ref$isFold,
       restProps = _objectWithoutProperties(_ref, _excluded);
 
   var feedId = data.feedId,
@@ -283,6 +285,8 @@ var DynamicReply = function DynamicReply(_ref) {
   }
 
   var handleInView = function handleInView(inview) {
+    if (!isFold) return;
+
     if (inview) {
       window.titaTracker('planAction').record({
         actionName: '查看日报',

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

@@ -29,7 +29,7 @@ var _getLocale = require("../../../../utils/getLocale");
 
 require("./index.css");
 
-var _excluded = ["data"];
+var _excluded = ["data", "isFold"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -58,6 +58,8 @@ var prefix = 'titaui-dynamic-report-item';
 
 var DynamicReply = function DynamicReply(_ref) {
   var data = _ref.data,
+      _ref$isFold = _ref.isFold,
+      isFold = _ref$isFold === void 0 ? true : _ref$isFold,
       restProps = _objectWithoutProperties(_ref, _excluded);
 
   var submitState = data.submitState,
@@ -163,6 +165,8 @@ var DynamicReply = function DynamicReply(_ref) {
   }
 
   var handleInView = function handleInView(inview) {
+    if (!isFold) return;
+
     if (inview) {
       window.titaTracker('planAction').record({
         actionName: '查看日报',

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

@@ -314,11 +314,13 @@ var DynamicItem = function DynamicItem(_ref) {
           return /*#__PURE__*/_react["default"].createElement(_dynamicNewReport["default"], _extends({
             data: data,
             onDeleteFeed: onDeleteFeed,
-            curAtUser: curAtUser
+            curAtUser: curAtUser,
+            isFold: isFold
           }, restProps));
         }
 
         return /*#__PURE__*/_react["default"].createElement(_dynamicReport["default"], _extends({
+          isFold: isFold,
           data: data,
           onDeleteFeed: onDeleteFeed
         }, restProps));
@@ -400,7 +402,7 @@ var DynamicItem = function DynamicItem(_ref) {
       default:
         return null;
     }
-  }, [data, curAtUser]);
+  }, [data, curAtUser, isFold]);
 
   var renderUpvoteCount = function renderUpvoteCount(type, count) {
     if (count === 0) {

package/lib/components/okr-detail/components/okr-tree/tree-node/e-kr-node/index.js

@@ -125,18 +125,25 @@ var EKrNode = function EKrNode(props) {
                   objType: 4,
                   AppId: 1,
                   AppType: 1,
-                  TaskType: 0,
-                  WorkMileStoneId: data.mileStoneId
-                };
+                  TaskType: 0 // WorkMileStoneId: data.mileStoneId,
 
-                if (data.mileStoneId > 0) {
-                  params.WorkMileStoneName = data.mileStoneName;
-                }
+                }; // if (data.mileStoneId > 0) {
+                //   params.WorkMileStoneName = data.mileStoneName
+                // }
 
                 window.openCreateTaskPop(btnRef.current, {
                   createParams: params,
                   createTaskOption: {
-                    allowObjectOptions: false
+                    allowObjectOptions: true,
+                    labelOption: {
+                      isOnlyCurrent: true,
+                      labelId: data.mileStoneId,
+                      workId: data.workId,
+                      workName: okrInfo.workName,
+                      name: data.mileStoneName,
+                      krId: data.mileStoneId,
+                      type: "kr"
+                    }
                   }
                 }).then(function () {
                   _toast["default"].Success((0, _getLocale.getLocale)('Mod_Successfuloperat'), {

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

@@ -35,9 +35,11 @@ var _relationWorkModel = _interopRequireDefault(require("./okr-relation/relation
 
 var _workRelation = _interopRequireDefault(require("./work-relation"));
 
+var _relationSingleOkr = _interopRequireDefault(require("./relation-single-okr"));
+
 require("./index.css");
 
-var _excluded = ["defaultVisible", "multiple", "onOk", "onCancel", "taskId", "isRelationOther", "lastSelected"];
+var _excluded = ["defaultVisible", "multiple", "onOk", "onCancel", "taskId", "isRelationOther", "lastSelected", "isOnlyCurrent"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -91,17 +93,25 @@ function TaskRelationModal(props) {
       isRelationOther = _props$isRelationOthe === void 0 ? false : _props$isRelationOthe,
       _props$lastSelected = props.lastSelected,
       lastSelected = _props$lastSelected === void 0 ? [] : _props$lastSelected,
+      isOnlyCurrent = props.isOnlyCurrent,
       restProps = _objectWithoutProperties(props, _excluded);
 
+  if (isOnlyCurrent) return /*#__PURE__*/_react["default"].createElement(_relationSingleOkr["default"], {
+    lastSelected: lastSelected,
+    defaultVisible: defaultVisible,
+    onCancel: onCancel,
+    onOk: onOk
+  });
+
   var _useState = (0, _react.useState)(defaultVisible),
       _useState2 = _slicedToArray(_useState, 2),
       visible = _useState2[0],
       setVisible = _useState2[1];
 
   var _useState3 = (0, _react.useState)(function () {
-    if (_helper.isOpenOkrManage) return "okr";
-    if (_helper.isOpenWorkManage) return "work";
-    return "category";
+    if (_helper.isOpenOkrManage) return 'okr';
+    if (_helper.isOpenWorkManage) return 'work';
+    return 'category';
   }),
       _useState4 = _slicedToArray(_useState3, 2),
       activeTab = _useState4[0],
@@ -155,7 +165,7 @@ function TaskRelationModal(props) {
               if (Message) {
                 _toast["default"].Error(Message);
               } else {
-                _toast["default"].Success((0, _getLocale.getLocale)("Mod_Successfuloperat"));
+                _toast["default"].Success((0, _getLocale.getLocale)('Mod_Successfuloperat'));
               }
 
             case 5:
@@ -202,7 +212,7 @@ function TaskRelationModal(props) {
               if (Message) {
                 _toast["default"].Error(Message);
               } else {
-                _toast["default"].Success((0, _getLocale.getLocale)("Mod_Successfuloperat"));
+                _toast["default"].Success((0, _getLocale.getLocale)('Mod_Successfuloperat'));
               }
 
             case 7:
@@ -250,14 +260,14 @@ function TaskRelationModal(props) {
   };
 
   var openLableSetting = function openLableSetting() {
-    window.open("#set?page_id=class", "_blank");
+    window.open('#set?page_id=class', '_blank');
   };
 
   var renderCateGory = function renderCateGory() {
     return /*#__PURE__*/_react["default"].createElement("span", {
       className: "".concat(_helper.preCls, "__catetory-set"),
       onClick: openLableSetting
-    }, (0, _getLocale.getLocale)("Tasks_Menu_Category"));
+    }, (0, _getLocale.getLocale)('Tasks_Menu_Category'));
   };
 
   return /*#__PURE__*/_react["default"].createElement(_dialog["default"], _extends({
@@ -267,13 +277,13 @@ function TaskRelationModal(props) {
     onCancel: onCancelHandler,
     onClose: onCancelHandler,
     style: {
-      height: "590px"
+      height: '590px'
     },
     width: 840,
     noFooterLine: true,
-    extendFooterBtn: activeTab === "category" && isCategory && renderCateGory() // getContainer={getContainer}
+    extendFooterBtn: activeTab === 'category' && isCategory && renderCateGory() // getContainer={getContainer}
     ,
-    extraClass: ["pull-screen-ignore", "tita-user-pop"],
+    extraClass: ['pull-screen-ignore', 'tita-user-pop'],
     destroyOnClose: false
   }, restProps), /*#__PURE__*/_react["default"].createElement(_context3.Context.Provider, {
     value: {
@@ -292,19 +302,19 @@ function TaskRelationModal(props) {
     className: "".concat(_helper.preCls, "__tabs")
   }, _helper.isOpenOkrManage && /*#__PURE__*/_react["default"].createElement(_tabs.TabPane, {
     key: "okr",
-    tab: (0, _getLocale.getLocale)("Tasks_Menu_AffiliateOKR")
+    tab: (0, _getLocale.getLocale)('Tasks_Menu_AffiliateOKR')
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(_helper.preCls, "__content")
   }, /*#__PURE__*/_react["default"].createElement(_okrTree["default"], {
     multiple: multiple
   }))), _helper.isOpenWorkManage && /*#__PURE__*/_react["default"].createElement(_tabs.TabPane, {
     key: "work",
-    tab: (0, _getLocale.getLocale)("OKR_MyO_E_Butt_AssProjects")
+    tab: (0, _getLocale.getLocale)('OKR_MyO_E_Butt_AssProjects')
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(_helper.preCls, "__content")
   }, /*#__PURE__*/_react["default"].createElement(_workTree["default"], null))), _helper.isOpenLabel && !isRelationOther && /*#__PURE__*/_react["default"].createElement(_tabs.TabPane, {
     key: "category",
-    tab: (0, _getLocale.getLocale)("Tasks_Menu_AffiliateCa")
+    tab: (0, _getLocale.getLocale)('Tasks_Menu_AffiliateCa')
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(_helper.preCls, "__content")
   }, /*#__PURE__*/_react["default"].createElement(_categoryTree["default"], null)))), selected.length > 0 && multiple && /*#__PURE__*/_react["default"].createElement("div", {

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

@@ -0,0 +1,77 @@
+.relation-single-okr__pop {
+  width: 280px;
+  height: 246px;
+  background: #FFFFFF;
+  box-shadow: 0px 4px 16px 0px rgba(127, 145, 180, 0.2);
+  border: 1px solid #F0F2F5;
+  border-radius: 24px;
+  padding: 20px 4px 16px 16px;
+  box-sizing: border-box;
+  overflow: auto;
+}
+
+.relation-single-okr__pop-O {
+  display: flex;
+  align-items: flex-start;
+  border-radius: 8px;
+  padding: 5px 4px 5px 4px;
+}
+
+.relation-single-okr__pop-O-img {
+  line-height: 22px !important;
+  color: #3F4755;
+  font-size: 14px;
+  position: relative;
+  top: 1px;
+}
+
+.relation-single-okr__pop-O-title {
+  margin-left: 4px;
+  width: 224px;
+  font-size: 14px;
+  color: #3F4755;
+  line-height: 22px;
+  cursor: pointer;
+}
+
+.relation-single-okr__pop-O--selected {
+  color: #2879FF;
+}
+
+.relation-single-okr__pop-O:hover {
+  background: #F0F4FA;
+}
+
+.relation-single-okr__pop-krs-kr {
+  display: flex;
+  align-items: flex-start;
+  padding-left: 18px;
+  padding: 5px 4px 5px 22px;
+  border-radius: 8px;
+}
+
+.relation-single-okr__pop-krs-kr__sort {
+  font-size: 12px;
+  font-weight: 400;
+  color: #89919F;
+  line-height: 18px;
+}
+
+.relation-single-okr__pop-krs-kr__title {
+  flex: 1;
+  margin-left: 6px;
+  flex-wrap: wrap;
+  font-size: 12px;
+  font-weight: 400;
+  color: #3F4755;
+  line-height: 18px;
+  cursor: pointer;
+}
+
+.relation-single-okr__pop-krs-kr__title--selected {
+  color: #2879FF;
+}
+
+.relation-single-okr__pop-krs-kr:hover {
+  background: #F0F4FA;
+}

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

@@ -0,0 +1,183 @@
+"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
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _popup = _interopRequireDefault(require("../../../components/popup"));
+
+var _requestApi = require("../request-api");
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
+require("./index.css");
+
+var _excluded = ["defaultVisible", "lastSelected", "onOk", "onCancel"];
+
+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 _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 _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; }
+
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
+var preCls = 'relation-single-okr';
+
+function RelationSingleOkr(props) {
+  var _props$defaultVisible = props.defaultVisible,
+      defaultVisible = _props$defaultVisible === void 0 ? false : _props$defaultVisible,
+      _props$lastSelected = props.lastSelected,
+      lastSelected = _props$lastSelected === void 0 ? [] : _props$lastSelected,
+      onOk = props.onOk,
+      onCancel = props.onCancel,
+      restProps = _objectWithoutProperties(props, _excluded);
+
+  var _useState = (0, _react.useState)(defaultVisible),
+      _useState2 = _slicedToArray(_useState, 2),
+      popupVisible = _useState2[0],
+      setPopupVisible = _useState2[1];
+
+  var _useState3 = (0, _react.useState)(function () {
+    var labelId = lastSelected[0].labelId;
+    return labelId || 0;
+  }),
+      _useState4 = _slicedToArray(_useState3, 2),
+      selectedId = _useState4[0],
+      setSelectedId = _useState4[1];
+
+  var _useState5 = (0, _react.useState)([]),
+      _useState6 = _slicedToArray(_useState5, 2),
+      krs = _useState6[0],
+      setKrs = _useState6[1];
+
+  (0, _react.useEffect)(function () {
+    setPopupVisible(defaultVisible);
+  }, [defaultVisible]);
+  (0, _react.useEffect)(function () {
+    if (!(lastSelected !== null && lastSelected !== void 0 && lastSelected.length)) return;
+    var workId = lastSelected[0].workId;
+    (0, _requestApi.getKrIds)(workId).then(function (res) {
+      if (res) {
+        setKrs(res);
+      }
+    });
+  }, [lastSelected]);
+
+  var handlePopupVisibleChange = function handlePopupVisibleChange(visible) {
+    setPopupVisible(visible);
+
+    if (!visible) {
+      onCancel && onCancel();
+    }
+  };
+
+  var selectOKr = function selectOKr(id, name) {
+    var _lastSelected$ = lastSelected[0],
+        workId = _lastSelected$.workId,
+        workName = _lastSelected$.workName;
+    var selected = {};
+
+    if (id == workId) {
+      selected = {
+        id: id,
+        krId: 0,
+        name: workName,
+        labelId: workId,
+        type: 'okr',
+        workId: workId,
+        workName: workName
+      };
+    } else {
+      selected = {
+        id: id,
+        krId: id,
+        name: name,
+        type: 'kr',
+        labelId: id,
+        workId: workId,
+        workName: workName
+      };
+    }
+
+    setSelectedId(id);
+
+    if (onOk) {
+      onOk([selected]);
+    }
+
+    setPopupVisible(false);
+  };
+
+  var popContent = function popContent() {
+    var _lastSelected$2 = lastSelected[0],
+        workId = _lastSelected$2.workId,
+        workName = _lastSelected$2.workName;
+    return /*#__PURE__*/_react["default"].createElement("div", {
+      className: "".concat(preCls, "__pop")
+    }, /*#__PURE__*/_react["default"].createElement("div", {
+      className: (0, _classnames["default"])("".concat(preCls, "__pop-O")),
+      onClick: function onClick() {
+        return selectOKr(workId, workName);
+      }
+    }, /*#__PURE__*/_react["default"].createElement("div", {
+      className: "".concat(preCls, "__pop-O-img tu-icon-O")
+    }), /*#__PURE__*/_react["default"].createElement("div", {
+      className: (0, _classnames["default"])("".concat(preCls, "__pop-O-title"), _defineProperty({}, "".concat(preCls, "__pop-O--selected"), selectedId == workId))
+    }, workName)), /*#__PURE__*/_react["default"].createElement("div", {
+      className: "".concat(preCls, "__pop-krs")
+    }, krs.map(function (item) {
+      var SortNum = item.SortNum,
+          mileStoneName = item.mileStoneName,
+          mileStoneId = item.mileStoneId;
+      return /*#__PURE__*/_react["default"].createElement("div", {
+        className: "".concat(preCls, "__pop-krs-kr"),
+        key: mileStoneId
+      }, /*#__PURE__*/_react["default"].createElement("div", {
+        className: "".concat(preCls, "__pop-krs-kr__sort")
+      }, "KR", SortNum + 1), /*#__PURE__*/_react["default"].createElement("div", {
+        className: (0, _classnames["default"])("".concat(preCls, "__pop-krs-kr__title"), _defineProperty({}, "".concat(preCls, "__pop-krs-kr__title--selected"), selectedId == mileStoneId)),
+        onClick: function onClick() {
+          return selectOKr(mileStoneId, mileStoneName);
+        }
+      }, mileStoneName));
+    })));
+  };
+
+  return /*#__PURE__*/_react["default"].createElement(_popup["default"], {
+    popup: popContent,
+    onPopupVisibleChange: handlePopupVisibleChange,
+    popupVisible: popupVisible,
+    popupPlacement: "bottomLeft",
+    destroyPopupOnHide: true,
+    extraClass: 'pull-screen-ignore tita-user-pop',
+    popupAlign: {
+      points: ['tr', 'br'],
+      offset: [161, 4]
+    }
+  }, /*#__PURE__*/_react["default"].createElement("div", null));
+}
+
+var _default = RelationSingleOkr;
+exports["default"] = _default;

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.workData = exports.updateLable = exports.relationWorks = exports.okrSearch = exports.getWorks = exports.getUserById = exports.getCategory = void 0;
+exports.workData = exports.updateLable = exports.relationWorks = exports.okrSearch = exports.getWorks = exports.getUserById = exports.getKrIds = exports.getCategory = void 0;
 
 var _request = require("../../utils/request");
 
@@ -83,6 +83,14 @@ var getUserById = function getUserById(userId) {
 
 exports.getUserById = getUserById;
 
+var getKrIds = function getKrIds(workId) {
+  return (0, _request.rget)('v1')("kr/list?workId=".concat(workId)).then(function (res) {
+    return res.Data;
+  });
+};
+
+exports.getKrIds = getKrIds;
+
 var workData = function workData(params, pageNum, pageSize) {
   var _params$keyWords2 = params.keyWords,
       keyWords = _params$keyWords2 === void 0 ? '' : _params$keyWords2,

package/package.json

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