fix: program字体放不下的问题

sql/base_db.py

@@ -97,13 +97,3 @@ class HGSDatabase(metaclass=abc.ABCMeta):
         :return:
         """
         ...
-
-
-class HGSCursor(metaclass=abc.ABCMeta):
-    @abc.abstractmethod
-    def fetchone(self):
-        ...
-
-    @abc.abstractmethod
-    def fetchall(self):
-        ...

sql/mysql_db.py

@@ -3,21 +3,10 @@ import threading
 import traceback
 
 from conf import mysql_url, mysql_name, mysql_passwd
-from .base_db import HGSDatabase, DBCloseException, HGSCursor
+from .base_db import HGSDatabase, DBCloseException
 from tool.type_ import *
 
 
-class MySQLCursor(HGSCursor):
-    def __init__(self, cursor: pymysql.cursors.Cursor):
-        self._cursor: pymysql.cursors.Cursor = cursor
-
-    def fetchall(self):
-        return self._cursor.fetchall()
-
-    def fetchone(self):
-        return self._cursor.fetchone()
-
-
 class MysqlDB(HGSDatabase):
     def __init__(self, host: str = mysql_url, name: str = mysql_name, passwd: str = mysql_passwd):
         super(MysqlDB, self).__init__(host, name, passwd)
@@ -25,8 +14,7 @@ class MysqlDB(HGSDatabase):
             self._db = pymysql.connect(user=self._name, password=self._passwd, host=self._host, database="hgssystem")
         except pymysql.err.OperationalError:
             raise
-        self._cursor: pymysql.cursors.Cursor = self._db.cursor()
-        self._mysql_cursor = MySQLCursor(self._cursor)
+        self._cursor = self._db.cursor()
         self._lock = threading.RLock()
 
     def close(self):
@@ -36,7 +24,6 @@ class MysqlDB(HGSDatabase):
             self._db.close()
         self._db = None
         self._cursor = None
-        self._mysql_cursor = None
         self._lock = None
 
     def is_connect(self) -> bool:
@@ -44,10 +31,10 @@ class MysqlDB(HGSDatabase):
             return False
         return True
 
-    def get_cursor(self) -> HGSCursor:
+    def get_cursor(self) -> pymysql.cursors.Cursor:
         if self._cursor is None or self._db is None:
             raise DBCloseException
-        return self._mysql_cursor
+        return self._cursor
 
     def search(self, columns: List[str], table: str,
                where: Union[str, List[str]] = None,
@@ -110,7 +97,7 @@ class MysqlDB(HGSDatabase):
 
         return self.__done(f"UPDATE {table} SET {kw_str} WHERE {where};")
 
-    def __search(self, sql) -> Union[None, HGSCursor]:
+    def __search(self, sql) -> Union[None, pymysql.cursors.Cursor]:
         if self._cursor is None or self._db is None:
             raise DBCloseException
 
@@ -123,9 +110,9 @@ class MysqlDB(HGSDatabase):
             return None
         finally:
             self._lock.release()  # 释放锁
-        return self._mysql_cursor
+        return self._cursor
 
-    def __done(self, sql) -> Union[None, HGSCursor]:
+    def __done(self, sql) -> Union[None, pymysql.cursors.Cursor]:
         if self._cursor is None or self._db is None:
             raise DBCloseException
 
@@ -140,4 +127,4 @@ class MysqlDB(HGSDatabase):
         finally:
             self._db.commit()
             self._lock.release()
-        return self._mysql_cursor
+        return self._cursor

tk_ui/admin_program.py

@@ -329,7 +329,7 @@ class CreateGarbageProgram(AdminProgram):
         self.enter_frame.place(relx=0.2, rely=0.3, relwidth=0.6, relheight=0.17)
 
         height = 0.1
-        for lb, text, enter, var in zip(self.title, ["数量:", "二维码导出位置:"], self.enter, self.var):
+        for lb, text, enter, var in zip(self.title, ["数量:", "导出位置:"], self.enter, self.var):
             lb['font'] = title_font
             lb['text'] = text
             lb['bg'] = "#b69968"

tk_ui/ranking.py

@@ -36,6 +36,9 @@ class RankingStationBase(metaclass=abc.ABCMeta):
         """
         limit = self.rank_count * self.limit_n
         offset = self.offset + limit * offset  # offset为0表示不移动, 1表示向前, -1表示向后
+        if offset < 0:
+            return False, []
+
         cur = self._db.search(columns=['UserID', 'Name', 'Score', 'Reputation'],
                               table='user',
                               where='IsManager=0',