2du 4 лет назад
Родитель
Сommit
ca57f9bbbe
3 измененных файлов с 9 добавлено и 7 удалено
  1. 2 2
      route/tool/func.py
  2. 1 1
      version.json
  3. 6 4
      views/main_css/js/render_onmark.js

+ 2 - 2
route/tool/func.py

@@ -1245,7 +1245,7 @@ def ban_check(ip = None, tool = ''):
     curs.execute(db_change("" + \
         "select login, block from rb " + \
         "where band = 'regex' and ongoing = '1'" + \
-    ""), [get_time()])
+    ""))
     regex_d = curs.fetchall()
     for test_r in regex_d:
         g_regex = re.compile(test_r[1])
@@ -1260,7 +1260,7 @@ def ban_check(ip = None, tool = ''):
         "select login from rb " + \
         "where block = ? and band = '' and ongoing = '1'" + \
         "" + \
-    ""), [get_time(), ip])
+    ""), [ip])
     ban_d = curs.fetchall()
     if ban_d:
         if tool == 'login':

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.4.0-stable-01b (beta-01b) (dev-2021-07-03-01)",
+        "r_ver" : "v3.4.0-stable-01b (beta-01b) (dev-2021-07-18-01)",
         "c_ver" : "3400101",
         "s_ver" : "12"
     }

+ 6 - 4
views/main_css/js/render_onmark.js

@@ -642,7 +642,7 @@ function do_onmark_middle_render(data, data_js, name_include, data_nowiki, name_
     return [data, data_js, data_nowiki];
 }
 
-function do_onmark_last_render(data) {   
+function do_onmark_last_render(data) {       
     // middle_render 마지막 처리
     data = data.replace(/<wiki_s_[0-9] /g, '<div ');
     data = data.replace(/<wiki_e_[0-9]>/g, '</div>');
@@ -724,11 +724,11 @@ function do_onmark_table_render_sub(data, data_col) {
         "rowspan" : "",
         "data" : ""
     };
+    var align_auto = 1;
     
     var table_option_re = /&lt;((?:(?!&lt;|&gt;).)+)&gt;/;
     while(1) {
         var no_option = '';
-        var align_auto = 1;
         var data_option = data.match(table_option_re);
         if(!data_option) {
             break;
@@ -800,6 +800,8 @@ function do_onmark_table_render_sub(data, data_col) {
                 data_option === ':' ||
                 data_option === ')'
             ) {
+                align_auto = 0;
+                
                 // align
                 if(data_option === '(') {
                     data_option_all['td'] += 'text-align:right;';
@@ -809,7 +811,7 @@ function do_onmark_table_render_sub(data, data_col) {
                     data_option_all['td'] += 'text-align:left;';
                 }
                 
-                align_auto = 0;
+                
             } else {
                 var table_option_data = data_option.replace(/"/g, '').match(/^((?:#[a-zA-Z0-9]{3}){1,2}|\w+)/);
                 if(table_option_data) {
@@ -933,7 +935,7 @@ function do_onmark_table_render(data) {
         }
         
         data = data.replace(wiki_re, function(x, x_1, x_2) {
-            return '<wiki_s_2 ' + x_1 + '>' + do_onmark_table_render_main(x_2) + '</wiki_e_2>';
+            return '<wiki_s_2 ' + x_1 + '>' + do_onmark_table_render_main(x_2) + '<wiki_e_2>';
         });
     }