update

lib/framework/static/js/ff_common1.js

@@ -53,7 +53,7 @@ $.notify({
   },
   offset: 20,
   spacing: 10,
-  z_index: 1031,
+  z_index: 3000,
   delay: 10000,
   timer: 1000,
   url_target: '_blank',
@@ -81,7 +81,7 @@ $.notify({
 
 
 function notify(msg, type) {
-  $.notify('<strong>' + msg + '</strong>', {type: type});
+  $.notify('<strong>' + msg + '</strong>', {type: type, z_index: 3000});
 }
 
 // 메뉴 제거
@@ -289,8 +289,8 @@ $.extend(
   {
       var form = '';
       $.each( args, function( key, value ) {
-          //console.log(key);
-          //console.log(value);
+          console.log(key);
+          console.log(value);
           value = value.split('"').join('\"')
           form += '<input type="hidden" name="'+key+'" value="'+value+'">';
       });

lib/framework/static/js/ff_global1.js

@@ -1,5 +1,6 @@
 // global socketio
 $(document).ready(function(){
+  ResizeTextArea();
 });
   
 $(document).ready(function(){
@@ -23,6 +24,7 @@ frameSocket.on('notify', function(data){
     target: '_self'
   },{
     type: data['type'],
+    z_index: 2000,
   });
 });
 
@@ -317,5 +319,17 @@ $("body").on('click', '#command_modal_input_btn', function(e) {
   });
 });
 
+
+$(window).resize(function() {
+  ResizeTextArea();
+});
+
+
+function ResizeTextArea() {
+  ClientHeight = window.innerHeight
+  $("#command_modal").height(ClientHeight-100);
+  $("#command_modal_textarea").height(ClientHeight-380);
+}
+
 ///////////////////////////////////////
 

lib/framework/static/js/ff_ui1.js

@@ -1,4 +1,4 @@
-function m_button_group(h) {
+function j_button_group(h) {
   var str = '<div class="btn-group btn-group-sm flex-wrap mr-2" role="group">';
   str += h
   str += '</div>';
@@ -6,7 +6,7 @@ function m_button_group(h) {
 }
 
 // primary, secondary, success, danger, warning, info, light, dark, white
-function m_button(id, text, data={}, color='success', outline=true, small=false) {
+function j_button(id, text, data={}, color='success', outline=true, small=false) {
   var str = '<button id="'+id+'" name="'+id+'" class="btn btn-sm btn';
   if (outline) {
     str += '-outline';
@@ -24,18 +24,48 @@ function m_button(id, text, data={}, color='success', outline=true, small=false)
   return str;
 }
 
-function m_button_small(id, text, data={}, color='success', outline=true) {
-  return m_button(id, text, data, color, outline, true);
+function j_button_small(id, text, data={}, color='success', outline=true) {
+  return j_button(id, text, data, color, outline, true);
+}
+
+
+
+function j_row_start(padding='10', align='center') {
+  var str = '<div class="row" style="padding-top: '+padding+'px; padding-bottom:'+padding+'px; align-items:'+align+';">';
+  return str;
+}
+function j_col(w, h, align='left') {
+  var str = '<div class="col-sm-' + w + ' " style="text-align: '+align+'; word-break:break-all;">';
+  str += h;
+  str += '</div>';
+  return str;
+}
+
+function j_col_wide(w, h, align='left') {
+  var str = '<div class="col-sm-' + w + ' " style="padding:0px; margin:0px; text-align: '+align+'; word-break:break-all;">';
+  str += h;
+  str += '</div>';
+  return str;
+}
+
+function j_row_end() {
+  var str = '</div>';
+  return str;
 }
 
 
 
 
 
+function j_hr(margin='5') {
+  var str = '<hr style="width: 100%; margin:'+margin+'px;" />';
+  return str;
+}
 
-
-
-
+function j_hr_black() {
+  var str = '<hr style="width: 100%; color: black; height: 2px; background-color:black;" />';
+  return str;
+}
 
 
 
@@ -119,10 +149,9 @@ function m_table(id, heads) {
 
 
 
-function m_row_start(padding='10', align='center') {
-  var str = '<div class="row" style="padding-top: '+padding+'px; padding-bottom:'+padding+'px; align-items:'+align+';">';
-  return str;
-}
+
+
+
 function m_row_start_hover(padding='10', align='center') {
   var str = '<div class="row my_hover" style="padding-top: '+padding+'px; padding-bottom:'+padding+'px; align-items:'+align+';">';
   return str;
@@ -139,39 +168,17 @@ function m_row_start_color2(padding='10', align='center') {
   return str;
 }
 
-function m_row_end() {
-  var str = '</div>';
-  return str;
-}
+
 
 //border
-function m_col(w, h, align='left') {
-  var str = '<div class="col-sm-' + w + ' " style="text-align: '+align+'; word-break:break-all;">';
-  str += h
-  str += '</div>';
-  return str
-}
-
-function m_col_wide(w, h, align='left') {
-  var str = '<div class="col-sm-' + w + ' " style="padding:0px; margin:0px; text-align: '+align+'; word-break:break-all;">';
-  str += h
-  str += '</div>';
-  return str
-}
 
 
 
 
 
-function m_hr(margin='5') {
-  var str = '<hr style="width: 100%; margin:'+margin+'px;" />';
-  return str;
-}
 
-function m_hr_black() {
-  var str = '<hr style="width: 100%; color: black; height: 2px; background-color:black;" />';
-  return str;
-}
+
+
 // 체크박스는 자바로 하면 on/off 스크립트가 안먹힘.
 
 

lib/framework/static/js/sjva_ui14.js

@@ -11,14 +11,7 @@ function m_row_start_hover(padding='10', align='center') {
 function m_row_start_top(padding='10') {
   return m_row_start(padding, 'top');
 }
-function m_row_start_color(padding='10', align='center', color='') {
-  var str = '<div class="row" style="padding-top: '+padding+'px; padding-bottom:'+padding+'px; align-items:'+align+'; background-color:'+color+'">';
-  return str;
-}
-function m_row_start_color2(padding='10', align='center') {
-  var str = '<div class="row bg-dark text-white" style="padding-top: '+padding+'px; padding-bottom:'+padding+'px; align-items:'+align+';">';
-  return str;
-}
+
 
 function m_row_end() {
   var str = '</div>';