Skip to content

Commit 20ee768

Browse files
committed
Java:MultiDataSource 解决 RESTful API 等非 APIJSON API 获取对象表名失败导致光标悬浮注释及 JSON key 后断言按钮未显示完整
1 parent 47c9d1a commit 20ee768

File tree

1 file changed

+8
-7
lines changed
  • APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/resources/static/api/js

1 file changed

+8
-7
lines changed

APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/resources/static/api/js/main.js

+8-7
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@
274274
// var newVal = JSON.parse(JSON.stringify(val))
275275

276276
var curPath = (StringUtil.isEmpty(path, false) ? '' : path + '/') + key;
277-
var curTable = JSONObject.isTableKey(objName || '', val, isRestful) ? objName : null;
277+
var curTable = JSONObject.isTableKey(objName, val, isRestful) ? objName : null;
278278
var thiz = {
279279
_$_path_$_: curPath,
280280
_$_table_$_: curTable
@@ -409,10 +409,10 @@
409409
var aliaIndex = key == null ? -1 : key.indexOf(':');
410410
var objName = aliaIndex < 0 ? key : key.substring(0, aliaIndex);
411411

412-
if (JSONObject.isTableKey(objName || '', val, isRestful)) {
412+
if (JSONObject.isTableKey(objName, val, isRestful)) {
413413
table = objName
414414
}
415-
else if (JSONObject.isTableKey(table || '', val, isRestful)) {
415+
else if (JSONObject.isTableKey(table, val, isRestful)) {
416416
column = key
417417
}
418418

@@ -1523,10 +1523,6 @@ https://github.com/Tencent/APIJSON/issues
15231523

15241524
var path = null;
15251525
var key = null;
1526-
var thiz = {
1527-
_$_path_$_: null,
1528-
_$_table_$_: null
1529-
};
15301526

15311527
if (isSingle || ! JSONResponse.isObject(vi)) {
15321528
var val = ret;
@@ -1596,6 +1592,11 @@ https://github.com/Tencent/APIJSON/issues
15961592
this.jsonhtml = val;
15971593
}
15981594
else {
1595+
var thiz = {
1596+
_$_path_$_: null,
1597+
_$_table_$_: null
1598+
};
1599+
15991600
for (var k in ret) {
16001601
if (this.isFullAssert) {
16011602
try {

0 commit comments

Comments
 (0)