@titaui/pc 1.15.3 → 1.15.4

package/lib/components/dynamic/dynamic-item/components/table-row-okr/index.js

@@ -57,7 +57,7 @@ var TableRowOKR = function TableRowOKR(_ref) {
     onClick: handleClickTitle
   }, /*#__PURE__*/_react["default"].createElement("i", {
     className: "tu-icon-H5-".concat(isO ? "O" : "KR", "-s ").concat(prefix, "__common-icon")
-  }), /*#__PURE__*/_react["default"].createElement("p", null, /*#__PURE__*/_react["default"].createElement("span", null, (0, _openData.parseString)(text)), isO && Number(data.CycleType) !== 0 && Number(data.AnnualNum) !== 0 && Number(data.YqmNum !== 0) && data.StartDate && data.EndDate && /*#__PURE__*/_react["default"].createElement("span", {
+  }), /*#__PURE__*/_react["default"].createElement("p", null, /*#__PURE__*/_react["default"].createElement("span", null, (0, _openData.parseString)(text)), isO && (Number(data.CycleType) !== 0 || Number(data.AnnualNum) !== 0 || Number(data.YqmNum !== 0) || data.StartDate && data.EndDate) && /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(prefix, "__common-time")
   }, (0, _utils.formatPeriod)({
     annualNum: data.AnnualNum,

package/lib/components/menus/components/menu-tree/tree-node/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.USER_NODE = exports.USER_CONCERN_NODE = exports.TONGJI_NODE = exports.SUB_MENU_ITEM_NOE = exports.SUBORDINATES_NODE = exports.SHARE_NODE = exports.PARENT_MENU_NODE = exports.NO_SUBORDINATES_NODE = exports.NO_FOLLOWER_NODE = exports.MENU_ITEM_NOE = exports.MENU_ASSESS_TEMPLATE = exports.MENU_ASSESS_MANAGE = exports.LOADING_NODE = exports.GROUP_NAME_NODE = exports.FOLLOWER_NODE = exports.DEPART_NODE = exports.COMPANY_NODE = exports.COMPANY_ALL_NODE = void 0;
+exports.USER_NODE = exports.USER_CONCERN_NODE = exports.TONGJI_NODE = exports.SUB_MENU_ITEM_NOE = exports.SUBORDINATES_NODE = exports.SHARE_NODE = exports.SAME_LEVEL_USER_NODE = exports.PARENT_MENU_NODE = exports.NO_SUBORDINATES_NODE = exports.NO_FOLLOWER_NODE = exports.MENU_ITEM_NOE = exports.MENU_ASSESS_TEMPLATE = exports.MENU_ASSESS_MANAGE = exports.LOADING_NODE = exports.GROUP_NAME_NODE = exports.FOLLOWER_NODE = exports.DEPART_NODE = exports.COMPANY_NODE = exports.COMPANY_ALL_NODE = void 0;
 exports["default"] = _default;
 
 var _react = _interopRequireDefault(require("react"));
@@ -30,6 +30,8 @@ var _depart = _interopRequireDefault(require("./depart"));
 
 var _user = _interopRequireDefault(require("./user"));
 
+var _sameLevelUser = _interopRequireDefault(require("./same-level-user"));
+
 var _companyAll = _interopRequireDefault(require("./company-all"));
 
 var _noFollower = _interopRequireDefault(require("./no-follower"));
@@ -82,6 +84,12 @@ function _default(node, level, _ref) {
         onExpand: onExpand
       }));
 
+    case SAME_LEVEL_USER_NODE:
+      return /*#__PURE__*/_react["default"].createElement(_sameLevelUser["default"], _extends({}, node, {
+        level: level,
+        onExpand: onExpand
+      }));
+
     case USER_CONCERN_NODE:
       return /*#__PURE__*/_react["default"].createElement(_userConcern["default"], _extends({}, node, {
         level: level,
@@ -182,4 +190,6 @@ exports.SUBORDINATES_NODE = SUBORDINATES_NODE;
 var SHARE_NODE = 'share';
 exports.SHARE_NODE = SHARE_NODE;
 var TONGJI_NODE = 'tongji';
-exports.TONGJI_NODE = TONGJI_NODE;
+exports.TONGJI_NODE = TONGJI_NODE;
+var SAME_LEVEL_USER_NODE = 'same-level-user';
+exports.SAME_LEVEL_USER_NODE = SAME_LEVEL_USER_NODE;

package/lib/components/menus/components/menu-tree/tree-node/same-level-user/index.css

@@ -0,0 +1,58 @@
+.titaui-menus-tree__user-node {
+  display: flex;
+  align-items: center;
+  height: 40px;
+  line-height: 40px;
+  border-radius: 12px;
+  cursor: pointer;
+  position: relative;
+}
+
+.titaui-menus-tree__user-node:hover .titaui-menus-tree__user-node-username {
+  color: #2879ff;
+}
+
+.titaui-menus-tree__user-node-avatar {
+  display: inline-block;
+  line-height: 24px;
+  width: 24px;
+  height: 24px;
+  font-size: 12px;
+  border-radius: 50%;
+  color: white;
+  margin-right: 8px;
+}
+
+.titaui-menus-tree__user-node-avatar-slice {
+  display: inline-block;
+  width: 18px;
+  text-indent: 6px;
+  overflow: hidden;
+}
+
+.titaui-menus-tree__user-node-username {
+  font-size: 14px;
+  font-weight: 400;
+  color: #3f4755;
+  line-height: 20px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.titaui-menus-tree__user-node-sub {
+  position: absolute;
+  width: 24px;
+  height: 24px;
+  color: #2879ff;
+  right: 0;
+  top: 8px;
+  cursor: pointer;
+  display: flex;
+  justify-items: center;
+  align-items: center;
+}
+
+.titaui-menus-tree__user-node-sub:hover {
+  color: #5C8EFF;
+}

package/lib/components/menus/components/menu-tree/tree-node/same-level-user/index.js

@@ -0,0 +1,74 @@
+"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"] = _default;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
+var _openData = require("../../../../../../utils/open-data");
+
+var _context = require("../../../../context");
+
+var _avatar = _interopRequireDefault(require("../avatar"));
+
+var _precls = _interopRequireDefault(require("../../precls"));
+
+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; }
+
+function _default(props) {
+  var user = props.data,
+      _props$level = props.level,
+      level = _props$level === void 0 ? 0 : _props$level,
+      _props$isFlip = props.isFlip,
+      isFlip = _props$isFlip === void 0 ? true : _props$isFlip,
+      onExpand = props.onExpand;
+  var hasSubordinates = user.hasSubordinates;
+
+  var _useContext = (0, _react.useContext)(_context.FlipContext),
+      flipGoNext = _useContext.flipGoNext;
+
+  var openSubordinate = function openSubordinate(e) {
+    e.stopPropagation();
+
+    if (isFlip) {
+      flipGoNext({
+        type: "subordinate",
+        options: {
+          toUserId: user.userId
+        }
+      });
+    } else {
+      onExpand(e);
+    }
+  };
+
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    title: "",
+    className: (0, _classnames["default"])("".concat(_precls["default"], "__user-node")),
+    style: {
+      paddingLeft: 12 + level * 10
+    }
+  }, /*#__PURE__*/_react["default"].createElement(_avatar["default"], {
+    user: user
+  }), /*#__PURE__*/_react["default"].createElement("span", {
+    style: {
+      width: "calc(100% - ".concat(12 + 13 + 16 + level * 10, "px)")
+    },
+    className: (0, _classnames["default"])("".concat(_precls["default"], "__user-node-username"), "noselect")
+  }, /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
+    name: user.name,
+    id: user.userId
+  })));
+}

package/lib/components/menus/export-modules/summary-menus/menus.js

@@ -87,15 +87,6 @@ var summaryMenus = /*#__PURE__*/function () {
       children: [],
       href: "#/summary/subordinates",
       isShow: window.BSGlobal.loginUserInfo.HasSub
-    }, {
-      icon: "caidan-enjoy",
-      label: _i18n.locale.menu_my_share,
-      key: this.SHARE,
-      type: this.SHARE,
-      isLeaf: false,
-      children: [],
-      href: "#/summary/share",
-      isShow: props.isShowShare
     }, {
       icon: "caidan-tongji",
       label: _i18n.locale.menu_summary_tongji,
@@ -105,6 +96,15 @@ var summaryMenus = /*#__PURE__*/function () {
       children: [],
       href: "#/summary/tongji",
       isShow: props.isShowTongji
+    }, {
+      icon: "caidan-enjoy",
+      label: _i18n.locale.menu_my_share,
+      key: this.SHARE,
+      type: this.SHARE,
+      isLeaf: false,
+      children: [],
+      href: "#/summary/share",
+      isShow: props.isShowShare
     }, {
       icon: "bumen",
       label: _i18n.locale.menu_department,
@@ -187,10 +187,10 @@ var summaryMenus = /*#__PURE__*/function () {
   }, {
     key: "setShareLoading",
     value: function setShareLoading(loading) {
-      this.menus[3].children = [];
+      this.menus[4].children = [];
 
       if (loading) {
-        this.menus[3].children.push({
+        this.menus[4].children.push({
           icon: "",
           label: "loading",
           key: "loading-subordinates",
@@ -203,10 +203,10 @@ var summaryMenus = /*#__PURE__*/function () {
   }, {
     key: "setTongjiLoading",
     value: function setTongjiLoading(loading) {
-      this.menus[4].children = [];
+      this.menus[3].children = [];
 
       if (loading) {
-        this.menus[4].children.push({
+        this.menus[3].children.push({
           icon: "",
           label: "loading",
           key: "loading-subordinates",
@@ -220,7 +220,7 @@ var summaryMenus = /*#__PURE__*/function () {
     key: "insertShare",
     value: function insertShare(users) {
       if (!users || !users.length) {
-        this.menus[3].children = [{
+        this.menus[4].children = [{
           icon: "",
           label: "empty-subordinates",
           key: "empty-subordinates",
@@ -245,13 +245,13 @@ var summaryMenus = /*#__PURE__*/function () {
         });
       }
 
-      this.menus[3].children = treeNodeUsers;
+      this.menus[4].children = treeNodeUsers;
     }
   }, {
     key: "insertTongji",
     value: function insertTongji(users) {
       if (!users || !users.length) {
-        this.menus[4].children = [{
+        this.menus[3].children = [{
           icon: "",
           label: "empty-subordinates",
           key: "empty-subordinates",
@@ -270,13 +270,13 @@ var summaryMenus = /*#__PURE__*/function () {
           icon: "",
           label: user.name,
           key: "".concat(user.userId),
-          type: _index.USER_NODE,
+          type: _index.SAME_LEVEL_USER_NODE,
           href: "",
           data: user
         });
       }
 
-      this.menus[4].children = treeNodeUsers;
+      this.menus[3].children = treeNodeUsers;
     }
   }, {
     key: "getMenus",

package/lib/components/menus/export-modules/summary-menus/summary-front-menus.js

@@ -122,7 +122,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     var nodeType = node.nodeType,
         data = node.data;
 
-    if (nodeType == _index.USER_NODE || nodeType == _index.FOLLOWER_NODE) {
+    if (nodeType == _index.USER_NODE || nodeType == _index.FOLLOWER_NODE || nodeType == _index.SAME_LEVEL_USER_NODE) {
       location.href = "#/summary/manage?toUserId=".concat(data.userId, "&subordinates=1");
     }
 

package/package.json

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