Skip to content

合并 dev → main：重构投票与问卷模块、上线“本科生可选”开关、优化首页与图片适配，修复发布/草稿/校验等流程问题。#174

Merged
mao2006 merged 144 commits intomainfrom
dev
Aug 10, 2025
Merged

合并 dev → main：重构投票与问卷模块、上线“本科生可选”开关、优化首页与图片适配，修复发布/草稿/校验等流程问题。#174
mao2006 merged 144 commits intomainfrom
dev

Conversation

@mao2006
Copy link
Collaborator

@mao2006 mao2006 commented Aug 10, 2025 •
edited
Loading

主要变更

  • 重构：将投票模块从问卷模块中解耦，抽离创建问卷的中间区块；导出/拆分 editQues 相关 reducer 与 initSchema，简化 baseConfig 导出。
  • 功能：新增“问卷/投票是否本科生可选”的开关项。
  • 性能/体验：首页状态枚举化；菜单宽度、确认弹窗交互优化；投票图片在 iPhone 的适配。
  • 代码质量：新增并修复 ESLint 规则与问题，移除未使用函数，补充 .gitignore。
  • Bug 修复：发布问卷逻辑、误用“发布接口保存”、创建问卷保存草稿 API 错误、多选框选项限制、校验与正方认证顺序、渲染时禁用空“其他”选项等。

测试与影响

  • 影响范围：问卷编辑（含 schema/baseConfig）、发布流程、首页状态展示、投票图片展示。
  • 已在开发/测试环境验证关键流程（创建/保存草稿/发布、投票与权限开关、首页展示）正常。

xixiIBN5100 and others added 30 commits January 3, 2025 17:09
@xixiIBN5100
refactor(vote): separate vote from questionnaire
5409167
@xixiIBN5100
refactor(vote): add vote components
929f818
@xixiIBN5100
feat(eslint): add eslint rule and fix errors
02ebc70
@xixiIBN5100
Merge pull request #127 from xixiIBN5100/dev
196ba15 
feat(eslint): add eslint rule and fix errors
@xixiIBN5100
Merge branch 'dev' into refactor/vote
41525ab
@xixiIBN5100
fix(eslint): eslint error
64c0345
@xixiIBN5100
refactor(DetailInfo): add question logic
8b0a3c5
@xixiIBN5100
fix: eslint error
02dd5d8
@xixiIBN5100
refactor(inputQues): upgrade edit performance
3a86acc
@xixiIBN5100
perf (menu): fix menu width
523d92a
@xixiIBN5100
Merge pull request #126 from xixiIBN5100/refactor/vote
5e5d38b 
refactor(editQuestionnaire): logic upgrade
@mao2006
style: 问卷创建样式
2271ddb
@xixiIBN5100
Merge pull request #130 from mao2006/style/list-border
70ffed3 
perf(addQues): 问卷创建样式
@xixiIBN5100
perf(home): adapt the status 3
ce3e7ee
@xixiIBN5100
Merge branch 'zjutjh:dev' into dev
49de08c
@xixiIBN5100
perf(home): change status number to enum
443d5c6
@xixiIBN5100
Merge remote-tracking branch 'origin/dev' into dev
98a1fc7
@xixiIBN5100
Merge pull request #131 from xixiIBN5100/dev
4e7e36b 
perf(home): adapt the expired status
@xixiIBN5100
refactor(editQues): Decouple Ques setting
b946f19
@xixiIBN5100
Merge pull request #133 from xixiIBN5100/refactor/vote
eb04f0d 
refactor(editQues): Decouple Ques setting
@mao2006
refactor: 抽离创建问卷中间部分
5e80e4a
@xixiIBN5100
Merge pull request #132 from mao2006/style/list-border
1b7dd37 
refactor: 抽离创建问卷中间部分
@xixiIBN5100
refactor(editQues): add switch function
b832ebb
@xixiIBN5100
Merge pull request #134 from xixiIBN5100/refactor/vote
a563f3d 
refactor(editQues): add switch function
@xixiIBN5100
refactor(editQues): export initSchema and QuesReducer Operation
4a045d8
@xixiIBN5100
Merge pull request #135 from xixiIBN5100/refactor/vote
2a9d2e7 
refactor(editQues): export initSchema and QuesReducer Operation
@xixiIBN5100
Merge branch 'zjutjh:main' into refactor/vote
66fe29a
@xixiIBN5100
refactor(editQues): export baseConfigReducer Operation
f34d396
@xixiIBN5100
perf(edit): simplify baseConfig export
e5b5aab
@xixiIBN5100
Merge pull request #136 from xixiIBN5100/refactor/vote
f178696 
Refactor(editQues): export baseConfigReducer Operation
xixiIBN5100 and others added 28 commits March 20, 2025 20:10
@xixiIBN5100
Merge pull request #161 from mao2006/fix/verification-process
ee99e99 
fix: [Render]修正表单校验和正方认证顺序
@xixiIBN5100
Merge branch 'dev' of https://github.com/xixiIBN5100/JingHong-Questio…
6390943 
…nnaire into dev
@mao2006
fix: 多选框选项限制
191d277
@xixiIBN5100
perf: confirm modal
ec86b9f
@xixiIBN5100
Merge pull request #163 from xixiIBN5100/dev
52db700 
perf: confirm modal
@mao2006
fix: unused function
a31da72
@mao2006
Merge pull request #162 from mao2006/fix/checkbox-limit
3dce431 
fix: 多选框选项限制
@mao2006
fix: 错误使用发布问卷接口保存
6a0eb83
@xixiIBN5100
Merge pull request #164 from mao2006/fix/edit-net-error
545ff2d 
fix: 错误使用发布问卷接口保存
@xixiIBN5100
Merge branch 'dev' of https://github.com/xixiIBN5100/JingHong-Questio…
7f3d9f3 
…nnaire into dev
@mao2006
fix: 发布问卷逻辑
6491e26
@xixiIBN5100
Merge pull request #165 from mao2006/fix/posting-logic
23a343e 
fix: 发布问卷逻辑
@xixiIBN5100
Merge branch 'dev' of https://github.com/xixiIBN5100/JingHong-Questio…
ce38779 
…nnaire into dev
@xixiIBN5100
perf: vote img adapte iphone
d2d8eee
@xixiIBN5100
fix: lint error
bbb6394
@xixiIBN5100
chore: gitignore zip
73b44bb
@xixiIBN5100
Merge pull request #166 from xixiIBN5100/dev
a33e274 
perf: vote img adapte iphone
@DumbDaiDai
fix:修复了创建问卷时保存草稿API错误的问题
e82cf17
@xixiIBN5100
Merge pull request #168 from DumbDaiDai/fix/createQuesApiBug
d337220 
fix:修复了创建问卷时保存草稿API错误的问题
@mao2006
feat: 投票是否本科生可选
029577d
@mao2006
feat: 问卷是否本科生可选
deb3078
@mao2006
feat: 仅本科生提示
1036095
@mao2006
fix: 字段判断
d851dd9
@mao2006
fix: 开发遗留/注释问题
7e8a23d
@mao2006
Merge pull request #170 from mao2006/feat/undergrad-only
3c2f32e 
FEAT: 是否验证/本科生
@mao2006
fix: 路由错误 (#171)
b53b39f
@mao2006
fix: 琐碎问题 (#172)
e5656a8 
* fix: 路由错误

* feat: 日期默认值

* fix: 引导输入框失效

* fix: 统一验证请求

* feat: 投票日期默认值
@mao2006
fix: 分享链接错误 (#173)
fc72787 
* fix: 路由错误

* feat: 日期默认值

* fix: 引导输入框失效

* fix: 统一验证请求

* feat: 投票日期默认值

* fix: 分享链接错误
@mao2006 mao2006 changed the title Dev 合并 dev → main：重构投票与问卷模块、上线“本科生可选”开关、优化首页与图片适配，修复发布/草稿/校验等流程问题。 Aug 10, 2025
@mao2006 mao2006 merged commit 377f266 into main Aug 10, 2025
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@mao2006 @xixiIBN5100 @WenSanCoder @DumbDaiDai