特征值debug

web/maintain/bills_lib/html/tezheng.html

@@ -289,7 +289,6 @@
                     selectedId = itemId;
                     if(valueArr){
                         setSheet.setMaxRowCount(valueSheet, valueArr);
-                        console.log(valueArr);
                         tools.reshowValue(valueSheet, valueArr, eigenValueSetting, true);
                     }
                     orgValue = valueSheet.getValue(0, 0);
@@ -344,27 +343,27 @@
                         }
                     }
                 }
-                //let pasteDatas = tools.uniqObjArr(pasteDatas);
-                //tools.resetRowIdx(pasteDatas, orgRow);
-                for(let i=0; i< pasteDatas.length; i++){
+                let uniqPasteDatas = tools.uniqObjArr(pasteDatas);
+                tools.resetRowIdx(uniqPasteDatas, orgRow);
+                for(let i=0; i< uniqPasteDatas.length; i++){
                     let crossedData;
                     let flag = true;
                     totalItemsDatas.forEach(function(orgData){
-                        if(pasteDatas[i].rowIdx === orgData.rowIdx && pasteDatas[i].colIdx === orgData.colIdx){
+                        if(uniqPasteDatas[i].rowIdx === orgData.rowIdx && uniqPasteDatas[i].colIdx === orgData.colIdx){
                             flag = false;
                             crossedData = {
                                 billsLibId: billsLibId,
-                                rowIdx: pasteDatas[i].rowIdx,
-                                colIdx: pasteDatas[i].colIdx,
-                                field: pasteDatas[i].field,
+                                rowIdx: uniqPasteDatas[i].rowIdx,
+                                colIdx: uniqPasteDatas[i].colIdx,
+                                field: uniqPasteDatas[i].field,
                                 orgId: orgData.id,
-                                data: pasteDatas[i].data,
+                                data: uniqPasteDatas[i].data,
                                 type: 'Update'
                             }
                         }
                     });
                     if(flag){
-                        uncrossedDatas.push(pasteDatas[i]);
+                        uncrossedDatas.push(uniqPasteDatas[i]);
                     }
                     else{
                         crossedDatas.push(crossedData);
@@ -385,7 +384,6 @@
         function pasteValue(sheet, totalItems){
             sheet.bind(GC.Spread.Sheets.Events.ClipboardPasting, function (sender, args) {
                 valueDatas = tools.getsheetDatas(sheet, 'total');
-                console.log(valueDatas);
                 let maxCol = args.cellRange.col + args.cellRange.colCount - 1;
                 //复制的列数超过正确的列数，不可复制
                 if(maxCol >= eigenValueSetting.cols.length){
@@ -394,7 +392,6 @@
             });
 
             sheet.bind(GC.Spread.Sheets.Events.ClipboardPasted, function(sender, args){
-                //valueDatas = tools.getsheetDatas(sheet, 'total');
                 const colIdx = 1;
                 let orgRow = args.cellRange.row, orgCol = args.cellRange.col, rowCount = args.cellRange.rowCount, colCount = args.cellRange.colCount;
                 let maxRow = orgRow + rowCount - 1, maxCol = orgCol + colCount -1;

web/maintain/bills_lib/scripts/db_controller.js

@@ -371,7 +371,7 @@ var createObj = {
 
         TotalItems.prototype.findItem = function(id){
             return this.items[this.prefix + id] ? this.items[this.prefix + id] : null;
-        }
+        };
 
         TotalItems.prototype.loadItems = function (nodes, datas){
             var me = this;
@@ -1562,19 +1562,19 @@ let pasteController = {
                         });
                     }
                    else if(datas[i].type === CreateT){
-                        newItemData = {id: datas[i].newItemId, content: datas[i].content, code: datas[i].code};
+                        newItemData = {id: datas[i].newItemId, content: datas[i].content, code: datas[i].code, itemValue: []};
                         newItem = createObj.newItem(newItemData);
                         totalItems.itemsArr.push(newItem);
                         totalItems.items[totalItems.prefix + datas[i].newItemId] = newItem;
                     }
                    else if(datas[i].type !== CreateT && datas[i].field === 'content'){
-                        newItemData = {id: datas[i].newItemId, content: datas[i].data, code: datas[i].code};
+                        newItemData = {id: datas[i].newItemId, content: datas[i].data, code: datas[i].code, itemValue: []};
                         newItem = createObj.newItem(newItemData);
                         totalItems.itemsArr.push(newItem);
                         totalItems.items[totalItems.prefix + datas[i].newItemId] = newItem;
                     }
                    else if(datas[i].type !== 'CreateT' && datas[i].field === 'code'){
-                        newItemData = {id: datas[i].newItemId, content: '', code: datas[i].data};
+                        newItemData = {id: datas[i].newItemId, content: '', code: datas[i].data, itemValue: []};
                         newItem = createObj.newItem(newItemData);
                         totalItems.itemsArr.push(newItem);
                         totalItems.items[totalItems.prefix + datas[i].newItemId] = newItem;
@@ -1606,7 +1606,7 @@ let pasteController = {
                             valuesArr.splice(index, 0, updateEle);
                         }
                     }
-                   else if(datas[i].type !== 'UpdateT' && datas[i].field === 'code'){
+                   else if(datas[i].type === 'Update' && datas[i].field === 'code'){
                         if(valuesArr){
                             for(let j=0; j< valuesArr.length; j++){
                                 if(datas[i].orgId === valuesArr[j].code){
@@ -1615,7 +1615,7 @@ let pasteController = {
                             }
                         }
                     }
-                   else if(datas[i].type !== 'UpdateT' && datas[i].field === 'value'){
+                   else if(datas[i].type === 'Update' && datas[i].field === 'value'){
                         if(valuesArr){
                             for(let j=0; j< valuesArr.length; j++){
                                 if(datas[i].orgId === valuesArr[j].code){
@@ -1629,11 +1629,11 @@ let pasteController = {
                         valuesArr.push(newValueData);
 
                     }
-                   else if(datas[i].type !== 'CreateT' && datas[i].field === 'value'){
+                   else if(datas[i].type === 'Create' && datas[i].field === 'value'){
                         let newValueData = {value: datas[i].data, code: datas[i].code};
                         valuesArr.push(newValueData);
                     }
-                   else if(datas[i].type !== 'CreateT' && datas[i].field === 'code'){
+                   else if(datas[i].type === 'Create' && datas[i].field === 'code'){
                         let newValueData = {value: '', code: datas[i].data};
                         valuesArr.push(newValueData);
                     }
@@ -2057,7 +2057,6 @@ var valueController = {
         let me = valueController;
         sheet.bind(GC.Spread.Sheets.Events.EditStarting, function (sender, args) {
             me.currentEditData = sheet.getValue(args.row, args.col);
-            console.log(me.currentEditData)
         })
         sheet.bind(GC.Spread.Sheets.Events.EditEnded, function(sender, args){
             var newValue = args.editingText, tagId = sheet.getTag(args.row, args.col), field, isRepeat;
@@ -2066,15 +2065,13 @@ var valueController = {
                     field = col.data.field;
                 }
             });
-            console.log(newValue);
             if(selectedId && newValue!== me.currentEditData){
-                console.log(`enter`);
                 isRepeat = tools.isRepeat(valueController.getValues(totalItems, selectedId), field, newValue, 'document');
                 if(!tagId && !isRepeat && newValue){//create
                         valueController.createValue(sheet, totalItems, selectedId, field, newValue, args);
                 }
                 else if(tagId && !isRepeat){//update
-                        valueController.updateValue(userAccount, totalItems, tagId, newValue, field, args);
+                        valueController.updateValue(totalItems, tagId, newValue, field, args);
                 }
                 if(isRepeat){
                     if(tagId && newValue){