admin/gr_report_web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

Compare commits

base: admin:e33fcb33fe4b8f77c8e4cfa9784af83018966c04
Branches Tags
admin:main admin:dev_sh admin:zh admin:main_beta
..
compare: admin:89b3c978c51bbf677eddb7d3f033409562e54381
Branches Tags
admin:main admin:dev_sh admin:zh admin:main_beta

2 Commits
e33fcb33fe ... 89b3c978c5

Author SHA1 Message Date
chy
89b3c978c5 Merge branch 'main' of http://8.130.49.250:3000/admin/gr_report_web 
# Conflicts:
#	src/views/lowdesign/reportDesign/index.vue
 2026-03-12 13:58:48 +08:00
chy
ccfb06113a 1231 2026-03-12 13:57:37 +08:00
2 changed files with 6 additions and 2 deletions
Expand all files Collapse all files

4
src/views/lowdesign/reportDesign/index.vue
View File

@@ -354,6 +354,10 @@ const tableFormVerify = (type) => {
let tabKey = 'mysql' let tabKey = 'mysql'
// 子字段不能再包含子字段 // 子字段不能再包含子字段
if (item.isSubField && item.hasChildren === 'Y') { if (item.isSubField && item.hasChildren === 'Y') {
<<<<<<< HEAD
=======
>>>>>>> e33fcb33fe4b8f77c8e4cfa9784af83018966c04
messageText = `<div style="line-height:24px"> messageText = `<div style="line-height:24px">
<div>子字段不能包含子字段</div> <div>子字段不能包含子字段</div>
<div>序号：${index + 1}</div> <div>序号：${index + 1}</div>