333

topsun-xt/src/main/webapp/biz/topsun/common/listeningFromData.js

@@ -208,7 +208,7 @@ function listeningGrid(elId, options) {
                 const originalOnClick = but.click;
                 but.click = function() {
                     let mappingEntry = Object.entries(window.dataMapping);
-                    tryForEach(mappingEntry, entry => {
+                    mappingEntry.forEach(entry => {
                         let beanName = entry[0];
                         if(elId.indexOf(beanName) >= 0) {
                             let idProperty = entry[1].id;
@@ -223,11 +223,11 @@ function listeningGrid(elId, options) {
                             // ------------- 设置 mapper -------------
                             debugger;
                             tryForEach(entry[1].columns, property => {
-                                mapperData['beanName'] = beanName;
+                                mapperData['listeningKey'] = rowId + '';
                                 if(!mapper[property]) {
                                     mapper[property] = {};
                                 }
-                                mapper[property][rowId] = mapperData;
+                                mapper[property][beanName] = mapperData;
                                 data[property] = '';
                             });
                             data[idProperty] = rowId;
@@ -249,7 +249,6 @@ function listeningGrid(elId, options) {
                         }
                     })
                     originalOnClick.call(this, data);
-                    debugger;
                 }
 
             }
@@ -291,13 +290,15 @@ function  listenerContent(event) {
         let inputIds = editId.split('_');
         debugger;
         tryForEach(Object.entries(beanMapping), mapperEntry => {
-            let mapperVal = mapperEntry[1], mapperKey = mapperEntry[0];
+            let mapperKey = mapperEntry[0], mapperVal = mapperEntry[1];
+            if(inputIds[0].lastIndexOf(mapperKey) >= 0) {
                 if(mapperVal.rowIndex === inputIds[2] * 1) {
-                window.dataSet.newData[mapperVal.beanName].compares[mapperKey][event.target.getAttribute('name')] = event.target.value;
+                    window.dataSet.newData[mapperKey].compares[mapperVal.listeningKey][inputIds[1]] = event.target.value;
                     console.log('Input value changed:', event.target.value);
                 } else {
                     console.error('当前输入框 '+ event.target.id+ '无法与数据行'+  mapperKey + '：' + mapperVal.rowIndex + '匹配！');
                 }
+            }
         })
         return;
     }