update

src/hooks/enum/index.ts

@@ -42,7 +42,7 @@ export function useEnum(code: string) {
 
         if (valuesSet.size === 0) {
             return state.enums.map((e) => ({
-                label: e[localizedKey].toString(),
+                label: e[localizedKey]?.toString() || e.enumitemname.toString(),
                 value: e.enumitemname
             }))
         }
@@ -58,7 +58,7 @@ export function useEnum(code: string) {
         })
 
         return result.map((e) => ({
-            label: e[localizedKey].toString(),
+            label: e[localizedKey]?.toString() || e.enumitemname.toString(),
             value: e.enumitemname
         }))
     }

src/packages/pc/components/base/editor/index.vue

@@ -5,6 +5,8 @@
 
 <script lang="ts" setup>
 import { computed } from 'vue'
+import { Language } from '@/constants/language'
+import { i18n } from '@/stores'
 import Editor from '@tinymce/tinymce-vue'
 
 const props = defineProps({
@@ -21,10 +23,30 @@ const editorValue = computed({
     set: (val) => emit('update:modelValue', val)
 })
 
+const language = computed(() => {
+    switch (i18n.global.locale) {
+        case Language.Simplified:
+            return 'zh_CN'
+        case Language.Traditional:
+            return 'zh_TW'
+        case Language.Thai:
+            return 'th_TH'
+        case Language.Vietnamese:
+            return 'vi'
+        default:
+            return 'en-US'
+    }
+})
+
 const config = {
-    language: 'zh-Hans',
+    language: language.value,
     menubar: false,
     statusbar: false,
     width: '100%',
+    plugins: 'fullscreen code',
+    toolbar: [
+        'code | fontsize forecolor backcolor | bold italic underline | undo redo',
+        'blocks | alignleft aligncenter alignright alignjustify | outdent indent | fullscreen'
+    ]
 }
 </script>

src/packages/pc/views/notice/news/components/details/index.vue

@@ -9,7 +9,9 @@
         <app-table-details title=" " :data="details" :label-width="120" :cell-props="detailProps" :column="2">
             <!-- 缩略图 -->
             <template #coverimage="{ value }">
-                <el-image :src="getFirstPathFullUrl(value)" fit="cover" lazy style="width: 128px; height: 72px" />
+                <el-image :src="getFirstPathFullUrl(value)" fit="cover" lazy style="width: 128px; height: 72px"
+                    v-if="value" />
+                <span v-else>{{ handleNoneValue() }}</span>
             </template>
             <!-- 内容 -->
             <template #context="{ value }">
@@ -62,11 +64,11 @@ const details = computed(() => {
     const e = data.value
     if (e) {
         const localizedProperties = {
-            [Language.Simplified]: { title: e.title, author: e.author, columnname: e.columnname, srcname: e.srcname, context: e.context },
-            [Language.English]: { title: e.titleen, author: e.authoren, columnname: e.columnnameen, srcname: e.srcnameen, context: e.contexten },
-            [Language.Thai]: { title: e.titleth, author: e.authorth, columnname: e.columnnameth, srcname: e.srcnameth, context: e.contextth },
-            [Language.Traditional]: { title: e.titletw, author: e.authortw, columnname: e.columnnametw, srcname: e.srcnametw, context: e.contexttw },
-            [Language.Vietnamese]: { title: e.titlevi, author: e.authorvi, columnname: e.columnnamevi, srcname: e.srcnamevi, context: e.contextvi },
+            [Language.Simplified]: { title: e.title, author: e.author, columnname: e.columnname, srcname: e.srcname, brief: e.brief, context: e.context },
+            [Language.English]: { title: e.titleen, author: e.authoren, columnname: e.columnnameen, srcname: e.srcnameen, brief: e.briefen, context: e.contexten },
+            [Language.Thai]: { title: e.titleth, author: e.authorth, columnname: e.columnnameth, srcname: e.srcnameth, brief: e.briefth, context: e.contextth },
+            [Language.Traditional]: { title: e.titletw, author: e.authortw, columnname: e.columnnametw, srcname: e.srcnametw, brief: e.brieftw, context: e.contexttw },
+            [Language.Vietnamese]: { title: e.titlevi, author: e.authorvi, columnname: e.columnnamevi, srcname: e.srcnamevi, brief: e.briefvi, context: e.contextvi },
         }
         return {
             ...e,
@@ -79,7 +81,7 @@ const details = computed(() => {
 const detailProps = computed<CellProp[]>(() => [
     { prop: 'columnname', label: 'notice.news.details.columnname' },
     { prop: 'author', label: 'notice.news.details.author' },
-    { prop: 'srcname: string;', label: 'notice.news.details.srcname' },
+    { prop: 'srcname', label: 'notice.news.details.srcname' },
     { prop: 'hits', label: 'notice.news.details.hits' },
     { prop: 'istop', label: 'notice.news.details.istop', formatValue: (val) => flagEnum.getEnumTypeName(val) },
     { prop: 'isshow', label: 'notice.news.details.isshow', formatValue: (val) => flagEnum.getEnumTypeName(val) },

src/packages/pc/views/notice/news/components/edit/index.vue

@@ -63,7 +63,15 @@
                 </el-form-item>
                 <el-form-item class="el-form-item--row" :label="t('notice.news.edit.brief')" prop="brief">
                     <el-input type="textarea" v-model="formData.brief" maxlength="200" :rows="3"
-                        :placeholder="t('common.pleaseenter')" />
+                        :placeholder="t('common.pleaseenter')" v-if="selectedTab === Language.Simplified" />
+                    <el-input type="textarea" v-model="formData.briefen" maxlength="200" :rows="3"
+                        :placeholder="t('common.pleaseenter')" v-if="selectedTab === Language.English" />
+                    <el-input type="textarea" v-model="formData.briefth" maxlength="200" :rows="3"
+                        :placeholder="t('common.pleaseenter')" v-if="selectedTab === Language.Thai" />
+                    <el-input type="textarea" v-model="formData.brieftw" maxlength="200" :rows="3"
+                        :placeholder="t('common.pleaseenter')" v-if="selectedTab === Language.Traditional" />
+                    <el-input type="textarea" v-model="formData.briefvi" maxlength="200" :rows="3"
+                        :placeholder="t('common.pleaseenter')" v-if="selectedTab === Language.Vietnamese" />
                 </el-form-item>
                 <el-form-item class="el-form-item--row" :label="t('notice.news.edit.context')" prop="context"
                     v-if="selectedTab === Language.Simplified">

src/packages/pc/views/notice/news/index.vue

@@ -101,10 +101,19 @@ const { filterOption, getQueryParams, resetFilters } = useDataFilter<Notice.Info
         {
             field: 'columnid',
             label: t('notice.news.columnid'),
-            options: () => data.value?.siteColumnconfig.map((e) => ({
-                label: e.columnname,
-                value: e.id
-            })) ?? []
+            options: () => data.value?.siteColumnconfig.map((e) => {
+                const localizedLabel = {
+                    [Language.Simplified]: e.columnname,
+                    [Language.English]: e.columnnameen,
+                    [Language.Thai]: e.columnnameth,
+                    [Language.Traditional]: e.columnnametw,
+                    [Language.Vietnamese]: e.columnnamevi,
+                }
+                return {
+                    label: localizedLabel[i18n.global.locale],
+                    value: e.id
+                }
+            }) ?? []
         },
         {
             field: 'status',

src/services/api/notice/index.ts

@@ -1,5 +1,8 @@
 import httpClient from '@/services/http'
 import { CommonFetchOptions } from '@/services/http/types'
+import { useUserStore } from '@/stores'
+
+const userStore = useUserStore()
 
 /**
  * 通知公告-->发布通知公告
@@ -166,6 +169,9 @@ export function deleteinform(options: CommonFetchOptions<{ response: Notice.Dele
  * 通知公告-->短信查询-->获取列表
  */
 export function smsquery(options: CommonFetchOptions<{ request: Notice.SmsQueryReq; response: Notice.SmsQueryRsp[]; }>) {
+    if (options.data) {
+        options.data.sensitive = userStore.userInfo.sensitive.join(',')
+    }
     return httpClient.commonRequest('/notice/smsquery', 'get', options)
 }
 

src/types/model/notice.d.ts

@@ -443,7 +443,7 @@ declare namespace Notice {
     interface SmsQueryReq {
         recvphone?: string; // 接收手机号
         status?: number; // 发送状态
-        sensitive?: string[]; // 敏感词权限
+        sensitive?: string; // 敏感词权限
         userid?: number;
         pageNum: number;
         pageSize: number;

src/types/model/user.d.ts

@@ -29,6 +29,7 @@ declare global {
             orgztypes: string;
             forcechangepass: string;
             logincode: string;
+            sensitive: string[];
             username: string;
         }