@titaui/pc 1.11.4 → 1.11.5-beta.3

package/lib/pages/new-okr-list/header/index.css

@@ -36,6 +36,51 @@
   color: #2879ff;
 }
 
+.tita-okr-list-v2__header-record {
+  display: flex;
+  box-sizing: border-box;
+  justify-content: center;
+  align-items: center;
+  transform: rotate(90deg);
+  background: #fff;
+  box-shadow: 0px 0px 8px 0px rgba(127, 145, 180, 0.1);
+  width: 36px;
+  height: 36px;
+  margin-left: 12px;
+  border-radius: 18px;
+  font-size: 20px;
+  cursor: pointer;
+}
+
+.tita-okr-list-v2__header-record-popup {
+  padding: 16px 12px;
+  box-sizing: border-box;
+  background: #ffffff;
+  box-shadow: 0px 4px 12px 0px rgba(127, 145, 180, 0.2);
+  border-radius: 12px;
+}
+
+.tita-okr-list-v2__header-record-item {
+  display: flex;
+  align-items: center;
+  padding: 5px 8px;
+  box-sizing: border-box;
+  font-size: 14px;
+  color: #3f4755;
+  line-height: 22px;
+  cursor: pointer;
+}
+
+.tita-okr-list-v2__header-record-item:hover {
+  color: #2879ff;
+  background: #f7f8fa;
+  border-radius: 8px;
+}
+
+.tita-okr-list-v2__header-record-item-content {
+  margin-left: 8px;
+}
+
 .tita-okr-list-v2__header-filter {
   box-sizing: border-box;
   height: 36px;

package/lib/pages/new-okr-list/header/index.js

@@ -29,6 +29,8 @@ var _filter = _interopRequireDefault(require("./filter"));
 
 var _comments = _interopRequireDefault(require("./comments"));
 
+var _operateRecord = _interopRequireDefault(require("./operate-record"));
+
 var _context = require("../context");
 
 var _requestApi = require("../request-api");
@@ -65,6 +67,7 @@ function Header(props, ref) {
       cycleType = _useContext.cycleType,
       yqmNum = _useContext.yqmNum;
 
+  var relationShip = parseInt(relation, 10);
   var onSearch = props.onSearch,
       onFrontAddOKR = props.onFrontAddOKR;
 
@@ -84,21 +87,26 @@ function Header(props, ref) {
       setUserInfo = _useState6[1];
 
   (0, _react.useEffect)(function () {
-    if (toUserId !== undefined || relation == 1) {
+    if (toUserId !== undefined || relationShip === 1) {
       var userId = toUserId;
-      if (relation == 1) userId = (0, _bsGlobal.getUserInfo)().Id;
-      userId && (0, _requestApi.getUserInfoById)(userId).then(function (res) {
-        setUserInfo(res.Data);
-      });
+      if (relationShip === 1) userId = (0, _bsGlobal.getUserInfo)().Id;
+
+      if (userId) {
+        (0, _requestApi.getUserInfoById)(userId).then(function (res) {
+          setUserInfo(res.Data);
+        });
+      }
     }
   }, [toUserId, relation]);
   (0, _react.useEffect)(function () {
     setInit(true);
   }, []);
   (0, _react.useEffect)(function () {
-    init && onSearch({
-      onlyThisDept: onlyThisDept
-    });
+    if (init) {
+      onSearch({
+        onlyThisDept: onlyThisDept
+      });
+    }
   }, [onlyThisDept]);
   var createOkrRef = (0, _react.useRef)();
   (0, _react.useImperativeHandle)(ref, function () {
@@ -125,7 +133,7 @@ function Header(props, ref) {
     };
     var searchType = "company";
 
-    if (departmentId && departmentId != -1) {
+    if (departmentId && departmentId !== -1) {
       rootNode.rootId = departmentId;
       rootNode.rootName = departmentName || "";
       searchType = "depart";
@@ -141,7 +149,7 @@ function Header(props, ref) {
       level2Selected.name = userInfo.name || "";
     }
 
-    if (relation == 1) {
+    if (parseInt(relation, 10) === 1) {
       rootNode.rootId = (0, _bsGlobal.getUserInfo)().Id;
       rootNode.rootName = (0, _bsGlobal.getUserInfo)().Name || "";
       searchType = "user";
@@ -154,18 +162,18 @@ function Header(props, ref) {
       annualNum: annualNum,
       yqmNum: yqmNum
     })), "rootNode=".concat(JSON.stringify(rootNode)), "level2Selected=".concat(JSON.stringify(level2Selected))].join("&");
-    var origin = window.location.href.split('#')[0];
+    var origin = window.location.href.split("#")[0];
     window.location.href = "".concat(origin, "/#okr/map?").concat(urlQuery);
   };
 
   var getTitle = function getTitle() {
-    if (relation == 1) {
+    if (relationShip === 1) {
       return /*#__PURE__*/_react["default"].createElement(_userTitle["default"], {
         toUserId: (0, _bsGlobal.getUserInfo)().Id
       });
     }
 
-    if (relation == 2 || relation == 3) {
+    if (relationShip === 2 || relationShip === 3) {
       return /*#__PURE__*/_react["default"].createElement(_relationTitle["default"], {
         relation: relation
       });
@@ -197,11 +205,11 @@ function Header(props, ref) {
     className: "".concat(_precls.precls, "__header-item")
   }, getTitle())), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(_precls.precls, "__header-right")
-  }, departmentId == 0 && /*#__PURE__*/_react["default"].createElement("div", {
+  }, departmentId === 0 && /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(_precls.precls, "__header-item")
   }, /*#__PURE__*/_react["default"].createElement(_keywordSearch["default"], {
     onSearch: onSearch
-  })), relation != 2 && relation != 3 &&
+  })), relationShip !== 2 && relationShip !== 3 &&
   /*#__PURE__*/
   // 我关注的 我参与的 没有创建按钮
   _react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
@@ -221,10 +229,14 @@ function Header(props, ref) {
     className: "tu-icon-yangshi-ditu"
   }))))), /*#__PURE__*/_react["default"].createElement(_comments["default"], {
     toUserId: toUserId,
-    relation: relation,
+    relation: relationShip,
     userInfo: userInfo
   }), /*#__PURE__*/_react["default"].createElement(_filter["default"], {
     onSearch: onSearch
+  }), /*#__PURE__*/_react["default"].createElement(_operateRecord["default"], {
+    toUserId: toUserId,
+    userInfo: userInfo,
+    relation: relationShip
   })));
 }
 

package/lib/pages/new-okr-list/header/operate-record.js

@@ -0,0 +1,88 @@
+"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 _getLocale = require("../../../utils/getLocale");
+
+var _precls = require("../precls");
+
+var _context = require("../context");
+
+var _common = require("./common");
+
+require("./index.css");
+
+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; }
+
+var OperateRecord = function OperateRecord(props) {
+  var popupRef = (0, _react.useRef)();
+  var drawerRef = (0, _react.useRef)();
+  var userInfo = props.userInfo,
+      toUserId = props.toUserId,
+      relation = props.relation;
+
+  var _useContext = (0, _react.useContext)(_context.Context),
+      OkrOperateRecordDrawer = _useContext.OkrOperateRecordDrawer,
+      annualNum = _useContext.annualNum,
+      cycleType = _useContext.cycleType,
+      yqmNum = _useContext.yqmNum;
+
+  var openOperateRecordPush = function openOperateRecordPush() {
+    popupRef.current && popupRef.current.close();
+    drawerRef.current && drawerRef.current.showOperateDrawerVisible();
+  };
+
+  var popup = /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(_precls.precls, "__header-record-popup")
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(_precls.precls, "__header-record-item"),
+    onClick: openOperateRecordPush
+  }, /*#__PURE__*/_react["default"].createElement("i", {
+    className: "tu-icon-jinzhan-s"
+  }), /*#__PURE__*/_react["default"].createElement("span", {
+    className: "".concat(_precls.precls, "__header-record-item-content")
+  }, (0, _getLocale.getLocale)('Per_details_OperationRecord'))));
+
+  if (!toUserId && relation !== 1) return null;
+  return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_popup["default"], {
+    ref: popupRef,
+    popup: popup,
+    popupAlign: {
+      offset: [0, 4]
+    }
+  }, /*#__PURE__*/_react["default"].createElement("span", {
+    className: "".concat(_precls.precls, "__header-record")
+  }, /*#__PURE__*/_react["default"].createElement("i", {
+    className: "tu-icon-more1"
+  }))), (toUserId !== undefined || relation === 1) && !!userInfo && /*#__PURE__*/_react["default"].createElement(OkrOperateRecordDrawer, {
+    ref: drawerRef,
+    userInfo: {
+      Id: userInfo.userId,
+      Name: userInfo.name,
+      Color: userInfo.avatar.color,
+      AvatarsUrl: userInfo.avatar.original,
+      Type: 1
+    },
+    okrCycle: "\u300C".concat((0, _common.formatPeriod)({
+      annualNum: annualNum,
+      cycleType: cycleType,
+      yqmNum: yqmNum
+    }), "\u300D")
+  }));
+};
+
+var _default = OperateRecord;
+exports["default"] = _default;

package/lib/pages/new-okr-list/index.js

@@ -85,7 +85,8 @@ var NewOkrList = function NewOkrList(props) {
   var OkrListCmp = props.OkrListCmp,
       OkrCommunicationPush = props.OkrCommunicationPush,
       Empty = props.Empty,
-      SetCycleModal = props.SetCycleModal;
+      SetCycleModal = props.SetCycleModal,
+      OkrOperateRecordDrawer = props.OkrOperateRecordDrawer;
   var useLocalStorage = new _localStorage.LocalStorage();
   var formFieldValues = useLocalStorage.getItem("okr-filter-values") || {
     targetType: "",
@@ -316,6 +317,7 @@ var NewOkrList = function NewOkrList(props) {
   return /*#__PURE__*/_react["default"].createElement(_context.Context.Provider, {
     value: _objectSpread({
       OkrCommunicationPush: OkrCommunicationPush,
+      OkrOperateRecordDrawer: OkrOperateRecordDrawer,
       relation: relation,
       departmentName: departmentName,
       departmentId: departmentId,

package/lib/pages/okr-map/export-modules/okr-map/header/index.css

@@ -93,7 +93,7 @@
 }
 
 .titapage-okr-map__header-action-showkr .titaui-switch {
-  width: 136px;
+  width: 158px;
   position: relative;
 }
 

package/lib/pages/okr-map/export-modules/okr-map/header/index.js

@@ -57,6 +57,7 @@ var preCls = "titapage-okr-map";
 
 function _default(props) {
   var onShowKrClick = props.onShowKrClick,
+      onShowCardKr = props.onShowCardKr,
       onSearchChange = props.onSearchChange,
       onBtnClick = props.onBtnClick,
       onPeriodChange = props.onPeriodChange,
@@ -68,6 +69,7 @@ function _default(props) {
       darkTheme = props.darkTheme,
       period = props.period,
       showkr = props.showkr,
+      showCardKr = props.showCardKr,
       openLevel = props.openLevel;
 
   var _useState = (0, _react.useState)(false),
@@ -75,6 +77,11 @@ function _default(props) {
       visible = _useState2[0],
       setVisible = _useState2[1];
 
+  var _useState3 = (0, _react.useState)(false),
+      _useState4 = _slicedToArray(_useState3, 2),
+      ovisible = _useState4[0],
+      setOVisible = _useState4[1];
+
   var iconButtons = [{
     icon: "export",
     overlay: (0, _getLocale.getLocale)("Mod_Export")
@@ -94,6 +101,14 @@ function _default(props) {
     className: (0, _classnames["default"])("".concat(preCls, "__show-more-popup"))
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__header-action-showkr"))
+  }, /*#__PURE__*/_react["default"].createElement(_switch["default"], {
+    label: '目标展示 KR 详情',
+    checked: showCardKr,
+    onChange: function onChange() {
+      return setOVisible(true);
+    }
+  })), /*#__PURE__*/_react["default"].createElement("div", {
+    className: (0, _classnames["default"])("".concat(preCls, "__header-action-showkr"))
   }, /*#__PURE__*/_react["default"].createElement(_switch["default"], {
     label: (0, _getLocale.getLocale)("OKR_Ali_Butt_ExhibitionKRs"),
     checked: showkr,
@@ -117,10 +132,15 @@ function _default(props) {
     setVisible(false);
   };
 
-  var _useState3 = (0, _react.useState)(false),
-      _useState4 = _slicedToArray(_useState3, 2),
-      fold = _useState4[0],
-      setFold = _useState4[1];
+  var onhandleShowCardKr = function onhandleShowCardKr(checked) {
+    onShowCardKr(checked);
+    setOVisible(false);
+  };
+
+  var _useState5 = (0, _react.useState)(false),
+      _useState6 = _slicedToArray(_useState5, 2),
+      fold = _useState6[0],
+      setFold = _useState6[1];
 
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__header"), _defineProperty({}, "".concat(preCls, "__header__folded"), fold))
@@ -178,5 +198,10 @@ function _default(props) {
     setVisible: setVisible,
     onConfirmHandler: onConfirmHandler,
     showkr: showkr
+  }), /*#__PURE__*/_react["default"].createElement(_showKrConfirm["default"], {
+    visible: ovisible,
+    setVisible: setOVisible,
+    onConfirmHandler: onhandleShowCardKr,
+    showkr: showCardKr
   }));
 }

package/lib/pages/okr-map/export-modules/okr-map/okr-map.js

@@ -27,7 +27,7 @@ var _level2Search = _interopRequireDefault(require("../../level2-search"));
 
 var _requestApis = require("../../request-apis");
 
-var _useStorage13 = _interopRequireDefault(require("../../hooks/useStorage"));
+var _useStorage15 = _interopRequireDefault(require("../../hooks/useStorage"));
 
 var _drawerManager = _interopRequireDefault(require("../../../../components/drawer-manager"));
 
@@ -75,7 +75,7 @@ function _default(props) {
   _objectDestructuringEmpty(props); // 使用存储的State
 
 
-  var _useStorage = (0, _useStorage13["default"])("period", {
+  var _useStorage = (0, _useStorage15["default"])("period", {
     annualNum: "".concat(new Date().getFullYear()),
     cycleType: "2",
     yqmNum: "".concat((0, _dayjs["default"])().quarter())
@@ -84,30 +84,35 @@ function _default(props) {
       period = _useStorage2[0],
       setPeriod = _useStorage2[1];
 
-  var _useStorage3 = (0, _useStorage13["default"])("showkr", false),
+  var _useStorage3 = (0, _useStorage15["default"])("showkr", false),
       _useStorage4 = _slicedToArray(_useStorage3, 2),
       showkr = _useStorage4[0],
       setShowKr = _useStorage4[1];
 
-  var _useStorage5 = (0, _useStorage13["default"])("searchType", "company"),
+  var _useStorage5 = (0, _useStorage15["default"])("showCardKr", false),
       _useStorage6 = _slicedToArray(_useStorage5, 2),
-      searchType = _useStorage6[0],
-      setSearchType = _useStorage6[1];
+      showCardKr = _useStorage6[0],
+      setShowCardKr = _useStorage6[1];
 
-  var _useStorage7 = (0, _useStorage13["default"])("level2Selected", {}),
+  var _useStorage7 = (0, _useStorage15["default"])("searchType", "company"),
       _useStorage8 = _slicedToArray(_useStorage7, 2),
-      level2Selected = _useStorage8[0],
-      setLevel2Selected = _useStorage8[1];
+      searchType = _useStorage8[0],
+      setSearchType = _useStorage8[1];
 
-  var _useStorage9 = (0, _useStorage13["default"])("rootNode", {
+  var _useStorage9 = (0, _useStorage15["default"])("level2Selected", {}),
+      _useStorage10 = _slicedToArray(_useStorage9, 2),
+      level2Selected = _useStorage10[0],
+      setLevel2Selected = _useStorage10[1];
+
+  var _useStorage11 = (0, _useStorage15["default"])("rootNode", {
     rootId: 0,
     rootName: ""
   }, {
     noLocal: true
   }),
-      _useStorage10 = _slicedToArray(_useStorage9, 2),
-      rootNode = _useStorage10[0],
-      setRootNode = _useStorage10[1];
+      _useStorage12 = _slicedToArray(_useStorage11, 2),
+      rootNode = _useStorage12[0],
+      setRootNode = _useStorage12[1];
 
   var _useState = (0, _react.useState)(true),
       _useState2 = _slicedToArray(_useState, 2),
@@ -152,10 +157,10 @@ function _default(props) {
       showMask = _useState16[0],
       setShowMask = _useState16[1];
 
-  var _useStorage11 = (0, _useStorage13["default"])("openLevel", 2),
-      _useStorage12 = _slicedToArray(_useStorage11, 2),
-      openLevel = _useStorage12[0],
-      setOpenLevel = _useStorage12[1];
+  var _useStorage13 = (0, _useStorage15["default"])("openLevel", 2),
+      _useStorage14 = _slicedToArray(_useStorage13, 2),
+      openLevel = _useStorage14[0],
+      setOpenLevel = _useStorage14[1];
 
   var _useState17 = (0, _react.useState)(false),
       _useState18 = _slicedToArray(_useState17, 2),
@@ -430,6 +435,9 @@ function _default(props) {
       onShowKrClick: function onShowKrClick(val) {
         return setShowKr(val);
       },
+      onShowCardKr: function onShowCardKr(val) {
+        return setShowCardKr(val);
+      },
       onSearchChange: onSearchChangeHandler,
       onPeriodChange: function onPeriodChange(period) {
         return setPeriod(period);
@@ -446,6 +454,7 @@ function _default(props) {
       darkTheme: darkTheme,
       direction: direction,
       showkr: showkr,
+      showCardKr: showCardKr,
       period: period
     }), /*#__PURE__*/_react["default"].createElement("div", {
       className: (0, _classnames["default"])("".concat(_precls["default"], "__content"))
@@ -469,6 +478,7 @@ function _default(props) {
         return /*#__PURE__*/_react["default"].createElement(OkrSearchPanel, _extends({
           ref: okrMapRef,
           showkr: showkr,
+          showCardKr: showCardKr,
           direction: direction,
           darkTheme: darkTheme,
           openLevel: openLevel,

package/lib/pages/okr-map/number-select/index.css

@@ -2,7 +2,6 @@
   font-size: 14px;
   font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
   color: #3F4755;
-  width: 136px;
   position: relative;
 }
 

package/lib/utils/format-time.js

@@ -167,5 +167,12 @@ var showNextMonthFirstDay = function showNextMonthFirstDay() {
 };
 
 exports.showNextMonthFirstDay = showNextMonthFirstDay;
-var _default = getTimeString;
+var _default = {
+  getTimeString: getTimeString,
+  timeFormat: timeFormat,
+  showWeekFirstDay: showWeekFirstDay,
+  showMonthFirstDay: showMonthFirstDay,
+  showNextWeekFirstDay: showNextWeekFirstDay,
+  showNextMonthFirstDay: showNextMonthFirstDay
+};
 exports["default"] = _default;

package/lib/utils/open-data.js

@@ -336,6 +336,10 @@ exports.parseHtmlAndTextTag = parseHtmlAndTextTag;
 var _default = {
   OpenUserName: OpenUserName,
   OpenDepartmentName: OpenDepartmentName,
-  isWechat: isWechat
+  isWechat: isWechat,
+  isPlatform: isPlatform,
+  parseString: parseString,
+  parseTag: parseTag,
+  parseHtmlAndTextTag: parseHtmlAndTextTag
 };
 exports["default"] = _default;

package/package.json

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