diff --git a/gringotts-frontend/components/permission/dialog-permission.js b/gringotts-frontend/components/permission/dialog-permission.js index d9a5a19..8582999 100644 --- a/gringotts-frontend/components/permission/dialog-permission.js +++ b/gringotts-frontend/components/permission/dialog-permission.js @@ -87,17 +87,17 @@ export function permissionAddDialog() { } } -export function permissionDetailDialog() { +export function permissionDetailDialog(field = 'id') { return { actionType: 'dialog', dialog: { - title: '新增确权申请', + title: '确权申请详情', size: 'md', actions: [], body: { debug: true, ...detailForm(), - initApi: apiGet('${base}/confirmation/detail/${id}'), + initApi: apiGet(`\${base}/confirmation/detail/\${${field}}`), static: true, data: { detail: true, diff --git a/gringotts-frontend/pages/index/tab-data.js b/gringotts-frontend/pages/index/tab-data.js index f5f7acc..ccd8243 100644 --- a/gringotts-frontend/pages/index/tab-data.js +++ b/gringotts-frontend/pages/index/tab-data.js @@ -63,8 +63,9 @@ export function resourceList() { ...resourceEditeDialog(), }, { + disabledOn: '${confirmationId}', type: 'action', - label: '删除', + label: "${IF(confirmationId, '删除(确权中)', '删除')}", confirmTitle: '确认删除', confirmText: '确认删除名称为「${name}」的数据资源吗?', actionType: 'ajax', diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/controller/DataResourceController.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/controller/DataResourceController.java index 7bbd30d..b5582e2 100644 --- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/controller/DataResourceController.java +++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/controller/DataResourceController.java @@ -76,6 +76,9 @@ public class DataResourceController extends SimpleController