From 8c5ea2ae72efb42008ade159f9ffbb084efa600c Mon Sep 17 00:00:00 2001
From: AN <1983933789@qq.com>
Date: Sat, 19 Apr 2025 08:18:07 +0800
Subject: [PATCH] =?UTF-8?q?chore:=E5=AD=97=E5=85=B8=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=8C=E6=94=AF=E6=8C=81=E6=95=B0=E7=BB=84?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=EF=BC=8C=E5=85=B6=E4=BB=96=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |  1 +
 src/components/custom/dict-select.vue         |  7 +-
 src/components/custom/dict-tag.vue            | 27 ++++--
 src/components/custom/json-preview.vue        | 27 +++---
 src/hooks/business/dict.ts                    | 11 ++-
 src/typings/api/system.api.d.ts               | 83 +++++++++++++++++++
 src/utils/common.ts                           |  5 ++
 .../modules/login-infor-view-drawer.vue       | 10 +--
 src/views/system/post/index.vue               |  6 +-
 .../tenant/modules/tenant-operate-drawer.vue  |  4 +-
 10 files changed, 138 insertions(+), 43 deletions(-)

diff --git a/package.json b/package.json
index 7f486d9d..190551a7 100644
--- a/package.json
+++ b/package.json
@@ -50,6 +50,7 @@
     "@sa/hooks": "workspace:*",
     "@sa/materials": "workspace:*",
     "@sa/utils": "workspace:*",
+    "@tinymce/tinymce-vue": "^6.1.0",
     "@vueuse/core": "12.5.0",
     "clipboard": "2.0.11",
     "dayjs": "1.11.13",
diff --git a/src/components/custom/dict-select.vue b/src/components/custom/dict-select.vue
index fc76755e..6956dfe1 100644
--- a/src/components/custom/dict-select.vue
+++ b/src/components/custom/dict-select.vue
@@ -8,14 +8,16 @@ defineOptions({ name: 'DictSelect' });
 interface Props {
   dictCode: string;
   immediate?: boolean;
+  multiple?: boolean;
   [key: string]: any;
 }
 
 const props = withDefaults(defineProps<Props>(), {
-  immediate: false
+  immediate: false,
+  multiple: false
 });
 
-const value = defineModel<string | null>('value', { required: false });
+const value = defineModel<string | string[] | null>('value', { required: false });
 
 const attrs: SelectProps = useAttrs();
 const { options } = useDict(props.dictCode, props.immediate);
@@ -24,6 +26,7 @@ const { options } = useDict(props.dictCode, props.immediate);
 <template>
   <NSelect
     v-model:value="value"
+    :multiple="multiple"
     :loading="!options.length"
     :options="options"
     :clear-filter-after-select="false"
diff --git a/src/components/custom/dict-tag.vue b/src/components/custom/dict-tag.vue
index 906cc3d8..894d4f06 100644
--- a/src/components/custom/dict-tag.vue
+++ b/src/components/custom/dict-tag.vue
@@ -7,10 +7,10 @@ import { isNotNull } from '@/utils/common';
 defineOptions({ name: 'DictTag' });
 
 interface Props {
-  value?: string | number;
+  value?: string[] | number[] | string | number;
   dictCode?: string;
   immediate?: boolean;
-  dictData?: Api.System.DictData;
+  dictData?: Api.System.DictData[];
   [key: string]: any;
 }
 
@@ -18,29 +18,38 @@ const props = withDefaults(defineProps<Props>(), {
   immediate: false,
   dictData: undefined,
   dictCode: '',
-  value: ''
+  value: () => []
 });
 
 const attrs = useAttrs() as TagProps;
 
-const dictTagData = computed(() => {
+const dictTagData = computed<Api.System.DictData[]>(() => {
   if (props.dictData) {
     return props.dictData;
   }
   // 避免 props.value 为 0 时，无法触发
   if (props.dictCode && isNotNull(props.value)) {
     const { transformDictData } = useDict(props.dictCode, props.immediate);
-    return transformDictData(String(props.value));
+    return transformDictData(props.value) || [];
   }
 
-  return null;
+  return [];
 });
 </script>
 
 <template>
-  <NTag v-if="dictTagData" :class="dictTagData.cssClass" :type="dictTagData.listClass" v-bind="attrs">
-    {{ dictTagData.dictLabel }}
-  </NTag>
+  <div v-if="dictTagData.length">
+    <NTag
+      v-for="item in dictTagData"
+      :key="item.dictValue"
+      class="mb-2 mr-2"
+      :class="[item.cssClass]"
+      :type="item.listClass"
+      v-bind="attrs"
+    >
+      {{ item.dictLabel }}
+    </NTag>
+  </div>
 </template>
 
 <style scoped></style>
diff --git a/src/components/custom/json-preview.vue b/src/components/custom/json-preview.vue
index efae49be..5320abb5 100644
--- a/src/components/custom/json-preview.vue
+++ b/src/components/custom/json-preview.vue
@@ -51,20 +51,19 @@ const jsonData = computed(() => {
 
 <template>
   <div class="json-preview">
-    <template v-if="jsonData">
-      <VueJsonPretty
-        :data="jsonData"
-        :deep="deep"
-        :show-double-quotes="showDoubleQuotes"
-        :show-length="showLength"
-        :show-line="showLine"
-        :show-line-number="showLineNumber"
-        :show-icon="showIcon"
-        :show-select-controller="showSelectController"
-        :collapsed-level="collapsedLevel"
-        :highlight-mouseover-node="highlightMouseoverNode"
-      />
-    </template>
+    <VueJsonPretty
+      v-if="jsonData"
+      :data="jsonData"
+      :deep="deep"
+      :show-double-quotes="showDoubleQuotes"
+      :show-length="showLength"
+      :show-line="showLine"
+      :show-line-number="showLineNumber"
+      :show-icon="showIcon"
+      :show-select-controller="showSelectController"
+      :collapsed-level="collapsedLevel"
+      :highlight-mouseover-node="highlightMouseoverNode"
+    />
     <span v-else-if="props.data">{{ props.data }}</span>
     <div v-else class="empty-data">暂无数据</div>
   </div>
diff --git a/src/hooks/business/dict.ts b/src/hooks/business/dict.ts
index 1d803a2e..798708ab 100644
--- a/src/hooks/business/dict.ts
+++ b/src/hooks/business/dict.ts
@@ -2,7 +2,7 @@ import { ref, watch } from 'vue';
 import { storeToRefs } from 'pinia';
 import { fetchGetDictDataByType } from '@/service/api/system';
 import { useDictStore } from '@/store/modules/dict';
-
+import { isNull } from '@/utils/common';
 export function useDict(dictType: string, immediate: boolean = true) {
   const dictStore = useDictStore();
   const { dictData: dictList } = storeToRefs(dictStore);
@@ -40,9 +40,12 @@ export function useDict(dictType: string, immediate: boolean = true) {
     options.value = data.value.map(dict => ({ label: dict.dictLabel!, value: dict.dictValue! }));
   }
 
-  function transformDictData(dictValue: string): Api.System.DictData | undefined {
-    if (!data.value.length || !dictValue) return undefined;
-    return data.value.find(dict => dict.dictValue === dictValue);
+  function transformDictData(dictValue: string[] | number[] | string | number) {
+    if (!data.value.length || isNull(dictValue)) return undefined;
+    if (Array.isArray(dictValue)) {
+      return data.value.filter(dict => dictValue.some(value => dict.dictValue === value.toString()));
+    }
+    return data.value.filter(dict => dict.dictValue === dictValue.toString());
   }
 
   if (immediate) {
diff --git a/src/typings/api/system.api.d.ts b/src/typings/api/system.api.d.ts
index f9d64952..a3937313 100644
--- a/src/typings/api/system.api.d.ts
+++ b/src/typings/api/system.api.d.ts
@@ -511,5 +511,88 @@ declare namespace Api {
 
     /** tenant package select list */
     type TenantPackageSelectList = Common.CommonRecord<Pick<TenantPackage, 'packageId' | 'packageName'>>;
+
+    /** notice */
+    type Notice = Common.CommonRecord<{
+      /** 公告ID */
+      noticeId: CommonType.IdType;
+      /** 租户编号 */
+      tenantId: CommonType.IdType;
+      /** 公告标题 */
+      noticeTitle: string;
+      /** 公告类型 */
+      noticeType: string;
+      /** 公告内容 */
+      noticeContent: string;
+      /** 公告状态 */
+      status: string;
+      /** 创建者 */
+      createByName: string;
+      /** 备注 */
+      remark: string;
+    }>;
+
+    /** notice search params */
+    type NoticeSearchParams = CommonType.RecordNullable<
+      Pick<Api.System.Notice, 'noticeTitle' | 'noticeType'> & Api.Common.CommonSearchParams
+    >;
+
+    /** notice operate params */
+    type NoticeOperateParams = CommonType.RecordNullable<
+      Pick<Api.System.Notice, 'noticeId' | 'noticeTitle' | 'noticeType' | 'noticeContent' | 'status'>
+    >;
+
+    /** notice list */
+    type NoticeList = Api.Common.PaginatingQueryRecord<Notice>;
+
+    /** client */
+    type Client = Common.CommonRecord<{
+      /** id */
+      id: CommonType.IdType;
+      /** 客户端id */
+      clientId: string;
+      /** 客户端key */
+      clientKey: string;
+      /** 客户端秘钥 */
+      clientSecret: string;
+      /** 授权类型 */
+      grantType: string;
+      /** 授权类型列表 */
+      grantTypeList: string[];
+      /** 设备类型 */
+      deviceType: string;
+      /** token活跃超时时间 */
+      activeTimeout: number;
+      /** token固定超时 */
+      timeout: number;
+      /** 状态 */
+      status: string;
+      /** 删除标志（0代表存在 1代表删除） */
+      delFlag: string;
+    }>;
+
+    /** client search params */
+    type ClientSearchParams = CommonType.RecordNullable<
+      Pick<Api.System.Client, 'clientKey' | 'clientSecret' | 'status'> & Api.Common.CommonSearchParams
+    >;
+
+    /** client operate params */
+    type ClientOperateParams = CommonType.RecordNullable<
+      Pick<
+        Api.System.Client,
+        | 'id'
+        | 'clientId'
+        | 'clientKey'
+        | 'clientSecret'
+        | 'grantTypeList'
+        | 'deviceType'
+        | 'activeTimeout'
+        | 'timeout'
+        | 'status'
+      >
+    >;
+
+    /** client list */
+    type ClientList = Api.Common.PaginatingQueryRecord<Client>;
   }
 }
diff --git a/src/utils/common.ts b/src/utils/common.ts
index be60e4af..d7e9133c 100644
--- a/src/utils/common.ts
+++ b/src/utils/common.ts
@@ -80,6 +80,11 @@ export function isNotNull(value: any) {
   return value !== undefined && value !== null && value !== '' && value !== 'undefined' && value !== 'null';
 }
 
+/** 判断是否为空 */
+export function isNull(value: any) {
+  return value === undefined || value === null || value === '' || value === 'undefined' || value === 'null';
+}
+
 /**
  * 构造树型结构数据
  *
diff --git a/src/views/monitor/login-infor/modules/login-infor-view-drawer.vue b/src/views/monitor/login-infor/modules/login-infor-view-drawer.vue
index 6405655c..2d90dd59 100644
--- a/src/views/monitor/login-infor/modules/login-infor-view-drawer.vue
+++ b/src/views/monitor/login-infor/modules/login-infor-view-drawer.vue
@@ -31,8 +31,8 @@ function closeDrawer() {
   <NDrawer v-model:show="visible" :title="title" display-directive="show" :width="800" class="max-w-90%">
     <NDrawerContent :title="title" :native-scrollbar="false" closable>
       <NDescriptions label-placement="left" :column="1" size="small" bordered>
-        <NDescriptionsItem label="用户账号">
-          {{ props.rowData?.userName }}
+        <NDescriptionsItem label="账号信息">
+          {{ props.rowData?.userName }} | {{ props.rowData?.ipaddr }} | {{ props.rowData?.loginLocation }}
         </NDescriptionsItem>
         <NDescriptionsItem label="客户端">
           {{ props.rowData?.clientKey }}
@@ -40,12 +40,6 @@ function closeDrawer() {
         <NDescriptionsItem label="设备类型">
           <DictTag size="small" :value="props.rowData?.deviceType" dict-code="sys_device_type" />
         </NDescriptionsItem>
-        <NDescriptionsItem label="登录IP地址">
-          {{ props.rowData?.ipaddr }}
-        </NDescriptionsItem>
-        <NDescriptionsItem label="登录地点">
-          {{ props.rowData?.loginLocation }}
-        </NDescriptionsItem>
         <NDescriptionsItem label="浏览器类型">
           <div class="flex items-center gap-2">
             <SvgIcon :icon="getBrowserIcon(props.rowData?.browser ?? '')" />
diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue
index 240f2d63..7eadcadf 100644
--- a/src/views/system/post/index.vue
+++ b/src/views/system/post/index.vue
@@ -10,6 +10,7 @@ import { useAppStore } from '@/store/modules/app';
 import { useDownload } from '@/hooks/business/download';
 import { useTable, useTableOperate } from '@/hooks/common/table';
 import DictTag from '@/components/custom/dict-tag.vue';
+import { useDict } from '@/hooks/business/dict';
 import PostOperateDrawer from './modules/post-operate-drawer.vue';
 import PostSearch from './modules/post-search.vue';
 
@@ -17,6 +18,7 @@ defineOptions({
   name: 'PostList'
 });
 
+useDict('sys_normal_disable');
 const appStore = useAppStore();
 const { download } = useDownload();
 const { hasAuth } = useAuth();
@@ -170,7 +172,6 @@ async function handleExport() {
 const { loading: treeLoading, startLoading: startTreeLoading, endLoading: endTreeLoading } = useLoading();
 const deptPattern = ref<string>();
 const deptData = ref<Api.Common.CommonTreeRecord>([]);
-const selectedKeys = ref<string[]>([]);
 
 async function getTreeData() {
   startTreeLoading();
@@ -184,7 +185,6 @@ async function getTreeData() {
 getTreeData();
 
 function handleClickTree(keys: string[]) {
-  selectedKeys.value = keys;
   searchParams.belongDeptId = keys.length ? keys[0] : null;
   checkedRowKeys.value = [];
   getDataByPage();
@@ -192,7 +192,6 @@ function handleClickTree(keys: string[]) {
 
 function handleResetTreeData() {
   deptPattern.value = undefined;
-  selectedKeys.value = [];
   searchParams.belongDeptId = null;
   getTreeData();
   getDataByPage();
@@ -212,7 +211,6 @@ function handleResetTreeData() {
       <NInput v-model:value="deptPattern" clearable :placeholder="$t('common.keywordSearch')" />
       <NSpin class="dept-tree" :show="treeLoading">
         <NTree
-          v-model:selected-keys="selectedKeys"
           block-node
           show-line
           :data="deptData as []"
diff --git a/src/views/system/tenant/modules/tenant-operate-drawer.vue b/src/views/system/tenant/modules/tenant-operate-drawer.vue
index f51eeaab..510eb5e9 100644
--- a/src/views/system/tenant/modules/tenant-operate-drawer.vue
+++ b/src/views/system/tenant/modules/tenant-operate-drawer.vue
@@ -261,7 +261,7 @@ watch(visible, () => {
             class="w-full"
           />
         </NFormItem>
-        <NFormItem label="用户数量" path="accountCount">
+        <NFormItem path="accountCount">
           <template #label>
             <div class="flex-center">
               <FormTip content="-1不限制用户数量" />
@@ -270,7 +270,7 @@ watch(visible, () => {
           </template>
           <NInputNumber v-model:value="model.accountCount" placeholder="请输入用户数量" min="-1" class="w-full" />
         </NFormItem>
-        <NFormItem label="绑定域名" path="domain">
+        <NFormItem path="domain">
           <template #label>
             <div class="flex-center">
               <FormTip