From f446ac43876682a1c0eaa80e20db9f3c02025b50 Mon Sep 17 00:00:00 2001
From: AN <1983933789@qq.com>
Date: Thu, 24 Apr 2025 22:22:11 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E5=88=97=E8=A1=A8=E5=A4=B4=E9=83=A8=E6=8F=92=E6=A7=BD?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E6=B7=BB=E5=8A=A0=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/java/VelocityUtils.java         |  2 +-
 src/components/custom/dict-tag.vue   |  6 ++--
 src/views/monitor/oper-log/index.vue | 47 ++++++++++++++--------------
 src/views/system/config/index.vue    | 41 ++++++++++++++----------
 src/views/system/dept/index.vue      | 25 ++++++++-------
 src/views/system/dict/type/index.vue | 35 +++++++++++----------
 src/views/system/tenant/index.vue    | 43 +++++++++++--------------
 7 files changed, 100 insertions(+), 99 deletions(-)

diff --git a/docs/java/VelocityUtils.java b/docs/java/VelocityUtils.java
index a64bcd63..73290c75 100644
--- a/docs/java/VelocityUtils.java
+++ b/docs/java/VelocityUtils.java
@@ -62,7 +62,7 @@ public class VelocityUtils {
         velocityContext.put("BusinessName", StringUtils.capitalize(genTable.getBusinessName()));
         velocityContext.put("businessName", genTable.getBusinessName());
         velocityContext.put("business_name", StrUtil.toUnderlineCase(genTable.getBusinessName()));
-        velocityContext.put("business-name", StrUtil.toUnderlineCase(genTable.getBusinessName()));
+        velocityContext.put("business-name", StrUtil.toSymbolCase(genTable.getBusinessName(),'-'));
         velocityContext.put("businessname", StrUtil.toSymbolCase(genTable.getBusinessName(), ' '));
         velocityContext.put("basePackage", getPackagePrefix(packageName));
         velocityContext.put("packageName", packageName);
diff --git a/src/components/custom/dict-tag.vue b/src/components/custom/dict-tag.vue
index 894d4f06..cf8464e4 100644
--- a/src/components/custom/dict-tag.vue
+++ b/src/components/custom/dict-tag.vue
@@ -10,7 +10,7 @@ interface Props {
   value?: string[] | number[] | string | number;
   dictCode?: string;
   immediate?: boolean;
-  dictData?: Api.System.DictData[];
+  dictData?: Api.System.DictData;
   [key: string]: any;
 }
 
@@ -25,7 +25,7 @@ const attrs = useAttrs() as TagProps;
 
 const dictTagData = computed<Api.System.DictData[]>(() => {
   if (props.dictData) {
-    return props.dictData;
+    return [props.dictData];
   }
   // 避免 props.value 为 0 时，无法触发
   if (props.dictCode && isNotNull(props.value)) {
@@ -42,7 +42,7 @@ const dictTagData = computed<Api.System.DictData[]>(() => {
     <NTag
       v-for="item in dictTagData"
       :key="item.dictValue"
-      class="mb-2 mr-2"
+      class="m-1"
       :class="[item.cssClass]"
       :type="item.listClass"
       v-bind="attrs"
diff --git a/src/views/monitor/oper-log/index.vue b/src/views/monitor/oper-log/index.vue
index 4614a9e8..4268effc 100644
--- a/src/views/monitor/oper-log/index.vue
+++ b/src/views/monitor/oper-log/index.vue
@@ -163,30 +163,29 @@ async function handleCleanOperLog() {
     <OperLogSearch v-model:model="searchParams" @reset="resetSearchParams" @search="getDataByPage" />
     <NCard title="操作日志列表" :bordered="false" size="small" class="sm:flex-1-hidden card-wrapper">
       <template #header-extra>
-        <NSpace>
-          <NPopconfirm v-if="hasAuth('monitor:operlog:remove')" @positive-click="() => handleCleanOperLog()">
-            <template #trigger>
-              <NButton type="warning" ghost size="small">
-                <template #icon>
-                  <icon-ic-round-delete class="text-icon" />
-                </template>
-                清空
-              </NButton>
-            </template>
-            确认清空操作日志？
-          </NPopconfirm>
-          <TableHeaderOperation
-            v-model:columns="columnChecks"
-            :disabled-delete="checkedRowKeys.length === 0"
-            :loading="loading"
-            :show-add="false"
-            :show-delete="hasAuth('monitor:operlog:remove')"
-            :show-export="hasAuth('monitor:operlog:export')"
-            @delete="handleBatchDelete"
-            @export="handleExport"
-            @refresh="getData"
-          />
-        </NSpace>
+        <TableHeaderOperation
+          v-model:columns="columnChecks"
+          :disabled-delete="checkedRowKeys.length === 0"
+          :loading="loading"
+          :show-add="false"
+          :show-delete="hasAuth('monitor:operlog:remove')"
+          :show-export="hasAuth('monitor:operlog:export')"
+          @delete="handleBatchDelete"
+          @export="handleExport"
+          @refresh="getData"
+        >
+          <template #prefix>
+            <NButton
+              v-if="hasAuth('monitor:operlog:remove')"
+              type="warning"
+              ghost
+              size="small"
+              @click="handleCleanOperLog"
+            >
+              清空
+            </NButton>
+          </template>
+        </TableHeaderOperation>
       </template>
       <NDataTable
         v-model:checked-row-keys="checkedRowKeys"
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index 37e9fbce..fabd489f 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -183,23 +183,30 @@ async function handleRefreshCache() {
     <ConfigSearch v-model:model="searchParams" @reset="resetSearchParams" @search="getDataByPage" />
     <NCard title="参数配置列表" :bordered="false" size="small" class="sm:flex-1-hidden card-wrapper">
       <template #header-extra>
-        <NSpace>
-          <NButton v-if="hasAuth('system:config:remove')" type="warning" ghost size="small" @click="handleRefreshCache">
-            刷新缓存
-          </NButton>
-          <TableHeaderOperation
-            v-model:columns="columnChecks"
-            :disabled-delete="checkedRowKeys.length === 0"
-            :loading="loading"
-            :show-add="hasAuth('system:config:add')"
-            :show-delete="hasAuth('system:config:remove')"
-            :show-export="hasAuth('system:config:export')"
-            @add="handleAdd"
-            @delete="handleBatchDelete"
-            @export="handleExport"
-            @refresh="getData"
-          />
-        </NSpace>
+        <TableHeaderOperation
+          v-model:columns="columnChecks"
+          :disabled-delete="checkedRowKeys.length === 0"
+          :loading="loading"
+          :show-add="hasAuth('system:config:add')"
+          :show-delete="hasAuth('system:config:remove')"
+          :show-export="hasAuth('system:config:export')"
+          @add="handleAdd"
+          @delete="handleBatchDelete"
+          @export="handleExport"
+          @refresh="getData"
+        >
+          <template #prefix>
+            <NButton
+              v-if="hasAuth('system:config:remove')"
+              type="warning"
+              ghost
+              size="small"
+              @click="handleRefreshCache"
+            >
+              刷新缓存
+            </NButton>
+          </template>
+        </TableHeaderOperation>
       </template>
       <NDataTable
         v-model:checked-row-keys="checkedRowKeys"
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 1bf7fcdc..79a5ed96 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -156,18 +156,19 @@ async function addInRow(row: TableDataWithIndex<Api.System.Dept>) {
     <DeptSearch v-model:model="searchParams" @reset="resetSearchParams" @search="getData" />
     <NCard title="部门列表" :bordered="false" size="small" class="sm:flex-1-hidden card-wrapper">
       <template #header-extra>
-        <div class="flex items-center gap-8px">
-          <NButton size="small" @click="expandAll">展开</NButton>
-          <NButton size="small" @click="collapseAll">收起</NButton>
-          <TableHeaderOperation
-            v-model:columns="columnChecks"
-            :loading="loading"
-            :show-add="hasAuth('system:dept:add')"
-            :show-delete="false"
-            @add="handleAdd"
-            @refresh="getData"
-          />
-        </div>
+        <TableHeaderOperation
+          v-model:columns="columnChecks"
+          :loading="loading"
+          :show-add="hasAuth('system:dept:add')"
+          :show-delete="false"
+          @add="handleAdd"
+          @refresh="getData"
+        >
+          <template #prefix>
+            <NButton size="small" @click="expandAll">展开</NButton>
+            <NButton size="small" @click="collapseAll">收起</NButton>
+          </template>
+        </TableHeaderOperation>
       </template>
       <NDataTable
         :columns="columns"
diff --git a/src/views/system/dict/type/index.vue b/src/views/system/dict/type/index.vue
index 3232f23d..e62a41d3 100644
--- a/src/views/system/dict/type/index.vue
+++ b/src/views/system/dict/type/index.vue
@@ -184,23 +184,24 @@ async function handleRefreshCache() {
     <DictTypeSearch v-model:model="searchParams" @reset="resetSearchParams" @search="getDataByPage" />
     <NCard title="字典类型列表" :bordered="false" size="small" class="sm:flex-1-hidden card-wrapper">
       <template #header-extra>
-        <NSpace>
-          <NButton v-if="hasAuth('system:dict:remove')" type="warning" ghost size="small" @click="handleRefreshCache">
-            刷新缓存
-          </NButton>
-          <TableHeaderOperation
-            v-model:columns="columnChecks"
-            :disabled-delete="checkedRowKeys.length === 0"
-            :loading="loading"
-            :show-add="hasAuth('system:dict:add')"
-            :show-delete="hasAuth('system:dict:remove')"
-            :show-export="hasAuth('system:dict:export')"
-            @add="handleAdd"
-            @delete="handleBatchDelete"
-            @export="handleExport"
-            @refresh="getData"
-          />
-        </NSpace>
+        <TableHeaderOperation
+          v-model:columns="columnChecks"
+          :disabled-delete="checkedRowKeys.length === 0"
+          :loading="loading"
+          :show-add="hasAuth('system:dict:add')"
+          :show-delete="hasAuth('system:dict:remove')"
+          :show-export="hasAuth('system:dict:export')"
+          @add="handleAdd"
+          @delete="handleBatchDelete"
+          @export="handleExport"
+          @refresh="getData"
+        >
+          <template #prefix>
+            <NButton v-if="hasAuth('system:dict:remove')" type="warning" ghost size="small" @click="handleRefreshCache">
+              刷新缓存
+            </NButton>
+          </template>
+        </TableHeaderOperation>
       </template>
       <NDataTable
         v-model:checked-row-keys="checkedRowKeys"
diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue
index 583e8673..c191c951 100644
--- a/src/views/system/tenant/index.vue
+++ b/src/views/system/tenant/index.vue
@@ -201,31 +201,24 @@ async function handleExport() {
     <TenantSearch v-model:model="searchParams" @reset="resetSearchParams" @search="getDataByPage" />
     <NCard title="租户列表" :bordered="false" size="small" class="sm:flex-1-hidden card-wrapper">
       <template #header-extra>
-        <NSpace>
-          <NPopconfirm v-if="isSuperAdmin" @positive-click="() => handleSyncTenantDict()">
-            <template #trigger>
-              <NButton size="small">
-                <template #icon>
-                  <icon-material-symbols:sync-rounded />
-                </template>
-                同步租户字典
-              </NButton>
-            </template>
-            确认同步租户字典？
-          </NPopconfirm>
-          <TableHeaderOperation
-            v-model:columns="columnChecks"
-            :disabled-delete="checkedRowKeys.length === 0"
-            :loading="loading"
-            :show-add="hasAuth('system:tenant:add')"
-            :show-delete="hasAuth('system:tenant:delete')"
-            :show-export="hasAuth('system:tenant:export')"
-            @add="handleAdd"
-            @delete="handleBatchDelete"
-            @export="handleExport"
-            @refresh="getData"
-          />
-        </NSpace>
+        <TableHeaderOperation
+          v-model:columns="columnChecks"
+          :disabled-delete="checkedRowKeys.length === 0"
+          :loading="loading"
+          :show-add="hasAuth('system:tenant:add')"
+          :show-delete="hasAuth('system:tenant:delete')"
+          :show-export="hasAuth('system:tenant:export')"
+          @add="handleAdd"
+          @delete="handleBatchDelete"
+          @export="handleExport"
+          @refresh="getData"
+        >
+          <template #prefix>
+            <NButton v-if="isSuperAdmin" type="warning" ghost size="small" @click="handleSyncTenantDict">
+              同步租户字典
+            </NButton>
+          </template>
+        </TableHeaderOperation>
       </template>
       <NDataTable
         v-model:checked-row-keys="checkedRowKeys"