-
+
-
+
-
+
diff --git a/cdTMP/src/components/ma-form/containerItem/children-form.vue b/cdTMP/src/components/ma-form/containerItem/children-form.vue
index d4842a3..5ec1bda 100644
--- a/cdTMP/src/components/ma-form/containerItem/children-form.vue
+++ b/cdTMP/src/components/ma-form/containerItem/children-form.vue
@@ -36,35 +36,30 @@
-
+
-
+
-
+
-
+
-
+
@@ -99,7 +94,7 @@
-
+
@@ -126,6 +121,7 @@
|
-
+
|
@@ -212,8 +208,7 @@ watch(
)
// ~~~~修改源码-end
-const rv = async (ev, value = undefined) =>
- await runEvent(props.component, ev, { formModel, getColumnService, columns }, value)
+const rv = async (ev, value = undefined) => await runEvent(props.component, ev, { formModel, getColumnService, columns }, value)
const defaultOpenKeys = [0]
@@ -269,9 +264,7 @@ function updateChongFen() {
const subItemFormData = formModel.value.testContent
const mapRes = subItemFormData.map((subItem) => subItem.subName || "")
formModel.value.adequacy &&
- (formModel.value.adequacy = `测试用例覆盖${mapRes.join(
- "、"
- )}子项要求的全部内容。\n所有用例执行完毕,对于未执行的用例说明未执行原因。`)
+ (formModel.value.adequacy = `测试用例覆盖${mapRes.join("、")}子项要求的全部内容。\n所有用例执行完毕,对于未执行的用例说明未执行原因。`)
}
}
diff --git a/cdTMP/src/components/ma-form/formItem/form-button.vue b/cdTMP/src/components/ma-form/formItem/form-button.vue
index 9283703..af1c4f0 100644
--- a/cdTMP/src/components/ma-form/formItem/form-button.vue
+++ b/cdTMP/src/components/ma-form/formItem/form-button.vue
@@ -1,7 +1,3 @@
-
@@ -36,8 +32,7 @@ const props = defineProps({
const formModel = inject("formModel")
const getColumnService = inject("getColumnService")
const columns = inject("columns")
-const rv = async (ev, value = undefined) =>
- await runEvent(props.component, ev, { formModel, getColumnService, columns }, value)
+const rv = async (ev, value = undefined) => await runEvent(props.component, ev, { formModel, getColumnService, columns }, value)
rv("onCreated")
onMounted(() => rv("onMounted"))
diff --git a/cdTMP/src/components/ma-form/formItem/form-key-value.vue b/cdTMP/src/components/ma-form/formItem/form-key-value.vue
index 782f719..feb4fe7 100644
--- a/cdTMP/src/components/ma-form/formItem/form-key-value.vue
+++ b/cdTMP/src/components/ma-form/formItem/form-key-value.vue
@@ -1,7 +1,3 @@
-
diff --git a/cdTMP/src/components/ma-form/formItem/form-radio.vue b/cdTMP/src/components/ma-form/formItem/form-radio.vue
index f8c572d..b7db3aa 100644
--- a/cdTMP/src/components/ma-form/formItem/form-radio.vue
+++ b/cdTMP/src/components/ma-form/formItem/form-radio.vue
@@ -1,7 +1,3 @@
-
- await runEvent(props.component, ev, { formModel, getColumnService, columns }, value)
+const rv = async (ev, value = undefined) => await runEvent(props.component, ev, { formModel, getColumnService, columns }, value)
const index = props.customField ?? props.component.dataIndex
-const dictIndex = index.match(/^(\w+\.)\d+\./)
- ? index.match(/^(\w+\.)\d+\./)[1] + props.component.dataIndex
- : props.component.dataIndex
+const dictIndex = index.match(/^(\w+\.)\d+\./) ? index.match(/^(\w+\.)\d+\./)[1] + props.component.dataIndex : props.component.dataIndex
const value = ref(get(formModel.value, index, ""))
watch(
@@ -65,11 +58,7 @@ watch(
if (value.value === "") {
value.value = undefined
-} else if (
- !isUndefined(value.value) &&
- props.component.dict &&
- (props.component.dict.name || props.component.dict.data)
-) {
+} else if (!isUndefined(value.value) && props.component.dict && (props.component.dict.name || props.component.dict.data)) {
value.value = value.value + ""
}
diff --git a/cdTMP/src/hooks/workarea/currentCasePage.ts b/cdTMP/src/hooks/workarea/currentCasePage.ts
index b5b43ce..d3b85ca 100644
--- a/cdTMP/src/hooks/workarea/currentCasePage.ts
+++ b/cdTMP/src/hooks/workarea/currentCasePage.ts
@@ -12,13 +12,17 @@ export default function () {
const tempCaseInfo = ref(null)
// 项目id和当前case的key
const { id, key } = route.query
- onMounted(async () => {
+ const fetchCaseOneStatus = async () => {
try {
const res = await caseApi.getCaseOne({ key, projectId: id })
tempCaseInfo.value = res.data
} catch (err) {
Message.error("获取用例信息失败,请检查服务器")
}
+ }
+ // 在初次加载时更新状态,如何在用例更新后再次加载呢
+ onMounted(() => {
+ fetchCaseOneStatus()
})
// hook里面判断函数:判断是否该用例未执行或未通过
const caseIsNotPassedOrNotExe = function (): boolean {
@@ -34,7 +38,8 @@ export default function () {
}
return {
tempCaseInfo,
- caseIsNotPassedOrNotExe
+ caseIsNotPassedOrNotExe,
+ fetchCaseOneStatus
}
}
diff --git a/cdTMP/src/layout/project-layout.vue b/cdTMP/src/layout/project-layout.vue
index 7eff809..0f9dc3c 100644
--- a/cdTMP/src/layout/project-layout.vue
+++ b/cdTMP/src/layout/project-layout.vue
@@ -119,6 +119,16 @@
+
+
+
+ {{ title }}
+
+ 右键
+
+
+ {{ title }}
+
@@ -428,10 +438,34 @@ const { paoVisible, paoContainer, pao2Visible, pao2Container, ondrop, allowdrop,
}
.font-icon {
font-size: 20px;
- margin-bottom: -2px;
+ margin-bottom: -2.8px;
}
.font-icon:hover {
color: #f53f3fed;
transition: all 0.3s;
}
+// 有右键菜单节点显示图标
+.small-right-context-tip {
+ align-items: center;
+ background: linear-gradient(54.58deg, rgba(74, 228, 255, 0.12) -14.12%, rgba(66, 130, 255, 0.12) 47.61%, rgba(215, 104, 255, 0.12) 105.84%);
+ border: 1px solid #d5d7f9;
+ border-radius: 10px;
+ color: transparent;
+ display: inline-flex;
+ height: 10px;
+ justify-content: center;
+ margin-left: 2px;
+ padding: 0 2.5px;
+ position: absolute;
+ top: 7px;
+ i {
+ -webkit-text-fill-color: transparent !important;
+ zoom: 0.7;
+ background: linear-gradient(85.2deg, #0062ff -3.15%, #cb50ff 98.89%) !important;
+ background-clip: text !important;
+ -webkit-background-clip: text !important;
+ font-size: 10px;
+ font-style: normal;
+ }
+}
diff --git a/cdTMP/src/views/project/case/index.vue b/cdTMP/src/views/project/case/index.vue
index 5b39561..bf662b1 100644
--- a/cdTMP/src/views/project/case/index.vue
+++ b/cdTMP/src/views/project/case/index.vue
@@ -17,11 +17,7 @@
-
+
@@ -33,10 +29,13 @@ import { useTreeDataStore } from "@/store"
import ProblemChoose from "./components/ProblemChoose.vue"
import { Message } from "@arco-design/web-vue"
import getCaseInfoHook from "@/hooks/workarea/currentCasePage"
+import { useUserStore } from "@/store"
+
const treeDataStore = useTreeDataStore()
+const userStore = useUserStore()
const route = useRoute()
// hook-获取当前用例信息
-const { tempCaseInfo, caseIsNotPassedOrNotExe } = getCaseInfoHook()
+const { tempCaseInfo, caseIsNotPassedOrNotExe, fetchCaseOneStatus } = getCaseInfoHook()
// const router = useRouter()
const roundNumber = route.query.key.split("-")[0]
@@ -118,6 +117,8 @@ const crudOptions = ref({
},
// 请求后置处理-用于新增/删除更新树状的用例关联问题单状态
afterRequest(tableData) {
+ // 调用更新是否有未通过变量
+ fetchCaseOneStatus()
const caseQuery = { key: route.query.key }
treeDataStore.updateCaseTreeData(caseQuery, route.query.id)
// 新版本mime必须返回
@@ -384,6 +385,7 @@ const crudColumns = ref([
search: true,
align: "center",
formType: "select",
+ addDefaultValue: userStore.name,
commonRules: [{ required: true, message: "测试人员必填" }],
dict: {
url: "system/user/list",
diff --git a/cdTMP/src/views/project/components/BatchDemandCreate/useColumn.ts b/cdTMP/src/views/project/components/BatchDemandCreate/useColumn.ts
index 5bebfc8..1b145b0 100644
--- a/cdTMP/src/views/project/components/BatchDemandCreate/useColumn.ts
+++ b/cdTMP/src/views/project/components/BatchDemandCreate/useColumn.ts
@@ -51,7 +51,7 @@ export default function () {
dataIndex: "testMethod",
align: "center",
slotName: "testMethod",
- width: 210
+ width: 220
},
{
title: "测试类型",
diff --git a/cdTMP/src/views/project/opeSets/components/CaseTable/ReplaceExetime.vue b/cdTMP/src/views/project/opeSets/components/CaseTable/ReplaceExetime.vue
index 49fc8ca..8b6e3ec 100644
--- a/cdTMP/src/views/project/opeSets/components/CaseTable/ReplaceExetime.vue
+++ b/cdTMP/src/views/project/opeSets/components/CaseTable/ReplaceExetime.vue
@@ -13,7 +13,7 @@
替换执行时间
-
+
diff --git a/cdTMP/src/views/project/opeSets/components/CaseTable/index.vue b/cdTMP/src/views/project/opeSets/components/CaseTable/index.vue
index 93e9d49..d2f99a6 100644
--- a/cdTMP/src/views/project/opeSets/components/CaseTable/index.vue
+++ b/cdTMP/src/views/project/opeSets/components/CaseTable/index.vue
@@ -246,7 +246,7 @@ const handlePerpleModal = () => {
}
// 10.批量修改时间
-const replaceExetimeModalRef = ref >()
+const replaceExetimeModalRef = ref>()
const handleExetimeModal = () => {
replaceExetimeModalRef.value!.open(undefined)
}
| |