Browse Source

Merge branch '3.0.5_onlilne'

vian 4 years ago
parent
commit
a944726f15
1 changed files with 3 additions and 1 deletions
  1. 3 1
      web/building_saas/complementary_glj_lib/js/glj.js

+ 3 - 1
web/building_saas/complementary_glj_lib/js/glj.js

@@ -788,7 +788,9 @@ 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, ' ').replace(/\s$/, '')
+                : '';
             args.sheet.setValue(args.row, args.col, args.editingText);
         }
         let rObj = sheetOpr.combineRowData(me.workBook.getSheet(0), me.setting, args.row, me),