Skip to content

E
ems3.3
Commit 9543de12 authored by TZW's avatar TZW
Browse files
Options

Merge branch 'master' of http://47.100.234.193:9527/wuhao/ems3.3

parents 584a5877 7fa62c3f
Hide whitespace changes
Inline Side-by-side
Showing with 83 additions and 87 deletions
src/app.jsx
View file @ 9543de12
......@@ -8,12 +8,9 @@ import TagView from '@/components/TagView';
import SiderMenu from '@/components/SiderMenu';
import * as Ant4Icons from '@ant-design/icons';
import { createElement } from 'react';
import routes from '../config/authRoutes';
const { LinkOutlined } = Ant4Icons;
// const isDev = process.env.NODE_ENV === 'development';
const isDev = true;
//console.log(isDev);
const isDev = process.env.NODE_ENV === 'development';
const loginPath = '/user/login';
/**
......@@ -35,7 +32,7 @@ export async function getInitialState() {
const msg = await queryCurrentUser();
return msg.data;
} catch (error) {
// history.push(loginPath);
history.push(loginPath);
}
return undefined;
}; // 如果是登录页面，不执行
......@@ -48,23 +45,14 @@ export async function getInitialState() {
message.error(res.msg);
}
return undefined;
};
// 如果是登录页面，不执行
}; // 如果是登录页面，不执行
if (history.location.pathname !== loginPath && token) {
const currentUserData = await fetchUserInfo();
let menuData;
if (currentUserData?.data?.username) {
menuData = await getmenuData();
}
/* isdev */
if (isDev) {
menuData = {
recentUsePermList: [],
collectPerm: [],
userHavePermList: routes,
};
}
return {
fetchUserInfo,
currentUser: currentUserData?.data,
......@@ -74,23 +62,12 @@ export async function getInitialState() {
collapsed: false,
};
}
let menuData = {};
if (isDev) {
menuData = {
recentUsePermList: [],
collectPerm: [],
userHavePermList: routes,
};
}
return {
fetchUserInfo,
settings: defaultSettings,
getmenuData,
collapsed: false,
tagList: [],
newMenu: menuData,
};
}
......@@ -98,18 +75,6 @@ export async function getInitialState() {
export const layout = ({ initialState, setInitialState }) => {
let token = localStorage.getItem('TOKENES');
let menurender = isDev
? {}
: {
menuRender: (props, defaultDom) => {
if (props.isMobile) {
return defaultDom;
} else {
return <SiderMenu {...props} />;
}
},
};
return {
disableContentMargin: false,
waterMarkProps: {
......@@ -123,16 +88,16 @@ export const layout = ({ initialState, setInitialState }) => {
onPageChange: () => {
const { location } = history;
// 如果没有登录，重定向到 login
// if (!initialState?.currentUser && location.pathname !== loginPath) {
// history.push(loginPath);
// }
if (!initialState?.currentUser && location.pathname !== loginPath) {
history.push(loginPath);
}
},
links: isDev
? [
// <Link key="openapi" to="/umi/plugin/openapi" target="_blank">
// <LinkOutlined />
// <span>OpenAPI 文档</span>
// </Link>,
<Link key="openapi" to="/umi/plugin/openapi" target="_blank">
<LinkOutlined />
<span>OpenAPI 文档</span>
</Link>,
]
: [],
//接口获取菜单数据
......@@ -142,26 +107,25 @@ export const layout = ({ initialState, setInitialState }) => {
userId: initialState?.currentUser?.id,
},
request: (params, defaultMenuData) => {
//console.log(initialState);
let lastArr = initialState?.newMenu?.userHavePermList
? JSON.parse(JSON.stringify(initialState?.newMenu?.userHavePermList))
: [];
// newArr = [
// // {
// // path: '/welcome',
// // name: '首页',
// // icon: 'smile',
// // component: './Welcome',
// // haveChildren: false,
// // key: '000000',
// // parentKey: '0',
// // routes: [],
// // children: null,
// // title: null,
// // },
// ].concat(lastArr);
? JSON.parse(JSON.stringify(initialState?.newMenu?.userHavePermList))
: [],
newArr = [
{
path: '/welcome',
name: '首页',
icon: 'smile',
component: './Welcome',
haveChildren: false,
key: '000000',
parentKey: '0',
routes: [],
children: null,
title: null,
},
].concat(lastArr);
return lastArr.map((item, index) => {
return newArr.map((item, index) => {
if (item.icon) {
const icon = strToHump(item.icon),
ItemIcon = Ant4Icons[icon];
......@@ -172,7 +136,13 @@ export const layout = ({ initialState, setInitialState }) => {
},
locale: false,
},
...menurender,
menuRender: (props, defaultDom) => {
if (props.isMobile) {
return defaultDom;
} else {
return <SiderMenu {...props} />;
}
},
// 自定义 403 页面
unAccessible: <div>unAccessible</div>,
noFound: <div>noFound</div>,
......
src/components/DrawerPro/index.jsx
View file @ 9543de12
......@@ -13,7 +13,6 @@ function DrawerPro(props) {
fields: props.fields,
detailData: props.detailData,
};
return (
<Drawer
maskClosable={false}
......
src/components/InitForm/index.jsx
View file @ 9543de12
......@@ -83,24 +83,27 @@ let FormRender = memo(({ fields = [], colProps, proformRef }) => {
);
});
function InitForm({
formRef,
onFinish = (vals) => {
//console.log(vals);
},
formKey,
params = {},
detailpath = '',
defaultFormValue = {},
detailFormat,
submitter,
fields,
extendField = '',
colProps = { xs: 24, sm: 24, md: 12, lg: 12, xl: 12, xxl: 12 },
onValuesChange = (changedValues, allValues) => {
//console.log(changedValues, allValues);
},
}) {
function InitForm(props) {
let {
formRef,
onFinish = (vals) => {
//console.log(vals);
},
formKey,
params = {},
detailpath = '',
defaultFormValue = {},
detailFormat,
submitter,
fields,
extendField = '',
colProps = { xs: 24, sm: 24, md: 12, lg: 12, xl: 12, xxl: 12 },
onValuesChange = (changedValues, allValues) => {
//console.log(changedValues, allValues);
},
} = props;
console.log(props);
let proformRef = useRef();
proformRef = formRef ?? proformRef;
return (
......
src/components/SiderMenu/index.jsx
View file @ 9543de12
......@@ -141,7 +141,7 @@ function SiderMenu({ logo, collapsed, onCollapse, fixSiderbar, theme, isMobile,
const collectList = useMemo(() => {
return collectPerm.map((item, i) => {
const icon = item.icon ?? strToHump(item.icon),
const icon = item.icon ? strToHump(item.icon) : 'ToolOutlined',
ItemIcon = icon ? Ant4Icons[icon] : Ant4Icons.ToolOutlined;
return {
key: item.path,
......@@ -316,7 +316,7 @@ function SiderMenu({ logo, collapsed, onCollapse, fixSiderbar, theme, isMobile,
<div className={styles.column}>
{getMenuData &&
filterMenu(getMenuData, search).map((item, i) => {
const icon = item.icon ?? strToHump(item.icon),
const icon = item.icon ? strToHump(item.icon) : 'ToolOutlined',
ItemIcon = icon ? Ant4Icons[icon] : Ant4Icons['ToolOutlined'];
return (
<div className={styles.item} key={i}>
......@@ -341,7 +341,7 @@ function SiderMenu({ logo, collapsed, onCollapse, fixSiderbar, theme, isMobile,
<div className={styles.rt}>
{getMenuData &&
getMenuData.map((item, i) => {
const icon = item.icon ?? strToHump(item.icon),
const icon = item.icon ? strToHump(item.icon) : 'ToolOutlined',
ItemIcon = icon ? Ant4Icons[icon] : Ant4Icons['ToolOutlined'];
return (
<p
......
src/global.less
View file @ 9543de12
......@@ -444,5 +444,23 @@ ol {
overflow: hidden !important;
> div {
height: 100%;
min-height: calc(100vh - 96px);
> div {
height: 100%;
}
}
.ant-drawer-content {
height: 100% !important;
}
}
// 横向滚动条
.scrollHoriz {
> div {
display: flex !important;
flex-wrap: nowrap !important;
align-items: center !important;
> div {
flex-shrink: 0 !important;
}
}
}
src/pages/device/account/index.jsx
View file @ 9543de12
......@@ -2178,6 +2178,9 @@ function Model(props) {
}));
}}
{...drawer}
colProps={{
span: 8,
}}
>
{selectMoreDrawerType(drawer?.type)}
</DrawerPro>
......@@ -2192,6 +2195,9 @@ function Model(props) {
}));
}}
{...currDrawer}
colProps={{
span: 8,
}}
>
<ProDescriptions
title="设备信息"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment