Skip to content

Commit a6b6b5d

Browse files
author
piexlMax(奇淼
committed
fix: 修正变量名拼写错误，将detailFrom统一改为detailForm
1 parent d5b4bbf commit a6b6b5d

File tree

4 files changed

+23
-23
lines changed

4 files changed

+23
-23
lines changed

‎server/resource/package/web/view/table.vue.tpl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ getDataSourceFunc()
232232
{{- if .IsTree }}
233233
<el-descriptions-item label="父节点">
234234
<el-tree-select
235-
v-model="detailFrom.parentID"
235+
v-model="detailForm.parentID"
236236
:data="[rootNode,...tableData]"
237237
check-strictly
238238
disabled
@@ -629,7 +629,7 @@ const enterDialog = async () => {
629629
})
630630
}
631631
632-
const detailFrom = ref({})
632+
const detailForm = ref({})
633633
634634
// 查看详情控制标记
635635
const detailShow = ref(false)
@@ -646,7 +646,7 @@ const getDetails = async (row) => {
646646
// 打开弹窗
647647
const res = await find{{.StructName}}({ {{.PrimaryField.FieldJson}}: row.{{.PrimaryField.FieldJson}} })
648648
if (res.code === 0) {
649-
detailFrom.value = res.data
649+
detailForm.value = res.data
650650
openDetailShow()
651651
}
652652
}
@@ -655,7 +655,7 @@ const getDetails = async (row) => {
655655
// 关闭详情弹窗
656656
const closeDetailShow = () => {
657657
detailShow.value = false
658-
detailFrom.value = {}
658+
detailForm.value = {}
659659
}
660660
661661

‎server/resource/plugin/web/view/view.vue.tpl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ getDataSourceFunc()
229229
{{- if .IsTree }}
230230
<el-descriptions-item label="父节点">
231231
<el-tree-select
232-
v-model="detailFrom.parentID"
232+
v-model="detailForm.parentID"
233233
:data="[rootNode,...tableData]"
234234
check-strictly
235235
disabled
@@ -624,7 +624,7 @@ const enterDialog = async () => {
624624
})
625625
}
626626
627-
const detailFrom = ref({})
627+
const detailForm = ref({})
628628
629629
// 查看详情控制标记
630630
const detailShow = ref(false)
@@ -641,7 +641,7 @@ const getDetails = async (row) => {
641641
// 打开弹窗
642642
const res = await find{{.StructName}}({ {{.PrimaryField.FieldJson}}: row.{{.PrimaryField.FieldJson}} })
643643
if (res.code === 0) {
644-
detailFrom.value = res.data
644+
detailForm.value = res.data
645645
openDetailShow()
646646
}
647647
}
@@ -650,7 +650,7 @@ const getDetails = async (row) => {
650650
// 关闭详情弹窗
651651
const closeDetailShow = () => {
652652
detailShow.value = false
653-
detailFrom.value = {}
653+
detailForm.value = {}
654654
}
655655
656656

‎server/utils/autocode/template_funcs.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -575,15 +575,15 @@ func GenerateDescriptionItem(field systemReq.AutoCodeField) string {
575575
result += ` <template #default="scope">
576576
`
577577
if field.DataSource.Association == 2 {
578-
result += fmt.Sprintf(` <el-tag v-for="(item,key) in filterDataSource(dataSource.%s,detailFrom.%s)" :key="key">
578+
result += fmt.Sprintf(` <el-tag v-for="(item,key) in filterDataSource(dataSource.%s,detailForm.%s)" :key="key">
579579
`,
580580
field.FieldJson, field.FieldJson)
581581
result += ` {{ item }}
582582
`
583583
result += ` </el-tag>
584584
`
585585
} else {
586-
result += fmt.Sprintf(` <span>{{ filterDataSource(dataSource.%s,detailFrom.%s) }}</span>
586+
result += fmt.Sprintf(` <span>{{ filterDataSource(dataSource.%s,detailForm.%s) }}</span>
587587
`,
588588
field.FieldJson, field.FieldJson)
589589
}
@@ -592,26 +592,26 @@ func GenerateDescriptionItem(field systemReq.AutoCodeField) string {
592592
} else if field.FieldType != "picture" && field.FieldType != "pictures" &&
593593
field.FieldType != "file" && field.FieldType != "array" &&
594594
field.FieldType != "richtext" {
595-
result += fmt.Sprintf(` {{ detailFrom.%s }}
595+
result += fmt.Sprintf(` {{ detailForm.%s }}
596596
`, field.FieldJson)
597597
} else {
598598
switch field.FieldType {
599599
case "picture":
600-
result += fmt.Sprintf(` <el-image style="width: 50px; height: 50px" :preview-src-list="returnArrImg(detailFrom.%s)" :src="getUrl(detailFrom.%s)" fit="cover" />
600+
result += fmt.Sprintf(` <el-image style="width: 50px; height: 50px" :preview-src-list="returnArrImg(detailForm.%s)" :src="getUrl(detailForm.%s)" fit="cover" />
601601
`,
602602
field.FieldJson, field.FieldJson)
603603
case "array":
604-
result += fmt.Sprintf(` <ArrayCtrl v-model="detailFrom.%s"/>
604+
result += fmt.Sprintf(` <ArrayCtrl v-model="detailForm.%s"/>
605605
`, field.FieldJson)
606606
case "pictures":
607-
result += fmt.Sprintf(` <el-image style="width: 50px; height: 50px; margin-right: 10px" :preview-src-list="returnArrImg(detailFrom.%s)" :initial-index="index" v-for="(item,index) in detailFrom.%s" :key="index" :src="getUrl(item)" fit="cover" />
607+
result += fmt.Sprintf(` <el-image style="width: 50px; height: 50px; margin-right: 10px" :preview-src-list="returnArrImg(detailForm.%s)" :initial-index="index" v-for="(item,index) in detailForm.%s" :key="index" :src="getUrl(item)" fit="cover" />
608608
`,
609609
field.FieldJson, field.FieldJson)
610610
case "richtext":
611-
result += fmt.Sprintf(` <RichView v-model="detailFrom.%s" />
611+
result += fmt.Sprintf(` <RichView v-model="detailForm.%s" />
612612
`, field.FieldJson)
613613
case "file":
614-
result += fmt.Sprintf(` <div class="fileBtn" v-for="(item,index) in detailFrom.%s" :key="index">
614+
result += fmt.Sprintf(` <div class="fileBtn" v-for="(item,index) in detailForm.%s" :key="index">
615615
`, field.FieldJson)
616616
result += ` <el-button type="primary" text bg @click="onDownloadFile(item.url)">
617617
`

‎web/src/view/superAdmin/params/sysParams.vue

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -268,16 +268,16 @@
268268
>
269269
<el-descriptions :column="1" border>
270270
<el-descriptions-item label="参数名称">
271-
{{ detailFrom.name }}
271+
{{ detailForm.name }}
272272
</el-descriptions-item>
273273
<el-descriptions-item label="参数键">
274-
{{ detailFrom.key }}
274+
{{ detailForm.key }}
275275
</el-descriptions-item>
276276
<el-descriptions-item label="参数值">
277-
{{ detailFrom.value }}
277+
{{ detailForm.value }}
278278
</el-descriptions-item>
279279
<el-descriptions-item label="参数说明">
280-
{{ detailFrom.desc }}
280+
{{ detailForm.desc }}
281281
</el-descriptions-item>
282282
</el-descriptions>
283283
</el-drawer>
@@ -574,7 +574,7 @@
574574
})
575575
}
576576
577-
const detailFrom = ref({})
577+
const detailForm = ref({})
578578
579579
// 查看详情控制标记
580580
const detailShow = ref(false)
@@ -589,15 +589,15 @@
589589
// 打开弹窗
590590
const res = await findSysParams({ ID: row.ID })
591591
if (res.code === 0) {
592-
detailFrom.value = res.data
592+
detailForm.value = res.data
593593
openDetailShow()
594594
}
595595
}
596596
597597
// 关闭详情弹窗
598598
const closeDetailShow = () => {
599599
detailShow.value = false
600-
detailFrom.value = {}
600+
detailForm.value = {}
601601
}
602602
</script>
603603

0 commit comments

Comments
 (0)