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

# Conflicts:
#	apps/web-antd/src/views/infra/demo/demo01/index.vue
#	apps/web-antd/src/views/infra/demo/general/demo01/index.vue
#	apps/web-antd/src/views/infra/demo/general/demo03/erp/index.vue
#	apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-course-list.vue
#	apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-grade-list.vue
#	apps/web-antd/src/views/infra/demo/general/demo03/inner/index.vue
#	apps/web-antd/src/views/infra/demo/general/demo03/normal/index.vue

apps/web-antd/src/views/infra/demo/demo01/data.ts

@@ -1,13 +1,9 @@
 import type { VbenFormSchema } from '#/adapter/form';
-import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { Demo01ContactApi } from '#/api/infra/demo/demo01';
 
-import { useAccess } from '@vben/access';
-
 import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils';
 
-const { hasAccessByCodes } = useAccess();
-
 /** 新增/修改的表单 */
 export function useFormSchema(): VbenFormSchema[] {
   return [
@@ -99,9 +95,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
 }
 
 /** 列表的字段 */
-export function useGridColumns(
-  onActionClick?: OnActionClickFn<Demo01ContactApi.Demo01Contact>,
-): VxeTableGridOptions<Demo01ContactApi.Demo01Contact>['columns'] {
+export function useGridColumns(): VxeTableGridOptions<Demo01ContactApi.Demo01Contact>['columns'] {
   return [
     { type: 'checkbox', width: 40 },
     {
@@ -146,30 +140,10 @@ export function useGridColumns(
       formatter: 'formatDateTime',
     },
     {
-      field: 'operation',
       title: '操作',
-      minWidth: 200,
-      align: 'center',
+      width: 160,
       fixed: 'right',
-      showOverflow: false,
-      cellRender: {
-        attrs: {
-          nameField: 'id',
-          nameTitle: '示例联系人',
-          onClick: onActionClick,
-        },
-        name: 'CellOperation',
-        options: [
-          {
-            code: 'edit',
-            show: hasAccessByCodes(['infra:demo01-contact:update']),
-          },
-          {
-            code: 'delete',
-            show: hasAccessByCodes(['infra:demo01-contact:delete']),
-          },
-        ],
-      },
+      slots: { default: 'actions' },
     },
   ];
 }