From 3484a69c726336617a34123da7411eddf6860c13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B4=A4=E5=BF=83?= <3277200+sentsim@users.noreply.github.com> Date: Thu, 7 Jul 2022 12:34:01 +0800 Subject: [PATCH 1/4] fix a minor error --- src/modules/table.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/table.js b/src/modules/table.js index 97acb8ad..ece1aaa5 100644 --- a/src/modules/table.js +++ b/src/modules/table.js @@ -1773,7 +1773,7 @@ layui.define(['laytpl', 'laypage', 'form', 'util'], function(exports){ tr.remove(); that.scrollPatch(); } - ,update: function(fields, ){ //修改行数据 + ,update: function(fields){ //修改行数据 fields = fields || {}; layui.each(fields, function(key, value){ var td = tr.children('td[data-field="'+ key +'"]'); From 831a2af0c909cd8ba6d8e29a532681b37a10c321 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B4=A4=E5=BF=83?= <3277200+sentsim@users.noreply.github.com> Date: Fri, 8 Jul 2022 11:56:40 +0800 Subject: [PATCH 2/4] =?UTF-8?q?table:=20[=E6=96=B0=E5=A2=9E]=20obj.updata(?= =?UTF-8?q?)=20=E7=AC=AC=202=20=E4=B8=AA=E5=8F=82=E6=95=B0=EF=BC=8C?= =?UTF-8?q?=E7=94=A8=E4=BA=8E=E6=9B=B4=E6=96=B0=E5=85=B6=E4=BB=96=E5=8C=85?= =?UTF-8?q?=E5=90=AB=E8=87=AA=E5=AE=9A=E4=B9=89=E6=A8=A1=E6=9D=BF=E5=B9=B6?= =?UTF-8?q?=E5=8F=AF=E8=83=BD=E5=AD=98=E5=9C=A8=E5=85=B3=E8=81=94=E7=9A=84?= =?UTF-8?q?=E5=88=97=E8=A7=86=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/table.js | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/modules/table.js b/src/modules/table.js index ece1aaa5..cf121321 100644 --- a/src/modules/table.js +++ b/src/modules/table.js @@ -1773,7 +1773,7 @@ layui.define(['laytpl', 'laypage', 'form', 'util'], function(exports){ tr.remove(); that.scrollPatch(); } - ,update: function(fields){ //修改行数据 + ,update: function(fields, related){ //修改行数据 fields = fields || {}; layui.each(fields, function(key, value){ var td = tr.children('td[data-field="'+ key +'"]'); @@ -1782,8 +1782,7 @@ layui.define(['laytpl', 'laypage', 'form', 'util'], function(exports){ // 更新缓存中的数据 if(key in data) data[key] = value; - // 更新相应列视 - // 若要更新其它列与之有关的动态模板，直接采用 reloadData 方法 + // 更新相应列视图 that.eachCols(function(i, item3){ if(item3.field == key){ cell.html(parseTempData.call(that, { @@ -1792,9 +1791,22 @@ layui.define(['laytpl', 'laypage', 'form', 'util'], function(exports){ ,tplData: data })); td.data('content', value); + } + // 更新其他包含自定义模板且可能有所关联的列视图 + else if(related && (item3.templet || item3.toolbar)){ + var thisTd = tr.children('td[data-field="'+ (item3.field || i) +'"]'); + var content = data[item3.field]; + + thisTd.children(ELEM_CELL).html(parseTempData.call(that, { + item3: item3 + ,content: content + ,tplData: data + })); + thisTd.data('content', content); } }); }); + that.renderForm(); } }, sets); From 90d1542205112454f401c8f55fdd259eaf21178c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B4=A4=E5=BF=83?= <3277200+sentsim@users.noreply.github.com> Date: Sat, 9 Jul 2022 19:04:49 +0800 Subject: [PATCH 3/4] optimizing code --- examples/form.html | 6 ++--- src/modules/form.js | 62 ++++++++++++++++++--------------------------- 2 files changed, 27 insertions(+), 41 deletions(-) diff --git a/examples/form.html b/examples/form.html index e82fae3b..a728226d 100644 --- a/examples/form.html +++ b/examples/form.html @@ -16,7 +16,6 @@ -
@@ -264,9 +263,7 @@


- - - + diff --git a/src/modules/table.js b/src/modules/table.js index cf121321..660f9cde 100644 --- a/src/modules/table.js +++ b/src/modules/table.js @@ -1144,16 +1144,16 @@ layui.define(['laytpl', 'laypage', 'form', 'util'], function(exports){ } }; - //数据合计行 + // 数据合计行 Class.prototype.renderTotal = function(data, totalRowData){ - var that = this - ,options = that.config - ,totalNums = {}; + var that = this; + var options = that.config; + var totalNums = {}; if(!options.totalRow) return; layui.each(data, function(i1, item1){ - //若数据项为空数组，则不往下执行（因为删除数据时，会将原有数据设置为 []） + // 若数据项为空数组，则不往下执行（因为删除数据时，会将原有数据设置为 []） if(layui.type(item1) === 'array' && item1.length === 0) return; that.eachCols(function(i3, item3){ @@ -1171,56 +1171,60 @@ layui.define(['laytpl', 'laypage', 'form', 'util'], function(exports){ var tds = []; that.eachCols(function(i3, item3){ var field = item3.field || i3; + + // 合计数据的特定字段 + var TOTAL_NUMS = totalRowData && totalRowData[item3.field]; - //td 内容 + // td 内容 var content = function(){ - var text = item3.totalRowText || '' - ,decimals = 'totalRowDecimals' in item3 ? item3.totalRowDecimals : 2 - ,thisTotalNum = parseFloat(totalNums[field]).toFixed(decimals) - ,tplData = { + var text = item3.totalRowText || ''; + var decimals = 'totalRowDecimals' in item3 ? item3.totalRowDecimals : 2; + var thisTotalNum = parseFloat(totalNums[field]).toFixed(decimals); + var tplData = { LAY_COL: item3 - } - ,getContent; + }; tplData[field] = thisTotalNum; - //获取自动计算的合并内容 - getContent = item3.totalRow ? (parseTempData.call(that, { + // 获取自动计算的合并内容 + var getContent = item3.totalRow ? (parseTempData.call(that, { item3: item3 ,content: thisTotalNum ,tplData: tplData }) || text) : text; - //如果直接传入了合计行数据，则不输出自动计算的结果 - return totalRowData ? (totalRowData[item3.field] || getContent) : getContent; - }() - ,td = ['' - ,'
' + function(){ var totalRow = item3.totalRow || options.totalRow; - //如果 totalRow 参数为字符类型，则解析为自定义模版 + // 如果 totalRow 参数为字符类型，则解析为自定义模版 if(typeof totalRow === 'string'){ return laytpl(totalRow).render($.extend({ - TOTAL_NUMS: totalNums[field] - ,LAY_COL: item3 + TOTAL_NUMS: TOTAL_NUMS || totalNums[field], + LAY_COL: item3 }, item3)); } return content;