表格输入,丢失问题

modules/complementary_ration_lib/models/compleRationModel.js

@@ -159,10 +159,10 @@ class CompleRatoinDao {
                 }
             }
             if(stdGljIds.length > 0) {
-                stdGljs = await stdGljModel.find({ID: {$in: stdGljIds}});
+                stdGljs = await stdGljModel.find({ID: {$in: stdGljIds}}).lean();
             }
             if(comGljIds.length > 0) {
-                comGljs = await complementaryGljModel.find({userId: userId, ID: {$in: comGljIds}});
+                comGljs = await complementaryGljModel.find({userId: userId, ID: {$in: comGljIds}}).lean();
             }
             let gljDatas = gljUtil.sortRationGLJ(stdGljs.concat(comGljs),true);
             if(ration.jobContent && ration.jobContent.toString().trim() !== ''){
@@ -240,7 +240,10 @@ class CompleRatoinDao {
                 stdGljIds.push(rationGlj.gljId);
             }
             if(stdGljIds.length > 0) {
-                stdGljs = await stdGljModel.find({ID: {$in: stdGljIds}});
+                stdGljs = await stdGljModel.find({ID: {$in: stdGljIds}}).lean();
+                /*stdGljs.forEach(function (glj) {
+                    glj.type = glj.gljType;
+                });*/
             }
             let gljDatas =  gljUtil.sortRationGLJ(stdGljs,true);
             if(ration.jobContent && ration.jobContent.toString().trim() !== ''){

web/building_saas/complementary_glj_lib/js/glj.js

@@ -582,7 +582,7 @@ let repositoryGljObj = {
         // 输入编号、名称、规格时，如果输入回车符或粘贴回车符，提交时应转换为空格。
         let deESCFields = ['code', 'name', 'specs'];
         if(deESCFields.includes(me.setting.header[args.col]['dataCode'])){
-            args.editingText = me.isDef(args.editingText) ? args.editingText.toString().replace(/[\r, \n]/g, ' ') : '';
+            args.editingText = me.isDef(args.editingText) ? args.editingText.toString().replace(/[\r\n]/g, ' ') : '';
             args.sheet.setValue(args.row, args.col, args.editingText);
         }
         let rObj = sheetOpr.combineRowData(me.workBook.getSheet(0), me.setting, args.row, me),

web/building_saas/complementary_ration_lib/js/ration.js

@@ -427,7 +427,7 @@ let rationOprObj = {
         let dataCode = me.setting.header[args.col].dataCode;
         let deESCFields = ['code', 'name', 'unit'];
         if(deESCFields.includes(dataCode)){
-            args.editingText = me.isDef(args.editingText) ? args.editingText.toString().replace(/[\r, \n]/g, ' ') : '';
+            args.editingText = me.isDef(args.editingText) ? args.editingText.toString().replace(/[\r\n]/g, ' ') : '';
             args.sheet.setValue(args.row, args.col, args.editingText);
         }
         let rObj = sheetsOprObj.combineRationRowData(me.workBook.getSheet(0), me.setting, args.row),

web/building_saas/main/js/models/exportStandardInterface.js

@@ -1268,8 +1268,8 @@ const XMLStandard = (function () {
                     feature = [];
                 let jobText = node.data.jobContentText || '';
                 let featureText = node.data.itemCharacterText || '';
-                let jobSplit = jobText.split(/[\r,\n]/g),
-                    featureSplit = featureText.split(/[\r,\n]/g);
+                let jobSplit = jobText.split(/[\r\n]/g),
+                    featureSplit = featureText.split(/[\r\n]/g);
                 //将特征和内容分类，通过[项目特征][工作内容]区分。若没有,则不区分:工作内容列全部数据为工作内容，项目特征列全部数据为项目特征
                 //@param {Array}data(splitdata) {String}field(job、feature)
                 function classifyData(data, field) {

web/building_saas/main/js/models/exportStdInterfaceBase.js

@@ -172,7 +172,7 @@ const XML_EXPORT_BASE = (() => {
                     : ''
                 : String(data.value);
             if (data.whiteSpace && data.whiteSpace === WHITE_SPACE.COLLAPSE) {  //处理空格相关
-                data.value = data.value.replace(/[\r,\n,\t]/g, ' ');
+                data.value = data.value.replace(/[\r\n\t]/g, ' ');
                 data.value = data.value.trim();
                 data.value = data.value.replace(/\s{1,}/g, ' ');
             }

web/building_saas/main/js/views/importBills.js

@@ -20,7 +20,7 @@ const importBills = (function(){
     
     //去除转义字符
     function _deESC(data) {
-        return _isDef(data) ? data.toString().replace(/[\r,\n,\s,\t]/g, '') : data;
+        return _isDef(data) ? data.toString().replace(/[\r\n\s\t]/g, '') : data;
     }
 
     function _deNR(data) {

web/building_saas/main/js/views/project_view.js

@@ -839,7 +839,7 @@ var projectObj = {
         let fieldName = projectObj.mainController.setting.cols[info.col].data.field;
         //提前处理
         if (fieldName === 'code' || fieldName === 'name' || fieldName === 'unit') {
-            info.editingText = info.editingText ? info.editingText.toString().replace(new RegExp(/[\r,\n]/g), '') : info.editingText;
+            info.editingText = info.editingText ? info.editingText.toString().replace(new RegExp(/[\r\n]/g), '') : info.editingText;
         }
         // 检查输入类型等
         let value = projectObj.checkSpreadEditingText(info.editingText, colSetting);

web/building_saas/pm/js/pm_newMain.js

@@ -2819,7 +2819,7 @@ function refreshAllPage(){
 
 
 function whiteSpaceCollapse(v) {
-    v = v.replace(/[\r,\n,\t]/g, ' ');
+    v = v.replace(/[\r\n\t]/g, ' ');
     v = v.trim();
     return v.replace(/\s{1,}/g, ' ');
 }