Przeglądaj źródła

Improve debugger function.

ZhangXK 9 miesięcy temu
rodzic
commit
0cd2dde6f7

+ 2 - 2
comx_sdk.node/js/_model.js

@@ -2595,7 +2595,7 @@ exports.saveFormDBToKul         = saveFormDBToKul;
 // Execute Form or Open a new Frame.
 
 var g_debug_process = false;
-function debugUnit(unit_name, geo, cb, ready)
+function debugUnit(unit_name, form_name, geo, cb, ready)
 {
     if(!g_debug_process)
     {
@@ -2605,7 +2605,7 @@ function debugUnit(unit_name, geo, cb, ready)
         let margin_x = 120;
         let margin_y = 40;
         g_debug_process = fork(cmd,
-                               [entry_js,
+                               [entry_js, form_name, comx.resource.e6509a46b9cba407fbd2d82b1b1d4779a,
                                 geo.x + margin_x * 2,
                                 geo.y + margin_y,
                                 geo.width - 2 * margin_x - margin_y,

+ 4 - 1
comx_sdk.node/js/kul_editor_pane.js

@@ -1253,6 +1253,9 @@ function OnExecute()
 
 function OnDebug()
 {
+    let form_name = ui.forms.value;
+    if(ui.execute_type.index === 1) form_name =  'mainfrm';
+    
     let geo = ui.GetWidgetGeometry(ui.callback.handle);
     ui.pb_preview.valid = false;
     OnPreview(false);
@@ -1264,7 +1267,7 @@ function OnDebug()
     
     ui.debug_btn.visible = false;
     ui.stop_debug_btn.visible = true;
-    model.debugUnit(ui.units.value, geo, ()=>{
+    model.debugUnit(ui.units.value, form_name, geo, ()=>{
         ui.debug_btn.visible = true;
         ui.stop_debug_btn.visible = false;
         setCuelineInfo('Ready.'); 

+ 10 - 7
comx_sdk.node/utils/debug.js

@@ -10,13 +10,16 @@ catch(err)
 
 const { spawn, fork } = require('child_process');
 
-let entry_js = process.argv[2];
-let x = process.argv[3];
-let y = process.argv[4];
-let w = process.argv[5];
-let h = process.argv[6];
-
-let cp = spawn('node', ['--inspect-brk', entry_js]);
+let n = 2;
+let entry_js = process.argv[n]; ++n;
+let form_name = process.argv[n]; ++n;
+let resource = process.argv[n]; ++n;
+let x = process.argv[n]; ++n;
+let y = process.argv[n]; ++n;
+let w = process.argv[n]; ++n;
+let h = process.argv[n]; ++n;
+
+let cp = spawn('node', ['--inspect-brk', entry_js, form_name, resource]);
 
 let g_first = true;
 let g_output = '';