ソースを参照

feat(add config): Optimized input config name

runhey 3 年 前
親
コミット
fbaef2fce4
2 ファイル変更、14 行追加、4 行削除
  1. 12 4
      module/gui/context/add.py
  2. 2 0
      module/gui/qml/Component/Add.qml

+ 12 - 4
module/gui/context/add.py

@@ -80,10 +80,18 @@ class Add(QObject):
         all_script_files = self.all_script_files()
         if not all_script_files:
             return 'oas1'
-        all_script_files.sort()
-        last_script = all_script_files[-1]
-        last_script_number = re.findall(r'\d+', last_script)[0]
-        new_script_number = int(last_script_number) + 1
+
+        script_numbers = []
+        for script_file in all_script_files:
+            match = re.search(r'\d+', script_file)
+            if match:
+                script_number = int(match.group())
+                script_numbers.append(script_number)
+
+        if not script_numbers:
+            return 'oas1'
+        script_numbers.sort()
+        new_script_number = script_numbers[-1] + 1
         return f'oas{new_script_number}'
 
 if __name__ == "__main__":

+ 2 - 0
module/gui/qml/Component/Add.qml

@@ -50,6 +50,8 @@ FluContentDialog{
             FluTextBox{
                 id: newNameBox
                 placeholderText:"推荐:oas+number"
+//                maxLength: 20
+                validator: RegularExpressionValidator { regularExpression: /^[a-zA-Z0-9]*$/ }
             }
             FluText{
                 text: 'Copy from existing config'