Compare commits
10 Commits
main
...
develop-20
| Author | SHA1 | Date | |
|---|---|---|---|
|
80a524fb10 | ||
|
|
9b2abb7847 | ||
|
|
17eee73f37 | ||
|
|
59f2bd3095 | ||
|
|
8f4c349c90 | ||
|
|
80fb10fa46 | ||
|
|
c403dadb93 | ||
|
|
c7a389af19 | ||
|
|
d22a920b1b | ||
|
|
1cedf4a53e |
3
.gitignore
vendored
Normal file
3
.gitignore
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
node_modules
|
||||
package-lock.json
|
||||
src/.umi
|
||||
@ -1,3 +1,12 @@
|
||||
/*
|
||||
* @version: V1.0.0
|
||||
* @Date: 2023-12-28 11:28:34
|
||||
* @LastEditors: lzq
|
||||
* @LastEditTime: 2023-12-29 15:41:41
|
||||
* @company: 睿展数据
|
||||
* @FilePath: \salpa-web\config\defaultSettings.ts
|
||||
* @Descripttion:
|
||||
*/
|
||||
import { Settings as LayoutSettings } from '@ant-design/pro-layout';
|
||||
|
||||
const Settings: LayoutSettings & {
|
||||
@ -7,7 +16,7 @@ const Settings: LayoutSettings & {
|
||||
} = {
|
||||
navTheme: 'light',
|
||||
headerTheme: 'light',
|
||||
primaryColor: '#722ED1',
|
||||
primaryColor: '#2B50C4',
|
||||
layout: 'top',
|
||||
splitMenus: true,
|
||||
contentWidth: 'Fluid',
|
||||
|
||||
@ -1,3 +1,12 @@
|
||||
/*
|
||||
* @version: V1.0.0
|
||||
* @Date: 2023-12-28 11:28:34
|
||||
* @LastEditors: lzq
|
||||
* @LastEditTime: 2023-12-28 13:31:22
|
||||
* @company: 睿展数据
|
||||
* @FilePath: \salpa-web\config\proxy.ts
|
||||
* @Descripttion:
|
||||
*/
|
||||
/**
|
||||
* 在生产环境 代理是无法生效的，所以这里没有生产环境的配置
|
||||
* -------------------------------
|
||||
@ -10,7 +19,7 @@ export default {
|
||||
dev: {
|
||||
'/api/': {
|
||||
// target: 'http://192.168.103.172:8080',
|
||||
target: 'http://192.168.2.58:8080',
|
||||
target: 'http://192.168.1.217:9080',
|
||||
changeOrigin: true,
|
||||
pathRewrite: { '^/api': '' },
|
||||
},
|
||||
@ -19,7 +28,7 @@ export default {
|
||||
target: 'http://192.168.113.251:8080',
|
||||
|
||||
changeOrigin: true,
|
||||
}
|
||||
},
|
||||
},
|
||||
test: {
|
||||
'/api/': {
|
||||
|
||||
57256
package-lock.json
generated
57256
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
159
src/app.tsx
159
src/app.tsx
@ -5,77 +5,98 @@
|
||||
*
|
||||
* */
|
||||
|
||||
import RightContent from '@/components/RightContent'
|
||||
import type { Settings as LayoutSettings } from '@ant-design/pro-layout'
|
||||
import { PageLoading } from '@ant-design/pro-layout'
|
||||
import type { RunTimeLayoutConfig } from 'umi'
|
||||
import { history, Link } from 'umi'
|
||||
import type { Settings as LayoutSettings } from '@ant-design/pro-layout';
|
||||
import { PageLoading } from '@ant-design/pro-layout';
|
||||
import type { RunTimeLayoutConfig } from 'umi';
|
||||
import { history, Link } from 'umi';
|
||||
// import Footer from '@/components/Footer';
|
||||
import { BookOutlined, LinkOutlined } from '@ant-design/icons'
|
||||
import defaultSettings from '../config/defaultSettings'
|
||||
import iconStyle from '../public/樽海鞘_图案.svg'
|
||||
import { getRoutersInfo, getUserInfo } from './services/session'
|
||||
const isDev = process.env.NODE_ENV === 'development'
|
||||
const loginPath = '/user/login'
|
||||
import { BookOutlined, LinkOutlined } from '@ant-design/icons';
|
||||
import defaultSettings from '../config/defaultSettings';
|
||||
import iconStyle from '../public/樽海鞘_图案.svg';
|
||||
import './modelstyle.css';
|
||||
import { getRoutersInfo, getUserInfo } from './services/session';
|
||||
import { login } from './services/login';
|
||||
import { setSessionToken } from './access';
|
||||
import { Route } from 'react-router';
|
||||
const isDev = process.env.NODE_ENV === 'development';
|
||||
const loginPath = '/user/login';
|
||||
|
||||
/** 获取用户信息比较慢的时候会展示一个 loading */
|
||||
export const initialStateConfig = {
|
||||
loading: <PageLoading />
|
||||
loading: <PageLoading />,
|
||||
};
|
||||
|
||||
const fetchUserInfo = async (setInitialState: any) => {
|
||||
try {
|
||||
const resp = await getUserInfo()
|
||||
if (resp === undefined || resp.code !== 200) {
|
||||
const response = await login({ username: 'admin', password: 'admin123' });
|
||||
const current = new Date();
|
||||
const expireTime = current.setTime(current.getTime() + 1000 * 12 * 60 * 60);
|
||||
setSessionToken(response.token, response.token, expireTime);
|
||||
const { user, permissions } = await getUserInfo()
|
||||
await setInitialState((s) => ({
|
||||
...s,
|
||||
currentUser: { permissions, user },
|
||||
}));
|
||||
let menus = await getRoutersInfo();
|
||||
if (window.localStorage.getItem('redirectPath')?.indexOf('?') !== -1) {
|
||||
menus = menus.map((item) => {
|
||||
return {
|
||||
...item,
|
||||
hideInMenu: true,
|
||||
};
|
||||
});
|
||||
}
|
||||
setInitialState((preInitialState: any) => ({
|
||||
...preInitialState,
|
||||
menus,
|
||||
})).then(() => {
|
||||
const path = window.localStorage.getItem("redirectPath") || loginPath
|
||||
history.push(path)
|
||||
})
|
||||
} else {
|
||||
return { ...resp.user, permissions: resp.permissions } as API.CurrentUser
|
||||
}
|
||||
} catch (error) {
|
||||
console.log(error);
|
||||
|
||||
history.push(loginPath)
|
||||
}
|
||||
return undefined
|
||||
}
|
||||
|
||||
/**
|
||||
* @see https://umijs.org/zh-CN/plugins/plugin-initial-state
|
||||
* */
|
||||
export async function getInitialState(): Promise<{
|
||||
settings?: Partial<LayoutSettings>
|
||||
currentUser?: API.CurrentUser
|
||||
loading?: boolean
|
||||
fetchUserInfo?: () => Promise<API.CurrentUser | undefined>
|
||||
settings?: Partial<LayoutSettings>;
|
||||
currentUser?: API.CurrentUser;
|
||||
loading?: boolean;
|
||||
fetchUserInfo?: (params: any) => Promise<API.CurrentUser | undefined>;
|
||||
}> {
|
||||
const fetchUserInfo = async () => {
|
||||
try {
|
||||
console.log(1111111111111111111111111111111)
|
||||
const resp = await getUserInfo()
|
||||
if (resp === undefined || resp.code !== 200) {
|
||||
history.push(loginPath)
|
||||
} else {
|
||||
return { ...resp.user, permissions: resp.permissions } as API.CurrentUser
|
||||
}
|
||||
} catch (error) {
|
||||
history.push(loginPath)
|
||||
}
|
||||
return undefined
|
||||
}
|
||||
// 如果是登录页面，不执行
|
||||
if (history.location.pathname !== loginPath) {
|
||||
console.log(222222222222222222222222222222)
|
||||
const currentUser = await fetchUserInfo()
|
||||
return {
|
||||
settings: defaultSettings,
|
||||
currentUser,
|
||||
fetchUserInfo
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
fetchUserInfo,
|
||||
settings: defaultSettings
|
||||
}
|
||||
settings: defaultSettings,
|
||||
};
|
||||
}
|
||||
|
||||
// ProLayout 支持的api https://procomponents.ant.design/components/layout
|
||||
export const layout: RunTimeLayoutConfig = ({ initialState, setInitialState }) => {
|
||||
return {
|
||||
rightContentRender: () => <RightContent />,
|
||||
rightContentRender: () => <div />,
|
||||
waterMarkProps: {
|
||||
content: initialState?.currentUser?.userName
|
||||
content: initialState?.currentUser?.userName,
|
||||
},
|
||||
// footerRender: () => <Footer />,
|
||||
onPageChange: () => {
|
||||
const { location } = history
|
||||
// 如果没有登录，重定向到 login
|
||||
if (!initialState?.currentUser && location.pathname !== loginPath) {
|
||||
history.push(loginPath)
|
||||
onPageChange: async () => {
|
||||
if (!initialState?.currentUser?.userId) {
|
||||
fetchUserInfo?.(setInitialState);
|
||||
}
|
||||
},
|
||||
pure: !!new URLSearchParams(window.location.search), // 删除自带页面
|
||||
// pure:true,
|
||||
links: isDev
|
||||
? [
|
||||
<Link key="openapi" to="/umi/plugin/openapi" target="_blank">
|
||||
@ -85,27 +106,41 @@ export const layout: RunTimeLayoutConfig = ({ initialState, setInitialState }) =
|
||||
<Link key="docs" to="/~docs">
|
||||
<BookOutlined />
|
||||
<span>业务组件文档</span>
|
||||
</Link>
|
||||
</Link>,
|
||||
]
|
||||
: [],
|
||||
menuHeaderRender: undefined,
|
||||
menuHeaderRender: false,
|
||||
menu: {
|
||||
// 每当 initialState?.currentUser?.userid 发生修改时重新执行 request
|
||||
params: {
|
||||
userId: initialState?.currentUser?.userId
|
||||
userId: initialState?.currentUser?.userId,
|
||||
},
|
||||
request: async () => {
|
||||
if (!initialState?.currentUser?.userId) {
|
||||
return []
|
||||
let path = window.location.pathname
|
||||
if (window.location.search) {
|
||||
path += '?hideInMenu=true'
|
||||
}
|
||||
window.localStorage.setItem("redirectPath", path)
|
||||
return [];
|
||||
}
|
||||
// initialState.currentUser 中包含了所有用户信息
|
||||
const menus = await getRoutersInfo()
|
||||
const menus = await getRoutersInfo();
|
||||
// const hideInMenu = urlParams.get('hideInMenu'); // 替换 'hideInMenu' 为你要获取的参数名
|
||||
// if (hideInMenu) {
|
||||
// menus = menus.map((item) => {
|
||||
// return {
|
||||
// ...item,
|
||||
// hideInMenu: true,
|
||||
// };
|
||||
// });
|
||||
// }
|
||||
setInitialState((preInitialState: any) => ({
|
||||
...preInitialState,
|
||||
menus
|
||||
}))
|
||||
return menus
|
||||
}
|
||||
menus,
|
||||
}));
|
||||
return menus;
|
||||
},
|
||||
},
|
||||
// 自定义 403 页面
|
||||
// unAccessible: <div>unAccessible</div>,
|
||||
@ -116,9 +151,9 @@ export const layout: RunTimeLayoutConfig = ({ initialState, setInitialState }) =
|
||||
{children}
|
||||
{!props.location?.pathname?.includes('/login')}
|
||||
</div>
|
||||
)
|
||||
);
|
||||
},
|
||||
...initialState?.settings,
|
||||
logo: <img src={iconStyle} />
|
||||
}
|
||||
}
|
||||
logo: <img src={iconStyle} />,
|
||||
};
|
||||
};
|
||||
|
||||
@ -5,111 +5,119 @@
|
||||
* @Last Modified time: 2022-02-21 11:12:12
|
||||
*/
|
||||
|
||||
import { SortableElement } from 'react-sortable-hoc';
|
||||
import { CloseOutlined } from '@ant-design/icons';
|
||||
import { useModel, useHistory, useAliveController } from 'umi'
|
||||
import { SortableElement } from 'react-sortable-hoc';
|
||||
import { useAliveController, useHistory, useModel } from 'umi';
|
||||
import styles from './index.less';
|
||||
|
||||
interface ITab {
|
||||
value: {
|
||||
hash: string
|
||||
key: string
|
||||
title: string
|
||||
pathname: string
|
||||
query: Record<string, any>
|
||||
search: string
|
||||
state: any
|
||||
keepAliveName: string
|
||||
}
|
||||
hash: string;
|
||||
key: string;
|
||||
title: string;
|
||||
pathname: string;
|
||||
query: Record<string, any>;
|
||||
search: string;
|
||||
state: any;
|
||||
keepAliveName: string;
|
||||
};
|
||||
// index: number
|
||||
tabIndex: number
|
||||
tabIndex: number;
|
||||
}
|
||||
|
||||
const SortableTab = (props: ITab) => {
|
||||
const history = useHistory()
|
||||
const history = useHistory();
|
||||
const { value, tabIndex } = props;
|
||||
const { active, dispatch, tabWidth, tarnslateX, showTabs, tabsWidth, tabList } = useModel("system");
|
||||
const { dropScope } = useAliveController()
|
||||
const closable = tabList.length > 1
|
||||
return (
|
||||
const { active, dispatch, tabWidth, tarnslateX, showTabs, tabsWidth, tabList } =
|
||||
useModel('system');
|
||||
const { dropScope } = useAliveController();
|
||||
const closable = tabList.length > 1;
|
||||
const urlParams = new URLSearchParams(window.location.search);
|
||||
const hideInMenu = urlParams.get('hideInMenu'); // 替换 'hideInMenu' 为你要获取的参数名
|
||||
return !hideInMenu ? (
|
||||
<div
|
||||
className={`${styles.tabItem} link-tab ${tabIndex === active ? styles.active : ''}`}
|
||||
title={value.title}
|
||||
onClick={() => {
|
||||
// translate了 多少个
|
||||
const tarnsNumber = Math.floor(tarnslateX / tabWidth)
|
||||
const tarnsNumber = Math.floor(tarnslateX / tabWidth);
|
||||
// 隐藏了多少
|
||||
const isBeyondDistance = tarnslateX - tarnsNumber * tabWidth;
|
||||
if (tabIndex - tarnsNumber <= 0) {
|
||||
dispatch({ type: 'CHANGESTATE', payload: { active: tabIndex, tarnslateX: tarnslateX - isBeyondDistance } })
|
||||
history.push({ ...value })
|
||||
dispatch({
|
||||
type: 'CHANGESTATE',
|
||||
payload: { active: tabIndex, tarnslateX: tarnslateX - isBeyondDistance },
|
||||
});
|
||||
history.push({ ...value });
|
||||
return;
|
||||
}
|
||||
// 是否在可视区域内
|
||||
if ((tabIndex - tarnsNumber + 1) === showTabs) {
|
||||
if (tabIndex - tarnsNumber + 1 === showTabs) {
|
||||
// 需要移动的距离计算
|
||||
const x = (tabIndex + 1) * (tabWidth as number) - (tabsWidth - 100)
|
||||
dispatch({ type: 'CHANGESTATE', payload: { active: tabIndex, tarnslateX: x } })
|
||||
history.push({ ...value })
|
||||
const x = (tabIndex + 1) * (tabWidth as number) - (tabsWidth - 100);
|
||||
dispatch({ type: 'CHANGESTATE', payload: { active: tabIndex, tarnslateX: x } });
|
||||
history.push({ ...value });
|
||||
return;
|
||||
}
|
||||
dispatch({ type: 'CHANGESTATE', payload: { active: tabIndex } })
|
||||
history.push({ ...value })
|
||||
|
||||
}}>
|
||||
dispatch({ type: 'CHANGESTATE', payload: { active: tabIndex } });
|
||||
history.push({ ...value });
|
||||
}}
|
||||
>
|
||||
{value.title}
|
||||
{
|
||||
closable && (
|
||||
{closable && (
|
||||
<div
|
||||
className={styles.closeIcon}
|
||||
onClick={(e) => {
|
||||
e.stopPropagation()
|
||||
const currentName = value.keepAliveName
|
||||
e.stopPropagation();
|
||||
const currentName = value.keepAliveName;
|
||||
// 如果关闭激活中的 KeepAlive Tab，需要先离开当前路由
|
||||
// 触发 KeepAlive unactivated 后再进行 drop
|
||||
const localTablist = JSON.parse(JSON.stringify(tabList))
|
||||
localTablist.splice(tabIndex, 1)
|
||||
const localTablist = JSON.parse(JSON.stringify(tabList));
|
||||
localTablist.splice(tabIndex, 1);
|
||||
let activeIndex: number = 0;
|
||||
if (tabIndex < active) {
|
||||
// 我在前面
|
||||
activeIndex = active - 1;
|
||||
dropScope(currentName)
|
||||
dropScope(currentName);
|
||||
} else if (tabIndex === active) {
|
||||
// 点击后面当前窗口
|
||||
if (active > 0) {
|
||||
activeIndex = active - 1
|
||||
activeIndex = active - 1;
|
||||
const timer = setTimeout(() => {
|
||||
clearTimeout(timer)
|
||||
history.push(tabList[activeIndex])
|
||||
}, 10)
|
||||
|
||||
clearTimeout(timer);
|
||||
history.push(tabList[activeIndex]);
|
||||
}, 10);
|
||||
} else {
|
||||
activeIndex = 0
|
||||
activeIndex = 0;
|
||||
const timer = setTimeout(() => {
|
||||
clearTimeout(timer)
|
||||
history.push(localTablist[activeIndex])
|
||||
}, 10)
|
||||
clearTimeout(timer);
|
||||
history.push(localTablist[activeIndex]);
|
||||
}, 10);
|
||||
}
|
||||
const unlisten = history.listen(() => {
|
||||
unlisten()
|
||||
unlisten();
|
||||
const dropTimer = setTimeout(() => {
|
||||
clearTimeout(dropTimer)
|
||||
dropScope(currentName)
|
||||
}, 10)
|
||||
})
|
||||
clearTimeout(dropTimer);
|
||||
dropScope(currentName);
|
||||
}, 10);
|
||||
});
|
||||
} else {
|
||||
activeIndex = active
|
||||
dropScope(currentName)
|
||||
activeIndex = active;
|
||||
dropScope(currentName);
|
||||
}
|
||||
dispatch({ type: "CHANGESTATE", payload: { tabList: localTablist, active: activeIndex, tarnslateX: 0 } })
|
||||
}}>
|
||||
dispatch({
|
||||
type: 'CHANGESTATE',
|
||||
payload: { tabList: localTablist, active: activeIndex, tarnslateX: 0 },
|
||||
});
|
||||
}}
|
||||
>
|
||||
<CloseOutlined />
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
)}
|
||||
</div>
|
||||
) : (
|
||||
<div />
|
||||
);
|
||||
}
|
||||
};
|
||||
|
||||
export default SortableElement(SortableTab);
|
||||
|
||||
@ -5,238 +5,246 @@
|
||||
* @Last Modified time: 2022-02-21 11:12:12
|
||||
*/
|
||||
|
||||
import { DownOutlined, MoreOutlined } from '@ant-design/icons';
|
||||
import { Divider, Dropdown, Menu } from 'antd';
|
||||
import { useEffect, useRef } from 'react';
|
||||
import { SortableContainer } from 'react-sortable-hoc';
|
||||
import { Dropdown, Menu, Divider } from 'antd';
|
||||
import { DownOutlined, MoreOutlined } from '@ant-design/icons';
|
||||
import { useModel, history, useAliveController } from 'umi'
|
||||
import SortableTab from './components/SortableTab'
|
||||
import { history, useAliveController, useModel } from 'umi';
|
||||
import SortableTab from './components/SortableTab';
|
||||
import styles from './index.less';
|
||||
|
||||
|
||||
const SortableList = SortableContainer(() => {
|
||||
const tabsRef = useRef<any>()
|
||||
const { tabList, tarnslateX } = useModel("system");
|
||||
const tabsRef = useRef<any>();
|
||||
const { tabList, tarnslateX } = useModel('system');
|
||||
return (
|
||||
<div className={`${styles.tabList}`} ref={tabsRef} >
|
||||
<div className={`${styles.tabList}`} ref={tabsRef}>
|
||||
{/* <div className={styles.linkTabs} style={{ transform: `translateX(-${tarnslateX}px)` }}> */}
|
||||
<div className={styles.linkTabs} style={{ transform: `translateX(-${tarnslateX}px)` }}>
|
||||
{
|
||||
tabList.map((value, index: number) => (
|
||||
{tabList.map((value, index: number) => (
|
||||
<SortableTab key={`item-${index}`} index={index} value={value} tabIndex={index} />
|
||||
))
|
||||
}
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
</div >
|
||||
);
|
||||
});
|
||||
|
||||
const KeepAliveTabs = () => {
|
||||
const { initialState } = useModel<any>("@@initialState");
|
||||
const { initialState } = useModel<any>('@@initialState');
|
||||
const { collapsed } = initialState;
|
||||
const { tabList, dispatch, active, showTabs, tabsWidth, tabWidth, tarnslateX } = useModel("system");
|
||||
const { tabList, dispatch, active, showTabs, tabsWidth, tabWidth, tarnslateX } =
|
||||
useModel('system');
|
||||
const { dropScope, clear } = useAliveController();
|
||||
|
||||
const onSortEnd = ({ oldIndex, newIndex }: { oldIndex: number, newIndex: number }) => {
|
||||
const dataSource = JSON.parse(JSON.stringify(tabList))
|
||||
const activeItem = dataSource[active as number]
|
||||
const onSortEnd = ({ oldIndex, newIndex }: { oldIndex: number; newIndex: number }) => {
|
||||
const dataSource = JSON.parse(JSON.stringify(tabList));
|
||||
const activeItem = dataSource[active as number];
|
||||
dataSource.splice(newIndex, 0, dataSource.splice(oldIndex, 1)[0]);
|
||||
const movedActiveIndex = dataSource.findIndex((item: string) => item === activeItem)
|
||||
dispatch({ type: "CHANGESTATE", payload: { tabList: dataSource, active: movedActiveIndex } })
|
||||
}
|
||||
|
||||
const movedActiveIndex = dataSource.findIndex((item: string) => item === activeItem);
|
||||
dispatch({ type: 'CHANGESTATE', payload: { tabList: dataSource, active: movedActiveIndex } });
|
||||
};
|
||||
|
||||
// 当前的索引值active showTabs一排能展示多少个
|
||||
// 计算应该在菜单展示的菜单有哪些
|
||||
|
||||
const arr: any[] = []
|
||||
const arr: any[] = [];
|
||||
if (tabList.length > showTabs) {
|
||||
// 前面隐藏的元素
|
||||
const beforeTab = Math.floor(tarnslateX / tabWidth);
|
||||
// 后面隐藏的元素
|
||||
const afterTab = Math.floor(tarnslateX / tabWidth) + showTabs
|
||||
const afterTab = Math.floor(tarnslateX / tabWidth) + showTabs;
|
||||
tabList.forEach((item, index) => {
|
||||
if (index < beforeTab) {
|
||||
arr.push(item)
|
||||
arr.push(item);
|
||||
}
|
||||
if (index >= afterTab) {
|
||||
arr.push(item)
|
||||
arr.push(item);
|
||||
}
|
||||
})
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
const menuMore = (
|
||||
<Menu onClick={(e) => {
|
||||
<Menu
|
||||
onClick={(e) => {
|
||||
// 判断点击多余tab的展示移动距离是多少
|
||||
// 计算超出了多少
|
||||
// tabsWidth tabWidth showTabs 100是右边操作的距离目前写死
|
||||
const isBeyondDistance = ((showTabs as number) * (tabWidth as number)) - (tabsWidth as number) + 100;
|
||||
const isBeyondDistance =
|
||||
(showTabs as number) * (tabWidth as number) - (tabsWidth as number) + 100;
|
||||
// TODO 找到当前点击的索引值
|
||||
const curClickIndex = tabList?.findIndex(item => item.pathname === e.key) as number;
|
||||
const curClickIndex = tabList?.findIndex((item) => item.pathname === e.key) as number;
|
||||
// 能展示多少个
|
||||
const totalShowIndex = (showTabs as number) - 1;
|
||||
if (curClickIndex > totalShowIndex) {
|
||||
// 计算移动的距离
|
||||
const x = (curClickIndex - totalShowIndex) * (tabWidth as number) + isBeyondDistance
|
||||
dispatch({ type: 'CHANGESTATE', payload: { tarnslateX: x, active: curClickIndex } })
|
||||
const x = (curClickIndex - totalShowIndex) * (tabWidth as number) + isBeyondDistance;
|
||||
dispatch({ type: 'CHANGESTATE', payload: { tarnslateX: x, active: curClickIndex } });
|
||||
} else {
|
||||
dispatch({ type: 'CHANGESTATE', payload: { tarnslateX: tabWidth * curClickIndex, active: curClickIndex } })
|
||||
}
|
||||
history.push({ ...tabList[curClickIndex] })
|
||||
}}>
|
||||
{
|
||||
arr.map(item => {
|
||||
return <Menu.Item key={item.pathname}> {item.title}</Menu.Item>
|
||||
})
|
||||
dispatch({
|
||||
type: 'CHANGESTATE',
|
||||
payload: { tarnslateX: tabWidth * curClickIndex, active: curClickIndex },
|
||||
});
|
||||
}
|
||||
history.push({ ...tabList[curClickIndex] });
|
||||
}}
|
||||
>
|
||||
{arr.map((item) => {
|
||||
return <Menu.Item key={item.pathname}> {item.title}</Menu.Item>;
|
||||
})}
|
||||
</Menu>
|
||||
);
|
||||
const menu = (
|
||||
<Menu onClick={(e) => {
|
||||
<Menu
|
||||
onClick={(e) => {
|
||||
let activeIndex: number = 0;
|
||||
const localTablist = JSON.parse(JSON.stringify(tabList))
|
||||
const localTablist = JSON.parse(JSON.stringify(tabList));
|
||||
switch (e.key) {
|
||||
case "closeCurrent": {
|
||||
const currentName = localTablist[active].keepAliveName
|
||||
case 'closeCurrent': {
|
||||
const currentName = localTablist[active].keepAliveName;
|
||||
if (active > 0) {
|
||||
activeIndex = active - 1
|
||||
activeIndex = active - 1;
|
||||
const timer = setTimeout(() => {
|
||||
clearTimeout(timer)
|
||||
history.push(tabList[activeIndex])
|
||||
}, 10)
|
||||
clearTimeout(timer);
|
||||
history.push(tabList[activeIndex]);
|
||||
}, 10);
|
||||
} else {
|
||||
activeIndex = 0
|
||||
activeIndex = 0;
|
||||
const timer = setTimeout(() => {
|
||||
clearTimeout(timer)
|
||||
history.push(localTablist[activeIndex])
|
||||
}, 10)
|
||||
clearTimeout(timer);
|
||||
history.push(localTablist[activeIndex]);
|
||||
}, 10);
|
||||
}
|
||||
const unlisten = history.listen(() => {
|
||||
unlisten()
|
||||
unlisten();
|
||||
const dropTimer = setTimeout(() => {
|
||||
clearTimeout(dropTimer)
|
||||
dropScope(currentName)
|
||||
}, 10)
|
||||
})
|
||||
localTablist.splice(active, 1)
|
||||
dispatch({ type: "CHANGESTATE", payload: { tabList: localTablist, active: activeIndex, tarnslateX: 0 } })
|
||||
clearTimeout(dropTimer);
|
||||
dropScope(currentName);
|
||||
}, 10);
|
||||
});
|
||||
localTablist.splice(active, 1);
|
||||
dispatch({
|
||||
type: 'CHANGESTATE',
|
||||
payload: { tabList: localTablist, active: activeIndex, tarnslateX: 0 },
|
||||
});
|
||||
break;
|
||||
}
|
||||
case "closeOther": {
|
||||
case 'closeOther': {
|
||||
const needDelete = localTablist.filter((item: any, index: number) => index !== active);
|
||||
const needUpdate = localTablist.filter((item: any, index: number) => index === active);
|
||||
needDelete.forEach((item: any) => dropScope(item.keepAliveName));
|
||||
dispatch({ type: "CHANGESTATE", payload: { tabList: needUpdate, active: 0, tarnslateX: 0 } })
|
||||
dispatch({
|
||||
type: 'CHANGESTATE',
|
||||
payload: { tabList: needUpdate, active: 0, tarnslateX: 0 },
|
||||
});
|
||||
break;
|
||||
}
|
||||
case "closeAll": {
|
||||
case 'closeAll': {
|
||||
const unlisten = history.listen(() => {
|
||||
unlisten()
|
||||
unlisten();
|
||||
const dropTimer = setTimeout(() => {
|
||||
clearTimeout(dropTimer)
|
||||
clear()
|
||||
}, 10)
|
||||
})
|
||||
clearTimeout(dropTimer);
|
||||
clear();
|
||||
}, 10);
|
||||
});
|
||||
const timer = setTimeout(() => {
|
||||
clearTimeout(timer)
|
||||
history.push("/")
|
||||
}, 10)
|
||||
dispatch({ type: "CHANGESTATE", payload: { tabList: [], active: 0, tarnslateX: 0 } })
|
||||
clearTimeout(timer);
|
||||
history.push('/');
|
||||
}, 10);
|
||||
dispatch({ type: 'CHANGESTATE', payload: { tabList: [], active: 0, tarnslateX: 0 } });
|
||||
break;
|
||||
}
|
||||
case "closeLeft": {
|
||||
case 'closeLeft': {
|
||||
const needDelete = localTablist.filter((item: any, index: number) => index < active);
|
||||
const needUpdate = localTablist.filter((item: any, index: number) => index >= active);
|
||||
needDelete.forEach((item: any) => dropScope(item.keepAliveName));
|
||||
dispatch({ type: "CHANGESTATE", payload: { tabList: needUpdate, active: 0, tarnslateX: 0 } })
|
||||
dispatch({
|
||||
type: 'CHANGESTATE',
|
||||
payload: { tabList: needUpdate, active: 0, tarnslateX: 0 },
|
||||
});
|
||||
break;
|
||||
}
|
||||
case "closeRight": {
|
||||
case 'closeRight': {
|
||||
const needDelete = localTablist.filter((item: any, index: number) => index > active);
|
||||
const needUpdate = localTablist.filter((item: any, index: number) => index <= active);
|
||||
needDelete.forEach((item: any) => dropScope(item.keepAliveName));
|
||||
dispatch({ type: "CHANGESTATE", payload: { tabList: needUpdate, tarnslateX: 0 } })
|
||||
dispatch({ type: 'CHANGESTATE', payload: { tabList: needUpdate, tarnslateX: 0 } });
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
}}>
|
||||
}}
|
||||
>
|
||||
<Menu.Item key="closeCurrent">关闭当前标签</Menu.Item>
|
||||
<Menu.Item key="closeOther">关闭其他标签</Menu.Item>
|
||||
<Menu.Item key="closeAll">关闭全部标签</Menu.Item>
|
||||
<Menu.Item key="closeLeft" disabled={active === 0}>关闭当前左边标签</Menu.Item>
|
||||
<Menu.Item key="closeRight" disabled={active === tabList.length - 1}>关闭当前右边标签</Menu.Item>
|
||||
<Menu.Item key="closeLeft" disabled={active === 0}>
|
||||
关闭当前左边标签
|
||||
</Menu.Item>
|
||||
<Menu.Item key="closeRight" disabled={active === tabList.length - 1}>
|
||||
关闭当前右边标签
|
||||
</Menu.Item>
|
||||
</Menu>
|
||||
);
|
||||
|
||||
|
||||
|
||||
useEffect(() => {
|
||||
|
||||
window.onresize = () => {
|
||||
const width = document.getElementById("contentContainer") ? document.getElementById("contentContainer")!.getBoundingClientRect()!.width : 0;
|
||||
dispatch({ type: "CHANGESTATE", payload: { tabsWidth: width, tarnslateX: 0 } })
|
||||
}
|
||||
const width = document.getElementById('contentContainer')
|
||||
? document.getElementById('contentContainer')!.getBoundingClientRect()!.width
|
||||
: 0;
|
||||
dispatch({ type: 'CHANGESTATE', payload: { tabsWidth: width, tarnslateX: 0 } });
|
||||
};
|
||||
|
||||
const timer = setTimeout(() => {
|
||||
const width = document.getElementById("contentContainer") ? document.getElementById("contentContainer")!.getBoundingClientRect()!.width : 0;
|
||||
dispatch({ type: "CHANGESTATE", payload: { tabsWidth: width } })
|
||||
const width = document.getElementById('contentContainer')
|
||||
? document.getElementById('contentContainer')!.getBoundingClientRect()!.width
|
||||
: 0;
|
||||
dispatch({ type: 'CHANGESTATE', payload: { tabsWidth: width } });
|
||||
}, 100);
|
||||
return () => {
|
||||
clearTimeout(timer)
|
||||
}
|
||||
}, [collapsed])
|
||||
|
||||
clearTimeout(timer);
|
||||
};
|
||||
}, [collapsed]);
|
||||
|
||||
useEffect(() => {
|
||||
const timer = setTimeout(() => {
|
||||
// 需要重新计算拿到当前tab的宽度
|
||||
const itemWidth = document.getElementsByClassName("link-tab")[0] ? document.getElementsByClassName("link-tab")[0]!.getBoundingClientRect().width : 120;
|
||||
const itemWidth = document.getElementsByClassName('link-tab')[0]
|
||||
? document.getElementsByClassName('link-tab')[0]!.getBoundingClientRect().width
|
||||
: 120;
|
||||
//计算一排能展示多少个tab 需要减去操作占用的空间100
|
||||
const isShowTabs = Math.ceil((tabsWidth as number - 100) / itemWidth);
|
||||
const isShowTabs = Math.ceil(((tabsWidth as number) - 100) / itemWidth);
|
||||
if (itemWidth > 0 && tabWidth > 0) {
|
||||
dispatch({ type: "CHANGESTATE", payload: { showTabs: isShowTabs, tabWidth: itemWidth } })
|
||||
dispatch({ type: 'CHANGESTATE', payload: { showTabs: isShowTabs, tabWidth: itemWidth } });
|
||||
}
|
||||
}, 100);
|
||||
return () => {
|
||||
clearTimeout(timer)
|
||||
}
|
||||
}, [tabsWidth])
|
||||
|
||||
|
||||
clearTimeout(timer);
|
||||
};
|
||||
}, [tabsWidth]);
|
||||
|
||||
return (
|
||||
// <div className={styles.tabs} style={{ width: initialState?.collapsed ? "calc(100vw - 41px)" : "calc(100vw - 249px)" }}>
|
||||
<div className={styles.tabs} id="contentContainer">
|
||||
<div className={!!new URLSearchParams(window.location.search) ? 'hideContent' : styles.tabs} id="contentContainer">
|
||||
{tabList.length > 0 && <SortableList onSortEnd={onSortEnd} axis={'x'} distance={1} />}
|
||||
<div className={`${styles.tabLeftMenu} ${tabList.length >= showTabs && styles.boxShadow}`}>
|
||||
{
|
||||
tabList.length > showTabs && (
|
||||
{tabList.length > showTabs && (
|
||||
<>
|
||||
<Dropdown overlay={menuMore} className={styles.tabMore}>
|
||||
<a className="ant-dropdown-link" onClick={e => e.preventDefault()}>
|
||||
<a className="ant-dropdown-link" onClick={(e) => e.preventDefault()}>
|
||||
<MoreOutlined />
|
||||
</a>
|
||||
</Dropdown>
|
||||
<Divider type='vertical' />
|
||||
<Divider type="vertical" />
|
||||
</>
|
||||
)
|
||||
}
|
||||
{
|
||||
tabList.length > 1 && (
|
||||
)}
|
||||
{tabList.length > 1 && (
|
||||
<Dropdown overlay={menu} className={styles.menuRight}>
|
||||
<a className="ant-dropdown-link" onClick={e => e.preventDefault()}>
|
||||
<a className="ant-dropdown-link" onClick={(e) => e.preventDefault()}>
|
||||
操作 <DownOutlined />
|
||||
</a>
|
||||
</Dropdown>
|
||||
)
|
||||
}
|
||||
|
||||
)}
|
||||
</div>
|
||||
|
||||
</div>
|
||||
);
|
||||
}
|
||||
};
|
||||
|
||||
export default KeepAliveTabs;
|
||||
|
||||
@ -27,6 +27,11 @@ body {
|
||||
-moz-osx-font-smoothing: grayscale;
|
||||
}
|
||||
|
||||
|
||||
.hideContent{
|
||||
display: none;
|
||||
}
|
||||
|
||||
ul,
|
||||
ol {
|
||||
list-style: none;
|
||||
@ -56,29 +61,28 @@ ol {
|
||||
}
|
||||
}
|
||||
|
||||
// .ant-layout{
|
||||
// background: #fff;
|
||||
// }
|
||||
// .ant-layout-header{
|
||||
// //display: none;
|
||||
// }
|
||||
|
||||
.ant-layout{
|
||||
background: #fff;
|
||||
}
|
||||
.ant-layout-header{
|
||||
//display: none;
|
||||
}
|
||||
|
||||
#contentContainer{
|
||||
//display: none;
|
||||
}
|
||||
.ant-pro-right-content{
|
||||
display: none;
|
||||
}
|
||||
.ant-modal-mask{
|
||||
background-color: rgba(255, 0, 0, 0);
|
||||
}
|
||||
.chiner-modal{
|
||||
background-color: rgba(255, 0, 0, 0);
|
||||
}
|
||||
.ant-pro-top-nav-header-logo{
|
||||
display: none;
|
||||
}
|
||||
.ant-pro-top-nav-header-main-left{
|
||||
min-width: 0px;
|
||||
}
|
||||
// #contentContainer{
|
||||
// //display: none;
|
||||
// }
|
||||
// .ant-pro-right-content{
|
||||
// display: none;
|
||||
// }
|
||||
// .ant-modal-mask{
|
||||
// background-color: rgba(255, 0, 0, 0);
|
||||
// }
|
||||
// .chiner-modal{
|
||||
// background-color: rgba(255, 0, 0, 0);
|
||||
// }
|
||||
// .ant-pro-top-nav-header-logo{
|
||||
// display: none;
|
||||
// }
|
||||
// .ant-pro-top-nav-header-main-left{
|
||||
// min-width: 0px;
|
||||
// }
|
||||
|
||||
149
src/modelstyle.css
Normal file
149
src/modelstyle.css
Normal file
@ -0,0 +1,149 @@
|
||||
body .ant-layout{
|
||||
background: #fff;
|
||||
}
|
||||
|
||||
/*ant-btn*/
|
||||
body .ant-btn:focus,
|
||||
body .ant-btn:hover {
|
||||
color: #2B50C4;
|
||||
border-color: #2B50C4;
|
||||
background: #fff;
|
||||
}
|
||||
body .ant-btn:active {
|
||||
color:#042281;
|
||||
border-color:#042281;
|
||||
background:#fff
|
||||
}
|
||||
body .ant-btn-primary {
|
||||
color: #fff;
|
||||
border-color: #233A82;
|
||||
background: #233A82;
|
||||
}
|
||||
body .ant-btn-primary:focus,
|
||||
body .ant-btn-primary:hover {
|
||||
color: #fff;
|
||||
border-color: #2B50C4;
|
||||
background: #2B50C4;
|
||||
}
|
||||
body .ant-btn-primary:active {
|
||||
color: #fff;
|
||||
border-color: #042281;
|
||||
background: #042281;
|
||||
}
|
||||
html {
|
||||
--antd-wave-shadow-color:#233A82 !important;
|
||||
}
|
||||
|
||||
|
||||
body .ant-input:hover {
|
||||
border-color: #233A82;
|
||||
}
|
||||
body .ant-input-affix-wrapper-focused,
|
||||
body .ant-input-affix-wrapper:focus {
|
||||
border-color:#233A82;
|
||||
box-shadow:0 0 0 2px rgba(35, 58, 130, .2);
|
||||
}
|
||||
body .ant-input-affix-wrapper-status-error:not(.ant-input-affix-wrapper-disabled):not(.ant-input-affix-wrapper-borderless).ant-input-affix-wrapper-focused,
|
||||
body .ant-input-affix-wrapper-status-error:not(.ant-input-affix-wrapper-disabled):not(.ant-input-affix-wrapper-borderless).ant-input-affix-wrapper:focus {
|
||||
box-shadow:0 0 0 2px rgba(35, 58, 130, .2);
|
||||
}
|
||||
body .ant-input-affix-wrapper-status-warning:not(.ant-input-affix-wrapper-disabled):not(.ant-input-affix-wrapper-borderless).ant-input-affix-wrapper-focused,
|
||||
body .ant-input-affix-wrapper-status-warning:not(.ant-input-affix-wrapper-disabled):not(.ant-input-affix-wrapper-borderless).ant-input-affix-wrapper:focus {
|
||||
box-shadow:0 0 0 2px rgba(35, 58, 130, .2);
|
||||
}
|
||||
body .ant-input-search-rtl>.ant-input-group>.ant-input-affix-wrapper-focused,
|
||||
body .ant-input-search-rtl>.ant-input-group>.ant-input-affix-wrapper:hover {
|
||||
border-right-color:#233A82;
|
||||
}
|
||||
body .ant-input-affix-wrapper:not(.ant-input-affix-wrapper-disabled):hover {
|
||||
border-color: #233A82;
|
||||
}
|
||||
|
||||
body .ant-select:not(.ant-select-disabled):hover .ant-select-selector {
|
||||
border-color: #233A82;
|
||||
}
|
||||
body .ant-select-status-error.ant-select:not(.ant-select-disabled):not(.ant-select-customize-input):not(.ant-pagination-size-changer).ant-select-focused .ant-select-selector,
|
||||
body .ant-select-status-error.ant-select:not(.ant-select-disabled):not(.ant-select-customize-input):not(.ant-pagination-size-changer).ant-select-open .ant-select-selector {
|
||||
box-shadow:0 0 0 2px rgba(35, 58, 130, .2);
|
||||
}
|
||||
body .ant-select-status-warning.ant-select:not(.ant-select-disabled):not(.ant-select-customize-input):not(.ant-pagination-size-changer).ant-select-focused .ant-select-selector,
|
||||
body .ant-select-status-warning.ant-select:not(.ant-select-disabled):not(.ant-select-customize-input):not(.ant-pagination-size-changer).ant-select-open .ant-select-selector {
|
||||
box-shadow:0 0 0 2px rgba(35, 58, 130, .2);
|
||||
}
|
||||
body .ant-select-focused:not(.ant-select-disabled).ant-select:not(.ant-select-customize-input) .ant-select-selector {
|
||||
border-color:#233A82;
|
||||
box-shadow:0 0 0 2px rgba(35, 58, 130, .2);
|
||||
}
|
||||
body .ant-input-group-addon .ant-select-focused .ant-select-selector,
|
||||
body .ant-input-group-addon .ant-select-open .ant-select-selector {
|
||||
color:#233A82;
|
||||
}
|
||||
|
||||
body .namediv:hover {
|
||||
color: #233A82;
|
||||
}
|
||||
|
||||
body .ant-select-item-option-selected:not(.ant-select-item-option-disabled) {
|
||||
color: #1d2129;
|
||||
background: #e9ecf4;
|
||||
}
|
||||
body .ant-select-item-option-selected:hover{
|
||||
background: #e9ecf4;
|
||||
}
|
||||
body .ant-select-item-option-selected:not(.ant-select-item-option-disabled) .ant-select-item-option-state {
|
||||
color: #233a82;
|
||||
}
|
||||
|
||||
|
||||
body .ant-input-status-warning:not(.ant-input-disabled):not(.ant-input-borderless).ant-input-focused,
|
||||
body .ant-input-status-warning:not(.ant-input-disabled):not(.ant-input-borderless).ant-input:focus {
|
||||
box-shadow:0 0 0 2px rgba(35, 58, 130, .2);
|
||||
}
|
||||
|
||||
|
||||
body .ant-input-affix-wrapper-focused,
|
||||
body .ant-input-affix-wrapper:focus {
|
||||
border-color:#233a82;
|
||||
box-shadow:0 0 0 2px rgba(35, 58, 130, .2);
|
||||
}
|
||||
body .ant-input-focused,
|
||||
body .ant-input:focus {
|
||||
border-color:#233a82;
|
||||
box-shadow:0 0 0 2px rgba(35, 58, 130, .2);
|
||||
}
|
||||
body .ant-pagination-options-quick-jumper input-focused,
|
||||
body .ant-pagination-options-quick-jumper input:focus {
|
||||
border-color:#233a82;
|
||||
box-shadow:0 0 0 2px rgba(35, 58, 130, .2);
|
||||
}
|
||||
body .ant-pagination-simple .ant-pagination-simple-pager input:focus {
|
||||
border-color:#233a82;
|
||||
box-shadow:0 0 0 2px rgba(35, 58, 130, .2);
|
||||
}
|
||||
|
||||
body .ant-input-status-error:not(.ant-input-disabled):not(.ant-input-borderless).ant-input-focused,
|
||||
body .ant-input-status-error:not(.ant-input-disabled):not(.ant-input-borderless).ant-input:focus {
|
||||
box-shadow:0 0 0 2px rgba(35, 58, 130, .2);
|
||||
}
|
||||
|
||||
body .spandes:hover{
|
||||
color:#233a82;
|
||||
}
|
||||
body .cardstyle:hover .deletestyle:hover {
|
||||
color: #233a82;
|
||||
}
|
||||
|
||||
body .ant-pagination-item-active {
|
||||
border-color: #233a82;
|
||||
}
|
||||
body .ant-pagination-item:hover a {
|
||||
color: #233a82;
|
||||
}
|
||||
body .ant-pagination-item:hover {
|
||||
border-color: #233a82;
|
||||
}
|
||||
body .ant-pagination-next:hover .ant-pagination-item-link,
|
||||
body .ant-pagination-prev:hover .ant-pagination-item-link {
|
||||
color: #233a82;
|
||||
border-color: #233a82;
|
||||
}
|
||||
@ -84,7 +84,7 @@ const Login: React.FC = () => {
|
||||
// 如果失败去设置用户错误信息
|
||||
setUserLoginState({status: 'error', type: 'account', massage: response.msg});
|
||||
message.error(response.msg);
|
||||
getCaptchaCode();
|
||||
// getCaptchaCode();
|
||||
}
|
||||
} catch (error) {
|
||||
clearSessionToken();
|
||||
@ -93,13 +93,13 @@ const Login: React.FC = () => {
|
||||
defaultMessage: '登录失败，请重试！',
|
||||
});
|
||||
message.error(defaultLoginFailureMessage);
|
||||
getCaptchaCode();
|
||||
// getCaptchaCode();
|
||||
}
|
||||
};
|
||||
const { status, type: loginType, massage } = userLoginState;
|
||||
|
||||
useEffect(() => {
|
||||
getCaptchaCode();
|
||||
// getCaptchaCode();
|
||||
}, []);
|
||||
|
||||
return (
|
||||
|
||||
@ -1,30 +1,23 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
|
||||
<meta
|
||||
name="keywords"
|
||||
content="antd,umi,umijs,ant design,Scaffolding, layout, Ant Design, project, Pro, admin, console, homepage, out-of-the-box, middle and back office, solution, component library"
|
||||
/>
|
||||
<meta
|
||||
name="description"
|
||||
content="
|
||||
An out-of-box UI solution for enterprise applications as a React boilerplate."
|
||||
/>
|
||||
<meta
|
||||
name="description"
|
||||
content="
|
||||
Out-of-the-box mid-stage front-end/design solution."
|
||||
/>
|
||||
<meta
|
||||
name="viewport"
|
||||
content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
|
||||
/>
|
||||
<meta name="keywords"
|
||||
content="antd,umi,umijs,ant design,Scaffolding, layout, Ant Design, project, Pro, admin, console, homepage, out-of-the-box, middle and back office, solution, component library" />
|
||||
<meta name="description" content="
|
||||
An out-of-box UI solution for enterprise applications as a React boilerplate." />
|
||||
<meta name="description" content="
|
||||
Out-of-the-box mid-stage front-end/design solution." />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
|
||||
<title>Salpa</title>
|
||||
<link rel="icon" href="<%= context.config.publicPath +'樽海鞘_图案.svg'%>" type="image/x-icon" />
|
||||
</head>
|
||||
<body>
|
||||
<script src="https://cdn.jsdelivr.net/npm/xlsx@latest/dist/xlsx.full.min.js"></script>
|
||||
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<noscript>
|
||||
<div class="noscript-container">
|
||||
Hi there! Please
|
||||
@ -45,10 +38,12 @@
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
#root {
|
||||
background-repeat: no-repeat;
|
||||
background-size: 100% auto;
|
||||
}
|
||||
|
||||
.noscript-container {
|
||||
display: flex;
|
||||
align-content: center;
|
||||
@ -58,16 +53,19 @@
|
||||
font-family: 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode',
|
||||
Geneva, Verdana, sans-serif;
|
||||
}
|
||||
|
||||
.noscript-enableJS {
|
||||
padding-right: 3px;
|
||||
padding-left: 3px;
|
||||
}
|
||||
|
||||
.page-loading-warp {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
padding: 98px;
|
||||
}
|
||||
|
||||
.ant-spin {
|
||||
position: absolute;
|
||||
display: none;
|
||||
@ -169,7 +167,8 @@
|
||||
height: 14px;
|
||||
}
|
||||
|
||||
@media all and (-ms-high-contrast: none), (-ms-high-contrast: active) {
|
||||
@media all and (-ms-high-contrast: none),
|
||||
(-ms-high-contrast: active) {
|
||||
.ant-spin-blur {
|
||||
background: #fff;
|
||||
opacity: 0.5;
|
||||
@ -202,34 +201,27 @@
|
||||
}
|
||||
}
|
||||
</style>
|
||||
<div
|
||||
style="
|
||||
<!-- <div style="
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
height: 100%;
|
||||
min-height: 420px;
|
||||
"
|
||||
>
|
||||
">
|
||||
<h1>Salpa</h1>
|
||||
<div class="page-loading-warp">
|
||||
<div class="ant-spin ant-spin-lg ant-spin-spinning">
|
||||
<span class="ant-spin-dot ant-spin-dot-spin"
|
||||
><i class="ant-spin-dot-item"></i><i class="ant-spin-dot-item"></i
|
||||
><i class="ant-spin-dot-item"></i><i class="ant-spin-dot-item"></i
|
||||
></span>
|
||||
<span class="ant-spin-dot ant-spin-dot-spin"><i class="ant-spin-dot-item"></i><i
|
||||
class="ant-spin-dot-item"></i><i class="ant-spin-dot-item"></i><i class="ant-spin-dot-item"></i></span>
|
||||
</div>
|
||||
</div>
|
||||
<div style="display: flex; align-items: center; justify-content: center">
|
||||
<img
|
||||
src="<%= context.config.publicPath +'樽海鞘_图案.svg'%>"
|
||||
width="32"
|
||||
style="margin-right: 8px"
|
||||
/>
|
||||
<img src="<%= context.config.publicPath +'樽海鞘_图案.svg'%>" width="32" style="margin-right: 8px" />
|
||||
Salpa
|
||||
</div>
|
||||
</div> -->
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
|
||||
@ -1,8 +1,6 @@
|
||||
// import { getUserConfig } from '../../lib/middle';
|
||||
import { openLoading, closeLoading, STATUS } from '../common';
|
||||
import allLangData from '../../lang';
|
||||
import { setMemoryCache } from '../../lib/cache';
|
||||
import { CONFIG } from '../../lib/variable';
|
||||
import { openLoading } from '../common';
|
||||
|
||||
export const SAVE_USER_CONFIG_SUCCESS = 'SAVE_USER_CONFIG_SUCCESS'; // 保存成功
|
||||
export const SAVE_USER_CONFIG_FAIL = 'SAVE_USER_CONFIG_FAIL'; // 保存失败
|
||||
@ -52,13 +50,16 @@ export const getUserConfigData = () => {
|
||||
export const saveUserConfigSome = (data) => {
|
||||
return (dispatch, getState) => {
|
||||
const configData = getState()?.config?.data || [];
|
||||
const config = {...configData[0], ...data};
|
||||
saveUserConfigData(configData.map((d, index) => {
|
||||
const config = { ...configData[0], ...data };
|
||||
saveUserConfigData(
|
||||
configData.map((d, index) => {
|
||||
if (index === 0) {
|
||||
return config;
|
||||
}
|
||||
return d;
|
||||
}), allLangData[config.lang].updateConfig)(dispatch);
|
||||
}),
|
||||
allLangData[config.lang].updateConfig,
|
||||
)(dispatch);
|
||||
};
|
||||
};
|
||||
|
||||
@ -87,26 +88,31 @@ export const removeHistory = (h) => {
|
||||
return (dispatch, getState) => {
|
||||
const configData = getState()?.config?.data || [];
|
||||
const config = configData[0];
|
||||
saveUserConfigData(configData.map((d, index) => {
|
||||
saveUserConfigData(
|
||||
configData.map((d, index) => {
|
||||
if (index === 0) {
|
||||
return {
|
||||
...d,
|
||||
projectHistories: (d.projectHistories || []).filter(p => (p.path !== h.path)),
|
||||
}
|
||||
projectHistories: (d.projectHistories || []).filter((p) => p.path !== h.path),
|
||||
};
|
||||
}
|
||||
return d;
|
||||
}), allLangData[config.lang].updateConfig)(dispatch);
|
||||
}
|
||||
}),
|
||||
allLangData[config.lang].updateConfig,
|
||||
)(dispatch);
|
||||
};
|
||||
};
|
||||
|
||||
export const addHistory = (data, cb) => {
|
||||
return (dispatch, getState) => {
|
||||
const configData = getState()?.config?.data || [];
|
||||
const config = configData[0];
|
||||
saveUserConfigData(configData.map((d, index) => {
|
||||
saveUserConfigData(
|
||||
configData.map((d, index) => {
|
||||
if (index === 0) {
|
||||
const tempProjectHistories = [...(d.projectHistories || [])]
|
||||
.filter(h => h.path !== data.path); // 移除当前的项目信息
|
||||
const tempProjectHistories = [...(d.projectHistories || [])].filter(
|
||||
(h) => h.path !== data.path,
|
||||
); // 移除当前的项目信息
|
||||
tempProjectHistories.unshift(data);
|
||||
return {
|
||||
...d,
|
||||
@ -114,15 +120,19 @@ export const addHistory = (data, cb) => {
|
||||
};
|
||||
}
|
||||
return d;
|
||||
}), allLangData[config.lang].updateConfig, cb)(dispatch);
|
||||
}
|
||||
}),
|
||||
allLangData[config.lang].updateConfig,
|
||||
cb,
|
||||
)(dispatch);
|
||||
};
|
||||
};
|
||||
|
||||
export const updateHistory = (oldData, newData) => {
|
||||
return (dispatch, getState) => {
|
||||
const configData = getState()?.config?.data || [];
|
||||
const config = configData[0];
|
||||
saveUserConfigData(configData.map((d, index) => {
|
||||
saveUserConfigData(
|
||||
configData.map((d, index) => {
|
||||
if (index === 0) {
|
||||
return {
|
||||
...d,
|
||||
@ -140,6 +150,8 @@ export const updateHistory = (oldData, newData) => {
|
||||
};
|
||||
}
|
||||
return d;
|
||||
}), allLangData[config.lang].updateConfig)(dispatch);
|
||||
}
|
||||
}),
|
||||
allLangData[config.lang].updateConfig,
|
||||
)(dispatch);
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,94 +1,109 @@
|
||||
/* eslint-disable no-const-assign */
|
||||
/* eslint-disable no-undef */
|
||||
import _ from 'lodash/object'
|
||||
import moment from 'moment'
|
||||
import { openLoading, closeLoading, STATUS, optReset } from '../common'
|
||||
import { reduceProject, transformationData } from '../../lib/datasource_util'
|
||||
import { setMemoryCache } from '../../lib/cache'
|
||||
import * as template from '../../lib/template'
|
||||
import { compareVersion } from '../../lib/update'
|
||||
import version from '../../../../../package.json'
|
||||
import _ from 'lodash/object';
|
||||
import moment from 'moment';
|
||||
import version from '../../../../../package.json';
|
||||
import { setMemoryCache } from '../../lib/cache';
|
||||
import { transformationData } from '../../lib/datasource_util';
|
||||
import * as template from '../../lib/template';
|
||||
import { closeLoading, openLoading, optReset, STATUS } from '../common';
|
||||
// import {emptyProject} from '../../lib/template/empty';
|
||||
import { removeHistory, addHistory, updateHistory } from '../config'
|
||||
import { projectSuffix } from '../../profile'
|
||||
import allLangData from '../../lang'
|
||||
import allLangData from '../../lang';
|
||||
import {
|
||||
basename, saveVersion, deleteFile, ensureDirectoryExistence, openFileOrDirPath, renameVersion, dirSplicing, fileExists, saveJsonPromiseAs, updateAllVersion, saveJsonPromise, getBackupAllFile, writeLog, deleteVersion, openProjectFilePath, readJsonPromise, getAllVersionProject
|
||||
} from '../../lib/middle'
|
||||
basename,
|
||||
deleteFile,
|
||||
deleteVersion,
|
||||
dirSplicing,
|
||||
ensureDirectoryExistence,
|
||||
fileExists,
|
||||
getAllVersionProject,
|
||||
getBackupAllFile,
|
||||
openFileOrDirPath,
|
||||
openProjectFilePath,
|
||||
readJsonPromise,
|
||||
renameVersion,
|
||||
saveJsonPromise,
|
||||
saveJsonPromiseAs,
|
||||
saveVersion,
|
||||
updateAllVersion,
|
||||
writeLog,
|
||||
} from '../../lib/middle';
|
||||
import { projectSuffix } from '../../profile';
|
||||
import { addHistory, removeHistory, updateHistory } from '../config';
|
||||
/*
|
||||
* 核心的action 负责整个项目的保存和删除
|
||||
* */
|
||||
* 核心的action 负责整个项目的保存和删除
|
||||
* */
|
||||
/*
|
||||
* action 类型
|
||||
*/
|
||||
export const SAVE_PROJECT_SUCCESS = 'SAVE_PROJECT_SUCCESS' // 保存成功
|
||||
export const SAVE_PROJECT_FAIL = 'SAVE_PROJECT_FAIL' // 保存失败
|
||||
export const SAVE_PROJECT_SUCCESS = 'SAVE_PROJECT_SUCCESS'; // 保存成功
|
||||
export const SAVE_PROJECT_FAIL = 'SAVE_PROJECT_FAIL'; // 保存失败
|
||||
|
||||
export const READ_PROJECT_SUCCESS = 'READ_PROJECT_SUCCESS' // 读取成功
|
||||
export const READ_PROJECT_FAIL = 'READ_PROJECT_FAIL' // 读取失败
|
||||
export const READ_PROJECT_SUCCESS = 'READ_PROJECT_SUCCESS'; // 读取成功
|
||||
export const READ_PROJECT_FAIL = 'READ_PROJECT_FAIL'; // 读取失败
|
||||
|
||||
export const CREATE_PROJECT_SUCCESS = 'CREATE_PROJECT_SUCCESS' // 创建成功
|
||||
export const CREATE_PROJECT_ERROR = 'CREATE_PROJECT_ERROR' // 创建失败
|
||||
export const CREATE_PROJECT_SUCCESS = 'CREATE_PROJECT_SUCCESS'; // 创建成功
|
||||
export const CREATE_PROJECT_ERROR = 'CREATE_PROJECT_ERROR'; // 创建失败
|
||||
|
||||
export const SAVE_VERSION_SUCCESS = 'SAVE_VERSION_SUCCESS' // 保存版本信息成功
|
||||
export const SAVE_VERSION_FAIL = 'SAVE_VERSION_FAIL' // 保存版本信息失败
|
||||
export const SAVE_VERSION_SUCCESS = 'SAVE_VERSION_SUCCESS'; // 保存版本信息成功
|
||||
export const SAVE_VERSION_FAIL = 'SAVE_VERSION_FAIL'; // 保存版本信息失败
|
||||
|
||||
export const SAVE_ALL_VERSION_SUCCESS = 'SAVE_ALL_VERSION_SUCCESS'
|
||||
export const SAVE_ALL_VERSION_FAIL = 'SAVE_ALL_VERSION_FAIL'
|
||||
export const SAVE_ALL_VERSION_SUCCESS = 'SAVE_ALL_VERSION_SUCCESS';
|
||||
export const SAVE_ALL_VERSION_FAIL = 'SAVE_ALL_VERSION_FAIL';
|
||||
|
||||
export const REMOVE_VERSION_SUCCESS = 'REMOVE_VERSION_SUCCESS' // 版本信息删除成功
|
||||
export const REMOVE_VERSION_SUCCESS = 'REMOVE_VERSION_SUCCESS'; // 版本信息删除成功
|
||||
|
||||
export const REMOVE_ALL_VERSION_SUCCESS = 'REMOVE_ALL_VERSION_SUCCESS' // 所有版本信息删除成功
|
||||
export const REMOVE_ALL_VERSION_SUCCESS = 'REMOVE_ALL_VERSION_SUCCESS'; // 所有版本信息删除成功
|
||||
|
||||
export const UPDATE_PROJECT = 'UPDATE_PROJECT' // 更新项目
|
||||
export const CLOSE_PROJECT = 'CLOSE_PROJECT' // 关闭项目
|
||||
export const UPDATE_PROJECT = 'UPDATE_PROJECT'; // 更新项目
|
||||
export const CLOSE_PROJECT = 'CLOSE_PROJECT'; // 关闭项目
|
||||
|
||||
export const UPDATE_PROJECT_INFO = 'UPDATE_PROJECT_INFO' // 更新项目信息
|
||||
export const UPDATE_PROJECT_INFO = 'UPDATE_PROJECT_INFO'; // 更新项目信息
|
||||
|
||||
export const updateProjectInfo = (info) => {
|
||||
return {
|
||||
type: UPDATE_PROJECT_INFO,
|
||||
data: info,
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
export const updateProject = (data) => {
|
||||
return {
|
||||
type: UPDATE_PROJECT,
|
||||
data,
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
const saveAllVersionSuccess = (data) => {
|
||||
return {
|
||||
type: SAVE_ALL_VERSION_SUCCESS,
|
||||
data,
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
const saveAllVersionFail = (err) => {
|
||||
return {
|
||||
type: SAVE_ALL_VERSION_FAIL,
|
||||
data: err,
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
const removeVersionSuccess = (versionInfo) => {
|
||||
return {
|
||||
type: REMOVE_VERSION_SUCCESS,
|
||||
data: versionInfo,
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
const saveVersionSuccess = (data, oldData) => {
|
||||
return {
|
||||
type: SAVE_VERSION_SUCCESS,
|
||||
data: { data, oldData },
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
const saveVersionFail = (err) => {
|
||||
return {
|
||||
type: SAVE_VERSION_FAIL,
|
||||
data: err,
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
const createProjectSuccess = (data, path) => {
|
||||
return {
|
||||
type: CREATE_PROJECT_SUCCESS,
|
||||
@ -97,82 +112,82 @@ const createProjectSuccess = (data, path) => {
|
||||
data,
|
||||
versionsData: [],
|
||||
},
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
const createProjectError = (error) => {
|
||||
return {
|
||||
type: CREATE_PROJECT_ERROR,
|
||||
data: error,
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
const saveProjectFail = (err) => {
|
||||
return {
|
||||
type: SAVE_PROJECT_FAIL,
|
||||
data: err,
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
const saveProjectSuccess = (data) => {
|
||||
return {
|
||||
type: SAVE_PROJECT_SUCCESS,
|
||||
data,
|
||||
}
|
||||
}
|
||||
let isSaving = false
|
||||
};
|
||||
};
|
||||
let isSaving = false;
|
||||
export const saveProject = (data, saveAs, callback) => {
|
||||
if (!isSaving) {
|
||||
// 此处为异步操作
|
||||
const time = moment().format('YYYY-M-D HH:mm:ss')
|
||||
const time = moment().format('YYYY-M-D HH:mm:ss');
|
||||
const tempData = {
|
||||
...data,
|
||||
createdTime: saveAs ? time : data.createdTime || time,
|
||||
updatedTime: time,
|
||||
version,
|
||||
}
|
||||
};
|
||||
return (dispatch, getState) => {
|
||||
const info = getState()?.core?.info
|
||||
const info = getState()?.core?.info;
|
||||
const getName = (p) => {
|
||||
const name = basename(p, '.json')
|
||||
return name.split('.')[0]
|
||||
}
|
||||
const name = basename(p, '.json');
|
||||
return name.split('.')[0];
|
||||
};
|
||||
if (saveAs) {
|
||||
const projectModelInfo = {
|
||||
projectName: data.name,
|
||||
jsonFile: typeof data === 'string' ? data : JSON.stringify(data, null, 2)
|
||||
}
|
||||
jsonFile: typeof data === 'string' ? data : JSON.stringify(data, null, 2),
|
||||
};
|
||||
// 保存操作
|
||||
if (data) {
|
||||
saveJsonPromiseAs(projectModelInfo).then(() => {
|
||||
getBackupAllFile(getState(), () => {
|
||||
setMemoryCache('data', tempData)
|
||||
callback && callback()
|
||||
dispatch(saveProjectSuccess(tempData))
|
||||
})
|
||||
})
|
||||
setMemoryCache('data', tempData);
|
||||
callback && callback();
|
||||
dispatch(saveProjectSuccess(tempData));
|
||||
});
|
||||
});
|
||||
} else {
|
||||
callback && callback(err)
|
||||
dispatch(saveProjectFail(err))
|
||||
callback && callback(err);
|
||||
dispatch(saveProjectFail(err));
|
||||
}
|
||||
} else {
|
||||
saveJsonPromise(info, tempData)
|
||||
.then(() => {
|
||||
getBackupAllFile(getState(), () => {
|
||||
isSaving = false
|
||||
setMemoryCache('data', tempData)
|
||||
callback && callback()
|
||||
dispatch(saveProjectSuccess(tempData))
|
||||
})
|
||||
isSaving = false;
|
||||
setMemoryCache('data', tempData);
|
||||
callback && callback();
|
||||
dispatch(saveProjectSuccess(tempData));
|
||||
});
|
||||
})
|
||||
.catch((err) => {
|
||||
isSaving = false
|
||||
callback && callback(err)
|
||||
dispatch(saveProjectFail(err))
|
||||
})
|
||||
}
|
||||
isSaving = false;
|
||||
callback && callback(err);
|
||||
dispatch(saveProjectFail(err));
|
||||
});
|
||||
}
|
||||
};
|
||||
}
|
||||
// return () => {};
|
||||
}
|
||||
};
|
||||
const readProjectSuccess = (data, versionsData, path, isDemoProject) => {
|
||||
return {
|
||||
type: READ_PROJECT_SUCCESS,
|
||||
@ -182,276 +197,314 @@ const readProjectSuccess = (data, versionsData, path, isDemoProject) => {
|
||||
data,
|
||||
versionsData,
|
||||
},
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
export const autoSaveProject = (data) => {
|
||||
// 此处为异步操作
|
||||
const time = moment().format('YYYY-M-D HH:mm:ss')
|
||||
const time = moment().format('YYYY-M-D HH:mm:ss');
|
||||
const tempData = {
|
||||
...data,
|
||||
updatedTime: time,
|
||||
version,
|
||||
}
|
||||
};
|
||||
return (dispatch, getState) => {
|
||||
const info = getState()?.core?.info
|
||||
const info = getState()?.core?.info;
|
||||
getBackupAllFile(getState(), () => {
|
||||
saveJsonPromise(info, tempData)
|
||||
.catch((err) => {
|
||||
writeLog(err)
|
||||
})
|
||||
})
|
||||
}
|
||||
}
|
||||
saveJsonPromise(info, tempData).catch((err) => {
|
||||
writeLog(err);
|
||||
});
|
||||
});
|
||||
};
|
||||
};
|
||||
export const removeVersionData = (title, versionInfo) => {
|
||||
return (dispatch, getState) => {
|
||||
const { data, info } = getState()?.core || {}
|
||||
dispatch(openLoading(title))
|
||||
deleteVersion(versionInfo, data, info)
|
||||
dispatch(removeVersionSuccess(versionInfo))
|
||||
dispatch(closeLoading(STATUS[1], null))
|
||||
}
|
||||
}
|
||||
const { data, info } = getState()?.core || {};
|
||||
dispatch(openLoading(title));
|
||||
deleteVersion(versionInfo, data, info);
|
||||
dispatch(removeVersionSuccess(versionInfo));
|
||||
dispatch(closeLoading(STATUS[1], null));
|
||||
};
|
||||
};
|
||||
|
||||
export const updateAllVersionData = (versionDataCallBack, title, dataSource) => {
|
||||
return (dispatch, getState) => {
|
||||
const { data, info, versionsData } = getState()?.core || {}
|
||||
const { data, info, versionsData } = getState()?.core || {};
|
||||
if (info) {
|
||||
dispatch(openLoading(title))
|
||||
const finalData = versionDataCallBack(versionsData)
|
||||
dispatch(autoSaveProject(dataSource))
|
||||
updateAllVersion(finalData, info, data).then(() => {
|
||||
dispatch(saveAllVersionSuccess(finalData))
|
||||
dispatch(closeLoading(STATUS[1], null))
|
||||
}).catch((err) => {
|
||||
dispatch(saveAllVersionFail(err))
|
||||
dispatch(closeLoading(STATUS[2], err))
|
||||
dispatch(openLoading(title));
|
||||
const finalData = versionDataCallBack(versionsData);
|
||||
dispatch(autoSaveProject(dataSource));
|
||||
updateAllVersion(finalData, info, data)
|
||||
.then(() => {
|
||||
dispatch(saveAllVersionSuccess(finalData));
|
||||
dispatch(closeLoading(STATUS[1], null));
|
||||
})
|
||||
.catch((err) => {
|
||||
dispatch(saveAllVersionFail(err));
|
||||
dispatch(closeLoading(STATUS[2], err));
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
export const saveVersionData = (versionData, oldVersion, dataSource, title) => {
|
||||
return (dispatch, getState) => {
|
||||
dispatch(openLoading(title))
|
||||
const info = getState()?.core?.info
|
||||
dispatch(openLoading(title));
|
||||
const info = getState()?.core?.info;
|
||||
return new Promise((res, rej) => {
|
||||
saveVersion(versionData, oldVersion, info, dataSource).then(() => {
|
||||
dispatch(saveVersionSuccess(versionData, oldVersion))
|
||||
dispatch(closeLoading(STATUS[1], null))
|
||||
res(versionData)
|
||||
}).catch((err) => {
|
||||
dispatch(saveVersionFail(err))
|
||||
rej(err)
|
||||
saveVersion(versionData, oldVersion, info, dataSource)
|
||||
.then(() => {
|
||||
dispatch(saveVersionSuccess(versionData, oldVersion));
|
||||
dispatch(closeLoading(STATUS[1], null));
|
||||
res(versionData);
|
||||
})
|
||||
})
|
||||
}
|
||||
}
|
||||
.catch((err) => {
|
||||
dispatch(saveVersionFail(err));
|
||||
rej(err);
|
||||
});
|
||||
});
|
||||
};
|
||||
};
|
||||
|
||||
export const renameProject = (newData, oldData, title, dataInfo) => {
|
||||
// 判断项目名和项目目录是否已经修改 该方法无只需触发loading操作的action
|
||||
return (dispatch, getState) => {
|
||||
dispatch(openLoading(title))
|
||||
dispatch(openLoading(title));
|
||||
// 1.需要调整项目文件 先新建 再删除
|
||||
const oldFilePath = dirSplicing(dataInfo.path, '')
|
||||
const newFilePath = dirSplicing(newData.path, `${newData.name}.${projectSuffix}.json`)
|
||||
const config = getState()?.config?.data[0]
|
||||
if (fileExists(newFilePath) && (oldFilePath !== newFilePath)) {
|
||||
dispatch(closeLoading(STATUS[2], allLangData[config.lang].createProjectExists))
|
||||
const oldFilePath = dirSplicing(dataInfo.path, '');
|
||||
const newFilePath = dirSplicing(newData.path, `${newData.name}.${projectSuffix}.json`);
|
||||
const config = getState()?.config?.data[0];
|
||||
if (fileExists(newFilePath) && oldFilePath !== newFilePath) {
|
||||
dispatch(closeLoading(STATUS[2], allLangData[config.lang].createProjectExists));
|
||||
} else {
|
||||
saveJsonPromise(newFilePath, _.omit({
|
||||
saveJsonPromise(
|
||||
newFilePath,
|
||||
_.omit(
|
||||
{
|
||||
...oldData,
|
||||
...newData,
|
||||
updatedTime: moment().format('YYYY-M-D HH:mm:ss'),
|
||||
}, ['path'])).then(() => {
|
||||
},
|
||||
['path'],
|
||||
),
|
||||
)
|
||||
.then(() => {
|
||||
if (oldFilePath !== newFilePath) {
|
||||
// 删除
|
||||
deleteFile(oldFilePath)
|
||||
deleteFile(oldFilePath);
|
||||
// 更新版本文件
|
||||
renameVersion(oldFilePath, newFilePath, oldData, newData)
|
||||
renameVersion(oldFilePath, newFilePath, oldData, newData);
|
||||
}
|
||||
// 2.需要更新用户配置文件
|
||||
updateHistory({
|
||||
updateHistory(
|
||||
{
|
||||
...oldData,
|
||||
path: oldFilePath,
|
||||
}, {
|
||||
},
|
||||
{
|
||||
describe: newData.describe || '',
|
||||
name: newData.name || '',
|
||||
avatar: newData.avatar || '',
|
||||
path: newFilePath,
|
||||
})(dispatch, getState)
|
||||
}).catch((err) => {
|
||||
dispatch(closeLoading(STATUS[2], err))
|
||||
},
|
||||
)(dispatch, getState);
|
||||
})
|
||||
.catch((err) => {
|
||||
dispatch(closeLoading(STATUS[2], err));
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
export const removeProject = (data, title) => {
|
||||
return (dispatch, getState) => {
|
||||
dispatch(openLoading(title))
|
||||
dispatch(openLoading(title));
|
||||
// 删除项目
|
||||
deleteFile(data.path)
|
||||
deleteFile(data.path);
|
||||
// 更新历史记录
|
||||
removeHistory(data)(dispatch, getState)
|
||||
}
|
||||
}
|
||||
removeHistory(data)(dispatch, getState);
|
||||
};
|
||||
};
|
||||
|
||||
export const createProject = (data, path, title, type) => {
|
||||
return (dispatch, getState) => {
|
||||
dispatch(openLoading(title))
|
||||
dispatch(openLoading(title));
|
||||
// 如果传递的路径则直接保存 反之则需要选取路径
|
||||
new Promise((res, rej) => {
|
||||
if (!path) {
|
||||
openFileOrDirPath([], ['openDirectory']).then((dir) => {
|
||||
res(dir)
|
||||
}).catch(rej)
|
||||
openFileOrDirPath([], ['openDirectory'])
|
||||
.then((dir) => {
|
||||
res(dir);
|
||||
})
|
||||
.catch(rej);
|
||||
} else {
|
||||
// 校验目录是否存在 如果不存在则需要创建
|
||||
ensureDirectoryExistence(path)
|
||||
res(path)
|
||||
ensureDirectoryExistence(path);
|
||||
res(path);
|
||||
}
|
||||
}).then((projectDir) => {
|
||||
})
|
||||
.then((projectDir) => {
|
||||
// 拼接路径和项目名
|
||||
const realFilePath = dirSplicing(projectDir, `${data.name}.${projectSuffix}.json`)
|
||||
const config = getState()?.config?.data[0]
|
||||
const realFilePath = dirSplicing(projectDir, `${data.name}.${projectSuffix}.json`);
|
||||
const config = getState()?.config?.data[0];
|
||||
if (fileExists(realFilePath)) {
|
||||
throw new Error(allLangData[config.lang].createProjectExists)
|
||||
throw new Error(allLangData[config.lang].createProjectExists);
|
||||
} else {
|
||||
const time = moment().format('YYYY-M-D HH:mm:ss')
|
||||
const time = moment().format('YYYY-M-D HH:mm:ss');
|
||||
const newData = {
|
||||
// ...emptyProject,
|
||||
...data,
|
||||
version,
|
||||
createdTime: time,
|
||||
updatedTime: time,
|
||||
}
|
||||
saveJsonPromise(realFilePath, newData).then(() => {
|
||||
addHistory({
|
||||
};
|
||||
saveJsonPromise(realFilePath, newData)
|
||||
.then(() => {
|
||||
addHistory(
|
||||
{
|
||||
describe: newData.describe || '',
|
||||
name: newData.name || '',
|
||||
avatar: newData.avatar || '',
|
||||
path: realFilePath,
|
||||
}, (err) => {
|
||||
},
|
||||
(err) => {
|
||||
if (!err) {
|
||||
dispatch(createProjectSuccess(newData, realFilePath))
|
||||
dispatch(closeLoading(STATUS[1], null, '', type))
|
||||
dispatch(createProjectSuccess(newData, realFilePath));
|
||||
dispatch(closeLoading(STATUS[1], null, '', type));
|
||||
} else {
|
||||
// dispatch(createProjectError(err));
|
||||
dispatch(closeLoading(STATUS[2], err))
|
||||
dispatch(closeLoading(STATUS[2], err));
|
||||
}
|
||||
})(dispatch, getState)
|
||||
}).catch((err) => {
|
||||
dispatch(createProjectError(err))
|
||||
},
|
||||
)(dispatch, getState);
|
||||
})
|
||||
.catch((err) => {
|
||||
dispatch(createProjectError(err));
|
||||
// dispatch(closeLoading(STATUS[2], err));
|
||||
})
|
||||
});
|
||||
}
|
||||
}).catch((err) => {
|
||||
dispatch(closeLoading(STATUS[2], err))
|
||||
})
|
||||
.catch((err) => {
|
||||
dispatch(closeLoading(STATUS[2], err));
|
||||
// dispatch(createProjectError(err));
|
||||
})
|
||||
}
|
||||
}
|
||||
});
|
||||
};
|
||||
};
|
||||
/*
|
||||
* action 创建函数
|
||||
*/
|
||||
export const openDemoProject = (h, t, title, type) => {
|
||||
return (dispatch, getState) => {
|
||||
dispatch(openLoading(title))
|
||||
let tempH = h
|
||||
let isDemoProject = t || getState().core.isDemoProject
|
||||
dispatch(openLoading(title));
|
||||
let tempH = h;
|
||||
let isDemoProject = t || getState().core.isDemoProject;
|
||||
if (!tempH) {
|
||||
tempH = template[isDemoProject]
|
||||
tempH = template[isDemoProject];
|
||||
}
|
||||
const data =
|
||||
// compareVersion('3.5.0', tempH.version.split('.'))
|
||||
// ? reduceProject(tempH, 'defKey') :
|
||||
tempH
|
||||
setMemoryCache('data', data)
|
||||
dispatch(readProjectSuccess(data, [], '', isDemoProject))
|
||||
dispatch(closeLoading(STATUS[1], null, '', type))
|
||||
tempH;
|
||||
setMemoryCache('data', data);
|
||||
dispatch(readProjectSuccess(data, [], '', isDemoProject));
|
||||
dispatch(closeLoading(STATUS[1], null, '', type));
|
||||
};
|
||||
};
|
||||
|
||||
export const updateDataSource = (data) => {
|
||||
return (dispatch, getState) => {
|
||||
let isDemoProject = getState().core.isDemoProject;
|
||||
dispatch(readProjectSuccess(data, [], '', isDemoProject));
|
||||
}
|
||||
}
|
||||
|
||||
export const close = () => {
|
||||
return {
|
||||
type: CLOSE_PROJECT,
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
export const closeProject = (type) => {
|
||||
return (dispatch) => {
|
||||
dispatch(optReset(type))
|
||||
dispatch(close())
|
||||
}
|
||||
}
|
||||
dispatch(optReset(type));
|
||||
dispatch(close());
|
||||
};
|
||||
};
|
||||
|
||||
export const readProject = (path, title, getState, type, isDemoProject) => {
|
||||
return (dispatch) => {
|
||||
dispatch(openLoading(title)) // 开启全局loading
|
||||
dispatch(openLoading(title)); // 开启全局loading
|
||||
// 判断项目文件是否为只读权限
|
||||
readJsonPromise(path)
|
||||
.then((data) => {
|
||||
if (!data.version) {
|
||||
// 无效的项目
|
||||
const config = getState()?.config?.data[0]
|
||||
const err = new Error(allLangData[config.lang].invalidProjectData)
|
||||
dispatch(readProjectFail(err))
|
||||
dispatch(closeLoading(STATUS[2], err))
|
||||
const config = getState()?.config?.data[0];
|
||||
const err = new Error(allLangData[config.lang].invalidProjectData);
|
||||
dispatch(readProjectFail(err));
|
||||
dispatch(closeLoading(STATUS[2], err));
|
||||
} else if (!isDemoProject) {
|
||||
const newData = transformationData(data)
|
||||
const newData = transformationData(data);
|
||||
// 将打开的项目记录存储到用户信息中
|
||||
addHistory({
|
||||
addHistory(
|
||||
{
|
||||
describe: newData.describe || '',
|
||||
name: newData.name || '',
|
||||
avatar: newData.avatar || '',
|
||||
path,
|
||||
}, (err) => {
|
||||
},
|
||||
(err) => {
|
||||
if (!err) {
|
||||
setMemoryCache('data', newData)
|
||||
getAllVersionProject(path, newData).then((versionData) => {
|
||||
dispatch(readProjectSuccess(newData, versionData, path))
|
||||
}).catch(() => {
|
||||
setMemoryCache('data', newData)
|
||||
dispatch(readProjectSuccess(newData, versionData, path))
|
||||
}).finally(() => {
|
||||
dispatch(closeLoading(STATUS[1], null, '', type))
|
||||
setMemoryCache('data', newData);
|
||||
getAllVersionProject(path, newData)
|
||||
.then((versionData) => {
|
||||
dispatch(readProjectSuccess(newData, versionData, path));
|
||||
})
|
||||
.catch(() => {
|
||||
setMemoryCache('data', newData);
|
||||
dispatch(readProjectSuccess(newData, versionData, path));
|
||||
})
|
||||
.finally(() => {
|
||||
dispatch(closeLoading(STATUS[1], null, '', type));
|
||||
});
|
||||
} else {
|
||||
dispatch(readProjectFail(err))
|
||||
dispatch(closeLoading(STATUS[2], err))
|
||||
dispatch(readProjectFail(err));
|
||||
dispatch(closeLoading(STATUS[2], err));
|
||||
}
|
||||
})(dispatch, getState)
|
||||
},
|
||||
)(dispatch, getState);
|
||||
} else {
|
||||
const newData = transformationData(data)
|
||||
setMemoryCache('data', newData)
|
||||
dispatch(readProjectSuccess(newData, [], path, isDemoProject))
|
||||
dispatch(closeLoading(STATUS[1], null, '', type))
|
||||
const newData = transformationData(data);
|
||||
setMemoryCache('data', newData);
|
||||
dispatch(readProjectSuccess(newData, [], path, isDemoProject));
|
||||
dispatch(closeLoading(STATUS[1], null, '', type));
|
||||
}
|
||||
})
|
||||
.catch((err) => {
|
||||
dispatch(readProjectFail(err))
|
||||
dispatch(closeLoading(STATUS[2], err))
|
||||
})
|
||||
}
|
||||
}
|
||||
dispatch(readProjectFail(err));
|
||||
dispatch(closeLoading(STATUS[2], err));
|
||||
});
|
||||
};
|
||||
};
|
||||
const readProjectFail = (err) => {
|
||||
return {
|
||||
type: READ_PROJECT_FAIL,
|
||||
data: err,
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
// 打开项目
|
||||
export const openProject = (title, type, path, suffix, isDemoProject) => {
|
||||
// 从系统中选择项目 无需传递路径
|
||||
return (dispatch, getState) => {
|
||||
if (path) {
|
||||
readProject(path, title, getState, type)(dispatch)
|
||||
readProject(path, title, getState, type)(dispatch);
|
||||
} else {
|
||||
const config = getState()?.config?.data[0]
|
||||
openProjectFilePath(allLangData[config.lang].invalidProjectFile, suffix).then((filePath) => {
|
||||
readProject(filePath, title, getState, type, isDemoProject)(dispatch)
|
||||
}).catch((err) => {
|
||||
dispatch(readProjectFail(err))
|
||||
const config = getState()?.config?.data[0];
|
||||
openProjectFilePath(allLangData[config.lang].invalidProjectFile, suffix)
|
||||
.then((filePath) => {
|
||||
readProject(filePath, title, getState, type, isDemoProject)(dispatch);
|
||||
})
|
||||
.catch((err) => {
|
||||
dispatch(readProjectFail(err));
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,15 +1,24 @@
|
||||
import React, {useRef, useState, useEffect, useMemo } from 'react';
|
||||
/*
|
||||
* @version: V1.0.0
|
||||
* @Date: 2023-12-28 11:28:35
|
||||
* @LastEditors: lzq
|
||||
* @LastEditTime: 2024-01-03 11:32:11
|
||||
* @company: 睿展数据
|
||||
* @FilePath: \salpa-web\src\pages\pdManer\components\groupicon\index.js
|
||||
* @Descripttion:
|
||||
*/
|
||||
import React, { useRef, useState, useEffect, useMemo } from 'react';
|
||||
import { v4 as uuidv4 } from "uuid"
|
||||
import GroupIconGroup from './GroupIconGroup';
|
||||
import DropDown from '../dropdown';
|
||||
import Icon from '../icon';
|
||||
import './style/index.less';
|
||||
import {getPrefix} from '../../lib/prefixUtil';
|
||||
import {addBodyClick, removeBodyClick} from '../../lib/listener';
|
||||
import { getPrefix } from '../../lib/prefixUtil';
|
||||
import { addBodyClick, removeBodyClick } from '../../lib/listener';
|
||||
|
||||
const GroupIcon = React.memo(({prefix, title, onClick, icon, dropMenu, dropType = 'all',
|
||||
const GroupIcon = React.memo(({ prefix, title, onClick, icon, dropMenu, dropType = 'all',
|
||||
disable, hoverTitle, style, draggable, onMouseDown, groupKey,
|
||||
topStyle = {}, dropMenuStyle, className = ''}) => {
|
||||
topStyle = {}, dropMenuStyle, className = '' }) => {
|
||||
const id = useMemo(() => uuidv4(), []);
|
||||
const menuContainerRef = useRef(null);
|
||||
const [status, setStatus] = useState(false);
|
||||
@ -22,7 +31,7 @@ const GroupIcon = React.memo(({prefix, title, onClick, icon, dropMenu, dropType
|
||||
}
|
||||
};
|
||||
const dropClick = (m, e) => {
|
||||
onClick && onClick(e, m.key);
|
||||
onClick && onClick(e, m.key, m?.dataSource);
|
||||
e.stopPropagation();
|
||||
};
|
||||
const onIconClick = (e) => {
|
||||
@ -40,7 +49,7 @@ const GroupIcon = React.memo(({prefix, title, onClick, icon, dropMenu, dropType
|
||||
removeBodyClick(id);
|
||||
};
|
||||
}
|
||||
return () => {};
|
||||
return () => { };
|
||||
}, []);
|
||||
return (
|
||||
<DropDown
|
||||
@ -56,14 +65,14 @@ const GroupIcon = React.memo(({prefix, title, onClick, icon, dropMenu, dropType
|
||||
draggable={draggable}
|
||||
title={hoverTitle}
|
||||
className={`${className} ${currentPrefix}-group-icon ${currentPrefix}-group-icon-${disable ? 'disable' : 'normal'} ${currentPrefix}-group-icon-container-${dropMenu ? 'drop' : 'nodrop'}`}
|
||||
onClick={disable ? () => {} : _onClick}
|
||||
onClick={disable ? () => { } : _onClick}
|
||||
ref={menuContainerRef}
|
||||
style={style}
|
||||
>
|
||||
<span>
|
||||
{
|
||||
typeof icon === 'string' ? <span style={topStyle} className={`${currentPrefix}-group-icon-top`}>
|
||||
<Icon type={icon}/>
|
||||
<Icon type={icon} />
|
||||
{(dropMenu && dropType === 'icon') ?
|
||||
<DropDown
|
||||
dropStyle={dropMenuStyle}
|
||||
@ -73,7 +82,7 @@ const GroupIcon = React.memo(({prefix, title, onClick, icon, dropMenu, dropType
|
||||
menus={dropMenu}
|
||||
menuClick={dropClick}
|
||||
>
|
||||
<Icon className={`${currentPrefix}-group-icon-drop`} type='fa-caret-down'/>
|
||||
<Icon className={`${currentPrefix}-group-icon-drop`} type='fa-caret-down' />
|
||||
</DropDown> : ''}
|
||||
</span>
|
||||
: icon
|
||||
@ -81,7 +90,7 @@ const GroupIcon = React.memo(({prefix, title, onClick, icon, dropMenu, dropType
|
||||
</span>
|
||||
<span className={`${currentPrefix}-group-icon-title`}>{title}</span>
|
||||
{
|
||||
status && <div style={{position: 'absolute', zIndex: '999', top: 56, left: -52}}>
|
||||
status && <div style={{ position: 'absolute', zIndex: '999', top: 56, left: -52 }}>
|
||||
{dropType === 'all' && !disable && !Array.isArray(dropMenu) && dropMenu}
|
||||
</div>
|
||||
}
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
|
||||
export default {
|
||||
system: {
|
||||
title: 'PDManer',
|
||||
@ -7,7 +6,7 @@ export default {
|
||||
errorMessage: '程序出现异常，请前往日志文件查看出错日志：',
|
||||
},
|
||||
toolbar: {
|
||||
go:'执行',
|
||||
go: '执行',
|
||||
save: '保存',
|
||||
refresh: '刷新',
|
||||
saveAs: '另存为',
|
||||
@ -38,6 +37,8 @@ export default {
|
||||
exportConfig: '导出系统设置',
|
||||
importConfig: '导入系统设置',
|
||||
importDDL: '导入DDL',
|
||||
standardDataImport:'标准数据导入',
|
||||
standardDataExport:'标准数据导出',
|
||||
exportImg: '导出当前画布为图片',
|
||||
exportImgLoading: '正在导出当前画布为图片...',
|
||||
exportSql: '导出DDL',
|
||||
@ -49,7 +50,7 @@ export default {
|
||||
exportPath: '导出文件位于："{path}"',
|
||||
setting: '设置',
|
||||
dbConnect: '数据库',
|
||||
dbConnectTest:"数据库连接",
|
||||
dbConnectTest: '数据库连接',
|
||||
search: '数据表/视图/数据字典',
|
||||
create: '新建',
|
||||
open: '打开',
|
||||
@ -153,7 +154,8 @@ export default {
|
||||
emptyField: '<空字段>',
|
||||
entityUniqueKeyError: '数据表中包含重复字段，请修改,重复字段有[{entities}]',
|
||||
entityUniqueDefKeyError: '数据表或视图已经存在，请修改,重复数据表或视图有[{entities}]',
|
||||
entityHideInGraphSizeError: '逻辑图显示字段请选择能够代表本表业务含义的典型属性字段，限制为[{size}]个,超限数据表有[{entities}]，如需修改，请通过："设置->系统参数->逻辑图最大展示字段数"进行修改',
|
||||
entityHideInGraphSizeError:
|
||||
'逻辑图显示字段请选择能够代表本表业务含义的典型属性字段，限制为[{size}]个,超限数据表有[{entities}]，如需修改，请通过："设置->系统参数->逻辑图最大展示字段数"进行修改',
|
||||
modify: '前往修改',
|
||||
formValidateMessage: '带星号为必输项，不能为空！',
|
||||
defKeyValidateMessage: '{name}代码不能为空',
|
||||
@ -422,6 +424,23 @@ export default {
|
||||
search: '搜索数据表',
|
||||
selectEntityEmpty: '请选择数据表',
|
||||
},
|
||||
tableExportHeaders: {
|
||||
defKey: '字段代码',
|
||||
defName: '显示名称',
|
||||
primaryKey: '主键',
|
||||
notNull: '不为空',
|
||||
autoIncrement: '自增',
|
||||
domain: '数据域',
|
||||
hideInGraph: '显示与逻辑图',
|
||||
type: '数据类型',
|
||||
len: '长度',
|
||||
scale: '小数位数',
|
||||
comment: '说明',
|
||||
refDict: '数据字典',
|
||||
defaultValue: '默认值',
|
||||
uiHint: 'UI建议',
|
||||
extProps: '拓展属性',
|
||||
},
|
||||
tableHeaders: {
|
||||
defName: '显示名称',
|
||||
defKey: '字段代码',
|
||||
@ -672,7 +691,8 @@ export default {
|
||||
success: '配置成功',
|
||||
error: '配置失败',
|
||||
placeholder: '不填将自动从系统的环境变量中读取',
|
||||
notFoundJDK: '未检测到JDK，请先安装JDK(如果已经安装，请检查环境变量是否配置正确或者前往系统【设置】-> 【系统参数】->【JAVA_HOME】指定JDK路径)',
|
||||
notFoundJDK:
|
||||
'未检测到JDK，请先安装JDK(如果已经安装，请检查环境变量是否配置正确或者前往系统【设置】-> 【系统参数】->【JAVA_HOME】指定JDK路径)',
|
||||
outOfMemoryError: 'JVM所需内存不足，请前往[设置=>系统参数=>JVM参数]调整',
|
||||
},
|
||||
DictSQLTemplate: '数据字典SQL模板',
|
||||
@ -733,7 +753,8 @@ export default {
|
||||
delete: '删除',
|
||||
copy: '复制',
|
||||
demoDbConnect: {
|
||||
mysql: 'jdbc:mysql://IP地址:端口号/数据库名?characterEncoding=UTF-8&useSSL=false&useUnicode=true&serverTimezone=UTC',
|
||||
mysql:
|
||||
'jdbc:mysql://IP地址:端口号/数据库名?characterEncoding=UTF-8&useSSL=false&useUnicode=true&serverTimezone=UTC',
|
||||
oracle: 'jdbc:oracle:thin:@IP地址:端口号/数据库名',
|
||||
sqlserver: 'jdbc:sqlserver://IP地址:端口号;DatabaseName=数据库名',
|
||||
sqlserverTitle: '（官方驱动默认支持java8，如果您是其他版本的JDK，请自定义驱动）',
|
||||
@ -742,8 +763,10 @@ export default {
|
||||
dm: 'jdbc:dm://IP地址:端口号/数据库名',
|
||||
guassdb: 'jdbc:postgresql://IP地址:端口号/数据库名',
|
||||
kingbase: 'jdbc:kingbase8://IP地址:端口号/数据库名',
|
||||
maxcompute: 'jdbc:odps:http://IP地址:端口号/api?project=项目名&accessId=ACCESS_ID&accessKey=ACCESS_KEY',
|
||||
sqlite: 'jdbc:sqlite:/path/db-file-name (MAC以及Linux) jdbc:sqlite://path/db-file-name (Windows)',
|
||||
maxcompute:
|
||||
'jdbc:odps:http://IP地址:端口号/api?project=项目名&accessId=ACCESS_ID&accessKey=ACCESS_KEY',
|
||||
sqlite:
|
||||
'jdbc:sqlite:/path/db-file-name (MAC以及Linux) jdbc:sqlite://path/db-file-name (Windows)',
|
||||
},
|
||||
configExample: '配置示例：',
|
||||
connectSuccess: '连接成功',
|
||||
@ -769,10 +792,12 @@ export default {
|
||||
parseDb: '正在解析数据库，请稍后。。。（请勿关闭当前弹窗！）',
|
||||
parseDbError: '数据库解析失败',
|
||||
selectEntity: '选择数据表',
|
||||
dealResult: '解析结果：共解析出[{data}]张数据表，当前模型中已经存在的有[{exists}]张表，请勾选需要添加到模型中的数据表！',
|
||||
dealResult:
|
||||
'解析结果：共解析出[{data}]张数据表，当前模型中已经存在的有[{exists}]张表，请勾选需要添加到模型中的数据表！',
|
||||
},
|
||||
importDb: {
|
||||
dealResult: '解析结果：共解析出[{data}]张数据表，当前模型中已经存在的有[{exists}]张表，请勾选需要添加到模型中的数据表！',
|
||||
dealResult:
|
||||
'解析结果：共解析出[{data}]张数据表，当前模型中已经存在的有[{exists}]张表，请勾选需要添加到模型中的数据表！',
|
||||
},
|
||||
group: {
|
||||
base: '基本信息',
|
||||
@ -853,4 +878,4 @@ export default {
|
||||
viewList: '视图',
|
||||
current: '数据库类型：',
|
||||
},
|
||||
}
|
||||
};
|
||||
|
||||
@ -1,103 +1,192 @@
|
||||
import React, { useState, forwardRef, useImperativeHandle, useRef, useEffect } from 'react'
|
||||
import { FormatMessage, GroupIcon, Icon, SearchSuggest, Slider, NumberInput, Modal } from '../../components'
|
||||
import { SketchPicker } from 'react-color'
|
||||
import numeral from 'numeral'
|
||||
import { validateNeedSave } from '../../lib/datasource_util'
|
||||
import { Divider, message } from 'antd'
|
||||
import { executeSql } from '@/services/api.ts'
|
||||
import { getAllDataSQLByFilter } from '../../lib/json2code_util'
|
||||
import './style/index.less'
|
||||
const GroupIconGroup = GroupIcon.GroupIconGroup
|
||||
import { executeSql } from '@/services/api.ts';
|
||||
import { Divider, Upload, message } from 'antd';
|
||||
import numeral from 'numeral';
|
||||
import React, { forwardRef, useImperativeHandle, useRef, useState } from 'react';
|
||||
|
||||
export default React.memo(forwardRef(({ currentPrefix, close, iconClick, colorChange, openModal, templateType,
|
||||
activeTab, resize, sliderChange, dataSource,
|
||||
jumpPosition, jumpDetail }, ref) => {
|
||||
const dbConn = dataSource?.dbConn || []
|
||||
const properties = dbConn[0]?.properties
|
||||
const [isCellSelected, setIsCellSelected] = useState(false)
|
||||
const [scaleNumber, setScaleNumber] = useState(1)
|
||||
import { SketchPicker } from 'react-color';
|
||||
import _ from 'lodash/object'
|
||||
import {
|
||||
FormatMessage,
|
||||
GroupIcon,
|
||||
Icon,
|
||||
Modal,
|
||||
NumberInput,
|
||||
SearchSuggest,
|
||||
Slider,
|
||||
} from '../../components';
|
||||
import { validateNeedSave } from '../../lib/datasource_util';
|
||||
import { getAllDataSQLByFilter } from '../../lib/json2code_util';
|
||||
import './style/index.less';
|
||||
const GroupIconGroup = GroupIcon.GroupIconGroup;
|
||||
|
||||
export default React.memo(
|
||||
forwardRef(
|
||||
(
|
||||
{
|
||||
currentPrefix,
|
||||
close,
|
||||
iconClick,
|
||||
colorChange,
|
||||
openModal,
|
||||
templateType,
|
||||
activeTab,
|
||||
resize,
|
||||
sliderChange,
|
||||
dataSource,
|
||||
getDataSource,
|
||||
restProps,
|
||||
jumpPosition,
|
||||
jumpDetail,
|
||||
},
|
||||
ref,
|
||||
) => {
|
||||
const dbConn = dataSource?.dbConn || [];
|
||||
const properties = dbConn[0]?.properties;
|
||||
const [isCellSelected, setIsCellSelected] = useState(false);
|
||||
const [scaleNumber, setScaleNumber] = useState(1);
|
||||
const [colorState, setColor] = useState({
|
||||
fontColor: 'rgba(0, 0, 0, 0.65)',
|
||||
fillColor: '#ACDAFC',
|
||||
})
|
||||
useImperativeHandle(ref, () => {
|
||||
});
|
||||
const [fileList, setFileList] = useState([]);
|
||||
|
||||
useImperativeHandle(
|
||||
ref,
|
||||
() => {
|
||||
return {
|
||||
setScaleNumber,
|
||||
setIsCellSelected,
|
||||
}
|
||||
}, [])
|
||||
};
|
||||
},
|
||||
[],
|
||||
);
|
||||
const _colorChange = (key, value) => {
|
||||
setColor((pre) => {
|
||||
return {
|
||||
...pre,
|
||||
[key]: value.hex,
|
||||
}
|
||||
})
|
||||
colorChange && colorChange(key, value)
|
||||
}
|
||||
};
|
||||
});
|
||||
colorChange && colorChange(key, value);
|
||||
};
|
||||
const _close = () => {
|
||||
if (validateNeedSave(dataSource)) {
|
||||
Modal.confirm({
|
||||
title: FormatMessage.string({ id: 'closeConfirmTitle' }),
|
||||
message: FormatMessage.string({ id: 'closeConfirm' }),
|
||||
onOk: () => {
|
||||
close()
|
||||
close();
|
||||
},
|
||||
})
|
||||
});
|
||||
} else {
|
||||
close()
|
||||
close();
|
||||
}
|
||||
};
|
||||
const handleExportDataBase = () => {
|
||||
const { entities, domains } = dataSource;
|
||||
const workBook = window.XLSX.utils.book_new();
|
||||
for (let index = 0; index < entities.length; index++) {
|
||||
const data = entities[index];
|
||||
const headers = data.headers
|
||||
.filter((item) => item.refKey !== 'isStandard')
|
||||
.map((item) => FormatMessage.string({ id: `tableExportHeaders.${item.refKey}` }));
|
||||
const keyList = data.headers
|
||||
.filter((item) => item.refKey !== 'isStandard')
|
||||
.map((item) => item.refKey);
|
||||
const tableColumnData = data.fields
|
||||
.map((item) => {
|
||||
// 判断为哪个数据域字典
|
||||
const {
|
||||
len,
|
||||
defName: domain,
|
||||
scale,
|
||||
uiHint,
|
||||
} = domains.find((domain) => domain.id === item.domain);
|
||||
|
||||
// 数据字典处理
|
||||
const obj = { ...item, len, domain, scale, uiHint };
|
||||
if (item.defKey.indexOf('time') === -1) {
|
||||
obj.type = 'VARCHAR';
|
||||
} else {
|
||||
obj.type = 'DATETIME';
|
||||
}
|
||||
const defaultTemplate = ['createTable', 'createIndex', 'content']
|
||||
const templateRef = useRef(defaultTemplate)
|
||||
const dataTypeSupports = _.get(dataSource, 'profile.dataTypeSupports', [])
|
||||
const defaultDb = _.get(dataSource, 'profile.default.db', dataTypeSupports[0]?.id)
|
||||
const [codeData, setCodeData] = useState(() => {
|
||||
return getAllDataSQLByFilter(dataSource,
|
||||
templateType === 'dict' ? 'dictSQLTemplate' : defaultDb, templateRef.current)
|
||||
return obj;
|
||||
})
|
||||
.map((item) => {
|
||||
return keyList.map((key) =>
|
||||
typeof item[key] === 'boolean' ? (item[key] ? '是' : '否') : item[key],
|
||||
);
|
||||
});
|
||||
tableColumnData.unshift(headers);
|
||||
const workSheet = window.XLSX.utils.aoa_to_sheet(tableColumnData);
|
||||
|
||||
if (!workSheet['!cols']) workSheet['!cols'] = [];
|
||||
for (let i = 0; i <= 21; i += 1) {
|
||||
if (i === 0 || i === 1) {
|
||||
workSheet['!cols'][i] = { wpx: 260 };
|
||||
} else {
|
||||
workSheet['!cols'][i] = { wpx: 150 };
|
||||
}
|
||||
}
|
||||
window.XLSX.utils.book_append_sheet(workBook, workSheet, data.defName);
|
||||
}
|
||||
|
||||
window.XLSX.writeFile(workBook, '数据表.xlsx');
|
||||
};
|
||||
const defaultTemplate = ['createTable', 'createIndex', 'content'];
|
||||
const templateRef = useRef(defaultTemplate);
|
||||
const dataTypeSupports = _.get(dataSource, 'profile.dataTypeSupports', []);
|
||||
const defaultDb = _.get(dataSource, 'profile.default.db', dataTypeSupports[0]?.id);
|
||||
const [codeData, setCodeData] = useState(() => {
|
||||
return getAllDataSQLByFilter(
|
||||
dataSource,
|
||||
templateType === 'dict' ? 'dictSQLTemplate' : defaultDb,
|
||||
templateRef.current,
|
||||
);
|
||||
});
|
||||
|
||||
const backGroup = async () => {
|
||||
if (!properties) {
|
||||
Modal.error({
|
||||
title: FormatMessage.string({ id: 'dbConnect.connectError' }),
|
||||
message: '请连接数据库',
|
||||
})
|
||||
});
|
||||
} else {
|
||||
const data = {
|
||||
driverName: properties.driver_class_name,
|
||||
url: properties.url,
|
||||
username: properties.username,
|
||||
password: properties.password,
|
||||
sql: codeData
|
||||
}
|
||||
const res = await executeSql(data)
|
||||
sql: codeData,
|
||||
};
|
||||
const res = await executeSql(data);
|
||||
if (res.code == 200) {
|
||||
Modal.success({
|
||||
title: FormatMessage.string({ id: 'dbConnect.connectSuccess' }),
|
||||
message: `${res.msg}`,
|
||||
})
|
||||
});
|
||||
} else {
|
||||
Modal.error({
|
||||
bodyStyle: { width: '50%' },
|
||||
contentStyle: { width: '100%', height: '100%' },
|
||||
title: FormatMessage.string({ id: 'dbConnect.connectError' }),
|
||||
message: `${res.msg}`
|
||||
})
|
||||
message: `${res.msg}`,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
const [issee, setIssee] = useState(false)
|
||||
const [isfill, setIsfill] = useState(false)
|
||||
};
|
||||
const [issee, setIssee] = useState(false);
|
||||
const [isfill, setIsfill] = useState(false);
|
||||
const fill = () => {
|
||||
setIsfill(!isfill)
|
||||
setIssee(false)
|
||||
}
|
||||
setIsfill(!isfill);
|
||||
setIssee(false);
|
||||
};
|
||||
const see = () => {
|
||||
setIsfill(false)
|
||||
setIssee(!issee)
|
||||
}
|
||||
setIsfill(false);
|
||||
setIssee(!issee);
|
||||
};
|
||||
|
||||
|
||||
|
||||
return (
|
||||
<div className={`${currentPrefix}-head`}>
|
||||
@ -112,7 +201,7 @@ export default React.memo(forwardRef(({ currentPrefix, close, iconClick, colorCh
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<Divider className='divider' />
|
||||
<Divider className="divider" />
|
||||
<div className={`${currentPrefix}-iconstyle`}>
|
||||
<GroupIconGroup>
|
||||
<GroupIcon
|
||||
@ -122,7 +211,6 @@ export default React.memo(forwardRef(({ currentPrefix, close, iconClick, colorCh
|
||||
groupKey="save"
|
||||
icon="icon-bianzu2"
|
||||
onClick={iconClick}
|
||||
|
||||
/>
|
||||
<GroupIcon
|
||||
className={`${currentPrefix}-icongroup`}
|
||||
@ -195,11 +283,21 @@ export default React.memo(forwardRef(({ currentPrefix, close, iconClick, colorCh
|
||||
//onMouseDown={e => iconClick(e, 'polygon')}
|
||||
/>
|
||||
|
||||
<div className='fontColor1'>
|
||||
<Icon type="icon-zitiyanse" onClick={see}
|
||||
disable={activeTab?.type !== 'diagram' || !isCellSelected} title="字体颜色" />
|
||||
<div className="fontColor1">
|
||||
<Icon
|
||||
type="icon-zitiyanse"
|
||||
onClick={see}
|
||||
disable={activeTab?.type !== 'diagram' || !isCellSelected}
|
||||
title="字体颜色"
|
||||
/>
|
||||
{/* display: issee ? 'block' : 'none' */}
|
||||
<div style={{ display: activeTab?.type == 'diagram' && issee && isCellSelected ? 'block' : 'none' }} className='fontColor2' >
|
||||
<div
|
||||
style={{
|
||||
display:
|
||||
activeTab?.type == 'diagram' && issee && isCellSelected ? 'block' : 'none',
|
||||
}}
|
||||
className="fontColor2"
|
||||
>
|
||||
<SketchPicker
|
||||
disableAlpha
|
||||
presetColors={[
|
||||
@ -225,9 +323,20 @@ export default React.memo(forwardRef(({ currentPrefix, close, iconClick, colorCh
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<div className='fontColor1'>
|
||||
<Icon type="icon-tianchongyanse" onClick={fill} disable={activeTab?.type !== 'diagram' || !isCellSelected} title="填充颜色" />
|
||||
<div style={{ display: activeTab?.type == 'diagram' && isfill && isCellSelected ? 'block' : 'none' }} className='fontColor2' >
|
||||
<div className="fontColor1">
|
||||
<Icon
|
||||
type="icon-tianchongyanse"
|
||||
onClick={fill}
|
||||
disable={activeTab?.type !== 'diagram' || !isCellSelected}
|
||||
title="填充颜色"
|
||||
/>
|
||||
<div
|
||||
style={{
|
||||
display:
|
||||
activeTab?.type == 'diagram' && isfill && isCellSelected ? 'block' : 'none',
|
||||
}}
|
||||
className="fontColor2"
|
||||
>
|
||||
<SketchPicker
|
||||
disableAlpha
|
||||
presetColors={[
|
||||
@ -365,32 +474,14 @@ export default React.memo(forwardRef(({ currentPrefix, close, iconClick, colorCh
|
||||
</>
|
||||
}
|
||||
/>
|
||||
{/* <GroupIcon
|
||||
<GroupIcon
|
||||
className={`${currentPrefix}-icongroup`}
|
||||
hoverTitle={FormatMessage.string({ id: 'toolbar.import' })}
|
||||
onClick={iconClick}
|
||||
icon={<Icon type="icon-daoru" />}
|
||||
dropMenu={[
|
||||
{ key: 'chiner', name: FormatMessage.string({ id: 'toolbar.importCHNR' }) },
|
||||
{
|
||||
key: 'powerdesigner',
|
||||
name: FormatMessage.string({ id: 'toolbar.importPowerDesigner' }),
|
||||
},
|
||||
{ key: 'db', name: FormatMessage.string({ id: 'toolbar.importDb' }) },
|
||||
{ key: 'importDDL', name: FormatMessage.string({ id: 'toolbar.importDDL' }) },
|
||||
{
|
||||
style: { borderTop: '1px solid #DFE3EB' },
|
||||
key: 'domains',
|
||||
name: FormatMessage.string({ id: 'toolbar.importDomains' }),
|
||||
},
|
||||
{
|
||||
key: 'appCodes',
|
||||
name: FormatMessage.string({ id: 'toolbar.importAppCodes' }),
|
||||
},
|
||||
{
|
||||
key: 'importConfig',
|
||||
name: FormatMessage.string({ id: 'toolbar.importConfig' }),
|
||||
},
|
||||
{ key: 'standardDataImport', name: FormatMessage.string({ id: 'toolbar.standardDataImport' }), dataSource },
|
||||
]}
|
||||
/>
|
||||
<GroupIcon
|
||||
@ -399,29 +490,11 @@ export default React.memo(forwardRef(({ currentPrefix, close, iconClick, colorCh
|
||||
hoverTitle={FormatMessage.string({ id: 'toolbar.export' })}
|
||||
icon={<Icon type="icon-daochu" />}
|
||||
dropMenu={[
|
||||
{ key: 'word', name: FormatMessage.string({ id: 'toolbar.exportWord' }) },
|
||||
{ key: 'sql', name: FormatMessage.string({ id: 'toolbar.exportSql' }) },
|
||||
{ key: 'dict', name: FormatMessage.string({ id: 'toolbar.exportDict' }) },
|
||||
{
|
||||
key: 'img',
|
||||
name: FormatMessage.string({ id: 'toolbar.exportImg' }),
|
||||
disable: activeTab?.type !== 'diagram',
|
||||
},
|
||||
{
|
||||
style: { borderTop: '1px solid #DFE3EB' },
|
||||
key: 'exportDomains',
|
||||
name: FormatMessage.string({ id: 'toolbar.exportDomains' }),
|
||||
},
|
||||
{
|
||||
key: 'exportAppCodes',
|
||||
name: FormatMessage.string({ id: 'toolbar.exportAppCodes' }),
|
||||
},
|
||||
{
|
||||
key: 'exportConfig',
|
||||
name: FormatMessage.string({ id: 'toolbar.exportConfig' }),
|
||||
},
|
||||
{ key: 'standardDataExport', name: FormatMessage.string({ id: 'toolbar.standardDataExport' }), dataSource },
|
||||
]}
|
||||
/> */}
|
||||
/>
|
||||
|
||||
{/* <GroupIcon
|
||||
className={`${currentPrefix}-icongroup`}
|
||||
hoverTitle={FormatMessage.string({ id: 'toolbar.setting' })}
|
||||
@ -441,6 +514,7 @@ export default React.memo(forwardRef(({ currentPrefix, close, iconClick, colorCh
|
||||
onClick={backGroup}
|
||||
/>
|
||||
</GroupIconGroup>
|
||||
|
||||
<div className={`${currentPrefix}-head-search`}>
|
||||
<SearchSuggest
|
||||
jumpPosition={jumpPosition}
|
||||
@ -451,5 +525,7 @@ export default React.memo(forwardRef(({ currentPrefix, close, iconClick, colorCh
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}))
|
||||
);
|
||||
},
|
||||
),
|
||||
);
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
507
src/pages/pdManer/pages/Main/mock.json
Normal file
507
src/pages/pdManer/pages/Main/mock.json
Normal file
@ -0,0 +1,507 @@
|
||||
[
|
||||
{
|
||||
"id": "57fa5152-07c0-4216-a384-67729c987e38",
|
||||
"env": {
|
||||
"base": {
|
||||
"nameSpace": "",
|
||||
"codeRoot": ""
|
||||
}
|
||||
},
|
||||
"defKey": "sys_user",
|
||||
"defName": "用户表",
|
||||
"comment": "",
|
||||
"properties": {
|
||||
"partitioned by": "(date string)",
|
||||
"row format delimited": "",
|
||||
"fields terminated by ','": "",
|
||||
"collection items terminated by '-'": "",
|
||||
"map keys terminated by ':'": "",
|
||||
"store as textfile;": ""
|
||||
},
|
||||
"nameTemplate": "{defKey}[{defName}]",
|
||||
"headers": [
|
||||
{
|
||||
"refKey": "hideInGraph",
|
||||
"hideInGraph": true
|
||||
},
|
||||
{
|
||||
"refKey": "defKey",
|
||||
"hideInGraph": false
|
||||
},
|
||||
{
|
||||
"refKey": "defName",
|
||||
"hideInGraph": false
|
||||
},
|
||||
{
|
||||
"refKey": "primaryKey",
|
||||
"hideInGraph": false
|
||||
},
|
||||
{
|
||||
"refKey": "notNull",
|
||||
"hideInGraph": true
|
||||
},
|
||||
{
|
||||
"refKey": "autoIncrement",
|
||||
"hideInGraph": true
|
||||
},
|
||||
{
|
||||
"refKey": "domain",
|
||||
"hideInGraph": true
|
||||
},
|
||||
{
|
||||
"refKey": "type",
|
||||
"hideInGraph": false
|
||||
},
|
||||
{
|
||||
"refKey": "len",
|
||||
"hideInGraph": false
|
||||
},
|
||||
{
|
||||
"refKey": "scale",
|
||||
"hideInGraph": false
|
||||
},
|
||||
{
|
||||
"refKey": "comment",
|
||||
"hideInGraph": true
|
||||
},
|
||||
{
|
||||
"refKey": "refDict",
|
||||
"hideInGraph": true
|
||||
},
|
||||
{
|
||||
"refKey": "defaultValue",
|
||||
"hideInGraph": true
|
||||
},
|
||||
{
|
||||
"refKey": "isStandard",
|
||||
"hideInGraph": false
|
||||
},
|
||||
{
|
||||
"refKey": "uiHint",
|
||||
"hideInGraph": true
|
||||
},
|
||||
{
|
||||
"refKey": "extProps",
|
||||
"hideInGraph": true
|
||||
}
|
||||
],
|
||||
"fields": [
|
||||
{
|
||||
"defKey": "tenant_id",
|
||||
"defName": "租户号",
|
||||
"comment": "",
|
||||
"type": "",
|
||||
"len": "",
|
||||
"scale": "",
|
||||
"primaryKey": false,
|
||||
"notNull": true,
|
||||
"autoIncrement": false,
|
||||
"defaultValue": "",
|
||||
"hideInGraph": true,
|
||||
"domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
|
||||
"refDict": "",
|
||||
"uiHint": "",
|
||||
"id": "fd1196b9-bc37-4275-b38b-a658f82252e8"
|
||||
},
|
||||
{
|
||||
"defKey": "revision",
|
||||
"defName": "乐观锁",
|
||||
"comment": "",
|
||||
"domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
|
||||
"type": "",
|
||||
"len": "",
|
||||
"scale": "",
|
||||
"primaryKey": false,
|
||||
"notNull": false,
|
||||
"autoIncrement": false,
|
||||
"defaultValue": "",
|
||||
"hideInGraph": true,
|
||||
"refDict": "",
|
||||
"uiHint": "",
|
||||
"id": "653db02c-54e3-4f3f-bff4-af294cb7cac3"
|
||||
},
|
||||
{
|
||||
"defKey": "created_by",
|
||||
"defName": "创建人",
|
||||
"comment": "",
|
||||
"domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
|
||||
"type": "",
|
||||
"len": "",
|
||||
"scale": "",
|
||||
"primaryKey": false,
|
||||
"notNull": false,
|
||||
"autoIncrement": false,
|
||||
"defaultValue": "",
|
||||
"hideInGraph": true,
|
||||
"refDict": "",
|
||||
"uiHint": "",
|
||||
"id": "5e0f02b1-632b-44c8-ba86-4cfb49fd0d40"
|
||||
},
|
||||
{
|
||||
"defKey": "created_time",
|
||||
"defName": "创建时间",
|
||||
"comment": "",
|
||||
"domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
|
||||
"type": "",
|
||||
"len": "",
|
||||
"scale": "",
|
||||
"primaryKey": false,
|
||||
"notNull": false,
|
||||
"autoIncrement": false,
|
||||
"defaultValue": "",
|
||||
"hideInGraph": true,
|
||||
"refDict": "",
|
||||
"uiHint": "",
|
||||
"id": "02de6461-ca9b-4c33-b304-b51ff055be5d"
|
||||
},
|
||||
{
|
||||
"defKey": "updated_by",
|
||||
"defName": "更新人",
|
||||
"comment": "",
|
||||
"domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
|
||||
"type": "",
|
||||
"len": "",
|
||||
"scale": "",
|
||||
"primaryKey": false,
|
||||
"notNull": false,
|
||||
"autoIncrement": false,
|
||||
"defaultValue": "",
|
||||
"hideInGraph": true,
|
||||
"refDict": "",
|
||||
"uiHint": "",
|
||||
"id": "a9c8cd25-5ee1-4eb2-9f65-4a0ebf8a670a"
|
||||
},
|
||||
{
|
||||
"defKey": "updated_time",
|
||||
"defName": "更新时间",
|
||||
"comment": "",
|
||||
"domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
|
||||
"type": "",
|
||||
"len": "",
|
||||
"scale": "",
|
||||
"primaryKey": false,
|
||||
"notNull": false,
|
||||
"autoIncrement": false,
|
||||
"defaultValue": "",
|
||||
"hideInGraph": true,
|
||||
"refDict": "",
|
||||
"uiHint": "",
|
||||
"id": "a034d653-7590-44bd-aa3d-e174f1610f0e"
|
||||
},
|
||||
{
|
||||
"defKey": "user_id",
|
||||
"defName": "用户ID",
|
||||
"comment": "",
|
||||
"type": "",
|
||||
"len": "",
|
||||
"scale": "",
|
||||
"primaryKey": true,
|
||||
"notNull": true,
|
||||
"autoIncrement": false,
|
||||
"defaultValue": "",
|
||||
"hideInGraph": false,
|
||||
"refDict": "",
|
||||
"extProps": {},
|
||||
"domain": "16120F75-6AA7-4483-868D-F07F511BB081",
|
||||
"id": "acc5f059-e2f9-4898-8f3e-67da1b131aab"
|
||||
},
|
||||
{
|
||||
"defKey": "user_name",
|
||||
"defName": "用户名称",
|
||||
"comment": "",
|
||||
"type": "",
|
||||
"len": "",
|
||||
"scale": "",
|
||||
"primaryKey": false,
|
||||
"notNull": true,
|
||||
"autoIncrement": false,
|
||||
"defaultValue": "",
|
||||
"hideInGraph": false,
|
||||
"refDict": "",
|
||||
"extProps": {},
|
||||
"domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
|
||||
"id": "fb905579-49a8-4ba1-8779-739c07e550ae"
|
||||
}
|
||||
],
|
||||
"correlations": [],
|
||||
"indexes": []
|
||||
},
|
||||
{
|
||||
"id": "3cb84272-2063-4c42-b3bf-e9f16583333",
|
||||
"env": {
|
||||
"base": {
|
||||
"nameSpace": "",
|
||||
"codeRoot": ""
|
||||
}
|
||||
},
|
||||
"defKey": "sys_dept",
|
||||
"defName": "部门表",
|
||||
"comment": "",
|
||||
"properties": {
|
||||
"partitioned by": "(date string)",
|
||||
"row format delimited": "",
|
||||
"fields terminated by ','": "",
|
||||
"collection items terminated by '-'": "",
|
||||
"map keys terminated by ':'": "",
|
||||
"store as textfile;": ""
|
||||
},
|
||||
"nameTemplate": "{defKey}[{defName}]",
|
||||
"headers": [
|
||||
{
|
||||
"refKey": "hideInGraph",
|
||||
"hideInGraph": true
|
||||
},
|
||||
{
|
||||
"refKey": "defKey",
|
||||
"hideInGraph": false
|
||||
},
|
||||
{
|
||||
"refKey": "defName",
|
||||
"hideInGraph": false
|
||||
},
|
||||
{
|
||||
"refKey": "primaryKey",
|
||||
"hideInGraph": false
|
||||
},
|
||||
{
|
||||
"refKey": "notNull",
|
||||
"hideInGraph": true
|
||||
},
|
||||
{
|
||||
"refKey": "autoIncrement",
|
||||
"hideInGraph": true
|
||||
},
|
||||
{
|
||||
"refKey": "domain",
|
||||
"hideInGraph": true
|
||||
},
|
||||
{
|
||||
"refKey": "type",
|
||||
"hideInGraph": false
|
||||
},
|
||||
{
|
||||
"refKey": "len",
|
||||
"hideInGraph": false
|
||||
},
|
||||
{
|
||||
"refKey": "scale",
|
||||
"hideInGraph": false
|
||||
},
|
||||
{
|
||||
"refKey": "comment",
|
||||
"hideInGraph": true
|
||||
},
|
||||
{
|
||||
"refKey": "refDict",
|
||||
"hideInGraph": true
|
||||
},
|
||||
{
|
||||
"refKey": "defaultValue",
|
||||
"hideInGraph": true
|
||||
},
|
||||
{
|
||||
"refKey": "isStandard",
|
||||
"hideInGraph": false
|
||||
},
|
||||
{
|
||||
"refKey": "uiHint",
|
||||
"hideInGraph": true
|
||||
},
|
||||
{
|
||||
"refKey": "extProps",
|
||||
"hideInGraph": true
|
||||
}
|
||||
],
|
||||
"fields": [
|
||||
{
|
||||
"defKey": "tenant_id",
|
||||
"defName": "租户号",
|
||||
"comment": "",
|
||||
"type": "",
|
||||
"len": "",
|
||||
"scale": "",
|
||||
"primaryKey": false,
|
||||
"notNull": false,
|
||||
"autoIncrement": false,
|
||||
"defaultValue": "",
|
||||
"hideInGraph": true,
|
||||
"domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
|
||||
"refDict": "",
|
||||
"uiHint": "",
|
||||
"id": "22de7bde-fdc0-4469-ad9f-97a555549bef"
|
||||
},
|
||||
{
|
||||
"defKey": "revision",
|
||||
"defName": "乐观锁",
|
||||
"comment": "",
|
||||
"domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
|
||||
"type": "",
|
||||
"len": "",
|
||||
"scale": "",
|
||||
"primaryKey": false,
|
||||
"notNull": false,
|
||||
"autoIncrement": false,
|
||||
"defaultValue": "",
|
||||
"hideInGraph": true,
|
||||
"refDict": "",
|
||||
"uiHint": "",
|
||||
"id": "2e48ad92-7f86-44d5-aa51-326878ab39ba"
|
||||
},
|
||||
{
|
||||
"defKey": "created_by",
|
||||
"defName": "创建人",
|
||||
"comment": "",
|
||||
"domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
|
||||
"type": "",
|
||||
"len": "",
|
||||
"scale": "",
|
||||
"primaryKey": false,
|
||||
"notNull": false,
|
||||
"autoIncrement": false,
|
||||
"defaultValue": "",
|
||||
"hideInGraph": true,
|
||||
"refDict": "",
|
||||
"uiHint": "",
|
||||
"id": "aef05e82-3fdd-48d1-b863-95df9d8025a1"
|
||||
},
|
||||
{
|
||||
"defKey": "created_time",
|
||||
"defName": "创建时间",
|
||||
"comment": "",
|
||||
"domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
|
||||
"type": "",
|
||||
"len": "",
|
||||
"scale": "",
|
||||
"primaryKey": false,
|
||||
"notNull": false,
|
||||
"autoIncrement": false,
|
||||
"defaultValue": "",
|
||||
"hideInGraph": true,
|
||||
"refDict": "",
|
||||
"uiHint": "",
|
||||
"id": "e043ad8c-80a1-4ac8-938d-2e220c508fd1"
|
||||
},
|
||||
{
|
||||
"defKey": "updated_by",
|
||||
"defName": "更新人",
|
||||
"comment": "",
|
||||
"domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
|
||||
"type": "",
|
||||
"len": "",
|
||||
"scale": "",
|
||||
"primaryKey": false,
|
||||
"notNull": false,
|
||||
"autoIncrement": false,
|
||||
"defaultValue": "",
|
||||
"hideInGraph": true,
|
||||
"refDict": "",
|
||||
"uiHint": "",
|
||||
"id": "56f2afaa-00be-405c-af90-58ffc10f1bec"
|
||||
},
|
||||
{
|
||||
"defKey": "updated_time",
|
||||
"defName": "更新时间",
|
||||
"comment": "",
|
||||
"domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
|
||||
"type": "",
|
||||
"len": "",
|
||||
"scale": "",
|
||||
"primaryKey": false,
|
||||
"notNull": false,
|
||||
"autoIncrement": false,
|
||||
"defaultValue": "",
|
||||
"hideInGraph": true,
|
||||
"refDict": "",
|
||||
"uiHint": "",
|
||||
"id": "f471d0b0-450c-436f-b300-0e26fd1c5189"
|
||||
},
|
||||
{
|
||||
"defKey": "dept_id",
|
||||
"defName": "部门ID",
|
||||
"comment": "",
|
||||
"type": "",
|
||||
"len": "",
|
||||
"scale": "",
|
||||
"primaryKey": true,
|
||||
"notNull": true,
|
||||
"autoIncrement": false,
|
||||
"defaultValue": "",
|
||||
"hideInGraph": false,
|
||||
"refDict": "",
|
||||
"extProps": {},
|
||||
"domain": "16120F75-6AA7-4483-868D-F07F511BB081",
|
||||
"id": "0cdd83a0-fa06-4139-9547-0fb8165fde0b"
|
||||
},
|
||||
{
|
||||
"defKey": "pid",
|
||||
"defName": "上级部门",
|
||||
"comment": "",
|
||||
"type": "",
|
||||
"len": "",
|
||||
"scale": "",
|
||||
"primaryKey": false,
|
||||
"notNull": false,
|
||||
"autoIncrement": false,
|
||||
"defaultValue": "",
|
||||
"hideInGraph": false,
|
||||
"refDict": "",
|
||||
"extProps": {},
|
||||
"domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
|
||||
"id": "8fb08930-0abf-4410-aa35-a9891c6a81a7"
|
||||
},
|
||||
{
|
||||
"defKey": "sub_count",
|
||||
"defName": "子部门数目",
|
||||
"comment": "",
|
||||
"type": "",
|
||||
"len": "",
|
||||
"scale": "",
|
||||
"primaryKey": false,
|
||||
"notNull": false,
|
||||
"autoIncrement": false,
|
||||
"defaultValue": "",
|
||||
"hideInGraph": false,
|
||||
"refDict": "",
|
||||
"extProps": {},
|
||||
"domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
|
||||
"id": "6b784bad-1a7f-4989-a9db-a9225e6e947b"
|
||||
},
|
||||
{
|
||||
"defKey": "name",
|
||||
"defName": "名称",
|
||||
"comment": "",
|
||||
"type": "",
|
||||
"len": "",
|
||||
"scale": "",
|
||||
"primaryKey": false,
|
||||
"notNull": true,
|
||||
"autoIncrement": false,
|
||||
"defaultValue": "",
|
||||
"hideInGraph": false,
|
||||
"refDict": "",
|
||||
"extProps": {},
|
||||
"domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
|
||||
"id": "210abffa-a4f8-4ce9-8459-29c4948fb2b1"
|
||||
},
|
||||
{
|
||||
"defKey": "dept_sort",
|
||||
"defName": "排序",
|
||||
"comment": "",
|
||||
"type": "",
|
||||
"len": "",
|
||||
"scale": "",
|
||||
"primaryKey": false,
|
||||
"notNull": true,
|
||||
"autoIncrement": false,
|
||||
"defaultValue": "",
|
||||
"hideInGraph": false,
|
||||
"refDict": "",
|
||||
"extProps": {},
|
||||
"domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
|
||||
"id": "90ed2b15-35d7-4fc5-82cd-aa7e257cf917"
|
||||
}
|
||||
],
|
||||
"correlations": [],
|
||||
"indexes": []
|
||||
}
|
||||
]
|
||||
@ -51,7 +51,20 @@ export default ({ openTemplate }) => {
|
||||
const [eidtLoading, setEidtLoading] = useState(false)
|
||||
const [searchLoading, setSearchLoading] = useState(false)
|
||||
React.useEffect(() => {
|
||||
const params = new URLSearchParams(window.location.search);
|
||||
const projectId = params.get('projectId');
|
||||
if (projectId) {
|
||||
setSpinCard(true)
|
||||
getModelId(projectId).then((res) => {
|
||||
if (res.code == 200) {
|
||||
setSpinCard(false)
|
||||
const manerDataKey = JSON.parse(res.data.jsonFile)
|
||||
openTemplate(manerDataKey, res.data.projectName)
|
||||
}
|
||||
})
|
||||
} else {
|
||||
goin(current, pagesize)
|
||||
}
|
||||
user()
|
||||
}, [])
|
||||
// 用户列表
|
||||
@ -259,7 +272,7 @@ export default ({ openTemplate }) => {
|
||||
okText: '确定',
|
||||
okType: 'danger',
|
||||
cancelText: '取消',
|
||||
async onOk () {
|
||||
async onOk() {
|
||||
await deleteProject(projectId)
|
||||
setTimeout(() => {
|
||||
message.success('删除成功')
|
||||
@ -286,6 +299,7 @@ export default ({ openTemplate }) => {
|
||||
<Form.Item>
|
||||
<Button
|
||||
block
|
||||
type='primary'
|
||||
className="ProCard"
|
||||
style={{ width: '200px' }}
|
||||
onClick={createshowModal}
|
||||
@ -338,7 +352,7 @@ export default ({ openTemplate }) => {
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
<div style={{ marginTop: '12px',color: "#9093a5" }}>{item.projectDescription}</div>
|
||||
<div style={{ marginTop: '12px', color: "#9093a5" }}>{item.projectDescription}</div>
|
||||
<DeleteOutlined
|
||||
title="删除"
|
||||
className="iconstyle"
|
||||
|
||||
@ -31,3 +31,7 @@
|
||||
display: flex;
|
||||
justify-content: end;
|
||||
}
|
||||
|
||||
.primary-button{
|
||||
color: @primary-color;
|
||||
}
|
||||
|
||||
@ -14,6 +14,7 @@ import {
|
||||
saveProject,
|
||||
saveVersionData,
|
||||
updateAllVersionData,
|
||||
updateDataSource,
|
||||
updateProject,
|
||||
} from '../../actions/core';
|
||||
import { ConfigContent } from '../../lib/context';
|
||||
@ -24,7 +25,7 @@ import './style/index.less';
|
||||
const Welcome = React.memo(({ prefix, getUserData, config, ...restProps }) => {
|
||||
const currentPrefix = getPrefix(prefix);
|
||||
return (
|
||||
<div className={`${currentPrefix}-welcome`} >
|
||||
<div className={!!new URLSearchParams(window.location.search) ? '' : `${currentPrefix}-welcome`}>
|
||||
{
|
||||
<ConfigContent.Provider value={config}>
|
||||
<Home config={config} {...restProps} />
|
||||
@ -48,6 +49,9 @@ const mapDispatchToProps = (dispatch) => {
|
||||
getUserData: (title) => {
|
||||
dispatch(getUserConfigData(title));
|
||||
},
|
||||
updateData: (data) => {
|
||||
dispatch(saveUserConfigSome(data));
|
||||
},
|
||||
saveUserData: (data) => {
|
||||
dispatch(saveUserConfigSome(data));
|
||||
},
|
||||
@ -103,6 +107,10 @@ const mapDispatchToProps = (dispatch) => {
|
||||
updateAllVersion: (versionData, title, dataSource) => {
|
||||
return dispatch(updateAllVersionData(versionData, title, dataSource));
|
||||
},
|
||||
updateDataSource: (dataSource) => {
|
||||
console.log(dataSource);
|
||||
return dispatch(updateDataSource(dataSource));
|
||||
},
|
||||
};
|
||||
};
|
||||
export default connect(mapStateToProps, mapDispatchToProps)(Welcome);
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
import { createIcon } from '@/utils/IconUtil';
|
||||
import request from '@/utils/request'
|
||||
import request from '@/utils/request';
|
||||
import type { MenuDataItem } from '@umijs/route-utils';
|
||||
|
||||
/** 获取当前的用户 GET /api/getUserInfo */
|
||||
export async function getUserInfo (options?: Record<string, any>) {
|
||||
export async function getUserInfo(options?: Record<string, any>) {
|
||||
return request<API.GetUserInfoResult>('/api/getInfo', {
|
||||
method: 'GET',
|
||||
...(options || {}),
|
||||
@ -11,14 +11,13 @@ export async function getUserInfo (options?: Record<string, any>) {
|
||||
}
|
||||
|
||||
/** 退出登录接口 POST /api/login/outLogin */
|
||||
export async function logout (options?: Record<string, any>) {
|
||||
export async function logout(options?: Record<string, any>) {
|
||||
return request<Record<string, any>>('/api/logout', {
|
||||
method: 'POST',
|
||||
...(options || {}),
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
export async function getRouters(): Promise<API.GetRoutersResult> {
|
||||
return request('/api/getRouters');
|
||||
}
|
||||
@ -44,9 +43,11 @@ export async function getRoutersInfo(): Promise<MenuDataItem[]> {
|
||||
});
|
||||
}
|
||||
|
||||
export function getMatchMenuItem(path: string, menuData: MenuDataItem[]|undefined): MenuDataItem[] {
|
||||
if(!menuData)
|
||||
return [];
|
||||
export function getMatchMenuItem(
|
||||
path: string,
|
||||
menuData: MenuDataItem[] | undefined,
|
||||
): MenuDataItem[] {
|
||||
if (!menuData) return [];
|
||||
let items: MenuDataItem[] = [];
|
||||
menuData.forEach((item) => {
|
||||
if (item.path) {
|
||||
@ -57,13 +58,13 @@ export function getMatchMenuItem(path: string, menuData: MenuDataItem[]|undefine
|
||||
if (path.length >= item.path?.length) {
|
||||
const exp = `${item.path}/*`;
|
||||
if (path.match(exp)) {
|
||||
if(item.routes) {
|
||||
const subpath = path.substr(item.path.length+1);
|
||||
if (item.routes) {
|
||||
const subpath = path.substr(item.path.length + 1);
|
||||
const subItem: MenuDataItem[] = getMatchMenuItem(subpath, item.routes);
|
||||
items = items.concat(subItem);
|
||||
} else {
|
||||
const paths = path.split('/');
|
||||
if(paths.length >= 2 && paths[0] === item.path && paths[1] === 'index') {
|
||||
if (paths.length >= 2 && paths[0] === item.path && paths[1] === 'index') {
|
||||
items.push(item);
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user