diff --git a/webapp/packages/supersonic-fe/src/app.tsx b/webapp/packages/supersonic-fe/src/app.tsx index 2af0917f7..3bd8ae5f3 100644 --- a/webapp/packages/supersonic-fe/src/app.tsx +++ b/webapp/packages/supersonic-fe/src/app.tsx @@ -40,9 +40,9 @@ export const initialStateConfig = { }; const getAuthCodes = (params: any) => { - const { currentUser, systemConfigAdmins } = params; + const { currentUser } = params; const codes = []; - if (Array.isArray(systemConfigAdmins) && systemConfigAdmins.includes(currentUser?.staffName)) { + if (currentUser?.superAdmin) { codes.push(ROUTE_AUTH_CODES.SYSTEM_ADMIN); } return codes; @@ -65,16 +65,7 @@ export async function getInitialState(): Promise<{ return undefined; }; - const fetchSystemConfigPermission = async () => { - try { - const { code, data } = await getSystemConfig(); - if (code === 200) { - const { admins } = data; - return [...admins]; - } - } catch (error) {} - return []; - }; + let currentUser: any; if (!window.location.pathname.includes('login')) { currentUser = await fetchUserInfo(); @@ -87,11 +78,8 @@ export async function getInitialState(): Promise<{ } } - const systemConfigAdmins = await fetchSystemConfigPermission(); - const authCodes = getAuthCodes({ currentUser, - systemConfigAdmins, }); return { diff --git a/webapp/packages/supersonic-fe/src/pages/Login/index.tsx b/webapp/packages/supersonic-fe/src/pages/Login/index.tsx index 804880a9e..6e9d87301 100644 --- a/webapp/packages/supersonic-fe/src/pages/Login/index.tsx +++ b/webapp/packages/supersonic-fe/src/pages/Login/index.tsx @@ -4,6 +4,7 @@ import { Button, Form, Input, message, Space } from 'antd'; import { LockOutlined, UserOutlined } from '@ant-design/icons'; import RegisterForm from './components/RegisterForm'; // import ForgetPwdForm from './components/ForgetPwdForm'; +import { ROUTE_AUTH_CODES } from '../../../config/routes'; import S2Icon, { ICON } from '@/components/S2Icon'; import React, { useState } from 'react'; import { useForm } from 'antd/lib/form/Form'; @@ -30,7 +31,11 @@ const LoginPage: React.FC = () => { ...queryUserData, staffName: queryUserData.staffName || queryUserData.name, }; - setInitialState({ ...initialState, currentUser }); + const authCodes = Array.isArray(initialState?.authCodes) ? initialState?.authCodes : []; + if (queryUserData.superAdmin) { + authCodes.push(ROUTE_AUTH_CODES.SYSTEM_ADMIN); + } + setInitialState({ ...initialState, currentUser, authCodes }); } history.push('/'); return; diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/DataSourceFieldForm.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/DataSourceFieldForm.tsx index a90e16e53..281b9de5b 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/DataSourceFieldForm.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/DataSourceFieldForm.tsx @@ -57,7 +57,7 @@ const FieldForm: React.FC = ({ fields, sql, onFieldChange, onSqlChange }) const columns = [ { - title: '字段名称', + title: '英文名称', dataIndex: 'fieldName', width: 100, }, diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/components/MetricFilter.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/components/MetricFilter.tsx index 1336d492d..22429fc51 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/components/MetricFilter.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/components/MetricFilter.tsx @@ -71,7 +71,7 @@ const MetricFilter: React.FC = ({ initFilterValues = {}, onFiltersChange
} onSearch={(value) => { onSearch(value); diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/SemanticGraph/components/NodeInfoDrawer.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/SemanticGraph/components/NodeInfoDrawer.tsx index c98e61e63..6ec4fb925 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/SemanticGraph/components/NodeInfoDrawer.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/SemanticGraph/components/NodeInfoDrawer.tsx @@ -76,7 +76,7 @@ const NodeInfoDrawer: React.FC = ({ title: '基本信息', children: [ { - label: '字段名称', + label: '英文名称', value: bizName, }, { diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassDimensionTable.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassDimensionTable.tsx index 416813885..9fb3e5449 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassDimensionTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassDimensionTable.tsx @@ -142,7 +142,7 @@ const ClassDimensionTable: React.FC = ({ domainManger, dispatch }) => { dataIndex: 'key', title: '维度搜索', hideInTable: true, - renderFormItem: () => , + renderFormItem: () => , }, { dataIndex: 'name', @@ -158,7 +158,7 @@ const ClassDimensionTable: React.FC = ({ domainManger, dispatch }) => { }, { dataIndex: 'bizName', - title: '字段名称', + title: '英文名称', search: false, // order: 9, }, diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassMetricTable.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassMetricTable.tsx index b7797c200..8599ba101 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassMetricTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassMetricTable.tsx @@ -107,7 +107,7 @@ const ClassMetricTable: React.FC = ({ domainManger, dispatch }) => { dataIndex: 'key', title: '指标搜索', hideInTable: true, - renderFormItem: () => , + renderFormItem: () => , }, { dataIndex: 'alias', @@ -118,7 +118,7 @@ const ClassMetricTable: React.FC = ({ domainManger, dispatch }) => { }, { dataIndex: 'bizName', - title: '字段名称', + title: '英文名称', search: false, }, { diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/CommonDimension/CommonDimensionInfoModal.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/CommonDimension/CommonDimensionInfoModal.tsx index 90174b5e9..6c33a76c8 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/CommonDimension/CommonDimensionInfoModal.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/CommonDimension/CommonDimensionInfoModal.tsx @@ -149,7 +149,7 @@ const CommonDimensionInfoModal: React.FC = ({ diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/CommonDimension/CommonDimensionTable.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/CommonDimension/CommonDimensionTable.tsx index ed461a866..536a5df54 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/CommonDimension/CommonDimensionTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/CommonDimension/CommonDimensionTable.tsx @@ -57,7 +57,7 @@ const CommonDimensionTable: React.FC = ({ domainManger, dispatch }) => { dataIndex: 'key', title: '维度搜索', hideInTable: true, - renderFormItem: () => , + renderFormItem: () => , }, { dataIndex: 'name', @@ -66,7 +66,7 @@ const CommonDimensionTable: React.FC = ({ domainManger, dispatch }) => { }, { dataIndex: 'bizName', - title: '字段名称', + title: '英文名称', search: false, // order: 9, }, diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/DimensionInfoModal.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/DimensionInfoModal.tsx index eb65415f9..1270cd421 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/DimensionInfoModal.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/DimensionInfoModal.tsx @@ -178,8 +178,8 @@ const DimensionInfoModal: React.FC = ({ diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricInfoCreateForm.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricInfoCreateForm.tsx index dbc09a872..c04db3cfc 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricInfoCreateForm.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/MetricInfoCreateForm.tsx @@ -273,8 +273,8 @@ const MetricInfoCreateForm: React.FC = ({ diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ModelTable.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ModelTable.tsx index 358b404e4..83dd01ede 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ModelTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ModelTable.tsx @@ -67,7 +67,7 @@ const ModelTable: React.FC = ({ modelList, disabledEdit = false, onModelC dataIndex: 'key', title: '模型搜索', hideInTable: true, - renderFormItem: () => , + renderFormItem: () => , }, { dataIndex: 'alias',