From 14f7839ff1c25cca8d9e7dad4d717973797ff2d9 Mon Sep 17 00:00:00 2001
From: chenjingjing <chenjingjing@192.168.10.3>
Date: 星期四, 27 十二月 2018 14:21:56 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/pages/js/mylayui.js | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/gx_tieta/WebRoot/pages/js/mylayui.js b/gx_tieta/WebRoot/pages/js/mylayui.js
index 141ec8f..785509f 100644
--- a/gx_tieta/WebRoot/pages/js/mylayui.js
+++ b/gx_tieta/WebRoot/pages/js/mylayui.js
@@ -405,14 +405,28 @@
var layui = this.layui;
var preData = this.cache[index];
- var _data = $.extend(preData, data||{});
+ var _data = $.extend(preData||{}, data||{});
var tds = this._getBodyTds(index);
- console.log(preData);
+ var tdRs = this._getFixedRTds(index);
+ //console.log(_data);
// 閬嶅巻
var _this = this;
layui.each(_data, function(key, value) {
// 閬嶅巻tds鐨勫��
- tds.each(function() {
+ tds.each(function(k) {
+ var _field = $(this).data('field');
+ if(key == _field) {
+ var cell = $(this).find('.layui-table-cell');
+ var content = _this._getContent(key, value, _data);
+ cell.html(content);
+ }
+ });
+ });
+
+ // 淇敼娴姩
+ layui.each(_data, function(key, value) {
+ // 閬嶅巻tds鐨勫��
+ tdRs.each(function(k) {
var _field = $(this).data('field');
if(key == _field) {
var cell = $(this).find('.layui-table-cell');
@@ -429,6 +443,12 @@
return trList.eq(index).find('td');
}
+ ,_getFixedRTds: function(index) {
+ var layuiTableView = $(this.ele).next('.layui-table-view');
+ var layuiFixedR = layuiTableView.find('.layui-table-fixed.layui-table-fixed-r .layui-table tbody');
+ var trList = layuiFixedR.find('tr');
+ return trList.eq(index).find('td');
+ }
,_getContent: function(key, value, data) {
var col = this.col; // 鎵�鏈夌殑鍒�
var laytpl = this.tpl;
@@ -440,7 +460,8 @@
// 鍒ゆ柇褰撳墠鍐呭鏄惁涓哄搴旂殑闇�瑕佹洿鏂扮殑鏁版嵁
if(key == _col.field) {
// 鍒ゆ柇鏄惁鏈夋ā鏉�
- templet = _col.templet?$(_col.templet).html():_col.toolbar?$(_col.toolbar).html():value;
+ templet = _col.templet?$(_col.templet).html():_col.toolbar?$(_col.toolbar).html():value.toString();
+ //console.log(templet);
// 鏍规嵁妯℃澘鏋勬垚content
laytpl(templet).render(data, function(html) {
rs = html;
--
Gitblit v1.9.1