Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/views/ai/image/ImageTask.vue

src/api/ai/image/index.ts

 import request from '@/config/axios'
 
 // AI API 密钥 VO
-// TODO @fan：要不前端不弄太多 VO，就用这个 ImageDetailVO？！
-export interface ImageDetailVO {
+export interface ImageRespVO {
   id: number // 编号
+  platform: string // 平台
+  model: string // 模型
   prompt: string // 提示词
+  width: number // 图片宽度
+  height: number // 图片高度
   status: number // 状态
-  errorMessage: string // 错误信息
-  type: string // 模型下分不同的类型(清晰、真实...)
-  taskId: number // dr 任务id
+  publicStatus: boolean // 公开状态
   picUrl: string // 任务地址
-  originalPicUrl: string // 绘制图片地址
-  platform: string // 平台
-  model: string // 模型
-  style: string // 图像生成的风格
-  size: string // 图片尺寸
+  errorMessage: string // 错误信息
+  options: object // 配置 Map<string, string>
+  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,68 @@ 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) => {
-    return await request.get({ url: `/ai/image/get-my?id=${id}`})
+  // 获取我的图片
+  getImageMy: async (id: number) => {
+    return await request.get({ url: `/ai/image/get-my?id=${id}` })
   },
   // 生成图片
-  drawImage: async (data: ImageDrawReqVO)=> {
+  drawImage: async (data: ImageDrawReqVO) => {
     return await request.post({ url: `/ai/image/draw`, data })
   },
-  // 删除
-  deleteImage: async (id: number)=> {
-    return await request.delete({ url: `/ai/image/delete-my?id=${id}`})
+  // 删除我的图片
+  deleteImageMy: async (id: number) => {
+    return await request.delete({ url: `/ai/image/delete-my?id=${id}` })
   },
 
-  // ------------ midjourney
+  // ================ midjourney 专属 ================
 
-  // midjourney - imagine
-  midjourneyImagine: async (data: ImageMidjourneyImagineReqVO)=> {
+  // 【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 })
+  },
+
+  // ================ 绘图管理 ================
+
+  // 查询绘画分页
+  getImagePage: async (params: any) => {
+    return await request.get({ url: `/ai/image/page`, params })
   },
+
+  // 更新绘画发布状态
+  updateImagePublicStatus: async (id: number, publicStatus: boolean) => {
+    return await request.put({
+      url: '/ai/image/update-public-status',
+      data: {
+        id,
+        publicStatus
+      }
+    })
+  },
+
+  // 删除绘画
+  deleteImage: async (id: number) => {
+    return await request.delete({ url: `/ai/image/delete?id=` + id })
+  }
 }

src/utils/dict.ts

@@ -219,5 +219,6 @@ export enum DICT_TYPE {
   ERP_STOCK_RECORD_BIZ_TYPE = 'erp_stock_record_biz_type', // 库存明细的业务类型
 
   // ========== AI - 人工智能模块  ==========
-  AI_PLATFORM = 'ai_platform' // AI 平台
+  AI_PLATFORM = 'ai_platform', // AI 平台
+  AI_IMAGE_STATUS = 'ai_image_status', // AI 图片状态
 }

src/views/ai/chat/manager/index.vue

@@ -16,5 +16,5 @@ import ChatConversationList from './ChatConversationList.vue'
 import ChatMessageList from './ChatMessageList.vue'
 
 /** AI 聊天对话 列表 */
-defineOptions({ name: 'ChatConversation' })
+defineOptions({ name: 'AiChatManager' })
 </script>

src/views/ai/image/ImageDetailDrawer.vue

@@ -60,11 +60,11 @@
 </template>
 
 <script setup lang="ts">
-import {ImageApi, ImageDetailVO} from '@/api/ai/image';
+import {ImageApi, ImageRespVO} from '@/api/ai/image';
 import ImageTaskCard from './ImageTaskCard.vue';
 
 const showDrawer = ref<boolean>(false) // 是否显示
-const imageDetail = ref<ImageDetailVO>({} as ImageDetailVO) // 图片详细信息
+const imageDetail = ref<ImageRespVO>({} as ImageRespVO) // 图片详细信息
 
 const props = defineProps({
   show: {
@@ -86,7 +86,7 @@ const handlerDrawerClose = async () => {
 /**  获取 - 图片 detail  */
 const getImageDetail = async (id) => {
   // 获取图片详细
-  imageDetail.value = await ImageApi.getImageDetail(id)
+  imageDetail.value = await ImageApi.getImageMy(id)
 }
 
 /**  任务 - detail  */

src/views/ai/image/ImageTask.vue

@@ -26,15 +26,15 @@
   />
 </template>
 <script setup lang="ts">
-import {ImageApi, ImageDetailVO, ImageMjActionVO, ImageMjButtonsVO} from '@/api/ai/image';
+import {ImageApi, ImageRespVO, ImageMjActionVO, ImageMjButtonsVO} from '@/api/ai/image';
 import ImageDetailDrawer from './ImageDetailDrawer.vue'
 import ImageTaskCard from './ImageTaskCard.vue'
 import {ElLoading, LoadingOptionsResolved} from "element-plus";
 
 const message = useMessage() // 消息弹窗
 
-const imageList = ref<ImageDetailVO[]>([]) // image 列表
-const watchImageList = ref<ImageDetailVO[]>([]) // 监听的 image list，一般是生成中，需要轮训
+const imageList = ref<ImageRespVO[]>([]) // image 列表
+const watchImageList = ref<ImageRespVO[]>([]) // 监听的 image list，一般是生成中，需要轮训
 const imageListInterval = ref<any>() // image 列表定时器，刷新列表
 const isShowImageDetail = ref<boolean>(false) // 是否显示 task 详情
 const showImageDetailId = ref<number>(0) // 是否显示 task 详情
@@ -65,7 +65,7 @@ const getImageList = async (apply:boolean = false) => {
       target: imageTaskRef.value,
       text: '加载中...'
     } as LoadingOptionsResolved)
-    const { list, total } = await ImageApi.getImageList({pageNo: pageNo.value, pageSize: pageSize.value})
+    const { list, total } = await ImageApi.getImagePageMy({pageNo: pageNo.value, pageSize: pageSize.value})
     if (apply) {
       imageList.value = [...imageList.value, ...list]
     } else {
@@ -81,7 +81,7 @@ const getImageList = async (apply:boolean = false) => {
 }
 
 /**  图片 - btn click  */
-const handlerImageBtnClick = async (type, imageDetail: ImageDetailVO) => {
+const handlerImageBtnClick = async (type, imageDetail: ImageRespVO) => {
   // 获取 image detail id
   showImageDetailId.value = imageDetail.id
   // 处理不用 btn
@@ -89,7 +89,7 @@ const handlerImageBtnClick = async (type, imageDetail: ImageDetailVO) => {
     await handlerDrawerOpen()
   } else if (type === 'delete') {
     await message.confirm(`是否删除照片?`)
-    await ImageApi.deleteImage(imageDetail.id)
+    await ImageApi.deleteImageMy(imageDetail.id)
     await getImageList()
     await message.success("删除成功!")
   } else if (type === 'download') {
@@ -98,14 +98,14 @@ const handlerImageBtnClick = async (type, imageDetail: ImageDetailVO) => {
 }
 
 /**  图片 - mj btn click  */
-const handlerImageMjBtnClick = async (button: ImageMjButtonsVO, imageDetail: ImageDetailVO) => {
+const handlerImageMjBtnClick = async (button: ImageMjButtonsVO, imageDetail: ImageRespVO) => {
   // 1、构建 params 参数
-  const params = {
+  const data = {
     id: imageDetail.id,
     customId: button.customId,
   } as ImageMjActionVO
   // 2、发送 action
-  await ImageApi.midjourneyAction(params)
+  await ImageApi.midjourneyAction(data)
   // 3、刷新列表
   await getImageList()
 }

src/views/ai/image/ImageTaskCard.vue

@@ -32,7 +32,7 @@
 </template>
 <script setup lang="ts">
 import {Delete, Download, More} from "@element-plus/icons-vue";
-import {ImageDetailVO, ImageMjButtonsVO} from "@/api/ai/image";
+import {ImageRespVO, ImageMjButtonsVO} from "@/api/ai/image";
 import {PropType} from "vue";
 import {ElLoading, ElMessageBox} from "element-plus";
 
@@ -41,13 +41,13 @@ const cardImageLoadingInstance = ref<any>() // 卡片 image ref
 const message = useMessage()
 const props = defineProps({
   imageDetail: {
-    type: Object as PropType<ImageDetailVO>,
+    type: Object as PropType<ImageRespVO>,
     require: true
   }
 })
 
 /**  按钮 - 点击事件  */
-const handlerBtnClick = async (type, imageDetail: ImageDetailVO) => {
+const handlerBtnClick = async (type, imageDetail: ImageRespVO) => {
   emits('onBtnClick', type, imageDetail)
 }
 

src/views/ai/image/manager/index.vue

+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="用户编号" prop="userId">
+        <el-select
+          v-model="queryParams.userId"
+          clearable
+          placeholder="请输入用户编号"
+          class="!w-240px"
+        >
+          <el-option
+            v-for="item in userList"
+            :key="item.id"
+            :label="item.nickname"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="平台" prop="platform">
+        <el-select v-model="queryParams.status" placeholder="请选择平台" clearable class="!w-240px">
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.AI_PLATFORM)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="绘画状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择绘画状态"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.AI_IMAGE_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="是否发布" prop="publicStatus">
+        <el-select
+          v-model="queryParams.publicStatus"
+          placeholder="请选择是否发布"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-220px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="编号" align="center" prop="id" width="180" fixed="left" />
+      <el-table-column label="图片" align="center" prop="picUrl" width="110px" fixed="left">
+        <template #default="{ row }">
+          <el-image
+            class="h-80px w-80px"
+            lazy
+            :src="row.picUrl"
+            :preview-src-list="[row.picUrl]"
+            preview-teleported
+            fit="cover"
+            v-if="row.picUrl?.length > 0"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column label="用户" align="center" prop="userId" width="180">
+        <template #default="scope">
+          <span>{{ userList.find((item) => item.id === scope.row.userId)?.nickname }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="平台" align="center" prop="platform" width="120">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.AI_PLATFORM" :value="scope.row.platform" />
+        </template>
+      </el-table-column>
+      <el-table-column label="模型" align="center" prop="model" width="180" />
+      <el-table-column label="绘画状态" align="center" prop="status" width="100">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.AI_IMAGE_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="是否发布" align="center" prop="publicStatus">
+        <template #default="scope">
+          <el-switch
+            v-model="scope.row.publicStatus"
+            :active-value="true"
+            :inactive-value="false"
+            @change="handleUpdatePublicStatusChange(scope.row)"
+            :disabled="scope.row.status !== 20"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column label="提示词" align="center" prop="prompt" width="180" />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="宽度" align="center" prop="width" />
+      <el-table-column label="高度" align="center" prop="height" />
+      <el-table-column label="错误信息" align="center" prop="errorMessage" />
+      <el-table-column label="任务编号" align="center" prop="taskId" />
+      <el-table-column label="操作" align="center" width="100" fixed="right">
+        <template #default="scope">
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['ai:image:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+</template>
+
+<script setup lang="ts">
+import { getIntDictOptions, DICT_TYPE, getStrDictOptions, getBoolDictOptions } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import { ImageApi, ImageRespVO } from '@/api/ai/image'
+import * as UserApi from '@/api/system/user'
+
+/** AI 绘画 列表 */
+defineOptions({ name: 'AiImageManager' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<ImageRespVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  userId: undefined,
+  platform: undefined,
+  status: undefined,
+  publicStatus: undefined,
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+const userList = ref<UserApi.UserVO[]>([]) // 用户列表
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await ImageApi.getImagePage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ImageApi.deleteImage(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 修改是否发布 */
+const handleUpdatePublicStatusChange = async (row: ImageRespVO) => {
+  try {
+    // 修改状态的二次确认
+    const text = row.publicStatus ? '公开' : '私有'
+    await message.confirm('确认要"' + text + '"该图片吗?')
+    // 发起修改状态
+    await ImageApi.updateImagePublicStatus(row.id, row.publicStatus)
+    await getList()
+  } catch {
+    row.publicStatus = !row.publicStatus
+  }
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  // 获得用户列表
+  userList.value = await UserApi.getSimpleUserList()
+})
+</script>

src/views/ai/image/midjourney/index.vue

@@ -170,7 +170,6 @@ const imageSizeList = ref<ImageSizeVO[]>([
 ]) // size
 selectImageSize.value = imageSizeList.value[0]
 
-
 // version
 let versionList = ref<any>([]) // version 列表
 const midjourneyVersionList = ref<any>([
@@ -204,9 +203,6 @@ const nijiVersionList = ref<any>([
 const selectVersion = ref<any>('6.0') // 选中的 version
 versionList.value = midjourneyVersionList.value // 默认选择 midjourney
 
-// 定义 Props
-const props = defineProps({})
-
 /**  热词 - click  */
 const handlerHotWordClick = async (hotWord: string) => {
   // 取消