+
-
- 生成地址
-
- {{imageDetail.originalPicUrl}}
-
-
+
diff --git a/src/views/ai/image/ImageTask.vue b/src/views/ai/image/ImageTask.vue
index 4f05d32d..a2dc3873 100644
--- a/src/views/ai/image/ImageTask.vue
+++ b/src/views/ai/image/ImageTask.vue
@@ -70,6 +70,7 @@ const getImageList = async () => {
const handlerImageBtnClick = async (type, imageDetail: ImageDetailVO) => {
// 获取 image detail id
showImageDetailId.value = imageDetail.id
+ console.log('type', imageDetail.id)
// 处理不用 btn
if (type === 'more') {
await handlerDrawerOpen()
@@ -119,7 +120,6 @@ const downloadImage = async (imageUrl) => {
const handleTabsScroll = async () => {
if (imageTaskRef.value) {
const { scrollTop, scrollHeight, clientHeight } = imageTaskRef.value;
- console.log('scrollTop', scrollTop, clientHeight, scrollHeight)
if (scrollTop + clientHeight >= scrollHeight - 20 && !imageTaskLoading.value) {
console.log('分页')
pageNo.value = pageNo.value + 1
From 63f0a2058dd5b77e5f638b9d5bcff699d79f95ae Mon Sep 17 00:00:00 2001
From: cherishsince
Date: Tue, 18 Jun 2024 17:18:55 +0800
Subject: [PATCH 21/86] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91?=
=?UTF-8?q?=E5=88=A0=E9=99=A4=20image=20task=20=E5=88=86=E9=A1=B5=EF=BC=8C?=
=?UTF-8?q?=E6=94=B9=E4=B8=BA=20top=20=E5=89=8D=E5=A4=9A=E5=B0=91=E6=95=B0?=
=?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/ai/image/ImageTask.vue | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/views/ai/image/ImageTask.vue b/src/views/ai/image/ImageTask.vue
index a2dc3873..6ceb7e0f 100644
--- a/src/views/ai/image/ImageTask.vue
+++ b/src/views/ai/image/ImageTask.vue
@@ -57,7 +57,8 @@ const getImageList = async () => {
text: '加载中...'
})
const { list } = await ImageApi.getImageList({pageNo: pageNo.value, pageSize: pageSize.value})
- imageList.value.push.apply(imageList.value, list)
+ // imageList.value.push.apply(imageList.value, list)
+ imageList.value = list
} finally {
if (imageTaskLoadingInstance.value) {
imageTaskLoadingInstance.value.close();
@@ -118,14 +119,15 @@ const downloadImage = async (imageUrl) => {
}
const handleTabsScroll = async () => {
- if (imageTaskRef.value) {
- const { scrollTop, scrollHeight, clientHeight } = imageTaskRef.value;
- if (scrollTop + clientHeight >= scrollHeight - 20 && !imageTaskLoading.value) {
- console.log('分页')
- pageNo.value = pageNo.value + 1
- await getImageList();
- }
- }
+ // todo 先不分页，只显示 top 前多少
+ // if (imageTaskRef.value) {
+ // const { scrollTop, scrollHeight, clientHeight } = imageTaskRef.value;
+ // if (scrollTop + clientHeight >= scrollHeight - 20 && !imageTaskLoading.value) {
+ // console.log('分页')
+ // pageNo.value = pageNo.value + 1
+ // await getImageList();
+ // }
+ // }
}
/** 暴露组件方法 */
From bd80a6f34f76480009f7499583f375dd7d437fb8 Mon Sep 17 00:00:00 2001
From: cherishsince
Date: Wed, 19 Jun 2024 10:41:33 +0800
Subject: [PATCH 22/86] =?UTF-8?q?=E3=80=90=E5=A2=9E=E5=8A=A0=E3=80=91image?=
=?UTF-8?q?=20task=20=E5=A2=9E=E5=8A=A0=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/ai/image/ImageTask.vue | 57 ++++++++++++++++++++++----------
1 file changed, 39 insertions(+), 18 deletions(-)
diff --git a/src/views/ai/image/ImageTask.vue b/src/views/ai/image/ImageTask.vue
index 6ceb7e0f..3a8ccb80 100644
--- a/src/views/ai/image/ImageTask.vue
+++ b/src/views/ai/image/ImageTask.vue
@@ -1,7 +1,7 @@
绘画任务
-
- ()
res.forEach((dictData: DictDataVO) => {
@@ -75,7 +76,8 @@ export const useDictStore = defineStore('dict', {
},
async resetDict() {
wsCache.delete(CACHE_KEY.DICT_CACHE)
- const res = await getSimpleDictDataList()
+ const res = []
+ // const res = await getSimpleDictDataList()
// 设置数据
const dictDataMap = new Map()
res.forEach((dictData: DictDataVO) => {
diff --git a/src/views/ai/music/components/list/audioBar/index.vue b/src/views/ai/music/components/list/audioBar/index.vue
new file mode 100644
index 00000000..2b25e40f
--- /dev/null
+++ b/src/views/ai/music/components/list/audioBar/index.vue
@@ -0,0 +1,9 @@
+
+
+
+
+
diff --git a/src/views/ai/music/components/list/index.vue b/src/views/ai/music/components/list/index.vue
new file mode 100644
index 00000000..bc21034d
--- /dev/null
+++ b/src/views/ai/music/components/list/index.vue
@@ -0,0 +1,94 @@
+
+
+ 信息复用
+
+
+
+
+
diff --git a/src/views/ai/music/components/mode/desc.vue b/src/views/ai/music/components/mode/desc.vue
new file mode 100644
index 00000000..4488461e
--- /dev/null
+++ b/src/views/ai/music/components/mode/desc.vue
@@ -0,0 +1,55 @@
+
+
+
+
+ 描述模式
+
+
+ 歌词模式
+
+
+
+
+
+ 创作音乐
+
+
+
+
+
diff --git a/src/views/ai/music/components/mode/lyric.vue b/src/views/ai/music/components/mode/lyric.vue
new file mode 100644
index 00000000..f774003a
--- /dev/null
+++ b/src/views/ai/music/components/mode/lyric.vue
@@ -0,0 +1,83 @@
+
+
Date: Thu, 27 Jun 2024 18:11:22 +0800
Subject: [PATCH 34/86] =?UTF-8?q?=E3=80=90=E8=A7=A3=E5=86=B3todo=E3=80=91g?=
=?UTF-8?q?et=20=E8=BD=AE=E8=AE=AD=EF=BC=8C=E4=B8=B4=E6=97=B6=E6=8F=90?=
=?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/ai/image/ImageTask.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/ai/image/ImageTask.vue b/src/views/ai/image/ImageTask.vue
index d458db00..ac2e51ff 100644
--- a/src/views/ai/image/ImageTask.vue
+++ b/src/views/ai/image/ImageTask.vue
@@ -34,6 +34,7 @@ import {ElLoading, LoadingOptionsResolved} from "element-plus";
const message = useMessage() // 消息弹窗
const imageList = ref([]) // image 列表
+const watchImageList = ref([]) // 监听的 image list，一般是生成中，需要轮训
const imageListInterval = ref() // image 列表定时器，刷新列表
const isShowImageDetail = ref(false) // 是否显示 task 详情
const showImageDetailId = ref(0) // 是否显示 task 详情
@@ -83,7 +84,6 @@ const getImageList = async (apply:boolean = false) => {
const handlerImageBtnClick = async (type, imageDetail: ImageDetailVO) => {
// 获取 image detail id
showImageDetailId.value = imageDetail.id
- console.log('type', imageDetail.id)
// 处理不用 btn
if (type === 'more') {
await handlerDrawerOpen()
From 75d0be9742f01ff6d759386f2a9d9ff436d63f7f Mon Sep 17 00:00:00 2001
From: xiaohong <1315228474@qq.com>
Date: Thu, 27 Jun 2024 22:31:49 +0800
Subject: [PATCH 35/86] =?UTF-8?q?feat:=20=E5=B0=86=E8=A7=86=E9=A2=91?=
=?UTF-8?q?=E5=88=97=E8=A1=A8=E6=94=B9=E6=88=90=E5=8D=95=E6=8E=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/ai/music/components/list/index.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/ai/music/components/list/index.vue b/src/views/ai/music/components/list/index.vue
index bc21034d..6dce9b8c 100644
--- a/src/views/ai/music/components/list/index.vue
+++ b/src/views/ai/music/components/list/index.vue
@@ -5,7 +5,7 @@
-
+
@@ -15,7 +15,7 @@
-
+
From 8d33476472ddd6667c72ba59f5e7f3f4319fe11c Mon Sep 17 00:00:00 2001
From: YunaiV
Date: Thu, 27 Jun 2024 23:08:50 +0800
Subject: [PATCH 36/86] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E6=96=B0?=
=?UTF-8?q?=E5=A2=9E=E3=80=91AI=EF=BC=9A=E9=9F=B3=E4=B9=90=E7=AE=A1?=
=?UTF-8?q?=E7=90=86=2050%?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/ai/image/index.ts | 4 +-
src/api/ai/music/index.ts | 40 +++++
src/views/ai/image/ImageDetailDrawer.vue | 34 ++--
src/views/ai/image/ImageTask.vue | 46 ++---
src/views/ai/image/ImageTaskCard.vue | 48 +++--
src/views/ai/image/manager/index.vue | 6 +-
src/views/ai/music/manager/index.vue | 215 +++++++++++++++++++++++
7 files changed, 329 insertions(+), 64 deletions(-)
create mode 100644 src/api/ai/music/index.ts
create mode 100644 src/views/ai/music/manager/index.vue
diff --git a/src/api/ai/image/index.ts b/src/api/ai/image/index.ts
index cb5a5afd..b895986d 100644
--- a/src/api/ai/image/index.ts
+++ b/src/api/ai/image/index.ts
@@ -1,7 +1,7 @@
import request from '@/config/axios'
-// AI API 密钥 VO
-export interface ImageRespVO {
+// AI 绘图 VO
+export interface ImageVO {
id: number // 编号
platform: string // 平台
model: string // 模型
diff --git a/src/api/ai/music/index.ts b/src/api/ai/music/index.ts
new file mode 100644
index 00000000..9415d3a2
--- /dev/null
+++ b/src/api/ai/music/index.ts
@@ -0,0 +1,40 @@
+import request from '@/config/axios'
+
+// AI 音乐 VO
+export interface MusicVO {
+ id: number // 编号
+ userId: number // 用户编号
+ title: string // 音乐名称
+ lyric: string // 歌词
+ imageUrl: string // 图片地址
+ audioUrl: string // 音频地址
+ videoUrl: string // 视频地址
+ status: number // 音乐状态
+ gptDescriptionPrompt: string // 描述词
+ prompt: string // 提示词
+ platform: string // 模型平台
+ model: string // 模型
+ generateMode: number // 生成模式
+ tags: string // 音乐风格标签
+ publicStatus: boolean // 是否发布
+ taskId: string // 任务id
+ errorMessage: string // 错误信息
+}
+
+// AI 音乐 API
+export const MusicApi = {
+ // 查询音乐分页
+ getMusicPage: async (params: any) => {
+ return await request.get({ url: `/ai/music/page`, params })
+ },
+
+ // 修改音乐
+ updateMusic: async (data: MusicVO) => {
+ return await request.put({ url: `/ai/music/update`, data })
+ },
+
+ // 删除音乐
+ deleteMusic: async (id: number) => {
+ return await request.delete({ url: `/ai/music/delete?id=` + id })
+ }
+}
diff --git a/src/views/ai/image/ImageDetailDrawer.vue b/src/views/ai/image/ImageDetailDrawer.vue
index 7c74ef35..fca087da 100644
--- a/src/views/ai/image/ImageDetailDrawer.vue
+++ b/src/views/ai/image/ImageDetailDrawer.vue
@@ -7,11 +7,11 @@
>
风格
- {{imageDetail.options.style}}
+ {{imageDetail?.options?.style}}
+
() // ref
const imageTaskLoadingInstance = ref() // loading
const imageTaskLoading = ref(false) // loading
const pageNo = ref(1) // page no
-const pageSize = ref(20) // page size
+const pageSize = ref(10) // page size
+const pageTotal = ref(0) // page size
/** 抽屉 - close */
const handlerDrawerClose = async () => {
@@ -49,16 +57,20 @@ const handlerDrawerOpen = async () => {
/**
* 获取 - image 列表
*/
-const getImageList = async () => {
+const getImageList = async (apply:boolean = false) => {
imageTaskLoading.value = true
try {
imageTaskLoadingInstance.value = ElLoading.service({
target: imageTaskRef.value,
text: '加载中...'
})
- const { list } = await ImageApi.getImageList({pageNo: pageNo.value, pageSize: pageSize.value})
- // imageList.value.push.apply(imageList.value, list)
- imageList.value = list
+ const { list, total } = await ImageApi.getImageList({pageNo: pageNo.value, pageSize: pageSize.value})
+ if (apply) {
+ imageList.value = [...imageList.value, ...list]
+ } else {
+ imageList.value = list
+ }
+ pageTotal.value = total
} finally {
if (imageTaskLoadingInstance.value) {
imageTaskLoadingInstance.value.close();
@@ -118,16 +130,10 @@ const downloadImage = async (imageUrl) => {
}
}
-const handleTabsScroll = async () => {
- // todo 先不分页，只显示 top 前多少
- // if (imageTaskRef.value) {
- // const { scrollTop, scrollHeight, clientHeight } = imageTaskRef.value;
- // if (scrollTop + clientHeight >= scrollHeight - 20 && !imageTaskLoading.value) {
- // console.log('分页')
- // pageNo.value = pageNo.value + 1
- // await getImageList();
- // }
- // }
+// page change
+const handlerPageChange = async (page) => {
+ pageNo.value = page
+ await getImageList(false)
}
/** 暴露组件方法 */
@@ -139,7 +145,7 @@ onMounted(async () => {
await getImageList()
// 自动刷新 image 列表
imageListInterval.value = setInterval(async () => {
- await getImageList()
+ await getImageList(false)
}, 1000 * 20)
})
@@ -168,7 +174,7 @@ onUnmounted(async () => {
height: 100%;
overflow: auto;
padding: 20px;
- padding-bottom: 100px;
+ padding-bottom: 140px;
box-sizing: border-box; /* 确保内边距不会增加高度 */
>div {
@@ -179,6 +185,21 @@ onUnmounted(async () => {
//margin-bottom: 100px;
}
}
+
+.task-image-pagination {
+ position: absolute;
+ bottom: 60px;
+ height: 50px;
+ line-height: 90px;
+ width: 100%;
+ z-index: 999;
+ background-color: #ffffff;
+ display: flex;
+ flex-direction: row;
+ justify-content: center;
+ align-items: center;
+}
+
From d66664b3d428d24fdb314617b7ef4569c16465b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=80=E5=90=8E=E7=9A=84=E6=A2=A6=E6=83=B3?=
<1971063665@qq.com>
Date: Mon, 24 Jun 2024 01:53:12 +0000
Subject: [PATCH 27/86] =?UTF-8?q?update=20src/components/bpmnProcessDesign?=
=?UTF-8?q?er/package/penal/flow-condition/FlowCondition.vue.=20=E4=BF=AE?=
=?UTF-8?q?=E5=A4=8D=EF=BC=9A=E6=B5=81=E7=A8=8B=E8=AE=BE=E8=AE=A1=E5=99=A8?=
=?UTF-8?q?bpmn=E6=B5=81=E8=BD=AC=E6=9D=A1=E4=BB=B6-=E6=B5=81=E8=BD=AC?=
=?UTF-8?q?=E7=B1=BB=E5=9E=8B=E9=80=89=E6=8B=A9=E9=BB=98=E8=AE=A4=E6=B5=81?=
=?UTF-8?q?=E8=BD=AC=E8=B7=AF=E5=BE=84=EF=BC=8C=E6=9C=AA=E6=AD=A3=E7=A1=AE?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA/?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: 最后的梦想 <1971063665@qq.com>
---
.../package/penal/flow-condition/FlowCondition.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/bpmnProcessDesigner/package/penal/flow-condition/FlowCondition.vue b/src/components/bpmnProcessDesigner/package/penal/flow-condition/FlowCondition.vue
index 1715d73b..304630d9 100644
--- a/src/components/bpmnProcessDesigner/package/penal/flow-condition/FlowCondition.vue
+++ b/src/components/bpmnProcessDesigner/package/penal/flow-condition/FlowCondition.vue
@@ -129,7 +129,7 @@ const updateFlowType = (flowType) => {
conditionExpression: null
})
bpmnInstances().modeling.updateProperties(toRaw(bpmnElementSource.value), {
- default: bpmnElement.value
+ default: toRaw(bpmnElement.value)
})
return
}
From bd4f2b8b7c98a13b36ce38e85f901e3e32f7f77f Mon Sep 17 00:00:00 2001
From: AhJindeg
Date: Tue, 25 Jun 2024 11:21:16 +0800
Subject: [PATCH 28/86] =?UTF-8?q?fix:=20=F0=9F=90=9E=20add=20result=20fiel?=
=?UTF-8?q?d=20to=20JobLogDetail=20el-descriptions-item?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/infra/jobLog/index.ts | 1 +
src/views/infra/job/logger/JobLogDetail.vue | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/api/infra/jobLog/index.ts b/src/api/infra/jobLog/index.ts
index dc80f1d9..ed54761c 100644
--- a/src/api/infra/jobLog/index.ts
+++ b/src/api/infra/jobLog/index.ts
@@ -12,6 +12,7 @@ export interface JobLogVO {
duration: string
status: number
createTime: string
+ result: string
}
// 任务日志列表
diff --git a/src/views/infra/job/logger/JobLogDetail.vue b/src/views/infra/job/logger/JobLogDetail.vue
index 1a84e4e8..7216f527 100644
--- a/src/views/infra/job/logger/JobLogDetail.vue
+++ b/src/views/infra/job/logger/JobLogDetail.vue
@@ -26,7 +26,7 @@
- {{ detailData.duration + ' result' }}
+ {{ detailData.result }}
From ef9ed50533cd4f08db50e920d280d661b3d84291 Mon Sep 17 00:00:00 2001
From: AhJindeg
Date: Tue, 25 Jun 2024 11:30:24 +0800
Subject: [PATCH 29/86] =?UTF-8?q?fix:=20=F0=9F=90=9E=20update=20axios=20in?=
=?UTF-8?q?terceptors=20response?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/config/axios/service.ts | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/config/axios/service.ts b/src/config/axios/service.ts
index 25936068..aed40908 100644
--- a/src/config/axios/service.ts
+++ b/src/config/axios/service.ts
@@ -174,6 +174,7 @@ service.interceptors.response.use(
if (msg === '无效的刷新令牌') {
// hard coding：忽略这个提示，直接登出
console.log(msg)
+ return handleAuthorized()
} else {
ElNotification.error({ title: msg })
}
From 36dc3c0b5c03fca829463d947671a52d90f390c5 Mon Sep 17 00:00:00 2001
From: YunaiV
Date: Wed, 26 Jun 2024 12:38:21 +0800
Subject: [PATCH 30/86] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E8=B0=83?=
=?UTF-8?q?=E6=95=B4=E3=80=91AI=EF=BC=9AMJ=20=E4=BA=8C=E6=AC=A1=20Action?=
=?UTF-8?q?=20=E7=9A=84=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/ai/image/index.ts | 78 ++++++++++--------------
src/views/ai/image/ImageDetailDrawer.vue | 6 +-
src/views/ai/image/ImageTask.vue | 16 ++---
src/views/ai/image/ImageTaskCard.vue | 6 +-
src/views/ai/image/midjourney/index.vue | 4 --
5 files changed, 47 insertions(+), 63 deletions(-)
diff --git a/src/api/ai/image/index.ts b/src/api/ai/image/index.ts
index 4fd35abe..205d0803 100644
--- a/src/api/ai/image/index.ts
+++ b/src/api/ai/image/index.ts
@@ -1,51 +1,28 @@
import request from '@/config/axios'
// AI API 密钥 VO
-// TODO @fan：要不前端不弄太多 VO，就用这个 ImageDetailVO？！
-export interface ImageDetailVO {
+export interface ImageRespVO {
id: number // 编号
- prompt: string // 提示词
- status: number // 状态
- errorMessage: string // 错误信息
- type: string // 模型下分不同的类型(清晰、真实...)
- taskId: number // dr 任务id
- picUrl: string // 任务地址
- originalPicUrl: string // 绘制图片地址
platform: string // 平台
model: string // 模型
- style: string // 图像生成的风格
- size: string // 图片尺寸
+ prompt: string // 提示词
+ width: number // 图片宽度
+ height: number // 图片高度
+ status: number // 状态
+ publicStatus: string // 公开状态
+ picUrl: string // 任务地址
+ errorMessage: string // 错误信息
+ options: object // 配置 Map
+ taskId: number // 任务编号
buttons: ImageMjButtonsVO[] // mj 操作按钮
createTime: string // 创建时间
- updateTime: string // 更新事件
}
-export interface ImageMjButtonsVO {
- customId: string // MJ::JOB::upsample::1::85a4b4c1-8835-46c5-a15c-aea34fad1862 动作标识
- emoji: string // 图标 emoji
- label: string // Make Variations 文本
- style: number // 样式: 2（Primary）、3（Green）
-}
-
-export interface ImageMjActionVO {
- id: string // MJ::JOB::upsample::1::85a4b4c1-8835-46c5-a15c-aea34fad1862 动作标识
- customId: string // MJ::JOB::upsample::1::85a4b4c1-8835-46c5-a15c-aea34fad1862 动作标识
-}
-
-
export interface ImagePageReqVO {
pageNo: number // 分页编号
pageSize: number // 分页大小
}
-export interface ImageDallReqVO {
- prompt: string // 提示词
- model: string // 模型
- style: string // 图像生成的风格
- width: string // 图片宽度
- height: string // 图片高度
-}
-
export interface ImageDrawReqVO {
platform: string // 平台
prompt: string // 提示词
@@ -65,34 +42,45 @@ export interface ImageMidjourneyImagineReqVO {
version: string // 版本
}
-// TODO 芋艿：review 下整体注释、方法名
+export interface ImageMjActionVO {
+ id: number // 图片编号
+ customId: string // MJ::JOB::upsample::1::85a4b4c1-8835-46c5-a15c-aea34fad1862 动作标识
+}
+
+export interface ImageMjButtonsVO {
+ customId: string // MJ::JOB::upsample::1::85a4b4c1-8835-46c5-a15c-aea34fad1862 动作标识
+ emoji: string // 图标 emoji
+ label: string // Make Variations 文本
+ style: number // 样式: 2（Primary）、3（Green）
+}
+
// AI API 密钥 API
export const ImageApi = {
- // 获取 image 列表
- getImageList: async (params: ImagePageReqVO) => {
+ // 获取我的图片列表
+ getImagePageMy: async (params: ImagePageReqVO) => {
return await request.get({ url: `/ai/image/my-page`, params })
},
- // 获取 image 详细信息
- getImageDetail: async (id: number) => {
+ // 获取我的图片
+ getImageMy: async (id: number) => {
return await request.get({ url: `/ai/image/get-my?id=${id}`})
},
// 生成图片
drawImage: async (data: ImageDrawReqVO)=> {
return await request.post({ url: `/ai/image/draw`, data })
},
- // 删除
- deleteImage: async (id: number)=> {
+ // 删除我的图片
+ deleteImageMy: async (id: number)=> {
return await request.delete({ url: `/ai/image/delete-my?id=${id}`})
},
- // ------------ midjourney
+ // ================ midjourney 专属 ================
- // midjourney - imagine
+ // 【Midjourney】生成图片
midjourneyImagine: async (data: ImageMidjourneyImagineReqVO)=> {
return await request.post({ url: `/ai/image/midjourney/imagine`, data })
},
- // midjourney - action
- midjourneyAction: async (params: ImageMjActionVO)=> {
- return await request.get({ url: `/ai/image/midjourney/action`, params })
+ // 【Midjourney】Action 操作（二次生成图片）
+ midjourneyAction: async (data: ImageMjActionVO)=> {
+ return await request.post({ url: `/ai/image/midjourney/action`, data })
},
}
diff --git a/src/views/ai/image/ImageDetailDrawer.vue b/src/views/ai/image/ImageDetailDrawer.vue
index e26a719a..7c74ef35 100644
--- a/src/views/ai/image/ImageDetailDrawer.vue
+++ b/src/views/ai/image/ImageDetailDrawer.vue
@@ -60,11 +60,11 @@
diff --git a/src/views/ai/image/manager/index.vue b/src/views/ai/image/manager/index.vue
new file mode 100644
index 00000000..ef505036
--- /dev/null
+++ b/src/views/ai/image/manager/index.vue
@@ -0,0 +1,247 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ userList.find((item) => item.id === scope.row.userId)?.nickname }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+
From 9516e7184ffa4d4deb67f409155c38d5eff74f5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BD=97=E5=A9=B7=28luot1=29?= <1315228474@qq.com>
Date: Thu, 27 Jun 2024 17:50:48 +0800
Subject: [PATCH 33/86] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9EAI=20music?=
=?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=A1=B5=E9=9D=A2=E4=BB=A5=E5=8F=8A=E7=BB=84?=
=?UTF-8?q?=E4=BB=B6=EF=BC=8C=E8=B0=83=E6=95=B4=E4=BA=86APPview=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2min-height=E4=B8=BAheight=EF=BC=8C=E6=B3=A8=E9=87=8A?=
=?UTF-8?q?=E4=BA=86=E7=99=BB=E5=BD=95=E6=97=B6dict=E6=8E=A5=E5=8F=A3?=
=?UTF-8?q?=E8=8E=B7=E5=8F=96=EF=BC=8C=E5=9C=A8contentWrap=E7=BB=84?=
=?UTF-8?q?=E4=BB=B6=E6=96=B0=E5=A2=9E=E4=BA=86bodystyle=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ContentWrap/src/ContentWrap.vue | 9 +-
src/layout/components/AppView.vue | 12 +--
src/router/modules/remaining.ts | 20 ++++
src/store/modules/dict.ts | 8 +-
.../music/components/list/audioBar/index.vue | 9 ++
src/views/ai/music/components/list/index.vue | 94 +++++++++++++++++++
.../music/components/list/songCard/index.vue | 29 ++++++
.../music/components/list/songInfo/index.vue | 33 +++++++
src/views/ai/music/components/mode/desc.vue | 55 +++++++++++
src/views/ai/music/components/mode/index.vue | 44 +++++++++
src/views/ai/music/components/mode/lyric.vue | 83 ++++++++++++++++
src/views/ai/music/components/title/index.vue | 25 +++++
src/views/ai/music/index.vue | 21 +++++
13 files changed, 428 insertions(+), 14 deletions(-)
create mode 100644 src/views/ai/music/components/list/audioBar/index.vue
create mode 100644 src/views/ai/music/components/list/index.vue
create mode 100644 src/views/ai/music/components/list/songCard/index.vue
create mode 100644 src/views/ai/music/components/list/songInfo/index.vue
create mode 100644 src/views/ai/music/components/mode/desc.vue
create mode 100644 src/views/ai/music/components/mode/index.vue
create mode 100644 src/views/ai/music/components/mode/lyric.vue
create mode 100644 src/views/ai/music/components/title/index.vue
create mode 100644 src/views/ai/music/index.vue
diff --git a/src/components/ContentWrap/src/ContentWrap.vue b/src/components/ContentWrap/src/ContentWrap.vue
index 454e95c9..c75e4b71 100644
--- a/src/components/ContentWrap/src/ContentWrap.vue
+++ b/src/components/ContentWrap/src/ContentWrap.vue
@@ -10,12 +10,13 @@ const prefixCls = getPrefixCls('content-wrap')
defineProps({
title: propTypes.string.def(''),
- message: propTypes.string.def('')
+ message: propTypes.string.def(''),
+ bodyStyle: propTypes.object.def({ padding: '20px' })
})
-
+
+
{{ title }}
@@ -30,8 +31,6 @@ defineProps({
-
+
+
+
+
+
+
+
+
diff --git a/src/views/ai/music/components/list/songCard/index.vue b/src/views/ai/music/components/list/songCard/index.vue
new file mode 100644
index 00000000..dc1ffa8b
--- /dev/null
+++ b/src/views/ai/music/components/list/songCard/index.vue
@@ -0,0 +1,29 @@
+
+
+
+
+
diff --git a/src/views/ai/music/components/list/songInfo/index.vue b/src/views/ai/music/components/list/songInfo/index.vue
new file mode 100644
index 00000000..4832bfcb
--- /dev/null
+++ b/src/views/ai/music/components/list/songInfo/index.vue
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ title }}
+ {{ desc }}
+ {{ date }}
+
+
+ <el-input
+ v-model="formData.desc"
+ :autosize="{ minRows: 6, maxRows: 6}"
+ resize="none"
+ type="textarea"
+ maxlength="1200"
+ show-word-limit
+ placeholder="一首关于糟糕分手的欢快歌曲"
+ />
+
+
+
+ <template #extra>
+ <el-switch v-model="formData.pure" size="small"/>
+ </template>
+
+
+
+ <el-select v-model="formData.version" placeholder="请选择">
+ <el-option
+ v-for="item in [{
+ value: '3',
+ label: 'V3'
+ }, {
+ value: '2',
+ label: 'V2'
+ }]"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+
+
+
+
+
diff --git a/src/views/ai/music/components/mode/index.vue b/src/views/ai/music/components/mode/index.vue
new file mode 100644
index 00000000..bb6cf116
--- /dev/null
+++ b/src/views/ai/music/components/mode/index.vue
@@ -0,0 +1,44 @@
+
+
+
+ <el-input
+ v-model="formData.lyric"
+ :autosize="{ minRows: 6, maxRows: 6}"
+ resize="none"
+ type="textarea"
+ maxlength="1200"
+ show-word-limit
+ placeholder="请输入您自己的歌词"
+ />
+
+
+
+ <el-space class="flex-wrap">
+ <el-tag v-for="tag in tags" :key="tag" round class="mb-8px">{{tag}}</el-tag>
+ </el-space>
+
+ <el-button
+ :type="showCustom ? 'primary': 'default'"
+ round
+ size="small"
+ class="mb-6px"
+ @click="showCustom = !showCustom"
+ >自定义风格
+ </el-button>
+
+
+
+ <el-input
+ v-model="formData.style"
+ :autosize="{ minRows: 4, maxRows: 4}"
+ resize="none"
+ type="textarea"
+ maxlength="256"
+ show-word-limit
+ placeholder="输入音乐风格(英文)"
+ />
+
+
+
+ <el-input v-model="formData.name" placeholder="请输入音乐/歌曲名称"/>
+
+
+
+ <el-select v-model="formData.version" placeholder="请选择">
+ <el-option
+ v-for="item in [{
+ value: '3',
+ label: 'V3'
+ }, {
+ value: '2',
+ label: 'V2'
+ }]"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+
+
+
+
+
diff --git a/src/views/ai/music/components/title/index.vue b/src/views/ai/music/components/title/index.vue
new file mode 100644
index 00000000..a0658027
--- /dev/null
+++ b/src/views/ai/music/components/title/index.vue
@@ -0,0 +1,25 @@
+
+
+
+
+
+
diff --git a/src/views/ai/music/index.vue b/src/views/ai/music/index.vue
new file mode 100644
index 00000000..b48abb6b
--- /dev/null
+++ b/src/views/ai/music/index.vue
@@ -0,0 +1,21 @@
+
+
+ {{title}}
+
+
+ {{desc}}
+
+
+
+
+
+
+
From 14c9e33b60ebaeb921ac0cadac440549e7ce2e35 Mon Sep 17 00:00:00 2001
From: cherishsince
-
-
-
-
-
+
+
+
+
+
Date: Fri, 28 Jun 2024 16:41:12 +0800
Subject: [PATCH 39/86] =?UTF-8?q?=E3=80=90=E8=A7=A3=E5=86=B3todo=E3=80=91?=
=?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=9C=89=E7=94=9F=E6=88=90=E4=B8=AD=E7=9A=84?=
=?UTF-8?q?=E5=9B=BE=E7=89=87=EF=BC=8C=E8=BD=AE=E8=AF=A2=E6=94=B9=E6=88=90?=
=?UTF-8?q?=20get=20=E6=8E=A5=E5=8F=A3=E5=8E=BB=E8=BD=AE=E8=AF=A2=EF=BC=8C?=
=?UTF-8?q?=E4=B8=8D=E5=9F=BA=E4=BA=8E=20page=20=E8=BD=AE=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/ai/image/index.ts | 4 ++++
src/views/ai/image/ImageTask.vue | 35 ++++++++++++++++++++++++++++----
2 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/src/api/ai/image/index.ts b/src/api/ai/image/index.ts
index cb5a5afd..75103182 100644
--- a/src/api/ai/image/index.ts
+++ b/src/api/ai/image/index.ts
@@ -64,6 +64,10 @@ export const ImageApi = {
getImageMy: async (id: number) => {
return await request.get({ url: `/ai/image/get-my?id=${id}` })
},
+ // 获取我的图片
+ getImageMyIds: async (params) => {
+ return await request.get({ url: `/ai/image/get-my-ids`, params})
+ },
// 生成图片
drawImage: async (data: ImageDrawReqVO) => {
return await request.post({ url: `/ai/image/draw`, data })
diff --git a/src/views/ai/image/ImageTask.vue b/src/views/ai/image/ImageTask.vue
index 38bf7483..992120bd 100644
--- a/src/views/ai/image/ImageTask.vue
+++ b/src/views/ai/image/ImageTask.vue
@@ -26,7 +26,7 @@
/>
diff --git a/src/views/mall/promotion/kefu/components/KefuChatBox.vue b/src/views/mall/promotion/kefu/components/KefuChatBox.vue
new file mode 100644
index 00000000..394c8424
--- /dev/null
+++ b/src/views/mall/promotion/kefu/components/KefuChatBox.vue
@@ -0,0 +1,77 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/mall/promotion/kefu/components/constants.ts b/src/views/mall/promotion/kefu/components/constants.ts
new file mode 100644
index 00000000..015b46a7
--- /dev/null
+++ b/src/views/mall/promotion/kefu/components/constants.ts
@@ -0,0 +1,14 @@
+export const KeFuMessageContentTypeEnum = {
+ TEXT: 1, // 文本消息
+ IMAGE: 2, // 图片消息
+ VOICE: 3, // 语音消息
+ VIDEO: 4, // 视频消息
+ SYSTEM: 5, // 系统消息
+ // ========== 商城特殊消息 ==========
+ PRODUCT: 10, // 商品消息
+ ORDER: 11 // 订单消息"
+}
+export const UserTypeEnum = {
+ MEMBER: 1, // 会员 面向 c 端，普通用户
+ ADMIN: 2 // 管理员 面向 b 端，管理后台
+}
diff --git a/src/views/mall/promotion/kefu/components/emoji.ts b/src/views/mall/promotion/kefu/components/emoji.ts
new file mode 100644
index 00000000..6ccd0cff
--- /dev/null
+++ b/src/views/mall/promotion/kefu/components/emoji.ts
@@ -0,0 +1,91 @@
+export const emojiList = [
+ { name: '[笑掉牙]', file: 'xiaodiaoya.png' },
+ { name: '[可爱]', file: 'keai.png' },
+ { name: '[冷酷]', file: 'lengku.png' },
+ { name: '[闭嘴]', file: 'bizui.png' },
+ { name: '[生气]', file: 'shengqi.png' },
+ { name: '[惊恐]', file: 'jingkong.png' },
+ { name: '[瞌睡]', file: 'keshui.png' },
+ { name: '[大笑]', file: 'daxiao.png' },
+ { name: '[爱心]', file: 'aixin.png' },
+ { name: '[坏笑]', file: 'huaixiao.png' },
+ { name: '[飞吻]', file: 'feiwen.png' },
+ { name: '[疑问]', file: 'yiwen.png' },
+ { name: '[开心]', file: 'kaixin.png' },
+ { name: '[发呆]', file: 'fadai.png' },
+ { name: '[流泪]', file: 'liulei.png' },
+ { name: '[汗颜]', file: 'hanyan.png' },
+ { name: '[惊悚]', file: 'jingshu.png' },
+ { name: '[困~]', file: 'kun.png' },
+ { name: '[心碎]', file: 'xinsui.png' },
+ { name: '[天使]', file: 'tianshi.png' },
+ { name: '[晕]', file: 'yun.png' },
+ { name: '[啊]', file: 'a.png' },
+ { name: '[愤怒]', file: 'fennu.png' },
+ { name: '[睡着]', file: 'shuizhuo.png' },
+ { name: '[面无表情]', file: 'mianwubiaoqing.png' },
+ { name: '[难过]', file: 'nanguo.png' },
+ { name: '[犯困]', file: 'fankun.png' },
+ { name: '[好吃]', file: 'haochi.png' },
+ { name: '[呕吐]', file: 'outu.png' },
+ { name: '[龇牙]', file: 'ziya.png' },
+ { name: '[懵比]', file: 'mengbi.png' },
+ { name: '[白眼]', file: 'baiyan.png' },
+ { name: '[饿死]', file: 'esi.png' },
+ { name: '[凶]', file: 'xiong.png' },
+ { name: '[感冒]', file: 'ganmao.png' },
+ { name: '[流汗]', file: 'liuhan.png' },
+ { name: '[笑哭]', file: 'xiaoku.png' },
+ { name: '[流口水]', file: 'liukoushui.png' },
+ { name: '[尴尬]', file: 'ganga.png' },
+ { name: '[惊讶]', file: 'jingya.png' },
+ { name: '[大惊]', file: 'dajing.png' },
+ { name: '[不好意思]', file: 'buhaoyisi.png' },
+ { name: '[大闹]', file: 'danao.png' },
+ { name: '[不可思议]', file: 'bukesiyi.png' },
+ { name: '[爱你]', file: 'aini.png' },
+ { name: '[红心]', file: 'hongxin.png' },
+ { name: '[点赞]', file: 'dianzan.png' },
+ { name: '[恶魔]', file: 'emo.png' }
+]
+
+export const emojiPage = {}
+emojiList.forEach((item, index) => {
+ if (!emojiPage[Math.floor(index / 30) + 1]) {
+ emojiPage[Math.floor(index / 30) + 1] = []
+ }
+ emojiPage[Math.floor(index / 30) + 1].push(item)
+})
+
+// 后端上传地址
+const staticUrl = import.meta.env.VITE_STATIC_URL
+
+// 处理表情
+export function replaceEmoji(data: string) {
+ let newData = data
+ if (typeof newData !== 'object') {
+ const reg = /\[(.+?)\]/g // [] 中括号
+ const zhEmojiName = newData.match(reg)
+ if (zhEmojiName) {
+ zhEmojiName.forEach((item) => {
+ const emojiFile = selEmojiFile(item)
+ newData = newData.replace(
+ item,
+ `
`
+ )
+ })
+ }
+ }
+ return newData
+}
+
+function selEmojiFile(name: string) {
+ for (const index in emojiList) {
+ if (emojiList[index].name === name) {
+ return emojiList[index].file
+ }
+ }
+ return false
+}
diff --git a/src/views/mall/promotion/kefu/components/index.ts b/src/views/mall/promotion/kefu/components/index.ts
new file mode 100644
index 00000000..afd2fd76
--- /dev/null
+++ b/src/views/mall/promotion/kefu/components/index.ts
@@ -0,0 +1,5 @@
+import KeFuConversationBox from './KeFuConversationBox.vue'
+import KeFuChatBox from './KefuChatBox.vue'
+import * as Constants from './constants'
+
+export { KeFuConversationBox, KeFuChatBox, Constants }
diff --git a/src/views/mall/promotion/kefu/index.vue b/src/views/mall/promotion/kefu/index.vue
new file mode 100644
index 00000000..52c6f2ba
--- /dev/null
+++ b/src/views/mall/promotion/kefu/index.vue
@@ -0,0 +1,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/types/env.d.ts b/types/env.d.ts
index 057b5268..63d9c3ee 100644
--- a/types/env.d.ts
+++ b/types/env.d.ts
@@ -19,6 +19,7 @@ interface ImportMetaEnv {
readonly VITE_UPLOAD_URL: string
readonly VITE_API_URL: string
readonly VITE_BASE_PATH: string
+ readonly VITE_STATIC_URL: string
readonly VITE_DROP_DEBUGGER: string
readonly VITE_DROP_CONSOLE: string
readonly VITE_SOURCEMAP: string
From d3b4063b94b159dc8d2256fd11c5fc409e79d7c1 Mon Sep 17 00:00:00 2001
From: puhui999
Date: Mon, 1 Jul 2024 16:15:27 +0800
Subject: [PATCH 46/86] =?UTF-8?q?=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91?=
=?UTF-8?q?=EF=BC=9Amall=20=E5=AE=A2=E6=9C=8D=E6=B6=88=E6=81=AF=E6=A0=B7?=
=?UTF-8?q?=E5=BC=8F=E8=AE=BE=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../mall/promotion/kefu/conversation/index.ts | 2 +-
src/api/mall/promotion/kefu/message/index.ts | 70 ++++++++
.../promotion/kefu/components/KeFuChatBox.vue | 167 ++++++++++++++++++
.../kefu/components/KeFuConversationBox.vue | 8 +-
.../promotion/kefu/components/KefuChatBox.vue | 77 --------
.../promotion/kefu/components/constants.ts | 4 -
.../mall/promotion/kefu/components/index.ts | 2 +-
src/views/mall/promotion/kefu/index.vue | 7 +-
8 files changed, 249 insertions(+), 88 deletions(-)
create mode 100644 src/api/mall/promotion/kefu/message/index.ts
create mode 100644 src/views/mall/promotion/kefu/components/KeFuChatBox.vue
delete mode 100644 src/views/mall/promotion/kefu/components/KefuChatBox.vue
diff --git a/src/api/mall/promotion/kefu/conversation/index.ts b/src/api/mall/promotion/kefu/conversation/index.ts
index 17432b35..96a23706 100644
--- a/src/api/mall/promotion/kefu/conversation/index.ts
+++ b/src/api/mall/promotion/kefu/conversation/index.ts
@@ -16,7 +16,7 @@ export interface KeFuConversationRespVO {
/**
* 会话所属用户昵称
*/
- nickname: string
+ userNickname: string
/**
* 最后聊天时间
*/
diff --git a/src/api/mall/promotion/kefu/message/index.ts b/src/api/mall/promotion/kefu/message/index.ts
new file mode 100644
index 00000000..3408f1e0
--- /dev/null
+++ b/src/api/mall/promotion/kefu/message/index.ts
@@ -0,0 +1,70 @@
+import request from '@/config/axios'
+
+export interface KeFuMessageRespVO {
+ /**
+ * 编号
+ */
+ id: number
+ /**
+ * 会话编号
+ */
+ conversationId: number
+ /**
+ * 发送人编号
+ */
+ senderId: number
+ /**
+ * 发送人头像
+ */
+ senderAvatar: string
+ /**
+ * 发送人类型
+ */
+ senderType: number
+ /**
+ * 接收人编号
+ */
+ receiverId: number
+ /**
+ * 接收人类型
+ */
+ receiverType: number
+ /**
+ * 消息类型
+ */
+ contentType: number
+ /**
+ * 消息
+ */
+ content: string
+ /**
+ * 是否已读
+ */
+ readStatus: boolean
+ /**
+ * 创建时间
+ */
+ createTime: Date
+}
+
+// 客服会话 API
+export const KeFuMessageApi = {
+ // 发送客服消息
+ sendKeFuMessage: async (data: any) => {
+ return await request.put({
+ url: '/promotion/kefu-message/send',
+ data
+ })
+ },
+ // 更新客服消息已读状态
+ updateKeFuMessageReadStatus: async (data: any) => {
+ return await request.put({
+ url: '/promotion/kefu-message/update-read-status',
+ data
+ })
+ },
+ // 获得消息分页数据
+ getKeFuMessagePage: async (params: any) => {
+ return await request.get({ url: '/promotion/kefu-message/page', params })
+ }
+}
diff --git a/src/views/mall/promotion/kefu/components/KeFuChatBox.vue b/src/views/mall/promotion/kefu/components/KeFuChatBox.vue
new file mode 100644
index 00000000..ee41564b
--- /dev/null
+++ b/src/views/mall/promotion/kefu/components/KeFuChatBox.vue
@@ -0,0 +1,167 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/mall/promotion/kefu/components/KeFuConversationBox.vue b/src/views/mall/promotion/kefu/components/KeFuConversationBox.vue
index c94c01c3..595475be 100644
--- a/src/views/mall/promotion/kefu/components/KeFuConversationBox.vue
+++ b/src/views/mall/promotion/kefu/components/KeFuConversationBox.vue
@@ -10,7 +10,7 @@
Date: Sun, 7 Jul 2024 11:22:02 +0800
Subject: [PATCH 84/86] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E4=BC=98?=
=?UTF-8?q?=E5=8C=96=E3=80=91AI=EF=BC=9A=E6=8E=A5=E5=85=A5=E6=9B=B4?=
=?UTF-8?q?=E5=A4=9A=20AI=20=E5=A4=A7=E6=A8=A1=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/ai/utils/constants.ts | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/views/ai/utils/constants.ts b/src/views/ai/utils/constants.ts
index 2e7b9ac5..337cfda3 100644
--- a/src/views/ai/utils/constants.ts
+++ b/src/views/ai/utils/constants.ts
@@ -11,12 +11,13 @@
* AI 平台的枚举
*/
export const AiPlatformEnum = {
+ TONG_YI: 'TongYi', // 阿里
+ YI_YAN: 'YiYan', // 百度
+ DEEP_SEEK: 'DeepSeek', // DeepSeek
+ ZHI_PU: 'ZhiPu', // 智谱 AI
+ XING_HUO: 'XingHuo', // 讯飞
OPENAI: 'OpenAI',
Ollama: 'Ollama',
- YI_YAN: 'YiYan', // 百度
- XING_HUO: 'XingHuo', // 讯飞
- QIAN_WEN: 'QianWen', // 阿里
- GEMIR: 'gemir', // 谷歌
STABLE_DIFFUSION: 'StableDiffusion', // Stability AI
MIDJOURNEY: 'Midjourney', // Midjourney
SUNO: 'Suno' // Suno AI
From 2871961582634a5627922f81e8908274a6a2397f Mon Sep 17 00:00:00 2001
From: YunaiV
Date: Sun, 7 Jul 2024 11:23:27 +0800
Subject: [PATCH 85/86] docs: update README
---
README.md | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/README.md b/README.md
index 738fc6d1..f69861f0 100644
--- a/README.md
+++ b/README.md
@@ -54,16 +54,16 @@
推荐 VS Code 开发，配合插件如下：
-| 插件名 | 功能 |
-|-------------------------------|--------------------------|
-| Vue - Official | Vue与TypeScript支持 |
-| unocss | unocss for vscode |
-| Iconify IntelliSense | Iconify 预览和搜索 |
-| i18n Ally | 国际化智能提示 |
-| Stylelint | Css 格式化 |
-| Prettier | 代码格式化 |
-| ESLint | 脚本代码检查 |
-| DotENV | env 文件高亮 |
+| 插件名 | 功能 |
+|-------------------------------|---------------------|
+| Vue - Official | Vue 与 TypeScript 支持 |
+| unocss | unocss for vscode |
+| Iconify IntelliSense | Iconify 预览和搜索 |
+| i18n Ally | 国际化智能提示 |
+| Stylelint | Css 格式化 |
+| Prettier | 代码格式化 |
+| ESLint | 脚本代码检查 |
+| DotENV | env 文件高亮 |
## 🔥 后端架构
From f3777f63348fbaaea21ae5c311a64b3d0b88e843 Mon Sep 17 00:00:00 2001
From: YunaiV
Date: Sun, 7 Jul 2024 17:22:16 +0800
Subject: [PATCH 86/86] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E4=BC=98?=
=?UTF-8?q?=E5=8C=96=E3=80=91AI=EF=BC=9A=E5=B0=86=E5=AF=B9=E8=AF=9D?=
=?UTF-8?q?=E3=80=81=E8=81=8A=E5=A4=A9=E6=8C=AA=E5=88=B0=20index=20?=
=?UTF-8?q?=E7=9B=AE=E5=BD=95=E4=B8=8B=EF=BC=8C=E6=9B=B4=E6=A8=A1=E5=9D=97?=
=?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/ai/chat/{ => index}/ChatEmpty.vue | 0
.../ai/chat/{ => index}/Conversation.vue | 2 +-
src/views/ai/chat/{ => index}/Message.vue | 0
.../ai/chat/{ => index}/MessageLoading.vue | 0
.../ai/chat/{ => index}/MessageNewChat.vue | 0
.../components/ChatConversationUpdateForm.vue | 0
.../ai/chat/{ => index}/components/Header.vue | 0
src/views/ai/chat/{ => index}/index.vue | 2 +-
.../{ => index}/role/RoleCategoryList.vue | 0
.../ai/chat/{ => index}/role/RoleList.vue | 0
src/views/ai/chat/{ => index}/role/index.vue | 2 +-
.../image/{ => index}/ImageDetailDrawer.vue | 0
src/views/ai/image/{ => index}/ImageTask.vue | 0
.../ai/image/{ => index}/ImageTaskCard.vue | 0
.../ai/image/{ => index}/dall3/index.vue | 0
src/views/ai/image/{ => index}/index.vue | 0
.../ai/image/{ => index}/midjourney/index.vue | 0
.../{ => index}/stable-diffusion/index.vue | 33 ++++++++++++++-----
.../ai/utils/{common-utils.ts => utils.ts} | 0
19 files changed, 27 insertions(+), 12 deletions(-)
rename src/views/ai/chat/{ => index}/ChatEmpty.vue (100%)
rename src/views/ai/chat/{ => index}/Conversation.vue (99%)
rename src/views/ai/chat/{ => index}/Message.vue (100%)
rename src/views/ai/chat/{ => index}/MessageLoading.vue (100%)
rename src/views/ai/chat/{ => index}/MessageNewChat.vue (100%)
rename src/views/ai/chat/{ => index}/components/ChatConversationUpdateForm.vue (100%)
rename src/views/ai/chat/{ => index}/components/Header.vue (100%)
rename src/views/ai/chat/{ => index}/index.vue (99%)
rename src/views/ai/chat/{ => index}/role/RoleCategoryList.vue (100%)
rename src/views/ai/chat/{ => index}/role/RoleList.vue (100%)
rename src/views/ai/chat/{ => index}/role/index.vue (99%)
rename src/views/ai/image/{ => index}/ImageDetailDrawer.vue (100%)
rename src/views/ai/image/{ => index}/ImageTask.vue (100%)
rename src/views/ai/image/{ => index}/ImageTaskCard.vue (100%)
rename src/views/ai/image/{ => index}/dall3/index.vue (100%)
rename src/views/ai/image/{ => index}/index.vue (100%)
rename src/views/ai/image/{ => index}/midjourney/index.vue (100%)
rename src/views/ai/image/{ => index}/stable-diffusion/index.vue (93%)
rename src/views/ai/utils/{common-utils.ts => utils.ts} (100%)
diff --git a/src/views/ai/chat/ChatEmpty.vue b/src/views/ai/chat/index/ChatEmpty.vue
similarity index 100%
rename from src/views/ai/chat/ChatEmpty.vue
rename to src/views/ai/chat/index/ChatEmpty.vue
diff --git a/src/views/ai/chat/Conversation.vue b/src/views/ai/chat/index/Conversation.vue
similarity index 99%
rename from src/views/ai/chat/Conversation.vue
rename to src/views/ai/chat/index/Conversation.vue
index 5976171b..be184cf8 100644
--- a/src/views/ai/chat/Conversation.vue
+++ b/src/views/ai/chat/index/Conversation.vue
@@ -98,7 +98,7 @@
时间
-
提交时间：{{imageDetail.createTime}}
+ 提交时间：{{ imageDetail.createTime }}
- 生成时间：{{imageDetail.updateTime}}
+ 生成时间：{{ imageDetail.updateTime }}
模型
- {{imageDetail.model}}({{imageDetail.height}}x{{imageDetail.width}})
+ {{ imageDetail.model }}({{ imageDetail.height }}x{{ imageDetail.width }})
提示词
- {{imageDetail.prompt}}
+ {{ imageDetail.prompt }}
图片地址
- {{imageDetail.picUrl}}
+ {{ imageDetail.picUrl }}
- {{imageDetail?.options?.style}}
+ {{ imageDetail?.options?.style }}
芋道
+
+
+ Lorem Ipsum，也称乱数假文或者哑元文本
+
+
+
+
+
+ 发送
+
+ `
+ )
+ })
+ }
+ }
+ return newData
+}
+
+function selEmojiFile(name: string) {
+ for (const index in emojiList) {
+ if (emojiList[index].name === name) {
+ return emojiList[index].file
+ }
+ }
+ return false
+}
diff --git a/src/views/mall/promotion/kefu/components/index.ts b/src/views/mall/promotion/kefu/components/index.ts
new file mode 100644
index 00000000..afd2fd76
--- /dev/null
+++ b/src/views/mall/promotion/kefu/components/index.ts
@@ -0,0 +1,5 @@
+import KeFuConversationBox from './KeFuConversationBox.vue'
+import KeFuChatBox from './KefuChatBox.vue'
+import * as Constants from './constants'
+
+export { KeFuConversationBox, KeFuChatBox, Constants }
diff --git a/src/views/mall/promotion/kefu/index.vue b/src/views/mall/promotion/kefu/index.vue
new file mode 100644
index 00000000..52c6f2ba
--- /dev/null
+++ b/src/views/mall/promotion/kefu/index.vue
@@ -0,0 +1,55 @@
+
+ {{ keFuConversation.userNickname }}
+
+
+
+
+
+
+
+ 发送
+
+
-
@@ -64,7 +64,7 @@
{{ item.nickname }}
+ {{ item.userNickname }}
@@ -16,7 +16,7 @@
layout="prev, pager, next"
:default-page-size="pageSize"
:total="pageTotal"
- @change="handlerPageChange"
+ @change="handlePageChange"
/>
@@ -24,7 +24,7 @@
{{model.name}}
{{imageStyle.name}}
+ @click="handleSizeClick(imageSize)">
@@ -91,7 +91,7 @@
size="large"
round
:loading="drawIn"
- @click="handlerGenerateImage">
+ @click="handleGenerateImage">
{{drawIn ? '生成中' : '生成内容'}}
@@ -183,10 +183,8 @@ const props = defineProps({})
// 定义 emits
const emits = defineEmits(['onDrawStart', 'onDrawComplete'])
-// TODO @fan：如果是简单注释，建议用 /** */，主要是现在项目里是这种风格哈，保持一致好点~
-// TODO @fan：handler 应该改成 handle 哈
/** 热词 - click */
-const handlerHotWordClick = async (hotWord: string) => {
+const handleHotWordClick = async (hotWord: string) => {
// 取消选中
if (selectHotWord.value == hotWord) {
selectHotWord.value = ''
@@ -199,22 +197,22 @@ const handlerHotWordClick = async (hotWord: string) => {
}
/** 模型 - click */
-const handlerModelClick = async (model: ImageModelVO) => {
+const handleModelClick = async (model: ImageModelVO) => {
selectModel.value = model.key
}
/** 样式 - click */
-const handlerStyleClick = async (imageStyle: ImageModelVO) => {
+const handleStyleClick = async (imageStyle: ImageModelVO) => {
selectImageStyle.value = imageStyle.key
}
/** size - click */
-const handlerSizeClick = async (imageSize: ImageSizeVO) => {
+const handleSizeClick = async (imageSize: ImageSizeVO) => {
selectImageSize.value = imageSize.key
}
/** 图片生产 */
-const handlerGenerateImage = async () => {
+const handleGenerateImage = async () => {
// 二次确认
await message.confirm(`确认生成内容?`)
try {
@@ -251,15 +249,14 @@ const settingValues = async (imageDetail: ImageVO) => {
selectImageStyle.value = imageDetail.options?.style
//
const imageSize = imageSizeList.value.find(item => item.key === `${imageDetail.width}x${imageDetail.height}`) as ImageSizeVO
- console.log('imageSize', imageSize)
- await handlerSizeClick(imageSize)
+ await handleSizeClick(imageSize)
}
/** 暴露组件方法 */
defineExpose({ settingValues })
+
From f70c8dcee2d95ca9cde2f0458e1329858581f7ce Mon Sep 17 00:00:00 2001
From: downeyin <853384781@qq.com>
Date: Sat, 6 Jul 2024 23:12:40 +0800
Subject: [PATCH 83/86] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DCRM=E5=90=88?=
=?UTF-8?q?=E5=90=8C=E8=AF=A6=E6=83=85=E4=B8=AD=E5=9B=A2=E9=98=9F=E6=88=90?=
=?UTF-8?q?=E5=91=98=E6=9C=AA=E5=B1=95=E7=A4=BA=E6=9D=83=E9=99=90=E7=BC=96?=
=?UTF-8?q?=E8=BE=91=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/crm/contract/detail/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/crm/contract/detail/index.vue b/src/views/crm/contract/detail/index.vue
index 0829e100..1369a355 100644
--- a/src/views/crm/contract/detail/index.vue
+++ b/src/views/crm/contract/detail/index.vue
@@ -36,7 +36,7 @@
ref="permissionListRef"
:biz-id="contract.id!"
:biz-type="BizTypeEnum.CRM_CONTRACT"
- :show-action="false"
+ :show-action="!permissionListRef?.isPool || false"
@quit-team="close"
/>
From 6f86ea96da367ab3b25fe04dc74ef9cdd8df9454 Mon Sep 17 00:00:00 2001
From: YunaiV