From c4e8e814d2c9e0d03f6449860b70e58657fd7dc2 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期二, 31 十二月 2024 11:58:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzhneasrs' into tzhneasrs
---
src/main/webapp/static/js/mat/mat.js | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/static/js/mat/mat.js b/src/main/webapp/static/js/mat/mat.js
index f1e0dc5..781b125 100644
--- a/src/main/webapp/static/js/mat/mat.js
+++ b/src/main/webapp/static/js/mat/mat.js
@@ -9,7 +9,7 @@
cols.push.apply(cols, matCols);
cols.push(
{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
- )
+ )
return cols;
}
@@ -255,6 +255,7 @@
}
// 琛ㄥ崟鎻愪氦浜嬩欢
form.on('submit(editSubmit)', function (data) {
+ console.log(data)
data.field.tagId = insXmSel.getValue('valueStr');
if (isEmpty(data.field.tagId)) {
layer.msg('鍒嗙被涓嶈兘涓虹┖', {icon: 2});
@@ -282,10 +283,15 @@
return false;
});
// 娓叉煋涓嬫媺鏍�
+ var dataTest = [];
+ dataTest[0] = {};
+ dataTest[0].name = "鍏ㄩ儴";
+ dataTest[0].id = "20";
var insXmSel = xmSelect.render({
el: '#tagSel',
height: '250px',
- data: insTb.options.data,
+ //data: insTb.options.data,
+ data: dataTest,
initValue: mData ? [mData.tagId] : [],
model: {label: {type: 'text'}},
prop: {
--
Gitblit v1.9.1