@titaui/pc 1.12.9-beta.1 → 1.12.9-beta.4

package/lib/components/nav-top/utils.js

@@ -17,7 +17,463 @@ var getMenus = function getMenus() {
   navs.sort(function (pre, next) {
     return pre.orderId - next.orderId;
   });
-  return navs;
+  return navs; // const newNavigation = [
+  //   {
+  //     id: 21817,
+  //     tenantId: 0,
+  //     title: "动态",
+  //     href: "#dynamic",
+  //     iconName: "",
+  //     type: "hash",
+  //     orderId: 1,
+  //     code: "dynamic",
+  //     appId: 119,
+  //     appCode: null,
+  //     status: 0,
+  //     groupId: 0,
+  //     signUrl: null,
+  //     domain: "",
+  //     labelName: null,
+  //     DataSource: null,
+  //     defaultExpand: false,
+  //     menuPoint: null,
+  //   },
+  //   {
+  //     id: 21818,
+  //     tenantId: 0,
+  //     title: "OKR",
+  //     href: "#okr/manage?relation=1",
+  //     iconName: "okr",
+  //     type: "hash",
+  //     orderId: 2,
+  //     code: "okr",
+  //     appId: 113,
+  //     appCode: null,
+  //     status: 0,
+  //     groupId: 0,
+  //     signUrl: null,
+  //     domain: "",
+  //     labelName: null,
+  //     DataSource: null,
+  //     defaultExpand: false,
+  //     children: [
+  //       {
+  //         id: 21001,
+  //         tenantId: 0,
+  //         title: "OKR",
+  //         href: "#okr/manage?relation=1",
+  //         iconName: "",
+  //         type: "hash",
+  //         orderId: 3,
+  //         code: "",
+  //         appId: 666,
+  //         appCode: null,
+  //         status: 0,
+  //         groupId: 0,
+  //         signUrl: null,
+  //         domain: "",
+  //         labelName: null,
+  //         DataSource: null,
+  //         defaultExpand: false,
+  //         children: [
+  //         ],
+  //         menuPoint: null,
+  //       }, {
+  //         id: 21002,
+  //         tenantId: 0,
+  //         title: "对齐",
+  //         href: "#okr/map",
+  //         iconName: "",
+  //         type: "hash",
+  //         orderId: 3,
+  //         code: "",
+  //         appId: 666,
+  //         appCode: null,
+  //         status: 0,
+  //         groupId: 0,
+  //         signUrl: null,
+  //         domain: "",
+  //         labelName: null,
+  //         DataSource: null,
+  //         defaultExpand: false,
+  //         children: [
+  //         ],
+  //         menuPoint: null,
+  //       }, {
+  //         id: 21003,
+  //         tenantId: 0,
+  //         title: "工作法",
+  //         href: "#okr/panel",
+  //         iconName: "",
+  //         type: "hash",
+  //         orderId: 3,
+  //         code: "",
+  //         appId: 666,
+  //         appCode: null,
+  //         status: 0,
+  //         groupId: 0,
+  //         signUrl: null,
+  //         domain: "",
+  //         labelName: null,
+  //         DataSource: null,
+  //         defaultExpand: false,
+  //         children: [
+  //         ],
+  //         menuPoint: null,
+  //       }, {
+  //         id: 21004,
+  //         tenantId: 0,
+  //         title: "仪表盘",
+  //         href: "#okr/chart",
+  //         iconName: "",
+  //         type: "hash",
+  //         orderId: 3,
+  //         code: "",
+  //         appId: 666,
+  //         appCode: null,
+  //         status: 0,
+  //         groupId: 0,
+  //         signUrl: null,
+  //         domain: "",
+  //         labelName: null,
+  //         DataSource: null,
+  //         defaultExpand: false,
+  //         children: [
+  //         ],
+  //         menuPoint: null,
+  //       },
+  //     ],
+  //     menuPoint: null,
+  //   },
+  //   {
+  //     id: 21819,
+  //     tenantId: 0,
+  //     title: "绩效考核",
+  //     href: "#performance",
+  //     iconName: "performance",
+  //     type: "hash",
+  //     orderId: 3,
+  //     code: "performance",
+  //     appId: 666,
+  //     appCode: null,
+  //     status: 0,
+  //     groupId: 0,
+  //     signUrl: null,
+  //     domain: "",
+  //     labelName: null,
+  //     DataSource: null,
+  //     defaultExpand: false,
+  //     children: [
+  //       {
+  //         id: 22001,
+  //         tenantId: 0,
+  //         title: "我的考核",
+  //         href: "#performance/my",
+  //         iconName: "",
+  //         type: "hash",
+  //         orderId: 3,
+  //         code: "",
+  //         appId: 666,
+  //         appCode: null,
+  //         status: 0,
+  //         groupId: 0,
+  //         signUrl: null,
+  //         domain: "",
+  //         labelName: null,
+  //         DataSource: null,
+  //         defaultExpand: false,
+  //         children: [
+  //         ],
+  //         menuPoint: null,
+  //       }, {
+  //         id: 22002,
+  //         tenantId: 0,
+  //         title: "考核管理",
+  //         href: "#performance/manage",
+  //         iconName: "",
+  //         type: "hash",
+  //         orderId: 3,
+  //         code: "",
+  //         appId: 666,
+  //         appCode: null,
+  //         status: 0,
+  //         groupId: 0,
+  //         signUrl: null,
+  //         domain: "",
+  //         labelName: null,
+  //         DataSource: null,
+  //         defaultExpand: false,
+  //         children: [
+  //         ],
+  //         menuPoint: null,
+  //       }, {
+  //         id: 22003,
+  //         tenantId: 0,
+  //         title: "仪表盘",
+  //         href: "#performance/dashboard",
+  //         iconName: "",
+  //         type: "hash",
+  //         orderId: 3,
+  //         code: "",
+  //         appId: 666,
+  //         appCode: null,
+  //         status: 0,
+  //         groupId: 0,
+  //         signUrl: null,
+  //         domain: "",
+  //         labelName: null,
+  //         DataSource: null,
+  //         defaultExpand: false,
+  //         children: [
+  //         ],
+  //         menuPoint: null,
+  //       },
+  //     ],
+  //     menuPoint: null,
+  //   },
+  //   {
+  //     id: 21820,
+  //     tenantId: 0,
+  //     title: "项目",
+  //     href: "#work",
+  //     iconName: "project",
+  //     type: "hash",
+  //     orderId: 4,
+  //     code: "work",
+  //     appId: 112,
+  //     appCode: null,
+  //     status: 0,
+  //     groupId: 0,
+  //     signUrl: null,
+  //     domain: "",
+  //     labelName: null,
+  //     DataSource: null,
+  //     defaultExpand: false,
+  //     children: [
+  //       {
+  //         id: 21820,
+  //         tenantId: 0,
+  //         title: "项目",
+  //         href: "#work",
+  //         iconName: "project",
+  //         type: "hash",
+  //         orderId: 4,
+  //         code: "",
+  //         appId: 112,
+  //         appCode: null,
+  //         status: 0,
+  //         groupId: 0,
+  //         signUrl: null,
+  //         domain: "",
+  //         labelName: null,
+  //         DataSource: null,
+  //         defaultExpand: false,
+  //         children: [
+  //         ],
+  //         menuPoint: null,
+  //       },
+  //     ],
+  //     menuPoint: null,
+  //   },
+  //   {
+  //     id: 21823,
+  //     tenantId: 0,
+  //     title: "计划表",
+  //     href: "#plan",
+  //     iconName: "plan",
+  //     type: "hash",
+  //     orderId: 5,
+  //     code: "plan",
+  //     appId: 116,
+  //     appCode: null,
+  //     status: 0,
+  //     groupId: 0,
+  //     signUrl: null,
+  //     domain: "",
+  //     labelName: null,
+  //     DataSource: null,
+  //     defaultExpand: false,
+  //     children: [
+  //       {
+  //         id: 21823,
+  //         tenantId: 0,
+  //         title: "计划表",
+  //         href: "#plan",
+  //         iconName: "plan",
+  //         type: "hash",
+  //         orderId: 5,
+  //         code: "",
+  //         appId: 116,
+  //         appCode: null,
+  //         status: 0,
+  //         groupId: 0,
+  //         signUrl: null,
+  //         domain: "",
+  //         labelName: null,
+  //         DataSource: null,
+  //         defaultExpand: false,
+  //         children: [
+  //         ],
+  //         menuPoint: null,
+  //         key: "plan",
+  //       },
+  //     ],
+  //     menuPoint: null,
+  //   },
+  //   {
+  //     id: 21821,
+  //     tenantId: 0,
+  //     title: "总结",
+  //     href: "#daily",
+  //     iconName: "summary",
+  //     type: "hash",
+  //     orderId: 6,
+  //     code: "",
+  //     appId: 115,
+  //     appCode: null,
+  //     status: 0,
+  //     groupId: 0,
+  //     signUrl: null,
+  //     domain: "",
+  //     labelName: null,
+  //     DataSource: null,
+  //     defaultExpand: false,
+  //     children: [
+  //       {
+  //         id: 21821,
+  //         tenantId: 0,
+  //         title: "总结",
+  //         href: "#daily",
+  //         iconName: "summary",
+  //         type: "hash",
+  //         orderId: 6,
+  //         code: "",
+  //         appId: 115,
+  //         appCode: null,
+  //         status: 0,
+  //         groupId: 0,
+  //         signUrl: null,
+  //         domain: "",
+  //         labelName: null,
+  //         DataSource: null,
+  //         defaultExpand: false,
+  //         children: [
+  //         ],
+  //         menuPoint: null,
+  //         key: "summary",
+  //       },
+  //     ],
+  //     menuPoint: null,
+  //     key: "daily",
+  //   },
+  //   {
+  //     id: 21822,
+  //     tenantId: 0,
+  //     title: "报表",
+  //     href: "#report",
+  //     iconName: "chart",
+  //     type: "hash",
+  //     orderId: 7,
+  //     code: "",
+  //     appId: 118,
+  //     appCode: null,
+  //     status: 0,
+  //     groupId: 0,
+  //     signUrl: null,
+  //     domain: "",
+  //     labelName: null,
+  //     DataSource: null,
+  //     defaultExpand: false,
+  //     children: [
+  //       {
+  //         id: 21822,
+  //         tenantId: 0,
+  //         title: "报表",
+  //         href: "#report",
+  //         iconName: "chart",
+  //         type: "hash",
+  //         orderId: 7,
+  //         code: "",
+  //         appId: 118,
+  //         appCode: null,
+  //         status: 0,
+  //         groupId: 0,
+  //         signUrl: null,
+  //         domain: "",
+  //         labelName: null,
+  //         DataSource: null,
+  //         defaultExpand: false,
+  //         children: [
+  //         ],
+  //         menuPoint: null,
+  //         key: "report",
+  //       },
+  //     ],
+  //     menuPoint: null,
+  //     key: "report",
+  //   },
+  //   {
+  //     id: 21831,
+  //     tenantId: 0,
+  //     title: "Learning",
+  //     href: "500000126/eLearningHome#learning",
+  //     iconName: "learning",
+  //     type: "page",
+  //     orderId: 8,
+  //     code: "",
+  //     appId: 120,
+  //     appCode: null,
+  //     status: 0,
+  //     groupId: 0,
+  //     signUrl: null,
+  //     domain: "",
+  //     labelName: null,
+  //     DataSource: null,
+  //     defaultExpand: false,
+  //     children: [
+  //     ],
+  //     menuPoint: null,
+  //     key: "learning",
+  //   },
+  //   {
+  //     appId: 101,
+  //     children: [{
+  //         id: 21831,
+  //         tenantId: 0,
+  //         title: "我的面谈",
+  //         href: "#/interview",
+  //         iconName: "learning",
+  //         type: "hash",
+  //         orderId: 8,
+  //         code: "",
+  //         appId: 120,
+  //         appCode: null,
+  //         status: 0,
+  //         groupId: 0,
+  //         signUrl: null,
+  //         domain: "",
+  //         labelName: null,
+  //         DataSource: null,
+  //         defaultExpand: false,
+  //         children: [
+  //         ],
+  //         menuPoint: null,
+  //         key: "learning",
+  //     }],
+  //     code: "interview",
+  //     domain: "",
+  //     href: "#/interview",
+  //     iconName: "interview",
+  //     id: 22827,
+  //     menuPoint: null,
+  //     orderId: 9,
+  //     signUrl: null,
+  //     tenantId: 0,
+  //     title: "1 on 1",
+  //     key:'interview'
+  //   },
+  // ];
+  // return newNavigation;
 };
 
 exports.getMenus = getMenus;

package/lib/components/user-selector/export-modules/field-tree-selector/index.js

@@ -66,6 +66,8 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       selectNodes = _props$selectNodes === void 0 ? defauleSelectNodes : _props$selectNodes,
       sourceFrom = props.sourceFrom,
       departOnly = props.departOnly,
+      searchUserOnly = props.searchUserOnly,
+      isVerify = props.isVerify,
       _props$departId = props.departId,
       departId = _props$departId === void 0 ? "-1" : _props$departId,
       _props$auth = props.auth,
@@ -307,6 +309,8 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     value: {
       sourceFrom: sourceFrom,
       departOnly: departOnly,
+      searchUserOnly: searchUserOnly,
+      isVerify: isVerify,
       auth: auth,
       departId: departId,
       authType: authType,

package/lib/components/user-selector/request-apis.js

@@ -159,13 +159,28 @@ exports.getSubordinateData = getSubordinateData;
 var search = function search(_ref4) {
   var searchKey = _ref4.searchKey,
       departOnly = _ref4.departOnly,
-      sourceFrom = _ref4.sourceFrom;
+      searchUserOnly = _ref4.searchUserOnly,
+      sourceFrom = _ref4.sourceFrom,
+      _ref4$isVerify = _ref4.isVerify,
+      isVerify = _ref4$isVerify === void 0 ? false : _ref4$isVerify;
   var args = [];
-  if (departOnly) args.push("isGetUser=false");
-  if (sourceFrom) args.push("sourceFrom=".concat(sourceFrom)); // 追加来源，用于企业微信搜索
 
-  args.push("source=".concat((0, _openData.getSource)()));
-  return _axios["default"].get("".concat(requestDomain(), "/api/v2/").concat(tenantId, "/").concat(userId, "/search/searchAll?keyWork=").concat(searchKey).concat(args.length ? "&".concat(args.join("&")) : "")).then(function (searchRes) {
+  if (departOnly) {
+    args.push("isGetUser=false&isGetDep=true&isGetGroup=false");
+  } else if (searchUserOnly) {
+    args.push("isGetUser=true&isGetDep=false&isGetGroup=false");
+  } else {
+    args.push("isGetUser=true&isGetDep=true&isGetGroup=true");
+  }
+
+  ;
+
+  if (!!sourceFrom) {
+    // 这个是遗留的管控群组的，后面逐步替换掉
+    isVerify = true;
+  }
+
+  return _axios["default"].get("".concat(requestDomain(), "/api/v2/").concat(tenantId, "/").concat(userId, "/search/searchAll?keyWord=").concat(searchKey, "&isVerify=").concat(isVerify, "&").concat(args[0])).then(function (searchRes) {
     return searchRes.data;
   });
 };

package/lib/components/user-selector/searched-panel/index.js

@@ -59,7 +59,9 @@ function _default(props) {
 
   var _useContext = (0, _react.useContext)(_context.CommonContext),
       departOnly = _useContext.departOnly,
+      searchUserOnly = _useContext.searchUserOnly,
       sourceFrom = _useContext.sourceFrom,
+      isVerify = _useContext.isVerify,
       _useContext$panes = _useContext.panes,
       panes = _useContext$panes === void 0 ? {
     depart: true,
@@ -97,7 +99,9 @@ function _default(props) {
     (0, _requestApis.search)({
       searchKey: searchKey,
       departOnly: departOnly,
-      sourceFrom: sourceFrom
+      searchUserOnly: searchUserOnly,
+      sourceFrom: sourceFrom,
+      isVerify: isVerify
     }).then(function (res) {
       var Code = res.Code,
           Data = res.Data;

package/lib/pages/aha2021/index.js

@@ -11,8 +11,6 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _contactKefu = _interopRequireDefault(require("../../components/contact-kefu"));
-
 var _navTop = _interopRequireDefault(require("../../components/nav-top"));
 
 var _followerVisitor = _interopRequireDefault(require("../../components/follower-visitor"));
@@ -37,10 +35,12 @@ var _errorBoundary = _interopRequireDefault(require("../../components/error-boun
 
 var _errorLevel = _interopRequireDefault(require("../../utils/error-level"));
 
-require("./index.css");
-
 var _hooks = _interopRequireDefault(require("../../utils/hooks"));
 
+var _newMenuSwitcher = _interopRequireDefault(require("./new-menu-switcher"));
+
+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); }
@@ -103,7 +103,7 @@ function PageLayout(props) {
     }
   }, children), !isTencentHr && /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__help"))
-  }, /*#__PURE__*/_react["default"].createElement(_helpCard["default"], null)), !isTencentHr && !(0, _helpers.isDingDing)() && !(0, _helpers.isFeishu)() && /*#__PURE__*/_react["default"].createElement(_contactKefu["default"], null), isTrial && !isTencentHr && /*#__PURE__*/_react["default"].createElement("div", {
+  }, /*#__PURE__*/_react["default"].createElement(_helpCard["default"], null)), /*#__PURE__*/_react["default"].createElement(_newMenuSwitcher["default"], null), isTrial && !isTencentHr && /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(preCls, "__invite")
   }, /*#__PURE__*/_react["default"].createElement(_invitePeople["default"], null)), isTencentHr && /*#__PURE__*/_react["default"].createElement(_hrMessage["default"], null), /*#__PURE__*/_react["default"].createElement(_errorBoundary["default"], {
     errorLevel: _errorLevel["default"].P0,

package/lib/pages/aha2021/new-menu-switcher/index.css

@@ -0,0 +1,40 @@
+.new-menu-switcher {
+  position: fixed;
+  bottom: 74px;
+  right: 24px;
+  z-index: 2;
+  font-size: 28px;
+}
+
+.new-menu-switcher__new-version, .new-menu-switcher__old-version {
+  display: inline-block;
+  width: 42px;
+  height: 42px;
+  font-size: 14px;
+  line-height: 42px;
+  text-align: center;
+  border-radius: 100px;
+  overflow: hidden;
+  white-space: nowrap;
+  cursor: pointer;
+  transition: width 0.3s;
+}
+
+.new-menu-switcher__new-version--full, .new-menu-switcher__old-version--full {
+  width: 108px;
+}
+
+.new-menu-switcher__new-version {
+  color: #fff;
+  box-shadow: 0px 4px 12px 0px rgba(127, 145, 180, 0.2), inset 0px 0px 6px 2px rgba(255, 255, 255, 0.5);
+  background: url(./new-menu-bg.png) no-repeat;
+  background-color: linear-gradient(135deg, #ffc726 0%, #f69300 100%);
+  background-position: right bottom;
+  background-size: cover;
+}
+
+.new-menu-switcher__old-version {
+  color: #141c28;
+  background: #fff;
+  box-shadow: 0px 4px 12px 0px rgba(127, 145, 180, 0.2), inset 0px 0px 6px 2px rgba(255, 255, 255, 0.5);
+}