From ce4c086473df00f78a369ca2a12c2aac23221957 Mon Sep 17 00:00:00 2001
From: AN <1983933789@qq.com>
Date: Thu, 3 Apr 2025 15:32:37 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E9=A1=B9=E6=97=B6=E4=B8=8B=E6=8B=89Tag=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=EF=BC=8C=E5=AF=B9=E6=8E=A5=E5=8F=82=E6=95=B0=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/template/modules/soy.search.vue.vm       |  1 -
 .../advanced/table-header-operation.vue       |  3 +-
 src/hooks/business/download.ts                | 15 +++--
 src/router/elegant/imports.ts                 |  1 +
 src/router/elegant/routes.ts                  |  9 +++
 src/router/elegant/transform.ts               |  1 +
 src/typings/api/system.api.d.ts               | 41 +++++++++---
 src/typings/elegant-router.d.ts               |  2 +
 src/views/system/dict/data/index.vue          | 16 ++++-
 .../data/modules/dict-data-operate-drawer.vue | 63 ++++++++++++-------
 src/views/system/dict/index.vue               |  6 +-
 src/views/system/tenant/index.vue             |  4 +-
 12 files changed, 117 insertions(+), 45 deletions(-)

diff --git a/docs/template/modules/soy.search.vue.vm b/docs/template/modules/soy.search.vue.vm
index 6329202c..20e586d8 100644
--- a/docs/template/modules/soy.search.vue.vm
+++ b/docs/template/modules/soy.search.vue.vm
@@ -1,6 +1,5 @@
 #set($ModuleName=$moduleName.substring(0, 1).toUpperCase() + $moduleName.substring(1))
 <script setup lang="ts">
-import { ref } from 'vue';
 import { $t } from '@/locales';
 import { useNaiveForm } from '@/hooks/common/form';
 #if($dictList && $dictList.size() > 0)import { useDict } from '@/hooks/business/dict';#end
diff --git a/src/components/advanced/table-header-operation.vue b/src/components/advanced/table-header-operation.vue
index d57da441..44358a46 100644
--- a/src/components/advanced/table-header-operation.vue
+++ b/src/components/advanced/table-header-operation.vue
@@ -8,6 +8,7 @@ defineOptions({
 interface Props {
   itemAlign?: NaiveUI.Align;
   disabledDelete?: boolean;
+  disableAdd?: boolean;
   loading?: boolean;
   showAdd?: boolean;
   showDelete?: boolean;
@@ -55,7 +56,7 @@ function handleExport() {
   <NSpace :align="itemAlign" wrap justify="end" class="lt-sm:w-200px">
     <slot name="prefix"></slot>
     <slot name="default">
-      <NButton v-if="showAdd" size="small" ghost type="primary" @click="add">
+      <NButton v-if="showAdd" :disabled="disableAdd" size="small" ghost type="primary" @click="add">
         <template #icon>
           <icon-ic-round-plus class="text-icon" />
         </template>
diff --git a/src/hooks/business/download.ts b/src/hooks/business/download.ts
index 3bde55a1..640d4662 100644
--- a/src/hooks/business/download.ts
+++ b/src/hooks/business/download.ts
@@ -29,15 +29,20 @@ export function useDownload() {
     const token = localStg.get('token');
     const clientId = import.meta.env.VITE_APP_CLIENT_ID;
     const now = Date.now();
-    const formData = new FormData();
-    Object.keys(params).forEach(key => formData.append(key, params[key]));
+    const searchParams = new FormData();
+    if (params) {
+      Object.keys(params).forEach(key => {
+        if (params[key] !== null && params[key] !== undefined) {
+          searchParams.append(key, params[key]);
+        }
+      });
+    }
     fetch(`${baseURL}${url}?t=${now}`, {
       method: 'post',
-      body: formData,
+      body: searchParams,
       headers: {
         Authorization: `Bearer ${token}`,
-        Clientid: clientId!,
-        'Content-Type': 'application/x-www-form-urlencoded'
+        Clientid: clientId!
       }
     })
       .then(async response => {
diff --git a/src/router/elegant/imports.ts b/src/router/elegant/imports.ts
index 852c8d60..887738f3 100644
--- a/src/router/elegant/imports.ts
+++ b/src/router/elegant/imports.ts
@@ -21,6 +21,7 @@ export const views: Record<LastLevelRouteKey, RouteComponent | (() => Promise<Ro
   "iframe-page": () => import("@/views/_builtin/iframe-page/[url].vue"),
   login: () => import("@/views/_builtin/login/index.vue"),
   home: () => import("@/views/home/index.vue"),
+  system_config: () => import("@/views/system/config/index.vue"),
   system_dict_data: () => import("@/views/system/dict/data/index.vue"),
   system_dict: () => import("@/views/system/dict/index.vue"),
   system_dict_type: () => import("@/views/system/dict/type/index.vue"),
diff --git a/src/router/elegant/routes.ts b/src/router/elegant/routes.ts
index d510e086..91e62cc9 100644
--- a/src/router/elegant/routes.ts
+++ b/src/router/elegant/routes.ts
@@ -86,6 +86,15 @@ export const generatedRoutes: GeneratedRoute[] = [
       order: 1
     },
     children: [
+      {
+        name: 'system_config',
+        path: '/system/config',
+        component: 'view.system_config',
+        meta: {
+          title: 'system_config',
+          i18nKey: 'route.system_config'
+        }
+      },
       {
         name: 'system_dict',
         path: '/system/dict',
diff --git a/src/router/elegant/transform.ts b/src/router/elegant/transform.ts
index d48f3649..88d09d60 100644
--- a/src/router/elegant/transform.ts
+++ b/src/router/elegant/transform.ts
@@ -170,6 +170,7 @@ const routeMap: RouteMap = {
   "iframe-page": "/iframe-page/:url",
   "login": "/login/:module(pwd-login|code-login|register|reset-pwd|bind-wechat)?",
   "system": "/system",
+  "system_config": "/system/config",
   "system_dict": "/system/dict",
   "system_dict_data": "/system/dict/data",
   "system_dict_type": "/system/dict/type",
diff --git a/src/typings/api/system.api.d.ts b/src/typings/api/system.api.d.ts
index 49ce6b47..d591eeb2 100644
--- a/src/typings/api/system.api.d.ts
+++ b/src/typings/api/system.api.d.ts
@@ -285,15 +285,7 @@ declare namespace Api {
     type DictDataOperateParams = CommonType.RecordNullable<
       Pick<
         Api.System.DictData,
-        | 'dictCode'
-        | 'dictSort'
-        | 'dictLabel'
-        | 'dictValue'
-        | 'dictType'
-        | 'cssClass'
-        | 'listClass'
-        | 'isDefault'
-        | 'remark'
+        'dictCode' | 'dictSort' | 'dictLabel' | 'dictValue' | 'dictType' | 'cssClass' | 'listClass' | 'remark'
       >
     >;
 
@@ -381,6 +373,37 @@ declare namespace Api {
     /** post list */
     type PostList = Api.Common.PaginatingQueryRecord<Post>;
 
+    /** config */
+    type Config = Common.CommonRecord<{
+      /** 参数主键 */
+      configId: CommonType.IdType;
+      /** 租户编号 */
+      tenantId: CommonType.IdType;
+      /** 参数名称 */
+      configName: string;
+      /** 参数键名 */
+      configKey: string;
+      /** 参数键值 */
+      configValue: string;
+      /** 是否内置 */
+      configType: string;
+      /** 备注 */
+      remark: string;
+    }>;
+
+    /** config search params */
+    type ConfigSearchParams = CommonType.RecordNullable<
+      Pick<Api.System.Config, 'configName' | 'configKey' | 'configType' | 'createTime'> & Api.Common.CommonSearchParams
+    >;
+
+    /** config operate params */
+    type ConfigOperateParams = CommonType.RecordNullable<
+      Pick<Api.System.Config, 'configId' | 'configName' | 'configKey' | 'configValue' | 'configType' | 'remark'>
+    >;
+
+    /** config list */
+    type ConfigList = Api.Common.PaginatingQueryRecord<Config>;
+
     /** tenant */
     type Tenant = Common.CommonRecord<{
       /** id */
diff --git a/src/typings/elegant-router.d.ts b/src/typings/elegant-router.d.ts
index 24f0c2de..18cb4f75 100644
--- a/src/typings/elegant-router.d.ts
+++ b/src/typings/elegant-router.d.ts
@@ -24,6 +24,7 @@ declare module "@elegant-router/types" {
     "iframe-page": "/iframe-page/:url";
     "login": "/login/:module(pwd-login|code-login|register|reset-pwd|bind-wechat)?";
     "system": "/system";
+    "system_config": "/system/config";
     "system_dict": "/system/dict";
     "system_dict_data": "/system/dict/data";
     "system_dict_type": "/system/dict/type";
@@ -93,6 +94,7 @@ declare module "@elegant-router/types" {
     | "iframe-page"
     | "login"
     | "home"
+    | "system_config"
     | "system_dict_data"
     | "system_dict"
     | "system_dict_type"
diff --git a/src/views/system/dict/data/index.vue b/src/views/system/dict/data/index.vue
index 74814bce..c8a19f76 100644
--- a/src/views/system/dict/data/index.vue
+++ b/src/views/system/dict/data/index.vue
@@ -10,6 +10,7 @@ import DictTag from '@/components/custom/dict-tag.vue';
 import { emitter } from '../mitt';
 import DictDataOperateDrawer from './modules/dict-data-operate-drawer.vue';
 import DictDataSearch from './modules/dict-data-search.vue';
+import { ref } from 'vue';
 defineOptions({
   name: 'DictDataList'
 });
@@ -170,19 +171,29 @@ async function handleExport() {
 
 emitter.on('rowClick', async (value: string) => {
   searchParams.dictType = value;
-  await getData();
+  await getDataByPage();
 });
+
+/**
+ * 自定义重置方法，重置dictLabel，不重置dictType
+ */
+async function handleReset() {
+  searchParams.dictLabel = null;
+  await getDataByPage();
+}
+
 </script>
 
 <template>
   <div class="min-h-500px flex-col-stretch gap-16px overflow-hidden lt-sm:overflow-auto">
-    <DictDataSearch v-model:model="searchParams" @reset="resetSearchParams" @search="getDataByPage" />
+    <DictDataSearch v-model:model="searchParams" @reset="handleReset" @search="getDataByPage" />
     <NCard title="字典数据列表" :bordered="false" size="small" class="sm:flex-1-hidden card-wrapper">
       <template #header-extra>
         <TableHeaderOperation
           v-model:columns="columnChecks"
           :disabled-delete="checkedRowKeys.length === 0"
           :loading="loading"
+          :disable-add="searchParams.dictType == null"
           :show-add="hasAuth('system:dictData:add')"
           :show-delete="hasAuth('system:dictData:remove')"
           :show-export="hasAuth('system:dictData:export')"
@@ -209,6 +220,7 @@ emitter.on('rowClick', async (value: string) => {
         v-model:visible="drawerVisible"
         :operate-type="operateType"
         :row-data="editingData"
+        :dict-type="searchParams.dictType || ''"
         @submitted="getDataByPage"
       />
     </NCard>
diff --git a/src/views/system/dict/data/modules/dict-data-operate-drawer.vue b/src/views/system/dict/data/modules/dict-data-operate-drawer.vue
index b9e30f44..1af1a9bc 100644
--- a/src/views/system/dict/data/modules/dict-data-operate-drawer.vue
+++ b/src/views/system/dict/data/modules/dict-data-operate-drawer.vue
@@ -1,8 +1,9 @@
 <script setup lang="ts">
-import { computed, reactive, watch } from 'vue';
+import { computed, h, reactive, watch } from 'vue';
 import { useFormRules, useNaiveForm } from '@/hooks/common/form';
 import { $t } from '@/locales';
 import { fetchCreateDictData, fetchUpdateDictData } from '@/service/api/system/dict-data';
+import { NTag } from 'naive-ui';
 
 defineOptions({
   name: 'DictDataOperateDrawer'
@@ -13,6 +14,7 @@ interface Props {
   operateType: NaiveUI.TableOperateType;
   /** the edit row data */
   rowData?: Api.System.DictData | null;
+  dictType: string;
 }
 
 const props = defineProps<Props>();
@@ -42,15 +44,23 @@ type Model = Api.System.DictDataOperateParams;
 
 const model: Model = reactive(createDefaultModel());
 
+const listClassOptions = [
+  { label: 'primary', value: 'primary' },
+  { label: 'success', value: 'success' },
+  { label: 'info', value: 'info' },
+  { label: 'warning', value: 'warning' },
+  { label: 'error', value: 'error' },
+  { label: 'default', value: 'default' }
+]
+
 function createDefaultModel(): Model {
   return {
-    dictSort: null,
+    dictSort: 0,
     dictLabel: '',
     dictValue: '',
-    dictType: '',
+    dictType: props.dictType,
     cssClass: '',
     listClass: null,
-    isDefault: '',
     remark: ''
   };
 }
@@ -83,7 +93,7 @@ async function handleSubmit() {
 
   // request
   if (props.operateType === 'add') {
-    const { dictSort, dictLabel, dictValue, dictType, cssClass, listClass, isDefault, remark } = model;
+    const { dictSort, dictLabel, dictValue, dictType, cssClass, listClass, remark } = model;
     const { error } = await fetchCreateDictData({
       dictSort,
       dictLabel,
@@ -91,14 +101,13 @@ async function handleSubmit() {
       dictType,
       cssClass,
       listClass,
-      isDefault,
       remark
     });
     if (error) return;
   }
 
   if (props.operateType === 'edit') {
-    const { dictCode, dictSort, dictLabel, dictValue, dictType, cssClass, listClass, isDefault, remark } = model;
+    const { dictCode, dictSort, dictLabel, dictValue, dictType, cssClass, listClass, remark } = model;
     const { error } = await fetchUpdateDictData({
       dictCode,
       dictSort,
@@ -107,7 +116,6 @@ async function handleSubmit() {
       dictType,
       cssClass,
       listClass,
-      isDefault,
       remark
     });
     if (error) return;
@@ -124,32 +132,44 @@ watch(visible, () => {
     restoreValidation();
   }
 });
+
+function renderTagLabel(option: { label: string; value: string }) {
+  return h(
+    'div',
+    { class: 'flex items-center gap-2' },
+    [
+      h(NTag, {type: option.value as any,}, { default: () => option.label })
+    ]
+  );
+}
 </script>
 
 <template>
   <NDrawer v-model:show="visible" :title="title" display-directive="show" :width="800" class="max-w-90%">
     <NDrawerContent :title="title" :native-scrollbar="false" closable>
       <NForm ref="formRef" :model="model" :rules="rules">
-        <NFormItem label="字典排序" path="dictSort">
-          <NInputNumber v-model:value="model.dictSort" placeholder="请输入字典排序" />
+        <NFormItem label="字典类型" path="dictType">
+          <NInput v-model:value="model.dictType" disabled placeholder="请输入字典类型" />
         </NFormItem>
-        <NFormItem label="字典标签" path="dictLabel">
+        <NFormItem label="标签样式" path="listClass">
+          <NSelect
+            v-model:value="model.listClass"
+            :options="listClassOptions"
+            placeholder="请选择标签样式"
+            :render-label="renderTagLabel"
+          />
+        </NFormItem>
+        <NFormItem label="数据标签" path="dictLabel">
           <NInput v-model:value="model.dictLabel" placeholder="请输入字典标签" />
         </NFormItem>
-        <NFormItem label="字典键值" path="dictValue">
+        <NFormItem label="数据键值" path="dictValue">
           <NInput v-model:value="model.dictValue" placeholder="请输入字典键值" />
         </NFormItem>
-        <NFormItem label="字典类型" path="dictType">
-          <NInput v-model:value="model.dictType" placeholder="请输入字典类型" />
-        </NFormItem>
-        <NFormItem label="样式属性（其他样式扩展）" path="cssClass">
+        <NFormItem label="css类名" path="cssClass">
           <NInput v-model:value="model.cssClass" placeholder="请输入样式属性（其他样式扩展）" />
         </NFormItem>
-        <NFormItem label="表格回显样式" path="listClass">
-          <NInput v-model:value="model.listClass" placeholder="请输入表格回显样式" />
-        </NFormItem>
-        <NFormItem label="是否默认（Y是 N否）" path="isDefault">
-          <NInput v-model:value="model.isDefault" placeholder="请输入是否默认（Y是 N否）" />
+        <NFormItem label="显示排序" path="dictSort">
+          <NInputNumber v-model:value="model.dictSort" placeholder="请输入字典排序" />
         </NFormItem>
         <NFormItem label="备注" path="remark">
           <NInput v-model:value="model.remark" :rows="3" type="textarea" placeholder="请输入备注" />
@@ -166,4 +186,3 @@ watch(visible, () => {
 </template>
 
 <style scoped></style>
-@/service/api/system/dict-data
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index f8a289d6..eda44670 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -9,9 +9,9 @@ onUnmounted(() => emitter.off('rowClick'));
 </script>
 
 <template>
-  <div class="h-full flex gap-16px">
-    <DictTypeList class="w-1/2" />
-    <DictDataList class="w-1/2" />
+  <div class="h-full flex flex-col md:flex-row gap-16px">
+    <DictTypeList class="w-full md:w-1/2" />
+    <DictDataList class="w-full md:w-1/2" />
   </div>
 </template>
 
diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue
index 321fbc6f..09f48427 100644
--- a/src/views/system/tenant/index.vue
+++ b/src/views/system/tenant/index.vue
@@ -202,9 +202,9 @@ async function handleExport() {
     <NCard title="租户列表" :bordered="false" size="small" class="sm:flex-1-hidden card-wrapper">
       <template #header-extra>
         <NSpace>
-          <NPopconfirm @positive-click="() => handleSyncTenantDict()">
+          <NPopconfirm v-if="isSuperAdmin" @positive-click="() => handleSyncTenantDict()">
             <template #trigger>
-              <NButton v-if="isSuperAdmin" size="small">
+              <NButton size="small">
                 <template #icon>
                   <icon-material-symbols:sync-rounded />
                 </template>