Browse Source

https://github.com/openNAMU/openNAMU/issues/1838

2du 2 năm trước cách đây
mục cha
commit
811ecacc44

+ 4 - 0
route/main_setting_skin_set.py

@@ -109,6 +109,10 @@ def main_setting_skin_set():
                         <select name="main_css_table_scroll">
                             ''' + set_data["main_css_table_scroll"] + '''
                         </select>
+                        <h3>''' + load_lang("list_view_change") + '''</h3>
+                        <select name="main_css_list_view_change">
+                            ''' + set_data["main_css_list_view_change"] + '''
+                        </select>
                         <h2>''' + load_lang("edit") + '''</h2>
                         <h3>''' + load_lang("image_paste") + '''</h3>
                         <sup>''' + load_lang('only_korean') + '''</sup> <sup>''' + load_lang('unavailable_in_monaco') + '''</sup>

+ 9 - 3
route/tool/func_render_namumark.py

@@ -1960,11 +1960,14 @@ class class_do_render_namumark:
                 i -= 1
 
             return end_text
+            
+        list_view_set = get_main_skin_set(self.curs, self.flask_session, 'main_css_list_view_change', self.ip)
         
         class do_render_list_int_to:
-            def __init__(self, do_type):
+            def __init__(self, do_type, list_view_set = ''):
                 self.list_num = []
                 self.do_type = do_type
+                self.list_view_set = list_view_set
 
             def __call__(self, match):
                 list_data = match.group(3)
@@ -1985,7 +1988,10 @@ class class_do_render_namumark:
                     self.list_num[list_len - 1] = int(list_start)
 
                 if self.do_type == 'int':
-                    change_text = str(self.list_num[list_len - 1])
+                    if self.list_view_set == 'on':
+                        change_text = str('-'.join([str(for_a) for for_a in self.list_num if for_a != 0]))
+                    else:
+                        change_text = str(self.list_num[list_len - 1])
                 elif self.do_type == 'roman_big':
                     change_text = int_to_roman(self.list_num[list_len - 1])
                 elif self.do_type == 'roman_small':
@@ -2010,7 +2016,7 @@ class class_do_render_namumark:
                 list_data = list_data.group(1)
                 list_sub_regex = r'\n( *)1\.(?:#([0-9]*))? ?([^\n]*)'
 
-                list_class = do_render_list_int_to('int')
+                list_class = do_render_list_int_to('int', list_view_set)
                 list_data = re.sub(list_sub_regex, list_class, list_data)
 
                 self.render_data = re.sub(list_regex, lambda x : ('\n<front_br><ul class="opennamu_ul">' + list_data + '</ul><back_br>\n'), self.render_data, 1)

+ 9 - 0
route/user_setting_skin_set_main.py

@@ -72,6 +72,10 @@ def user_setting_skin_set_main_set_list():
             ['default', load_lang('default')],
             ['off', load_lang('off')],
             ['on', load_lang('use')]
+        ], 'main_css_list_view_change' : [
+            ['default', load_lang('default')],
+            ['off', load_lang('off')],
+            ['on', load_lang('use')]
         ]
     }
 
@@ -217,6 +221,11 @@ def user_setting_skin_set_main():
                         <select name="main_css_table_scroll">
                             ''' + set_data["main_css_table_scroll"] + '''
                         </select>
+                        <h3>''' + load_lang("list_view_change") + '''</h3>
+                        ''' + set_data_main["main_css_list_view_change"] + '''
+                        <select name="main_css_list_view_change">
+                            ''' + set_data["main_css_list_view_change"] + '''
+                        </select>
                         <h2>''' + load_lang("edit") + '''</h2>
                         <h3>''' + load_lang("image_paste") + '''</h3>
                         <sup>''' + load_lang('only_korean') + '''</sup> <sup>''' + load_lang('unavailable_in_monaco') + '''</sup>

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.4.6-RC5-dev4",
+        "r_ver" : "v3.4.6-RC5-dev5",
         "c_ver" : "3500372",
         "s_ver" : "3500111"
     }