chenjunyi/cdTestPlant3
1
1
Fork 0
Code Issues Pull Requests Actions Packages Releases Wiki Activity

（修复）修复问题单无法显示null的问题

Browse Source
This commit is contained in:
管理员
2024-07-29 18:32:53 +08:00
parent 7aecdb2df6
commit 8773e5f927
16 changed files with 891 additions and 4432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1258
cdTMP/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

61
cdTMP/package.json
View File

@@ -12,53 +12,52 @@
},
"dependencies": {
"@arco-design/color": "^0.4.0",
"@arco-design/web-vue": "^2.55.3",
"@tinymce/tinymce-vue": "^5.1.1",
"@vueuse/core": "^10.1.2",
"axios": "^1.4.0",
"@arco-design/web-vue": "^2.56.0",
"@tinymce/tinymce-vue": "^6.0.1",
"@vueuse/core": "^10.11.0",
"axios": "^1.7.2",
"axois": "^0.0.1-security",
"crypto-js": "^4.1.1",
"dayjs": "^1.11.7",
"echarts": "^5.4.2",
"dayjs": "^1.11.12",
"echarts": "^5.5.1",
"file2md5": "^1.3.0",
"lodash": "^4.17.21",
"mammoth": "^1.8.0",
"mitt": "^3.0.0",
"mitt": "^3.0.1",
"monaco-editor": "^0.33.0",
"nprogress": "^0.2.0",
"pinia": "^2.1.3",
"pinyin-match": "^1.2.4",
"postcss-import": "^15.1.0",
"qs": "^6.11.2",
"sortablejs": "^1.15.0",
"tinymce": "^6.8.3",
"vue": "^3.4.33",
"pinia": "^2.2.0",
"pinyin-match": "^1.2.5",
"postcss-import": "^16.1.0",
"qs": "^6.12.3",
"sortablejs": "^1.15.2",
"tinymce": "^6.8.4",
"vue": "^3.4.34",
"vue-clipboard3": "^2.0.0",
"vue-color-kit": "^1.0.5",
"vue-color-kit": "^1.0.6",
"vue-echarts": "^6.5.5",
"vue-router": "^4.0.13",
"vue-router": "^4.4.0",
"vuedraggable": "^2.24.3"
},
"devDependencies": {
"@types/lodash": "^4.14.195",
"@types/mockjs": "^1.0.7",
"@types/node": "^20.12.13",
"@types/nprogress": "^0.2.0",
"@types/qs": "^6.9.7",
"@vitejs/plugin-vue": "^5.0.5",
"@types/node": "^22.0.0",
"@types/nprogress": "^0.2.3",
"@types/qs": "^6.9.15",
"@vitejs/plugin-vue": "^5.1.1",
"@vitejs/plugin-vue-jsx": "^4.0.0",
"@vue/babel-plugin-jsx": "^1.1.1",
"autoprefixer": "^10.4.14",
"autoprefixer": "^10.4.19",
"browserslist": "^4.23.0",
"caniuse-lite": "^1.0.30001591",
"eslint": "^8.57.0",
"eslint-plugin-vue": "^9.26.0",
"eslint": "^9.8.0",
"eslint-plugin-vue": "^9.27.0",
"less": "^4.2.0",
"less-loader": "^11.1.2",
"postcss": "^8.4.38",
"prettier": "^2.8.8",
"tailwindcss": "^3.3.2",
"less-loader": "^12.2.0",
"postcss": "^8.4.40",
"prettier": "^3.3.3",
"tailwindcss": "^3.4.7",
"typescript": "^5.5.3",
"vite": "^5.3.4"
}
"vite": "^5.3.5"
},
"packageManager": "yarn@4.3.1+sha512.af78262d7d125afbfeed740602ace8c5e4405cd7f4735c08feb327286b2fdb2390fbca01589bfd1f50b1240548b74806767f5a063c94b67e431aabd0d86f7774"
}

3947
cdTMP/pnpm-lock.yaml generated
View File

File diff suppressed because it is too large Load Diff

7
cdTMP/src/components/ma-editor/index.vue
View File

@@ -43,7 +43,10 @@ const appStore = useAppStore()
const props = defineProps({
modelValue: { type: String },
height: { type: Number, default: 200 },
id: { type: String, default: () => "tinymce" + new Date().getTime().toString() },
id: {
type: String,
default: () => "tinymce" + new Date().getTime().toString() + "-" + Math.random().toString(16).substring(2,10)
},
plugins: {
type: [String, Array],
default: "searchreplace visualchars code table nonbreaking lists autosave"
@@ -129,7 +132,7 @@ const initConfig = reactive({
skeletonScreen: true,
branding: false,
content_css: "/tinymce/skins/content/default/content.css",
selector: "#textarea1", // 下面自定义样式选中的区域为编辑区
// selector: "#textarea1", // 下面自定义样式选中的区域为编辑区
content_style: "body {line-height:1.5;font-size:14px;} p {margin:2px 0px;}", // 这里可以设置自定义样式
// paste_as_text: false, // 粘贴文字只能是纯文本
// 1.自定义粘贴过滤器函数，args.content就是粘贴内容

3
cdTMP/src/components/ma-form/formItem/form-input.vue
View File

@@ -5,9 +5,10 @@
:custom-field="props.customField"
>
<slot :name="`form-${props.component.dataIndex}`" v-bind="props.component">
<!-- chen.xiugai-warning -->
<component
:is="getComponentName()"
v-model="value"
v-model.trim="value"
:size="props.component.size"
:allow-clear="props.component.allowClear ?? true"
:disabled="props.component.disabled"

12
cdTMP/src/layout/project-layout.vue
View File

@@ -788,25 +788,29 @@ const soDutColumn = ref([
title: "空行",
dataIndex: "black_line",
formType: "input-number",
rules: [{ required: true, message: "空行数必填" }]
rules: [{ required: true, message: "空行数必填" }],
min: 0
},
{
title: "纯注释",
dataIndex: "comment_line",
formType: "input-number",
rules: [{ required: true, message: "纯注释数必填" }]
rules: [{ required: true, message: "纯注释数必填" }],
min: 0
},
{
title: "混合行",
dataIndex: "mix_line",
formType: "input-number",
rules: [{ required: true, message: "混合行必填" }]
rules: [{ required: true, message: "混合行必填" }],
min: 0
},
{
title: "纯代码",
dataIndex: "code_line",
formType: "input-number",
rules: [{ required: true, message: "纯代码行必填" }]
rules: [{ required: true, message: "纯代码行必填" }],
min: 0
}
])

3
cdTMP/src/utils/enums/productTypes.ts
View File

@@ -1,3 +1,6 @@
/**
* 文档片段所属的enum
*/
export enum ProductFileEnum {
dg = "测评大纲",
sm = "测试说明",

9
cdTMP/src/utils/extensions/arcoValidator.ts Normal file
View File

@@ -0,0 +1,9 @@
/**
* 表单验证器：验证输入trim空格后是否为空，例如项目标识必须不能为空格
*/
export function validateBlank(value: string | undefined, callback: (error?: string) => void): void {
const val = value?.trim()
if (val === "") {
callback("注意标识不能为空格")
}
}

3
cdTMP/src/utils/types/CommonType.ts
View File

@@ -1,3 +1,6 @@
/**
* 接口：为MimeAdmin的dict远程数据设置的接口
*/
export interface IDictData<T> {
label: T
value: number

2
cdTMP/src/views/project/case/components/ProblemChoose.vue
View File

@@ -365,7 +365,7 @@ const columns = ref([
title: "原因分析",
hide: true,
dataIndex: "analysis",
formType: "editor"
formType: "textarea"
},
{
title: "影响域分析",

2
cdTMP/src/views/project/case/components/ProblemForm.vue
View File

@@ -130,7 +130,7 @@ const columnsOptions = reactive([
{
title: "原因分析",
dataIndex: "analysis",
formType: "editor"
formType: "textarea"
},
{
title: "影响域分析",

2
cdTMP/src/views/project/case/index.vue
View File

@@ -330,7 +330,7 @@ const crudColumns = ref([
hide: true,
align: "center",
dataIndex: "analysis",
formType: "editor"
formType: "textarea"
},
{
title: "影响域分析",

2
cdTMP/src/views/project/round/index.vue
View File

@@ -168,7 +168,7 @@ const crudColumns = ref([
align: "center",
dataIndex: "ref",
search: true,
commonRules: [{ required: true, message: "用户标识或编号必填" }],
commonRules: [{ required: true, message: "用户标识必填" }],
validateTrigger: "blur",
help: "客户使用的标识"
},

2
cdTMP/src/views/testmanage/projFragment/index.vue
View File

@@ -52,7 +52,7 @@ const headerData: ComputedRef<IPageHeaderProps> = computed(() => {
name: loadingData.value.name as string
}
})
// 切换is_main
// 在表格切换is_main属性
const beforeSwitchChange = (record: any) => {
return async function (newVal: boolean) {
await FragApi.update(record.id, {

8
cdTMP/src/views/testmanage/projmanage/index.vue
View File

@@ -123,6 +123,7 @@ import wtdGenerateApi from "@/api/generate/wtdGenerate"
import { Message } from "@arco-design/web-vue"
import Progress from "./cpns/progress.vue"
import hoosk from "@/views/testmanage/projmanage/hooks.js"
import { validateBlank } from "@/utils/extensions/arcoValidator"
const router = useRouter()
// 定义预览组件的Ref
const previewRef = ref()
@@ -500,7 +501,10 @@ const crudColumns = ref([
sortable: { sortDirections: ["ascend"] },
dataIndex: "ident",
search: true,
commonRules: [{ required: true, message: "标识是必填" }],
commonRules: [
{ required: true, message: "标识是必填" },
{ validator: validateBlank, message: "标识格式不正确" }
],
validateTrigger: "blur"
},
{
@@ -536,7 +540,7 @@ const crudColumns = ref([
{
validator: (value, validationCallbackFunction) => {
let beginTime = crudRef.value.getFormData().beginTime
value < beginTime ? validationCallbackFunction("开始时间必须小于结束时间") : null
value < beginTime ? validationCallbackFunction("开始时间必须小于等于结束时间") : null
}
}
]

2
cdTMP/进度.md
View File

@@ -1,2 +0,0 @@
### 完成需求录入功能
1. 设计需求的录入