Merge branch 'v-next-dev' of https://gitee.com/yudaocode/yudao-ui-admin-vben into v-next-dev

2025-04-23 14:34:55 +08:00
parent 9bb543ea9e b012c9c01f
commit 455d396f96
18 changed files with 209 additions and 146 deletions
--- a/apps/web-antd/src/views/_core/profile/modules/profile-user.vue
+++ b/apps/web-antd/src/views/_core/profile/modules/profile-user.vue
@@ -1,17 +1,21 @@
 <script setup lang="ts">
-import {type SystemUserProfileApi, updateUserPassword} from '#/api/system/user/profile';
-
-import {Descriptions, DescriptionsItem, message, Tooltip} from 'ant-design-vue';
-import { IconifyIcon } from '@vben/icons';
+import type { SystemUserProfileApi } from '#/api/system/user/profile';

 import { computed } from 'vue';
+
+import { IconifyIcon } from '@vben/icons';
 import { preferences } from '@vben/preferences';
-import { updateUserProfile } from '#/api/system/user/profile';
 import { formatDateTime } from '@vben/utils';
+
+import { Descriptions, DescriptionsItem, Tooltip } from 'ant-design-vue';
+
+import { updateUserProfile } from '#/api/system/user/profile';
 import { CropperAvatar } from '#/components/cropper';
 import { useUpload } from '#/components/upload/use-upload';

-const props = defineProps<{ profile?: SystemUserProfileApi.UserProfileRespVO }>();
+const props = defineProps<{
+  profile?: SystemUserProfileApi.UserProfileRespVO;
+}>();

 const emit = defineEmits<{
  (e: 'success'): void;
@@ -21,7 +25,13 @@ const avatar = computed(
  () => props.profile?.avatar || preferences.app.defaultAvatar,
 );

-async function handelUpload({ file, filename }: { file: Blob; filename: string; }) {
+async function handelUpload({
+  file,
+  filename,
+}: {
+  file: Blob;
+  filename: string;
+}) {
  // 1. 上传头像，获取 URL
  const { httpRequest } = useUpload();
  // 将 Blob 转换为 File
@@ -59,11 +69,14 @@ async function handelUpload({ file, filename }: { file: Blob; filename: string;
        <DescriptionsItem>
          <template #label>
            <div class="flex items-center">
-              <IconifyIcon icon="ant-design:user-switch-outlined" class="mr-1" />
+              <IconifyIcon
+                icon="ant-design:user-switch-outlined"
+                class="mr-1"
+              />
              所属角色
            </div>
          </template>
-          {{ profile.roles.map(role => role.name).join(',') }}
+          {{ profile.roles.map((role) => role.name).join(',') }}
        </DescriptionsItem>
        <DescriptionsItem>
          <template #label>
@@ -95,16 +108,22 @@ async function handelUpload({ file, filename }: { file: Blob; filename: string;
        <DescriptionsItem>
          <template #label>
            <div class="flex items-center">
-              <IconifyIcon icon="ant-design:usergroup-add-outlined" class="mr-1" />
+              <IconifyIcon
+                icon="ant-design:usergroup-add-outlined"
+                class="mr-1"
+              />
              所属岗位
            </div>
          </template>
-          {{ profile.posts.map(post => post.name).join(',') }}
+          {{ profile.posts.map((post) => post.name).join(',') }}
        </DescriptionsItem>
        <DescriptionsItem>
          <template #label>
            <div class="flex items-center">
-              <IconifyIcon icon="ant-design:clock-circle-outlined" class="mr-1" />
+              <IconifyIcon
+                icon="ant-design:clock-circle-outlined"
+                class="mr-1"
+              />
              创建时间
            </div>
          </template>
--- a/apps/web-antd/src/views/bpm/model/index.vue
+++ b/apps/web-antd/src/views/bpm/model/index.vue
@@ -1,17 +1,28 @@
 <script lang="ts" setup>
-import { DocAlert } from '#/components/doc-alert';
-import { Button } from 'ant-design-vue';
 import { Page } from '@vben/common-ui';
+
+import { Button } from 'ant-design-vue';
 </script>

 <template>
  <Page>
-    <Button danger type="link" target="_blank" href="https://github.com/yudaocode/yudao-ui-admin-vue3">
+    <Button
+      danger
+      type="link"
+      target="_blank"
+      href="https://github.com/yudaocode/yudao-ui-admin-vue3"
+    >
      该功能支持 Vue3 + element-plus 版本！
    </Button>
    <br />
-    <Button type="link" target="_blank" href="https://github.com/yudaocode/yudao-ui-admin-vue3/blob/master/src/views/bpm/model/index">
-      可参考 https://github.com/yudaocode/yudao-ui-admin-vue3/blob/master/src/views/bpm/model/index 代码，pull request 贡献给我们！
+    <Button
+      type="link"
+      target="_blank"
+      href="https://github.com/yudaocode/yudao-ui-admin-vue3/blob/master/src/views/bpm/model/index"
+    >
+      可参考
+      https://github.com/yudaocode/yudao-ui-admin-vue3/blob/master/src/views/bpm/model/index
+      代码，pull request 贡献给我们！
    </Button>
  </Page>
-</template>
+</template>
--- a/apps/web-antd/src/views/bpm/processInstance/create/index.vue
+++ b/apps/web-antd/src/views/bpm/processInstance/create/index.vue
@@ -1,17 +1,28 @@
 <script lang="ts" setup>
-import { DocAlert } from '#/components/doc-alert';
-import { Button } from 'ant-design-vue';
 import { Page } from '@vben/common-ui';
+
+import { Button } from 'ant-design-vue';
 </script>

 <template>
  <Page>
-    <Button danger type="link" target="_blank" href="https://github.com/yudaocode/yudao-ui-admin-vue3">
+    <Button
+      danger
+      type="link"
+      target="_blank"
+      href="https://github.com/yudaocode/yudao-ui-admin-vue3"
+    >
      该功能支持 Vue3 + element-plus 版本！
    </Button>
    <br />
-    <Button type="link" target="_blank" href="https://github.com/yudaocode/yudao-ui-admin-vue3/blob/master/src/views/bpm/processInstance/create/index">
-      可参考 https://github.com/yudaocode/yudao-ui-admin-vue3/blob/master/src/views/bpm/processInstance/create/index 代码，pull request 贡献给我们！
+    <Button
+      type="link"
+      target="_blank"
+      href="https://github.com/yudaocode/yudao-ui-admin-vue3/blob/master/src/views/bpm/processInstance/create/index"
+    >
+      可参考
+      https://github.com/yudaocode/yudao-ui-admin-vue3/blob/master/src/views/bpm/processInstance/create/index
+      代码，pull request 贡献给我们！
    </Button>
  </Page>
-</template>
+</template>
--- a/apps/web-antd/src/views/infra/apiAccessLog/modules/detail.vue
+++ b/apps/web-antd/src/views/infra/apiAccessLog/modules/detail.vue
@@ -84,8 +84,7 @@ const [Modal, modalApi] = useVbenModal({
      </Descriptions.Item>
      <Descriptions.Item label="操作结果">
        <div v-if="formData?.resultCode === 0">正常</div>
-        <!-- TODO @芋艿：处理爆红 -->
-        <div v-else-if="formData?.resultCode > 0">
+        <div v-else-if="formData && formData?.resultCode > 0">
          失败 | {{ formData?.resultCode }} | {{ formData?.resultMsg }}
        </div>
      </Descriptions.Item>
--- a/apps/web-antd/src/views/infra/demo/demo03/inner/modules/form.vue
+++ b/apps/web-antd/src/views/infra/demo/demo03/inner/modules/form.vue
@@ -54,6 +54,7 @@ const [Modal, modalApi] = useVbenModal({
    // 提交表单
    const data = (await formApi.getValues()) as Demo03StudentApi.Demo03Student;
    // 拼接子表的数据
+    // TODO @puhui999：字段对不上
    data.demo03Courses = demo03CourseFormRef.value?.getData();
    data.demo03Grade = await demo03GradeFormRef.value?.getValues();
    try {
--- a/apps/web-antd/src/views/system/dict/data.ts
+++ b/apps/web-antd/src/views/system/dict/data.ts
@@ -1,5 +1,7 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { SystemDictDataApi } from '#/api/system/dict/data';
+import type { SystemDictTypeApi } from '#/api/system/dict/type';

 import { useAccess } from '@vben/access';

@@ -94,7 +96,7 @@ export function useTypeGridFormSchema(): VbenFormSchema[] {
 }

 /** 类型列表的字段 */
-export function useTypeGridColumns<T = any>(
+export function useTypeGridColumns<T = SystemDictTypeApi.DictType>(
  onActionClick: OnActionClickFn<T>,
 ): VxeTableGridOptions['columns'] {
  return [
@@ -312,7 +314,7 @@ export function useDataGridFormSchema(): VbenFormSchema[] {
 /**
 * 字典数据表格列
 */
-export function useDataGridColumns<T = any>(
+export function useDataGridColumns<T = SystemDictDataApi.DictData>(
  onActionClick: OnActionClickFn<T>,
 ): VxeTableGridOptions['columns'] {
  return [
--- a/apps/web-antd/src/views/system/dict/modules/data-grid.vue
+++ b/apps/web-antd/src/views/system/dict/modules/data-grid.vue
@@ -1,5 +1,9 @@
 <script lang="ts" setup>
-import type { OnActionClickParams } from '#/adapter/vxe-table';
+import type {
+  OnActionClickParams,
+  VxeTableGridOptions,
+} from '#/adapter/vxe-table';
+import type { SystemDictDataApi } from '#/api/system/dict/data';

 import { watch } from 'vue';

@@ -100,8 +104,8 @@ const [Grid, gridApi] = useVbenVxeGrid({
          return await getDictDataPage({
            pageNo: page.currentPage,
            pageSize: page.pageSize,
-            ...formValues,
            dictType: props.dictType,
+            ...formValues,
          });
        },
      },
@@ -113,7 +117,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
      refresh: { code: 'query' },
      search: true,
    },
-  },
+  } as VxeTableGridOptions<SystemDictDataApi.DictData>,
 });

 /** 监听 dictType 变化，重新查询 */
--- a/apps/web-antd/src/views/system/dict/modules/type-grid.vue
+++ b/apps/web-antd/src/views/system/dict/modules/type-grid.vue
@@ -1,5 +1,9 @@
 <script lang="ts" setup>
-import type { OnActionClickParams } from '#/adapter/vxe-table';
+import type {
+  OnActionClickParams,
+  VxeGridListeners,
+  VxeTableGridOptions,
+} from '#/adapter/vxe-table';
 import type { SystemDictTypeApi } from '#/api/system/dict/type';

 import { useVbenModal } from '@vben/common-ui';
@@ -67,7 +71,10 @@ async function onDelete(row: SystemDictTypeApi.DictType) {
 }

 /** 表格操作按钮回调 */
-function onActionClick({ code, row }: OnActionClickParams) {
+function onActionClick({
+  code,
+  row,
+}: OnActionClickParams<SystemDictTypeApi.DictType>) {
  switch (code) {
    case 'delete': {
      onDelete(row);
@@ -81,8 +88,7 @@ function onActionClick({ code, row }: OnActionClickParams) {
 }

 /** 表格事件 */
-// TODO @芋艿：这里有爆红
-const gridEvents: VxeGridListeners<RowType> = {
+const gridEvents: VxeGridListeners<SystemDictTypeApi.DictType> = {
  cellClick: ({ row }) => {
    emit('select', row.type);
  },
@@ -115,7 +121,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
      refresh: { code: 'query' },
      search: true,
    },
-  },
+  } as VxeTableGridOptions<SystemDictTypeApi.DictType>,
  gridEvents,
 });
 </script>
--- a/apps/web-antd/src/views/system/notify/my/modules/detail.vue
+++ b/apps/web-antd/src/views/system/notify/my/modules/detail.vue
@@ -43,7 +43,6 @@ const [Modal, modalApi] = useVbenModal({
      <Descriptions.Item label="发送人">
        {{ formData?.templateNickname }}
      </Descriptions.Item>
-      <!-- TODO @芋艿：报错 -->
      <Descriptions.Item label="发送时间">
        {{ formatDateTime(formData?.createTime) }}
      </Descriptions.Item>