zhongzewei 6 лет назад
Родитель
Сommit
e3f31c187b

+ 4 - 1
public/web/PerfectLoad.js

@@ -71,7 +71,10 @@ jQuery.bootstrapLoading = {
 
                             });
                         setTimeout(function () {
-                            $('#loadingFocus')[0].focus();
+                            const $loadingFocus = $('#loadingFocus')[0];
+                            if ($loadingFocus) {
+                                $loadingFocus.focus();
+                            }
                         }, 200);
 
                     },

+ 2 - 2
web/maintain/bills_lib/html/qingdan.html

@@ -461,7 +461,6 @@
 
     function showBillsSheet(datas, jobsSheet, itemsSheet, setting) {
         let billsSpread = new GC.Spread.Sheets.Workbook($('#spreadBills')[0], {sheetCount: 1});
-        let billsSheet = billsSpread.getSheet(0);
         sheetCommonObj.bindEscKey(billsSpread, [{sheet: billsSpread.getSheet(0), editStarting: dbController.onEditStart, editEnded: dbController.onEditEnded}]);
         billsSpread.focus(true);
         setSheet.initSheet(billsSpread, setting, true);
@@ -727,7 +726,8 @@
             }
             if(controller.tree.selected  && args.oldSelections[0].row !== args.newSelections[0].row|| controller.tree.selected && args.oldSelections[0].row === 0){
                 //rechargeArea
-                codeEditor.setValue(controller.tree.selected.data.recharge);
+                const recharge = controller.tree.selected.data.recharge || '';
+                codeEditor.setValue(recharge);
                 //$('#exampleTextarea').val(controller.tree.selected.data.recharge);
                 if(field === 'jobs'){
                     tools.clearData(sheet);

+ 2 - 1
web/maintain/bills_lib/scripts/db_controller.js

@@ -244,7 +244,8 @@ var dbController = {
                 let nowNode = controller.tree.selected ;
                 if(nowNode){
                     let jobs = controller.tree.selected.jobs;
-                    codeEditor.setValue(controller.tree.selected.data.recharge);
+                    const recharge = controller.tree.selected.data.recharge || '';
+                    codeEditor.setValue(recharge);
                     //$('#exampleTextarea').val(controller.tree.selected.data.recharge);
                     setSheet.setMaxRowCount(jobsSheet, jobs);
                     tools.orderReshowData(jobsSheet, jobs, jobsSetting, 'job', false);