diff --git a/apps/web-antd/src/views/system/area/index.vue b/apps/web-antd/src/views/system/area/index.vue
index 54277f6dc..a07141905 100644
--- a/apps/web-antd/src/views/system/area/index.vue
+++ b/apps/web-antd/src/views/system/area/index.vue
@@ -15,7 +15,7 @@ const [FormModal, formModalApi] = useVbenModal({
});
/** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
gridApi.query();
}
@@ -60,7 +60,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
-
+
{
-
+
{
{
label: isExpanded ? '收缩' : '展开',
type: 'primary',
- onClick: toggleExpand,
+ onClick: handleExpand,
},
{
label: '批量删除',
diff --git a/apps/web-antd/src/views/system/dict/modules/data-grid.vue b/apps/web-antd/src/views/system/dict/modules/data-grid.vue
index 1a603195e..2e18c7027 100644
--- a/apps/web-antd/src/views/system/dict/modules/data-grid.vue
+++ b/apps/web-antd/src/views/system/dict/modules/data-grid.vue
@@ -34,7 +34,7 @@ const [DataFormModal, dataFormModalApi] = useVbenModal({
});
/** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
gridApi.query();
}
@@ -61,9 +61,9 @@ async function handleDelete(row: SystemDictDataApi.DictData) {
duration: 0,
});
try {
- await deleteDictData(row.id);
+ await deleteDictData(row.id!);
message.success($t('ui.actionMessage.deleteSuccess', [row.label]));
- onRefresh();
+ handleRefresh();
} finally {
hideLoading();
}
@@ -80,7 +80,7 @@ async function handleDeleteBatch() {
await deleteDictDataList(checkedIds.value);
checkedIds.value = [];
message.success($t('ui.actionMessage.deleteSuccess'));
- onRefresh();
+ handleRefresh();
} finally {
hideLoading();
}
@@ -135,7 +135,7 @@ watch(
() => props.dictType,
() => {
if (props.dictType) {
- onRefresh();
+ handleRefresh();
}
},
);
@@ -143,7 +143,7 @@ watch(
-
+
diff --git a/apps/web-antd/src/views/system/dict/modules/type-grid.vue b/apps/web-antd/src/views/system/dict/modules/type-grid.vue
index e83902d8e..ebfa663ab 100644
--- a/apps/web-antd/src/views/system/dict/modules/type-grid.vue
+++ b/apps/web-antd/src/views/system/dict/modules/type-grid.vue
@@ -32,7 +32,7 @@ const [TypeFormModal, typeFormModalApi] = useVbenModal({
});
/** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
gridApi.query();
}
@@ -59,9 +59,9 @@ async function handleDelete(row: SystemDictTypeApi.DictType) {
duration: 0,
});
try {
- await deleteDictType(row.id);
+ await deleteDictType(row.id!);
message.success($t('ui.actionMessage.deleteSuccess', [row.name]));
- onRefresh();
+ handleRefresh();
} finally {
hideLoading();
}
@@ -78,7 +78,7 @@ async function handleDeleteBatch() {
await deleteDictTypeList(checkedIds.value);
checkedIds.value = [];
message.success($t('ui.actionMessage.deleteSuccess'));
- onRefresh();
+ handleRefresh();
} finally {
hideLoading();
}
@@ -134,7 +134,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
-
+
-
+
-
+
-
+
diff --git a/apps/web-ele/src/views/system/dept/index.vue b/apps/web-ele/src/views/system/dept/index.vue
index eab4805a1..9209a5330 100644
--- a/apps/web-ele/src/views/system/dept/index.vue
+++ b/apps/web-ele/src/views/system/dept/index.vue
@@ -32,13 +32,13 @@ function getLeaderName(userId: number) {
/** 切换树形展开/收缩状态 */
const isExpanded = ref(true);
-function toggleExpand() {
+function handleExpand() {
isExpanded.value = !isExpanded.value;
gridApi.grid.setAllTreeExpand(isExpanded.value);
}
/** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
gridApi.query();
}
@@ -65,7 +65,7 @@ async function handleDelete(row: SystemDeptApi.Dept) {
try {
await deleteDept(row.id as number);
ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.name]));
- onRefresh();
+ handleRefresh();
} finally {
loadingInstance.close();
}
@@ -81,7 +81,7 @@ async function handleDeleteBatch() {
await deleteDeptList(checkedIds.value);
checkedIds.value = [];
ElMessage.success($t('ui.actionMessage.deleteSuccess'));
- onRefresh();
+ handleRefresh();
} finally {
loadingInstance.close();
}
@@ -140,7 +140,7 @@ onMounted(async () => {
-
+
{
{
label: isExpanded ? '收缩' : '展开',
type: 'primary',
- onClick: toggleExpand,
+ onClick: handleExpand,
},
{
label: '批量删除',
diff --git a/apps/web-ele/src/views/system/dict/modules/data-grid.vue b/apps/web-ele/src/views/system/dict/modules/data-grid.vue
index b0fdd6503..54053c386 100644
--- a/apps/web-ele/src/views/system/dict/modules/data-grid.vue
+++ b/apps/web-ele/src/views/system/dict/modules/data-grid.vue
@@ -34,7 +34,7 @@ const [DataFormModal, dataFormModalApi] = useVbenModal({
});
/** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
gridApi.query();
}
@@ -60,9 +60,9 @@ async function handleDelete(row: SystemDictDataApi.DictData) {
text: $t('ui.actionMessage.deleting', [row.label]),
});
try {
- await deleteDictData(row.id);
+ await deleteDictData(row.id!);
ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.label]));
- onRefresh();
+ handleRefresh();
} finally {
loadingInstance.close();
}
@@ -78,7 +78,7 @@ async function handleDeleteBatch() {
await deleteDictDataList(checkedIds.value);
checkedIds.value = [];
ElMessage.success($t('ui.actionMessage.deleteSuccess'));
- onRefresh();
+ handleRefresh();
} finally {
loadingInstance.close();
}
@@ -133,7 +133,7 @@ watch(
() => props.dictType,
() => {
if (props.dictType) {
- onRefresh();
+ handleRefresh();
}
},
);
@@ -141,7 +141,7 @@ watch(
-
+
diff --git a/apps/web-ele/src/views/system/dict/modules/type-grid.vue b/apps/web-ele/src/views/system/dict/modules/type-grid.vue
index ec0c1a195..f9fcc8804 100644
--- a/apps/web-ele/src/views/system/dict/modules/type-grid.vue
+++ b/apps/web-ele/src/views/system/dict/modules/type-grid.vue
@@ -29,7 +29,7 @@ const [TypeFormModal, typeFormModalApi] = useVbenModal({
});
/** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
gridApi.query();
}
@@ -57,7 +57,7 @@ async function handleDelete(row: SystemDictTypeApi.DictType) {
try {
await deleteDictType(row.id as number);
ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.name]));
- onRefresh();
+ handleRefresh();
} finally {
loadingInstance.close();
}
@@ -73,7 +73,7 @@ async function handleDeleteBatch() {
await deleteDictTypeList(checkedIds.value);
checkedIds.value = [];
ElMessage.success($t('ui.actionMessage.deleteSuccess'));
- onRefresh();
+ handleRefresh();
} finally {
loadingInstance.close();
}
@@ -129,7 +129,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
-
+
(
- onActionClick: OnActionClickFn,
-): VxeTableGridOptions['columns'] {
+export function useGridColumns(): VxeTableGridOptions['columns'] {
return [
{
field: 'id',
@@ -92,26 +86,10 @@ export function useGridColumns(
formatter: 'formatDateTime',
},
{
- field: 'operation',
title: '操作',
- minWidth: 120,
- align: 'center',
+ width: 120,
fixed: 'right',
- cellRender: {
- attrs: {
- nameField: 'username',
- nameTitle: '登录日志',
- onClick: onActionClick,
- },
- name: 'CellOperation',
- options: [
- {
- code: 'detail',
- text: '详情',
- show: hasAccessByCodes(['system:login-log:query']),
- },
- ],
- },
+ slots: { default: 'actions' },
},
];
}
diff --git a/apps/web-ele/src/views/system/loginlog/index.vue b/apps/web-ele/src/views/system/loginlog/index.vue
index 98c31beab..734d3528c 100644
--- a/apps/web-ele/src/views/system/loginlog/index.vue
+++ b/apps/web-ele/src/views/system/loginlog/index.vue
@@ -1,19 +1,13 @@