jingrow/jcloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

main #2

Merged
jingrow merged 250 commits from main into v1 2026-01-13 22:45:50 +08:00
Conversation 0 Commits 250 Files Changed 419 +157 -39
2 changed files with 157 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bf0fce72cd - Show all commits

123
dashboard/src2/components/DomainOwner.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="space-y-4">
<div class="mx-5 mt-5">
<div>
<div class="flex flex-col sm:flex-row gap-4 items-center">
<div class="w-full sm:w-1/2">
<div class="flex gap-2">
@ -34,7 +34,7 @@
</div>
<!-- 列表内容 -->
<div class="rounded-lg border border-gray-200 bg-white mt-4">
<div class="rounded-lg border border-gray-200 bg-white my-4">
<!-- 表头 -->
<div class="grid grid-cols-12 gap-4 border-b border-gray-200 bg-gray-50 px-6 py-3 text-sm font-medium text-gray-700">
<div class="col-span-4">所有者名称</div>
@ -112,28 +112,46 @@
</div>
<!-- 分页 -->
<div v-if="pagination.total > pagination.limit" class="flex items-center justify-between mt-4">
<div v-if="pagination.total > pagination.limit" class="flex flex-col items-center space-y-4">
<div class="text-sm text-gray-700">
显示 {{ (pagination.pageno - 1) * pagination.limit + 1 }} 到
显示第 {{ (pagination.pageno - 1) * pagination.limit + 1 }} -
{{ Math.min(pagination.pageno * pagination.limit, pagination.total) }} 条，
共 {{ pagination.total }} 条记录
</div>
<div class="flex gap-2">
<div class="flex items-center space-x-2">
<Button
@click="previousPage"
:disabled="pagination.pageno <= 1"
variant="outline"
size="sm"
class="px-3"
>
上一页
←
</Button>
<div class="flex items-center space-x-1">
<Button
v-for="page in getVisiblePages()"
:key="page"
@click="changePage(page)"
:class="[
'px-3 py-1 text-sm rounded',
page === pagination.pageno
? '!bg-[#1fc76f] text-white'
: 'bg-white text-gray-700 border border-gray-300 hover:bg-gray-50'
]"
:disabled="page === pagination.pageno"
>
{{ page }}
</Button>
</div>
<Button
@click="nextPage"
:disabled="pagination.pageno >= pagination.pagecount"
variant="outline"
size="sm"
class="px-3"
>
下一页
→
</Button>
</div>
</div>
@ -461,7 +479,7 @@ export default {
selectedStatus: '',
pagination: {
pageno: 1,
limit: 20,
limit: 10,
total: 0,
pagecount: 0
},
@ -487,31 +505,20 @@ export default {
},
computed: {
filteredOwners() {
let filtered = [...this.owners];
// 搜索过滤
if (this.searchQuery) {
const query = this.searchQuery.toLowerCase();
filtered = filtered.filter(owner => {
const displayName = this.getDisplayName(owner).toLowerCase();
const title = (owner.title || '').toLowerCase();
const email = (owner.c_em || '').toLowerCase();
return displayName.includes(query) || title.includes(query) || email.includes(query);
});
}
// 状态过滤
if (this.selectedStatus) {
filtered = filtered.filter(owner => {
// 根据r_status字段判断实名认证状态
// 0: 未实名, 1: 实名成功, 2: 实名中, 3: 实名失败, 4: 认证过期, 5: 待审核
const rStatus = owner.r_status;
const isVerified = rStatus === '1'; // 只有状态为'1'才是已实名认证
return String(isVerified ? '1' : '0') === this.selectedStatus;
});
}
return filtered;
// 由于搜索和过滤现在在服务器端处理，直接返回当前页的数据
return this.owners;
}
},
watch: {
// 监听搜索条件变化
searchQuery() {
this.pagination.pageno = 1; // 重置到第一页
this.fetchOwners();
},
// 监听状态过滤变化
selectedStatus() {
this.pagination.pageno = 1; // 重置到第一页
this.fetchOwners();
}
},
methods: {
@ -604,11 +611,21 @@ export default {
try {
const ownersRequest = createResource({
url: 'jcloud.api.domain_west.get_domain_owners',
params: {
limit: this.pagination.limit,
pageno: this.pagination.pageno,
searchQuery: this.searchQuery,
selectedStatus: this.selectedStatus
},
onSuccess: (response) => {
if (response.status === 'Success') {
this.owners = response.data || [];
this.pagination.total = this.owners.length;
this.pagination.pagecount = Math.ceil(this.pagination.total / this.pagination.limit);
this.owners = response.data.items || [];
this.pagination = {
pageno: response.data.pageno || 1,
limit: response.data.limit || 20,
total: response.data.total || 0,
pagecount: response.data.pagecount || 0
};
} else {
this.error = response.message || '获取域名所有者列表失败';
}
@ -777,6 +794,7 @@ export default {
previousPage() {
if (this.pagination.pageno > 1) {
this.pagination.pageno--;
this.fetchOwners();
}
},
@ -784,12 +802,45 @@ export default {
nextPage() {
if (this.pagination.pageno < this.pagination.pagecount) {
this.pagination.pageno++;
this.fetchOwners();
}
},
// 刷新列表
refresh() {
this.fetchOwners();
},
// 获取可见的页码
getVisiblePages() {
const current = this.pagination.pageno;
const total = this.pagination.pagecount;
const pages = [];
// 如果总页数小于等于5，显示所有页码
if (total <= 5) {
for (let i = 1; i <= total; i++) {
pages.push(i);
}
} else {
// 显示当前页附近的页码
const start = Math.max(1, current - 2);
const end = Math.min(total, current + 2);
for (let i = start; i <= end; i++) {
pages.push(i);
}
}
return pages;
},
// 切换页码
changePage(page) {
if (page >= 1 && page <= this.pagination.pagecount) {
this.pagination.pageno = page;
this.fetchOwners();
}
}
},
mounted() {

73
jcloud/api/domain_west.py
View File

@ -1795,13 +1795,31 @@ def delete_domain(pagetype, name):
@jingrow.whitelist()
def get_domain_owners():
"""获取当前团队的域名所有者列表"""
def get_domain_owners(**data):
"""获取当前团队的域名所有者列表（支持分页、搜索和过滤）"""
try:
team = get_current_team()
if not team:
return {"status": "Error", "message": "未找到当前团队"}
# 获取分页参数
limit = data.get('limit', 20)
pageno = data.get('pageno', 1)
search_query = data.get('searchQuery', '').strip()
selected_status = data.get('selectedStatus', '')
# 确保参数类型正确
try:
limit = int(limit)
pageno = int(pageno)
except (ValueError, TypeError):
limit = 20
pageno = 1
# 确保参数在合理范围内
limit = max(1, min(limit, 100)) # 限制每页最多100条
pageno = max(1, pageno)
# 获取当前团队的所有域名所有者
domain_owners = jingrow.get_all(
"Domain Owner",
@ -1811,9 +1829,58 @@ def get_domain_owners():
"c_idtype_gswl", "c_idnum_gswl", "c_sysid"]
)
# 搜索过滤
if search_query:
search_query_lower = search_query.lower()
filtered_owners = []
for owner in domain_owners:
# 检查显示名称
display_name = ""
if owner.c_regtype == 'I':
if owner.fullname:
display_name = owner.fullname
else:
display_name = (owner.c_ln_m or '') + (owner.c_fn_m or '')
elif owner.c_regtype == 'E':
display_name = owner.c_org_m or owner.title or owner.name
else:
display_name = owner.title or owner.name
# 检查是否匹配搜索条件
if (search_query_lower in display_name.lower() or
search_query_lower in (owner.title or '').lower() or
search_query_lower in (owner.c_em or '').lower()):
filtered_owners.append(owner)
domain_owners = filtered_owners
# 状态过滤
if selected_status:
filtered_owners = []
for owner in domain_owners:
r_status = owner.r_status
is_verified = r_status == '1'
if str('1' if is_verified else '0') == selected_status:
filtered_owners.append(owner)
domain_owners = filtered_owners
# 计算分页信息
total = len(domain_owners)
pagecount = (total + limit - 1) // limit
start_index = (pageno - 1) * limit
end_index = start_index + limit
# 返回当前页的记录
current_page_items = domain_owners[start_index:end_index]
return {
"status": "Success",
"data": domain_owners
"data": {
"pageno": pageno,
"limit": limit,
"total": total,
"pagecount": pagecount,
"items": current_page_items
}
}
except Exception as e:
return {"status": "Error", "message": f"获取域名所有者列表失败: {str(e)}"}