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

apps/web-antd/src/adapter/vxe-table.ts

@@ -1,3 +1,4 @@
+import type { VxeTableGridOptions } from '@vben/plugins/vxe-table';
 import type { Recordable } from '@vben/types';
 
 import { h } from 'vue';
@@ -63,7 +64,7 @@ setupVbenVxeTable({
         round: true,
         showOverflow: true,
         size: 'small',
-      },
+      } as VxeTableGridOptions,
     });
 
     // 表格配置项可以用 cellRender: { name: 'CellImage' },

apps/web-antd/src/api/mall/trade/delivery/pickUpStore/index.ts

@@ -35,6 +35,9 @@ export namespace MallDeliveryPickUpStoreApi {
 
   /** 绑定自提店员请求 */
   export interface BindStaffRequest {
+    id?: number;
+    /** 门店名称 */
+    name: string;
     /** 门店编号 */
     storeId: number;
     /** 用户编号列表 */

apps/web-antd/src/api/mall/trade/order/index.ts

@@ -176,13 +176,13 @@ export namespace MallOrderApi {
   /** 交易订单统计 */
   export interface OrderSummary {
     /** 订单数量 */
-    orderCount?: number;
+    orderCount: number;
     /** 订单金额 */
-    orderPayPrice?: string;
+    orderPayPrice: number;
     /** 退款单数 */
-    afterSaleCount?: number;
+    afterSaleCount: number;
     /** 退款金额 */
-    afterSalePrice?: string;
+    afterSalePrice: number;
   }
 
   /** 订单发货请求 */

apps/web-antd/src/components/summary-card/index.ts

@@ -0,0 +1,2 @@
+export { default as SummaryCard } from './summary-card.vue';
+export type { SummaryCardProps } from './typing';

apps/web-antd/src/components/summary-card/summary-card.vue

@@ -0,0 +1,52 @@
+<script lang="ts" setup>
+import type { SummaryCardProps } from './typing';
+
+import { CountTo } from '@vben/common-ui';
+import { IconifyIcon } from '@vben/icons';
+
+import { Tooltip } from 'ant-design-vue';
+
+/** 统计卡片 */
+defineOptions({ name: 'SummaryCard' });
+
+defineProps<SummaryCardProps>();
+</script>
+<template>
+  <div
+    class="flex flex-row items-center gap-3 rounded bg-[var(--el-bg-color-overlay)] p-4"
+  >
+    <div
+      class="rounded-1 flex h-12 w-12 flex-shrink-0 items-center justify-center"
+      :class="`${iconColor} ${iconBgColor}`"
+    >
+      <IconifyIcon v-if="icon" :icon="icon" class="!text-6" />
+    </div>
+    <div class="flex flex-col gap-1">
+      <div class="flex items-center gap-1">
+        <span class="text-3.5">{{ title }}</span>
+        <Tooltip :content="tooltip" placement="topLeft" v-if="tooltip">
+          <IconifyIcon icon="ep:warning" class="item-center !text-3 flex" />
+        </Tooltip>
+      </div>
+      <div class="flex flex-row items-baseline gap-2">
+        <div class="text-7">
+          <CountTo
+            :prefix="prefix"
+            :end-val="value ?? 0"
+            :decimals="decimals ?? 0"
+          />
+        </div>
+        <span
+          v-if="percent !== undefined"
+          :class="Number(percent) > 0 ? 'text-red-500' : 'text-green-500'"
+        >
+          <span class="text-sm">{{ Math.abs(Number(percent)) }}%</span>
+          <IconifyIcon
+            :icon="Number(percent) > 0 ? 'ep:caret-top' : 'ep:caret-bottom'"
+            class="!text-3 ml-0.5"
+          />
+        </span>
+      </div>
+    </div>
+  </div>
+</template>

apps/web-antd/src/components/summary-card/typing.ts

@@ -0,0 +1,11 @@
+export interface SummaryCardProps {
+  title: string;
+  tooltip?: string;
+  icon?: string;
+  iconColor?: string;
+  iconBgColor?: string;
+  prefix?: string;
+  value?: number;
+  decimals?: number;
+  percent?: number | string;
+}

apps/web-antd/src/views/crm/customer/limitConfig/data.ts

@@ -30,7 +30,7 @@ export function useFormSchema(confType: LimitConfType): VbenFormSchema[] {
           label: 'nickname',
           value: 'id',
         },
-        multiple: true,
+        mode: 'tags',
         allowClear: true,
       },
       rules: 'required',

apps/web-antd/src/views/mall/trade/delivery/pickUpOrder/data.ts

@@ -0,0 +1,126 @@
+import type { VbenFormSchema } from '#/adapter/form';
+import type { VxeGridPropTypes } from '#/adapter/vxe-table';
+import type { MallDeliveryPickUpStoreApi } from '#/api/mall/trade/delivery/pickUpStore';
+
+import { ref } from 'vue';
+
+import { getSimpleDeliveryPickUpStoreList } from '#/api/mall/trade/delivery/pickUpStore';
+import {
+  DeliveryTypeEnum,
+  DICT_TYPE,
+  getRangePickerDefaultProps,
+} from '#/utils';
+
+const pickUpStoreList = ref<MallDeliveryPickUpStoreApi.PickUpStore[]>([]);
+
+getSimpleDeliveryPickUpStoreList().then((res) => {
+  pickUpStoreList.value = res;
+});
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'createTime',
+      label: '创建时间',
+      component: 'RangePicker',
+      componentProps: {
+        ...getRangePickerDefaultProps(),
+        allowClear: true,
+      },
+    },
+    {
+      fieldName: 'pickUpStoreId',
+      label: '自提门店',
+      component: 'ApiSelect',
+      componentProps: {
+        api: getSimpleDeliveryPickUpStoreList,
+        fieldNames: {
+          label: 'name',
+          value: 'id',
+        },
+      },
+      dependencies: {
+        triggerFields: ['deliveryType'],
+        show: (values) => values.deliveryType === DeliveryTypeEnum.PICK_UP.type,
+      },
+    },
+  ];
+}
+
+/** 表格列配置 */
+export function useGridColumns(): VxeGridPropTypes.Columns {
+  return [
+    {
+      field: 'no',
+      title: '订单号',
+      fixed: 'left',
+      minWidth: 180,
+    },
+    {
+      field: 'user.nickname',
+      title: '用户信息',
+      minWidth: 100,
+    },
+    {
+      field: 'brokerageUser.nickname',
+      title: '推荐人信息',
+      minWidth: 100,
+    },
+    {
+      field: 'spuName',
+      title: '商品信息',
+      minWidth: 100,
+      formatter: ({ row }) => {
+        if (row.items.length > 1) {
+          return row.items.map((item: any) => item.spuName).join(',');
+        }
+      },
+    },
+    {
+      field: 'payPrice',
+      title: '实付金额(元)',
+      formatter: 'formatAmount2',
+      minWidth: 180,
+    },
+    {
+      field: 'storeStaffName',
+      title: '核销员',
+      minWidth: 160,
+    },
+    {
+      field: 'pickUpStoreId',
+      title: '核销门店',
+      minWidth: 160,
+      formatter: ({ row }) => {
+        return pickUpStoreList.value.find(
+          (item) => item.id === row.pickUpStoreId,
+        )?.name;
+      },
+    },
+    {
+      field: 'payStatus',
+      title: '支付状态',
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
+      },
+      minWidth: 80,
+    },
+    {
+      field: 'status',
+      title: '订单状态',
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.TRADE_ORDER_STATUS },
+      },
+      minWidth: 80,
+    },
+    {
+      field: 'createTime',
+      title: '下单时间',
+      formatter: 'formatDateTime',
+      minWidth: 160,
+    },
+  ];
+}

apps/web-antd/src/views/mall/trade/delivery/pickUpOrder/index.vue

@@ -1,38 +1,106 @@
 <script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MallOrderApi } from '#/api/mall/trade/order';
+
+import { onMounted, ref } from 'vue';
+
 import { Page } from '@vben/common-ui';
 
-import { Button } from 'ant-design-vue';
+import { Card } from 'ant-design-vue';
 
-import { DocAlert } from '#/components/doc-alert';
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getOrderPage, getOrderSummary } from '#/api/mall/trade/order';
+import { SummaryCard } from '#/components/summary-card';
+import { DeliveryTypeEnum, fenToYuan } from '#/utils';
+
+import { useGridColumns, useGridFormSchema } from './data';
+
+const summary = ref<MallOrderApi.OrderSummary>();
+
+async function getOrderSum() {
+  const query = await gridApi.formApi.getValues();
+  query.deliveryType = DeliveryTypeEnum.PICK_UP.type;
+  const res = await getOrderSummary(query as any);
+  summary.value = res;
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getOrderPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            deliveryType: DeliveryTypeEnum.PICK_UP.type,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+    },
+    toolbarConfig: {
+      refresh: { code: 'query' },
+      search: true,
+    },
+  } as VxeTableGridOptions<MallOrderApi.Order>,
+});
+
+onMounted(() => {
+  getOrderSum();
+});
 </script>
 
 <template>
-  <Page>
+  <Page auto-content-height>
-    <DocAlert
+    <Card class="mb-4 h-[10%]">
-      title="【交易】交易订单"
+      <template class="flex flex-row gap-4">
-      url="https://doc.iocoder.cn/mall/trade-order/"
+        <SummaryCard
-    />
+          class="flex flex-1"
-    <DocAlert
+          title="订单数量"
-      title="【交易】购物车"
+          icon="icon-park-outline:transaction-order"
-      url="https://doc.iocoder.cn/mall/trade-cart/"
+          icon-color="bg-blue-100"
-    />
+          icon-bg-color="text-blue-500"
-    <Button
+          :value="summary?.orderCount || 0"
-      danger
+        />
-      type="link"
+        <SummaryCard
-      target="_blank"
+          class="flex flex-1"
-      href="https://github.com/yudaocode/yudao-ui-admin-vue3"
+          title="订单金额"
-    >
+          icon="streamline:money-cash-file-dollar-common-money-currency-cash-file"
-      该功能支持 Vue3 + element-plus 版本！
+          icon-color="bg-purple-100"
-    </Button>
+          icon-bg-color="text-purple-500"
-    <br />
+          prefix="￥"
-    <Button
+          :decimals="2"
-      type="link"
+          :value="Number(fenToYuan(summary?.orderPayPrice || 0))"
-      target="_blank"
+        />
-      href="https://github.com/yudaocode/yudao-ui-admin-vue3/blob/master/src/views/mall/trade/delivery/pickUpOrder/index"
+        <SummaryCard
-    >
+          class="flex flex-1"
-      可参考
+          title="退款单数"
-      https://github.com/yudaocode/yudao-ui-admin-vue3/blob/master/src/views/mall/trade/delivery/pickUpOrder/index
+          icon="heroicons:receipt-refund"
-      代码，pull request 贡献给我们！
+          icon-color="bg-yellow-100"
-    </Button>
+          icon-bg-color="text-yellow-500"
+          :value="summary?.afterSaleCount || 0"
+        />
+        <SummaryCard
+          class="flex flex-1"
+          title="退款金额"
+          icon="ri:refund-2-line"
+          icon-color="bg-green-100"
+          icon-bg-color="text-green-500"
+          prefix="￥"
+          :decimals="2"
+          :value="Number(fenToYuan(summary?.afterSalePrice || 0))"
+        />
+      </template>
+    </Card>
+    <Grid class="h-[80%]" table-title="核销订单" />
   </Page>
 </template>

apps/web-antd/src/views/mall/trade/delivery/pickUpStore/data.ts

@@ -0,0 +1,248 @@
+import type { VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+
+import { z } from '#/adapter/form';
+import { getAreaTree } from '#/api/system/area';
+import { getSimpleUserList } from '#/api/system/user';
+import {
+  CommonStatusEnum,
+  DICT_TYPE,
+  getDictOptions,
+  getRangePickerDefaultProps,
+} from '#/utils';
+
+/** 新增/修改的表单 */
+export function useFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      component: 'Input',
+      fieldName: 'id',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      component: 'ImageUpload',
+      fieldName: 'logo',
+      label: '门店logo',
+      componentProps: {
+        maxSize: 1,
+      },
+      rules: 'required',
+    },
+    {
+      component: 'Input',
+      fieldName: 'name',
+      label: '门店名称',
+      rules: 'required',
+    },
+    {
+      component: 'Input',
+      fieldName: 'phone',
+      label: '门店手机',
+      rules: 'mobileRequired',
+    },
+    {
+      component: 'Textarea',
+      fieldName: 'introduction',
+      label: '门店简介',
+    },
+    {
+      fieldName: 'areaId',
+      label: '地址',
+      component: 'ApiTreeSelect',
+      componentProps: {
+        api: () => getAreaTree(),
+        fieldNames: { label: 'name', value: 'id', children: 'children' },
+      },
+    },
+    {
+      component: 'Input',
+      fieldName: 'detailAddress',
+      label: '详细地址',
+      rules: 'required',
+    },
+    {
+      component: 'TimePicker',
+      fieldName: 'openingTime',
+      label: '营业开始时间',
+      rules: 'required',
+    },
+    {
+      component: 'TimePicker',
+      fieldName: 'closingTime',
+      label: '营业结束时间',
+      rules: 'required',
+    },
+    {
+      component: 'Input',
+      fieldName: 'longitude',
+      label: '经度',
+      rules: 'required',
+    },
+    {
+      component: 'Input',
+      fieldName: 'latitude',
+      label: '纬度',
+      rules: 'required',
+    },
+    {
+      component: 'Input',
+      fieldName: 'getGeo',
+      label: '获取经纬度',
+    },
+    {
+      fieldName: 'status',
+      label: '门店状态',
+      component: 'RadioGroup',
+      componentProps: {
+        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
+        buttonStyle: 'solid',
+        optionType: 'button',
+      },
+      rules: z.number().default(CommonStatusEnum.ENABLE),
+    },
+  ];
+}
+
+/** 绑定店员的表单 */
+export function useBindFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      component: 'Input',
+      fieldName: 'id',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      component: 'Input',
+      fieldName: 'name',
+      label: '门店名称',
+      dependencies: {
+        triggerFields: ['id'],
+        disabled: () => true,
+      },
+    },
+    {
+      component: 'ApiSelect',
+      fieldName: 'verifyUserIds',
+      label: '门店店员',
+      rules: 'required',
+      componentProps: {
+        api: () => getSimpleUserList(),
+        fieldNames: { label: 'nickname', value: 'id' },
+        mode: 'tags',
+        allowClear: true,
+      },
+    },
+    {
+      component: 'Select',
+      fieldName: 'verifyUsers',
+      label: '店员列表',
+      rules: 'required',
+      componentProps: {
+        options: [],
+        mode: 'tags',
+      },
+      dependencies: {
+        triggerFields: ['verifyUserIds'],
+        trigger(values, form) {
+          form.setFieldValue('verifyUsers', values.verifyUserIds);
+        },
+        disabled: () => true,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'phone',
+      label: '门店手机',
+      component: 'Input',
+    },
+    {
+      fieldName: 'name',
+      label: '门店名称',
+      component: 'Input',
+    },
+    {
+      fieldName: 'status',
+      label: '门店状态',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
+      },
+    },
+    {
+      fieldName: 'createTime',
+      label: '创建时间',
+      component: 'RangePicker',
+      componentProps: {
+        ...getRangePickerDefaultProps(),
+        allowClear: true,
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions['columns'] {
+  return [
+    {
+      field: 'id',
+      title: '编号',
+    },
+    {
+      field: 'logo',
+      title: '门店logo',
+      cellRender: {
+        name: 'CellImage',
+      },
+    },
+    {
+      field: 'name',
+      title: '门店名称',
+    },
+    {
+      field: 'phone',
+      title: '门店手机',
+    },
+    {
+      field: 'detailAddress',
+      title: '地址',
+    },
+    {
+      field: 'openingTime',
+      title: '营业时间',
+      formatter: ({ row }) => {
+        return `${row.openingTime} ~ ${row.closingTime}`;
+      },
+    },
+    {
+      field: 'status',
+      title: '开启状态',
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.COMMON_STATUS },
+      },
+    },
+    {
+      field: 'createTime',
+      title: '创建时间',
+      formatter: 'formatDateTime',
+    },
+    {
+      title: '操作',
+      width: 200,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}

apps/web-antd/src/views/mall/trade/delivery/pickUpStore/index.vue

@@ -1,34 +1,149 @@
 <script lang="ts" setup>
-import { Page } from '@vben/common-ui';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MallDeliveryPickUpStoreApi } from '#/api/mall/trade/delivery/pickUpStore';
 
-import { Button } from 'ant-design-vue';
+import { Page, useVbenModal } from '@vben/common-ui';
 
-import { DocAlert } from '#/components/doc-alert';
+import { message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteDeliveryPickUpStore,
+  getDeliveryPickUpStorePage,
+} from '#/api/mall/trade/delivery/pickUpStore';
+import { $t } from '#/locales';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import BindForm from './modules/bind-form.vue';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+const [BindFormModal, bindFormModalApi] = useVbenModal({
+  connectedComponent: BindForm,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function onRefresh() {
+  gridApi.query();
+}
+
+/** 创建门店 */
+function handleCreate() {
+  formModalApi.setData(null).open();
+}
+
+/** 编辑门店 */
+function handleEdit(row: MallDeliveryPickUpStoreApi.PickUpStore) {
+  formModalApi.setData(row).open();
+}
+
+/** 绑定店员 */
+function handleBind(row: MallDeliveryPickUpStoreApi.PickUpStore) {
+  bindFormModalApi.setData(row).open();
+}
+
+/** 删除门店 */
+async function handleDelete(row: MallDeliveryPickUpStoreApi.PickUpStore) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.name]),
+    key: 'action_key_msg',
+  });
+  try {
+    await deleteDeliveryPickUpStore(row.id as number);
+    message.success({
+      content: $t('ui.actionMessage.deleteSuccess', [row.name]),
+      key: 'action_key_msg',
+    });
+    onRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getDeliveryPickUpStorePage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+    },
+    toolbarConfig: {
+      refresh: { code: 'query' },
+      search: true,
+    },
+  } as VxeTableGridOptions<MallDeliveryPickUpStoreApi.PickUpStore>,
+});
 </script>
 
 <template>
-  <Page>
+  <Page auto-content-height>
-    <DocAlert
+    <FormModal @success="onRefresh" />
-      title="【交易】快递发货"
+    <BindFormModal />
-      url="https://doc.iocoder.cn/mall/trade-delivery-express/"
+    <Grid table-title="门店列表">
-    />
+      <template #toolbar-tools>
-    <Button
+        <TableAction
-      danger
+          :actions="[
-      type="link"
+            {
-      target="_blank"
+              label: $t('ui.actionTitle.create', ['门店']),
-      href="https://github.com/yudaocode/yudao-ui-admin-vue3"
+              type: 'primary',
-    >
+              icon: ACTION_ICON.ADD,
-      该功能支持 Vue3 + element-plus 版本！
+              auth: ['trade:delivery:pick-up-store:create'],
-    </Button>
+              onClick: handleCreate,
-    <br />
+            },
-    <Button
+          ]"
-      type="link"
+        />
-      target="_blank"
+      </template>
-      href="https://github.com/yudaocode/yudao-ui-admin-vue3/blob/master/src/views/mall/trade/delivery/pickUpStore/index"
+      <template #actions="{ row }">
-    >
+        <TableAction
-      可参考
+          :actions="[
-      https://github.com/yudaocode/yudao-ui-admin-vue3/blob/master/src/views/mall/trade/delivery/pickUpStore/index
+            {
-      代码，pull request 贡献给我们！
+              label: $t('common.edit'),
-    </Button>
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              auth: ['trade:delivery:pick-up-store:update'],
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: '绑定店员',
+              type: 'link',
+              icon: ACTION_ICON.ADD,
+              auth: ['trade:delivery:pick-up-store:update'],
+              onClick: handleBind.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['trade:delivery:pick-up-store:delete'],
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.name]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
   </Page>
 </template>

apps/web-antd/src/views/mall/trade/delivery/pickUpStore/modules/bind-form.vue

@@ -0,0 +1,87 @@
+<script lang="ts" setup>
+import type { MallDeliveryPickUpStoreApi } from '#/api/mall/trade/delivery/pickUpStore';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  bindStoreStaffId,
+  getDeliveryPickUpStore,
+} from '#/api/mall/trade/delivery/pickUpStore';
+import { $t } from '#/locales';
+
+import { useBindFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MallDeliveryPickUpStoreApi.PickUpStore>();
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['绑定店员'])
+    : $t('ui.actionTitle.create', ['绑定店员']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-2',
+    labelWidth: 120,
+  },
+  layout: 'horizontal',
+  schema: useBindFormSchema(),
+  showDefaultActions: false,
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MallDeliveryPickUpStoreApi.BindStaffRequest;
+    try {
+      await bindStoreStaffId(data);
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    // 加载数据
+    const data =
+      modalApi.getData<MallDeliveryPickUpStoreApi.BindStaffRequest>();
+    if (!data || !data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getDeliveryPickUpStore(data.id as number);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal class="w-[40%]" :title="getTitle">
+    <Form class="mx-4" />
+  </Modal>
+</template>

apps/web-antd/src/views/mall/trade/delivery/pickUpStore/modules/form.vue

@@ -0,0 +1,89 @@
+<script lang="ts" setup>
+import type { MallDeliveryPickUpStoreApi } from '#/api/mall/trade/delivery/pickUpStore';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createDeliveryPickUpStore,
+  getDeliveryPickUpStore,
+  updateDeliveryPickUpStore,
+} from '#/api/mall/trade/delivery/pickUpStore';
+import { $t } from '#/locales';
+
+import { useFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MallDeliveryPickUpStoreApi.PickUpStore>();
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['自提订单'])
+    : $t('ui.actionTitle.create', ['自提订单']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-2',
+    labelWidth: 120,
+  },
+  layout: 'horizontal',
+  schema: useFormSchema(),
+  showDefaultActions: false,
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MallDeliveryPickUpStoreApi.PickUpStore;
+    try {
+      await (formData.value?.id
+        ? updateDeliveryPickUpStore(data)
+        : createDeliveryPickUpStore(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<MallDeliveryPickUpStoreApi.PickUpStore>();
+    if (!data || !data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getDeliveryPickUpStore(data.id as number);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal class="w-[40%]" :title="getTitle">
+    <Form class="mx-4" />
+  </Modal>
+</template>

apps/web-antd/src/views/system/role/modules/assign-data-permission-form.vue

@@ -135,12 +135,12 @@ function getAllNodeIds(nodes: any[], ids: number[] = []): number[] {
   <Modal title="数据权限" class="w-[40%]">
     <Form class="mx-4">
       <template #dataScopeDeptIds="slotProps">
-        <!-- <Spin :spinning="deptLoading"> -->
         <!-- TODO @芋艿：可优化，使用 antd 的 tree？原因是，更原生 -->
         <VbenTree
           :tree-data="deptTree"
           multiple
           bordered
+          :spinning="deptLoading"
           :expanded="expandedKeys"
           v-bind="slotProps"
           value-field="id"
@@ -148,7 +148,6 @@ function getAllNodeIds(nodes: any[], ids: number[] = []): number[] {
           :auto-check-parent="false"
           :check-strictly="!isCheckStrictly"
         />
-        <!-- </Spin> -->
       </template>
     </Form>
     <template #prepend-footer>

apps/web-antd/src/views/system/role/modules/assign-menu-form.vue

@@ -127,9 +127,9 @@ function getAllNodeIds(nodes: any[], ids: number[] = []): number[] {
   <Modal title="数据权限" class="w-[40%]">
     <Form class="mx-4">
       <template #menuIds="slotProps">
-        <!-- <Spin :spinning="menuLoading" class="w-full"> -->
         <!-- TODO @芋艿：可优化，使用 antd 的 tree？原因是，更原生 -->
         <VbenTree
+          :spinning="menuLoading"
           :tree-data="menuTree"
           multiple
           bordered
@@ -138,7 +138,6 @@ function getAllNodeIds(nodes: any[], ids: number[] = []): number[] {
           value-field="id"
           label-field="name"
         />
-        <!-- </Spin> -->
       </template>
     </Form>
     <template #prepend-footer>

apps/web-antd/src/views/system/user/modules/dept-tree.vue

@@ -6,7 +6,7 @@ import { onMounted, ref } from 'vue';
 import { Search } from '@vben/icons';
 import { handleTree } from '@vben/utils';
 
-import { Input, Spin, Tree } from 'ant-design-vue';
+import { Input, Tree } from 'ant-design-vue';
 
 import { getSimpleDeptList } from '#/api/system/dept';
 
@@ -66,18 +66,17 @@ onMounted(async () => {
         </template>
       </Input>
     </div>
-    <Spin :spinning="loading">
+    <Tree
-      <Tree
+      :spinning="loading"
-        class="pt-2"
+      class="pt-2"
-        v-if="deptTree.length > 0"
+      v-if="deptTree.length > 0"
-        :tree-data="deptTree"
+      :tree-data="deptTree"
-        :field-names="{ title: 'name', key: 'id', children: 'children' }"
+      :field-names="{ title: 'name', key: 'id', children: 'children' }"
-        @select="handleSelect"
+      @select="handleSelect"
-        :default-expand-all="true"
+      :default-expand-all="true"
-      />
+    />
-      <div v-else-if="!loading" class="py-4 text-center text-gray-500">
+    <div v-else-if="!loading" class="py-4 text-center text-gray-500">
-        暂无数据
+      暂无数据
-      </div>
+    </div>
-    </Spin>
   </div>
 </template>

apps/web-ele/src/adapter/vxe-table.ts

@@ -1,3 +1,4 @@
+import type { VxeTableGridOptions } from '@vben/plugins/vxe-table';
 import type { Recordable } from '@vben/types';
 
 import { h } from 'vue';
@@ -63,7 +64,7 @@ setupVbenVxeTable({
         round: true,
         showOverflow: true,
         size: 'small',
-      },
+      } as VxeTableGridOptions,
     });
 
     // 表格配置项可以用 cellRender: { name: 'CellImage' },

apps/web-naive/src/adapter/vxe-table.ts

@@ -1,3 +1,4 @@
+import type { VxeTableGridOptions } from '@vben/plugins/vxe-table';
 import type { Recordable } from '@vben/types';
 
 import { h } from 'vue';
@@ -57,7 +58,7 @@ setupVbenVxeTable({
         round: true,
         showOverflow: true,
         size: 'small',
-      },
+      } as VxeTableGridOptions,
     });
 
     // 表格配置项可以用 cellRender: { name: 'CellImage' },

packages/@core/ui-kit/shadcn-ui/src/components/button/check-button-group.vue

@@ -122,6 +122,7 @@ async function onBtnClick(value: ValueType) {
       v-bind="btnDefaultProps"
       :variant="innerValue.includes(btn.value) ? 'default' : 'outline'"
       @click="onBtnClick(btn.value)"
+      type="button"
     >
       <div class="icon-wrapper" v-if="props.showIcon">
         <slot

packages/effects/hooks/src/use-hover-toggle.ts

@@ -8,19 +8,40 @@ import { isFunction } from '@vben/utils';
 
 import { useElementHover } from '@vueuse/core';
 
+interface HoverDelayOptions {
+  /** 鼠标进入延迟时间 */
+  enterDelay?: (() => number) | number;
+  /** 鼠标离开延迟时间 */
+  leaveDelay?: (() => number) | number;
+}
+
+const DEFAULT_LEAVE_DELAY = 500; // 鼠标离开延迟时间，默认为 500ms
+const DEFAULT_ENTER_DELAY = 0; // 鼠标进入延迟时间，默认为 0（立即响应）
+
 /**
  * 监测鼠标是否在元素内部，如果在元素内部则返回 true，否则返回 false
  * @param refElement 所有需要检测的元素。如果提供了一个数组，那么鼠标在任何一个元素内部都会返回 true
- * @param delay 延迟更新状态的时间
+ * @param delay 延迟更新状态的时间，可以是数字或包含进入/离开延迟的配置对象
  * @returns 返回一个数组，第一个元素是一个 ref，表示鼠标是否在元素内部，第二个元素是一个控制器，可以通过 enable 和 disable 方法来控制监听器的启用和禁用
  */
 export function useHoverToggle(
   refElement: Arrayable<MaybeElementRef>,
-  delay: (() => number) | number = 500,
+  delay: (() => number) | HoverDelayOptions | number = DEFAULT_LEAVE_DELAY,
 ) {
+  // 兼容旧版本API
+  const normalizedOptions: HoverDelayOptions =
+    typeof delay === 'number' || isFunction(delay)
+      ? { enterDelay: DEFAULT_ENTER_DELAY, leaveDelay: delay }
+      : {
+          enterDelay: DEFAULT_ENTER_DELAY,
+          leaveDelay: DEFAULT_LEAVE_DELAY,
+          ...delay,
+        };
+
   const isHovers: Array<Ref<boolean>> = [];
   const value = ref(false);
-  const timer = ref<ReturnType<typeof setTimeout> | undefined>();
+  const enterTimer = ref<ReturnType<typeof setTimeout> | undefined>();
+  const leaveTimer = ref<ReturnType<typeof setTimeout> | undefined>();
   const refs = Array.isArray(refElement) ? refElement : [refElement];
   refs.forEach((refEle) => {
     const eleRef = computed(() => {
@@ -32,15 +53,47 @@ export function useHoverToggle(
   });
   const isOutsideAll = computed(() => isHovers.every((v) => !v.value));
 
+  function clearTimers() {
+    if (enterTimer.value) {
+      clearTimeout(enterTimer.value);
+      enterTimer.value = undefined;
+    }
+    if (leaveTimer.value) {
+      clearTimeout(leaveTimer.value);
+      leaveTimer.value = undefined;
+    }
+  }
+
   function setValueDelay(val: boolean) {
-    timer.value && clearTimeout(timer.value);
+    clearTimers();
-    timer.value = setTimeout(
+
-      () => {
+    if (val) {
-        value.value = val;
+      // 鼠标进入
-        timer.value = undefined;
+      const enterDelay = normalizedOptions.enterDelay ?? DEFAULT_ENTER_DELAY;
-      },
+      const delayTime = isFunction(enterDelay) ? enterDelay() : enterDelay;
-      isFunction(delay) ? delay() : delay,
+
-    );
+      if (delayTime <= 0) {
+        value.value = true;
+      } else {
+        enterTimer.value = setTimeout(() => {
+          value.value = true;
+          enterTimer.value = undefined;
+        }, delayTime);
+      }
+    } else {
+      // 鼠标离开
+      const leaveDelay = normalizedOptions.leaveDelay ?? DEFAULT_LEAVE_DELAY;
+      const delayTime = isFunction(leaveDelay) ? leaveDelay() : leaveDelay;
+
+      if (delayTime <= 0) {
+        value.value = false;
+      } else {
+        leaveTimer.value = setTimeout(() => {
+          value.value = false;
+          leaveTimer.value = undefined;
+        }, delayTime);
+      }
+    }
   }
 
   const watcher = watch(
@@ -61,7 +114,7 @@ export function useHoverToggle(
   };
 
   onUnmounted(() => {
-    timer.value && clearTimeout(timer.value);
+    clearTimers();
   });
 
   return [value, controller] as [typeof value, typeof controller];

packages/effects/plugins/src/vxe-table/api.ts

@@ -26,14 +26,14 @@ function getDefaultState(): VxeGridProps {
   };
 }
 
-export class VxeGridApi {
+export class VxeGridApi<T extends Record<string, any> = any> {
   public formApi = {} as ExtendedFormApi;
 
   // private prevState: null | VxeGridProps = null;
-  public grid = {} as VxeGridInstance;
+  public grid = {} as VxeGridInstance<T>;
-  public state: null | VxeGridProps = null;
+  public state: null | VxeGridProps<T> = null;
 
-  public store: Store<VxeGridProps>;
+  public store: Store<VxeGridProps<T>>;
 
   private isMounted = false;
 
@@ -99,8 +99,8 @@ export class VxeGridApi {
 
   setState(
     stateOrFn:
-      | ((prev: VxeGridProps) => Partial<VxeGridProps>)
+      | ((prev: VxeGridProps<T>) => Partial<VxeGridProps<T>>)
-      | Partial<VxeGridProps>,
+      | Partial<VxeGridProps<T>>,
   ) {
     if (isFunction(stateOrFn)) {
       this.store.setState((prev) => {

packages/effects/plugins/src/vxe-table/types.ts

@@ -9,7 +9,7 @@ import type { Ref } from 'vue';
 
 import type { ClassType, DeepPartial } from '@vben/types';
 
-import type { VbenFormProps } from '@vben-core/form-ui';
+import type { BaseFormComponentType, VbenFormProps } from '@vben-core/form-ui';
 
 import type { VxeGridApi } from './api';
 
@@ -35,7 +35,11 @@ export interface SeparatorOptions {
   show?: boolean;
   backgroundColor?: string;
 }
-export interface VxeGridProps {
+
+export interface VxeGridProps<
+  T extends Record<string, any> = any,
+  D extends BaseFormComponentType = BaseFormComponentType,
+> {
   /**
    * 标题
    */
@@ -55,15 +59,15 @@ export interface VxeGridProps {
   /**
    * vxe-grid 配置
    */
-  gridOptions?: DeepPartial<VxeTableGridOptions>;
+  gridOptions?: DeepPartial<VxeTableGridOptions<T>>;
   /**
    * vxe-grid 事件
    */
-  gridEvents?: DeepPartial<VxeGridListeners>;
+  gridEvents?: DeepPartial<VxeGridListeners<T>>;
   /**
    * 表单配置
    */
-  formOptions?: VbenFormProps;
+  formOptions?: VbenFormProps<D>;
   /**
    * 显示搜索表单
    */
@@ -74,9 +78,12 @@ export interface VxeGridProps {
   separator?: boolean | SeparatorOptions;
 }
 
-export type ExtendedVxeGridApi = VxeGridApi & {
+export type ExtendedVxeGridApi<
-  useStore: <T = NoInfer<VxeGridProps>>(
+  D extends Record<string, any> = any,
-    selector?: (state: NoInfer<VxeGridProps>) => T,
+  F extends BaseFormComponentType = BaseFormComponentType,
+> = VxeGridApi<D> & {
+  useStore: <T = NoInfer<VxeGridProps<D, F>>>(
+    selector?: (state: NoInfer<VxeGridProps<any, any>>) => T,
   ) => Readonly<Ref<T>>;
 };
 

packages/effects/plugins/src/vxe-table/use-vxe-grid.ts

@@ -1,3 +1,5 @@
+import type { BaseFormComponentType } from '@vben-core/form-ui';
+
 import type { ExtendedVxeGridApi, VxeGridProps } from './types';
 
 import { defineComponent, h, onBeforeUnmount } from 'vue';
@@ -7,16 +9,19 @@ import { useStore } from '@vben-core/shared/store';
 import { VxeGridApi } from './api';
 import VxeGrid from './use-vxe-grid.vue';
 
-export function useVbenVxeGrid(options: VxeGridProps) {
+export function useVbenVxeGrid<
+  T extends Record<string, any> = any,
+  D extends BaseFormComponentType = BaseFormComponentType,
+>(options: VxeGridProps<T, D>) {
   // const IS_REACTIVE = isReactive(options);
   const api = new VxeGridApi(options);
-  const extendedApi: ExtendedVxeGridApi = api as ExtendedVxeGridApi;
+  const extendedApi: ExtendedVxeGridApi<T, D> = api as ExtendedVxeGridApi<T, D>;
   extendedApi.useStore = (selector) => {
     return useStore(api.store, selector);
   };
 
   const Grid = defineComponent(
-    (props: VxeGridProps, { attrs, slots }) => {
+    (props: VxeGridProps<T>, { attrs, slots }) => {
       onBeforeUnmount(() => {
         api.unmount();
       });

packages/effects/request/src/request-client/modules/uploader.ts

@@ -1,6 +1,8 @@
 import type { RequestClient } from '../request-client';
 import type { RequestClientConfig } from '../types';
 
+import { isUndefined } from '@vben/utils';
+
 class FileUploader {
   private client: RequestClient;
 
@@ -18,10 +20,10 @@ class FileUploader {
     Object.entries(data).forEach(([key, value]) => {
       if (Array.isArray(value)) {
         value.forEach((item, index) => {
-          formData.append(`${key}[${index}]`, item);
+          !isUndefined(item) && formData.append(`${key}[${index}]`, item);
         });
       } else {
-        formData.append(key, value);
+        !isUndefined(value) && formData.append(key, value);
       }
     });
 

playground/src/adapter/vxe-table.ts

@@ -1,10 +1,16 @@
+import type { VxeTableGridOptions } from '@vben/plugins/vxe-table';
 import type { Recordable } from '@vben/types';
 
+import type { ComponentType } from './component';
+
 import { h } from 'vue';
 
 import { IconifyIcon } from '@vben/icons';
 import { $te } from '@vben/locales';
-import { setupVbenVxeTable, useVbenVxeGrid } from '@vben/plugins/vxe-table';
+import {
+  setupVbenVxeTable,
+  useVbenVxeGrid as useGrid,
+} from '@vben/plugins/vxe-table';
 import { get, isFunction, isString } from '@vben/utils';
 
 import { objectOmit } from '@vueuse/core';
@@ -42,7 +48,7 @@ setupVbenVxeTable({
         round: true,
         showOverflow: true,
         size: 'small',
-      },
+      } as VxeTableGridOptions,
     });
 
     /**
@@ -277,7 +283,10 @@ setupVbenVxeTable({
   useVbenForm,
 });
 
-export { useVbenVxeGrid };
+export const useVbenVxeGrid = <T extends Record<string, any>>(
+  ...rest: Parameters<typeof useGrid<T, ComponentType>>
+) => useGrid<T, ComponentType>(...rest);
+
 export type OnActionClickParams<T = Recordable<any>> = {
   code: string;
   row: T;

playground/src/views/examples/vxe-table/basic.vue

@@ -43,7 +43,22 @@ const gridEvents: VxeGridListeners<RowType> = {
   },
 };
 
-const [Grid, gridApi] = useVbenVxeGrid({ gridEvents, gridOptions });
+const [Grid, gridApi] = useVbenVxeGrid<RowType>({
+  // 放开注释查看表单组件的类型
+  // formOptions: {
+  //   schema: [
+  //     {
+  //       component: 'Switch',
+  //       fieldName: 'name',
+  //     },
+  //   ],
+  // },
+  gridEvents,
+  gridOptions,
+});
+
+// 放开注释查看当前表格实例的类型
+// gridApi.grid
 
 const showBorder = gridApi.useStore((state) => state.gridOptions?.border);
 const showStripe = gridApi.useStore((state) => state.gridOptions?.stripe);

playground/src/views/system/menu/modules/form.vue

@@ -241,10 +241,10 @@ const schema: VbenFormSchema[] = [
     component: 'Input',
     dependencies: {
       rules: (values) => {
-        return values.type === 'action' ? 'required' : null;
+        return values.type === 'button' ? 'required' : null;
       },
       show: (values) => {
-        return ['action', 'catalog', 'embedded', 'menu'].includes(values.type);
+        return ['button', 'catalog', 'embedded', 'menu'].includes(values.type);
       },
       triggerFields: ['type'],
     },
@@ -277,7 +277,7 @@ const schema: VbenFormSchema[] = [
     },
     dependencies: {
       show: (values) => {
-        return values.type !== 'action';
+        return values.type !== 'button';
       },
       triggerFields: ['type'],
     },
@@ -295,7 +295,7 @@ const schema: VbenFormSchema[] = [
     },
     dependencies: {
       show: (values) => {
-        return values.type !== 'action';
+        return values.type !== 'button';
       },
       triggerFields: ['type'],
     },
@@ -314,7 +314,7 @@ const schema: VbenFormSchema[] = [
     },
     dependencies: {
       show: (values) => {
-        return values.type !== 'action';
+        return values.type !== 'button';
       },
       triggerFields: ['type'],
     },
@@ -325,7 +325,7 @@ const schema: VbenFormSchema[] = [
     component: 'Divider',
     dependencies: {
       show: (values) => {
-        return !['action', 'link'].includes(values.type);
+        return !['button', 'link'].includes(values.type);
       },
       triggerFields: ['type'],
     },
@@ -372,7 +372,7 @@ const schema: VbenFormSchema[] = [
     component: 'Checkbox',
     dependencies: {
       show: (values) => {
-        return !['action'].includes(values.type);
+        return !['button'].includes(values.type);
       },
       triggerFields: ['type'],
     },
@@ -402,7 +402,7 @@ const schema: VbenFormSchema[] = [
     component: 'Checkbox',
     dependencies: {
       show: (values) => {
-        return !['action', 'link'].includes(values.type);
+        return !['button', 'link'].includes(values.type);
       },
       triggerFields: ['type'],
     },
@@ -417,7 +417,7 @@ const schema: VbenFormSchema[] = [
     component: 'Checkbox',
     dependencies: {
       show: (values) => {
-        return !['action', 'link'].includes(values.type);
+        return !['button', 'link'].includes(values.type);
       },
       triggerFields: ['type'],
     },