From bdb8c55b2b987012a9b037bc720243f5c5ccacf1 Mon Sep 17 00:00:00 2001
From: ks3356143 <314298729@qq.com>
Date: Sun, 1 Sep 2024 15:58:58 +0800
Subject: [PATCH] 1122
---
cdTMP/package-lock.json | 44 +++++++++----------
cdTMP/package.json | 10 ++---
cdTMP/src/api/generate/seitaiGenerate.js | 11 +++++
cdTMP/src/store/project/treeData.js | 6 ++-
.../project/case/components/ProblemChoose.vue | 4 +-
cdTMP/src/views/project/case/index.vue | 2 +-
.../testmanage/projmanage/cpns/progress.vue | 5 ++-
7 files changed, 49 insertions(+), 33 deletions(-)
diff --git a/cdTMP/package-lock.json b/cdTMP/package-lock.json
index 5abfdc5..3b2e51d 100644
--- a/cdTMP/package-lock.json
+++ b/cdTMP/package-lock.json
@@ -1,18 +1,18 @@
{
"name": "cdtmp",
- "version": "0.0.2",
+ "version": "0.0.3",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "cdtmp",
- "version": "0.0.2",
+ "version": "0.0.3",
"dependencies": {
"@arco-design/color": "^0.4.0",
"@arco-design/web-vue": "^2.56.1",
"@tinymce/tinymce-vue": "^6.0.1",
"@vueuse/core": "^11.0.3",
- "axios": "^1.7.5",
+ "axios": "^1.7.7",
"dayjs": "^1.11.13",
"echarts": "^5.5.1",
"file2md5": "^1.3.0",
@@ -22,7 +22,7 @@
"monaco-editor": "^0.51.0",
"nprogress": "^0.2.0",
"pinia": "^2.2.2",
- "pinyin-match": "^1.2.5",
+ "pinyin-match": "^1.2.6",
"postcss-import": "^16.1.0",
"qs": "^6.13.0",
"tinymce": "^7.3.0",
@@ -38,17 +38,17 @@
"@types/node": "^22.5.1",
"@types/nprogress": "^0.2.3",
"@types/qs": "^6.9.15",
- "@vitejs/plugin-vue": "^5.1.2",
+ "@vitejs/plugin-vue": "^5.1.3",
"@vitejs/plugin-vue-jsx": "^4.0.1",
"@vue/babel-plugin-jsx": "^1.1.1",
"autoprefixer": "^10.4.20",
"browserslist": "^4.23.0",
- "caniuse-lite": "^1.0.30001653",
+ "caniuse-lite": "^1.0.30001655",
"eslint": "^9.9.1",
"eslint-plugin-vue": "^9.27.0",
"less": "^4.2.0",
"less-loader": "^12.2.0",
- "postcss": "^8.4.41",
+ "postcss": "^8.4.42",
"prettier": "^3.3.3",
"tailwindcss": "^3.4.10",
"typescript": "^5.5.3",
@@ -1439,9 +1439,9 @@
"integrity": "sha512-g9gZnnXVq7gM7v3tJCWV/qw7w+KeOlSHAhgF9RytFyifW6AF61hdT2ucrYhPq9hLs5JIryeupHV3qGk95dH9ow=="
},
"node_modules/@vitejs/plugin-vue": {
- "version": "5.1.2",
- "resolved": "https://registry.npmmirror.com/@vitejs/plugin-vue/-/plugin-vue-5.1.2.tgz",
- "integrity": "sha512-nY9IwH12qeiJqumTCLJLE7IiNx7HZ39cbHaysEUd+Myvbz9KAqd2yq+U01Kab1R/H1BmiyM2ShTYlNH32Fzo3A==",
+ "version": "5.1.3",
+ "resolved": "https://registry.npmmirror.com/@vitejs/plugin-vue/-/plugin-vue-5.1.3.tgz",
+ "integrity": "sha512-3xbWsKEKXYlmX82aOHufFQVnkbMC/v8fLpWwh6hWOUrK5fbbtBh9Q/WWse27BFgSy2/e2c0fz5Scgya9h2GLhw==",
"dev": true,
"license": "MIT",
"engines": {
@@ -2092,9 +2092,9 @@
}
},
"node_modules/axios": {
- "version": "1.7.5",
- "resolved": "https://registry.npmmirror.com/axios/-/axios-1.7.5.tgz",
- "integrity": "sha512-fZu86yCo+svH3uqJ/yTdQ0QHpQu5oL+/QE+QPSv6BZSkDAoky9vytxp7u5qk83OJFS3kEBcesWni9WTZAv3tSw==",
+ "version": "1.7.7",
+ "resolved": "https://registry.npmmirror.com/axios/-/axios-1.7.7.tgz",
+ "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==",
"license": "MIT",
"dependencies": {
"follow-redirects": "^1.15.6",
@@ -2255,9 +2255,9 @@
}
},
"node_modules/caniuse-lite": {
- "version": "1.0.30001653",
- "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001653.tgz",
- "integrity": "sha512-XGWQVB8wFQ2+9NZwZ10GxTYC5hk0Fa+q8cSkr0tgvMhYhMHP/QC+WTgrePMDBWiWc/pV+1ik82Al20XOK25Gcw==",
+ "version": "1.0.30001655",
+ "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001655.tgz",
+ "integrity": "sha512-jRGVy3iSGO5Uutn2owlb5gR6qsGngTw9ZTb4ali9f3glshcNmJ2noam4Mo9zia5P9Dk3jNNydy7vQjuE5dQmfg==",
"dev": true,
"funding": [
{
@@ -4334,9 +4334,9 @@
}
},
"node_modules/pinyin-match": {
- "version": "1.2.5",
- "resolved": "https://registry.npmmirror.com/pinyin-match/-/pinyin-match-1.2.5.tgz",
- "integrity": "sha512-+F3bi5v95enkqSJ0nD1e2fGp8Uj3YCRBzka3DlCQ4tyurfqYmAChLR3aAO/c/Pk+xBgvEx9zI35HoyYATSb0mw==",
+ "version": "1.2.6",
+ "resolved": "https://registry.npmmirror.com/pinyin-match/-/pinyin-match-1.2.6.tgz",
+ "integrity": "sha512-d9fMSwZujH7UlMu+FO8MGXrgUYv0CwJtzpf3fQ8xgLJy1qfXlzOZsnQuL7Ej7msAiEtt37U7bE4dkVmyWaFfwA==",
"license": "SATA"
},
"node_modules/pirates": {
@@ -4349,9 +4349,9 @@
}
},
"node_modules/postcss": {
- "version": "8.4.41",
- "resolved": "https://registry.npmmirror.com/postcss/-/postcss-8.4.41.tgz",
- "integrity": "sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==",
+ "version": "8.4.42",
+ "resolved": "https://registry.npmmirror.com/postcss/-/postcss-8.4.42.tgz",
+ "integrity": "sha512-hywKUQB9Ra4dR1mGhldy5Aj1X3MWDSIA1cEi+Uy0CjheLvP6Ual5RlwMCh8i/X121yEDLDIKBsrCQ8ba3FDMfQ==",
"funding": [
{
"type": "opencollective",
diff --git a/cdTMP/package.json b/cdTMP/package.json
index 7a834bf..23ea907 100644
--- a/cdTMP/package.json
+++ b/cdTMP/package.json
@@ -15,7 +15,7 @@
"@arco-design/web-vue": "^2.56.1",
"@tinymce/tinymce-vue": "^6.0.1",
"@vueuse/core": "^11.0.3",
- "axios": "^1.7.5",
+ "axios": "^1.7.7",
"dayjs": "^1.11.13",
"echarts": "^5.5.1",
"file2md5": "^1.3.0",
@@ -25,7 +25,7 @@
"monaco-editor": "^0.51.0",
"nprogress": "^0.2.0",
"pinia": "^2.2.2",
- "pinyin-match": "^1.2.5",
+ "pinyin-match": "^1.2.6",
"postcss-import": "^16.1.0",
"qs": "^6.13.0",
"tinymce": "^7.3.0",
@@ -41,17 +41,17 @@
"@types/node": "^22.5.1",
"@types/nprogress": "^0.2.3",
"@types/qs": "^6.9.15",
- "@vitejs/plugin-vue": "^5.1.2",
+ "@vitejs/plugin-vue": "^5.1.3",
"@vitejs/plugin-vue-jsx": "^4.0.1",
"@vue/babel-plugin-jsx": "^1.1.1",
"autoprefixer": "^10.4.20",
"browserslist": "^4.23.0",
- "caniuse-lite": "^1.0.30001653",
+ "caniuse-lite": "^1.0.30001655",
"eslint": "^9.9.1",
"eslint-plugin-vue": "^9.27.0",
"less": "^4.2.0",
"less-loader": "^12.2.0",
- "postcss": "^8.4.41",
+ "postcss": "^8.4.42",
"prettier": "^3.3.3",
"tailwindcss": "^3.4.10",
"typescript": "^5.5.3",
diff --git a/cdTMP/src/api/generate/seitaiGenerate.js b/cdTMP/src/api/generate/seitaiGenerate.js
index 159a24e..db0132a 100644
--- a/cdTMP/src/api/generate/seitaiGenerate.js
+++ b/cdTMP/src/api/generate/seitaiGenerate.js
@@ -76,5 +76,16 @@ export default {
method: "get",
params
})
+ },
+ /**
+ * 请求：取消生成文档标志设置为True
+ * @returns 返回是否取消成功
+ */
+ cancel(params = {}) {
+ return request({
+ url: `/create/cancel`,
+ method: "get",
+ params
+ })
}
}
diff --git a/cdTMP/src/store/project/treeData.js b/cdTMP/src/store/project/treeData.js
index d7b38f2..21ef5a7 100644
--- a/cdTMP/src/store/project/treeData.js
+++ b/cdTMP/src/store/project/treeData.js
@@ -10,10 +10,12 @@ const useTreeDataStore = defineStore("treeDataStore", {
isInit: false
}
},
+ /**
+ * 注意action不能使用箭头函数，不能绑定this
+ */
actions: {
- // 不能使用箭头函数，无法绑定this
async initTreeData(projectId) {
- // 先判断储存的pid是否存在
+ // 判读是否有项目tree储存：pid为项目后端id
const pid = localStorage.getItem("pid")
// 如果不存在，则请求后台树状数据
if (!pid) {
diff --git a/cdTMP/src/views/project/case/components/ProblemChoose.vue b/cdTMP/src/views/project/case/components/ProblemChoose.vue
index fcce19f..3e5308b 100644
--- a/cdTMP/src/views/project/case/components/ProblemChoose.vue
+++ b/cdTMP/src/views/project/case/components/ProblemChoose.vue
@@ -86,6 +86,8 @@ const handleRelatedChange = async (record) => {
}
loading.value = false
emits("relatedOrunrelated")
+ // 重新刷新表格请求
+ crudRef.value.refresh()
}
// 数据定义
@@ -455,7 +457,7 @@ const columns = ref([
title: "开发人员",
hide: true,
dataIndex: "designerPerson",
- formType: "input",
+ formType: "input"
},
{
title: "开发方日期",
diff --git a/cdTMP/src/views/project/case/index.vue b/cdTMP/src/views/project/case/index.vue
index d96895c..875b020 100644
--- a/cdTMP/src/views/project/case/index.vue
+++ b/cdTMP/src/views/project/case/index.vue
@@ -12,7 +12,7 @@
- 关联添加问题单
+ 添加关联问题单
diff --git a/cdTMP/src/views/testmanage/projmanage/cpns/progress.vue b/cdTMP/src/views/testmanage/projmanage/cpns/progress.vue
index 03a8148..b80eb37 100644
--- a/cdTMP/src/views/testmanage/projmanage/cpns/progress.vue
+++ b/cdTMP/src/views/testmanage/projmanage/cpns/progress.vue
@@ -6,7 +6,7 @@
hide-cancel
:mask-closable="false"
:on-before-ok="handleClickConfirmButton"
- @cancel="handleClickConfirmButton"
+ :on-before-cancel="handleClickConfirmButton"
>
正在生成{{ text }}
@@ -17,6 +17,7 @@