@titaui/pc 1.16.6 → 1.16.7-beta.1

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

@@ -5,7 +5,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = exports.ViewType = void 0;
+exports["default"] = exports.ViewType = exports.MoreMenuType = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
@@ -15,6 +15,8 @@ var _bsGlobal = require("../../../utils/bs-global");
 
 var _precls = require("../precls");
 
+var _moment = _interopRequireDefault(require("moment"));
+
 var _keywordSearch = _interopRequireDefault(require("../keyword-search"));
 
 var _createOkr = _interopRequireDefault(require("./create-okr"));
@@ -31,6 +33,8 @@ var _comments = _interopRequireDefault(require("./comments"));
 
 var _operateRecord = _interopRequireDefault(require("./operate-record"));
 
+var _localStorage = require("../../../utils/local-storage");
+
 var _context = require("../context");
 
 var _requestApi = require("../request-api");
@@ -43,12 +47,20 @@ var _guideTip = _interopRequireDefault(require("../../../components/guide-tip"))
 
 require("./index.css");
 
+var _reactRouter = require("react-router");
+
 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 _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."); }
@@ -70,6 +82,14 @@ exports.ViewType = ViewType;
   ViewType["Map"] = "map";
 })(ViewType || (exports.ViewType = ViewType = {}));
 
+var MoreMenuType;
+exports.MoreMenuType = MoreMenuType;
+
+(function (MoreMenuType) {
+  MoreMenuType["Adds"] = "adds";
+  MoreMenuType["Record"] = "record";
+})(MoreMenuType || (exports.MoreMenuType = MoreMenuType = {}));
+
 var viewConfig = function viewConfig() {
   return {
     table: {
@@ -151,6 +171,7 @@ function Header(props, ref) {
       cycleType = _useContext.cycleType,
       yqmNum = _useContext.yqmNum;
 
+  var history = (0, _reactRouter.useHistory)();
   var relationShip = parseInt(relation, 10);
   var onSearch = props.onSearch,
       onFrontAddOKR = props.onFrontAddOKR,
@@ -173,20 +194,38 @@ function Header(props, ref) {
       viewTypeMenuData = _useState6[0],
       setViewTypeMenuData = _useState6[1];
 
-  var _useState7 = (0, _react.useState)(false),
+  var _useState7 = (0, _react.useState)(),
       _useState8 = _slicedToArray(_useState7, 2),
-      init = _useState8[0],
-      setInit = _useState8[1];
-
-  var _useState9 = (0, _react.useState)(getTableTip()),
+      moreMenuSelectValue = _useState8[0],
+      setMoreMenuSelectValue = _useState8[1];
+
+  var moreMenuData = (0, _react.useMemo)(function () {
+    return [{
+      label: (0, _getLocale.getLocale)('OKR_ComAll_Batchcreation'),
+      icon: 'APPgengduo',
+      value: MoreMenuType.Adds
+    }, {
+      label: (0, _getLocale.getLocale)('Per_details_OperationRecord'),
+      icon: 'jinzhan-s',
+      value: MoreMenuType.Record,
+      visible: Number(cycleType) !== -1 && ![2, 3].includes(Number(relation)) && departmentId === undefined
+    }];
+  }, [cycleType, relation, departmentId]);
+
+  var _useState9 = (0, _react.useState)(false),
       _useState10 = _slicedToArray(_useState9, 2),
-      showTableTip = _useState10[0],
-      setShowTableTip = _useState10[1];
+      init = _useState10[0],
+      setInit = _useState10[1];
 
-  var _useState11 = (0, _react.useState)(),
+  var _useState11 = (0, _react.useState)(getTableTip()),
       _useState12 = _slicedToArray(_useState11, 2),
-      userInfo = _useState12[0],
-      setUserInfo = _useState12[1];
+      showTableTip = _useState12[0],
+      setShowTableTip = _useState12[1];
+
+  var _useState13 = (0, _react.useState)(),
+      _useState14 = _slicedToArray(_useState13, 2),
+      userInfo = _useState14[0],
+      setUserInfo = _useState14[1];
 
   (0, _react.useEffect)(function () {
     setViewTypeMenuData(getViewTypeMenuData(relationShip));
@@ -319,6 +358,43 @@ function Header(props, ref) {
   var onHideTableTip = (0, _react.useCallback)(function () {
     setTableTip();
     setShowTableTip(false);
+  }, []); // 设置默认季度
+
+  var useLocalStorage = new _localStorage.LocalStorage();
+  var cacheFilterParams = useLocalStorage.getItem('okr-filter-cycle');
+
+  var _useState15 = (0, _react.useState)(cacheFilterParams || {
+    annualNum: "".concat(new Date().getFullYear()),
+    cycleType: '2',
+    yqmNum: "".concat((0, _moment["default"])().quarter())
+  }),
+      _useState16 = _slicedToArray(_useState15, 2),
+      searchParams = _useState16[0],
+      setSearchParams = _useState16[1];
+
+  var onChangeMoreMenuHandler = (0, _react.useCallback)(function (value) {
+    if (value === MoreMenuType.Adds) {
+      var _searchParams$annualN = searchParams.annualNum,
+          _annualNum = _searchParams$annualN === void 0 ? new Date().getFullYear() : _searchParams$annualN,
+          _searchParams$cycleTy = searchParams.cycleType,
+          _cycleType = _searchParams$cycleTy === void 0 ? '2' : _searchParams$cycleTy,
+          _searchParams$yqmNum = searchParams.yqmNum,
+          _yqmNum = _searchParams$yqmNum === void 0 ? (0, _moment["default"])().quarter() : _searchParams$yqmNum;
+
+      history.push("/excel-okr-create?annualNum=".concat(_annualNum, "&cycleType=").concat(_cycleType, "&yqmNum=").concat(_yqmNum));
+      return;
+    }
+
+    setMoreMenuSelectValue(value);
+  }, [searchParams]);
+
+  var _onSearch = (0, _react.useCallback)(function (params) {
+    if (params.annualNum !== undefined) setSearchParams(_objectSpread({}, params));
+    if (onSearch) onSearch(params);
+  }, [onSearch, setSearchParams]);
+
+  var onOperateRecordCloseHandler = (0, _react.useCallback)(function () {
+    setMoreMenuSelectValue(undefined);
   }, []);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(_precls.precls, "__header")
@@ -370,10 +446,24 @@ function Header(props, ref) {
     relation: relationShip,
     userInfo: userInfo
   }), /*#__PURE__*/_react["default"].createElement(_filter["default"], {
-    onSearch: onSearch
-  }), Number(cycleType) !== -1 && Number(relation) !== 2 && Number(relation) !== 3 && departmentId === undefined && /*#__PURE__*/_react["default"].createElement(_operateRecord["default"], {
+    onSearch: _onSearch
+  }), relationShip === 1 && /*#__PURE__*/_react["default"].createElement(_popupSelect["default"], {
+    menuData: moreMenuData,
+    popupPlacement: "bottomRight",
+    action: "click",
+    onChange: onChangeMoreMenuHandler
+  }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+    overlay: (0, _getLocale.getLocale)("Feed_Set_Pop_Butt_More"),
+    placement: "top"
+  }, /*#__PURE__*/_react["default"].createElement("span", {
+    className: "".concat(_precls.precls, "__header-record")
+  }, /*#__PURE__*/_react["default"].createElement("i", {
+    className: "tu-icon-more1"
+  })))), userInfo && /*#__PURE__*/_react["default"].createElement(_operateRecord["default"], {
     toUserId: toUserId,
     userInfo: userInfo,
+    onClose: onOperateRecordCloseHandler,
+    activation: moreMenuSelectValue === MoreMenuType.Record,
     relation: relationShip,
     okrFeedParams: {
       objId: departmentId === undefined ? Number(toUserId || (0, _bsGlobal.getUserInfo)().Id) : Number(departmentId),

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

@@ -9,14 +9,6 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _popup = _interopRequireDefault(require("../../../components/popup"));
-
-var _getLocale = require("../../../utils/getLocale");
-
-var _tooltip = _interopRequireDefault(require("../../../components/tooltip"));
-
-var _precls = require("../precls");
-
 var _context = require("../context");
 
 var _common = require("./common");
@@ -27,8 +19,6 @@ var _tools = require("../../../utils/tools");
 
 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; }
@@ -51,12 +41,13 @@ var OperateRecord = function OperateRecord(props) {
       showOperateRecord = _useState2[0],
       setShowOperateRecord = _useState2[1];
 
-  var popupRef = (0, _react.useRef)();
   var drawerRef = (0, _react.useRef)();
   var userInfo = props.userInfo,
       toUserId = props.toUserId,
       relation = props.relation,
-      okrFeedParams = props.okrFeedParams;
+      okrFeedParams = props.okrFeedParams,
+      activation = props.activation,
+      onClose = props.onClose;
 
   var _useContext = (0, _react.useContext)(_context.Context),
       OkrOperateRecordDrawer = _useContext.OkrOperateRecordDrawer,
@@ -64,29 +55,10 @@ var OperateRecord = function OperateRecord(props) {
       cycleType = _useContext.cycleType,
       yqmNum = _useContext.yqmNum;
 
-  var openOperateRecordPush = function openOperateRecordPush() {
-    if (popupRef.current) {
-      // @ts-ignore
-      popupRef.current.close();
-    }
-
-    if (drawerRef.current) {
-      // @ts-ignore
-      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"))));
-
+  (0, _react.useEffect)(function () {
+    // @ts-ignore
+    if (activation && drawerRef.current) drawerRef.current.showOperateDrawerVisible();
+  }, [activation]);
   (0, _react.useEffect)(function () {
     if (toUserId) {
       (0, _requestApi.getOperateRecordAuth)(toUserId).then(function (res) {
@@ -101,21 +73,9 @@ var OperateRecord = function OperateRecord(props) {
     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(_tooltip["default"], {
-    overlay: (0, _getLocale.getLocale)("Feed_Set_Pop_Butt_More"),
-    placement: "top"
-  }, /*#__PURE__*/_react["default"].createElement("span", {
-    className: "".concat(_precls.precls, "__header-record")
-  }, /*#__PURE__*/_react["default"].createElement("i", {
-    className: "tu-icon-more1"
-  })))), (toUserId !== undefined || Number(relation) === 1 || Object.keys((0, _tools.getQueryString)()).length === 0) && !!userInfo && /*#__PURE__*/_react["default"].createElement(OkrOperateRecordDrawer, {
+  return /*#__PURE__*/_react["default"].createElement("div", null, (toUserId !== undefined || Number(relation) === 1 || Object.keys((0, _tools.getQueryString)()).length === 0) && !!userInfo && /*#__PURE__*/_react["default"].createElement(OkrOperateRecordDrawer, {
     ref: drawerRef,
+    onClose: onClose,
     userInfo: {
       id: userInfo.userId,
       name: userInfo.name,

package/lib/utils/array.js

@@ -0,0 +1,26 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.arr2Dic = arr2Dic;
+
+function arr2Dic() {
+  var arr = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var field = arguments.length > 1 ? arguments[1] : undefined;
+  var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+  var _options$alwaysArray = options.alwaysArray,
+      alwaysArray = _options$alwaysArray === void 0 ? false : _options$alwaysArray;
+  var dic = {};
+  arr.forEach(function (vo) {
+    if (dic[vo[field]]) {
+      if (!Array.isArray(dic[vo[field]])) dic[vo[field]] = [dic[vo[field]]];
+      dic[vo[field]].push(vo);
+      return;
+    }
+
+    dic[vo[field]] = alwaysArray ? [vo] : vo;
+  }); // @ts-ignore
+
+  return dic;
+}

package/package.json

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