@titaui/pc 1.9.90 → 1.9.94

package/lib/components/create-okr-modal/request-api.js

@@ -21,10 +21,8 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
-// @ts-ignore
-var tenantId = BSGlobal && BSGlobal.tenantInfo.Id || 0; // @ts-ignore
-
-var userId = BSGlobal && BSGlobal.loginUserInfo.Id || 0;
+var tenantId = window.BSGlobal && window.BSGlobal.tenantInfo.Id || 0;
+var userId = window.BSGlobal && window.BSGlobal.loginUserInfo.Id || 0;
 
 var requestDomain = function requestDomain() {
   if (!window.location.hostname.match(/dev/)) return "";
@@ -86,7 +84,9 @@ var getKrAnalysisInfos = /*#__PURE__*/function () {
         switch (_context2.prev = _context2.next) {
           case 0:
             url = "".concat(requestDomain(), "/api/v1/").concat(tenantId, "/").concat(userId, "/okr/create/analys");
-            return _context2.abrupt("return", _axios["default"].post(url, params));
+            return _context2.abrupt("return", _axios["default"].post(url, params).then(function (res) {
+              return res.data.Data;
+            }));
 
           case 2:
           case "end":
@@ -170,6 +170,8 @@ var getOAnalysisInfos = /*#__PURE__*/function () {
               if (resp.status === 200 && resp.data.Code === 1) {
                 return resp.data.Data;
               }
+
+              return {};
             }));
 
           case 2:

package/lib/components/menus/export-modules/demo-menus/index.js

@@ -48,7 +48,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var DemoMenus = function DemoMenus(props) {
   var _props$onSelect = props.onSelect,
       onSelect = _props$onSelect === void 0 ? function () {} : _props$onSelect,
-      history = props.history;
+      history = props.history,
+      isManager = props.isManager;
   var menuRef = (0, _react.useRef)();
   var okrMenusData = (0, _react.useRef)(_menus.defaultRefObject);
 
@@ -66,9 +67,15 @@ var DemoMenus = function DemoMenus(props) {
     okrMenusData.current = new _menus["default"]();
     return okrMenusData.current.getMenus();
   }),
-      _useState6 = _slicedToArray(_useState5, 1),
-      menus = _useState6[0];
+      _useState6 = _slicedToArray(_useState5, 2),
+      menus = _useState6[0],
+      setMenus = _useState6[1];
 
+  (0, _react.useEffect)(function () {
+    okrMenusData.current = new _menus["default"](isManager === 1);
+    setMenus(okrMenusData.current.getMenus());
+    setExpandedKeys(["demofree"]);
+  }, [isManager]);
   var flipRef = (0, _react.useRef)({
     next: function next() {},
     goback: function goback() {}
@@ -114,7 +121,7 @@ var DemoMenus = function DemoMenus(props) {
   }, /*#__PURE__*/_react["default"].createElement(_scrollbar["default"], null, /*#__PURE__*/_react["default"].createElement(_menuTree["default"], {
     data: menus,
     selectedKeys: selectedMenuKeys,
-    expandedKeys: expandedKeys,
+    defaultExpandedKeys: expandedKeys,
     onExpand: onExpandHandler,
     onSelect: onSelectHandler
   }))), /*#__PURE__*/_react["default"].createElement("div", null)));

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

@@ -31,9 +31,11 @@ exports.PAGE_IGNORED_DEMOFREE = PAGE_IGNORED_DEMOFREE;
 
 var DemoMenuData = /*#__PURE__*/function () {
   function DemoMenuData() {
+    var isManager = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+
     _classCallCheck(this, DemoMenuData);
 
-    this.isManager = localStorage.getItem("DEMO_USER_IS_MANAGER") === "1";
+    this.isManager = isManager;
     this.menus = [{
       icon: "kaohe",
       label: "任务状态",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.9.90",
+  "version": "1.9.94",
   "nameCN": "",
   "description": "",
   "main": "src/index.js",

package/src/components/create-okr-modal/request-api.ts

@@ -6,10 +6,8 @@ import {
   UpdateOkrVisibilityParams,
 } from "./interface";
 
-// @ts-ignore
-const tenantId = (BSGlobal && BSGlobal.tenantInfo.Id) || 0;
-// @ts-ignore
-const userId = (BSGlobal && BSGlobal.loginUserInfo.Id) || 0;
+const tenantId = (window.BSGlobal && window.BSGlobal.tenantInfo.Id) || 0;
+const userId = (window.BSGlobal && window.BSGlobal.loginUserInfo.Id) || 0;
 
 const requestDomain = () => {
   if (!window.location.hostname.match(/dev/)) return "";
@@ -23,7 +21,7 @@ export const getImageBase64ByUrl = (toUserId) => axios
   )
   .then((getBase64Str) => getBase64Str.data);
 
-export const createWidthKr = async function (data: any) {
+export const createWidthKr = async (data: any) => {
   const url = `${requestDomain()}/api/v2/${tenantId}/${userId}/work/createWithKr`;
   const res = await axios.post(
     url,
@@ -39,19 +37,19 @@ export const createWidthKr = async function (data: any) {
   return res.data.Data;
 };
 
-export const getKrAnalysisInfos = async function (params) {
+export const getKrAnalysisInfos = async (params) => {
   const url = `${requestDomain()}/api/v1/${tenantId}/${userId}/okr/create/analys`;
-  return axios.post(url, params);
+  return axios.post(url, params).then((res) => res.data.Data);
 };
 
-export const updateOkrVisibility = async function (
+export const updateOkrVisibility = async (
   params: UpdateOkrVisibilityParams,
-) {
+) => {
   const url = `${requestDomain()}/api/v2/${tenantId}/${userId}/work/visiblity`;
   return axios.post(url, params);
 };
 
-export const updateOCommitType = async function (params: UpdateOkrTypeParams) {
+export const updateOCommitType = async (params: UpdateOkrTypeParams) => {
   const url = `${requestDomain()}/api/v1/${tenantId}/${userId}/okr/update/okrType?okrId=${
     params.okrId
   }`;
@@ -61,16 +59,17 @@ export const updateOCommitType = async function (params: UpdateOkrTypeParams) {
   });
 };
 
-export const getOAnalysisInfos = async function (params) {
+export const getOAnalysisInfos = async (params) => {
   const url = `${requestDomain()}/api/v1/${tenantId}/${userId}/okr/create/analys`;
   return axios.post(url, params).then((resp) => {
     if (resp.status === 200 && resp.data.Code === 1) {
       return resp.data.Data;
     }
+    return {};
   });
 };
 
-export const getCycleSetting = async function (): Promise<GetCycleSettingParams> {
+export const getCycleSetting = async (): Promise<GetCycleSettingParams> => {
   const url = `${requestDomain()}/api/v1/${tenantId}/${userId}/okr/cycleSetting`;
   const res = await axios.get(url);
   return res.data.Data;

package/src/components/menus/export-modules/demo-menus/index.tsx

@@ -14,18 +14,23 @@ import { isEn } from "../../../../utils/getLocale";
 interface DemoMenusProps {
   onSelect: (node: any) => void;
   history: any;
+  isManager: number
 }
 const DemoMenus: React.FC<DemoMenusProps> = (props) => {
-  const { onSelect = () => { }, history } = props;
-
+  const { onSelect = () => { }, history, isManager } = props;
   const menuRef = useRef<any>();
   const okrMenusData = useRef<DemoMenusInt>(defaultRefObject);
   const [selectedMenuKeys, setSelectedMenuKeys] = useState<string[]>([]);
   const [expandedKeys, setExpandedKeys] = useState(["demofree"]);
-  const [menus] = useState(() => {
+  const [menus, setMenus] = useState(() => {
     okrMenusData.current = new DemoMenuData();
-    return okrMenusData.current.getMenus();
+    return okrMenusData.current.getMenus()
   });
+  useEffect(() => {
+    okrMenusData.current = new DemoMenuData(isManager === 1);
+    setMenus(okrMenusData.current.getMenus())
+    setExpandedKeys(["demofree"]);
+  }, [isManager])
   const flipRef = useRef<flipRefIns>({
     next: () => { },
     goback: () => { },
@@ -66,7 +71,7 @@ const DemoMenus: React.FC<DemoMenusProps> = (props) => {
             <MenuTree
               data={menus}
               selectedKeys={selectedMenuKeys}
-              expandedKeys={expandedKeys}
+              defaultExpandedKeys={expandedKeys}
               onExpand={onExpandHandler}
               onSelect={onSelectHandler}
             />

package/src/components/menus/export-modules/demo-menus/menus.tsx

@@ -26,8 +26,8 @@ export default class DemoMenuData {
 
   public isManager;
 
-  constructor() {
-    this.isManager = localStorage.getItem("DEMO_USER_IS_MANAGER") === "1";
+  constructor(isManager = false) {
+    this.isManager = isManager;
     this.menus = [
       {
         icon: "kaohe",