Merge pull request #2485 from openNAMU/dont_use

버그 수정

route/main_setting_external.py

@@ -98,6 +98,8 @@ def main_setting_external():
                         <h3>''' + get_lang(conn, 'smtp_setting') + '''</h3>
                         <a href="https://support.google.com/mail/answer/7126229">(Google)</a>
                         <hr class="main_hr">
+                        <a href="/setting/email_send">(''' + get_lang(conn, 'test') + ''')</a>
+                        <hr class="main_hr">
 
                         <span>''' + get_lang(conn, 'smtp_server') + '''</span>
                         <hr class="main_hr">

route/tool/func.py

@@ -1243,7 +1243,7 @@ def skin_check(conn, set_n = 0):
         return skin
     
 def cache_v():
-    return '.cache_v283'
+    return '.cache_v284'
 
 def wiki_css(data):
     with class_temp_db() as m_conn:
@@ -1585,6 +1585,7 @@ def render_set(conn, doc_name = '', doc_data = '', data_type = 'view', markup =
 
                 .opennamu_render_complete td {
                     padding: 5px 10px !important;
+                    word-break: break-all;
                 }
 
                 .opennamu_render_complete summary {

route/tool/func_render_namumark.py

@@ -163,7 +163,7 @@ class class_do_render_namumark:
             if data == '':
                 data += '<div class="opennamu_footnote">'
             else:
-                data += '<br>'
+                data += '<hr class="main_hr">'
 
             if len(self.data_footnote[for_a]['list']) > 1:
                 data += '(' + for_a + ') '
@@ -1707,7 +1707,13 @@ class class_do_render_namumark:
                     else:
                         do_any_thing += '&lt;' + table_parameter + '&gt;'
                 elif len(table_parameter_split) == 1:
-                    if table_parameter == 'nopad':
+                    if table_parameter == 'keepall':
+                        table_parameter_all['td'] += 'word-break: keep-all !important;'
+                    elif table_parameter == 'rowkeepall':
+                        table_parameter_all['tr'] += 'word-break: keep-all !important;'
+                    elif table_parameter == 'colkeepall':
+                        table_parameter_all['col'] += 'word-break: keep-all !important;'
+                    elif table_parameter == 'nopad':
                         table_parameter_all['td'] += 'padding: 0 !important;'
                     elif re.search(r'^-[0-9]+$', table_parameter):
                         table_colspan_auto = 0
@@ -1882,7 +1888,7 @@ class class_do_render_namumark:
                             self.render_data = re.sub(middle_regex, lambda x : middle_data_org, self.render_data, 1)
                             continue
 
-                        wiki_data = re.sub(r'^#!wiki +', '', middle_data)
+                        wiki_data = re.sub(r'^#!wiki *', '', middle_data)
 
                         wiki_regex = re.compile('^(?:(?:style=(&quot;(?:(?:(?!&quot;).)*)&quot;|&#x27;(?:(?:(?!&#x27;).)*)&#x27;)))(?:\n| +)', re.I)
                         wiki_dark_regex = re.compile('^(?:(?:dark-style=(&quot;(?:(?:(?!&quot;).)*)&quot;|&#x27;(?:(?:(?!&#x27;).)*)&#x27;)))(?:\n| +)', re.I)
@@ -2154,6 +2160,8 @@ class class_do_render_namumark:
                 data = re.sub(inter_data_regex, self.replace_sub, data)
                 
                 data = self.do_inter_render(data, self.doc_set['doc_include'] + 'opennamu_inter_render_' + str(self.inter_count))
+                data = re.sub(r'\|\|', '<no_td>', data)
+                
                 self.inter_count += 1
 
                 return data

route/view_w.py

@@ -181,7 +181,7 @@ async def view_w(name = 'Test', do_type = ''):
             name_view = name
 
         doc_data = json.loads((await api_w_raw(name)).data)
-        if doc_data["response"] != "not exist":
+        if doc_data["response"] == "ok":
             render_data = json.loads((await api_w_render(name, request_method = 'POST', request_data = {
                 'name' : name,
                 'data' : doc_data["data"]

version.json

@@ -1,5 +1,5 @@
 {
-    "r_ver" : "v3.5.1-v24",
+    "r_ver" : "v3.5.1-v28",
     "c_ver" : "20241202",
     "s_ver" : "20240426",
     "bin_link" : "https://github.com/openNAMU/GopenNAMU/releases/download/v2025-01-16-v1/"

views/main_css/js/func/render.js

@@ -118,7 +118,7 @@ function opennamu_do_render_html(name = '') {
                 if(['b', 'i', 's', 'del', 'strong', 'bold', 'em', 'sub', 'sup'].includes(t_data[key])) {
                     return '<' + t_data[key] + '>' + in_data_2 + '</' + t_data[key] + '>'
                 } else if(t_data[key] === 'div' || t_data[key] === 'span') {
-                    let style_data = in_data.match(/ style=['"]([^'"]*)['"]/);
+                    let style_data = in_data?.match(/ style=['"]([^'"]*)['"]/);
                     if(style_data) {
                         style_data = style_data[1];
 
@@ -140,7 +140,7 @@ function opennamu_do_render_html(name = '') {
 
                     return '<' + t_data[key] + ' style="' + style_data + '">' + in_data_2 + '</' + t_data[key] + '>';
                 } else if(t_data[key] === 'a') {
-                    let link_data = in_data.match(/ href=['"]([^'"]*)['"]/);
+                    let link_data = in_data?.match(/ href=['"]([^'"]*)['"]/);
                     if(link_data) {
                         link_data = link_data[1].replace(/^javascript:/ig, '');
                     } else {
@@ -149,7 +149,7 @@ function opennamu_do_render_html(name = '') {
 
                     return '<' + t_data[key] + ' class="opennamu_link_out" href="' + link_data + '">' + in_data_2 + '</' + t_data[key] + '>';
                 } else if(t_data[key] === 'iframe') {
-                    let src_data = in_data.match(/ src=['"]([^'"]*)['"]/);
+                    let src_data = in_data?.match(/ src=['"]([^'"]*)['"]/);
                     if(src_data) {
                         src_data = src_data[1];
 
@@ -165,14 +165,14 @@ function opennamu_do_render_html(name = '') {
                         src_data = '';
                     }
 
-                    let width_data = in_data.match(/ width=['"]([^'"]*)['"]/);
+                    let width_data = in_data?.match(/ width=['"]([^'"]*)['"]/);
                     if(width_data) {
                         width_data = width_data[1];
                     } else {
                         width_data = '';
                     }
 
-                    let height_data = in_data.match(/ height=['"]([^'"]*)['"]/);
+                    let height_data = in_data?.match(/ height=['"]([^'"]*)['"]/);
                     if(height_data) {
                         height_data = height_data[1];
                     } else {
@@ -181,21 +181,21 @@ function opennamu_do_render_html(name = '') {
 
                     return '<' + t_data[key] + ' src="' + src_data + '" width="' + width_data + '" height="' + height_data + '" allowfullscreen frameborder="0">' + in_data_2 + '</' + t_data[key] + '>';
                 } else {
-                    let src_data = in_data.match(/ src=['"]([^'"]*)['"]/);
+                    let src_data = in_data?.match(/ src=['"]([^'"]*)['"]/);
                     if(src_data) {
                         src_data = src_data[1];
                     } else {
                         src_data = '';
                     }
 
-                    let width_data = in_data.match(/ width=['"]([^'"]*)['"]/);
+                    let width_data = in_data?.match(/ width=['"]([^'"]*)['"]/);
                     if(width_data) {
                         width_data = width_data[1];
                     } else {
                         width_data = '';
                     }
 
-                    let height_data = in_data.match(/ height=['"]([^'"]*)['"]/);
+                    let height_data = in_data?.match(/ height=['"]([^'"]*)['"]/);
                     if(height_data) {
                         height_data = height_data[1];
                     } else {
@@ -335,4 +335,4 @@ function opennamu_do_toc() {
     data.innerHTML = data.innerHTML.replace(/<div class="opennamu_toc"><\/div>/g, function(match) {
         return '<div class="opennamu_TOC" id="toc"><div class="opennamu_TOC_title">TOC</div><br>' + toc_html + '</div>';
     });
-}
+}

views/main_css/js/route/setting_404_page.js

@@ -71,7 +71,12 @@ function opennamu_setting_404_page() {
         data_html += '</select>';
         data_html += '<hr class="main_hr">';
 
-        data_html += '<textarea class="opennamu_textarea_500" id="opennamu_setting_404_page_textarea">' + data[2]['data'][0][0] + '</textarea>';
+        let set_data = '';
+        if(data[2]['data'].length > 0) {
+            set_data = data[2]['data'][0][0];
+        }
+
+        data_html += '<textarea class="opennamu_textarea_500" id="opennamu_setting_404_page_textarea">' + set_data + '</textarea>';
         data_html += '<hr class="main_hr">';
 
         data_html += '<button id="opennamu_save_button" onclick="opennamu_setting_404_page_post();">' + data[0]['data'][0] + '</button> ';