Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into feature
Browse files Browse the repository at this point in the history
  • Loading branch information
@zombieJ
zombieJ committed Nov 24, 2022
2 parents cfa5dd4 + 16b9cd7 commit 2e721eb
Show file tree
Hide file tree
Showing 12 changed files with 2,290 additions and 2,467 deletions.
5 changes: 2 additions & 3 deletions docs/components/components/Footer/index.local.less
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "./footerMobile.less";
@import './footerMobile.less';

.footerContainer {
background-color: #000;
Expand Down Expand Up @@ -44,7 +44,6 @@
}
}
}

}

.copyright {
Expand All @@ -55,7 +54,7 @@
color: rgba(255, 255, 255, 0.65);
text-align: center;
line-height: 32px;
border-top: 1px solid rgba(255, 255, 255, .25);
border-top: 1px solid rgba(255, 255, 255, 0.25);

.copyrightLink {
color: #fff;
Expand Down
7 changes: 3 additions & 4 deletions docs/components/globalMobile.less
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
:global {

// 移动端
@media screen and (max-width: 450px) {

// 影响移动端所有页面
#root .__dumi-default-navbar {
padding: 0 58px;
Expand All @@ -13,7 +11,7 @@
}

// 影响移动端首页
.__dumi-default-layout[data-route="/"].__dumi-default-layout[data-gapless='true'] {
.__dumi-default-layout[data-route='/'].__dumi-default-layout[data-gapless='true'] {
.__dumi-default-navbar {
position: sticky;
top: 0;
Expand All @@ -25,7 +23,8 @@
.__dumi-default-navbar-toggle {
width: 16px;
height: 16px;
background: url(https://gw.alipayobjects.com/zos/bmw-prod/2a780b32-f3dd-4e13-8c27-2369d898bd76.svg) no-repeat center / cover
background: url(https://gw.alipayobjects.com/zos/bmw-prod/2a780b32-f3dd-4e13-8c27-2369d898bd76.svg)
no-repeat center / cover;
}

.__dumi-default-menu {
Expand Down
15 changes: 7 additions & 8 deletions docs/components/globalPC.less
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
:global {

// 下面影响所有页面
.__dumi-default-navbar nav>span>a svg {
.__dumi-default-navbar nav > span > a svg {
display: none;
}

Expand All @@ -18,10 +17,9 @@
}

// 下面样式只影响首页
.__dumi-default-layout[data-route="/"].__dumi-default-layout[data-gapless='true'] {
.__dumi-default-layout[data-route='/'].__dumi-default-layout[data-gapless='true'] {
padding-top: 0 !important;


.__dumi-default-navbar {
position: absolute;
max-width: 1152px;
Expand All @@ -36,17 +34,17 @@
background-image: url(https://gw.alipayobjects.com/zos/bmw-prod/7c5fec71-34b2-4996-8384-89555714927c.svg) !important;
}

.__dumi-default-navbar nav>span>a {
.__dumi-default-navbar nav > span > a {
color: #fff;
}

.__dumi-default-navbar nav>span>a:hover {
.__dumi-default-navbar nav > span > a:hover {
font-family: PingFangSC-Medium;
line-height: 22px;
color: #fff !important;
}

.__dumi-default-navbar nav>span:hover:before {
.__dumi-default-navbar nav > span:hover:before {
content: '';
position: absolute;
top: 0;
Expand All @@ -63,7 +61,8 @@
width: 200px;
height: 32px;
transition: none;
background: url(https://gw.alipayobjects.com/zos/bmw-prod/f4f3a6af-273c-4250-8cf3-f36e58448063.svg) no-repeat;
background: url(https://gw.alipayobjects.com/zos/bmw-prod/f4f3a6af-273c-4250-8cf3-f36e58448063.svg)
no-repeat;
background-size: 100% 100%;
}

Expand Down
19 changes: 10 additions & 9 deletions docs/components/home-page.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
import React, { useEffect } from 'react';
import Main from './components/Main';
import Footer from './components/Footer';
import 'antd/dist/antd.css';
import styles from './home-page.less';
import React, { useEffect } from 'react'
import Main from './components/Main'
import Footer from './components/Footer'
import 'antd/dist/antd.css'
import styles from './home-page.less'

export default () => {
useEffect(() => {
const algoliaSearch: any = document.querySelector('.__dumi-default-search-input') || {};
algoliaSearch.placeholder = '搜索';
}, []);
const algoliaSearch: any =
document.querySelector('.__dumi-default-search-input') || {}
algoliaSearch.placeholder = '搜索'
}, [])

return (
<div className={styles.homePage}>
<Main />
<Footer />
</div>
)
}
}
84 changes: 42 additions & 42 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,68 +15,68 @@
"pub:dev": "npm publish ./lib --tag dev"
},
"dependencies": {
"@floating-ui/dom": "^1.0.0",
"@react-spring/web": "^9.4.5",
"@floating-ui/dom": "^1.0.6",
"@react-spring/web": "^9.5.5",
"@use-gesture/react": "10.2.20",
"ahooks": "^3.7.0",
"ahooks": "^3.7.2",
"antd-mobile-icons": "^0.3.0",
"antd-mobile-v5-count": "^1.0.1",
"big.js": "^6.2.1",
"classnames": "^2.3.1",
"dayjs": "^1.11.4",
"classnames": "^2.3.2",
"dayjs": "^1.11.6",
"lodash": "^4.17.21",
"rc-field-form": "~1.27.0",
"rc-field-form": "~1.27.3",
"react-is": "^17.0.2",
"runes": "^0.4.3",
"staged-components": "^1.1.3",
"tslib": "^2.4.0",
"use-sync-external-store": "^1.1.0"
"tslib": "^2.4.1",
"use-sync-external-store": "^1.2.0"
},
"devDependencies": {
"@ant-design/icons": "^4.7.0",
"@ant-design/tools": "^16.0.0-alpha.0",
"@babel/cli": "^7.18.10",
"@babel/core": "^7.18.10",
"@babel/plugin-transform-modules-commonjs": "^7.18.2",
"@babel/preset-env": "^7.18.10",
"@babel/preset-react": "^7.17.12",
"@babel/preset-typescript": "^7.17.12",
"@commitlint/cli": "^17.0.2",
"@commitlint/config-conventional": "^17.0.2",
"@docsearch/react": "^3.2.1",
"@ant-design/icons": "^4.8.0",
"@ant-design/tools": "^16.0.0-alpha.3",
"@babel/cli": "^7.19.3",
"@babel/core": "^7.20.2",
"@babel/plugin-transform-modules-commonjs": "^7.19.6",
"@babel/preset-env": "^7.20.2",
"@babel/preset-react": "^7.18.6",
"@babel/preset-typescript": "^7.18.6",
"@commitlint/cli": "^17.3.0",
"@commitlint/config-conventional": "^17.3.0",
"@docsearch/react": "^3.3.0",
"@jest/types": "^28.1.3",
"@statoscope/webpack-plugin": "^5.24.0",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^13.3.0",
"@testing-library/react": "^13.4.0",
"@testing-library/react-hooks": "^8.0.1",
"@testing-library/user-event": "14.2.1",
"@types/big.js": "^6.1.5",
"@types/jest": "^28.1.7",
"@types/big.js": "^6.1.6",
"@types/jest": "^28.1.8",
"@types/jest-axe": "3.5.4",
"@types/lodash": "^4.14.183",
"@types/node": "^18.7.6",
"@types/react": "^18.0.17",
"@types/lodash": "^4.14.189",
"@types/node": "^18.11.9",
"@types/react": "^18.0.25",
"@types/react-beautiful-dnd": "^13.1.2",
"@types/react-dom": "^18.0.6",
"@types/react-dom": "^18.0.9",
"@types/react-helmet": "^6.1.5",
"@types/react-is": "^17.0.3",
"@types/react-virtualized": "^9.21.21",
"@types/resize-observer-browser": "^0.1.7",
"@types/runes": "^0.4.1",
"@types/testing-library__jest-dom": "^5.14.5",
"@types/use-sync-external-store": "^0.0.3",
"@typescript-eslint/eslint-plugin": "^5.33.1",
"@typescript-eslint/parser": "^5.33.1",
"@umijs/types": "^3.5.34",
"antd": "^4.23.5",
"@typescript-eslint/eslint-plugin": "^5.44.0",
"@typescript-eslint/parser": "^5.44.0",
"@umijs/types": "^3.5.35",
"antd": "^4.24.3",
"autoprefixer": "^9.8.8",
"babel-loader": "^8.2.5",
"css-loader": "^6.7.1",
"babel-loader": "^8.3.0",
"css-loader": "^6.7.2",
"del": "^6.1.1",
"dumi": "^1.1.48",
"eslint": "^8.22.0",
"dumi": "^1.1.49",
"eslint": "^8.28.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-react": "^7.30.1",
"eslint-plugin-react": "^7.31.11",
"eslint-plugin-react-hooks": "^4.6.0",
"gulp": "^4.0.2",
"gulp-babel": "^8.0.0",
Expand All @@ -85,9 +85,9 @@
"gulp-rename": "^2.0.0",
"gulp-replace": "^1.1.3",
"gulp-typescript": "^6.0.0-alpha.1",
"husky": "^8.0.1",
"husky": "^8.0.2",
"jest": "^28.1.3",
"jest-axe": "^6.0.0",
"jest-axe": "^6.0.1",
"jest-canvas-mock": "^2.4.0",
"jest-environment-jsdom": "^28.1.3",
"jest-watch-typeahead": "^1.1.0",
Expand All @@ -101,10 +101,10 @@
"prettier": "^2.7.1",
"pretty-quick": "^3.1.3",
"prism-react-renderer": "^1.3.5",
"prismjs": "^1.28.0",
"prismjs": "^1.29.0",
"qrcode.react": "^3.1.0",
"react": "^18.2.0",
"react-beautiful-dnd": "^13.1.0",
"react-beautiful-dnd": "^13.1.1",
"react-dom": "^18.2.0",
"react-helmet": "^6.1.0",
"react-lottie": "^1.2.3",
Expand All @@ -115,9 +115,9 @@
"ts-jest": "^28.0.8",
"ts-node": "^10.9.1",
"typescript": "~4.6.4",
"vite": "^3.0.8",
"webpack": "^5.74.0",
"webpack-bundle-analyzer": "^4.5.0",
"vite": "^3.2.4",
"webpack": "^5.75.0",
"webpack-bundle-analyzer": "^4.7.0",
"webpack-stream": "^7.0.0"
},
"peerDependencies": {
Expand Down
Loading

0 comments on commit 2e721eb

Please sign in to comment.