Merge branch 'master' of https://g.civnet.cn:8443/ReactWeb5/CivWeb

.gitlab-ci.yml

@@ -49,8 +49,8 @@ push:
   - 'git clean -fd'
   - 'git remote set-url origin "https://${GIT_ACCESS_USER}:${GIT_ACCESS_PASSWORD}@g.civnet.cn:8443/CivPublish/CivWebPublish2021.git"'
   - 'git pull origin map'
-  - 'git rm -rf "${TARGET_REPO}/civbase"'
-  - 'git commit -m "chore: clear folder"'
+  #- 'git rm -rf "${TARGET_REPO}/civbase"'
+  #- 'git commit -m "chore: clear folder"'
   - 'git push origin map'
   - 'robocopy "${CI_PROJECT_DIR}/../CivWebPublish2021/civbase" "${TARGET_REPO}/civbase" /S ;
         IF ((${LASTEXITCODE} -le 8)) {cmd /c "exit /b 0"}'

src/pages/commonMenu/index.js

@@ -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

 import LoadingComponent from '@ant-design/pro-layout/es/PageLoading';
 import { dynamic } from '@wisdom-utils/runtime';
 
-import BasicLayout from '../layouts/BasicLayout1';
+import BasicLayout from '../layouts/BasicLayout';
 import UserLayout from '../layouts/UserLayout';
 import BootPage from '../pages/bootpage';
 import Login from '../pages/user/login';