From bbccbe49be57c507cea6bf07a29421ef39b470eb Mon Sep 17 00:00:00 2001 From: baiqi Date: Thu, 28 Sep 2023 16:31:43 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=B6=88=E6=81=AF=E7=AE=A1=E7=90=86):=20?= =?UTF-8?q?=20useSelect=E9=92=A9=E5=AD=90&=E6=B6=88=E6=81=AF=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E9=83=A8=E5=88=86=E9=A1=B5=E9=9D=A2&=E9=83=A8?= =?UTF-8?q?=E5=88=86=E7=BB=84=E4=BB=B6=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project-management/fileManagement.ts | 188 ++++++ .../project-management/messageManagement.ts | 153 +++++ .../project-management/messageManagement.ts | 6 + frontend/src/assets/style/arco-reset.less | 44 ++ .../business/ms-card-list/index.vue | 12 +- .../components/business/ms-cascader/index.vue | 70 +-- .../business/ms-form-item-sub/index.vue | 13 +- .../{ms-search-select => ms-select}/index.tsx | 146 ++++- .../src/components/pure/ms-button/index.vue | 2 +- .../src/components/pure/ms-button/not-mr.vue | 70 --- .../src/components/pure/ms-card/index.vue | 41 +- .../src/components/pure/ms-drawer/index.vue | 23 +- .../src/components/pure/ms-list/index.vue | 8 - .../src/components/pure/ms-timeline/index.vue | 6 - frontend/src/components/pure/navbar/index.vue | 2 +- frontend/src/config/pathMap.ts | 14 + frontend/src/enums/routeEnum.ts | 2 + frontend/src/hooks/useContainerShadow.ts | 13 +- frontend/src/hooks/useSelect.ts | 97 ++++ frontend/src/locale/en-US/common.ts | 3 + frontend/src/locale/en-US/index.ts | 2 + frontend/src/locale/zh-CN/common.ts | 3 + frontend/src/locale/zh-CN/index.ts | 2 + .../src/models/projectManagement/message.ts | 35 ++ .../routes/modules/projectManagement.ts | 32 + .../fileManagement/components/popConfirm.vue | 4 +- .../fileManagement/index.vue | 3 + .../src/views/project-management/index.vue | 3 - .../components/messageList.vue | 71 +++ .../components/robotList.vue | 547 ++++++++++++++++++ .../messageManagement/edit.vue | 11 + .../messageManagement/index.vue | 37 ++ .../messageManagement/locale/en-US.ts | 1 + .../messageManagement/locale/zh-CN.ts | 60 ++ .../userGroup/projectUserGroup.vue | 6 +- .../system/log/components/logCards.vue | 7 +- .../views/setting/system/log/locale/en-US.ts | 2 +- .../views/setting/system/log/locale/zh-CN.ts | 2 +- 38 files changed, 1515 insertions(+), 226 deletions(-) create mode 100644 frontend/src/api/modules/project-management/messageManagement.ts create mode 100644 frontend/src/api/requrls/project-management/messageManagement.ts rename frontend/src/components/business/{ms-search-select => ms-select}/index.tsx (52%) delete mode 100644 frontend/src/components/pure/ms-button/not-mr.vue create mode 100644 frontend/src/hooks/useSelect.ts create mode 100644 frontend/src/models/projectManagement/message.ts delete mode 100644 frontend/src/views/project-management/index.vue create mode 100644 frontend/src/views/project-management/messageManagement/components/messageList.vue create mode 100644 frontend/src/views/project-management/messageManagement/components/robotList.vue create mode 100644 frontend/src/views/project-management/messageManagement/edit.vue create mode 100644 frontend/src/views/project-management/messageManagement/index.vue create mode 100644 frontend/src/views/project-management/messageManagement/locale/en-US.ts create mode 100644 frontend/src/views/project-management/messageManagement/locale/zh-CN.ts diff --git a/frontend/src/api/modules/project-management/fileManagement.ts b/frontend/src/api/modules/project-management/fileManagement.ts index dff79b9c24..5a0de28774 100644 --- a/frontend/src/api/modules/project-management/fileManagement.ts +++ b/frontend/src/api/modules/project-management/fileManagement.ts @@ -570,6 +570,194 @@ const fileList = [ updateTime: 18975439859, createTime: 18975439859, }, + { + id: 100001, + name: 'JAR', + url: 'https://github.com/metersphere/metersphere/blob/v2.10/.gitignore', + type: 'JAR', + desc: 'fwihflhlofihlasjkhfdlkasjdhgaksuidhoasidoasidasopidapsoidaps', + storage: 'minio', + tag: ['dsadasd'], + size: '12MB', + enable: true, + fileVersion: 'v2.10', + fileModule: 'XXX', + creator: '创建人', + updater: '更新人', + updateTime: 18975439859, + createTime: 18975439859, + }, + { + id: 1000002, + name: 'PNG', + url: 'http://localhost:5173/front/base-display/get/logo-platform', + type: 'PNG', + desc: 'sfakjdghkjrugheoirugkblasjblsdjkhflksdjfsldkjklnjkhkljds', + storage: 'github', + gitBranch: 'master', + gitVersion: 'v2.10', + gitPath: '/asdas/xas/xas/fd/f/', + tag: ['asfasdfas'], + size: '12MB', + enable: false, + fileModule: 'XXX', + creator: '创建人', + updater: '更新人', + updateTime: 18975439859, + createTime: 18975439859, + }, + { + id: 1000003, + name: 'PNG', + url: 'http://localhost:5173/front/base-display/get/logo-platform', + type: 'PNG', + desc: 'sfakjdghkjrugheoirugkblasjblsdjkhflksdjfsldkjklnjkhkljds', + storage: 'github', + gitBranch: 'master', + gitVersion: 'v2.10', + gitPath: '/asdas/xas/xas/fd/f/', + tag: ['asfasdfas'], + size: '12MB', + enable: false, + fileModule: 'XXX', + creator: '创建人', + updater: '更新人', + updateTime: 18975439859, + createTime: 18975439859, + }, + { + id: 1000004, + name: 'PNG', + url: 'http://localhost:5173/front/base-display/get/logo-platform', + type: 'PNG', + desc: 'sfakjdghkjrugheoirugkblasjblsdjkhflksdjfsldkjklnjkhkljds', + storage: 'github', + gitBranch: 'master', + gitVersion: 'v2.10', + gitPath: '/asdas/xas/xas/fd/f/', + tag: ['asfasdfas'], + size: '12MB', + enable: false, + fileModule: 'XXX', + creator: '创建人', + updater: '更新人', + updateTime: 18975439859, + createTime: 18975439859, + }, + { + id: 1000005, + name: 'PNG', + url: 'http://localhost:5173/front/base-display/get/logo-platform', + type: 'PNG', + desc: 'sfakjdghkjrugheoirugkblasjblsdjkhflksdjfsldkjklnjkhkljds', + storage: 'github', + gitBranch: 'master', + gitVersion: 'v2.10', + gitPath: '/asdas/xas/xas/fd/f/', + tag: ['asfasdfas'], + size: '12MB', + enable: false, + fileModule: 'XXX', + creator: '创建人', + updater: '更新人', + updateTime: 18975439859, + createTime: 18975439859, + }, + { + id: 1000006, + name: 'PNG', + url: 'http://localhost:5173/front/base-display/get/logo-platform', + type: 'PNG', + desc: 'sfakjdghkjrugheoirugkblasjblsdjkhflksdjfsldkjklnjkhkljds', + storage: 'github', + gitBranch: 'master', + gitVersion: 'v2.10', + gitPath: '/asdas/xas/xas/fd/f/', + tag: ['asfasdfas'], + size: '12MB', + enable: false, + fileModule: 'XXX', + creator: '创建人', + updater: '更新人', + updateTime: 18975439859, + createTime: 18975439859, + }, + { + id: 1000007, + name: 'PNG', + url: 'http://localhost:5173/front/base-display/get/logo-platform', + type: 'PNG', + desc: 'sfakjdghkjrugheoirugkblasjblsdjkhflksdjfsldkjklnjkhkljds', + storage: 'github', + gitBranch: 'master', + gitVersion: 'v2.10', + gitPath: '/asdas/xas/xas/fd/f/', + tag: ['asfasdfas'], + size: '12MB', + enable: false, + fileModule: 'XXX', + creator: '创建人', + updater: '更新人', + updateTime: 18975439859, + createTime: 18975439859, + }, + { + id: 1000008, + name: 'PNG', + url: 'http://localhost:5173/front/base-display/get/logo-platform', + type: 'PNG', + desc: 'sfakjdghkjrugheoirugkblasjblsdjkhflksdjfsldkjklnjkhkljds', + storage: 'github', + gitBranch: 'master', + gitVersion: 'v2.10', + gitPath: '/asdas/xas/xas/fd/f/', + tag: ['asfasdfas'], + size: '12MB', + enable: false, + fileModule: 'XXX', + creator: '创建人', + updater: '更新人', + updateTime: 18975439859, + createTime: 18975439859, + }, + { + id: 1000009, + name: 'PNG', + url: 'http://localhost:5173/front/base-display/get/logo-platform', + type: 'PNG', + desc: 'sfakjdghkjrugheoirugkblasjblsdjkhflksdjfsldkjklnjkhkljds', + storage: 'github', + gitBranch: 'master', + gitVersion: 'v2.10', + gitPath: '/asdas/xas/xas/fd/f/', + tag: ['asfasdfas'], + size: '12MB', + enable: false, + fileModule: 'XXX', + creator: '创建人', + updater: '更新人', + updateTime: 18975439859, + createTime: 18975439859, + }, + { + id: 1000010, + name: 'PNG', + url: 'http://localhost:5173/front/base-display/get/logo-platform', + type: 'PNG', + desc: 'sfakjdghkjrugheoirugkblasjblsdjkhflksdjfsldkjklnjkhkljds', + storage: 'github', + gitBranch: 'master', + gitVersion: 'v2.10', + gitPath: '/asdas/xas/xas/fd/f/', + tag: ['asfasdfas'], + size: '12MB', + enable: false, + fileModule: 'XXX', + creator: '创建人', + updater: '更新人', + updateTime: 18975439859, + createTime: 18975439859, + }, ]; // 获取文件列表 export function getFileList(data: TableQueryParams): Promise> { diff --git a/frontend/src/api/modules/project-management/messageManagement.ts b/frontend/src/api/modules/project-management/messageManagement.ts new file mode 100644 index 0000000000..0f5dc97b30 --- /dev/null +++ b/frontend/src/api/modules/project-management/messageManagement.ts @@ -0,0 +1,153 @@ +import MSR from '@/api/http/index'; +import { + RobotListUrl, + GetRobotUrl, + AddRobotUrl, + UpdateRobotUrl, + EnableRobotUrl, +} from '@/api/requrls/project-management/messageManagement'; + +import type { RobotItem, RobotAddParams, RobotEditParams } from '@/models/projectManagement/message'; +import type { TableQueryParams, CommonList } from '@/models/common'; + +const list = [ + { + id: '1', + name: '站内信', + description: '系统内置，在顶部导航栏显示消息通知', + platform: 'IN_SITE', + enable: true, + webhook: 'asdasdasfasfsaf', + projectId: '1', + createTime: 1695721467045, + createUser: 'admin', + }, + { + id: '2', + name: '邮件', + description: '系统内置，以添加用户邮箱为通知方式', + platform: 'MAIL', + enable: false, + webhook: 'sdfsdfasfasf', + projectId: '1', + createTime: 1695721467045, + createUser: 'admin', + }, + { + id: '3', + name: '飞书', + description: '', + platform: 'LARK', + enable: false, + webhook: 'asdfgasdgasfgasgas', + projectId: '1', + createTime: 1695721467045, + createUser: 'admin', + updateUser: 'bai', + updateTime: 1695721467045, + }, + { + id: '4', + name: '钉钉', + description: '', + platform: 'DING_TALK', + enable: false, + webhook: 'asfgasfasdfa', + type: 'CUSTOM', + projectId: '1', + createTime: 1695721467045, + createUser: 'admin', + updateUser: 'bai', + updateTime: 1695721467045, + }, + { + id: '44', + name: '钉钉', + description: '', + platform: 'DING_TALK', + enable: false, + webhook: 'asfgasfasdfa', + appKey: 'asfasfasfasfasf', + appSecret: 'asfasfasfasfasf', + type: 'ENTERPRISE', + projectId: '1', + createTime: 1695721467045, + createUser: 'admin', + updateUser: 'bai', + updateTime: 1695721467045, + }, + { + id: '5', + name: '企业微信', + description: '', + platform: 'WE_COM', + enable: false, + webhook: 'vevbbt', + projectId: '1', + createTime: 1695721467045, + createUser: 'admin', + updateUser: 'bai', + updateTime: 1695721467045, + }, + { + id: '5', + name: '自定义', + description: '', + platform: 'CUSTOM', + enable: false, + webhook: 'bytnm', + projectId: '1', + createTime: 1695721467045, + createUser: 'admin', + updateUser: 'bai', + updateTime: 1695721467045, + }, + { + id: '5', + name: '自定义', + description: '', + platform: 'CUSTOM', + enable: false, + webhook: 'bytnm', + projectId: '1', + createTime: 1695721467045, + createUser: 'admin', + updateUser: 'bai', + updateTime: 1695721467045, + }, + { + id: '5', + name: '自定义', + description: '', + platform: 'CUSTOM', + enable: false, + webhook: 'bytnm', + projectId: '1', + createTime: 1695721467045, + createUser: 'admin', + updateUser: 'bai', + updateTime: 1695721467045, + }, +]; + +export function getRobotList(projectId: string) { + // return MSR.post({ url: `${RobotListUrl}/${projectId}` }); + return Promise.resolve(list); +} + +export function getRobotDetail(robotId: string) { + // return MSR.get({ url: GetRobotUrl, params: robotId }); + return Promise.resolve(list.find((item) => item.id === robotId)); +} + +export function addRobot(data: RobotAddParams) { + return MSR.post({ url: AddRobotUrl, data }); +} + +export function updateRobot(data: RobotEditParams) { + return MSR.post({ url: UpdateRobotUrl, data }); +} + +export function toggleRobot(id: string) { + return MSR.get({ url: EnableRobotUrl, params: id }); +} diff --git a/frontend/src/api/requrls/project-management/messageManagement.ts b/frontend/src/api/requrls/project-management/messageManagement.ts new file mode 100644 index 0000000000..4818a66c0d --- /dev/null +++ b/frontend/src/api/requrls/project-management/messageManagement.ts @@ -0,0 +1,6 @@ +export const RobotListUrl = '/project/robot/list/page'; +export const UpdateRobotUrl = '/project/robot/update'; +export const AddRobotUrl = '/project/robot/add'; +export const GetRobotUrl = '/project/robot/get'; +export const EnableRobotUrl = '/project/robot/enable'; +export const DeleteRobotUrl = '/project/robot/delete'; diff --git a/frontend/src/assets/style/arco-reset.less b/frontend/src/assets/style/arco-reset.less index 8461dcfddf..3cb51e3a60 100644 --- a/frontend/src/assets/style/arco-reset.less +++ b/frontend/src/assets/style/arco-reset.less @@ -328,6 +328,16 @@ .arco-checkbox-icon { border: 1px solid var(--color-text-input-border); } + &:hover { + .arco-checkbox-icon-hover::before { + background-color: rgb(var(--primary-9)) !important; + } + } + .arco-checkbox-icon-hover { + &:hover::before { + background-color: rgb(var(--primary-9)) !important; + } + } } .arco-checkbox-indeterminate .arco-checkbox-icon { border-color: rgba(var(--primary-7)); @@ -407,8 +417,12 @@ .arco-dropdown, .arco-trigger-menu, .arco-select-dropdown { + padding: 6px; border: 0.5px solid var(--color-text-n8); box-shadow: 0 3px 14px 2px rgb(0 0 0 / 5%), 0 8px 10px 1px rgb(0 0 0 / 6%), 0 5px 5px -3px rgb(0 0 0 / 10%); + .arco-select-dropdown-header { + margin-bottom: 4px; + } .arco-dropdown-list, .arco-select-dropdown-list, .arco-trigger-menu-inner { @@ -427,6 +441,18 @@ background-color: rgb(var(--primary-1)); } } + .arco-select-option { + margin: 0; + .arco-select-option-checkbox { + padding-top: 3px; + padding-bottom: 3px; + &:hover { + .arco-checkbox-icon-hover::before { + background-color: rgb(var(--primary-9)) !important; + } + } + } + } .ms-dropdown-divider { margin: 6px 0; } @@ -442,6 +468,13 @@ } } } +.arco-select-dropdown-has-header { + padding-top: 6px !important; +} +.arco-select-dropdown-footer { + margin-top: 4px; + margin-bottom: 4px; +} .arco-dropdown-option-content { @apply flex items-center; @@ -742,3 +775,14 @@ white-space: nowrap; } } + +/** Alter **/ +.arco-alert-title { + font-size: 14px; + font-weight: 400; +} +.arco-alert-icon { + @apply flex; + + margin-top: 1px; +} diff --git a/frontend/src/components/business/ms-card-list/index.vue b/frontend/src/components/business/ms-card-list/index.vue index ab95fde2f2..e766ee07b4 100644 --- a/frontend/src/components/business/ms-card-list/index.vue +++ b/frontend/src/components/business/ms-card-list/index.vue @@ -66,16 +66,6 @@ } }); } - if (arr && arr.length > 0) { - nextTick(() => { - if (msCardListRef.value) { - // 为了在列表数据滚动加载时，能够正确判断是否滚动到底部，因为此时没有触发滚动事件，而在加载前触发了滚动到底部的判断 - const listContent = msCardListRef.value; - const { scrollTop, scrollHeight, clientHeight } = listContent; - isArrivedBottom.value = scrollHeight - clientHeight - scrollTop < props.shadowLimit; - } - }); - } } watch( @@ -219,7 +209,7 @@ @apply overflow-hidden; .ms-container--shadow(); .ms-card-list { - @apply grid overflow-auto; + @apply grid max-h-full overflow-auto; .ms-scroll-bar(); diff --git a/frontend/src/components/business/ms-cascader/index.vue b/frontend/src/components/business/ms-cascader/index.vue index 5d48aa5d52..383293d416 100644 --- a/frontend/src/components/business/ms-cascader/index.vue +++ b/frontend/src/components/business/ms-cascader/index.vue @@ -71,8 +71,8 @@ +@/hooks/useSelect diff --git a/frontend/src/components/business/ms-form-item-sub/index.vue b/frontend/src/components/business/ms-form-item-sub/index.vue index d6253411b3..e8999da8ca 100644 --- a/frontend/src/components/business/ms-form-item-sub/index.vue +++ b/frontend/src/components/business/ms-form-item-sub/index.vue @@ -1,5 +1,5 @@ @@ -17,12 +24,14 @@ defineProps<{ text: string; showFillIcon?: boolean; + icon?: string; + iconText?: string; }>(), { showFillIcon: true, } ); - const emit = defineEmits(['fill']); + const emit = defineEmits(['fill', 'iconClick']); function fillHeapByDefault() { emit('fill'); diff --git a/frontend/src/components/business/ms-search-select/index.tsx b/frontend/src/components/business/ms-select/index.tsx similarity index 52% rename from frontend/src/components/business/ms-search-select/index.tsx rename to frontend/src/components/business/ms-select/index.tsx index 2c0a0d8d63..aad948f055 100644 --- a/frontend/src/components/business/ms-search-select/index.tsx +++ b/frontend/src/components/business/ms-select/index.tsx @@ -1,6 +1,7 @@ -import { watch, ref, h, defineComponent, onBeforeMount } from 'vue'; +import { watch, ref, h, defineComponent, onBeforeMount, computed, Ref, Slot } from 'vue'; import { debounce } from 'lodash-es'; import { useI18n } from '@/hooks/useI18n'; +import useSelect from '@/hooks/useSelect'; import type { SelectOptionData } from '@arco-design/web-vue'; @@ -15,11 +16,14 @@ export type RemoteFieldsMap = { export interface MsSearchSelectProps { mode?: 'static' | 'remote'; // 静态模式，远程模式。默认为静态模式，需要传入 options 数据；远程模式需要传入请求函数 modelValue: ModelType; + allowSearch?: boolean; allowClear?: boolean; placeholder?: string; - prefix?: string; - searchKeys: string[]; // 需要搜索的 key 名，关键字会遍历这个 key 数组，然后取 item[key] 进行模糊匹配 + hasAllSelect?: boolean; // 是否有全选选项 + searchKeys?: string[]; // 需要搜索的 key 名，关键字会遍历这个 key 数组，然后取 item[key] 进行模糊匹配 + valueKey?: string; // 选项的 value 字段名，默认为 value options: SelectOptionData[]; + multiple?: boolean; // 是否多选 remoteFieldsMap?: RemoteFieldsMap; // 远程模式下的结果 key 映射，例如 { value: 'id' }，表示远程请求时，会将返回结果的 id 赋值到 value 字段 remoteExtraParams?: Record; // 远程模式下的额外参数 remoteFunc?(params: Record): Promise; // 远程模式下的请求函数，返回一个 Promise @@ -27,13 +31,20 @@ export interface MsSearchSelectProps { optionTooltipContent?: (item: SelectOptionData) => string; // 自定义 option 的 tooltip 内容，返回一个字符串，默认使用 item.label } +export interface MsSearchSelectSlots { + prefix?: string; + header?: (() => JSX.Element) | Slot; + default?: () => JSX.Element[]; + footer?: Slot; +} + export default defineComponent( - (props: MsSearchSelectProps, { emit }) => { + (props: MsSearchSelectProps & MsSearchSelectSlots, { emit, slots }) => { const { t } = useI18n(); const innerValue = ref(props.modelValue); - const filterOptions = ref([]); - const remoteOriginOptions = ref([...props.options]); + const filterOptions = ref([]); // 实际渲染的 options，会根据搜索关键字进行过滤 + const remoteOriginOptions = ref([...props.options]); // 远程模式下的原始 options，接口返回的数据会存储在这里 watch( () => props.modelValue, (val) => { @@ -41,12 +52,14 @@ export default defineComponent( } ); - watch( - () => props.options, - (arr) => { - filterOptions.value = [...arr]; - } - ); + const selectRef = ref(); + + const { maxTagCount, getOptionComputedStyle, calculateMaxTag } = useSelect({ + selectRef, + selectVal: innerValue, + isCascade: true, + options: props.options, + }); const loading = ref(false); @@ -76,7 +89,11 @@ export default defineComponent( } if (val.trim() === '') { // 如果搜索关键字为空，则直接返回所有数据 - filterOptions.value = [...remoteOriginOptions.value]; + filterOptions.value = remoteOriginOptions.value.map((e) => ({ + ...e, + tooltipContent: typeof props.optionTooltipContent === 'function' ? props.optionTooltipContent(e) : e.label, + })); + calculateMaxTag(); return; } const highlightedKeyword = `${val}`; @@ -84,13 +101,15 @@ export default defineComponent( .map((e) => { const item = { ...e }; let hasMatch = false; - for (let i = 0; i < props.searchKeys.length; i++) { - // 遍历传入的搜索字段 - const key = props.searchKeys[i]; - if (e[key].includes(val)) { - // 是否匹配 - hasMatch = true; - item[key] = e[key].replace(new RegExp(val, 'gi'), highlightedKeyword); // 高亮关键字替换 + if (props.searchKeys) { + for (let i = 0; i < props.searchKeys.length; i++) { + // 遍历传入的搜索字段 + const key = props.searchKeys[i]; + if (e[key].includes(val)) { + // 是否匹配 + hasMatch = true; + item[key] = e[key].replace(new RegExp(val, 'gi'), highlightedKeyword); // 高亮关键字替换 + } } } if (hasMatch) { @@ -99,7 +118,9 @@ export default defineComponent( return null; }) .filter((e) => e) as SelectOptionData[]; + calculateMaxTag(); } catch (error) { + // eslint-disable-next-line no-console console.log(error); } finally { loading.value = false; @@ -111,31 +132,92 @@ export default defineComponent( ? h('div', { innerHTML: props.optionLabelRender(item) }) : item.label; + // 半选状态 + const indeterminate = computed(() => { + if (props.multiple && Array.isArray(innerValue.value)) { + return innerValue.value.length > 0 && innerValue.value.length < filterOptions.value.length; + } + return false; + }); + + const isSelectAll = computed({ + get: () => { + if (props.multiple && Array.isArray(innerValue.value)) { + return innerValue.value.length === filterOptions.value.length; + } + return false; + }, + set: (val) => val, + }); + function handleSelectAllChange(val: boolean) { + isSelectAll.value = val; + if (val) { + innerValue.value = filterOptions.value.map((item) => item[props.valueKey || 'value']); + emit('update:modelValue', innerValue.value); + } else { + innerValue.value = []; + emit('update:modelValue', []); + } + } + + const selectSlots = () => { + const _slots: MsSearchSelectSlots = { + default: () => + filterOptions.value.map((item) => ( + + +
+ {optionItemLabelRender(item)} +
+ + + )), + }; + if (props.hasAllSelect) { + _slots.header = () => ( +
+ + {t('common.allSelect')} + +
+ ); + } + if (slots.header) { + _slots.header = slots.header; + } + if (slots.footer) { + _slots.footer = slots.footer; + } + + return _slots; + }; + onBeforeMount(() => { handleUserSearch(''); }); return () => ( emit('update:modelValue', value)} onInputValueChange={debounce(handleUserSearch, 300)} > {{ prefix: () => t(props.prefix || ''), - default: () => - filterOptions.value.map((item) => ( - - - {optionItemLabelRender(item)} - - - )), + ...selectSlots(), }} ); @@ -145,16 +227,20 @@ export default defineComponent( props: [ 'mode', 'modelValue', + 'allowSearch', 'allowClear', 'placeholder', - 'prefix', 'searchKeys', + 'valueKey', 'options', 'optionLabelRender', 'remoteFieldsMap', 'remoteExtraParams', 'remoteFunc', 'optionTooltipContent', + 'prefix', + 'hasAllSelect', + 'multiple', ], emits: ['update:modelValue'], } diff --git a/frontend/src/components/pure/ms-button/index.vue b/frontend/src/components/pure/ms-button/index.vue index a5cde8116f..5b078fa297 100644 --- a/frontend/src/components/pure/ms-button/index.vue +++ b/frontend/src/components/pure/ms-button/index.vue @@ -39,7 +39,7 @@ } padding: 0 4px; - font-size: 1rem; + font-size: 14px; border-radius: var(--border-radius-mini); line-height: 22px; } diff --git a/frontend/src/components/pure/ms-button/not-mr.vue b/frontend/src/components/pure/ms-button/not-mr.vue deleted file mode 100644 index 297654cd35..0000000000 --- a/frontend/src/components/pure/ms-button/not-mr.vue +++ /dev/null @@ -1,70 +0,0 @@ - - - - - diff --git a/frontend/src/components/pure/ms-card/index.vue b/frontend/src/components/pure/ms-card/index.vue index e72dd6e22b..4ea6d5a221 100644 --- a/frontend/src/components/pure/ms-card/index.vue +++ b/frontend/src/components/pure/ms-card/index.vue @@ -5,6 +5,7 @@ 'ms-card', 'relative', 'h-full', + props.isFullscreen ? 'ms-card--no-radius' : '', props.autoHeight ? '' : 'min-h-[500px]', props.noContentPadding ? 'ms-card--noContentPadding' : 'p-[24px]', ]" @@ -15,17 +16,8 @@
- -
+ +
@@ -72,10 +64,11 @@ specialHeight: number; // 特殊高度，例如某些页面有面包屑 hideBack: boolean; // 隐藏返回按钮 autoHeight: boolean; // 内容区域高度是否自适应 - otherWidth?: number; // 该宽度为卡片外部同级容器的宽度 - minWidth?: number; // 卡片最小宽度 + otherWidth: number; // 该宽度为卡片外部同级容器的宽度 + minWidth: number; // 卡片最小宽度 hasBreadcrumb: boolean; // 是否有面包屑，如果有面包屑，高度需要减去面包屑的高度 noContentPadding: boolean; // 内容区域是否有padding + isFullscreen?: boolean; // 是否全屏 handleBack: () => void; // 自定义返回按钮触发事件 }> >(), @@ -117,6 +110,23 @@ return 246 + _specialHeight; }); + const getComputedContentStyle = computed(() => { + if (props.isFullscreen) { + return { + overflow: 'auto', + width: 'calc(100vw - 58px)', + height: 'auto', + }; + } + return { + overflow: 'auto', + width: props.otherWidth + ? `calc(100vw - ${menuWidth.value}px - ${props.otherWidth}px)` + : `calc(100vw - ${menuWidth.value}px - 58px)`, + height: props.autoHeight ? 'auto' : `calc(100vh - ${cardOverHeight.value}px)`, + }; + }); + function back() { if (typeof props.handleBack === 'function') { props.handleBack(); @@ -128,7 +138,7 @@ diff --git a/frontend/src/components/pure/ms-drawer/index.vue b/frontend/src/components/pure/ms-drawer/index.vue index f2f6b6168e..a6859e940c 100644 --- a/frontend/src/components/pure/ms-drawer/index.vue +++ b/frontend/src/components/pure/ms-drawer/index.vue @@ -44,15 +44,20 @@ diff --git a/frontend/src/components/pure/ms-list/index.vue b/frontend/src/components/pure/ms-list/index.vue index a548a767b2..fa074023b6 100644 --- a/frontend/src/components/pure/ms-list/index.vue +++ b/frontend/src/components/pure/ms-list/index.vue @@ -154,14 +154,6 @@ initScrollListener(); }); } - if (props.data.length > 0) { - nextTick(() => { - // 为了在列表数据滚动加载时，能够正确判断是否滚动到底部，因为此时没有触发滚动事件，而在加载前触发了滚动到底部的判断 - const listContent = listRef.value?.$el.querySelector('.arco-list-content'); - const { scrollTop, scrollHeight, clientHeight } = listContent; - isArrivedBottom.value = scrollHeight - clientHeight - scrollTop < props.itemHeight; - }); - } }, { immediate: true, diff --git a/frontend/src/components/pure/ms-timeline/index.vue b/frontend/src/components/pure/ms-timeline/index.vue index b07e1c7a79..7b63eda995 100644 --- a/frontend/src/components/pure/ms-timeline/index.vue +++ b/frontend/src/components/pure/ms-timeline/index.vue @@ -84,12 +84,6 @@ listContent.addEventListener('scroll', listenScroll); }); } - nextTick(() => { - // 为了在列表数据滚动加载时，能够正确判断是否滚动到底部，因为此时没有触发滚动事件，而在加载前触发了滚动到底部的判断 - const listContent = listRef.value?.$el.querySelector('.arco-list-content'); - const { scrollTop, scrollHeight, clientHeight } = listContent; - isArrivedBottom.value = scrollHeight - clientHeight - scrollTop < 20; - }); }); function handleReachBottom() { diff --git a/frontend/src/components/pure/navbar/index.vue b/frontend/src/components/pure/navbar/index.vue index 40ff474ec7..857793b33e 100644 --- a/frontend/src/components/pure/navbar/index.vue +++ b/frontend/src/components/pure/navbar/index.vue @@ -2,7 +2,7 @@
-
+
{{ props.name }}
diff --git a/frontend/src/config/pathMap.ts b/frontend/src/config/pathMap.ts index e67fac0a3e..8f80068e00 100644 --- a/frontend/src/config/pathMap.ts +++ b/frontend/src/config/pathMap.ts @@ -225,6 +225,20 @@ export const pathMap: PathMapItem[] = [ permission: [], level: MENU_LEVEL[2], }, + { + key: 'PROJECT_MANAGEMENT_MESSAGE_MANAGEMENT', // 项目管理-消息管理 + locale: 'menu.projectManagement.messageManagement', + route: RouteEnum.PROJECT_MANAGEMENT_MESSAGE_MANAGEMENT, + permission: [], + level: MENU_LEVEL[2], + }, + { + key: 'PROJECT_MANAGEMENT_MESSAGE_MANAGEMENT_EDIT', // 项目管理-消息管理-编辑 + locale: 'menu.projectManagement.messageManagementEdit', + route: RouteEnum.PROJECT_MANAGEMENT_MESSAGE_MANAGEMENT_EDIT, + permission: [], + level: MENU_LEVEL[2], + }, ], }, ]; diff --git a/frontend/src/enums/routeEnum.ts b/frontend/src/enums/routeEnum.ts index b030560856..94ada7767e 100644 --- a/frontend/src/enums/routeEnum.ts +++ b/frontend/src/enums/routeEnum.ts @@ -18,6 +18,8 @@ export enum PerformanceTestRouteEnum { export enum ProjectManagementRouteEnum { PROJECT_MANAGEMENT = 'projectManagement', PROJECT_MANAGEMENT_FILE_MANAGEMENT = 'projectManagementFileManageMent', + PROJECT_MANAGEMENT_MESSAGE_MANAGEMENT = 'projectManagementMessageManagement', + PROJECT_MANAGEMENT_MESSAGE_MANAGEMENT_EDIT = 'projectManagementMessageManagementEdit', PROJECT_MANAGEMENT_LOG = 'projectManagementLog', PROJECT_MANAGEMENT_PERMISSION = 'projectManagementPermission', PROJECT_MANAGEMENT_PERMISSION_BASIC_INFO = 'projectManagementPermissionBasicInfo', diff --git a/frontend/src/hooks/useContainerShadow.ts b/frontend/src/hooks/useContainerShadow.ts index 4c2cd2c789..d3fa1a0a49 100644 --- a/frontend/src/hooks/useContainerShadow.ts +++ b/frontend/src/hooks/useContainerShadow.ts @@ -31,6 +31,13 @@ export default function useContainerShadow(options: ContainerShadowOptions) { } } + function calculateArrivedPosition(listContent: HTMLElement) { + const { scrollTop, scrollHeight, clientHeight } = listContent; + const scrollBottom = scrollHeight - clientHeight - scrollTop; + isArrivedTop.value = scrollTop < options.overHeight; + isArrivedBottom.value = scrollBottom < options.overHeight; + } + /** * 监听列表内容区域滚动，以切换顶部底部阴影 * @param event 滚动事件 @@ -38,16 +45,14 @@ export default function useContainerShadow(options: ContainerShadowOptions) { function listenScroll(event: Event) { if (event.target) { const listContent = event.target as HTMLElement; - const { scrollTop, scrollHeight, clientHeight } = listContent; - const scrollBottom = scrollHeight - clientHeight - scrollTop; - isArrivedTop.value = scrollTop < options.overHeight; - isArrivedBottom.value = scrollBottom < options.overHeight; + calculateArrivedPosition(listContent); } } function initScrollListener() { if (!isInitListener.value && containerRef.value) { containerRef.value.addEventListener('scroll', listenScroll); + calculateArrivedPosition(containerRef.value); // 初始化计算一次，因为初始化的时候内容可能超出可视区域了 isInitListener.value = true; } } diff --git a/frontend/src/hooks/useSelect.ts b/frontend/src/hooks/useSelect.ts new file mode 100644 index 0000000000..c64207922b --- /dev/null +++ b/frontend/src/hooks/useSelect.ts @@ -0,0 +1,97 @@ +import { Ref, computed, nextTick, onBeforeUnmount, onMounted, ref, watch } from 'vue'; +import { calculateMaxDepth } from '@/utils'; + +import type { CascaderOption, SelectOptionData } from '@arco-design/web-vue'; + +export interface UseSelectOption { + selectRef: Ref; // 选择器 ref 对象 + selectVal: Ref; // 选择器的 v-model + isCascade?: boolean; // 是否级联选择器 + panelWidth?: number; // 级联选择器的下拉面板宽度 + options?: CascaderOption[] | SelectOptionData[]; // 级联选择器的选项 +} + +/** + * 计算 Select 组件的单行展示的最大标签数量 + * @param selectRef 选择器 ref 对象 + * @param selectVal 选择器的 v-model + */ +export default function useSelect(config: UseSelectOption) { + const maxTagCount = ref(1); + const selectWidth = ref(0); + const selectViewInner = ref(null); // 输入框内容容器 DOM + const cascadeDeep = ref(0); // 级联选择器的深度 + + /** + * 计算最大标签数量 + */ + function calculateMaxTag() { + nextTick(() => { + if (config.selectRef.value && selectViewInner.value && Array.isArray(config.selectVal.value)) { + if (maxTagCount.value !== 0 && config.selectVal.value.length > maxTagCount.value) return; // 已经超过最大数量的展示，不需要再计算 + let lastWidth = selectViewInner.value?.getBoundingClientRect().width || 0; + const tags = selectViewInner.value.querySelectorAll('.arco-tag'); + let tagCount = 0; + for (let i = 0; i < tags.length; i++) { + const tagWidth = Number(getComputedStyle(tags[i]).width.replace('px', '')); + if (lastWidth < tagWidth + 65) { + // 65px 是“+N”的标签宽度+聚焦输入框的宽度 + lastWidth = 0; // 当剩余宽度已经放不下刚添加的标签，则剩余宽度置为 0，避免后面再进行计算 + break; + } else { + tagCount += 1; + lastWidth = lastWidth - tagWidth - 5; + } + } + maxTagCount.value = tagCount === 0 ? 1 : tagCount; + } + }); + } + + const getOptionComputedStyle = computed(() => { + if (config.isCascade) { + // 减去 80px 是为了防止溢出，因为会出现单选框、右侧箭头 + return { + width: + cascadeDeep.value <= 2 + ? `${selectWidth.value / cascadeDeep.value - 80 - cascadeDeep.value * 4}px` + : `${config.panelWidth}px` || '150px', + }; + } + // 减去 60px 是为了防止溢出，因为有复选框、边距等 + return { + width: `${selectWidth.value - 60}px`, + }; + }); + + watch( + () => config.options, + (arr) => { + if (config.isCascade && arr && arr.length > 0) { + // 级联选择器的选项发生变化时，重新计算最大深度 + cascadeDeep.value = calculateMaxDepth(arr); + } + }, + { + immediate: true, + deep: true, + } + ); + + onMounted(() => { + if (config.selectRef.value) { + selectWidth.value = config.selectRef.value.$el.nextElementSibling.getBoundingClientRect().width; + selectViewInner.value = config.selectRef.value.$el.nextElementSibling.querySelector('.arco-select-view-inner'); + } + }); + + onBeforeUnmount(() => { + selectViewInner.value = null; // 释放 DOM 引用 + }); + + return { + maxTagCount, + getOptionComputedStyle, // 获取选择器选项的样式 + calculateMaxTag, // 在需要的时机调用此函数以计算最大标签数量，一般在 select 的 change 事件中调用 + }; +} diff --git a/frontend/src/locale/en-US/common.ts b/frontend/src/locale/en-US/common.ts index b2dac578c9..c217200054 100644 --- a/frontend/src/locale/en-US/common.ts +++ b/frontend/src/locale/en-US/common.ts @@ -55,4 +55,7 @@ export default { 'common.internal': 'Internal', 'common.custom': 'Custom', 'common.preview': 'Preview', + 'common.fullScreen': 'Full Screen', + 'common.offFullScreen': 'Exit', + 'common.allSelect': 'Select All', }; diff --git a/frontend/src/locale/en-US/index.ts b/frontend/src/locale/en-US/index.ts index 55bfcf7ad4..31dd17b895 100644 --- a/frontend/src/locale/en-US/index.ts +++ b/frontend/src/locale/en-US/index.ts @@ -28,6 +28,8 @@ export default { 'menu.performanceTest': 'Performance Test', 'menu.projectManagement': 'Project', 'menu.projectManagement.fileManagement': 'File Management', + 'menu.projectManagement.messageManagement': 'Message Management', + 'menu.projectManagement.messageManagementEdit': 'Update Template', 'menu.featureTest.featureCase': 'Feature Case', 'meun.workstation': 'Workstation', 'menu.loadTest': 'Performance Test', diff --git a/frontend/src/locale/zh-CN/common.ts b/frontend/src/locale/zh-CN/common.ts index 4f06492bee..cfe815ff4c 100644 --- a/frontend/src/locale/zh-CN/common.ts +++ b/frontend/src/locale/zh-CN/common.ts @@ -57,4 +57,7 @@ export default { 'common.internal': '内部', 'common.custom': '自定义', 'common.preview': '预览', + 'common.fullScreen': '全屏', + 'common.offFullScreen': '退出全屏', + 'common.allSelect': '全选', }; diff --git a/frontend/src/locale/zh-CN/index.ts b/frontend/src/locale/zh-CN/index.ts index 341a6c6edb..37fca14819 100644 --- a/frontend/src/locale/zh-CN/index.ts +++ b/frontend/src/locale/zh-CN/index.ts @@ -31,6 +31,8 @@ export default { 'menu.projectManagement': '项目管理', 'menu.projectManagement.log': '日志', 'menu.projectManagement.fileManagement': '文件管理', + 'menu.projectManagement.messageManagement': '消息管理', + 'menu.projectManagement.messageManagementEdit': '更新模板', 'menu.featureTest.featureCase': '功能用例', 'menu.projectManagement.projectPermission': '项目与权限', 'menu.settings': '系统设置', diff --git a/frontend/src/models/projectManagement/message.ts b/frontend/src/models/projectManagement/message.ts new file mode 100644 index 0000000000..efe971aa8d --- /dev/null +++ b/frontend/src/models/projectManagement/message.ts @@ -0,0 +1,35 @@ +// 支持添加机器人的平台类型 +export type ProjectRobotPlatformCanEdit = 'DING_TALK' | 'LARK' | 'WE_COM' | 'CUSTOM'; + +// 机器人全平台类型 +export type ProjectRobotPlatform = ProjectRobotPlatformCanEdit | 'IN_SITE' | 'MAIL'; + +// 钉钉机器人类型 +export type ProjectRobotDingTalkType = 'CUSTOM' | 'ENTERPRISE'; + +export interface RobotCommon { + name: string; + platform: ProjectRobotPlatformCanEdit; + webhook: string; + enable: boolean; + description?: string; +} + +export interface RobotAddParams extends RobotCommon { + projectId: string; + type?: ProjectRobotDingTalkType; + appKey?: string; + appSecret?: string; +} + +export interface RobotEditParams extends RobotAddParams { + id: string; +} + +export interface RobotItem extends Omit { + platform: ProjectRobotPlatform; + createUser: string; + createTime: number; + updateUser?: string; + updateTime?: number; +} diff --git a/frontend/src/router/routes/modules/projectManagement.ts b/frontend/src/router/routes/modules/projectManagement.ts index c4e1e83cd1..82faabb818 100644 --- a/frontend/src/router/routes/modules/projectManagement.ts +++ b/frontend/src/router/routes/modules/projectManagement.ts @@ -90,6 +90,38 @@ const ProjectManagement: AppRouteRecordRaw = { isTopMenu: true, }, }, + // 消息管理 + { + path: 'messageManagement', + name: ProjectManagementRouteEnum.PROJECT_MANAGEMENT_MESSAGE_MANAGEMENT, + component: () => import('@/views/project-management/messageManagement/index.vue'), + meta: { + locale: 'menu.projectManagement.messageManagement', + roles: ['*'], + isTopMenu: true, + }, + }, + { + path: 'messageManagementEdit', + name: ProjectManagementRouteEnum.PROJECT_MANAGEMENT_MESSAGE_MANAGEMENT_EDIT, + component: () => import('@/views/project-management/messageManagement/edit.vue'), + meta: { + locale: 'menu.projectManagement.messageManagementEdit', + roles: ['*'], + breadcrumbs: [ + { + name: ProjectManagementRouteEnum.PROJECT_MANAGEMENT_MESSAGE_MANAGEMENT, + locale: 'menu.projectManagement.messageManagement', + }, + { + name: ProjectManagementRouteEnum.PROJECT_MANAGEMENT_MESSAGE_MANAGEMENT_EDIT, + locale: 'menu.projectManagement.messageManagementEdit', + editTag: 'id', + editLocale: 'menu.projectManagement.messageManagementEdit', + }, + ], + }, + }, // 项目日志 { path: 'log', diff --git a/frontend/src/views/project-management/fileManagement/components/popConfirm.vue b/frontend/src/views/project-management/fileManagement/components/popConfirm.vue index 23a107c656..2a3762e8c9 100644 --- a/frontend/src/views/project-management/fileManagement/components/popConfirm.vue +++ b/frontend/src/views/project-management/fileManagement/components/popConfirm.vue @@ -35,7 +35,7 @@ diff --git a/frontend/src/views/project-management/messageManagement/components/messageList.vue b/frontend/src/views/project-management/messageManagement/components/messageList.vue new file mode 100644 index 0000000000..90cf6c9f04 --- /dev/null +++ b/frontend/src/views/project-management/messageManagement/components/messageList.vue @@ -0,0 +1,71 @@ + + + + + diff --git a/frontend/src/views/project-management/messageManagement/components/robotList.vue b/frontend/src/views/project-management/messageManagement/components/robotList.vue new file mode 100644 index 0000000000..88ad049bfe --- /dev/null +++ b/frontend/src/views/project-management/messageManagement/components/robotList.vue @@ -0,0 +1,547 @@ + + + + + diff --git a/frontend/src/views/project-management/messageManagement/edit.vue b/frontend/src/views/project-management/messageManagement/edit.vue new file mode 100644 index 0000000000..0cc53da13d --- /dev/null +++ b/frontend/src/views/project-management/messageManagement/edit.vue @@ -0,0 +1,11 @@ + + + + + diff --git a/frontend/src/views/project-management/messageManagement/index.vue b/frontend/src/views/project-management/messageManagement/index.vue new file mode 100644 index 0000000000..94874345d2 --- /dev/null +++ b/frontend/src/views/project-management/messageManagement/index.vue @@ -0,0 +1,37 @@ + + + + + diff --git a/frontend/src/views/project-management/messageManagement/locale/en-US.ts b/frontend/src/views/project-management/messageManagement/locale/en-US.ts new file mode 100644 index 0000000000..ff8b4c5632 --- /dev/null +++ b/frontend/src/views/project-management/messageManagement/locale/en-US.ts @@ -0,0 +1 @@ +export default {}; diff --git a/frontend/src/views/project-management/messageManagement/locale/zh-CN.ts b/frontend/src/views/project-management/messageManagement/locale/zh-CN.ts new file mode 100644 index 0000000000..517940cd8e --- /dev/null +++ b/frontend/src/views/project-management/messageManagement/locale/zh-CN.ts @@ -0,0 +1,60 @@ +export default { + 'project.messageManagement': '消息管理', + 'project.messageManagement.config': '消息设置', + 'project.messageManagement.botList': '机器人列表', + 'project.messageManagement.robot': '机器人', + 'project.messageManagement.botListTips': + '机器人的开启与关闭状态与消息设置列表机器人同步；如：站内信开启，消息列表页则展示站内信通知列', + 'project.messageManagement.notRemind': '不再提醒', + 'project.messageManagement.createBot': '创建机器人', + 'project.messageManagement.createAt': '创建于', + 'project.messageManagement.updateAt': '更新于', + 'project.messageManagement.status': '状态', + 'project.messageManagement.statusTipOn': '开启：在消息通知列表展示及使用', + 'project.messageManagement.statusTipOff': '关闭：暂不使用改机器人', + 'project.messageManagement.choosePlatform': '选择配置平台', + 'project.messageManagement.WE_COM': '企业微信', + 'project.messageManagement.DING_TALK': '钉钉', + 'project.messageManagement.LARK': '飞书', + 'project.messageManagement.CUSTOM': '自定义', + 'project.messageManagement.business': '（企业版）', + 'project.messageManagement.name': '机器人名称', + 'project.messageManagement.nameRequired': '机器人名称不能为空', + 'project.messageManagement.namePlaceholder': '请输入机器人名称', + 'project.messageManagement.webhook': 'Webhook', + 'project.messageManagement.webhookRequired': 'Webhook 不能为空', + 'project.messageManagement.webhookPlaceholder': '在{type}群内，点击「机器人」可直接获取', + 'project.messageManagement.webhookCustomPlaceholder': '请输入 webhook', + 'project.messageManagement.dingTalkType': '机器人类型', + 'project.messageManagement.ENTERPRISE': '企业内部应用', + 'project.messageManagement.dingTalkCustomTip': '钉钉自定义机器人产品线下公告', + 'project.messageManagement.noticeDetail': '公告详情', + 'project.messageManagement.dingTalkCustomTitle': '添加钉钉自定义机器人场景注意事项', + 'project.messageManagement.dingTalkCustomContent1': + '1. 若使用安全验证的钉钉机器人，请选择 “自定义关键词” 验证，关键词为 “消息通知”；', + 'project.messageManagement.dingTalkCustomContent2': '2. 若使用 {at} 功能，接收人必须是机器人所在群的用户；', + 'project.messageManagement.dingTalkCustomContent3': '3. 若使用手机通知，接收人手机号必须为钉钉企业所使用的手机号', + 'project.messageManagement.expand': '展开', + 'project.messageManagement.close': '收起', + 'project.messageManagement.dingTalkEnterpriseTip': '添加企业内部应用文档', + 'project.messageManagement.helpDoc': '帮助文档', + 'project.messageManagement.dingTalkEnterpriseTitle': '添加企业内部应用机器人场景注意事项', + 'project.messageManagement.dingTalkEnterpriseContent1': '1. 若使用 {at} 功能，接收人必须是机器人所在群的用户；', + 'project.messageManagement.dingTalkEnterpriseContent2': '2. 若使用手机通知，接收人手机号必须为钉钉企业所使用的手机号', + 'project.messageManagement.appKey': 'AppKey', + 'project.messageManagement.appKeyPlaceholder': '打开帮助文档可直接获取', + 'project.messageManagement.appKeyRequired': 'AppKey 不能为空', + 'project.messageManagement.appSecret': 'AppSecret', + 'project.messageManagement.appSecretPlaceholder': '打开帮助文档可直接获取', + 'project.messageManagement.appSecretRequired': 'AppSecret 不能为空', + 'project.messageManagement.disableTitle': '确定关闭 {name} 吗？', + 'project.messageManagement.disableContent': '关闭后，将不在接收站内信通知，且不在消息列表页展示', + 'project.messageManagement.disableConfirm': '确认关闭', + 'project.messageManagement.disableSuccess': '关闭成功', + 'project.messageManagement.enableTitle': '开启 {name}', + 'project.messageManagement.enableContent': '开启后，站内信则显示在消息设置列表，需要手动设置通知类型', + 'project.messageManagement.enableConfirm': '确认开启', + 'project.messageManagement.enableSuccess': '开启成功', + 'project.messageManagement.deleteTitle': '确认删除 {name} ？', + 'project.messageManagement.deleteContent': '删除机器人后将不再推送绑定的消息事件', +}; diff --git a/frontend/src/views/project-management/projectAndPermission/userGroup/projectUserGroup.vue b/frontend/src/views/project-management/projectAndPermission/userGroup/projectUserGroup.vue index d5be4c29c0..00c5a3f912 100644 --- a/frontend/src/views/project-management/projectAndPermission/userGroup/projectUserGroup.vue +++ b/frontend/src/views/project-management/projectAndPermission/userGroup/projectUserGroup.vue @@ -26,9 +26,9 @@