From f15bcc2f539295b1d3bfe268a688706f6bae2515 Mon Sep 17 00:00:00 2001
From: lanyuanxiaoyao <lanyuanxiaoyao@gmail.com>
Date: Wed, 27 Nov 2024 14:01:36 +0800
Subject: [PATCH] =?UTF-8?q?feat(web):=20=E5=85=B3=E8=81=94=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E8=B5=84=E6=BA=90=E5=92=8C=E7=A1=AE=E6=9D=83=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/permission/dialog-permission.js              | 6 +++---
 gringotts-frontend/pages/index/tab-data.js                  | 3 ++-
 .../domain/resource/controller/DataResourceController.java  | 4 ++++
 .../gringotts/web/domain/resource/entity/DataResource.java  | 6 ++++++
 4 files changed, 15 insertions(+), 4 deletions(-)

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<DataResource, DataR
         item.setDescription(dataResource.getDescription());
         item.setType(dataResource.getType().getResourceType().name());
         item.setFormat(dataResource.getFormat().getFormatType().name());
+        if (ObjectUtil.isNotNull(dataResource.getConfirmation())) {
+            item.setConfirmationId(dataResource.getConfirmation().getId());
+        }
         item.setCreatedUser(dataResource.getCreatedUser().getUsername());
         item.setCreatedTime(dataResource.getCreatedTime());
         return item;
@@ -250,6 +253,7 @@ public class DataResourceController extends SimpleController<DataResource, DataR
         private String description;
         private String type;
         private String format;
+        private Long confirmationId;
         private String createdUser;
         private LocalDateTime createdTime;
     }
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/DataResource.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/DataResource.java
index cedb9fb..387eb20 100644
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/DataResource.java
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/resource/entity/DataResource.java
@@ -2,6 +2,7 @@ package com.eshore.gringotts.web.domain.resource.entity;
 
 import com.eshore.gringotts.core.Constants;
 import com.eshore.gringotts.web.domain.base.entity.SimpleEntity;
+import com.eshore.gringotts.web.domain.confirmation.entity.Confirmation;
 import com.eshore.gringotts.web.domain.resource.entity.format.ResourceFormat;
 import com.eshore.gringotts.web.domain.resource.entity.type.ResourceType;
 import com.eshore.gringotts.web.domain.upload.entity.DataFile;
@@ -33,12 +34,14 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 @NamedEntityGraph(name = "data_resource.list", attributeNodes = {
         @NamedAttributeNode(value = "type"),
         @NamedAttributeNode(value = "format"),
+        @NamedAttributeNode(value = "confirmation"),
         @NamedAttributeNode(value = "createdUser"),
 })
 @NamedEntityGraph(name = "data_resource.detail", attributeNodes = {
         @NamedAttributeNode(value = "type"),
         @NamedAttributeNode(value = "format"),
         @NamedAttributeNode(value = "example"),
+        @NamedAttributeNode(value = "confirmation"),
         @NamedAttributeNode(value = "createdUser"),
         @NamedAttributeNode(value = "modifiedUser"),
 })
@@ -58,4 +61,7 @@ public class DataResource extends SimpleEntity {
     @JoinColumn(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
     @ToString.Exclude
     private DataFile example;
+    @OneToOne(cascade = CascadeType.REMOVE, fetch = FetchType.EAGER, mappedBy = "target")
+    @ToString.Exclude
+    private Confirmation confirmation;
 }