marking
/
WGShare.Client.Electron
18
0
Fork 0
Code Pull Requests 1 Actions Releases 4 Activity

yangjie #45

Merged
yangqiang merged 19 commits from yangjie into master 2024-12-18 13:52:10 +08:00
Conversation 0 Commits 19 Files Changed 11 +15 -11
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ec5edabaf0 - Show all commits

3
src/page/Home/Index/index.tsx
View File

@ -385,7 +385,6 @@ const Index: React.FC = () => {
placeholder="请输入房间号" placeholder="请输入房间号"
style={{ flexGrow: 1 }} style={{ flexGrow: 1 }}
className={styles.letterSpacing} className={styles.letterSpacing}
showCount
maxLength={8} maxLength={8}
value={createRoomFrom.roomNum} value={createRoomFrom.roomNum}
onChange={(e) => { onChange={(e) => {
@ -422,7 +421,6 @@ const Index: React.FC = () => {
<Input.TextArea <Input.TextArea
placeholder="请输入房间名字" placeholder="请输入房间名字"
style={{ flexGrow: 1 }} style={{ flexGrow: 1 }}
showCount
maxLength={30} maxLength={30}
value={createRoomFrom.roomName} value={createRoomFrom.roomName}
onChange={(e) => { onChange={(e) => {
@ -437,6 +435,7 @@ const Index: React.FC = () => {
<span>届：</span> <span>届：</span>
<Input <Input
placeholder="请输入届" placeholder="请输入届"
maxLength={4}
style={{ flexGrow: 1 }} style={{ flexGrow: 1 }}
value={createRoomFrom.year} value={createRoomFrom.year}
onChange={(e) => { onChange={(e) => {

21
src/page/Home/User/index.tsx
View File

@ -602,7 +602,7 @@ const User: React.FC = () => {
onClick={() => { onClick={() => {
const file = document.createElement("input") as any; const file = document.createElement("input") as any;
file.type = "file"; file.type = "file";
// file.accept = ".xls,.xlsx"; file.accept = ".xls,.xlsx";
file.onchange = async () => { file.onchange = async () => {
const setting = await JSON.parse(storage.getItem('setting') as string) const setting = await JSON.parse(storage.getItem('setting') as string)
const fileInfo = file.files[0]; const fileInfo = file.files[0];
@ -669,7 +669,7 @@ const User: React.FC = () => {
onClick={() => { onClick={() => {
const file = document.createElement("input") as any; const file = document.createElement("input") as any;
file.type = "file"; file.type = "file";
// file.accept = ".xls,.xlsx"; file.accept = ".xls,.xlsx";
file.onchange = async () => { file.onchange = async () => {
const setting = await JSON.parse(storage.getItem('setting') as string) const setting = await JSON.parse(storage.getItem('setting') as string)
const fileInfo = file.files[0]; const fileInfo = file.files[0];
@ -762,12 +762,17 @@ const User: React.FC = () => {
<Button type="primary" style={{ backgroundColor: '#31353A', marginRight: '14px' }} <Button type="primary" style={{ backgroundColor: '#31353A', marginRight: '14px' }}
onClick={() => setSignInUserModal(false)}>取消</Button> onClick={() => setSignInUserModal(false)}>取消</Button>
<Button type="primary" className='m-ant-btn' onClick={() => { <Button type="primary" className='m-ant-btn' onClick={() => {
PutSigns(signInUserForm.uid, signInUserForm.currentUserList).then(res => { let signInNameNull = signInUserForm.currentUserList.find((item: any) => !item.signInName)
if (res.code === 200) { if (signInNameNull) {
message.success('签到绑定成功') message.error('请输入用户名称');
setSignInUserModal(false) } else {
} PutSigns(signInUserForm.uid, signInUserForm.currentUserList).then(res => {
}) if (res.code === 200) {
message.success('签到绑定成功')
setSignInUserModal(false)
}
})
}
}}>确定</Button> }}>确定</Button>
</div> </div>
</div> </div>