From 282c9539ec0b4754989e2373c27e3e7b621c12cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BA=90=E6=96=87=E9=9B=A8?=
 <41315874+fumiama@users.noreply.github.com>
Date: Fri, 21 Apr 2023 01:11:46 +0800
Subject: [PATCH] finish getUserRegex

---
 backend/global/regex.go                       |  4 ++--
 frontend/vben/src/api/dashboard/index.ts      |  7 ++++++-
 .../model/{workbenchModel.ts => model.ts}     | 12 ++++++++++++
 .../vben/src/views/dashboard/regex/data.ts    | 19 +++++++++++--------
 .../workbench/components/DynamicInfo.vue      |  2 +-
 5 files changed, 32 insertions(+), 12 deletions(-)
 rename frontend/vben/src/api/dashboard/model/{workbenchModel.ts => model.ts} (65%)

diff --git a/backend/global/regex.go b/backend/global/regex.go
index 3f408c0..f85138b 100644
--- a/backend/global/regex.go
+++ b/backend/global/regex.go
@@ -79,9 +79,9 @@ func (u *UserDatabase) GetUserRegex(id int) (*Regex, error) {
 	reg, _ := sql.Find[Regex](&u.db, UserTableRegex, "WHERE ID="+strconv.Itoa(id))
 	u.mu.RUnlock()
 	reg.ID = *user.ID
-	rf := reflect.ValueOf(reg)
+	rf := reflect.ValueOf(&reg).Elem()
 	defaultrf := reflect.ValueOf(GetDefaultRegex())
-	for i := 0; i < rf.NumField(); i++ {
+	for i := 1; i < rf.NumField(); i++ {
 		if rf.Field(i).IsZero() {
 			rf.Field(i).Set(defaultrf.Field(i))
 		}
diff --git a/frontend/vben/src/api/dashboard/index.ts b/frontend/vben/src/api/dashboard/index.ts
index 28cb204..61556f0 100644
--- a/frontend/vben/src/api/dashboard/index.ts
+++ b/frontend/vben/src/api/dashboard/index.ts
@@ -1,11 +1,12 @@
 import { defHttp } from '/@/utils/http/axios'
-import { MessageItem } from './model/workbenchModel'
+import { MessageItem, UserRegex } from './model/model'
 
 enum Api {
   GetMessageList = '/getMessageList',
   AcceptMessage = '/acceptMessage',
   DeleteMessage = '/delMessage',
   GetAnnualVisits = '/getAnnualVisits',
+  GetUserRegex = '/getUserRegex',
 }
 
 export const getAnnualVisits = () => {
@@ -23,3 +24,7 @@ export const acceptMessage = (id: number) => {
 export const deleteMessage = (id: number) => {
   return defHttp.get<string>({ url: Api.DeleteMessage, params: { id } })
 }
+
+export const getUserRegex = () => {
+  return defHttp.get<UserRegex>({ url: Api.GetUserRegex })
+}
diff --git a/frontend/vben/src/api/dashboard/model/workbenchModel.ts b/frontend/vben/src/api/dashboard/model/model.ts
similarity index 65%
rename from frontend/vben/src/api/dashboard/model/workbenchModel.ts
rename to frontend/vben/src/api/dashboard/model/model.ts
index fa507c8..4bff249 100644
--- a/frontend/vben/src/api/dashboard/model/workbenchModel.ts
+++ b/frontend/vben/src/api/dashboard/model/model.ts
@@ -15,3 +15,15 @@ export interface MessageItem {
   text: string
   type: MessageTypeEnum
 }
+
+export interface UserRegex {
+  ID: number
+  Title: string
+  Class: string
+  OpenCl: string
+  Date: string
+  Time: string
+  Rate: string
+  Major: string
+  Sub: string
+}
diff --git a/frontend/vben/src/views/dashboard/regex/data.ts b/frontend/vben/src/views/dashboard/regex/data.ts
index e7d2000..55dec1c 100644
--- a/frontend/vben/src/views/dashboard/regex/data.ts
+++ b/frontend/vben/src/views/dashboard/regex/data.ts
@@ -1,63 +1,66 @@
 import { FormSchema } from '/@/components/Form'
+import { getUserRegex } from '/@/api/dashboard'
 const colProps = {
   span: 24,
 }
 
+const userregex = await getUserRegex()
+
 export const schemas: FormSchema[] = [
   {
     field: 'title',
     component: 'Input',
     colProps,
     label: '试卷标题',
-    defaultValue: 'more 吗',
+    defaultValue: userregex.Title,
   },
   {
     field: 'class',
     component: 'Input',
     colProps,
     label: '课程名称',
-    defaultValue: 'more 吗',
+    defaultValue: userregex.Class,
   },
   {
     field: 'opencl',
     component: 'Input',
     colProps,
     label: '开/闭卷',
-    defaultValue: 'more 吗',
+    defaultValue: userregex.OpenCl,
   },
   {
     field: 'date',
     component: 'Input',
     colProps,
     label: '考试日期',
-    defaultValue: 'more 吗',
+    defaultValue: userregex.Date,
   },
   {
     field: 'time',
     component: 'Input',
     colProps,
     label: '考试时长',
-    defaultValue: 'more 吗',
+    defaultValue: userregex.Time,
   },
   {
     field: 'rate',
     component: 'Input',
     colProps,
     label: '成绩占比',
-    defaultValue: 'more 吗',
+    defaultValue: userregex.Rate,
   },
   {
     field: 'major',
     component: 'Input',
     colProps,
     label: '大题题号',
-    defaultValue: 'more 吗',
+    defaultValue: userregex.Major,
   },
   {
     field: 'sub',
     component: 'Input',
     colProps,
     label: '小题题号',
-    defaultValue: 'more 吗',
+    defaultValue: userregex.Sub,
   },
 ]
diff --git a/frontend/vben/src/views/dashboard/workbench/components/DynamicInfo.vue b/frontend/vben/src/views/dashboard/workbench/components/DynamicInfo.vue
index 4826f08..2d7d555 100644
--- a/frontend/vben/src/views/dashboard/workbench/components/DynamicInfo.vue
+++ b/frontend/vben/src/views/dashboard/workbench/components/DynamicInfo.vue
@@ -36,7 +36,7 @@
   import { Card, List } from 'ant-design-vue'
   import { getMessageList, acceptMessage, deleteMessage } from '/@/api/dashboard/index'
   import { useMessage } from '/@/hooks/web/useMessage'
-  import { MessageTypeEnum, MessageItem } from '/@/api/dashboard/model/workbenchModel'
+  import { MessageTypeEnum, MessageItem } from '../../../../api/dashboard/model/model.js'
   import { Avatar } from 'ant-design-vue'
   import headerImg from '/@/assets/images/header.jpg'