Merge branch 'dev' of https://gitee.com/dapppp/ruoyi-plus-vben5 into warmflow

2025-01-07 16:24:53 +08:00
parent 02d42de133 95650da33b
commit c11cca2c2e
404 changed files with 4182 additions and 1468 deletions
--- a/apps/web-antd/src/views/_core/authentication/code-login.vue
+++ b/apps/web-antd/src/views/_core/authentication/code-login.vue
@@ -15,6 +15,7 @@ import { useAuthStore } from '#/store';
 defineOptions({ name: 'CodeLogin' });

 const loading = ref(false);
+const CODE_LENGTH = 6;

 const tenantInfo = ref<TenantResp>({
  tenantEnabled: false,
@@ -98,7 +99,9 @@ const formSchema = computed((): VbenFormSchema[] => {
      },
      fieldName: 'code',
      label: $t('authentication.code'),
-      rules: z.string().min(1, { message: $t('authentication.codeTip') }),
+      rules: z.string().length(CODE_LENGTH, {
+        message: $t('authentication.codeTip', [CODE_LENGTH]),
+      }),
    },
  ];
 });
--- a/apps/web-antd/src/views/_core/profile/components/online-device.vue
+++ b/apps/web-antd/src/views/_core/profile/components/online-device.vue
@@ -10,7 +10,9 @@ import { columns } from '#/views/monitor/online/data';
 const gridOptions: VxeGridProps = {
  columns,
  keepSource: true,
-  pagerConfig: {},
+  pagerConfig: {
+    enabled: false,
+  },
  proxyConfig: {
    ajax: {
      query: async () => {
--- a/apps/web-antd/src/views/common.tsx
+++ b/apps/web-antd/src/views/common.tsx
@@ -1,18 +1,34 @@
 import { defineComponent } from 'vue';

-import { Fallback } from '@vben/common-ui';
+import { Page } from '@vben/common-ui';
+import { openWindow } from '@vben/utils';
+
+import { Result } from 'ant-design-vue';

 export default defineComponent({
  name: 'CommonSkeleton',
  setup() {
    return () => (
-      <div class="flex h-[600px] w-full items-center justify-center">
-        <Fallback
-          description="等待后端重构工作流后开发"
-          status="coming-soon"
-          title="等待开发"
-        />
-      </div>
+      <Page autoContentHeight={true}>
+        <Result
+          status="success"
+          sub-title="等待后端发布"
+          title="已经开发完毕(warmflow分支)"
+        >
+          {{
+            extra: (
+              <div>
+                <a-button
+                  onClick={() => openWindow('http://106.55.255.76')}
+                  type="primary"
+                >
+                  前往工作流版本演示站
+                </a-button>
+              </div>
+            ),
+          }}
+        </Result>
+      </Page>
    );
  },
 });
--- a/apps/web-antd/src/views/dashboard/analytics/analytics-trends.vue
+++ b/apps/web-antd/src/views/dashboard/analytics/analytics-trends.vue
@@ -1,11 +1,8 @@
 <script lang="ts" setup>
-import { onMounted, ref } from 'vue';
+import type { EchartsUIType } from '@vben/plugins/echarts';

-import {
-  EchartsUI,
-  type EchartsUIType,
-  useEcharts,
-} from '@vben/plugins/echarts';
+import { EchartsUI, useEcharts } from '@vben/plugins/echarts';
+import { onMounted, ref } from 'vue';

 const chartRef = ref<EchartsUIType>();
 const { renderEcharts } = useEcharts(chartRef);
--- a/apps/web-antd/src/views/dashboard/analytics/analytics-visits-data.vue
+++ b/apps/web-antd/src/views/dashboard/analytics/analytics-visits-data.vue
@@ -1,11 +1,8 @@
 <script lang="ts" setup>
-import { onMounted, ref } from 'vue';
+import type { EchartsUIType } from '@vben/plugins/echarts';

-import {
-  EchartsUI,
-  type EchartsUIType,
-  useEcharts,
-} from '@vben/plugins/echarts';
+import { EchartsUI, useEcharts } from '@vben/plugins/echarts';
+import { onMounted, ref } from 'vue';

 const chartRef = ref<EchartsUIType>();
 const { renderEcharts } = useEcharts(chartRef);
--- a/apps/web-antd/src/views/dashboard/analytics/analytics-visits-sales.vue
+++ b/apps/web-antd/src/views/dashboard/analytics/analytics-visits-sales.vue
@@ -1,11 +1,8 @@
 <script lang="ts" setup>
-import { onMounted, ref } from 'vue';
+import type { EchartsUIType } from '@vben/plugins/echarts';

-import {
-  EchartsUI,
-  type EchartsUIType,
-  useEcharts,
-} from '@vben/plugins/echarts';
+import { EchartsUI, useEcharts } from '@vben/plugins/echarts';
+import { onMounted, ref } from 'vue';

 const chartRef = ref<EchartsUIType>();
 const { renderEcharts } = useEcharts(chartRef);
--- a/apps/web-antd/src/views/dashboard/analytics/analytics-visits-source.vue
+++ b/apps/web-antd/src/views/dashboard/analytics/analytics-visits-source.vue
@@ -1,11 +1,8 @@
 <script lang="ts" setup>
-import { onMounted, ref } from 'vue';
+import type { EchartsUIType } from '@vben/plugins/echarts';

-import {
-  EchartsUI,
-  type EchartsUIType,
-  useEcharts,
-} from '@vben/plugins/echarts';
+import { EchartsUI, useEcharts } from '@vben/plugins/echarts';
+import { onMounted, ref } from 'vue';

 const chartRef = ref<EchartsUIType>();
 const { renderEcharts } = useEcharts(chartRef);
--- a/apps/web-antd/src/views/dashboard/analytics/analytics-visits.vue
+++ b/apps/web-antd/src/views/dashboard/analytics/analytics-visits.vue
@@ -1,11 +1,8 @@
 <script lang="ts" setup>
-import { onMounted, ref } from 'vue';
+import type { EchartsUIType } from '@vben/plugins/echarts';

-import {
-  EchartsUI,
-  type EchartsUIType,
-  useEcharts,
-} from '@vben/plugins/echarts';
+import { EchartsUI, useEcharts } from '@vben/plugins/echarts';
+import { onMounted, ref } from 'vue';

 const chartRef = ref<EchartsUIType>();
 const { renderEcharts } = useEcharts(chartRef);
--- a/apps/web-antd/src/views/monitor/online/index.vue
+++ b/apps/web-antd/src/views/monitor/online/index.vue
@@ -26,18 +26,22 @@ const gridOptions: VxeGridProps = {
  columns,
  height: 'auto',
  keepSource: true,
-  pagerConfig: {},
+  pagerConfig: {
+    enabled: false,
+  },
  proxyConfig: {
    ajax: {
-      query: async ({ page }, formValues) => {
+      query: async (_, formValues) => {
        return await onlineList({
-          pageNum: page.currentPage,
-          pageSize: page.pageSize,
          ...formValues,
        });
      },
    },
  },
+  scrollY: {
+    enabled: true,
+    gt: 0,
+  },
  rowConfig: {
    isHover: true,
    keyField: 'tokenId',
@@ -51,11 +55,24 @@ async function handleForceOffline(row: Recordable<any>) {
  await forceLogout(row.tokenId);
  await tableApi.query();
 }
+
+function onlineCount() {
+  return tableApi?.grid?.getData?.()?.length ?? 0;
+}
 </script>

 <template>
  <Page :auto-content-height="true">
-    <BasicTable table-title="在线用户列表">
+    <BasicTable>
+      <template #toolbar-actions>
+        <div class="mr-1 pl-1 text-[1rem]">
+          <div>
+            在线用户列表 (共
+            <span class="text-primary font-bold">{{ onlineCount() }}</span>
+            人在线)
+          </div>
+        </div>
+      </template>
      <template #action="{ row }">
        <Popconfirm
          :get-popup-container="getVxePopupContainer"
--- a/apps/web-antd/src/views/monitor/operlog/index.vue
+++ b/apps/web-antd/src/views/monitor/operlog/index.vue
@@ -9,10 +9,10 @@ import { $t } from '@vben/locales';
 import { Modal, Space } from 'ant-design-vue';

 import {
+  addSortParams,
  useVbenVxeGrid,
  vxeCheckboxChecked,
  type VxeGridProps,
-  vxeSortEvent,
 } from '#/adapter/vxe-table';
 import {
  operLogClean,
@@ -60,12 +60,14 @@ const gridOptions: VxeGridProps<OperationLog> = {
  pagerConfig: {},
  proxyConfig: {
    ajax: {
-      query: async ({ page }, formValues = {}) => {
+      query: async ({ page, sorts }, formValues = {}) => {
        const params: any = {
          pageNum: page.currentPage,
          pageSize: page.pageSize,
          ...formValues,
        };
+        // 添加排序参数
+        addSortParams(params, sorts);
        return await operLogList(params);
      },
    },
@@ -87,7 +89,8 @@ const [BasicTable, tableApi] = useVbenVxeGrid({
  formOptions,
  gridOptions,
  gridEvents: {
-    sortChange: (sortParams) => vxeSortEvent(tableApi, sortParams),
+    // 排序 重新请求接口
+    sortChange: () => tableApi.query(),
  },
 });

--- a/apps/web-antd/src/views/system/menu/menu-drawer.vue
+++ b/apps/web-antd/src/views/system/menu/menu-drawer.vue
@@ -48,7 +48,12 @@ async function setupMenuSelect() {
    item.menuName = $t(item.menuName);
  });
  // const folderArray = menuArray.filter((item) => item.menuType === 'M');
-  const menuTree = listToTree(menuArray, { id: 'menuId', pid: 'parentId' });
+  /**
+   * 这里需要过滤掉按钮类型
+   * 不允许在按钮下添加数据
+   */
+  const filteredList = menuArray.filter((item) => item.menuType !== 'F');
+  const menuTree = listToTree(filteredList, { id: 'menuId', pid: 'parentId' });
  const fullMenuTree = [
    {
      menuId: 0,
--- a/apps/web-antd/src/views/system/oss-config/data.tsx
+++ b/apps/web-antd/src/views/system/oss-config/data.tsx
@@ -128,6 +128,12 @@ export const drawerSchema: FormSchemaGetter = () => [
    fieldName: 'domain',
    label: '自定义域名',
  },
+  {
+    component: 'Input',
+    fieldName: 'tip',
+    label: '占位作为提示使用',
+    hideLabel: true,
+  },
  {
    component: 'Divider',
    componentProps: {
--- a/apps/web-antd/src/views/system/oss-config/oss-config-drawer.vue
+++ b/apps/web-antd/src/views/system/oss-config/oss-config-drawer.vue
@@ -5,6 +5,8 @@ import { useVbenDrawer } from '@vben/common-ui';
 import { $t } from '@vben/locales';
 import { cloneDeep } from '@vben/utils';

+import { Alert } from 'ant-design-vue';
+
 import { useVbenForm } from '#/adapter/form';
 import {
  ossConfigAdd,
@@ -79,7 +81,17 @@ async function handleCancel() {

 <template>
  <BasicDrawer :close-on-click-modal="false" :title="title" class="w-[650px]">
-    <BasicForm />
+    <BasicForm>
+      <template #tip>
+        <div class="ml-7 w-full">
+          <Alert
+            message="私有桶使用自定义域名无法预览, 但可以正常上传/下载"
+            show-icon
+            type="warning"
+          />
+        </div>
+      </template>
+    </BasicForm>
  </BasicDrawer>
 </template>

--- a/apps/web-antd/src/views/system/oss/index.vue
+++ b/apps/web-antd/src/views/system/oss/index.vue
@@ -19,10 +19,10 @@ import {
 } from 'ant-design-vue';

 import {
+  addSortParams,
  useVbenVxeGrid,
  vxeCheckboxChecked,
  type VxeGridProps,
-  vxeSortEvent,
 } from '#/adapter/vxe-table';
 import { configInfoByKey } from '#/api/system/config';
 import { ossDownload, ossList, ossRemove } from '#/api/system/oss';
@@ -66,12 +66,14 @@ const gridOptions: VxeGridProps = {
  pagerConfig: {},
  proxyConfig: {
    ajax: {
-      query: async ({ page }, formValues = {}) => {
+      query: async ({ page, sorts }, formValues = {}) => {
        const params: any = {
          pageNum: page.currentPage,
          pageSize: page.pageSize,
          ...formValues,
        };
+        // 添加排序参数
+        addSortParams(params, sorts);
        return await ossList(params);
      },
    },
@@ -94,7 +96,8 @@ const [BasicTable, tableApi] = useVbenVxeGrid({
  formOptions,
  gridOptions,
  gridEvents: {
-    sortChange: (sortParams) => vxeSortEvent(tableApi, sortParams),
+    // 排序 重新请求接口
+    sortChange: () => tableApi.query(),
  },
 });

@@ -134,8 +137,8 @@ function handleToSettings() {

 const preview = ref(false);
 onMounted(async () => {
-  const resp = await configInfoByKey('sys.oss.previewListResource');
-  preview.value = Boolean(resp);
+  const previewStr = await configInfoByKey('sys.oss.previewListResource');
+  preview.value = previewStr === 'true';
 });

 function isImageFile(ext: string) {
--- a/apps/web-antd/src/views/system/role/data.tsx
+++ b/apps/web-antd/src/views/system/role/data.tsx
@@ -1,3 +1,4 @@
+import type { FormSchemaGetter } from '#/adapter/form';
 import type { VxeGridProps } from '#/adapter/vxe-table';

 import { DictEnum } from '@vben/constants';
@@ -5,7 +6,6 @@ import { getPopupContainer } from '@vben/utils';

 import { Tag } from 'ant-design-vue';

-import { type FormSchemaGetter } from '#/adapter/form';
 import { getDictOptions } from '#/utils/dict';

 /**
@@ -17,6 +17,7 @@ export const authScopeOptions = [
  { color: 'orange', label: '本部门数据权限', value: '3' },
  { color: 'cyan', label: '本部门及以下数据权限', value: '4' },
  { color: 'error', label: '仅本人数据权限', value: '5' },
+  { color: 'default', label: '部门及以下或本人数据权限', value: '6' },
 ];

 export const querySchema: FormSchemaGetter = () => [
--- a/apps/web-antd/src/views/system/role/index.vue
+++ b/apps/web-antd/src/views/system/role/index.vue
@@ -1,16 +1,14 @@
 <script setup lang="ts">
+import type { VbenFormProps } from '@vben/common-ui';
 import type { Recordable } from '@vben/types';

+import type { VxeGridProps } from '#/adapter/vxe-table';
+
 import { computed } from 'vue';
 import { useRouter } from 'vue-router';

 import { useAccess } from '@vben/access';
-import {
-  Page,
-  useVbenDrawer,
-  useVbenModal,
-  type VbenFormProps,
-} from '@vben/common-ui';
+import { Page, useVbenDrawer, useVbenModal } from '@vben/common-ui';
 import { getVxePopupContainer } from '@vben/utils';

 import {
@@ -22,11 +20,7 @@ import {
  Space,
 } from 'ant-design-vue';

-import {
-  useVbenVxeGrid,
-  vxeCheckboxChecked,
-  type VxeGridProps,
-} from '#/adapter/vxe-table';
+import { useVbenVxeGrid, vxeCheckboxChecked } from '#/adapter/vxe-table';
 import {
  roleChangeStatus,
  roleExport,
--- a/apps/web-antd/src/views/system/role/role-drawer.vue
+++ b/apps/web-antd/src/views/system/role/role-drawer.vue
@@ -1,5 +1,7 @@
 <script setup lang="ts">
-import { computed, ref } from 'vue';
+import type { MenuOption } from '#/api/system/menu/model';
+
+import { computed, nextTick, ref } from 'vue';

 import { useVbenDrawer } from '@vben/common-ui';
 import { $t } from '@vben/locales';
@@ -8,7 +10,7 @@ import { cloneDeep, eachTree } from '@vben/utils';
 import { useVbenForm } from '#/adapter/form';
 import { menuTreeSelect, roleMenuTreeSelect } from '#/api/system/menu';
 import { roleAdd, roleInfo, roleUpdate } from '#/api/system/role';
-import { TreeSelectPanel } from '#/components/tree';
+import { MenuSelectTable } from '#/components/tree';

 import { drawerSchema } from './data';

@@ -32,11 +34,10 @@ const [BasicForm, formApi] = useVbenForm({
  wrapperClass: 'grid-cols-2 gap-x-4',
 });

-const menuTree = ref<any[]>([]);
+const menuTree = ref<MenuOption[]>([]);
 async function setupMenuTree(id?: number | string) {
  if (id) {
    const resp = await roleMenuTreeSelect(id);
-    formApi.setFieldValue('menuIds', resp.checkedKeys);
    const menus = resp.menus;
    // i18n处理
    eachTree(menus, (node) => {
@@ -44,15 +45,20 @@ async function setupMenuTree(id?: number | string) {
    });
    // 设置菜单信息
    menuTree.value = resp.menus;
+    // keys依赖于menu 需要先加载menu
+    await nextTick();
+    await formApi.setFieldValue('menuIds', resp.checkedKeys);
  } else {
    const resp = await menuTreeSelect();
-    formApi.setFieldValue('menuIds', []);
    // i18n处理
    eachTree(resp, (node) => {
      node.label = $t(node.label);
    });
    // 设置菜单信息
    menuTree.value = resp;
+    // keys依赖于menu 需要先加载menu
+    await nextTick();
+    await formApi.setFieldValue('menuIds', []);
  }
 }

@@ -78,11 +84,7 @@ const [BasicDrawer, drawerApi] = useVbenDrawer({
  },
 });

-/**
- * 这里拿到的是一个数组ref
- */
-const menuSelectRef = ref();
-
+const menuSelectRef = ref<InstanceType<typeof MenuSelectTable>>();
 async function handleConfirm() {
  try {
    drawerApi.drawerLoading(true);
@@ -91,7 +93,7 @@ async function handleConfirm() {
      return;
    }
    // 这个用于提交
-    const menuIds = menuSelectRef.value?.[0]?.getCheckedKeys() ?? [];
+    const menuIds = menuSelectRef.value?.getCheckedKeys?.() ?? [];
    // formApi.getValues拿到的是一个readonly对象，不能直接修改，需要cloneDeep
    const data = cloneDeep(await formApi.getValues());
    data.menuIds = menuIds;
@@ -120,17 +122,19 @@ function handleMenuCheckStrictlyChange(value: boolean) {
 </script>

 <template>
-  <BasicDrawer :close-on-click-modal="false" :title="title" class="w-[600px]">
+  <BasicDrawer :close-on-click-modal="false" :title="title" class="w-[800px]">
    <BasicForm>
      <template #menuIds="slotProps">
-        <!-- check-strictly为readonly 不能通过v-model绑定 -->
-        <TreeSelectPanel
-          ref="menuSelectRef"
-          v-bind="slotProps"
-          :check-strictly="formApi.form.values.menuCheckStrictly"
-          :tree-data="menuTree"
-          @check-strictly-change="handleMenuCheckStrictlyChange"
-        />
+        <div class="h-[600px] w-full">
+          <!-- association为readonly 不能通过v-model绑定 -->
+          <MenuSelectTable
+            ref="menuSelectRef"
+            :checked-keys="slotProps.value"
+            :association="formApi.form.values.menuCheckStrictly"
+            :menus="menuTree"
+            @update:association="handleMenuCheckStrictlyChange"
+          />
+        </div>
      </template>
    </BasicForm>
  </BasicDrawer>
--- a/apps/web-antd/src/views/system/tenantPackage/tenant-package-drawer.vue
+++ b/apps/web-antd/src/views/system/tenantPackage/tenant-package-drawer.vue
@@ -1,23 +1,24 @@
 <script setup lang="ts">
-import { computed, ref } from 'vue';
+import type { MenuOption } from '#/api/system/menu/model';
+
+import { computed, nextTick, ref } from 'vue';

 import { useVbenDrawer } from '@vben/common-ui';
 import { $t } from '@vben/locales';
-import { cloneDeep, eachTree, listToTree } from '@vben/utils';
+import { cloneDeep, eachTree } from '@vben/utils';

 import { omit } from 'lodash-es';

 import { useVbenForm } from '#/adapter/form';
-import { menuList, tenantPackageMenuTreeSelect } from '#/api/system/menu';
+import { menuTreeSelect, tenantPackageMenuTreeSelect } from '#/api/system/menu';
 import {
  packageAdd,
  packageInfo,
  packageUpdate,
 } from '#/api/system/tenant-package';
-import { TreeSelectPanel } from '#/components/tree';
+import { MenuSelectTable } from '#/components/tree';

 import { drawerSchema } from './data';
-import TreeItem from './tree-item';

 const emit = defineEmits<{ reload: [] }>();

@@ -36,25 +37,34 @@ const [BasicForm, formApi] = useVbenForm({
  wrapperClass: 'grid-cols-2',
 });

-async function setupMenuTreeSelect(id?: number | string) {
+const menuTree = ref<MenuOption[]>([]);
+async function setupMenuTree(id?: number | string) {
  if (id) {
    const resp = await tenantPackageMenuTreeSelect(id);
+    const menus = resp.menus;
+    // i18n处理
+    eachTree(menus, (node) => {
+      node.label = $t(node.label);
+    });
+    // 设置菜单信息
+    menuTree.value = resp.menus;
+    // keys依赖于menu 需要先加载menu
+    await nextTick();
    await formApi.setFieldValue('menuIds', resp.checkedKeys);
+  } else {
+    const resp = await menuTreeSelect();
+    // i18n处理
+    eachTree(resp, (node) => {
+      node.label = $t(node.label);
+    });
+    // 设置菜单信息
+    menuTree.value = resp;
+    // keys依赖于menu 需要先加载menu
+    await nextTick();
+    await formApi.setFieldValue('menuIds', []);
  }
 }

-const menuTree = ref<any[]>([]);
-async function setupMenuTree() {
-  const resp = await menuList();
-  const treeData = listToTree(resp, { id: 'menuId' });
-  // i18n处理
-  eachTree(treeData, (node) => {
-    node.menuName = $t(node.menuName);
-  });
-  // 设置菜单信息
-  menuTree.value = treeData;
-}
-
 const [BasicDrawer, drawerApi] = useVbenDrawer({
  onCancel: handleCancel,
  onConfirm: handleConfirm,
@@ -72,20 +82,14 @@ const [BasicDrawer, drawerApi] = useVbenDrawer({
      // 通过setupMenuTreeSelect设置
      await formApi.setValues(omit(record, ['menuIds']));
    }
-    /**
-     * 加载菜单树和已勾选菜单
-     */
-    await Promise.all([setupMenuTree(), setupMenuTreeSelect(id)]);
+    // init菜单 注意顺序要放在赋值record之后 内部watch会依赖record
+    await setupMenuTree(id);

    drawerApi.drawerLoading(false);
  },
 });

-/**
- * 这里拿到的是一个数组ref
- */
-const menuSelectRef = ref();
-
+const menuSelectRef = ref<InstanceType<typeof MenuSelectTable>>();
 async function handleConfirm() {
  try {
    drawerApi.drawerLoading(true);
@@ -94,7 +98,7 @@ async function handleConfirm() {
      return;
    }
    // 这个用于提交
-    const menuIds = menuSelectRef.value?.[0]?.getCheckedKeys() ?? [];
+    const menuIds = menuSelectRef.value?.getCheckedKeys?.() ?? [];
    // formApi.getValues拿到的是一个readonly对象，不能直接修改，需要cloneDeep
    const data = cloneDeep(await formApi.getValues());
    data.menuIds = menuIds;
@@ -123,22 +127,19 @@ function handleMenuCheckStrictlyChange(value: boolean) {
 </script>

 <template>
-  <BasicDrawer :close-on-click-modal="false" :title="title" class="w-[600px]">
+  <BasicDrawer :close-on-click-modal="false" :title="title" class="w-[800px]">
    <BasicForm>
      <template #menuIds="slotProps">
-        <TreeSelectPanel
-          ref="menuSelectRef"
-          v-bind="slotProps"
-          :check-strictly="formApi.form.values.menuCheckStrictly"
-          :expand-all-on-init="false"
-          :field-names="{ title: 'menuName', key: 'menuId' }"
-          :tree-data="menuTree"
-          @check-strictly-change="handleMenuCheckStrictlyChange"
-        >
-          <template #title="data">
-            <TreeItem :data="data" />
-          </template>
-        </TreeSelectPanel>
+        <div class="h-[600px] w-full">
+          <!-- association为readonly 不能通过v-model绑定 -->
+          <MenuSelectTable
+            ref="menuSelectRef"
+            :checked-keys="slotProps.value"
+            :association="formApi.form.values.menuCheckStrictly"
+            :menus="menuTree"
+            @update:association="handleMenuCheckStrictlyChange"
+          />
+        </div>
      </template>
    </BasicForm>
  </BasicDrawer>
--- a/apps/web-antd/src/views/system/user/user-drawer.vue
+++ b/apps/web-antd/src/views/system/user/user-drawer.vue
@@ -1,14 +1,6 @@
 <script setup lang="ts">
 import type { Role } from '#/api/system/user/model';

-import { computed, h, ref } from 'vue';
-
-import { useVbenDrawer } from '@vben/common-ui';
-import { $t } from '@vben/locales';
-import { addFullName, cloneDeep, getPopupContainer } from '@vben/utils';
-
-import { Tag } from 'ant-design-vue';
-
 import { useVbenForm } from '#/adapter/form';
 import { configInfoByKey } from '#/api/system/config';
 import { postOptionSelect } from '#/api/system/post';
@@ -19,6 +11,11 @@ import {
  userUpdate,
 } from '#/api/system/user';
 import { authScopeOptions } from '#/views/system/role/data';
+import { useVbenDrawer } from '@vben/common-ui';
+import { $t } from '@vben/locales';
+import { addFullName, cloneDeep, getPopupContainer } from '@vben/utils';
+import { Tag } from 'ant-design-vue';
+import { computed, h, onMounted, ref } from 'vue';

 import { drawerSchema } from './data';

@@ -117,13 +114,20 @@ async function setupDeptSelect() {
  ]);
 }

+const defaultPassword = ref('');
+onMounted(async () => {
+  const password = await configInfoByKey('sys.user.initPassword');
+  if (password) {
+    defaultPassword.value = password;
+  }
+});
+
 /**
 * 新增时候 从参数设置获取默认密码
 */
 async function loadDefaultPassword(update: boolean) {
-  if (!update) {
-    const defaultPassword = await configInfoByKey('sys.user.initPassword');
-    defaultPassword && formApi.setFieldValue('password', defaultPassword);
+  if (!update && defaultPassword.value) {
+    formApi.setFieldValue('password', defaultPassword.value);
  }
 }

--- a/apps/web-antd/src/views/演示使用自行删除/menu/index.vue
+++ b/apps/web-antd/src/views/演示使用自行删除/menu/index.vue
@@ -0,0 +1,27 @@
+<script setup lang="ts">
+import type { MenuOption } from '#/api/system/menu/model';
+
+import { roleMenuTreeSelect } from '#/api/system/menu';
+import { MenuSelectTable } from '#/components/tree';
+import { Page } from '@vben/common-ui';
+import { onMounted, ref, shallowRef } from 'vue';
+
+const checkedKeys = ref<number[]>([]);
+const menus = shallowRef<MenuOption[]>([]);
+
+onMounted(async () => {
+  const resp = await roleMenuTreeSelect(3);
+  menus.value = resp.menus;
+  checkedKeys.value = resp.checkedKeys;
+});
+</script>
+
+<template>
+  <Page :auto-content-height="true">
+    <MenuSelectTable
+      :menus="menus"
+      v-model:checked-keys="checkedKeys"
+      :association="true"
+    />
+  </Page>
+</template>
--- a/apps/web-antd/src/views/演示使用自行删除/upload/index.vue
+++ b/apps/web-antd/src/views/演示使用自行删除/upload/index.vue
@@ -1,11 +1,8 @@
 <script setup lang="ts">
-import { ref } from 'vue';
-
-import { JsonPreview, Page } from '@vben/common-ui';
-
-import { Alert, RadioGroup } from 'ant-design-vue';
-
 import { FileUpload, ImageUpload } from '#/components/upload';
+import { JsonPreview, Page } from '@vben/common-ui';
+import { Alert, RadioGroup } from 'ant-design-vue';
+import { ref } from 'vue';

 const resultField = ref<'ossId' | 'url'>('ossId');

@@ -17,7 +14,7 @@ const fieldOptions = [
 ];
 const fileAccept = ['xlsx', 'word', 'pdf'];

-const signleImage = ref<string>('');
+const signleImage = ref<string>('1745443704356782081');
 </script>

 <template>
@@ -27,7 +24,11 @@ const signleImage = ref<string>('');
        :show-icon="true"
        message="新特性: 设置max-number为1时, 会被绑定为string而非string[]类型 省去手动转换"
      />
-      <ImageUpload v-model:value="signleImage" :max-number="1" />
+      <ImageUpload
+        v-model:value="signleImage"
+        :max-number="1"
+        result-field="ossId"
+      />
      <JsonPreview :data="signleImage" />
    </div>
    <div class="bg-background flex flex-col gap-[12px] rounded-lg p-6">
--- a/apps/web-antd/src/views/演示使用自行删除/vxe/edit-table.vue
+++ b/apps/web-antd/src/views/演示使用自行删除/vxe/edit-table.vue
@@ -0,0 +1,234 @@
+<script setup lang="tsx">
+import type { VxeGridProps } from '#/adapter/vxe-table';
+
+import { nextTick, onMounted } from 'vue';
+
+import { JsonPreview } from '@vben/common-ui';
+import { getPopupContainer } from '@vben/utils';
+
+import {
+  Button,
+  Input,
+  InputNumber,
+  message,
+  Modal,
+  Select,
+  Space,
+} from 'ant-design-vue';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+
+const gridOptions: VxeGridProps = {
+  editConfig: {
+    // 触发编辑的方式
+    trigger: 'click',
+    // 触发编辑的模式
+    mode: 'row',
+    showStatus: true,
+  },
+  border: true,
+  rowConfig: {
+    drag: true,
+  },
+  checkboxConfig: {},
+  editRules: {
+    name: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
+    age: [
+      { required: true, message: '请输入年龄', trigger: 'blur' },
+      { min: 0, max: 200, message: '年龄必须为1-200' },
+    ],
+    job: [{ required: true, message: '请选择工作', trigger: 'blur' }],
+  },
+  columns: [
+    {
+      type: 'checkbox',
+      width: 60,
+    },
+    {
+      dragSort: true,
+      title: '排序',
+      width: 60,
+    },
+    {
+      field: 'name',
+      title: '姓名',
+      align: 'left',
+      editRender: {},
+      slots: {
+        default: ({ row }) => {
+          if (!row.name) {
+            return <span class="text-red-500">未填写</span>;
+          }
+          return <span>{row.name}</span>;
+        },
+        edit: ({ row }) => {
+          return <Input placeholder={'请输入'} v-model:value={row.name} />;
+        },
+      },
+    },
+    {
+      field: 'age',
+      title: '年龄',
+      align: 'left',
+      editRender: {},
+      slots: {
+        default: ({ row }) => {
+          if (!row.age) {
+            return <span class="text-red-500">未填写</span>;
+          }
+          return <span>{row.age}</span>;
+        },
+        edit: ({ row }) => {
+          return (
+            <InputNumber
+              class="w-full"
+              placeholder={'请输入'}
+              v-model:value={row.age}
+            />
+          );
+        },
+      },
+    },
+    {
+      field: '工作',
+      title: 'job',
+      align: 'left',
+      editRender: {},
+      slots: {
+        default: ({ row }) => {
+          if (!row.job) {
+            return <span class="text-red-500">未选择</span>;
+          }
+          return <span>{row.job}</span>;
+        },
+        edit: ({ row }) => {
+          const options = ['前端佬', '后端佬', '组长'].map((item) => ({
+            label: item,
+            value: item,
+          }));
+          return (
+            <Select
+              class="w-full"
+              getPopupContainer={getPopupContainer}
+              options={options}
+              placeholder={'请选择'}
+              v-model:value={row.job}
+            />
+          );
+        },
+      },
+    },
+    {
+      field: 'action',
+      title: '操作',
+      width: 100,
+      slots: {
+        default: ({ $table, row }) => {
+          function handleDelete() {
+            $table.remove(row);
+          }
+          return (
+            <Button danger={true} onClick={handleDelete} size={'small'}>
+              删除
+            </Button>
+          );
+        },
+      },
+    },
+  ],
+  height: 'auto',
+  keepSource: true,
+  pagerConfig: {
+    enabled: false,
+  },
+  proxyConfig: {
+    enabled: false,
+  },
+  toolbarConfig: {
+    // 自定义列
+    custom: false,
+    // 最大化
+    zoom: false,
+    // 刷新
+    refresh: false,
+  },
+  showOverflow: false,
+};
+
+const [BasicTable, tableApi] = useVbenVxeGrid({
+  gridOptions,
+});
+
+onMounted(async () => {
+  const data = [
+    {
+      name: '张三',
+      age: 18,
+      job: '前端佬',
+    },
+    {
+      name: '李四',
+      age: 19,
+      job: '后端佬',
+    },
+    {
+      name: '王五',
+      age: 20,
+      job: '组长',
+    },
+  ];
+  await nextTick();
+  await tableApi.grid.loadData(data);
+});
+async function handleAdd() {
+  const record = { name: '', age: undefined, job: undefined };
+  const { row: newRow } = await tableApi.grid.insert(record);
+  await tableApi.grid.setEditCell(newRow, 'name');
+}
+
+async function handleRemove() {
+  await tableApi.grid.removeCheckboxRow();
+}
+
+async function handleValidate() {
+  const result = await tableApi.grid.validate(true);
+  if (result) {
+    message.error('校验失败');
+  } else {
+    message.success('校验成功');
+  }
+}
+
+function getData() {
+  const data = tableApi.grid.getTableData();
+  const { fullData } = data;
+  console.log(fullData);
+  Modal.info({
+    title: '提示',
+    content: (
+      <div class="max-h-[350px] overflow-y-auto">
+        <JsonPreview data={fullData} />
+      </div>
+    ),
+  });
+}
+</script>
+
+<template>
+  <BasicTable>
+    <template #toolbar-tools>
+      <Space>
+        <a-button @click="getData">获取表格数据</a-button>
+        <a-button @click="handleValidate">校验</a-button>
+        <a-button danger @click="handleRemove"> 删除勾选 </a-button>
+        <a-button
+          type="primary"
+          v-access:code="['system:config:add']"
+          @click="handleAdd"
+        >
+          {{ $t('pages.common.add') }}
+        </a-button>
+      </Space>
+    </template>
+  </BasicTable>
+</template>
--- a/apps/web-antd/src/views/演示使用自行删除/vxe/index.vue
+++ b/apps/web-antd/src/views/演示使用自行删除/vxe/index.vue
@@ -0,0 +1,17 @@
+<script setup lang="ts">
+import { Page } from '@vben/common-ui';
+
+import { Card } from 'ant-design-vue';
+
+import EditTable from './edit-table.vue';
+</script>
+
+<template>
+  <Page>
+    <div class="flex flex-col gap-4">
+      <Card title="可编辑表格" size="small">
+        <EditTable class="h-[500px]" />
+      </Card>
+    </div>
+  </Page>
+</template>