From 37be251c5a75466cc2b9dac359a75daac274ec42 Mon Sep 17 00:00:00 2001 From: zhengpengju Date: Mon, 13 Dec 2021 10:09:12 +0800 Subject: [PATCH] test --- .gitignore | 3 +++ README.md | 12 ++++++++++++ config/config.ts | 24 ++++++++++++++++++++++++ package.json | 4 +++- scripts/block.js | 16 ++++++++++++++++ scripts/creator.js | 2 ++ src/components/Footer/index.tsx | 5 +++-- src/locales/zh-CN.ts | 2 +- src/pages/hello.css | 4 ++++ src/pages/hello.js | 10 ++++++++++ src/pages/hello2.css | 4 ++++ src/pages/hello2.js | 10 ++++++++++ src/pages/user/Login/index.tsx | 16 +++------------- 13 files changed, 95 insertions(+), 17 deletions(-) create mode 100644 scripts/block.js create mode 100644 scripts/creator.js create mode 100644 src/pages/hello.css create mode 100644 src/pages/hello.js create mode 100644 src/pages/hello2.css create mode 100644 src/pages/hello2.js diff --git a/.gitignore b/.gitignore index 7fd9f58..c7ee84e 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,6 @@ screenshot .eslintcache build + +# blocks +blocks \ No newline at end of file diff --git a/README.md b/README.md index 4c89a72..89c2f54 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +# 考务管理大数据平台(自定义)数据上报 + # Ant Design Pro This project is initialized with [Ant Design Pro](https://pro.ant.design). Follow is the quick guide for how to use. @@ -55,3 +57,13 @@ npm test ## More You can view full document on our [official website](https://pro.ant.design). And welcome any feedback in our [github](https://github.com/ant-design/ant-design-pro). + + +### Block + +```bash +$ yarn umi block add --path http://localhost:5000/blocks/procomponents +$ yarn umi generate page hello +$ yarn umi block add ./blocks/procomponents +$ yarn umi block clear +``` \ No newline at end of file diff --git a/config/config.ts b/config/config.ts index f8822ea..6afe0ed 100644 --- a/config/config.ts +++ b/config/config.ts @@ -316,6 +316,30 @@ export default defineConfig({ path: '/', redirect: '/dashboard/analysis', }, + { + name: '空白页面', + icon: 'smile', + path: '/emptypagetwo', + component: './EmptyPageFour', + }, + { + name: '空白页面', + icon: 'smile', + path: '/emptypagetwo', + component: './EmptyPageThree', + }, + { + name: '空白页面', + icon: 'smile', + path: '/emptypagetwo', + component: './EmptyPageTwo', + }, + { + name: '空白页面', + icon: 'smile', + path: '/emptypage', + component: './EmptyPage', + }, { component: '404', }, diff --git a/package.json b/package.json index a565d0a..df49b51 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,9 @@ "test:all": "node ./tests/run-tests.js", "test:component": "umi test ./src/components", "serve": "umi-serve", - "tsc": "tsc --noEmit" + "tsc": "tsc --noEmit", + "creator": "node ./scripts/creator.js", + "block-serve": "node ./scripts/block.js" }, "lint-staged": { "**/*.less": "stylelint --syntax less", diff --git a/scripts/block.js b/scripts/block.js new file mode 100644 index 0000000..bd5f128 --- /dev/null +++ b/scripts/block.js @@ -0,0 +1,16 @@ +const express = require('express') +const path = require("path") +const app = express() +const port = 5000 + +app.use('/blocks', express.static(path.join(path.resolve(__dirname, '..'), 'blocks'))) + +console.log('path:', path.join(path.resolve(__dirname, '..'), 'blocks')) + +app.get('/', (req, res) => { + res.send('Hello World!') +}) + +app.listen(port, () => { + console.log(`Example app listening at http://localhost:${port}`) +}) \ No newline at end of file diff --git a/scripts/creator.js b/scripts/creator.js new file mode 100644 index 0000000..bfb40bd --- /dev/null +++ b/scripts/creator.js @@ -0,0 +1,2 @@ +#!/usr/bin/env node +console.log('hello') \ No newline at end of file diff --git a/src/components/Footer/index.tsx b/src/components/Footer/index.tsx index b259d6f..8c27213 100644 --- a/src/components/Footer/index.tsx +++ b/src/components/Footer/index.tsx @@ -6,7 +6,7 @@ export default () => { const intl = useIntl(); const defaultMessage = intl.formatMessage({ id: 'app.copyright.produced', - defaultMessage: '蚂蚁集团体验技术部出品', + defaultMessage: '东北师大理想软件股份有限公司', }); const currentYear = new Date().getFullYear(); @@ -15,6 +15,7 @@ export default () => { { title: 'Ant Design', href: 'https://ant.design', blankTarget: true, - }, + },*/ ]} /> ); diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index e4258ce..df3a40c 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -11,7 +11,7 @@ export default { 'layout.user.link.help': '帮助', 'layout.user.link.privacy': '隐私', 'layout.user.link.terms': '条款', - 'app.copyright.produced': '蚂蚁集团体验技术部出品', + 'app.copyright.produced': '东北师大理想软件股份有限公司', 'app.preview.down.block': '下载此页面到本地项目', 'app.welcome.link.fetch-blocks': '获取全部区块', 'app.welcome.link.block-list': '基于 block 开发，快速构建标准页面', diff --git a/src/pages/hello.css b/src/pages/hello.css new file mode 100644 index 0000000..ad5588c --- /dev/null +++ b/src/pages/hello.css @@ -0,0 +1,4 @@ + +.title { + background: rgb(121, 242, 196); +} diff --git a/src/pages/hello.js b/src/pages/hello.js new file mode 100644 index 0000000..a3652b3 --- /dev/null +++ b/src/pages/hello.js @@ -0,0 +1,10 @@ +import React from 'react'; +import styles from './hello.css'; + +export default function Page() { + return ( +
+

Page hello

+
+ ); +} diff --git a/src/pages/hello2.css b/src/pages/hello2.css new file mode 100644 index 0000000..65f4327 --- /dev/null +++ b/src/pages/hello2.css @@ -0,0 +1,4 @@ + +.title { + background: rgb(195, 242, 121); +} diff --git a/src/pages/hello2.js b/src/pages/hello2.js new file mode 100644 index 0000000..c8623c3 --- /dev/null +++ b/src/pages/hello2.js @@ -0,0 +1,10 @@ +import React from 'react'; +import styles from './hello2.css'; + +export default function Page() { + return ( +
+

Page hello2

+
+ ); +} diff --git a/src/pages/user/Login/index.tsx b/src/pages/user/Login/index.tsx index 2862053..72cb6d0 100644 --- a/src/pages/user/Login/index.tsx +++ b/src/pages/user/Login/index.tsx @@ -1,10 +1,7 @@ import { - AlipayCircleOutlined, LockOutlined, MobileOutlined, - TaobaoCircleOutlined, UserOutlined, - WeiboCircleOutlined, } from '@ant-design/icons'; import { Alert, message, Tabs } from 'antd'; import React, { useState } from 'react'; @@ -85,20 +82,13 @@ const Login: React.FC = () => {
} - title="Ant Design" - subTitle={intl.formatMessage({ id: 'pages.layouts.userLayout.title' })} + title="基础数据" + subTitle="DSBase Universal V1.0" initialValues={{ autoLogin: true, }} actions={[ - , - , - , - , + ]} onFinish={async (values) => { await handleSubmit(values as API.LoginParams);