From b334e7dd5d850ace51e726ce882cc6b81a14de0e Mon Sep 17 00:00:00 2001 From: weizhiqiang <598748873@qq.com> Date: Sat, 10 Jun 2023 00:35:47 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E5=B8=83=E5=B1=80=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E8=87=AA=E5=AE=9A=E4=B9=89=E6=95=B0=E6=8D=AE=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=97=B6=E7=9A=84bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/template/assets/lib/layui/css/layui.css | 2 +- .../template/assets/lib/layui/customer/skyeye/dsFormUtil.js | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/web/src/main/resources/template/assets/lib/layui/css/layui.css b/web/src/main/resources/template/assets/lib/layui/css/layui.css index 13926977f..5b4d868b4 100644 --- a/web/src/main/resources/template/assets/lib/layui/css/layui.css +++ b/web/src/main/resources/template/assets/lib/layui/css/layui.css @@ -2263,7 +2263,7 @@ hr, .layui-input-block { margin-left: 135px; - min-height: 40px; + min-height: 41px; } .layui-input-inline { diff --git a/web/src/main/resources/template/assets/lib/layui/customer/skyeye/dsFormUtil.js b/web/src/main/resources/template/assets/lib/layui/customer/skyeye/dsFormUtil.js index 61ceb5edd..78dfec192 100644 --- a/web/src/main/resources/template/assets/lib/layui/customer/skyeye/dsFormUtil.js +++ b/web/src/main/resources/template/assets/lib/layui/customer/skyeye/dsFormUtil.js @@ -888,10 +888,11 @@ var dsFormTableUtil = { var obj = []; eval('url = ' + businessApi.serviceStr + ' + "' + businessApi.api + '"'); AjaxPostUtil.request({url: url, params: params, type: 'json', method: businessApi.method, callback: function (json) { - obj = json.beans; + obj = json.rows; }, async: false}); + obj = JSON.stringify(obj); return `function (d) { - var json = ${obj}; + var json = JSON.parse('${obj}'); return getInPoingArr(json, "id", d.${item.attrKey}, "name"); }`; } -- GitLab