fix: 修改缺陷同步bugs&测试计划部分bug&文件转存bug

This commit is contained in:
xinxin.wu 2024-05-27 19:28:59 +08:00 committed by Craftsman
parent c50243e35c
commit ef29029d46
9 changed files with 23 additions and 11 deletions

View File

@ -89,6 +89,7 @@
placeholder?: string; placeholder?: string;
draggable?: boolean; draggable?: boolean;
previewUrl?: string; previewUrl?: string;
editable?: boolean;
}>(), }>(),
{ {
raw: '', raw: '',
@ -340,6 +341,7 @@
}) as Extension<any, any>, }) as Extension<any, any>,
], ],
autofocus: false, autofocus: false,
editable: !props.editable,
onUpdate: () => { onUpdate: () => {
debounceOnUpdate(); debounceOnUpdate();
}, },

View File

@ -40,7 +40,7 @@
:placeholder="props.placeholderText" :placeholder="props.placeholderText"
multiple multiple
:value-key="props.valueKey || 'id'" :value-key="props.valueKey || 'id'"
:label-key="props.labelKey" :label-key="props.labelKey || 'name'"
:filter-option="false" :filter-option="false"
allow-clear allow-clear
:search-keys="['name']" :search-keys="['name']"
@ -137,6 +137,9 @@
if (props.valueKey) { if (props.valueKey) {
item.id = item[props.valueKey || 'id'] as string; item.id = item[props.valueKey || 'id'] as string;
} }
if (props.labelKey) {
item.name = (item[props.labelKey] as string) || '';
}
}); });
return list; return list;
} }

View File

@ -25,7 +25,7 @@
[ExecuteStatusFilters.RUNNING]: { [ExecuteStatusFilters.RUNNING]: {
bgColor: 'rgb(var(--link-2))', bgColor: 'rgb(var(--link-2))',
color: 'rgb(var(--link-5))', color: 'rgb(var(--link-5))',
text: 'ccommon.running', text: 'common.running',
}, },
// [ExecuteStatusFilters.RERUNNING]: { // [ExecuteStatusFilters.RERUNNING]: {
// bgColor: 'rgb(var(--link-2))', // bgColor: 'rgb(var(--link-2))',

View File

@ -110,6 +110,7 @@
{{ t('caseManagement.featureCase.storage') }} {{ t('caseManagement.featureCase.storage') }}
</MsButton> </MsButton>
<SaveAsFilePopover <SaveAsFilePopover
v-if="item.uid === activeTransferFileParams?.uid"
v-model:visible="transferVisible" v-model:visible="transferVisible"
:saving-file="activeTransferFileParams" :saving-file="activeTransferFileParams"
:file-save-as-source-id="props.detailInfo.id" :file-save-as-source-id="props.detailInfo.id"

View File

@ -154,7 +154,7 @@
{{ t('ms.upload.preview') }} {{ t('ms.upload.preview') }}
</MsButton> </MsButton>
<SaveAsFilePopover <SaveAsFilePopover
v-if="!props.isTestPlan" v-if="!props.isTestPlan && item.uid === activeTransferFileParams?.uid"
v-model:visible="transferVisible" v-model:visible="transferVisible"
:saving-file="activeTransferFileParams" :saving-file="activeTransferFileParams"
:file-save-as-source-id="(form.id as string)" :file-save-as-source-id="(form.id as string)"

View File

@ -255,7 +255,6 @@
{{ t('project.menu.configure') }} {{ t('project.menu.configure') }}
</span> </span>
</template> </template>
<a-switch <a-switch
v-model="allValueMap['BUG_SYNC_SYNC_ENABLE']" v-model="allValueMap['BUG_SYNC_SYNC_ENABLE']"
checked-value="true" checked-value="true"
@ -383,7 +382,11 @@
/> />
</template> </template>
</MsBaseTable> </MsBaseTable>
<DefectSync v-model:visible="defectDrawerVisible" @cancel="defectDrawerVisible = false" @ok="initMenuData()" /> <DefectSync
v-model:visible="defectDrawerVisible"
@cancel="defectDrawerVisible = false"
@ok="getMenuConfig(MenuEnum.bugManagement)"
/>
<RelatedCase <RelatedCase
v-model:visible="relatedCaseDrawerVisible" v-model:visible="relatedCaseDrawerVisible"
@cancel="relatedCaseDrawerVisible = false" @cancel="relatedCaseDrawerVisible = false"

View File

@ -471,9 +471,6 @@
:deep(.arco-table-content + .arco-scrollbar-track-direction-vertical .arco-scrollbar-thumb-direction-vertical) { :deep(.arco-table-content + .arco-scrollbar-track-direction-vertical .arco-scrollbar-thumb-direction-vertical) {
height: 0 !important; height: 0 !important;
} }
:deep(.arco-table-content + .arco-scrollbar-track-direction-horizontal .arco-scrollbar-thumb-direction-horizontal) {
width: 0 !important;
}
:deep(.arco-table-hover) { :deep(.arco-table-hover) {
.arco-table-tr-expand:not(.arco-table-tr-empty):hover { .arco-table-tr-expand:not(.arco-table-tr-empty):hover {
.arco-table-td:not(.arco-table-col-fixed-left):not(.arco-table-col-fixed-right) { .arco-table-td:not(.arco-table-col-fixed-left):not(.arco-table-col-fixed-right) {

View File

@ -134,7 +134,7 @@
:upload-image="handleUploadImage" :upload-image="handleUploadImage"
:preview-url="PreviewEditorImageUrl" :preview-url="PreviewEditorImageUrl"
class="mt-[8px] w-full" class="mt-[8px] w-full"
:disabled="true" :editable="!!shareId"
/></div> /></div>
<div <div
@ -443,8 +443,8 @@
watchEffect(() => { watchEffect(() => {
if (props.detailInfo) { if (props.detailInfo) {
// await getDetail();
detail.value = cloneDeep(props.detailInfo); detail.value = cloneDeep(props.detailInfo);
richText.value.summary = detail.value.summary;
initOptionsData(); initOptionsData();
} }
}); });

View File

@ -29,6 +29,7 @@
:label="t('apiTestManagement.batchUpdate')" :label="t('apiTestManagement.batchUpdate')"
:rules="[{ required: true, message: t('apiTestManagement.valueRequired') }]" :rules="[{ required: true, message: t('apiTestManagement.valueRequired') }]"
asterisk-position="end" asterisk-position="end"
:validate-trigger="['blur', 'input']"
class="mb-0" class="mb-0"
required required
> >
@ -138,7 +139,12 @@
function closeHandler() { function closeHandler() {
isVisible.value = false; isVisible.value = false;
formRef.value?.resetFields(); formRef.value?.resetFields();
form.value = { ...initForm }; form.value = {
selectedAttrsId: '',
append: false,
tags: [],
value: '',
};
} }
const batchEditLoading = ref(false); const batchEditLoading = ref(false);