Skip to content

Commit 96f6a14

Browse files
committed
自动生成文档:解决不显示数据字典,解决名称不是原始的表名
1 parent e8bc9b3 commit 96f6a14

File tree

1 file changed

+3
-49
lines changed

1 file changed

+3
-49
lines changed

js/main.js

Lines changed: 3 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@
496496

497497

498498
function markdownToHTML(md, isRequest) {
499-
if (editormd == null) {
499+
if (typeof editormd == 'undefined' || editormd == null) {
500500
return;
501501
}
502502

@@ -4911,29 +4911,10 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
49114911
var page = this.page || 0
49124912

49134913
var search = StringUtil.isEmpty(this.search, true) ? null : '%' + StringUtil.trim(this.search) + '%'
4914-
this.request(false, REQUEST_TYPE_JSON, this.getBaseUrl() + '/get', {
4914+
this.request(false, REQUEST_TYPE_JSON, this.server + '/get', {
49154915
format: false,
49164916
'@database': StringUtil.isEmpty(this.database, true) ? undefined : this.database,
49174917
// '@schema': StringUtil.isEmpty(this.schema, true) ? undefined : this.schema,
4918-
'sql@': {
4919-
'from': 'Access',
4920-
'Access': {
4921-
'@column': 'name'
4922-
}
4923-
},
4924-
'Access[]': {
4925-
'count': count,
4926-
'page': page,
4927-
'Access': {
4928-
'@column': 'name,alias,get,head,gets,heads,post,put,delete',
4929-
'@order': 'date-,name+',
4930-
'name()': 'getWithDefault(alias,name)',
4931-
'r0()': 'removeKey(alias)',
4932-
'name$': search,
4933-
'alias$': search,
4934-
'@combine': search == null ? null : 'name$,alias$',
4935-
}
4936-
},
49374918
'[]': {
49384919
'count': count,
49394920
'page': page,
@@ -4944,7 +4925,6 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
49444925
'table_name$': search,
49454926
'table_comment$': this.database == 'POSTGRESQL' ? null : search,
49464927
'@combine': search == null || this.database == 'POSTGRESQL' ? null : 'table_name$,table_comment$',
4947-
'table_name{}@': 'sql',
49484928
'@order': 'table_name+', //MySQL 8 SELECT `table_name` 返回的仍然是大写的 TABLE_NAME,需要 AS 一下
49494929
'@column': this.database == 'POSTGRESQL' ? 'table_name' : 'table_name:table_name,table_comment:table_comment'
49504930
},
@@ -5022,32 +5002,6 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
50225002
"@column": "COMMENTS:column_comment"
50235003
}
50245004
}
5025-
},
5026-
'Function[]': {
5027-
'count': count,
5028-
'page': page,
5029-
'Function': {
5030-
'@order': 'date-,name+',
5031-
'@column': 'name,arguments,demo,detail',
5032-
'demo()': 'getFunctionDemo()',
5033-
'detail()': 'getFunctionDetail()',
5034-
'r0()': 'removeKey(name)',
5035-
'r1()': 'removeKey(arguments)',
5036-
'name$': search,
5037-
'detail$': search,
5038-
'@combine': search == null ? null : 'name$,detail$',
5039-
}
5040-
},
5041-
'Request[]': {
5042-
'count': count,
5043-
'page': page,
5044-
'Request': {
5045-
'@order': 'version-,method-',
5046-
'@json': 'structure',
5047-
'tag$': search,
5048-
// 界面又不显示这个字段,搜出来莫名其妙 'detail$': search,
5049-
// '@combine': search == null ? null : 'tag$,detail$',
5050-
}
50515005
}
50525006
}, {}, function (url, res, err) {
50535007
if (err != null || res == null || res.data == null) {
@@ -5095,7 +5049,7 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
50955049
// item.Table.table_name = table.table_name
50965050
// item.Table.table_comment = table_comment
50975051

5098-
doc += '### ' + (i + 1) + '. ' + CodeUtil.getModelName(table.table_name) + '\n'
5052+
doc += '### ' + (i + 1) + '. ' + StringUtil.get(table.table_name) + '\n'
50995053
+ App.toMD(table_comment);
51005054

51015055

0 commit comments

Comments
 (0)