Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] feat: antd5 #336

Open
wants to merge 51 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
2a0ea79
feat: use umi@4 and antd@5
xiaohuoni Dec 1, 2023
452317d
feat: page AccountCenter
xiaohuoni Dec 1, 2023
17b4865
feat: page AccountSettings
xiaohuoni Dec 1, 2023
f74882e
feat: page EmptyPage
xiaohuoni Dec 1, 2023
d127d62
feat: page DashboardAnalysis
xiaohuoni Dec 1, 2023
116be52
feat: page DashboardMonitor
xiaohuoni Dec 1, 2023
7242001
feat: page DashboardWorkplace
xiaohuoni Dec 1, 2023
80b7cec
feat: use pro-components
xiaohuoni Dec 1, 2023
438045b
feat: use pro-components
xiaohuoni Dec 1, 2023
7a06726
feat: page EditorFlow
xiaohuoni Dec 1, 2023
6ee493d
feat: page EditorKoni
xiaohuoni Dec 1, 2023
5cbf549
feat: page EditorMind
xiaohuoni Dec 1, 2023
4bd919d
feat: page FormAdvancedForm
xiaohuoni Dec 1, 2023
f7a9867
feat: page FormBasicForm
xiaohuoni Dec 1, 2023
284d346
feat: page FormStepForm
xiaohuoni Dec 1, 2023
eea835b
feat: page ListBasicList
xiaohuoni Dec 1, 2023
1b35c3f
feat: page ListCardList
xiaohuoni Dec 1, 2023
afe6873
feat: page ListSearch all
xiaohuoni Dec 1, 2023
1e1eb5e
feat: page use antd@5
xiaohuoni Dec 1, 2023
cf1cc3c
chore: remove less
xiaohuoni Dec 1, 2023
ff69235
feat: add dev layout
xiaohuoni Dec 1, 2023
b5ee6eb
chore: use eslint
xiaohuoni Dec 1, 2023
523a182
chore: ci
xiaohuoni Dec 1, 2023
e949807
chore: update type
Wxh16144 Dec 6, 2023
9bd8b63
fix: ts error
Wxh16144 Dec 6, 2023
8cbfa8f
fix: error
Wxh16144 Dec 6, 2023
5b0109e
fix: ts type
Wxh16144 Dec 6, 2023
6f452fb
fix: no style
Wxh16144 Dec 6, 2023
9d9133d
fix: ts type
Wxh16144 Dec 6, 2023
8b1622b
fix: ts type
Wxh16144 Dec 6, 2023
c7bfe6c
fix: ts error
Wxh16144 Dec 6, 2023
e40b873
fix: style
Wxh16144 Dec 6, 2023
237ab62
fix: ts error
Wxh16144 Dec 6, 2023
3a61962
fix: style error
Wxh16144 Dec 6, 2023
28c1923
fix: style error & ts error
Wxh16144 Dec 6, 2023
8fb1d41
fix: style var error
Wxh16144 Dec 6, 2023
801e5ec
fix: styles error
Wxh16144 Dec 6, 2023
eb742df
fix: dayjs error
Wxh16144 Dec 6, 2023
ea84004
fix: ts error
Wxh16144 Dec 6, 2023
b3c3208
fix: ts error
Wxh16144 Dec 6, 2023
7c2845a
fix: ts error
Wxh16144 Dec 6, 2023
714873d
fix: ts error
Wxh16144 Dec 6, 2023
5f72392
fix: ts type err
Wxh16144 Dec 6, 2023
2edd83b
fix: ts type & style
Wxh16144 Dec 6, 2023
2578597
chore: update deps
Wxh16144 Dec 6, 2023
e96b5d3
fix: types
xiaohuoni Dec 7, 2023
9cda25a
fix: types error
xiaohuoni Dec 11, 2023
fa61aaf
chore: remove react-router
xiaohuoni Dec 12, 2023
fb82de5
chore: DataItem not find
xiaohuoni Dec 13, 2023
e17240f
chore: type error
xiaohuoni Dec 13, 2023
9fe1ae0
feat: 移除没有用的文件
xiaohuoni Dec 13, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,7 @@ _scripts
_test_
.eslintrc.js

node_modules
node_modules
.husky/**
pnpm-lock.yaml
.npmrc
13 changes: 1 addition & 12 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,7 @@
module.exports = {
extends: [require.resolve('@umijs/fabric/dist/eslint')],
rules: {
'@typescript-eslint/camelcase': 0,
'@typescript-eslint/class-name-casing': 0,
'import/no-extraneous-dependencies': 0,
'@typescript-eslint/no-explicit-any': 0,
'import/no-unresolved': 0,
'@typescript-eslint/naming-convention': 0,
},
extends: [require.resolve('@umijs/max/eslint')],
globals: {
ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION: true,
page: true,
},
parserOptions: {
project: './tsconfig.json',
},
};
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ jobs:
uses: actions/checkout@master

- name: install
run: yarn
run: pnpm i

- name: lint
run: yarn run lint
run: pnpm run lint

test-js:
runs-on: ubuntu-latest
Expand Down
4 changes: 4 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

npx --no-install lint-staged
6 changes: 6 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
registry=https://registry.npmjs.org/

# Prevent jsx namespace conflicts, because Vue global types will auto install.
# In the future, Vue 3 will fix this issue
# See https://github.com/vuejs/core/blob/main/CHANGELOG.md#features-1
auto-install-peers=false
3 changes: 3 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,6 @@ yarn-error.log
CNAME
/build
umi-block.json
.husky/**
pnpm-lock.yaml
.npmrc
16 changes: 13 additions & 3 deletions .prettierrc.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
const fabric = require('@umijs/fabric');

module.exports = {
...fabric.prettier,
singleQuote: true,
trailingComma: 'all',
printWidth: 100,
proseWrap: 'never',
endOfLine: 'lf',
overrides: [
{
files: '.prettierrc',
options: {
parser: 'json',
},
},
],
};
5 changes: 0 additions & 5 deletions .stylelintrc.js

This file was deleted.

23 changes: 0 additions & 23 deletions .umirc.js

This file was deleted.

14 changes: 14 additions & 0 deletions .umirc.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { defineConfig } from '@umijs/max';

export default defineConfig({
antd: {},
request: {},
targets: {
ie: 11,
},
dva: {},
mfsu: false,
layout: {
title: 'pro-blocks',
},
});
5 changes: 2 additions & 3 deletions AccountCenter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,10 @@
"@ant-design/icons": "^4.0.0",
"classnames": "^2.2.6",
"moment": "^2.24.0",
"numeral": "^2.0.6",
"react-router": "^4.3.1"
"numeral": "^2.0.6"
},
"peerDependencies": {
"@ant-design/pro-layout": "^6.0.0"
"@ant-design/pro-components":"^2.6.43"
},
"blockConfig": {
"specVersion": "0.1"
Expand Down
86 changes: 0 additions & 86 deletions AccountCenter/src/Center.less

This file was deleted.

69 changes: 69 additions & 0 deletions AccountCenter/src/Center.style.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
import { createStyles } from 'antd-style';

const useStyles = createStyles(({ token }) => {
return {
avatarHolder: {
marginBottom: '24px',
textAlign: 'center',
'& > img': { width: '104px', height: '104px', marginBottom: '20px' },
},
name: {
marginBottom: '4px',
color: token.colorTextHeading,
fontWeight: '500',
fontSize: '20px',
lineHeight: '28px',
},
detail: {
p: {
position: 'relative',
marginBottom: '8px',
paddingLeft: '26px',
'&:last-child': {
marginBottom: '0',
},
},
i: {
position: 'absolute',
top: '4px',
left: '0',
width: '14px',
height: '14px',
},
},
tagsTitle: {
marginBottom: '12px',
color: token.colorTextHeading,
fontWeight: '500',
},
teamTitle: {
marginBottom: '12px',
color: token.colorTextHeading,
fontWeight: '500',
},
tags: {
'.ant-tag': { marginBottom: '8px' },
},
team: {
'.ant-avatar': { marginRight: '12px' },
a: {
display: 'block',
marginBottom: '24px',
overflow: 'hidden',
color: token.colorText,
whiteSpace: 'nowrap',
textOverflow: 'ellipsis',
wordBreak: 'break-all',
transition: 'color 0.3s',
'&:hover': {
color: token.colorPrimary,
},
},
},
tabsCard: {
'.ant-card-head': { padding: '0 16px' },
},
};
});

export default useStyles;
2 changes: 1 addition & 1 deletion AccountCenter/src/_mock.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// eslint-disable-next-line import/no-extraneous-dependencies
// @ts-nocheck
import type { Request, Response } from 'express';
import type { ListItemDataType } from './data.d';

Expand Down
51 changes: 0 additions & 51 deletions AccountCenter/src/components/Applications/index.less

This file was deleted.

Loading
Loading