Merge pull request #13 from NanGua-QWQ/main

推送一个稳定版本

eslint.config.mjs

@@ -31,7 +31,9 @@ export default defineConfig(
       'react-refresh/only-export-components': 'off',
       'react-hooks/exhaustive-deps': 'warn',
       'react-hooks/set-state-in-effect': 'off',
-      '@typescript-eslint/no-require-imports': 'off'
+      '@typescript-eslint/no-require-imports': 'off',
+      // we use TypeScript types instead of PropTypes in React components
+      'react/prop-types': 'off'
     }
   },
   eslintConfigPrettier

src/main/services/AutoScoreService.ts

@@ -418,13 +418,13 @@ export class AutoScoreService extends Service {
         // 当前触发器有匹配的学生
         if (currentRelation === 'AND') {
           // AND关系下，取交集
-          currentGroup = currentGroup.filter(student => 
+          currentGroup = currentGroup.filter((student) =>
-            result.matchedStudents!.some(matched => matched.id === student.id)
+            result.matchedStudents!.some((matched) => matched.id === student.id)
           )
         } else {
           // OR关系下，取并集
-          const newStudents = result.matchedStudents.filter(matched => 
+          const newStudents = result.matchedStudents.filter(
-            !currentGroup.some(student => student.id === matched.id)
+            (matched) => !currentGroup.some((student) => student.id === matched.id)
           )
           currentGroup = [...currentGroup, ...newStudents]
         }
@@ -439,8 +439,8 @@ export class AutoScoreService extends Service {
           if (currentRelation === 'AND') {
             // AND组结束，如果当前组不为空，则合并到结果
             if (currentGroup.length > 0) {
-              resultStudents = resultStudents.filter(student => 
+              resultStudents = resultStudents.filter((student) =>
-                currentGroup.some(groupStudent => groupStudent.id === student.id)
+                currentGroup.some((groupStudent) => groupStudent.id === student.id)
               )
             } else {
               // AND组为空，整个规则不匹配
@@ -448,8 +448,9 @@ export class AutoScoreService extends Service {
             }
           } else {
             // OR组结束，合并当前组到结果
-            const newStudents = currentGroup.filter(groupStudent => 
+            const newStudents = currentGroup.filter(
-              !resultStudents.some(resultStudent => resultStudent.id === groupStudent.id)
+              (groupStudent) =>
+                !resultStudents.some((resultStudent) => resultStudent.id === groupStudent.id)
             )
             resultStudents = [...resultStudents, ...newStudents]
           }
@@ -465,8 +466,8 @@ export class AutoScoreService extends Service {
     if (currentRelation === 'AND') {
       // AND组结束，如果当前组不为空，则合并到结果
       if (currentGroup.length > 0) {
-        resultStudents = resultStudents.filter(student => 
+        resultStudents = resultStudents.filter((student) =>
-          currentGroup.some(groupStudent => groupStudent.id === student.id)
+          currentGroup.some((groupStudent) => groupStudent.id === student.id)
         )
       } else {
         // AND组为空，整个规则不匹配
@@ -474,8 +475,9 @@ export class AutoScoreService extends Service {
       }
     } else {
       // OR组结束，合并当前组到结果
-      const newStudents = currentGroup.filter(groupStudent => 
+      const newStudents = currentGroup.filter(
-        !resultStudents.some(resultStudent => resultStudent.id === groupStudent.id)
+        (groupStudent) =>
+          !resultStudents.some((resultStudent) => resultStudent.id === groupStudent.id)
       )
       resultStudents = [...resultStudents, ...newStudents]
     }

src/main/services/HttpServerService.ts

@@ -337,9 +337,7 @@ export class HttpServerService extends Service {
       }
     })
 
-    // ww
+    // stray expression removed
-    this.app.use
-    
     // 404处理
     this.app.use((_req: Request, res: Response) => {
       res.status(404).json({
@@ -349,7 +347,8 @@ export class HttpServerService extends Service {
     })
 
     // 错误处理中间件
-    this.app.use((error: Error, _: Request, res: Response, __: NextFunction) => {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    this.app.use((error: Error, _: Request, res: Response, _next: NextFunction) => {
       this.mainCtx.logger.error(`HTTP server error: ${error.message}`)
       res.status(500).json({
         success: false,

src/renderer/src/components/AutoScoreManager.tsx

@@ -569,7 +569,7 @@ export const AutoScoreManager: React.FC = () => {
         />
       </Card>
 
-      <Card style={{ marginBottom: '24px', backgroundColor: 'var(--ss-card-bg)' }}>
+      <Card style={{ marginBottom: '24px' }}>
         <Code
           code={(() => {
             if (editingRuleId !== null) {

src/renderer/src/components/Code.tsx

@@ -3,8 +3,6 @@ import { useEffect } from 'react'
 import Prism from 'prismjs'
 import { useTheme } from '../contexts/ThemeContext'
 
-// 预先导入所有主题
-import 'prismjs/themes/prism-coy.min.css'
 import 'prismjs/themes/prism-okaidia.min.css'
 
 const Code = ({ code, language }) => {

src/renderer/src/components/TagEditorDialog.tsx

@@ -29,15 +29,8 @@ export const TagEditorDialog: React.FC<TagEditorDialogProps> = ({
 
   const themeMode = currentTheme?.mode || 'light' // 默认为 light
 
-  useEffect(() => {
+  // fetchAllTags is declared as a function so it can be called from useEffect
-    if (visible) {
+  async function fetchAllTags() {
-      setSelectedTagIds(new Set(initialTagIds))
-      setInputValue('')
-      fetchAllTags()
-    }
-  }, [visible, initialTagIds])
-
-  const fetchAllTags = async () => {
     if (!(window as any).api) return
     try {
       const res = await (window as any).api.tagsGetAll()
@@ -50,6 +43,14 @@ export const TagEditorDialog: React.FC<TagEditorDialogProps> = ({
     }
   }
 
+  useEffect(() => {
+    if (visible) {
+      setSelectedTagIds(new Set(initialTagIds))
+      setInputValue('')
+      fetchAllTags()
+    }
+  }, [visible, initialTagIds])
+
   const handleAddTag = async () => {
     const trimmed = inputValue.trim()
     if (!trimmed) return

src/renderer/src/components/com.automatically/actions/index.ts

@@ -43,7 +43,7 @@ const actionDefinitions: ActionDefinition[] = [
     description: sendNotificationDescription,
     component: SendNotificationAction,
     hasReason: sendNotificationHasReason
-  },
+  }
 ]
 
 actionDefinitions.forEach((def) => actionRegistry.register(def))

src/renderer/src/components/com.automatically/index.ts

@@ -14,8 +14,4 @@ export { default as TriggerItemComponent } from './TriggerItem'
 export { default as ActionItemComponent } from './ActionItem'
 
 export { IntervalTimeTrigger, StudentTagTrigger, RandomTimeTrigger } from './triggers'
-export {
+export { AddScoreAction, AddTagAction, SendNotificationAction } from './actions'
-  AddScoreAction,
-  AddTagAction,
-  SendNotificationAction,
-} from './actions'

src/renderer/src/components/com.automatically/triggers/RandomTimeTrigger.tsx

@@ -29,7 +29,9 @@ const RandomTimeTrigger: React.FC<TriggerComponentProps> = ({ value, onChange })
       const parsed = JSON.parse(value)
       config = { ...config, ...parsed }
     }
-  } catch {}
+  } catch (e) {
+    console.debug('RandomTimeTrigger parse error', e)
+  }
 
   const handleChange = (key: keyof RandomTimeConfig, v: any) => {
     const numV = typeof v === 'number' ? v : v ? Number(v) : undefined

src/shared/triggers/RandomTimeTrigger.ts

@@ -34,7 +34,10 @@ export const randomTimeTrigger: TriggerLogic = {
         const parsed = JSON.parse(value)
         config = { ...config, ...parsed }
       }
-    } catch {}
+    } catch (e) {
+      // swallow errors, use default config
+      console.debug('randomTimeTrigger calculateNextTime parse error', e)
+    }
 
     const minHour = config.minHour ?? 0
     const maxHour = config.maxHour ?? 23