Merge branch '3.0.5_online'

web/building_saas/complementary_glj_lib/js/glj.js

@@ -577,7 +577,9 @@ let repositoryGljObj = {
         let deESCFields = ['code', 'name', 'specs'];
         let dataCode = me.setting.header[args.col].dataCode;
         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, ' ').replace(/\s$/, '')
+                : '';
             args.sheet.setValue(args.row, args.col, args.editingText);
         }
         let rObj = sheetOpr.combineRowData(me.workBook.getSheet(0), me.setting, args.row, me),