Skip to content

Commit 3d0c4f4

Browse files
committed
代码生成:支持树形表结构的配置
1 parent 40b1522 commit 3d0c4f4

File tree

1 file changed

+20
-38
lines changed

1 file changed

+20
-38
lines changed

src/views/infra/codegen/components/GenerateInfoForm.vue

Lines changed: 20 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -182,50 +182,33 @@
182182
</el-col>
183183
</el-row>
184184

185-
<el-row v-show="formData.tplCategory === 'tree'">
186-
<h4 class="form-header">其他信息</h4>
187-
<el-col :span="12">
188-
<el-form-item>
189-
<template #label>
190-
<span>
191-
树编码字段
192-
<el-tooltip content="树显示的编码字段名, 如:dept_id" placement="top">
193-
<Icon icon="ep:question-filled" />
194-
</el-tooltip>
195-
</span>
196-
</template>
197-
<el-select v-model="formData.treeCode" placeholder="请选择">
198-
<el-option
199-
v-for="(column, index) in formData.columns"
200-
:key="index"
201-
:label="column.columnName + ':' + column.columnComment"
202-
:value="column.columnName"
203-
/>
204-
</el-select>
205-
</el-form-item>
185+
<!-- 树表信息 -->
186+
<el-row v-show="formData.templateType == 2">
187+
<el-col :span="24">
188+
<h4 class="form-header">树表信息</h4>
206189
</el-col>
207190
<el-col :span="12">
208-
<el-form-item>
191+
<el-form-item prop="treeParentColumnId">
209192
<template #label>
210193
<span>
211-
树父编码字段
194+
父编号字段
212195
<el-tooltip content="树显示的父编码字段名, 如:parent_Id" placement="top">
213196
<Icon icon="ep:question-filled" />
214197
</el-tooltip>
215198
</span>
216199
</template>
217-
<el-select v-model="formData.treeParentCode" placeholder="请选择">
200+
<el-select v-model="formData.treeParentColumnId" placeholder="请选择">
218201
<el-option
219-
v-for="(column, index) in formData.columns"
202+
v-for="(column, index) in props.columns"
220203
:key="index"
221204
:label="column.columnName + ':' + column.columnComment"
222-
:value="column.columnName"
205+
:value="column.id"
223206
/>
224207
</el-select>
225208
</el-form-item>
226209
</el-col>
227210
<el-col :span="12">
228-
<el-form-item>
211+
<el-form-item prop="treeNameColumnId">
229212
<template #label>
230213
<span>
231214
树名称字段
@@ -234,21 +217,20 @@
234217
</el-tooltip>
235218
</span>
236219
</template>
237-
238-
<el-select v-model="formData.treeName" placeholder="请选择">
220+
<el-select v-model="formData.treeNameColumnId" placeholder="请选择">
239221
<el-option
240-
v-for="(column, index) in formData.columns"
222+
v-for="(column, index) in props.columns"
241223
:key="index"
242224
:label="column.columnName + ':' + column.columnComment"
243-
:value="column.columnName"
225+
:value="column.id"
244226
/>
245227
</el-select>
246228
</el-form-item>
247229
</el-col>
248230
</el-row>
249231

250232
<!-- 主表信息 -->
251-
<el-row v-if="formData.templateType === 15">
233+
<el-row v-if="formData.templateType == 15">
252234
<el-col :span="24">
253235
<h4 class="form-header">主表信息</h4>
254236
</el-col>
@@ -343,14 +325,12 @@ const formData = ref({
343325
classComment: '',
344326
parentMenuId: null,
345327
genPath: '',
346-
treeCode: '',
347-
treeParentCode: '',
348-
treeName: '',
349-
tplCategory: '',
350328
genType: '',
351329
masterTableId: undefined,
352330
subJoinColumnId: undefined,
353-
subJoinMany: undefined
331+
subJoinMany: undefined,
332+
treeParentColumnId: undefined,
333+
treeNameColumnId: undefined
354334
})
355335
356336
const rules = reactive({
@@ -364,7 +344,9 @@ const rules = reactive({
364344
classComment: [required],
365345
masterTableId: [required],
366346
subJoinColumnId: [required],
367-
subJoinMany: [required]
347+
subJoinMany: [required],
348+
treeParentColumnId: [required],
349+
treeNameColumnId: [required]
368350
})
369351
370352
const tables = ref([]) // 表定义列表

0 commit comments

Comments
 (0)