Merge branch 'dev' of https://gitee.com/txyyj/yudao-ui-admin-vue3 into dev

 Conflicts:

	src/views/system/oauth2/client/index.vue

src/views/system/oauth2/client/form.vue

@@ -17,7 +17,7 @@
         <el-input v-model="formData.name" placeholder="请输入应用名" />
       </el-form-item>
       <el-form-item label="应用图标">
-        <UploadImg v-model="formData.logo" :limit="1" />
+        <imageUpload v-model="formData.logo" :limit="1" />
       </el-form-item>
       <el-form-item label="应用描述">
         <el-input type="textarea" v-model="formData.description" placeholder="请输入应用名" />
@@ -147,7 +147,6 @@
 <script setup lang="ts">
 import { DICT_TYPE, getDictOptions } from '@/utils/dict'
 import * as ClientApi from '@/api/system/oauth2/client'
-import UploadImg from '@/components/UploadFile'
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 

src/views/system/oauth2/client/index.vue

@@ -1,206 +1,179 @@
 <template>
-  <ContentWrap>
+  <!-- 搜索 -->
-    <!-- 列表 -->
+  <content-wrap>
-    <XTable @register="registerTable">
+    <el-form
-      <template #toolbar_buttons>
+      class="-mb-15px"
-        <!-- 操作：新增 -->
+      :model="queryParams"
-        <XButton
+      ref="queryFormRef"
-          type="primary"
+      :inline="true"
-          preIcon="ep:zoom-in"
+      label-width="68px"
-          :title="t('action.add')"
-          v-hasPermi="['system:oauth2-client:create']"
-          @click="handleCreate()"
-        />
-      </template>
-      <template #accessTokenValiditySeconds_default="{ row }">
-        {{ row.accessTokenValiditySeconds + '秒' }}
-      </template>
-      <template #refreshTokenValiditySeconds_default="{ row }">
-        {{ row.refreshTokenValiditySeconds + '秒' }}
-      </template>
-      <template #authorizedGrantTypes_default="{ row }">
-        <el-tag
-          :disable-transitions="true"
-          :key="index"
-          v-for="(authorizedGrantType, index) in row.authorizedGrantTypes"
-          :index="index"
-        >
-          {{ authorizedGrantType }}
-        </el-tag>
-      </template>
-      <template #actionbtns_default="{ row }">
-        <!-- 操作：修改 -->
-        <XTextButton
-          preIcon="ep:edit"
-          :title="t('action.edit')"
-          v-hasPermi="['system:oauth2-client:update']"
-          @click="handleUpdate(row.id)"
-        />
-        <!-- 操作：详情 -->
-        <XTextButton
-          preIcon="ep:view"
-          :title="t('action.detail')"
-          v-hasPermi="['system:oauth2-client:query']"
-          @click="handleDetail(row.id)"
-        />
-        <!-- 操作：删除 -->
-        <XTextButton
-          preIcon="ep:delete"
-          :title="t('action.del')"
-          v-hasPermi="['system:oauth2-client:delete']"
-          @click="deleteData(row.id)"
-        />
-      </template>
-    </XTable>
-  </ContentWrap>
-  <!-- 弹窗 -->
-  <XModal id="postModel" v-model="dialogVisible" :title="dialogTitle">
-    <!-- 表单：添加/修改 -->
-    <Form
-      ref="formRef"
-      v-if="['create', 'update'].includes(actionType)"
-      :schema="allSchemas.formSchema"
-      :rules="rules"
-    />
-    <!-- 表单：详情 -->
-    <Descriptions
-      v-if="actionType === 'detail'"
-      :schema="allSchemas.detailSchema"
-      :data="detailData"
     >
-      <template #accessTokenValiditySeconds="{ row }">
+      <el-form-item label="应用名" prop="name">
-        {{ row.accessTokenValiditySeconds + '秒' }}
+        <el-input
-      </template>
+          v-model="queryParams.name"
-      <template #refreshTokenValiditySeconds="{ row }">
+          placeholder="请输入应用名"
-        {{ row.refreshTokenValiditySeconds + '秒' }}
+          clearable
-      </template>
+          @keyup.enter="handleQuery"
-      <template #authorizedGrantTypes="{ row }">
+        />
-        <el-tag
+      </el-form-item>
-          :disable-transitions="true"
+      <el-form-item label="状态" prop="status">
-          :key="index"
+        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable size="small">
-          v-for="(authorizedGrantType, index) in row.authorizedGrantTypes"
+          <el-option
-          :index="index"
+            v-for="dict in getDictOptions(DICT_TYPE.COMMON_STATUS)"
-        >
+            :key="dict.value"
-          {{ authorizedGrantType }}
+            :label="dict.label"
-        </el-tag>
+            :value="dict.value"
-      </template>
+          />
-      <template #scopes="{ row }">
+        </el-select>
-        <el-tag
+      </el-form-item>
-          :disable-transitions="true"
+      <el-form-item>
-          :key="index"
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
-          v-for="(scopes, index) in row.scopes"
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-          :index="index"
+        <el-button type="primary" @click="openModal('create')" v-hasPermi="['infra:config:create']">
-        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
-          {{ scopes }}
+        </el-button>
-        </el-tag>
+      </el-form-item>
-      </template>
+    </el-form>
-      <template #autoApproveScopes="{ row }">
+  </content-wrap>
-        <el-tag
+
-          :disable-transitions="true"
+  <!-- 列表 -->
-          :key="index"
+  <content-wrap>
-          v-for="(autoApproveScopes, index) in row.autoApproveScopes"
+    <el-table v-loading="loading" :data="list">
-          :index="index"
+      <el-table-column label="客户端编号" align="center" prop="clientId" />
-        >
+      <el-table-column label="客户端密钥" align="center" prop="secret" />
-          {{ autoApproveScopes }}
+      <el-table-column label="应用名" align="center" prop="name" />
-        </el-tag>
+      <el-table-column label="应用图标" align="center" prop="logo">
-      </template>
+        <template #default="scope">
-      <template #redirectUris="{ row }">
+          <img width="40px" height="40px" :src="scope.row.logo" />
-        <el-tag
+        </template>
-          :disable-transitions="true"
+      </el-table-column>
-          :key="index"
+      <el-table-column label="状态" align="center" prop="status">
-          v-for="(redirectUris, index) in row.redirectUris"
+        <template #default="scope">
-          :index="index"
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
-        >
+        </template>
-          {{ redirectUris }}
+      </el-table-column>
-        </el-tag>
+      <el-table-column label="访问令牌的有效期" align="center" prop="accessTokenValiditySeconds">
-      </template>
+        <template #default="scope">{{ scope.row.accessTokenValiditySeconds }} 秒</template>
-    </Descriptions>
+      </el-table-column>
-    <template #footer>
+      <el-table-column label="刷新令牌的有效期" align="center" prop="refreshTokenValiditySeconds">
-      <!-- 按钮：保存 -->
+        <template #default="scope">{{ scope.row.refreshTokenValiditySeconds }} 秒</template>
-      <XButton
+      </el-table-column>
-        v-if="['create', 'update'].includes(actionType)"
+      <el-table-column label="授权类型" align="center" prop="authorizedGrantTypes">
-        type="primary"
+        <template #default="scope">
-        :title="t('action.save')"
+          <el-tag
-        :loading="actionLoading"
+            :disable-transitions="true"
-        @click="submitForm()"
+            :key="index"
+            v-for="(authorizedGrantType, index) in scope.row.authorizedGrantTypes"
+            :index="index"
+          >
+            {{ authorizedGrantType }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        width="180"
+        :formatter="dateFormatter"
       />
-      <!-- 按钮：关闭 -->
+      <el-table-column label="操作" align="center">
-      <XButton :loading="actionLoading" :title="t('dialog.close')" @click="dialogVisible = false" />
+        <template #default="scope">
-    </template>
+          <el-button
-  </XModal>
+            link
+            type="primary"
+            @click="openModal('update', scope.row.id)"
+            v-hasPermi="['infra:config:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['infra:config:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </content-wrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <ClientForm ref="modalRef" @success="getList" />
 </template>
-<script setup lang="ts" name="Client">
+<script setup lang="ts">
-import type { FormExpose } from '@/components/Form'
+import { DICT_TYPE, getDictOptions } from '@/utils/dict'
-// 业务相关的 import
+import { dateFormatter } from '@/utils/formatTime'
 import * as ClientApi from '@/api/system/oauth2/client'
-
+import ClientForm from './form.vue'
-const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
 
-// 列表相关的变量
+const loading = ref(true) // 列表的加载中
-const [registerTable, { reload, deleteData }] = useXTable({
+const total = ref(0) // 列表的总页数
-  allSchemas: allSchemas,
+const list = ref([]) // 列表的数据
-  getListApi: ClientApi.getOAuth2ClientPageApi,
+const queryParams = reactive({
-  deleteApi: ClientApi.deleteOAuth2ClientApi
+  pageNo: 1,
+  pageSize: 10,
+  name: null,
+  status: null
 })
-// 弹窗相关的变量
+const queryFormRef = ref() // 搜索的表单
-const dialogVisible = ref(false) // 是否显示弹出层
+
-const dialogTitle = ref('edit') // 弹出层标题
+/** 查询参数列表 */
-const actionType = ref('') // 操作按钮的类型
+const getList = async () => {
-const actionLoading = ref(false) // 按钮 Loading
+  loading.value = true
-const formRef = ref<FormExpose>() // 表单 Ref
+  try {
-const detailData = ref() // 详情 Ref
+    const data = await ClientApi.getOAuth2ClientPageApi(queryParams)
-// 设置标题
+    list.value = data.list
-const setDialogTile = (type: string) => {
+    total.value = data.total
-  dialogTitle.value = t('action.' + type)
+  } finally {
-  actionType.value = type
+    loading.value = false
-  dialogVisible.value = true
+  }
 }
 
-// 新增操作
+/** 搜索按钮操作 */
-const handleCreate = () => {
+const handleQuery = () => {
-  setDialogTile('create')
+  queryParams.pageNo = 1
+  getList()
 }
 
-// 修改操作
+/** 重置按钮操作 */
-const handleUpdate = async (rowId: number) => {
+const resetQuery = () => {
-  setDialogTile('update')
+  queryFormRef.value.resetFields()
-  // 设置数据
+  handleQuery()
-  const res = await ClientApi.getOAuth2ClientApi(rowId)
-  unref(formRef)?.setValues(res)
 }
 
-// 详情操作
+/** 添加/修改操作 */
-const handleDetail = async (rowId: number) => {
+const modalRef = ref()
-  setDialogTile('detail')
+const openModal = (type: string, id?: number) => {
-  const res = await ClientApi.getOAuth2ClientApi(rowId)
+  modalRef.value.openModal(type, id)
-  detailData.value = res
 }
 
-// 提交新增/修改的表单
+/** 删除按钮操作 */
-const submitForm = async () => {
+const handleDelete = async (id: number) => {
-  const elForm = unref(formRef)?.getElFormRef()
+  try {
-  if (!elForm) return
+    // 删除的二次确认
-  elForm.validate(async (valid) => {
+    await message.delConfirm()
-    if (valid) {
+    // 发起删除
-      actionLoading.value = true
+    await ClientApi.deleteOAuth2ClientApi(id)
-      // 提交请求
+    message.success(t('common.delSuccess'))
-      try {
+    // 刷新列表
-        const data = unref(formRef)?.formModel as ClientApi.OAuth2ClientVO
+    await getList()
-        if (actionType.value === 'create') {
+  } catch {}
-          await ClientApi.createOAuth2ClientApi(data)
-          message.success(t('common.createSuccess'))
-        } else {
-          await ClientApi.updateOAuth2ClientApi(data)
-          message.success(t('common.updateSuccess'))
-        }
-        dialogVisible.value = false
-      } finally {
-        actionLoading.value = false
-        // 刷新列表
-        await reload()
-      }
-    }
-  })
 }
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
 </script>