From 0ac50f5dcac92b70b42d982a84d06cae279bceb2 Mon Sep 17 00:00:00 2001 From: JavaLuo <376693576@qq.com> Date: Wed, 8 Mar 2023 17:40:03 +0800 Subject: [PATCH 1/3] update --- src/pages/Home/index.tsx | 2 +- vite.config.ts | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/Home/index.tsx b/src/pages/Home/index.tsx index 842de45..39132c2 100644 --- a/src/pages/Home/index.tsx +++ b/src/pages/Home/index.tsx @@ -12,7 +12,7 @@ export default function HomePageContainer(): JSX.Element {
React-admin
- 标准后台管理系统解决方案，react18、router6、rematch、antd5、vite4、ES6+ + 标准后台管理系统解决方案，react18、router6、rematch、antd4、vite4、ES6+
动态菜单配置，权限精确到按钮
diff --git a/vite.config.ts b/vite.config.ts index 75547db..96fcbd6 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -10,6 +10,7 @@ function pathResolve(dir) { // https://vitejs.dev/config/ export default defineConfig({ + base: "./", plugins: [ react(), eslintPlugin({ From 044a8a88521af7bb0e34a75459db6adead60286a Mon Sep 17 00:00:00 2001 From: javaLuo <376693576@qq.com> Date: Mon, 22 May 2023 22:35:40 +0800 Subject: [PATCH 2/3] feat: package and details --- package.json | 60 ++++++++++----------- src/components/Header/index.tsx | 14 ++--- src/components/TreeChose/PowerTreeTable.tsx | 3 +- src/components/TreeChose/RoleTree.tsx | 2 +- src/pages/System/MenuAdmin/index.tsx | 2 +- src/pages/System/PowerAdmin/index.tsx | 2 +- src/pages/System/RoleAdmin/index.tsx | 2 +- src/pages/System/UserAdmin/index.tsx | 2 +- 8 files changed, 41 insertions(+), 46 deletions(-) diff --git a/package.json b/package.json index f9cad67..88e621c 100644 --- a/package.json +++ b/package.json @@ -10,51 +10,51 @@ "prettier": "prettier --write \"{src,mock}/**/*.{js,css,less,ts,tsx}\"" }, "dependencies": { - "@ant-design/icons": "^5.0.1", + "@ant-design/icons": "^5.1.0", "@loadable/component": "^5.15.3", - "@rematch/core": "^2.1.0", - "antd": "4.24.8", - "axios": "^1.3.4", + "@rematch/core": "^2.2.0", + "antd": "4.x", + "axios": "^1.4.0", "lodash": "^4.17.21", "normalize.css": "^8.0.1", - "qs": "^6.11.0", + "qs": "^6.11.2", "react": "^18.2.0", "react-dom": "^18.2.0", - "react-redux": "^7.2.5", - "react-router-dom": "^6.8.2", - "react-use": "^17.3.1", + "react-redux": "^8.0.5", + "react-router-dom": "^6.11.2", + "react-use": "^17.4.0", "react-vcode": "1.0.11", - "redux": "^4.1.1" + "redux": "^4.2.1" }, "devDependencies": { "@types/loadable__component": "^5.13.4", - "@types/lodash": "^4.14.175", - "@types/mockjs": "^1.0.4", - "@types/node": "^18.14.4", + "@types/lodash": "^4.14.194", + "@types/mockjs": "^1.0.7", + "@types/node": "^20.2.3", "@types/qs": "^6.9.7", - "@types/react": "^18.0.27", - "@types/react-dom": "^18.0.10", - "@types/react-redux": "^7.1.18", - "@types/react-router-dom": "^5.3.0", - "@typescript-eslint/eslint-plugin": "^5.54.0", - "@typescript-eslint/parser": "^5.54.0", - "@vitejs/plugin-react-swc": "^3.0.0", - "autoprefixer": "^10.4.13", - "consola": "^2.15.3", - "eslint": "^8.35.0", - "eslint-config-prettier": "^8.6.0", + "@types/react": "^18.2.6", + "@types/react-dom": "^18.2.4", + "@types/react-redux": "^7.1.25", + "@types/react-router-dom": "^5.3.3", + "@typescript-eslint/eslint-plugin": "^5.59.6", + "@typescript-eslint/parser": "^5.59.6", + "@vitejs/plugin-react-swc": "^3.3.1", + "autoprefixer": "^10.4.14", + "consola": "^3.1.0", + "eslint": "^8.41.0", + "eslint-config-prettier": "^8.8.0", "eslint-plugin-prettier": "^4.2.1", "eslint-plugin-react": "^7.32.2", "eslint-plugin-react-hooks": "^4.6.0", - "less": "^4.1.1", + "less": "^4.1.3", "mockjs": "^1.1.0", - "postcss": "^8.4.21", - "prettier": "^2.8.4", + "postcss": "^8.4.23", + "prettier": "^2.8.8", "prop-types": "^15.8.1", - "rc-tree": "^5.7.2", - "typescript": "^4.9.3", - "vite": "^4.1.0", + "rc-tree": "^5.7.3", + "typescript": "^5.0.4", + "vite": "^4.3.8", "vite-plugin-eslint": "^1.8.1", "vite-plugin-style-import": "^2.0.0" } -} +} \ No newline at end of file diff --git a/src/components/Header/index.tsx b/src/components/Header/index.tsx index ccc290b..ab1df39 100644 --- a/src/components/Header/index.tsx +++ b/src/components/Header/index.tsx @@ -89,15 +89,11 @@ export default function HeaderCom(props: Props): JSX.Element { const u = props.userinfo.userBasicInfo; return (
- - props.onToggle()} - /> - + props.onToggle()} + /> +
diff --git a/src/components/TreeChose/PowerTreeTable.tsx b/src/components/TreeChose/PowerTreeTable.tsx index 13c3807..5c08eb7 100644 --- a/src/components/TreeChose/PowerTreeTable.tsx +++ b/src/components/TreeChose/PowerTreeTable.tsx @@ -220,7 +220,6 @@ export default function TreeTable(props: Props): JSX.Element { key: "powers", width: "70%", render: (value: Power[], record: PowerLevel): JSX.Element[] | null => { - console.log("东西呢：", value); if (value) { return value.map((item: Power, index: number) => { return ( @@ -246,7 +245,7 @@ export default function TreeTable(props: Props): JSX.Element { zIndex={1001} width={750} title={props.title || "请选择"} - visible={props.modalShow} + open={props.modalShow} onOk={onOk} onCancel={onClose} confirmLoading={props.loading} diff --git a/src/components/TreeChose/RoleTree.tsx b/src/components/TreeChose/RoleTree.tsx index 0c2e2a1..022e60f 100644 --- a/src/components/TreeChose/RoleTree.tsx +++ b/src/components/TreeChose/RoleTree.tsx @@ -109,7 +109,7 @@ export default function RoleTreeComponent(props: Props): JSX.Element { return ( ${modal.nowData?.title ?? ""}`} - visible={modal.modalShow} + open={modal.modalShow} onOk={onOk} onCancel={onClose} confirmLoading={modal.modalLoading} diff --git a/src/pages/System/RoleAdmin/index.tsx b/src/pages/System/RoleAdmin/index.tsx index 11e09ee..f9c7da7 100644 --- a/src/pages/System/RoleAdmin/index.tsx +++ b/src/pages/System/RoleAdmin/index.tsx @@ -517,7 +517,7 @@ function RoleAdminContainer() { {/* 新增&修改&查看 模态框 */} onOk()} onCancel={() => onClose()} confirmLoading={modal.modalLoading} diff --git a/src/pages/System/UserAdmin/index.tsx b/src/pages/System/UserAdmin/index.tsx index 362f664..f4ea5a1 100644 --- a/src/pages/System/UserAdmin/index.tsx +++ b/src/pages/System/UserAdmin/index.tsx @@ -552,7 +552,7 @@ function UserAdminContainer(): JSX.Element { {/* 新增&修改&查看 模态框 */} Date: Mon, 23 Oct 2023 11:50:10 +0800 Subject: [PATCH 3/3] perf userAdmin --- src/assets/styles/global.less | 3 +++ src/pages/System/UserAdmin/index.tsx | 40 +++++++++++++--------------- 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/src/assets/styles/global.less b/src/assets/styles/global.less index 53bcd51..60dede8 100644 --- a/src/assets/styles/global.less +++ b/src/assets/styles/global.less @@ -56,3 +56,6 @@ .ant-tooltip { min-width: 30px; } +.ant-input[disabled]{ + color: rgba(0,0,0,.6) !important; +} \ No newline at end of file diff --git a/src/pages/System/UserAdmin/index.tsx b/src/pages/System/UserAdmin/index.tsx index f4ea5a1..c3fcb3a 100644 --- a/src/pages/System/UserAdmin/index.tsx +++ b/src/pages/System/UserAdmin/index.tsx @@ -206,12 +206,7 @@ function UserAdminContainer(): JSX.Element { } else if (data) { // 查看或修改，需设置表单各控件的值为当前所选中行的数据 form.setFieldsValue({ - formConditions: data.conditions, - formDesc: data.desc, - formUsername: data.username, - formPhone: data.phone, - formEmail: data.email, - formPassword: data.password, + ...data, }); } }); @@ -229,12 +224,12 @@ function UserAdminContainer(): JSX.Element { modalLoading: true, }); const params: UserBasicInfoParam = { - username: values.formUsername, - password: values.formPassword, - phone: values.formPhone, - email: values.formEmail, - desc: values.formDesc, - conditions: values.formConditions, + username: values.username, + password: values.password, + phone: values.phone, + email: values.email, + desc: values.desc, + conditions: values.conditions, }; if (modal.operateType === "add") { // 新增 @@ -549,10 +544,11 @@ function UserAdminContainer(): JSX.Element { }} />
+ {/* 新增&修改&查看 模态框 */} - ({ @@ -619,7 +614,7 @@ function UserAdminContainer(): JSX.Element { ({ @@ -642,7 +637,7 @@ function UserAdminContainer(): JSX.Element { @@ -654,7 +649,7 @@ function UserAdminContainer(): JSX.Element { @@ -669,6 +664,7 @@ function UserAdminContainer(): JSX.Element { +