xuemingqiang/yudao-ui-admin-vue3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'yudao/master'

Browse Source 
# Conflicts:
#	src/api/infra/demo/demo03/erp/index.ts
#	src/api/infra/demo/demo03/inner/index.ts
#	src/api/infra/demo/demo03/normal/index.ts
#	src/views/infra/demo/demo03/erp/components/Demo03CourseList.vue
#	src/views/infra/demo/demo03/erp/components/Demo03GradeList.vue
#	src/views/infra/demo/demo03/erp/index.vue
This commit is contained in:
puhui999
2025-06-06 18:41:39 +08:00
parent 6844b26f67 b14df2e01b
commit c351a69371
1145 changed files with 123107 additions and 13043 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/infra/demo/demo01/Demo01ContactForm.vue
View File

@ -15,7 +15,7 @@
<el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_USER_SEX)"
:key="dict.value"
:label="dict.value"
:value="dict.value"
>
{{ dict.label }}
</el-radio>
@ -123,4 +123,4 @@ const resetForm = () => {
}
formRef.value?.resetFields()
}
</script>
</script>

2
src/views/infra/demo/demo02/Demo02CategoryForm.vue
View File

@ -111,4 +111,4 @@ const getDemo02CategoryTree = async () => {
root.children = handleTree(data, 'id', 'parentId')
demo02CategoryTree.value.push(root)
}
</script>
</script>

2
src/views/infra/demo/demo03/erp/Demo03StudentForm.vue
View File

@ -15,7 +15,7 @@
<el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_USER_SEX)"
:key="dict.value"
:label="dict.value"
:value="dict.value"
>
{{ dict.label }}
</el-radio>

2
src/views/infra/demo/demo03/inner/Demo03StudentForm.vue
View File

@ -15,7 +15,7 @@
<el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_USER_SEX)"
:key="dict.value"
:label="dict.value"
:value="dict.value"
>
{{ dict.label }}
</el-radio>

2
src/views/infra/demo/demo03/normal/Demo03StudentForm.vue
View File

@ -15,7 +15,7 @@
<el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_USER_SEX)"
:key="dict.value"
:label="dict.value"
:value="dict.value"
>
{{ dict.label }}
</el-radio>

4
src/views/infra/demo/demo03/normal/components/Demo03CourseForm.vue
View File

@ -9,7 +9,7 @@
>
<el-table :data="formData" class="-mt-10px">
<el-table-column label="序号" type="index" width="100" />
<el-table-column label="名字" min-width="150">
<el-table-column label="名字" min-width="150">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.name`" :rules="formRules.name" class="mb-0px!">
<el-input v-model="row.name" placeholder="请输入名字" />
@ -57,7 +57,7 @@ watch(
formData.value = []
// 2. val 非空，则加载数据
if (!val) {
return;
return
}
try {
formLoading.value = true

4
src/views/infra/demo/demo03/normal/components/Demo03GradeForm.vue
View File

@ -38,11 +38,11 @@ watch(
id: undefined,
studentId: undefined,
name: undefined,
teacher: undefined,
teacher: undefined
}
// 2. val 非空，则加载数据
if (!val) {
return;
return
}
try {
formLoading.value = true