module-menu 0.3.16 → 0.3.18

package/src/pages/util/userInfo.js

@@ -1,75 +1,75 @@
-// tokenInSessionStor不存在为一体化，存在为轻量级
-const tokenInSessionStor = window.sessionStorage.getItem('bigdata-access_token');
-/**
-* 获取认证相关的localStorage/SessionStorage
-*/
-function getStore(params) {
-    if(tokenInSessionStor){
-        let { name } = params;
-        const { debug } = params;
-        const keyName = 'bigdata-';
-        name = keyName + name;
-        let obj = {};
-        let content;
-        obj = window.sessionStorage.getItem(name);
-        if (!obj || Object.keys(obj).length === 0) obj = window.localStorage.getItem(name);
-        if (!obj || Object.keys(obj).length === 0) return '';
-        try {
-            obj = JSON.parse(obj);
-        } catch (e) {
-            return '';
-        }
-        if (debug) {
-            return '';
-        }
-        if (obj.dataType === 'string') {
-            content = obj.content;
-        } else if (obj.dataType === 'number') {
-            content = Number(obj.content);
-        } else if (obj.dataType === 'boolean') {
-            // eslint-disable-next-line no-eval
-            content = eval(obj.content);
-        } else if (obj.dataType === 'object') {
-            content = obj.content;
-        }
-        return content;
-    }else{
-        let { name } = params;
-        let storageStr = '';
-        if (name === 'access_token') {
-          storageStr = localStorage.getItem('ACCESS_TOKEN');
-        } else if (name === 'tenantId') {
-          // 暂定当前租户 curTenantId
-          storageStr = localStorage.getItem('curTenantId');
-        } else if (name === 'tenantName') {
-            // 暂定当前租户 curTenantId
-            storageStr = localStorage.getItem('curTenantName');
-          }else if (name === 'userName') {
-          // 获取当前登录用户名称
-          storageStr = localStorage.getItem('userName');
-        } else if (name === 'userId') {
-          // 获取当前登录用户Id
-          storageStr = localStorage.getItem('userId');
-        }
-        return storageStr;
-    }
-    
-}
-export default getStore;
-
-export const getUserName = () => {
-    if(tokenInSessionStor){
-        const userInfo = getStore({ name: 'userInfo' });
-        if (userInfo && Object.keys(userInfo).length > 0 && userInfo.username) {
-            return userInfo.username;
-        }
-        return '';
-    }else{
-        const name = getStore({ name: 'userName' });
-    if (!name) {
-      return '';
-    }
-    return name;
-    }
-    
-};
+// tokenInSessionStor不存在为一体化，存在为轻量级
+const tokenInSessionStor = window.sessionStorage.getItem('bigdata-access_token');
+/**
+* 获取认证相关的localStorage/SessionStorage
+*/
+function getStore(params) {
+    if(tokenInSessionStor){
+        let { name } = params;
+        const { debug } = params;
+        const keyName = 'bigdata-';
+        name = keyName + name;
+        let obj = {};
+        let content;
+        obj = window.sessionStorage.getItem(name);
+        if (!obj || Object.keys(obj).length === 0) obj = window.localStorage.getItem(name);
+        if (!obj || Object.keys(obj).length === 0) return '';
+        try {
+            obj = JSON.parse(obj);
+        } catch (e) {
+            return '';
+        }
+        if (debug) {
+            return '';
+        }
+        if (obj.dataType === 'string') {
+            content = obj.content;
+        } else if (obj.dataType === 'number') {
+            content = Number(obj.content);
+        } else if (obj.dataType === 'boolean') {
+            // eslint-disable-next-line no-eval
+            content = eval(obj.content);
+        } else if (obj.dataType === 'object') {
+            content = obj.content;
+        }
+        return content;
+    }else{
+        let { name } = params;
+        let storageStr = '';
+        if (name === 'access_token') {
+          storageStr = localStorage.getItem('ACCESS_TOKEN');
+        } else if (name === 'tenantId') {
+          // 暂定当前租户 curTenantId
+          storageStr = localStorage.getItem('curTenantId');
+        } else if (name === 'tenantName') {
+            // 暂定当前租户 curTenantId
+            storageStr = localStorage.getItem('curTenantName');
+          }else if (name === 'userName') {
+          // 获取当前登录用户名称
+          storageStr = localStorage.getItem('userName');
+        } else if (name === 'userId') {
+          // 获取当前登录用户Id
+          storageStr = localStorage.getItem('userId');
+        }
+        return storageStr;
+    }
+    
+}
+export default getStore;
+
+export const getUserName = () => {
+    if(tokenInSessionStor){
+        const userInfo = getStore({ name: 'userInfo' });
+        if (userInfo && Object.keys(userInfo).length > 0 && userInfo.username) {
+            return userInfo.username;
+        }
+        return '';
+    }else{
+        const name = getStore({ name: 'userName' });
+    if (!name) {
+      return '';
+    }
+    return name;
+    }
+    
+};

package/tsconfig.json

@@ -1,37 +1,37 @@
-{
-  "compilerOptions": {
-    "target": "esnext",
-    "module": "esnext",
-    "moduleResolution": "node",
-    "resolveJsonModule": true,
-    "importHelpers": true,
-    "jsx": "preserve",
-    "esModuleInterop": true,
-    "sourceMap": true,
-    "baseUrl": "./",
-    "strict": true,
-    "paths": {
-      "@/*": ["src/*"],
-      "@@/*": ["src/.umi/*"]
-    },
-    "allowSyntheticDefaultImports": true
-  },
-  "include": [
-    "mock/**/*",
-    "src/**/*",
-    "config/**/*",
-    ".umirc.js",
-    "typings.d.ts"
-  ],
-  "exclude": [
-    "node_modules",
-    "lib",
-    "es",
-    "dist",
-    "typings",
-    "**/__test__",
-    "test",
-    "docs",
-    "tests"
-  ]
-}
+{
+  "compilerOptions": {
+    "target": "esnext",
+    "module": "esnext",
+    "moduleResolution": "node",
+    "resolveJsonModule": true,
+    "importHelpers": true,
+    "jsx": "preserve",
+    "esModuleInterop": true,
+    "sourceMap": true,
+    "baseUrl": "./",
+    "strict": true,
+    "paths": {
+      "@/*": ["src/*"],
+      "@@/*": ["src/.umi/*"]
+    },
+    "allowSyntheticDefaultImports": true
+  },
+  "include": [
+    "mock/**/*",
+    "src/**/*",
+    "config/**/*",
+    ".umirc.js",
+    "typings.d.ts"
+  ],
+  "exclude": [
+    "node_modules",
+    "lib",
+    "es",
+    "dist",
+    "typings",
+    "**/__test__",
+    "test",
+    "docs",
+    "tests"
+  ]
+}

package/typings.d.ts

@@ -1,10 +1,10 @@
-declare module '*.css';
-declare module '*.less';
-declare module '*.png';
-declare module '*.svg' {
-  export function ReactComponent(
-    props: React.SVGProps<SVGSVGElement>,
-  ): React.ReactElement;
-  const url: string;
-  export default url;
-}
+declare module '*.css';
+declare module '*.less';
+declare module '*.png';
+declare module '*.svg' {
+  export function ReactComponent(
+    props: React.SVGProps<SVGSVGElement>,
+  ): React.ReactElement;
+  const url: string;
+  export default url;
+}