Commit a0671062 authored by 邓晓峰's avatar 邓晓峰

feat: 调整菜单图标大小

parent 1b8d8427
Pipeline #35592 passed with stages
in 57 minutes 19 seconds
...@@ -3,15 +3,15 @@ export function genActiveRule(routerPrefix) { ...@@ -3,15 +3,15 @@ export function genActiveRule(routerPrefix) {
} }
export default { export default {
dev: [ dev: [
{ // {
name: 'civ_monitor', // name: 'civ_monitor',
entry: `//${window.location.hostname}:8082/civ_monitor`, // entry: `//${window.location.hostname}:8082/civ_monitor`,
container: '#micro-container', // container: '#micro-container',
activeRule: '/civbase/civ_monitor', // activeRule: '/civbase/civ_monitor',
}, // },
{ {
name: 'civ_water', name: 'civ_water',
entry: `//${window.location.hostname}:8080/civ_water`, entry: `//${window.location.hostname}:8082/civ_water`,
container: '#micro-container', container: '#micro-container',
activeRule: '/civbase/civ_water', activeRule: '/civbase/civ_water',
}, },
......
/* eslint-disable */ /* eslint-disable */
// const proxyURL = process.env.NODE_ENV !== 'production' ? 'http://192.168.10.150:8777' : window.location.origin; // const proxyURL = process.env.NODE_ENV !== 'production' ? 'http://192.168.10.150:8777' : window.location.origin;
const proxyURL = 'http://172.16.10.206:8666'; const proxyURL = 'http://192.168.10.150:8669';
module.exports = { module.exports = {
assetsRoot: process.env.NODE_ENV !== 'production' ? proxyURL : './', assetsRoot: process.env.NODE_ENV !== 'production' ? proxyURL : './',
dev: { dev: {
......
...@@ -506,7 +506,7 @@ const BasicLayout = props => { ...@@ -506,7 +506,7 @@ const BasicLayout = props => {
<Tooltip placement="right" title={collapse ? item.name: ''}> <Tooltip placement="right" title={collapse ? item.name: ''}>
<a> <a>
{ {
item.icon ? item.icon: item.extData && /.svg/.test(item.extData.icon) ? <ReactSVG src={item.extData.icon} style={{width: '22px', height: '22px'}} className={layoutStyles.icon}/>: item.extData && <img src={item.extData.icon} /> item.icon ? item.icon: item.extData && /.svg/.test(item.extData.icon) ? <ReactSVG src={item.extData.icon} style={{width: '20px', height: '20px'}} className={layoutStyles.icon}/>: item.extData && <img src={item.extData.icon} />
} }
{ {
collapse ? item.extData && <span>{(item.extData.shortName || item.name).substr(0, 2)}</span>: <span>{item.name}</span> collapse ? item.extData && <span>{(item.extData.shortName || item.name).substr(0, 2)}</span>: <span>{item.name}</span>
......
...@@ -43,7 +43,10 @@ export const initMicroApps = (loader, store) => { ...@@ -43,7 +43,10 @@ export const initMicroApps = (loader, store) => {
entry: "//" + window.location.host + (`/${item.PackageName}`), entry: "//" + window.location.host + (`/${item.PackageName}`),
container: '#micro-container', container: '#micro-container',
activeRule: genActiveRule(`/civbase/${item.PackageName}`), activeRule: genActiveRule(`/civbase/${item.PackageName}`),
props: item.DefaultSetting props: {
...item.DefaultSetting,
routerBase: item.PackageName
}
}) })
}); });
const entrys = const entrys =
......
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