Skip to content

Commit f1e3ecc

Browse files
committed
Merge branch 'feature/sub-table' of https://gitee.com/yudaocode/yudao-ui-admin-vue3
2 parents 26dba8b + 652698b commit f1e3ecc

File tree

6 files changed

+22
-30
lines changed

6 files changed

+22
-30
lines changed

src/views/infra/codegen/index.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<template>
2-
<doc-alert title="代码生成" url="https://doc.iocoder.cn/new-feature/" />
2+
<doc-alert title="代码生成(单表)" url="https://doc.iocoder.cn/new-feature/" />
3+
<doc-alert title="代码生成(树表)" url="https://doc.iocoder.cn/new-feature/tree/" />
4+
<doc-alert title="代码生成(主子表)" url="https://doc.iocoder.cn/new-feature/master-sub/" />
35
<doc-alert title="单元测试" url="https://doc.iocoder.cn/unit-test/" />
46

57
<!-- 搜索 -->

src/views/infra/demo/demo01/index.vue

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<template>
2+
<doc-alert title="代码生成(单表)" url="https://doc.iocoder.cn/new-feature/" />
3+
24
<ContentWrap>
35
<!-- 搜索工作栏 -->
46
<el-form
@@ -18,12 +20,7 @@
1820
/>
1921
</el-form-item>
2022
<el-form-item label="性别" prop="sex">
21-
<el-select
22-
v-model="queryParams.sex"
23-
placeholder="请选择性别"
24-
clearable
25-
class="!w-240px"
26-
>
23+
<el-select v-model="queryParams.sex" placeholder="请选择性别" clearable class="!w-240px">
2724
<el-option
2825
v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_USER_SEX)"
2926
:key="dict.value"
@@ -214,4 +211,4 @@ const handleExport = async () => {
214211
onMounted(() => {
215212
getList()
216213
})
217-
</script>
214+
</script>

src/views/infra/demo/demo02/index.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<template>
2+
<doc-alert title="代码生成(树表)" url="https://doc.iocoder.cn/new-feature/tree/" />
3+
24
<ContentWrap>
35
<!-- 搜索工作栏 -->
46
<el-form
@@ -202,4 +204,4 @@ const toggleExpandAll = async () => {
202204
onMounted(() => {
203205
getList()
204206
})
205-
</script>
207+
</script>

src/views/infra/demo/demo03/erp/index.vue

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<template>
2+
<doc-alert title="代码生成(主子表)" url="https://doc.iocoder.cn/new-feature/master-sub/" />
3+
24
<ContentWrap>
35
<!-- 搜索工作栏 -->
46
<el-form
@@ -18,12 +20,7 @@
1820
/>
1921
</el-form-item>
2022
<el-form-item label="性别" prop="sex">
21-
<el-select
22-
v-model="queryParams.sex"
23-
placeholder="请选择性别"
24-
clearable
25-
class="!w-240px"
26-
>
23+
<el-select v-model="queryParams.sex" placeholder="请选择性别" clearable class="!w-240px">
2724
<el-option
2825
v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_USER_SEX)"
2926
:key="dict.value"
@@ -240,4 +237,4 @@ const handleCurrentChange = (row) => {
240237
onMounted(() => {
241238
getList()
242239
})
243-
</script>
240+
</script>

src/views/infra/demo/demo03/inner/index.vue

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<template>
2+
<doc-alert title="代码生成(主子表)" url="https://doc.iocoder.cn/new-feature/master-sub/" />
3+
24
<ContentWrap>
35
<!-- 搜索工作栏 -->
46
<el-form
@@ -18,12 +20,7 @@
1820
/>
1921
</el-form-item>
2022
<el-form-item label="性别" prop="sex">
21-
<el-select
22-
v-model="queryParams.sex"
23-
placeholder="请选择性别"
24-
clearable
25-
class="!w-240px"
26-
>
23+
<el-select v-model="queryParams.sex" placeholder="请选择性别" clearable class="!w-240px">
2724
<el-option
2825
v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_USER_SEX)"
2926
:key="dict.value"
@@ -229,4 +226,4 @@ const handleExport = async () => {
229226
onMounted(() => {
230227
getList()
231228
})
232-
</script>
229+
</script>

src/views/infra/demo/demo03/normal/index.vue

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<template>
2+
<doc-alert title="代码生成(主子表)" url="https://doc.iocoder.cn/new-feature/master-sub/" />
3+
24
<ContentWrap>
35
<!-- 搜索工作栏 -->
46
<el-form
@@ -18,12 +20,7 @@
1820
/>
1921
</el-form-item>
2022
<el-form-item label="性别" prop="sex">
21-
<el-select
22-
v-model="queryParams.sex"
23-
placeholder="请选择性别"
24-
clearable
25-
class="!w-240px"
26-
>
23+
<el-select v-model="queryParams.sex" placeholder="请选择性别" clearable class="!w-240px">
2724
<el-option
2825
v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_USER_SEX)"
2926
:key="dict.value"
@@ -214,4 +211,4 @@ const handleExport = async () => {
214211
onMounted(() => {
215212
getList()
216213
})
217-
</script>
214+
</script>

0 commit comments

Comments
 (0)