Oak-Team
/
oak-domain
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 33 Wiki Activity

Merge branch 'dev' of gitea.51mars.com:Oak-Team/oak-domain into dev

This commit is contained in:
Xu Chang 2024-04-26 20:57:37 +08:00
parent 0ea1532d49 988a6d86e8
commit 80bc19e0f3
3 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/base-app-domain/User/Style.js
View File

@ -9,6 +9,6 @@ exports.style = {
userState: {
normal: '#112233',
merged: '#223344',
}
}
},
},
};

8
lib/entities/User.js
View File

@ -26,7 +26,7 @@ exports.entityDesc = {
normal: '正常',
merged: '已被合并',
},
}
},
},
},
style: {
@ -37,7 +37,7 @@ exports.entityDesc = {
userState: {
normal: '#112233',
merged: '#223344',
}
}
}
},
},
},
};

21
src/entities/User.ts
View File

@ -1,4 +1,4 @@
import { String, Int, Text, Image, Datetime } from '../types/DataType';
import { String, Text } from '../types/DataType';
import { EntityShape } from '../types/Entity';
import { ActionDef } from '../types/Action';
import { EntityDesc } from '../types/EntityDesc';
@ -22,9 +22,14 @@ export const UserActionDef: ActionDef<UserAction, UserState> = {
},
};
export const entityDesc: EntityDesc<Schema, Action, '', {
userState: UserState,
}> = {
export const entityDesc: EntityDesc<
Schema,
Action,
'',
{
userState: UserState;
}
> = {
locales: {
zh_CN: {
name: '用户',
@ -43,7 +48,7 @@ export const entityDesc: EntityDesc<Schema, Action, '', {
normal: '正常',
merged: '已被合并',
},
}
},
},
},
style: {
@ -54,7 +59,7 @@ export const entityDesc: EntityDesc<Schema, Action, '', {
userState: {
normal: '#112233',
merged: '#223344',
}
}
}
},
},
},
};