diff --git a/cdTMP/package-lock.json b/cdTMP/package-lock.json index f023351..5cf7460 100644 --- a/cdTMP/package-lock.json +++ b/cdTMP/package-lock.json @@ -10,7 +10,7 @@ "dependencies": { "@arco-design/color": "^0.4.0", "@arco-design/web-vue": "^2.57.0", - "@tanstack/vue-query": "^5.75.6", + "@tanstack/vue-query": "^5.76.0", "@tinymce/tinymce-vue": "^6.1.0", "@vueuse/core": "^13.1.0", "axios": "^1.9.0", @@ -24,10 +24,10 @@ "mitt": "^3.0.1", "nprogress": "^0.2.0", "pinia": "^3.0.2", - "pinyin-match": "^1.2.7", + "pinyin-match": "^1.2.8", "postcss-import": "^16.1.0", "qs": "^6.14.0", - "tailwind-merge": "^3.2.0", + "tailwind-merge": "^3.3.0", "tinymce": "^7.8.0", "tw-animate-css": "^1.2.9", "vue": "^3.5.13", @@ -1802,9 +1802,9 @@ } }, "node_modules/@tanstack/query-core": { - "version": "5.75.6", - "resolved": "https://registry.npmmirror.com/@tanstack/query-core/-/query-core-5.75.6.tgz", - "integrity": "sha512-r+WQ/z30KZF0TFkzCT7C8gWgrLuv7/t+gEjqeEp69JAIUS/omuieaHeIkoscjEcT6yaWebXGTyjdiIxJkYzEXg==", + "version": "5.76.0", + "resolved": "https://registry.npmmirror.com/@tanstack/query-core/-/query-core-5.76.0.tgz", + "integrity": "sha512-FN375hb8ctzfNAlex5gHI6+WDXTNpe0nbxp/d2YJtnP+IBM6OUm7zcaoCW6T63BawGOYZBbKC0iPvr41TteNVg==", "license": "MIT", "funding": { "type": "github", @@ -1812,13 +1812,13 @@ } }, "node_modules/@tanstack/vue-query": { - "version": "5.75.6", - "resolved": "https://registry.npmmirror.com/@tanstack/vue-query/-/vue-query-5.75.6.tgz", - "integrity": "sha512-NhE1BTyWkQmqqRGHmMj3t1vj6SvH46QlHOtOc43fS87RCfkrfkzDV6uB+nHutaPEdeIU2treLhZNzxAGNBYFvQ==", + "version": "5.76.0", + "resolved": "https://registry.npmmirror.com/@tanstack/vue-query/-/vue-query-5.76.0.tgz", + "integrity": "sha512-Ow1JPfAqjam/hH2WJj15Y+a7FT5LS/So2b4jMAI3lLKUcpIjVRLEOLQXdCYZ/29YbDrL66trwLPXjA9tYrHung==", "license": "MIT", "dependencies": { "@tanstack/match-sorter-utils": "^8.19.4", - "@tanstack/query-core": "5.75.6", + "@tanstack/query-core": "5.76.0", "@vue/devtools-api": "^6.6.3", "vue-demi": "^0.14.10" }, @@ -5263,9 +5263,9 @@ } }, "node_modules/pinyin-match": { - "version": "1.2.7", - "resolved": "https://registry.npmmirror.com/pinyin-match/-/pinyin-match-1.2.7.tgz", - "integrity": "sha512-RnypoF7OKgSKL8L4IayHmmHj9cHeked45TFAOffddcvpIIDrLcTSEJNruprE5otXCegBBqWm4YEi8JwMqToeig==", + "version": "1.2.8", + "resolved": "https://registry.npmmirror.com/pinyin-match/-/pinyin-match-1.2.8.tgz", + "integrity": "sha512-5rBwNuOjnOtZNEgX4OlTLYsmBcE9XSV1oF/KN9mLEsVNr8HdqMb2YRhR6iqHMeU8ZBKbx/oYBgHr04uIvOlxGg==", "license": "SATA" }, "node_modules/pkce-challenge": { @@ -6051,9 +6051,9 @@ } }, "node_modules/tailwind-merge": { - "version": "3.2.0", - "resolved": "https://registry.npmmirror.com/tailwind-merge/-/tailwind-merge-3.2.0.tgz", - "integrity": "sha512-FQT/OVqCD+7edmmJpsgCsY820RTD5AkBryuG5IUqR5YQZSdj5xlH5nLgH7YPths7WsLPSpSBNneJdM8aS8aeFA==", + "version": "3.3.0", + "resolved": "https://registry.npmmirror.com/tailwind-merge/-/tailwind-merge-3.3.0.tgz", + "integrity": "sha512-fyW/pEfcQSiigd5SNn0nApUOxx0zB/dm6UDU/rEwc2c3sX2smWUNbapHv+QRqLGVp9GWX3THIa7MUGPo+YkDzQ==", "license": "MIT", "funding": { "type": "github", diff --git a/cdTMP/package.json b/cdTMP/package.json index 1ff14c0..b2cf0bf 100644 --- a/cdTMP/package.json +++ b/cdTMP/package.json @@ -13,7 +13,7 @@ "dependencies": { "@arco-design/color": "^0.4.0", "@arco-design/web-vue": "^2.57.0", - "@tanstack/vue-query": "^5.75.6", + "@tanstack/vue-query": "^5.76.0", "@tinymce/tinymce-vue": "^6.1.0", "@vueuse/core": "^13.1.0", "axios": "^1.9.0", @@ -27,10 +27,10 @@ "mitt": "^3.0.1", "nprogress": "^0.2.0", "pinia": "^3.0.2", - "pinyin-match": "^1.2.7", + "pinyin-match": "^1.2.8", "postcss-import": "^16.1.0", "qs": "^6.14.0", - "tailwind-merge": "^3.2.0", + "tailwind-merge": "^3.3.0", "tinymce": "^7.8.0", "tw-animate-css": "^1.2.9", "vue": "^3.5.13", diff --git a/cdTMP/src/components/ma-crud/components/form.vue b/cdTMP/src/components/ma-crud/components/form.vue index 032ee68..0654326 100644 --- a/cdTMP/src/components/ma-crud/components/form.vue +++ b/cdTMP/src/components/ma-crud/components/form.vue @@ -17,7 +17,14 @@ > - + + @@ -35,6 +42,11 @@ import { useRouter } from "vue-router" import tool from "@/utils/tool" import { useFormStore } from "@/store/index" +// 2025年5月14日新增 +const props = defineProps({ + parentKey: { type: String, default: "" } +}) + const formStore = useFormStore() const router = useRouter() const formOptions = ref({ showButtons: false }) diff --git a/cdTMP/src/components/ma-crud/index.vue b/cdTMP/src/components/ma-crud/index.vue index 082b422..274fe20 100644 --- a/cdTMP/src/components/ma-crud/index.vue +++ b/cdTMP/src/components/ma-crud/index.vue @@ -257,7 +257,8 @@ - + + @@ -308,7 +309,9 @@ const props = defineProps({ options: { type: Object, default: {} }, crud: { type: Object, default: {} }, // 字段列设置 - columns: { type: Array, default: [] } + columns: { type: Array, default: [] }, + // ~~~2025年5月14日新增透传给ma-form字段 + parentKey: { type: String, default: "" } }) const loading = ref(true) diff --git a/cdTMP/src/components/ma-form/Customs/ChenDemandList.vue b/cdTMP/src/components/ma-form/Customs/ChenDemandList.vue index 14612cd..5798681 100644 --- a/cdTMP/src/components/ma-form/Customs/ChenDemandList.vue +++ b/cdTMP/src/components/ma-form/Customs/ChenDemandList.vue @@ -61,7 +61,7 @@ - + diff --git a/cdTMP/src/components/ma-form/index.vue b/cdTMP/src/components/ma-form/index.vue index 6b35869..56685fb 100644 --- a/cdTMP/src/components/ma-form/index.vue +++ b/cdTMP/src/components/ma-form/index.vue @@ -63,12 +63,16 @@ + + + + diff --git a/cdTMP/src/views/project/design-demand/DemandSubForm/index.tsx b/cdTMP/src/views/project/design-demand/DemandSubForm/index.tsx index 0f08646..539505d 100644 --- a/cdTMP/src/views/project/design-demand/DemandSubForm/index.tsx +++ b/cdTMP/src/views/project/design-demand/DemandSubForm/index.tsx @@ -6,6 +6,7 @@ import useOptions from "./useOptions" import subFormHooks from "@/views/project/projPublicHooks/subFormHooks" import useBeforeCancel from "@/views/project/projPublicHooks/useBeforeCancel" import { cloneDeep } from "lodash-es" +import ParentPreview from "@/views/project/ParentPreview/index.vue" const DemandSubForm = defineComponent({ name: "DemandSubFormForm", diff --git a/cdTMP/src/views/project/design-demand/hooks/useCrudOpMore.ts b/cdTMP/src/views/project/design-demand/hooks/useCrudOpMore.ts index 5b5d237..87b74cf 100644 --- a/cdTMP/src/views/project/design-demand/hooks/useCrudOpMore.ts +++ b/cdTMP/src/views/project/design-demand/hooks/useCrudOpMore.ts @@ -60,7 +60,7 @@ export default function (crudRef: Ref>) { crudRef.value.crudFormRef.actionTitle = `${route.query.ident} > ${td[round_key].title} > ${td[round_key].children[dut_key].title} > ${td[round_key].children[dut_key].children[design_key].title} > 测试项-` return true }, - beforeOpenEdit: function (record) { + beforeOpenEdit: function (record: any) { // 1.储存打开前form的content数据到ref中,以便后续比较 beforeFormContent = cloneDeep(record.testContent) // 2.处理标识 diff --git a/cdTMP/src/views/project/design-demand/index.vue b/cdTMP/src/views/project/design-demand/index.vue index e5dcc75..cfb9ab0 100644 --- a/cdTMP/src/views/project/design-demand/index.vue +++ b/cdTMP/src/views/project/design-demand/index.vue @@ -2,7 +2,13 @@
- + @@ -44,10 +50,13 @@