diff --git a/frontend/package.json b/frontend/package.json index a1c7915580..28cee6c224 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -37,7 +37,7 @@ "dependencies": { "@7polo/kity": "2.0.8", "@7polo/kityminder-core": "1.4.53", - "@arco-design/web-vue": "^2.53.3", + "@arco-design/web-vue": "^2.54.3", "@arco-themes/vue-ms-theme-default": "^0.0.30", "@form-create/arco-design": "^3.1.23", "@halo-dev/richtext-editor": "0.0.0-alpha.33", diff --git a/frontend/src/api/modules/case-management/caseReview.ts b/frontend/src/api/modules/case-management/caseReview.ts index f806bad319..485b559478 100644 --- a/frontend/src/api/modules/case-management/caseReview.ts +++ b/frontend/src/api/modules/case-management/caseReview.ts @@ -181,8 +181,8 @@ export const getReviewDetailModuleCount = (data: ReviewDetailCaseListQueryParams }; // 评审详情-已关联用例模块树 -export const getReviewDetailModuleTree = (projectId: string, reviewId: string) => { - return MSR.get({ url: `${GetReviewDetailModuleTreeUrl}/${projectId}/${reviewId}` }); +export const getReviewDetailModuleTree = (reviewId: string) => { + return MSR.get({ url: `${GetReviewDetailModuleTreeUrl}/${reviewId}` }); }; // 评审详情-获取用例评审历史 diff --git a/frontend/src/api/modules/user/index.ts b/frontend/src/api/modules/user/index.ts index 698dbf034e..4598f3069c 100644 --- a/frontend/src/api/modules/user/index.ts +++ b/frontend/src/api/modules/user/index.ts @@ -47,7 +47,7 @@ export function login(data: LoginData) { } export function isLogin() { - return MSR.get({ url: isLoginUrl }, { ignoreCancelToken: true }); + return MSR.get({ url: isLoginUrl }, { ignoreCancelToken: true, errorMessageMode: 'none' }); } export function logout() { @@ -143,18 +143,18 @@ export function updatePsw(data: UpdatePswParams) { } // 个人信息-校验第三方平台账号信息 -export function validatePlatform(id: string, data: Record) { - return MSR.post({ url: `${ValidatePlatformUrl}/${id}`, data }); +export function validatePlatform(id: string, orgId: string, data: Record) { + return MSR.post({ url: `${ValidatePlatformUrl}/${id}/${orgId}`, data }); } // 个人信息-保存第三方平台账号信息 -export function savePlatform(data: UpdatePswParams) { +export function savePlatform(data: Record) { return MSR.post({ url: SavePlatformUrl, data }); } // 个人信息-获取第三方平台账号信息 -export function getPlatform() { - return MSR.get({ url: GetPlatformUrl }); +export function getPlatform(orgId: string) { + return MSR.get({ url: GetPlatformUrl, params: orgId }); } // 个人信息-获取第三方平台账号信息-插件信息 diff --git a/frontend/src/assets/icon-font/iconfont.css b/frontend/src/assets/icon-font/iconfont.css index 7f4cf0fab7..6205059ae0 100644 --- a/frontend/src/assets/icon-font/iconfont.css +++ b/frontend/src/assets/icon-font/iconfont.css @@ -1,7 +1,7 @@ @font-face { font-family: iconfont; /* Project id 3462279 */ - src: url('iconfont.woff2?t=1705549750803') format('woff2'), url('iconfont.woff?t=1705549750803') format('woff'), - url('iconfont.ttf?t=1705549750803') format('truetype'), url('iconfont.svg?t=1705549750803#iconfont') format('svg'); + src: url('iconfont.woff2?t=1706424798592') format('woff2'), url('iconfont.woff?t=1706424798592') format('woff'), + url('iconfont.ttf?t=1706424798592') format('truetype'), url('iconfont.svg?t=1706424798592#iconfont') format('svg'); } .iconfont { font-size: 16px; @@ -10,6 +10,12 @@ -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } +.icon-icon_swich::before { + content: '\e79c'; +} +.icon-icon_split_turn-down_arrow::before { + content: '\e79b'; +} .icon-icon_carriage_return2::before { content: '\e79a'; } diff --git a/frontend/src/assets/icon-font/iconfont.js b/frontend/src/assets/icon-font/iconfont.js index f11ec41353..53d4d3cc03 100644 --- a/frontend/src/assets/icon-font/iconfont.js +++ b/frontend/src/assets/icon-font/iconfont.js @@ -1,5 +1,5 @@ (window._iconfont_svg_string_3462279 = - ''), + ''), (function (h) { var a = (a = document.getElementsByTagName('script'))[a.length - 1], l = a.getAttribute('data-injectcss'), diff --git a/frontend/src/assets/icon-font/iconfont.json b/frontend/src/assets/icon-font/iconfont.json index 3077b1f206..74fc69ddd0 100644 --- a/frontend/src/assets/icon-font/iconfont.json +++ b/frontend/src/assets/icon-font/iconfont.json @@ -5,6 +5,20 @@ "css_prefix_text": "icon-", "description": "DE、MS项目icon管理", "glyphs": [ + { + "icon_id": "39108518", + "name": "icon_swich", + "font_class": "icon_swich", + "unicode": "e79c", + "unicode_decimal": 59292 + }, + { + "icon_id": "39084088", + "name": "icon_split_turn-down_arrow", + "font_class": "icon_split_turn-down_arrow", + "unicode": "e79b", + "unicode_decimal": 59291 + }, { "icon_id": "38923289", "name": "icon_carriage_return", diff --git a/frontend/src/assets/icon-font/iconfont.svg b/frontend/src/assets/icon-font/iconfont.svg index 02bf9776a8..3e80b7ddc6 100644 --- a/frontend/src/assets/icon-font/iconfont.svg +++ b/frontend/src/assets/icon-font/iconfont.svg @@ -14,6 +14,10 @@ /> + + + + diff --git a/frontend/src/assets/icon-font/iconfont.ttf b/frontend/src/assets/icon-font/iconfont.ttf index f8584e10fb..9d13663eb7 100644 Binary files a/frontend/src/assets/icon-font/iconfont.ttf and b/frontend/src/assets/icon-font/iconfont.ttf differ diff --git a/frontend/src/assets/icon-font/iconfont.woff b/frontend/src/assets/icon-font/iconfont.woff index aaa08498f1..26e91e75aa 100644 Binary files a/frontend/src/assets/icon-font/iconfont.woff and b/frontend/src/assets/icon-font/iconfont.woff differ diff --git a/frontend/src/assets/icon-font/iconfont.woff2 b/frontend/src/assets/icon-font/iconfont.woff2 index bd1a47ad9f..09253c5e5f 100644 Binary files a/frontend/src/assets/icon-font/iconfont.woff2 and b/frontend/src/assets/icon-font/iconfont.woff2 differ diff --git a/frontend/src/assets/style/arco-reset.less b/frontend/src/assets/style/arco-reset.less index a2deb9eb54..e5722b0d7f 100644 --- a/frontend/src/assets/style/arco-reset.less +++ b/frontend/src/assets/style/arco-reset.less @@ -575,12 +575,12 @@ background-color: var(--color-text-input-border); } } -.ms-card-container .arco-scrollbar .arco-scrollbar-track-direction-vertical { - right: -10px; -} -.ms-card-container .arco-scrollbar .arco-scrollbar-track-direction-horizontal { - bottom: -10px; -} +// .ms-card-container .arco-scrollbar .arco-scrollbar-track-direction-vertical { +// right: -10px; +// } +// .ms-card-container .arco-scrollbar .arco-scrollbar-track-direction-horizontal { +// bottom: -10px; +// } .ms-base-table .arco-scrollbar .arco-scrollbar-track-direction-vertical { right: 0; } diff --git a/frontend/src/components/business/ms-cascader/index.vue b/frontend/src/components/business/ms-cascader/index.vue index 64852d9937..41fc70c34e 100644 --- a/frontend/src/components/business/ms-cascader/index.vue +++ b/frontend/src/components/business/ms-cascader/index.vue @@ -215,10 +215,11 @@ // TODO: 临时解决 arco-design 的 cascader 组件绑定值只能是 path-mode 的问题，如果实际值也包含了 ‘-’，则不要取这个值，而是取绑定的 v-model 的值 function getInputLabel(data: CascaderOption) { + const isTagCount = data[props.labelKey].includes('+'); if (!props.pathMode) { - return t(data[props.labelKey].split('-').pop()); + return isTagCount ? data[props.labelKey] : t(data[props.labelKey].split('-').pop()); } - return t(data[props.labelKey]); + return isTagCount ? data[props.labelKey] : t(data[props.labelKey]); } function clearValues() { diff --git a/frontend/src/components/business/ms-case-associate/caseLevel.vue b/frontend/src/components/business/ms-case-associate/caseLevel.vue index ef81fd80a0..8c4cf18366 100644 --- a/frontend/src/components/business/ms-case-associate/caseLevel.vue +++ b/frontend/src/components/business/ms-case-associate/caseLevel.vue @@ -2,11 +2,11 @@
- {{ caseLevelMap[props.caseLevel].label }} + {{ caseLevel.label }} diff --git a/frontend/src/components/business/ms-personal-drawer/components/baseInfo.vue b/frontend/src/components/business/ms-personal-drawer/components/baseInfo.vue index f2d03fd054..6fbb9f2cb0 100644 --- a/frontend/src/components/business/ms-personal-drawer/components/baseInfo.vue +++ b/frontend/src/components/business/ms-personal-drawer/components/baseInfo.vue @@ -6,7 +6,7 @@
- + diff --git a/frontend/src/components/business/ms-personal-drawer/components/tripartite.vue b/frontend/src/components/business/ms-personal-drawer/components/tripartite.vue index 2749cf12ee..d091a0147e 100644 --- a/frontend/src/components/business/ms-personal-drawer/components/tripartite.vue +++ b/frontend/src/components/business/ms-personal-drawer/components/tripartite.vue @@ -1,7 +1,14 @@ diff --git a/frontend/src/components/business/ms-personal-drawer/locale/en-US.ts b/frontend/src/components/business/ms-personal-drawer/locale/en-US.ts index 517c0bae7b..2f7d13c072 100644 --- a/frontend/src/components/business/ms-personal-drawer/locale/en-US.ts +++ b/frontend/src/components/business/ms-personal-drawer/locale/en-US.ts @@ -72,7 +72,7 @@ export default { 'ms.personal.validPass': 'Verification passed', 'ms.personal.validFail': 'Verification failed', 'ms.personal.unValid': 'Not verified', - 'ms.personal.valid': 'Verify', + 'ms.personal.valid': 'Verify and save', 'ms.personal.authType': 'Authentication', 'ms.personal.platformAccount': 'Account', 'ms.personal.platformAccountPlaceholder': 'Please enter {type} account', diff --git a/frontend/src/components/business/ms-personal-drawer/locale/zh-CN.ts b/frontend/src/components/business/ms-personal-drawer/locale/zh-CN.ts index 0e281f7fa1..ea39793e04 100644 --- a/frontend/src/components/business/ms-personal-drawer/locale/zh-CN.ts +++ b/frontend/src/components/business/ms-personal-drawer/locale/zh-CN.ts @@ -66,7 +66,7 @@ export default { 'ms.personal.validPass': '校验通过', 'ms.personal.validFail': '校验失败', 'ms.personal.unValid': '未校验', - 'ms.personal.valid': '校验', + 'ms.personal.valid': '校验并保存', 'ms.personal.authType': '认证方式', 'ms.personal.platformAccount': '平台账号', 'ms.personal.platformAccountPlaceholder': '请输入 {type} 账号', diff --git a/frontend/src/components/business/ms-select/index.tsx b/frontend/src/components/business/ms-select/index.tsx index f77bc21512..e44995a85d 100644 --- a/frontend/src/components/business/ms-select/index.tsx +++ b/frontend/src/components/business/ms-select/index.tsx @@ -69,7 +69,6 @@ export default defineComponent( selectRef, selectVal: innerValue, isCascade: true, - options: props.options, valueKey: props.valueKey, labelKey: props.labelKey, }); @@ -79,7 +78,7 @@ export default defineComponent( (val) => { innerValue.value = val; if (Array.isArray(val) && val.length > 0 && props.multiple) { - calculateMaxTag(); + calculateMaxTag(remoteOriginOptions.value); } }, { @@ -239,6 +238,7 @@ export default defineComponent( handleSelectAllChange(true); } } + calculateMaxTag(val); } ); @@ -357,9 +357,15 @@ export default defineComponent( popup-container={props.popupContainer || document.body} trigger-props={props.triggerProps} fallback-option={props.fallbackOption} - onChange={(value: ModelType) => emit('update:modelValue', value)} + onChange={(value: ModelType) => { + emit('update:modelValue', value); + emit('change', value); + }} onSearch={handleSearch} - onPopupVisibleChange={(val: boolean) => emit('popupVisibleChange', val)} + onPopupVisibleChange={(val: boolean) => { + handleSearch('', true); + emit('popupVisibleChange', val); + }} onRemove={(val: string | number | boolean | Record | undefined) => emit('remove', val)} onKeyup={(e: KeyboardEvent) => { // 阻止组件在回车时自动触发的事件 @@ -416,6 +422,6 @@ export default defineComponent( 'atLeastOne', 'objectValue', ], - emits: ['update:modelValue', 'remoteSearch', 'popupVisibleChange', 'update:loading', 'remove'], + emits: ['update:modelValue', 'remoteSearch', 'popupVisibleChange', 'update:loading', 'remove', 'change'], } ); diff --git a/frontend/src/components/business/ms-thumbnail-card/index.vue b/frontend/src/components/business/ms-thumbnail-card/index.vue index 00707582c5..2407e609fc 100644 --- a/frontend/src/components/business/ms-thumbnail-card/index.vue +++ b/frontend/src/components/business/ms-thumbnail-card/index.vue @@ -19,7 +19,7 @@ :type="FileIconMap[fileType][UploadStatus.done]" class="absolute top-0 h-full w-full p-[24px] text-[var(--color-text-4)]" /> - +
{{ props.footerText }}
diff --git a/frontend/src/components/business/ms-top-menu/index.vue b/frontend/src/components/business/ms-top-menu/index.vue index e79a7994ea..37e76613df 100644 --- a/frontend/src/components/business/ms-top-menu/index.vue +++ b/frontend/src/components/business/ms-top-menu/index.vue @@ -113,4 +113,12 @@ } - + diff --git a/frontend/src/components/business/ms-tree/index.vue b/frontend/src/components/business/ms-tree/index.vue index fca9a4b8df..b3c6958a87 100644 --- a/frontend/src/components/business/ms-tree/index.vue +++ b/frontend/src/components/business/ms-tree/index.vue @@ -66,6 +66,7 @@ -@/config/caseManagement diff --git a/frontend/src/views/case-management/caseReview/components/create/associateDrawer.vue b/frontend/src/views/case-management/caseReview/components/create/associateDrawer.vue index 664f116b5e..b404e23727 100644 --- a/frontend/src/views/case-management/caseReview/components/create/associateDrawer.vue +++ b/frontend/src/views/case-management/caseReview/components/create/associateDrawer.vue @@ -7,7 +7,7 @@ :get-modules-func="getCaseModuleTree" :get-table-func="getCaseList" :confirm-loading="confirmLoading" - :associated-ids="associatedIds" + :associated-ids="[]" :type="RequestModuleEnum.CASE_MANAGEMENT" @close="emit('close')" @save="saveHandler" @@ -90,10 +90,12 @@ const props = defineProps<{ visible: boolean; project: string; + // associatedIds: string[]; }>(); const emit = defineEmits<{ (e: 'update:visible', val: boolean): void; (e: 'update:project', val: string): void; + (e: 'update:associatedIds', val: string[]): void; (e: 'success', val: BaseAssociateCaseRequest & { reviewers: string[] }): void; (e: 'close'): void; }>(); @@ -136,7 +138,7 @@ const currentSelectCase = ref | undefined>(''); - const associatedIds = ref([]); + // const associatedIds = useVModel(props, 'associatedIds', emit); const confirmLoading = ref(false); function saveHandler(params: BaseAssociateCaseRequest) { @@ -144,7 +146,7 @@ if (!errors) { try { confirmLoading.value = true; - associatedIds.value = [...params.selectIds]; + // associatedIds.value = [...params.selectIds]; emit('success', { ...params, reviewers: associateForm.value.reviewers }); innerVisible.value = false; } catch (error) { diff --git a/frontend/src/views/case-management/caseReview/components/detail/caseTable.vue b/frontend/src/views/case-management/caseReview/components/detail/caseTable.vue index bc3e53816b..434fde5331 100644 --- a/frontend/src/views/case-management/caseReview/components/detail/caseTable.vue +++ b/frontend/src/views/case-management/caseReview/components/detail/caseTable.vue @@ -44,10 +44,10 @@
- -