Browse Source

update

main
zhengzhou 3 years ago
parent
commit
f26e191c7c
6 changed files with 14 additions and 11 deletions
  1. +0
    -1
      .yarnrc
  2. +2
    -5
      docs/fileStatus.md
  3. +2
    -0
      electron/.yarnrc
  4. +2
    -1
      electron/main.js
  5. +5
    -3
      src/components/FileStatus/FileStatus.less
  6. +3
    -1
      src/pages/login/index.tsx

+ 0
- 1
.yarnrc View File

@@ -1,2 +1 @@
electron_mirror https://npm.taobao.org/mirrors/electron/
registry https://registry.npm.taobao.org registry https://registry.npm.taobao.org

+ 2
- 5
docs/fileStatus.md View File

@@ -1,14 +1,11 @@
```jsx ```jsx
import React from 'react'; import React from 'react';
import FileStatus from '@/components/FileStatus'; import FileStatus from '@/components/FileStatus';
import dayjs from 'dayjs';


export default () => ( export default () => (
<> <>
<FileStatus type="upload" loadingState="loading" progress={30} />
<FileStatus type="upload" loadingState="complete" result="success" />
<FileStatus type="upload" loadingState="complete" result="fail" />
<FileStatus type="download" loadingState="complete" result="success" />
<FileStatus type="download" loadingState="complete" result="fail" />
<FileStatus data={{ notifyType: 1, taskCreateDate: dayjs() }} />
</> </>
) )
``` ```

+ 2
- 0
electron/.yarnrc View File

@@ -0,0 +1,2 @@
electron_mirror https://npm.taobao.org/mirrors/electron/
registry https://registry.npm.taobao.org

+ 2
- 1
electron/main.js View File

@@ -39,10 +39,11 @@ function createWindow() {
frame: false, frame: false,
minWidth: 720, minWidth: 720,
minHeight: 600, minHeight: 600,
icon: path.join(__dirname, 'logo.ico'),
}); });
// 隐藏菜单栏 // 隐藏菜单栏
mainWindow.setMenuBarVisibility(false); mainWindow.setMenuBarVisibility(false);
if (process.env.NODE_ENV === 'development') {
if (isDev) {
// 开发环境 // 开发环境
// 加载页面并打开调试工具,根据 NODE_ENV // 加载页面并打开调试工具,根据 NODE_ENV
// umijs 在dev时会给出相应的url,直接加载即可 // umijs 在dev时会给出相应的url,直接加载即可


+ 5
- 3
src/components/FileStatus/FileStatus.less View File

@@ -8,17 +8,18 @@
height: 76px; height: 76px;
padding: 12px; padding: 12px;
.left { .left {
width: 228px;
flex: 0 0 228px;
width: 296px;
flex: 0 0 296px;
margin-right: 10px; margin-right: 10px;
} }
.mid { .mid {
flex: 1; flex: 1;
text-align: center;
text-align: left;
} }
.right { .right {
flex: 0 0 80px; flex: 0 0 80px;
margin-left: 10px; margin-left: 10px;
text-align: right;
.button { .button {
color: @primary-color; color: @primary-color;
font-size: 12px; font-size: 12px;
@@ -35,6 +36,7 @@
.content { .content {
display: inline-flex; display: inline-flex;
width: calc(100% - 36px - 12px); width: calc(100% - 36px - 12px);
padding-left: 50px;
height: 100%; height: 100%;
vertical-align: top; vertical-align: top;
flex-direction: column; flex-direction: column;


+ 3
- 1
src/pages/login/index.tsx View File

@@ -98,6 +98,7 @@ export default function Login() {
<Input <Input
size="large" size="large"
prefix={<MobileFilled className={styles.icon} />} prefix={<MobileFilled className={styles.icon} />}
placeholder="请输入注册手机号"
disabled={loading} disabled={loading}
className={styles.mb24} className={styles.mb24}
value={account} value={account}
@@ -106,6 +107,7 @@ export default function Login() {
<Input <Input
size="large" size="large"
prefix={<LockFilled className={styles.icon} />} prefix={<LockFilled className={styles.icon} />}
placeholder="请输入密码"
type="password" type="password"
disabled={loading} disabled={loading}
className={styles.mb4} className={styles.mb4}
@@ -128,7 +130,7 @@ export default function Login() {
className={styles.btn} className={styles.btn}
onClick={() => setRegModalVisible(true)} onClick={() => setRegModalVisible(true)}
> >
注册
企业注册
</Button> </Button>
</div> </div>
</Form> </Form>


Loading…
Cancel
Save