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

fix: 修复菜单样式

parent 73bee61e
Pipeline #32432 skipped with stages
...@@ -21,6 +21,13 @@ export default { ...@@ -21,6 +21,13 @@ export default {
container: '#micro-container', container: '#micro-container',
activeRule: '/civbase/civweb4', activeRule: '/civbase/civweb4',
}, },
{
name: 'middleground',
entry: `//${window.location.hostname}:8081/middleground`,
container: '#micro-container',
activeRule: '/civbase/middleground',
},
], ],
prod: [ prod: [
{ {
......
/* 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 = 'https://panda-water.com'; const proxyURL = 'http://192.168.19.105:8082';
module.exports = { module.exports = {
assetsRoot: process.env.NODE_ENV !== 'production' ? proxyURL : './', assetsRoot: process.env.NODE_ENV !== 'production' ? proxyURL : './',
dev: { dev: {
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
"pinyin-match": "^1.1.1", "pinyin-match": "^1.1.1",
"promise.prototype.finally": "^3.1.2", "promise.prototype.finally": "^3.1.2",
"prop-types": "15.7.2", "prop-types": "15.7.2",
"qiankun": "^2.4.8", "qiankun": "^2.4.10",
"qrcode.react": "^1.0.0", "qrcode.react": "^1.0.0",
"react": "16.12.0", "react": "16.12.0",
"react-dom": "16.12.0", "react-dom": "16.12.0",
...@@ -28712,9 +28712,10 @@ ...@@ -28712,9 +28712,10 @@
"dev": true "dev": true
}, },
"node_modules/qiankun": { "node_modules/qiankun": {
"version": "2.4.8", "version": "2.4.10",
"resolved": "https://g.civnet.cn:4873/qiankun/-/qiankun-2.4.8.tgz", "resolved": "https://g.civnet.cn:4873/qiankun/-/qiankun-2.4.10.tgz",
"integrity": "sha512-JVznyuB7lPB/6mEvINCbUr79reeJ2SHzA0ziORWjrQz+C0/4E2jtdJN/f49uGY1p3zd6vHNNXFucjpjqpKQUMw==", "integrity": "sha512-k8S2WytuhaFjbG9dRsymga2R5GDOfJipBN4nqnvh+q2o83wJbcWWI+CVjX89YgWgwsHKmVREbnp4+Ey1ZQUPYg==",
"license": "MIT",
"dependencies": { "dependencies": {
"@babel/runtime": "^7.10.5", "@babel/runtime": "^7.10.5",
"import-html-entry": "^1.9.0", "import-html-entry": "^1.9.0",
...@@ -67417,9 +67418,9 @@ ...@@ -67417,9 +67418,9 @@
"dev": true "dev": true
}, },
"qiankun": { "qiankun": {
"version": "2.4.8", "version": "2.4.10",
"resolved": "https://g.civnet.cn:4873/qiankun/-/qiankun-2.4.8.tgz", "resolved": "https://g.civnet.cn:4873/qiankun/-/qiankun-2.4.10.tgz",
"integrity": "sha512-JVznyuB7lPB/6mEvINCbUr79reeJ2SHzA0ziORWjrQz+C0/4E2jtdJN/f49uGY1p3zd6vHNNXFucjpjqpKQUMw==", "integrity": "sha512-k8S2WytuhaFjbG9dRsymga2R5GDOfJipBN4nqnvh+q2o83wJbcWWI+CVjX89YgWgwsHKmVREbnp4+Ey1ZQUPYg==",
"requires": { "requires": {
"@babel/runtime": "^7.10.5", "@babel/runtime": "^7.10.5",
"import-html-entry": "^1.9.0", "import-html-entry": "^1.9.0",
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
"pinyin-match": "^1.1.1", "pinyin-match": "^1.1.1",
"promise.prototype.finally": "^3.1.2", "promise.prototype.finally": "^3.1.2",
"prop-types": "15.7.2", "prop-types": "15.7.2",
"qiankun": "^2.4.8", "qiankun": "^2.4.10",
"qrcode.react": "^1.0.0", "qrcode.react": "^1.0.0",
"react": "16.12.0", "react": "16.12.0",
"react-dom": "16.12.0", "react-dom": "16.12.0",
......
...@@ -6,7 +6,6 @@ import 'antd/dist/antd.less'; ...@@ -6,7 +6,6 @@ import 'antd/dist/antd.less';
import 'file-loader?name=.htaccess!./.htaccess'; // eslint-disable-line import/extensions import 'file-loader?name=.htaccess!./.htaccess'; // eslint-disable-line import/extensions
import 'kit_utils/lib/format'; import 'kit_utils/lib/format';
import 'sanitize.css/sanitize.css'; import 'sanitize.css/sanitize.css';
// import './locales/zh-CN'; // import './locales/zh-CN';
// import './loader'; // import './loader';
// import './vm'; // import './vm';
......
...@@ -608,4 +608,7 @@ ...@@ -608,4 +608,7 @@
margin: 0; margin: 0;
} }
:global(.@{ant-prefix}-menu-submenu .@{ant-prefix}-menu-sub.@{ant-prefix}-menu-inline) {
padding-left: 30px!important;
}
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