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

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

src/views/ai/image/ImageDetailDrawer.vue

@@ -7,11 +7,11 @@
   >
     <!-- 图片 -->
     <div class="item">
-<!--      <div class="header">-->
-<!--        <div>图片</div>-->
-<!--        <div>-->
-<!--        </div>-->
-<!--      </div>-->
+      <!--      <div class="header">-->
+      <!--        <div>图片</div>-->
+      <!--        <div>-->
+      <!--        </div>-->
+      <!--      </div>-->
       <div class="body">
         <!-- TODO @fan: 要不，这里只展示图片？？？不用 ImageTaskCard -->
         <ImageTaskCard :image-detail="imageDetail" />
@@ -21,30 +21,30 @@
     <div class="item">
       <div class="tip">时间</div>
       <div class="body">
-        <div>提交时间：{{imageDetail.createTime}}</div>
+        <div>提交时间：{{ imageDetail.createTime }}</div>
         <!-- TODO @fan：要不加个完成时间的字段 finishTime？updateTime 不算特别合理哈 -->
-        <div>生成时间：{{imageDetail.updateTime}}</div>
+        <div>生成时间：{{ imageDetail.updateTime }}</div>
       </div>
     </div>
     <!--  模型  -->
     <div class="item">
       <div class="tip">模型</div>
       <div class="body">
-        {{imageDetail.model}}({{imageDetail.height}}x{{imageDetail.width}})
+        {{ imageDetail.model }}({{ imageDetail.height }}x{{ imageDetail.width }})
       </div>
     </div>
     <!--  提示词  -->
     <div class="item">
       <div class="tip">提示词</div>
       <div class="body">
-        {{imageDetail.prompt}}
+        {{ imageDetail.prompt }}
       </div>
     </div>
     <!--  地址  -->
     <div class="item">
       <div class="tip">图片地址</div>
       <div class="body">
-        {{imageDetail.picUrl}}
+        {{ imageDetail.picUrl }}
       </div>
     </div>
     <!-- 风格 -->
@@ -53,18 +53,18 @@
       <div class="body">
         <!-- TODO @fan：貌似需要把 imageStyleList 搞到 api/image/index.ts 枚举起来？ -->
         <!-- TODO @fan：这里的展示，可能需要按照平台做区分 -->
-        {{imageDetail?.options?.style}}
+        {{ imageDetail?.options?.style }}
       </div>
     </div>
   </el-drawer>
 </template>
 
 <script setup lang="ts">
-import {ImageApi, ImageRespVO} from '@/api/ai/image';
-import ImageTaskCard from './ImageTaskCard.vue';
+import { ImageApi, ImageVO } from '@/api/ai/image'
+import ImageTaskCard from './ImageTaskCard.vue'
 
 const showDrawer = ref<boolean>(false) // 是否显示
-const imageDetail = ref<ImageRespVO>({} as ImageRespVO) // 图片详细信息
+const imageDetail = ref<ImageVO>({} as ImageVO) // 图片详细信息
 
 const props = defineProps({
   show: {
@@ -109,12 +109,9 @@ watch(id, async (newVal, oldVal) => {
 //
 const emits = defineEmits(['handlerDrawerClose'])
 //
-onMounted(async () => {
-
-})
+onMounted(async () => {})
 </script>
 <style scoped lang="scss">
-
 .item {
   margin-bottom: 20px;
   width: 100%;
@@ -136,7 +133,6 @@ onMounted(async () => {
     margin-top: 10px;
     color: #616161;
 
-
     .taskImage {
       border-radius: 10px;
     }

src/views/ai/image/ImageTask.vue

@@ -6,15 +6,17 @@
         v-for="image in imageList"
         :key="image"
         :image-detail="image"
-
         @on-btn-click="handlerImageBtnClick"
-        @on-mj-btn-click="handlerImageMjBtnClick"/>
+        @on-mj-btn-click="handlerImageMjBtnClick"
+      />
     </div>
     <div class="task-image-pagination">
-      <el-pagination background layout="prev, pager, next"
-                     :default-page-size="pageSize"
-                     :total="pageTotal"
-                     @change="handlerPageChange"
+      <el-pagination
+        background
+        layout="prev, pager, next"
+        :default-page-size="pageSize"
+        :total="pageTotal"
+        @change="handlerPageChange"
       />
     </div>
   </el-card>
@@ -26,14 +28,14 @@
   />
 </template>
 <script setup lang="ts">
-import {ImageApi, ImageMjActionVO, ImageMjButtonsVO, ImageRespVO} from '@/api/ai/image';
+import { ImageApi, ImageVO, ImageMjActionVO, ImageMjButtonsVO } from '@/api/ai/image'
 import ImageDetailDrawer from './ImageDetailDrawer.vue'
 import ImageTaskCard from './ImageTaskCard.vue'
-import {ElLoading, LoadingOptionsResolved} from "element-plus";
+import { ElLoading, LoadingOptionsResolved } from 'element-plus'
 
 const message = useMessage() // 消息弹窗
 
-const imageList = ref<ImageRespVO[]>([]) // image 列表
+const imageList = ref<ImageVO[]>([]) // image 列表
 const watchImages = ref<{}>({}) // 监听的 image list，一般是生成中，需要轮训
 const imageListInterval = ref<any>() // image 列表定时器，刷新列表
 const isShowImageDetail = ref<boolean>(false) // 是否显示 task 详情
@@ -58,14 +60,17 @@ const handlerDrawerOpen = async () => {
 /**
  * 获取 - image 列表
  */
-const getImageList = async (apply:boolean = false) => {
+const getImageList = async (apply: boolean = false) => {
   imageTaskLoading.value = true
   try {
     imageTaskLoadingInstance.value = ElLoading.service({
       target: imageTaskRef.value,
       text: '加载中...'
     } as LoadingOptionsResolved)
-    const { list, total } = await ImageApi.getImagePageMy({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,8 +86,8 @@ const getImageList = async (apply:boolean = false) => {
 
   } finally {
     if (imageTaskLoadingInstance.value) {
-      imageTaskLoadingInstance.value.close();
-      imageTaskLoadingInstance.value = null;
+      imageTaskLoadingInstance.value.close()
+      imageTaskLoadingInstance.value = null
     }
   }
 }
@@ -108,7 +113,7 @@ const refreshWatchImages = async () => {
 }
 
 /**  图片 - btn click  */
-const handlerImageBtnClick = async (type, imageDetail: ImageRespVO) => {
+const handlerImageBtnClick = async (type, imageDetail: ImageVO) => {
   // 获取 image detail id
   showImageDetailId.value = imageDetail.id
   // 处理不用 btn
@@ -118,18 +123,18 @@ const handlerImageBtnClick = async (type, imageDetail: ImageRespVO) => {
     await message.confirm(`是否删除照片?`)
     await ImageApi.deleteImageMy(imageDetail.id)
     await getImageList()
-    await message.success("删除成功!")
+    await message.success('删除成功!')
   } else if (type === 'download') {
     await downloadImage(imageDetail.picUrl)
   }
 }
 
 /**  图片 - mj btn click  */
-const handlerImageMjBtnClick = async (button: ImageMjButtonsVO, imageDetail: ImageRespVO) => {
+const handlerImageMjBtnClick = async (button: ImageMjButtonsVO, imageDetail: ImageVO) => {
   // 1、构建 params 参数
   const data = {
     id: imageDetail.id,
-    customId: button.customId,
+    customId: button.customId
   } as ImageMjActionVO
   // 2、发送 action
   await ImageApi.midjourneyAction(data)
@@ -164,7 +169,7 @@ const handlerPageChange = async (page) => {
 }
 
 /** 暴露组件方法 */
-defineExpose({getImageList})
+defineExpose({ getImageList })
 
 /** 组件挂在的时候 */
 onMounted(async () => {
@@ -204,11 +209,11 @@ onUnmounted(async () => {
   padding-bottom: 140px;
   box-sizing: border-box; /* 确保内边距不会增加高度 */
 
-  >div {
+  > div {
     margin-right: 20px;
     margin-bottom: 20px;
   }
-  >div:last-of-type {
+  > div:last-of-type {
     //margin-bottom: 100px;
   }
 }
@@ -226,7 +231,6 @@ onUnmounted(async () => {
   justify-content: center;
   align-items: center;
 }
-
 </style>
 
 <style scoped lang="scss">

src/views/ai/image/ImageTaskCard.vue

@@ -8,22 +8,34 @@
       </div>
       <!-- TODO @fan：1）按钮要不调整成详情、下载、再次生成、删除？；2）如果是再次生成，就把当前的参数填写到左侧的框框里？ -->
       <div>
-        <el-button class="btn" text :icon="Download"
-                   @click="handlerBtnClick('download', imageDetail)"/>
-        <el-button class="btn" text :icon="Delete" @click="handlerBtnClick('delete', imageDetail)"/>
-        <el-button class="btn" text :icon="More" @click="handlerBtnClick('more', imageDetail)"/>
+        <el-button
+          class="btn"
+          text
+          :icon="Download"
+          @click="handlerBtnClick('download', imageDetail)"
+        />
+        <el-button
+          class="btn"
+          text
+          :icon="Delete"
+          @click="handlerBtnClick('delete', imageDetail)"
+        />
+        <el-button class="btn" text :icon="More" @click="handlerBtnClick('more', imageDetail)" />
       </div>
     </div>
     <div class="image-wrapper" ref="cardImageRef">
       <!-- TODO @fan：要不加个点击，大图预览？ -->
-      <img class="image" :src="imageDetail?.picUrl"/>
-      <div v-if="imageDetail?.status === 30">{{imageDetail?.errorMessage}}</div>
+      <img class="image" :src="imageDetail?.picUrl" />
+      <div v-if="imageDetail?.status === 30">{{ imageDetail?.errorMessage }}</div>
     </div>
     <!-- TODO @fan：style 使用 unocss 替代下 -->
     <div class="image-mj-btns">
-      <el-button size="small" v-for="button in imageDetail?.buttons" :key="button"
-                 style="min-width: 40px;margin-left: 0; margin-right: 10px; margin-top: 5px;"
-                 @click="handlerMjBtnClick(button)"
+      <el-button
+        size="small"
+        v-for="button in imageDetail?.buttons"
+        :key="button"
+        style="min-width: 40px; margin-left: 0; margin-right: 10px; margin-top: 5px"
+        @click="handlerMjBtnClick(button)"
       >
         {{ button.label }}{{ button.emoji }}
       </el-button>
@@ -31,23 +43,23 @@
   </el-card>
 </template>
 <script setup lang="ts">
-import {Delete, Download, More} from "@element-plus/icons-vue";
-import {ImageRespVO, ImageMjButtonsVO} from "@/api/ai/image";
-import {PropType} from "vue";
-import {ElLoading, ElMessageBox} from "element-plus";
+import { Delete, Download, More } from '@element-plus/icons-vue'
+import { ImageVO, ImageMjButtonsVO } from '@/api/ai/image'
+import { PropType } from 'vue'
+import { ElLoading, ElMessageBox } from 'element-plus'
 
 const cardImageRef = ref<any>() // 卡片 image ref
 const cardImageLoadingInstance = ref<any>() // 卡片 image ref
 const message = useMessage()
 const props = defineProps({
   imageDetail: {
-    type: Object as PropType<ImageRespVO>,
+    type: Object as PropType<ImageVO>,
     require: true
   }
 })
 
 /**  按钮 - 点击事件  */
-const handlerBtnClick = async (type, imageDetail: ImageRespVO) => {
+const handlerBtnClick = async (type, imageDetail: ImageVO) => {
   emits('onBtnClick', type, imageDetail)
 }
 
@@ -60,8 +72,8 @@ const handlerLoading = async (status: number) => {
     })
   } else {
     if (cardImageLoadingInstance.value) {
-      cardImageLoadingInstance.value.close();
-      cardImageLoadingInstance.value = null;
+      cardImageLoadingInstance.value.close()
+      cardImageLoadingInstance.value = null
     }
   }
 }
@@ -89,7 +101,6 @@ onMounted(async () => {
 </script>
 
 <style scoped lang="scss">
-
 .image-card {
   width: 320px;
   height: auto;
@@ -131,5 +142,4 @@ onMounted(async () => {
     justify-content: flex-start;
   }
 }
-
 </style>

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

@@ -163,7 +163,7 @@
 <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 { ImageApi, ImageVO } from '@/api/ai/image'
 import * as UserApi from '@/api/system/user'
 
 /** AI 绘画 列表 */
@@ -173,7 +173,7 @@ const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
 const loading = ref(true) // 列表的加载中
-const list = ref<ImageRespVO[]>([]) // 列表的数据
+const list = ref<ImageVO[]>([]) // 列表的数据
 const total = ref(0) // 列表的总页数
 const queryParams = reactive({
   pageNo: 1,
@@ -225,7 +225,7 @@ const handleDelete = async (id: number) => {
 }
 
 /** 修改是否发布 */
-const handleUpdatePublicStatusChange = async (row: ImageRespVO) => {
+const handleUpdatePublicStatusChange = async (row: ImageVO) => {
   try {
     // 修改状态的二次确认
     const text = row.publicStatus ? '公开' : '私有'