-
Notifications
You must be signed in to change notification settings - Fork 39
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix(mis): 消费记录、充值记录搜索功能优化 #1152
Conversation
🦋 Changeset detectedLatest commit: 0dd2263 The changes in this PR will be included in the next version bump. This PR includes changesets to release 15 packages
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
1b7961f
to
6b006cb
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
所有修改SCOW API的变化需要确保兼容性!仔细阅读开发文档里的版本控制 -> Protobuf接口版本兼容性方案
apps/mis-web/src/pages/api/finance/getChargeRecordsTotalCount.ts
Outdated
Show resolved
Hide resolved
7dd42ae是不合并前较完善版本,后续为中间版本。请检查4d809b6(自测导出平台日志没有输入操作行为时会报错)和62dee63(本地pnpm test有问题,但单独测报错文件又没报错),在合并SpecificAccountsOfTenant到AccountsOfTenantTarget后,日志思路不大确定。日志的AccountsOfTenant是否需要accountNames或者部分保留SpecificAccountsOfTenant?目前UI中mis没有涉及,但未来AI或后续也有相关?总之可能涉及不同方向。希望先确认一下思路。 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
改一下就行
.changeset/slow-candles-rush.md
Outdated
@@ -0,0 +1,5 @@ | |||
--- | |||
"@scow/grpc-api": patch |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
根据规则,修改了API,但是兼容当前的API,则需要提高minor版本。
protos/server/charging.proto
Outdated
// 返回多个特定账户的消费记录 | ||
AccountsTarget accounts = 10; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
这个target是否可以使用AccountsOfAllTenantsTarget代替?因为虽然实际上账户名是全局唯一的,但是这是因为底层是用的slurm,slurm保证的账户名全局唯一,但是SCOW这一层并不要求账户名必须全局唯一,而只保证租户中账户名唯一,SCOW的API也要和SCOW的设计一致。
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
日志部分同样考虑下这个问题,并且仍然合并到AccountsOfTenant里去
已经合并了AccountsTarget进入AccountsOfAllTenantsTarget,日志进行同步修改,并且兼容了先前没有accountNames的情况。连锁修改,日志的消费和充值记录中,能体现单选、多选、全选。 |
消费记录类型选择框修改
账户管理->消费记录、租户管理->账户消费记录,平台管理->账户消费记录:
1、类型改为多选
2、类型选择下拉框不隐藏文字信息
改进前
改进后
充值记录类型选择框修改
账户管理->充值记录,租户管理->账户充值记录,租户管理->租户充值记录,平台管理->充值记录:
1、增加充值类型搜索
2、类型搜索框进行trim
改进前
改进后
账户搜索框修改
租户管理->账户消费记录,租户管理->账户充值记录,平台管理->账户消费记录:
1、账户搜索框改为可以输入多个
2、账户搜索框,允许直接输入内容后,不用再点击搜索结果也可以进行搜索
改进前
改进后
其他
1、导出功能根据类型从string->string[]同步更新
![微信截图_20240507114137](https://private-user-images.githubusercontent.com/78541912/328380228-ccdcb7b1-51fe-4b61-8682-3e75827738da.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MTk1MzMxODcsIm5iZiI6MTcxOTUzMjg4NywicGF0aCI6Ii83ODU0MTkxMi8zMjgzODAyMjgtY2NkY2I3YjEtNTFmZS00YjYxLTg2ODItM2U3NTgyNzczOGRhLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNDA2MjglMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjQwNjI4VDAwMDEyN1omWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPWYxYzE1MTlkZTFmZWY2MGM2YjJlZGVmZmRjZmE2NjBiNWJkYTY0ZjY0MDMxZmIzNjc3NGViZmFlMmEwYjRkOWEmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0JmFjdG9yX2lkPTAma2V5X2lkPTAmcmVwb19pZD0wIn0.dJVCgE0w4LUAEhx7I-kTnQJIzO21OkFkdNYCEiQo2WM)
2、mis、audit中测试用例随着账户名和类型可多选,string->string[],随之修改和增加
3、mis、audit中日志相关随string->string[]进行一定修改
连锁i修改,操作日志,体现单选、多选、全选,并兼容过去记录: