From e5b6f7a2a661432e8bedf2a7f8ed50bac351fce6 Mon Sep 17 00:00:00 2001 From: gaoxq <376340421@qq.com> Date: Tue, 16 Dec 2025 19:18:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=89=8D=E7=AB=AFvue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/biz/entity/BizListItem.java | 8 +- .../biz/web/BizListItemController.java | 3 +- web-vue/packages/biz/api/biz/listItem.ts | 6 +- .../packages/biz/views/biz/listItem/list.vue | 2 +- .../header/components/notify/NoticeList.vue | 22 +- .../header/components/notify/index.vue | 8 +- .../workbench/components/listItem/form.vue | 146 ++++++++++ .../components/listItem/formImport.vue | 103 +++++++ .../workbench/components/listItem/list.vue | 273 ++++++++++++++++++ .../layouts/views/desktop/workbench/index.vue | 6 +- 10 files changed, 557 insertions(+), 20 deletions(-) create mode 100644 web-vue/packages/core/layouts/views/desktop/workbench/components/listItem/form.vue create mode 100644 web-vue/packages/core/layouts/views/desktop/workbench/components/listItem/formImport.vue create mode 100644 web-vue/packages/core/layouts/views/desktop/workbench/components/listItem/list.vue diff --git a/web-api/src/main/java/com/jeesite/modules/biz/entity/BizListItem.java b/web-api/src/main/java/com/jeesite/modules/biz/entity/BizListItem.java index 5493cfca..74760e65 100644 --- a/web-api/src/main/java/com/jeesite/modules/biz/entity/BizListItem.java +++ b/web-api/src/main/java/com/jeesite/modules/biz/entity/BizListItem.java @@ -36,7 +36,7 @@ import java.io.Serial; @Column(name = "id", attrName = "id", label = "唯一标识", isPK = true), @Column(name = "avatar", attrName = "avatar", label = "头像图标", isUpdate = false, isUpdateForce = true), @Column(name = "title", attrName = "title", label = "通知标题", queryType = QueryType.LIKE), - @Column(name = "title_delete", attrName = "titleDelete", label = "是否删除", isQuery = false), + @Column(name = "title_delete", attrName = "titleDelete", label = "是否删除"), @Column(name = "datetime", attrName = "datetime", label = "发送时间", isQuery = false), @Column(name = "type", attrName = "type", label = "类型标识"), @Column(name = "read_flag", attrName = "readFlag", label = "是否已读"), @@ -62,12 +62,12 @@ public class BizListItem extends DataEntity implements Serializable private Date createTime; // 创建时间 private String avatar; // 头像图标 private String title; // 通知标题 - private Boolean titleDelete; // 是否删除 + private String titleDelete; // 是否删除 private String datetime; // 发送时间 private String type; // 类型标识 - private Boolean readFlag; // 是否已读 + private String readFlag; // 是否已读 private String description; // 描述信息 - private Boolean clickClose; // 是否关闭 + private String clickClose; // 是否关闭 private String extra; // 待办状态 private String color; // 颜色值 private Date updateTime; // 更新时间 diff --git a/web-api/src/main/java/com/jeesite/modules/biz/web/BizListItemController.java b/web-api/src/main/java/com/jeesite/modules/biz/web/BizListItemController.java index 24c6c829..e31034c7 100644 --- a/web-api/src/main/java/com/jeesite/modules/biz/web/BizListItemController.java +++ b/web-api/src/main/java/com/jeesite/modules/biz/web/BizListItemController.java @@ -175,7 +175,8 @@ public class BizListItemController extends BaseController { return Arrays.stream(NotifyType.values()) .map(type -> { BizListItem listItem = new BizListItem(); - listItem.setClickClose(false); + listItem.setClickClose("0"); + listItem.setTitleDelete("0"); listItem.setType(type.getCode()); if (type.getCode().equals("3")) { listItem.setLoginUser(user.getLoginCode()); diff --git a/web-vue/packages/biz/api/biz/listItem.ts b/web-vue/packages/biz/api/biz/listItem.ts index f049a377..24f178f3 100644 --- a/web-vue/packages/biz/api/biz/listItem.ts +++ b/web-vue/packages/biz/api/biz/listItem.ts @@ -16,12 +16,12 @@ export interface BizListItem extends BasicModel { createTime?: string; // 创建时间 avatar?: string; // 头像图标 title: string; // 通知标题 - titleDelete?: boolean; + titleDelete?: string; datetime?: string; // 发送时间 type: string; // 类型标识 - readFlag?: boolean; // 是否已读 + readFlag?: string; // 是否已读 description: string; // 描述信息 - clickClose?: boolean; // 是否关闭 + clickClose?: string; // 是否关闭 extra?: string; // 待办状态 color?: string; // 颜色值 updateTime: string; // 更新时间 diff --git a/web-vue/packages/biz/views/biz/listItem/list.vue b/web-vue/packages/biz/views/biz/listItem/list.vue index 495c69e8..6f14d1b2 100644 --- a/web-vue/packages/biz/views/biz/listItem/list.vue +++ b/web-vue/packages/biz/views/biz/listItem/list.vue @@ -256,7 +256,7 @@ confirm: handleDelete.bind(this, record), }, auth: 'biz:listItem:edit', - ifShow: record.clickClose == false + ifShow: record.clickClose == '9' }, ], }; diff --git a/web-vue/packages/core/layouts/default/header/components/notify/NoticeList.vue b/web-vue/packages/core/layouts/default/header/components/notify/NoticeList.vue index aba6b1cf..d1857d42 100644 --- a/web-vue/packages/core/layouts/default/header/components/notify/NoticeList.vue +++ b/web-vue/packages/core/layouts/default/header/components/notify/NoticeList.vue @@ -1,14 +1,14 @@