Explorar o código

部分bug修复

laiguoran %!s(int64=5) %!d(string=hai) anos
pai
achega
28f695ad57
Modificáronse 1 ficheiros con 6 adicións e 6 borrados
  1. 6 6
      app/public/js/material.js

+ 6 - 6
app/public/js/material.js

@@ -242,10 +242,10 @@ $(document).ready(() => {
                 const select = SpreadJsObj.getSelectObject(info.sheet);
                 const col = info.sheet.zh_setting.cols[info.col];
                 // 未改变值则不提交
-                console.log(!isNaN(info.editingText));
-                const validText = !isNaN(info.editingText) ? parseFloat(info.editingText) : (info.editingText ? trimInvalidChar(info.editingText) : null);
-                console.log(validText);
+                const validText = info.editingText !== null && !isNaN(info.editingText) ? parseFloat(info.editingText) : (info.editingText ? trimInvalidChar(info.editingText) : null);
                 const orgValue = select[col.field];
+                console.log(orgValue);
+                console.log(validText);
                 if (orgValue == validText || ((!orgValue || orgValue === '') && (validText === ''))) {
                     SpreadJsObj.reLoadRowData(info.sheet, info.row);
                     return;
@@ -328,8 +328,8 @@ $(document).ready(() => {
             }
         },
         clipboardPasted(e, info) {
-            const tree = info.sheet.zh_tree;
-            if (!tree) { return; }
+            // const tree = info.sheet.zh_tree;
+            // if (!tree) { return; }
             console.log(info);
             // if (info.sheet.zh_setting) {
             //     const select = SpreadJsObj.getSelectObject(info.sheet);
@@ -419,7 +419,7 @@ $(document).ready(() => {
             // }
         },
         setReadOnly: function(readOnly) {
-            SpreadJsObj.resetFieldReadOnly(materialSpread.getActiveSheet(), 'msg_spread', 'm_spread', 'm_tp', 'pre_tp', readOnly);
+            // SpreadJsObj.resetFieldReadOnly(materialSpread.getActiveSheet(), 'msg_spread', 'm_spread', 'm_tp', 'pre_tp', readOnly);
         }
     };
     materialSpreadObj.refreshActn();