From 7baa427038f924cb3b36fa1dc16f293f7c20e6f8 Mon Sep 17 00:00:00 2001 From: augushong Date: Fri, 21 Mar 2025 14:13:17 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AE=BE=E7=BD=AE=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC=E4=B8=BA=E7=A9=BA=EF=BC=8C=E9=81=BF?= =?UTF-8?q?=E5=85=8D=E6=98=BE=E7=A4=BAnull=E5=92=8Cundefined?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/static/plugs/ulthon-admin/ulthon-admin.js | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/public/static/plugs/ulthon-admin/ulthon-admin.js b/public/static/plugs/ulthon-admin/ulthon-admin.js index f874b0d..841ad0f 100644 --- a/public/static/plugs/ulthon-admin/ulthon-admin.js +++ b/public/static/plugs/ulthon-admin/ulthon-admin.js @@ -1118,9 +1118,11 @@ if (val.sort === undefined) { - cols[i][index]['sort'] = true; } + if (val.defaultValue === undefined) { + cols[i][index]['defaultValue'] = ''; + } // 判断是否包含初始化数据 if (val.init === undefined) { @@ -1477,20 +1479,25 @@ return ''; } var option = data.LAY_COL; + field = field || option.field; defaultValue = defaultValue || option.defaultValue; + var valueParser = option.valueParser; - var value = defaultValue; + var value = undefined; try { value = eval("data." + field); } catch (e) { - value = undefined; - } + } if (typeof valueParser == 'function') { value = valueParser(value, data); } + if(value === null || value === undefined) { + value = defaultValue + } + return value; }, listenTableSearch: function (tableId) {