Răsfoiți Sursa

렌더링 버그 수정 및 keepall 추가

https://github.com/openNAMU/openNAMU/issues/2481
잉여개발기 1 an în urmă
părinte
comite
89361415d5
3 a modificat fișierele cu 11 adăugiri și 2 ștergeri
  1. 1 0
      route/tool/func.py
  2. 9 1
      route/tool/func_render_namumark.py
  3. 1 1
      version.json

+ 1 - 0
route/tool/func.py

@@ -1585,6 +1585,7 @@ def render_set(conn, doc_name = '', doc_data = '', data_type = 'view', markup =
 
 
                 .opennamu_render_complete td {
                 .opennamu_render_complete td {
                     padding: 5px 10px !important;
                     padding: 5px 10px !important;
+                    word-break: break-all;
                 }
                 }
 
 
                 .opennamu_render_complete summary {
                 .opennamu_render_complete summary {

+ 9 - 1
route/tool/func_render_namumark.py

@@ -1707,7 +1707,13 @@ class class_do_render_namumark:
                     else:
                     else:
                         do_any_thing += '<' + table_parameter + '>'
                         do_any_thing += '<' + table_parameter + '>'
                 elif len(table_parameter_split) == 1:
                 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;'
                         table_parameter_all['td'] += 'padding: 0 !important;'
                     elif re.search(r'^-[0-9]+$', table_parameter):
                     elif re.search(r'^-[0-9]+$', table_parameter):
                         table_colspan_auto = 0
                         table_colspan_auto = 0
@@ -2154,6 +2160,8 @@ class class_do_render_namumark:
                 data = re.sub(inter_data_regex, self.replace_sub, data)
                 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 = 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
                 self.inter_count += 1
 
 
                 return data
                 return data

+ 1 - 1
version.json

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