Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
144 commits
Select commit Hold shift + click to select a range
5409167
refactor(vote): separate vote from questionnaire
xixiIBN5100 Jan 3, 2025
929f818
refactor(vote): add vote components
xixiIBN5100 Jan 5, 2025
02ebc70
feat(eslint): add eslint rule and fix errors
xixiIBN5100 Jan 5, 2025
196ba15
Merge pull request #127 from xixiIBN5100/dev
xixiIBN5100 Jan 5, 2025
41525ab
Merge branch 'dev' into refactor/vote
xixiIBN5100 Jan 5, 2025
64c0345
fix(eslint): eslint error
xixiIBN5100 Jan 5, 2025
8b0a3c5
refactor(DetailInfo): add question logic
xixiIBN5100 Jan 9, 2025
02dd5d8
fix: eslint error
xixiIBN5100 Jan 9, 2025
3a86acc
refactor(inputQues): upgrade edit performance
xixiIBN5100 Jan 12, 2025
523d92a
perf (menu): fix menu width
xixiIBN5100 Jan 25, 2025
5e5d38b
Merge pull request #126 from xixiIBN5100/refactor/vote
xixiIBN5100 Jan 25, 2025
2271ddb
style: 问卷创建样式
mao2006 Jan 26, 2025
70ffed3
Merge pull request #130 from mao2006/style/list-border
xixiIBN5100 Jan 26, 2025
ce3e7ee
perf(home): adapt the status 3
xixiIBN5100 Jan 26, 2025
49de08c
Merge branch 'zjutjh:dev' into dev
xixiIBN5100 Jan 26, 2025
443d5c6
perf(home): change status number to enum
xixiIBN5100 Jan 26, 2025
98a1fc7
Merge remote-tracking branch 'origin/dev' into dev
xixiIBN5100 Jan 26, 2025
4e7e36b
Merge pull request #131 from xixiIBN5100/dev
xixiIBN5100 Jan 27, 2025
b946f19
refactor(editQues): Decouple Ques setting
xixiIBN5100 Jan 27, 2025
eb04f0d
Merge pull request #133 from xixiIBN5100/refactor/vote
xixiIBN5100 Jan 27, 2025
5e80e4a
refactor: 抽离创建问卷中间部分
mao2006 Jan 27, 2025
1b7dd37
Merge pull request #132 from mao2006/style/list-border
xixiIBN5100 Jan 27, 2025
b832ebb
refactor(editQues): add switch function
xixiIBN5100 Jan 31, 2025
a563f3d
Merge pull request #134 from xixiIBN5100/refactor/vote
xixiIBN5100 Jan 31, 2025
4a045d8
refactor(editQues): export initSchema and QuesReducer Operation
xixiIBN5100 Feb 1, 2025
2a9d2e7
Merge pull request #135 from xixiIBN5100/refactor/vote
xixiIBN5100 Feb 3, 2025
66fe29a
Merge branch 'zjutjh:main' into refactor/vote
xixiIBN5100 Feb 3, 2025
f34d396
refactor(editQues): export baseConfigReducer Operation
xixiIBN5100 Feb 3, 2025
e5b5aab
perf(edit): simplify baseConfig export
xixiIBN5100 Feb 5, 2025
f178696
Merge pull request #136 from xixiIBN5100/refactor/vote
xixiIBN5100 Feb 5, 2025
28a01a1
perf(edit): delete baseConfig in edit.ts
xixiIBN5100 Feb 5, 2025
460e61e
Merge pull request #137 from xixiIBN5100/refactor/vote
xixiIBN5100 Feb 5, 2025
dcaa9ed
refactor(edit): export add different types question function
xixiIBN5100 Feb 7, 2025
7587c6b
fix(edit): add ref in QuesList
xixiIBN5100 Feb 7, 2025
0fb5415
perf(edit): decouple quesSetMap
xixiIBN5100 Feb 8, 2025
1cae55a
fix(edit): spell mistake
xixiIBN5100 Feb 8, 2025
83a780e
Merge pull request #138 from xixiIBN5100/refactor/vote
xixiIBN5100 Feb 8, 2025
ddb2812
refactor: 提取activeSerial相关逻辑到父组件
mao2006 Feb 10, 2025
4c453d1
feat: 初步适配新schema
mao2006 Feb 10, 2025
40c9459
style: 引入QuesItemType减少数字直接暴露
mao2006 Feb 10, 2025
dc87ab0
Merge pull request #140 from mao2006/feat/right-tools
xixiIBN5100 Feb 10, 2025
e9b541e
refactor: 抽离activeSerial相关逻辑到store
mao2006 Feb 11, 2025
d6bac70
feat: 创建页面右侧工具栏
mao2006 Feb 18, 2025
999519e
fix: 删除无效引入
mao2006 Feb 18, 2025
f5f72ab
style: 抽离基础正则部分
mao2006 Feb 18, 2025
dd3f97b
perf(linkCopy): copy link support http
xixiIBN5100 Feb 19, 2025
c904996
fix(ci): add vue-eslint-parser
xixiIBN5100 Feb 19, 2025
8238285
feat:新增问卷基础设置组件2.0
WenSanCoder Feb 19, 2025
3823fd1
perf(copyLink): 借助 Vueuse 实现 copyLink
xixiIBN5100 Feb 19, 2025
f4193a8
fix(ci): delete no use ref
xixiIBN5100 Feb 19, 2025
da70479
refactor: 使用storeToRefs替代toRefs
mao2006 Feb 20, 2025
04b4e34
refactor: 替代setActive setter
mao2006 Feb 20, 2025
5be75d0
Merge pull request #142 from xixiIBN5100/perf/home
xixiIBN5100 Feb 20, 2025
e28d30e
Merge pull request #141 from mao2006/refactor/create-questionnaire
xixiIBN5100 Feb 20, 2025
b05c229
feat: 问题移动&删除
mao2006 Feb 23, 2025
918a968
feat: 单选/多选特殊编辑
mao2006 Feb 23, 2025
42a6f7a
feat: 新增问卷基础设置组件3.0
WenSanCoder Feb 23, 2025
f4c436e
fix:将所有“登陆”(land)改为“登录”(login)
DumbDaiDai Feb 25, 2025
fc34de2
Merge pull request #145 from DumbDaiDai/fix/将所有“登陆”(land)改为“登录”(login)
xixiIBN5100 Feb 25, 2025
c78f60e
feat:更新QuestionnaireSettings组件以使用Pinia store
WenSanCoder Feb 25, 2025
a6b19a5
feat:新增删除答卷功能
DumbDaiDai Feb 25, 2025
8e44790
feat: activeSerial跟随变化
mao2006 Feb 27, 2025
d063bae
feat: 删除选项后清空右侧工具栏
mao2006 Feb 27, 2025
7c85a4d
fix: 请求默认行为导致的显示错误
mao2006 Feb 27, 2025
1279cf9
fix(ci):将v-for提到class前
DumbDaiDai Feb 27, 2025
db53741
perf:更改删除提示的字体样式
DumbDaiDai Feb 27, 2025
1fd5cac
Merge pull request #146 from DumbDaiDai/feat/新增删除答卷功能
xixiIBN5100 Feb 27, 2025
1281474
feat:创建问卷api
mao2006 Mar 2, 2025
74a91fc
fix: 改用lodash-es并修正计算结果
mao2006 Mar 2, 2025
91c94c9
Merge pull request #144 from mao2006/feat/edit-questionnaire
xixiIBN5100 Mar 2, 2025
80c5164
feat:修改了问卷设置界面的显示逻辑
WenSanCoder Mar 2, 2025
101e7a6
Merge branch 'refactor/editQuestionList' into refactor/editQuestionList
xixiIBN5100 Mar 2, 2025
4f57ff5
Merge pull request #143 from WenSanCoder/refactor/editQuestionList
xixiIBN5100 Mar 2, 2025
11c613b
refactor(edit): 新建问卷
xixiIBN5100 Mar 5, 2025
0c07a3c
refactor(render): static schema change
xixiIBN5100 Mar 5, 2025
566767a
Merge pull request #147 from xixiIBN5100/refactor/editQues
xixiIBN5100 Mar 5, 2025
80a6c3b
refactor(render): checkAnswer
xixiIBN5100 Mar 5, 2025
c2da94f
fix: 修复响应式丢失导致的数据不同步
mao2006 Mar 6, 2025
75b2383
Merge pull request #148 from mao2006/fix/unexpected-data
xixiIBN5100 Mar 6, 2025
da63a3f
Merge branch 'refactor/editQuestionList' into refactor/editQuestionList
xixiIBN5100 Mar 6, 2025
d683a44
Merge pull request #149 from xixiIBN5100/refactor/editQuestionList
xixiIBN5100 Mar 6, 2025
244971f
refactor(render): checkAnswer
xixiIBN5100 Mar 6, 2025
50cafb2
Merge branch 'zjutjh:refactor/editQuestionList' into refactor/editQue…
xixiIBN5100 Mar 6, 2025
e1e17d2
fix: 修复了响应式连接丢失的问题
mao2006 Mar 7, 2025
e20c7e8
Merge pull request #150 from mao2006/fix/out-of-sync
mao2006 Mar 7, 2025
736c093
Merge branch 'zjutjh:refactor/editQuestionList' into refactor/editQue…
xixiIBN5100 Mar 8, 2025
53758b2
Merge branch 'refactor/editQuestionList' of https://github.com/xixiIB…
xixiIBN5100 Mar 8, 2025
fc807e7
fix: 增加选项的响应式丢失问题
mao2006 Mar 8, 2025
73bb017
feat: 发布问卷
mao2006 Mar 8, 2025
92a25a8
Merge pull request #151 from mao2006/feat/release-questionnaire
xixiIBN5100 Mar 8, 2025
d415ae3
Merge branch 'zjutjh:refactor/editQuestionList' into refactor/editQue…
xixiIBN5100 Mar 8, 2025
5770bba
Merge branch 'refactor/editQuestionList' of https://github.com/xixiIB…
xixiIBN5100 Mar 8, 2025
cfc8880
fix: list operation
xixiIBN5100 Mar 9, 2025
7466da0
refactor: vote edit question list
xixiIBN5100 Mar 9, 2025
97de4d9
Merge pull request #152 from xixiIBN5100/refactor/editQuestionList
xixiIBN5100 Mar 9, 2025
0cad6e3
Merge branch 'dev' into refactor/editQuestionList
xixiIBN5100 Mar 9, 2025
15a3538
Merge pull request #153 from zjutjh/refactor/editQuestionList
xixiIBN5100 Mar 9, 2025
1246756
Merge branch 'dev' of https://github.com/xixiIBN5100/JingHong-Questio…
xixiIBN5100 Mar 9, 2025
0291a50
fix: eslint error
xixiIBN5100 Mar 10, 2025
c47245c
fix: delete pnpm config
xixiIBN5100 Mar 10, 2025
103366c
Merge pull request #154 from xixiIBN5100/dev
xixiIBN5100 Mar 10, 2025
0975fe2
perf: render vote
xixiIBN5100 Mar 12, 2025
8410c58
style: 删除重构过程中产生的无效字段
mao2006 Mar 12, 2025
d851a96
Merge pull request #155 from mao2006/refactor/trash-cleanup
mao2006 Mar 13, 2025
8f83090
perf: checkbox max potion limit
xixiIBN5100 Mar 15, 2025
08af4fb
Merge pull request #157 from zjutjh/refactor/editQuestionList
xixiIBN5100 Mar 15, 2025
5bdd94a
Merge pull request #156 from xixiIBN5100/perf/render
xixiIBN5100 Mar 15, 2025
be33495
Merge branch 'dev' of https://github.com/xixiIBN5100/JingHong-Questio…
xixiIBN5100 Mar 15, 2025
83fe2db
perf: render width
xixiIBN5100 Mar 16, 2025
e31fc4b
Merge pull request #158 from xixiIBN5100/dev
xixiIBN5100 Mar 16, 2025
89a0293
fix: 多选其他选项遗留问题
mao2006 Mar 16, 2025
1e597b2
Merge pull request #159 from mao2006/fix/ans-arr
xixiIBN5100 Mar 16, 2025
76ec4eb
Merge branch 'dev' of https://github.com/xixiIBN5100/JingHong-Questio…
xixiIBN5100 Mar 16, 2025
1ff3469
fix: [Render]禁用多选框内容为空的其他选项的选中
mao2006 Mar 20, 2025
29c525e
Merge pull request #160 from mao2006/fix/other-logic
mao2006 Mar 20, 2025
7db9c43
fix: [Render]修正表单校验和正方认证顺序
mao2006 Mar 20, 2025
ee99e99
Merge pull request #161 from mao2006/fix/verification-process
xixiIBN5100 Mar 20, 2025
6390943
Merge branch 'dev' of https://github.com/xixiIBN5100/JingHong-Questio…
xixiIBN5100 Mar 20, 2025
191d277
fix: 多选框选项限制
mao2006 Mar 21, 2025
ec86b9f
perf: confirm modal
xixiIBN5100 Mar 24, 2025
52db700
Merge pull request #163 from xixiIBN5100/dev
xixiIBN5100 Mar 24, 2025
a31da72
fix: unused function
mao2006 Mar 24, 2025
3dce431
Merge pull request #162 from mao2006/fix/checkbox-limit
mao2006 Mar 24, 2025
6a0eb83
fix: 错误使用发布问卷接口保存
mao2006 Mar 24, 2025
545ff2d
Merge pull request #164 from mao2006/fix/edit-net-error
xixiIBN5100 Mar 25, 2025
7f3d9f3
Merge branch 'dev' of https://github.com/xixiIBN5100/JingHong-Questio…
xixiIBN5100 Mar 26, 2025
6491e26
fix: 发布问卷逻辑
mao2006 Mar 27, 2025
23a343e
Merge pull request #165 from mao2006/fix/posting-logic
xixiIBN5100 Mar 27, 2025
ce38779
Merge branch 'dev' of https://github.com/xixiIBN5100/JingHong-Questio…
xixiIBN5100 Mar 27, 2025
d2d8eee
perf: vote img adapte iphone
xixiIBN5100 May 16, 2025
bbb6394
fix: lint error
xixiIBN5100 May 16, 2025
73b44bb
chore: gitignore zip
xixiIBN5100 May 16, 2025
a33e274
Merge pull request #166 from xixiIBN5100/dev
xixiIBN5100 May 16, 2025
e82cf17
fix:修复了创建问卷时保存草稿API错误的问题
DumbDaiDai May 16, 2025
d337220
Merge pull request #168 from DumbDaiDai/fix/createQuesApiBug
xixiIBN5100 May 18, 2025
029577d
feat: 投票是否本科生可选
mao2006 Jul 14, 2025
deb3078
feat: 问卷是否本科生可选
mao2006 Jul 14, 2025
1036095
feat: 仅本科生提示
mao2006 Jul 14, 2025
d851dd9
fix: 字段判断
mao2006 Aug 4, 2025
7e8a23d
fix: 开发遗留/注释问题
mao2006 Aug 4, 2025
3c2f32e
Merge pull request #170 from mao2006/feat/undergrad-only
mao2006 Aug 4, 2025
b53b39f
fix: 路由错误 (#171)
mao2006 Aug 9, 2025
e5656a8
fix: 琐碎问题 (#172)
mao2006 Aug 9, 2025
fc72787
fix: 分享链接错误 (#173)
mao2006 Aug 9, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions .eslintrc.cjs

This file was deleted.

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,4 @@ uploadToQiniu.js
*.njsproj
*.sln
*.sw?
*.zip
4 changes: 4 additions & 0 deletions components.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,24 @@ export {}
declare module 'vue' {
export interface GlobalComponents {
ElButton: typeof import('element-plus/es')['ElButton']
ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
ElDialog: typeof import('element-plus/es')['ElDialog']
ElDivider: typeof import('element-plus/es')['ElDivider']
ElIcon: typeof import('element-plus/es')['ElIcon']
ElImage: typeof import('element-plus/es')['ElImage']
ElInput: typeof import('element-plus/es')['ElInput']
ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
ElOption: typeof import('element-plus/es')['ElOption']
ElPagination: typeof import('element-plus/es')['ElPagination']
ElRadio: typeof import('element-plus/es')['ElRadio']
ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
ElSelect: typeof import('element-plus/es')['ElSelect']
ElSkeleton: typeof import('element-plus/es')['ElSkeleton']
ElSwitch: typeof import('element-plus/es')['ElSwitch']
ElTag: typeof import('element-plus/es')['ElTag']
ElTooltip: typeof import('element-plus/es')['ElTooltip']
ElUpload: typeof import('element-plus/es')['ElUpload']
Modal: typeof import('./src/components/Modal/index.vue')['default']
RouterLink: typeof import('vue-router')['RouterLink']
Expand Down
22 changes: 22 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import zjutjh from "@zjutjh/eslint-config";

export default [
...await zjutjh({
overrides: {
vue: {
"vue/multi-word-component-names": "off",
"vue/require-v-for-key": "off"
}
}
}),
{
name: "local/ignores",
ignores: [
"dist",
"tailwind.config.cjs",
"components.d.ts",
"auto-imports.d.ts",
"uploadToQiniu.js"
]
}
];
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no,viewport-fit=cover">
<title>精弘网络问卷系统</title>
</head>
<body>
Expand Down
19 changes: 16 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,25 @@
"test:unit": "vitest",
"build-only": "vite build",
"type-check": "vue-tsc --build --force",
"lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --ignore-path .gitignore",
"lint:fix": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
"lint": "eslint",
"lint:fix": "eslint --fix",
"format": "prettier --write src/"
},
"dependencies": {
"@element-plus/icons-vue": "^2.3.1",
"@stylistic/eslint-plugin": "^2.9.0",
"@vue/eslint-config-typescript": "^14.0.0",
"@vueuse/core": "^12.7.0",
"axios": "^1.7.3",
"crypto-js": "^4.2.0",
"daisyui": "^4.12.10",
"element-plus": "^2.7.8",
"eslint": "^9.12.0",
"eslint-import-resolver-typescript": "^3.6.3",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-vue": "^9.28.0",
"globals": "^15.14.0",
"lodash-es": "^4.17.21",
"naive-ui": "^2.39.0",
"pinia": "^2.1.7",
"pinia-plugin-persistedstate": "^3.2.1",
Expand All @@ -38,12 +47,15 @@
"@rushstack/eslint-patch": "^1.8.0",
"@tsconfig/node20": "^20.1.4",
"@types/jsdom": "^21.1.7",
"@types/lodash": "^4.17.16",
"@types/lodash-es": "^4.17.12",
"@types/node": "^20.12.8",
"@vitejs/plugin-vue": "^5.0.4",
"@vue/eslint-config-prettier": "^9.0.0",
"@vue/eslint-config-typescript": "^13.0.0",
"@vue/eslint-config-typescript": "^14.0.0",
"@vue/test-utils": "^2.4.6",
"@vue/tsconfig": "^0.5.1",
"@zjutjh/eslint-config": "^0.2.0",
"autoprefixer": "^10.4.20",
"eslint": "^8.57.0",
"eslint-plugin-vue": "^9.23.0",
Expand All @@ -54,6 +66,7 @@
"typescript": "~5.4.5",
"vite": "^5.2.11",
"vitest": "^1.6.0",
"vue-eslint-parser": "^9.4.3",
"vue-tsc": "^1.8.27"
}
}
Loading