需求解析功能进一步完善

cdTMP/src/views/project/testDemand/CaseSubForm/useOptions.ts

@@ -10,7 +10,78 @@ export default function useOptions(formRef: any) {
     })
     const crudColumns = useColumn(formRef)
     const columnOptions = computed(() => {
-        return tool.renameKeyInArray(crudColumns.value, "commonRules", "rules")
+        // 处理表单布局
+        const transformColumns = tool.renameKeyInArray(crudColumns.value, "commonRules", "rules")
+        // 取出字段column对象
+        const identColumn = transformColumns.find((item: any) => item.dataIndex === "ident")
+        const nameColumn = transformColumns.find((item: any) => item.dataIndex === "name")
+        const designPersonColumn = transformColumns.find((item: any) => item.dataIndex === "designPerson")
+        const testPersonColumn = transformColumns.find((item: any) => item.dataIndex === "testPerson")
+        const monitorPersonColumn = transformColumns.find((item: any) => item.dataIndex === "monitorPerson")
+        const summarizeColumn = transformColumns.find((item: any) => item.dataIndex === "summarize")
+        const initializationColumn = transformColumns.find((item: any) => item.dataIndex === "initialization")
+        const premiseColumn = transformColumns.find((item: any) => item.dataIndex === "premise")
+        const exe_timeColumn = transformColumns.find((item: any) => item.dataIndex === "exe_time")
+        // 组装表单布局
+        const identAndNameColumn = {
+            formType: "grid",
+            cols: [
+                { span: 12, formList: [identColumn] },
+                { span: 12, formList: [nameColumn] }
+            ]
+        }
+        const cardColumn = {
+            formType: "card",
+            customClass: ["ml-5", "mb-3", "py-0", "px-0"],
+            title: "人员信息",
+            formList: [
+                {
+                    formType: "grid",
+                    cols: [
+                        { span: 8, formList: [designPersonColumn] },
+                        { span: 8, formList: [testPersonColumn] },
+                        { span: 8, formList: [monitorPersonColumn] }
+                    ]
+                }
+            ]
+        }
+        const summarizeColumnNew = {
+            formType: "grid",
+            cols: [{ span: 24, formList: [summarizeColumn] }]
+        }
+        const initializationColumnNew = {
+            formType: "grid",
+            cols: [{ span: 24, formList: [initializationColumn] }]
+        }
+        const premiseAndExeColumn = {
+            formType: "grid",
+            cols: [
+                { span: 12, formList: [premiseColumn] },
+                { span: 12, formList: [exe_timeColumn] }
+            ]
+        }
+        // 取除原数组里面的内容
+        const newColumnsArray = transformColumns.filter(
+            (it: any) =>
+                it.dataIndex !== "ident" &&
+                it.dataIndex !== "name" &&
+                it.dataIndex !== "designPerson" &&
+                it.dataIndex !== "testPerson" &&
+                it.dataIndex !== "monitorPerson" &&
+                it.dataIndex !== "summarize" &&
+                it.dataIndex !== "initialization" &&
+                it.dataIndex !== "premise" &&
+                it.dataIndex !== "exe_time"
+        )
+        newColumnsArray.unshift(
+            identAndNameColumn,
+            cardColumn,
+            summarizeColumnNew,
+            initializationColumnNew,
+            premiseAndExeColumn
+        )
+        return newColumnsArray
     })
+
     return { options, columnOptions }
 }

cdTMP/src/views/project/testDemand/hooks/useColumn.tsx

@@ -140,9 +140,20 @@ export default function (crudOrFormRef: any, problemFormRef?: any) {
         },
         {
             title: "执行时间",
+            align: "center",
             dataIndex: "exe_time",
+            formType: "date",
+            customRender: ({ record }) => {
+                // 如果不存在exe_time则显示为“没有设置”
+                return record.exe_time ? record.exe_time : <a-tag color="red">未填写</a-tag>
+            }
+        },
+        {
+            title: "时序图(cpu不填写此字段)",
             hide: true,
-            formType: "date"
+            dataIndex: "timing_diagram",
+            addDefaultValue: "",
+            formType: "editor"
         },
         {
             title: "测试步骤",

cdTMP/src/views/project/testDemand/hooks/useCrudOpMore.ts

@@ -123,7 +123,7 @@ export default function (crudRef: Ref<InstanceType<typeof MaCrud>>) {
                 },
                 {
                     formType: "card",
-                    customClass: ["ml-10", "mb-3", "py-0", "px-0"],
+                    customClass: ["ml-5", "mb-3", "py-0", "px-0"],
                     title: "人员信息",
                     formList: [
                         {