Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
CivWeb
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ReactWeb5
CivWeb
Commits
120b9197
Commit
120b9197
authored
Nov 02, 2021
by
邓晓峰
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修复智联加载
parent
24ea3b8f
Pipeline
#36992
skipped with stages
Changes
8
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
20 additions
and
21 deletions
+20
-21
config.js
config/config.js
+3
-6
app.js
src/app.js
+2
-2
index.less
src/components/HeaderSearch/index.less
+2
-0
index.js
src/components/NoticeIcon/index.js
+4
-4
UserLayout1.less
src/layouts/UserLayout1.less
+0
-0
micro.js
src/micro.js
+5
-5
index.js
src/pages/commonMenu/index.js
+3
-3
config.js
src/routes/config.js
+1
-1
No files found.
config/config.js
View file @
120b9197
...
...
@@ -60,10 +60,7 @@ module.exports = {
.
split
(
'/'
)
.
map
(
a
=>
a
.
replace
(
/
([
A-Z
])
/g
,
'-$1'
))
.
map
(
a
=>
a
.
toLowerCase
());
return
`panda-console-base
${
arr
.
join
(
'-'
)}
-
${
localName
}
`
.
replace
(
/--/g
,
'-'
,
);
return
`panda-pro-
${
arr
.
join
(
'-'
)}
-
${
localName
}
`
.
replace
(
/--/g
,
'-'
);
}
return
localName
;
},
...
...
@@ -72,8 +69,8 @@ module.exports = {
lessLoader
:
{
modifyVars
:
{
// hack: `true; @import "~@/global.less";`,
'@ant-prefix'
:
'panda-console-base'
,
'@iconPrefixCls'
:
'panda-console-base-icon'
//
'@ant-prefix': 'panda-console-base',
//
'@iconPrefixCls': 'panda-console-base-icon'
},
javascriptEnabled
:
true
},
...
...
src/app.js
View file @
120b9197
...
...
@@ -45,14 +45,14 @@ window.createStoreage = new Storeage(namespace);
const
initialState
=
Immutable
.
Map
();
const
store
=
configureStore
(
initialState
,
history
);
const
MOUNT_NODE
=
document
.
getElementById
(
'root'
);
//prefixCls="panda-console-base"
const
render
=
()
=>
{
// eslint-disable-next-line react-hooks/rules-of-hooks
ReactDOM
.
render
(
<
Provider
store
=
{
store
}
>
<
ConnectedRouter
history
=
{
history
}
>
<
LocaleContainer
>
<
ConfigProvider
prefixCls
=
"panda-console-base"
>
<
ConfigProvider
>
<
ErrorBoundary
>
<
Container
>
<
App
/>
...
...
src/components/HeaderSearch/index.less
View file @
120b9197
...
...
@@ -38,6 +38,7 @@
border-radius: 28px;
width: 320px !important;
color: #555555;
padding: 4px 11px!important;
}
}
.@{ant-prefix}-input-affix-wrapper {
...
...
@@ -46,6 +47,7 @@
min-width: 120px;
max-width: 320px;
border-radius: 28px;
padding: 4px 11px!important;
}
.anticon-search {
color: #888888;
...
...
src/components/NoticeIcon/index.js
View file @
120b9197
...
...
@@ -10,7 +10,7 @@ import Icon from '@ant-design/icons';
import
HeaderDropdown
from
'../HeaderDropdown'
;
import
styles
from
'./index.less'
;
import
NoticeList
from
'./NoticeList'
;
//hsla(221, 100%, 95%, 0.7)
const
messageSvg
=
()
=>
(
<
svg
version
=
"1.1"
...
...
@@ -23,7 +23,7 @@ const messageSvg = () => (
space
=
"preserve"
>
<
path
fill
=
"
hsla(221, 100%, 95%, 0.7)
"
fill
=
"
#5F718C
"
d
=
"M20.486,16.373l-1.721-2.246v-0.984v-0.352V9.924c0-1.919-0.664-3.698-1.871-5.007
c-0.712-0.776-1.57-1.349-2.551-1.705c-0.091-0.514-0.35-0.983-0.737-1.335c-0.879-0.791-2.334-0.791-3.21,0
c-0.394,0.354-0.653,0.823-0.741,1.336C8.676,3.568,7.817,4.14,7.105,4.917C5.899,6.229,5.234,8.008,5.234,9.923l0.005,4.194
...
...
@@ -34,7 +34,7 @@ const messageSvg = () => (
c0,0.334,0.123,0.654,0.336,0.875l1.642,2.164l0.013,1.037L4.899,17.996z"
/>
<
path
fill
=
"
hsla(221, 100%, 95%, 0.7)
"
fill
=
"
#5F718C
"
d
=
"M13.685,20.236c-0.101,0.238-0.248,0.453-0.444,0.631c-0.677,0.617-1.799,0.615-2.473,0.002
c-0.194-0.18-0.344-0.396-0.446-0.633H8.895c0.146,0.627,0.474,1.199,0.955,1.639c0.588,0.543,1.354,0.841,2.158,0.841
c0.801,0,1.566-0.298,2.154-0.837c0.481-0.439,0.808-1.012,0.954-1.641L13.685,20.236z"
...
...
@@ -112,7 +112,7 @@ const NoticeIcon = props => {
>
{
NoticeBellIcon
}
<
/Badge
>
<
span
className
=
{
styles
.
title
}
>
消息
<
/span
>
{
/* <span className={styles.title}>消息</span> */
}
<
/span
>
);
if
(
!
notificationBox
)
{
...
...
src/layouts/UserLayout1.less
0 → 100644
View file @
120b9197
src/micro.js
View file @
120b9197
...
...
@@ -127,11 +127,11 @@ export const initMicroApps = (loader, store) => {
url
.
indexOf
(
'framework/jquery/gridify.qrcode.js'
)
!==
-
1
||
url
.
indexOf
(
'framework/application/Platform.js'
)
!==
-
1
||
url
.
indexOf
(
'echarts'
)
!==
-
1
||
//
url.indexOf('lbs.amap.com') !== -1 ||
//
url.indexOf('restapi.amap.com') !== -1 ||
//
url.indexOf('webapi.amap.com') !== -1 ||
//
url.indexOf('webapi.amap.com/count') !== -1 ||
//
url.indexOf('restapi.amap.com/v3') !== -1 ||
url
.
indexOf
(
'lbs.amap.com'
)
!==
-
1
||
url
.
indexOf
(
'restapi.amap.com'
)
!==
-
1
||
url
.
indexOf
(
'webapi.amap.com'
)
!==
-
1
||
url
.
indexOf
(
'webapi.amap.com/count'
)
!==
-
1
||
url
.
indexOf
(
'restapi.amap.com/v3'
)
!==
-
1
||
url
.
indexOf
(
'api.map.baidu.com'
)
!==
-
1
||
url
.
indexOf
(
'map.baidu.com'
)
!==
-
1
||
url
.
indexOf
(
'pv.sohu.com'
)
!==
-
1
||
...
...
src/pages/commonMenu/index.js
View file @
120b9197
...
...
@@ -19,9 +19,9 @@ import starIcon from '../../assets/images/commonMenu/矢量智能对象 拷贝 3
// 是否是灰色的图标(灰色图标在白色背景中看不见,添加滤镜变色)
const
isNeedFilterIcon
=
(
icon
=
''
)
=>
icon
&&
!
icon
.
includes
(
'一级'
)
&&
!
icon
.
includes
(
'ios/'
);
Modal
.
config
({
rootPrefixCls
:
'panda-console-base'
});
//
Modal.config({
//
rootPrefixCls: 'panda-console-base'
//
});
const
CommonMenu
=
props
=>
{
const
history
=
useHistory
();
const
{
menus
}
=
props
;
...
...
src/routes/config.js
View file @
120b9197
import
LoadingComponent
from
'@ant-design/pro-layout/es/PageLoading'
;
import
{
dynamic
}
from
'@wisdom-utils/runtime'
;
import
BasicLayout
from
'../layouts/BasicLayout
1
'
;
import
BasicLayout
from
'../layouts/BasicLayout'
;
import
UserLayout
from
'../layouts/UserLayout'
;
import
BootPage
from
'../pages/bootpage'
;
import
Login
from
'../pages/user/login'
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment