@titaui/pc 1.12.9-beta.2 → 1.12.9-beta.5

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/okr-flow/export-modal/index.js

@@ -232,41 +232,29 @@ var ExportMapModal = function ExportMapModal(props) {
                   scope.setExtra('userMessage', userId + '租户：' + telentId + '我得到了图片大小为：' + size + '，路径为' + imgUrl);
                 });
                 (0, _requestApis.getBase64DownloadUrl)(imgUrl.split(',')[1]).then(function (url) {
-                  var image = new Image(); // @ts-ignore
+                  // const image = new Image()
+                  // @ts-ignore
                   // window.titaTracker && window.titaTracker("action").record({
                   //   actionName: userId+'租户：'+telentId+'我获得了地址'+url.Data.obj,
                   //   actionGroup: 'okr地图接口',
                   //   productName: 'okr地图导出',
                   // });
-
                   Sentry.withScope(function (scope) {
                     scope.setTag('error-level', "P0");
                     scope.setTag('error-type', '地图导出-图片地址');
                     scope.setExtra('userMessage', userId + '租户：' + telentId + '我得到了图片大小为：' + size + '，路径为' + imgUrl);
                   });
-
-                  _toast["default"].Warning('图片上传成功，准备本地下载', {
-                    canClose: true
-                  });
-
-                  image.setAttribute('crossOrigin', 'anonymous');
-
-                  image.onload = function () {
-                    if (!url.Data.obj) {
-                      _toast["default"].Error('导出失败，请稍后重试', {
-                        canClose: false
-                      });
-                    }
-
-                    var a = document.createElement('a'); // 生成一个a元素
-
-                    var event = new MouseEvent('click'); // 创建一个单击事件
-
-                    a.download = 'okr地图'; // 设置图片名称
-
-                    a.href = url.Data.obj; // 将生成的URL设置为a
-
-                    a.dispatchEvent(event); // 触发a的单击事件
+                  var newUrl = url.Data.obj;
+                  var x = new XMLHttpRequest();
+                  x.open("GET", newUrl, true);
+                  x.responseType = 'blob';
+
+                  x.onload = function (e) {
+                    var url = window.URL.createObjectURL(x.response);
+                    var a = document.createElement('a');
+                    a.href = url;
+                    a.download = model.value === 20 ? '高清图片' : '标准图片';
+                    a.click();
 
                     _toast["default"].Success('导出成功');
 
@@ -277,7 +265,24 @@ var ExportMapModal = function ExportMapModal(props) {
                     }
                   };
 
-                  image.src = imgUrl;
+                  x.send(); // image.setAttribute('crossOrigin', 'anonymous')
+                  // image.onload = async() => {
+                  //   if (!url.Data.obj) {
+                  //     Toast.Error('导出失败，请稍后重试', { canClose: false })
+                  //   }
+                  //   await downloadFile(url.Data.obj,model.value===20?'高清分享图片':'标准分享图片')
+                  //   // const a = document.createElement('a') // 生成一个a元素
+                  //   // const event = new MouseEvent('click') // 创建一个单击事件
+                  //   // a.download = '123' // 设置图片名称
+                  //   // a.href = url.Data.obj // 将生成的URL设置为a
+                  //   // a.dispatchEvent(event) // 触发a的单击事件
+                  //   Toast.Success('导出成功')
+                  //   setIsExport(false)
+                  //   if (onCloseHandler) {
+                  //     onCloseHandler()
+                  //   }
+                  // }
+                  // image.src = imgUrl
                 });
               })["catch"](function (err) {
                 setIsExport(false);

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

@@ -80,6 +80,7 @@ function _default(props) {
           tabPane: true
         }
       }, Object.keys(panes).map(function (panelKey) {
+        if (!panes[panelKey]) return;
         var _getPanesConfig$panel = (0, _constant.getPanesConfig)()[panelKey],
             label = _getPanesConfig$panel.label,
             Component = _getPanesConfig$panel.Component;

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

@@ -160,27 +160,39 @@ var search = function search(_ref4) {
   var searchKey = _ref4.searchKey,
       departOnly = _ref4.departOnly,
       searchUserOnly = _ref4.searchUserOnly,
-      sourceFrom = _ref4.sourceFrom,
+      panes = _ref4.panes,
+      _ref4$auth = _ref4.auth,
+      auth = _ref4$auth === void 0 ? false : _ref4$auth,
       _ref4$isVerify = _ref4.isVerify,
       isVerify = _ref4$isVerify === void 0 ? false : _ref4$isVerify;
-  var args = [];
+  var isGetUser = true;
+  var isGetDep = false;
+  var isGetGroup = false;
+  var depart = panes.depart,
+      group = panes.group;
+
+  if (depart) {
+    isGetDep = true;
+  }
+
+  if (group) {
+    isGetGroup = true;
+  }
 
   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");
+    isGetUser = false;
   }
 
-  ;
+  if (searchUserOnly) {
+    isGetDep = false;
+    isGetGroup = false;
+  }
 
-  if (!!sourceFrom) {
-    // 这个是遗留的管控群组的，后面逐步替换掉
+  if (auth) {
     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 _axios["default"].get("".concat(requestDomain(), "/api/v2/").concat(tenantId, "/").concat(userId, "/search/searchAll?keyWord=").concat(searchKey, "&isVerify=").concat(isVerify, "&isGetUser=").concat(isGetUser, "&isGetDep=").concat(isGetDep, "&isGetGroup=").concat(isGetGroup)).then(function (searchRes) {
     return searchRes.data;
   });
 };

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

@@ -61,6 +61,7 @@ function _default(props) {
       departOnly = _useContext.departOnly,
       searchUserOnly = _useContext.searchUserOnly,
       sourceFrom = _useContext.sourceFrom,
+      auth = _useContext.auth,
       isVerify = _useContext.isVerify,
       _useContext$panes = _useContext.panes,
       panes = _useContext$panes === void 0 ? {
@@ -100,7 +101,8 @@ function _default(props) {
       searchKey: searchKey,
       departOnly: departOnly,
       searchUserOnly: searchUserOnly,
-      sourceFrom: sourceFrom,
+      auth: auth,
+      panes: panes,
       isVerify: isVerify
     }).then(function (res) {
       var Code = res.Code,

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,