Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release: 问卷v1.1.0发布 #112

Merged
merged 39 commits into from
Oct 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
665bd3d
fix: 修复CI潜在的检测问题 (#86)
xixiIBN5100 Oct 4, 2024
2289714
fix: 隐藏了超时问卷的提交按钮 (#88)
xixiIBN5100 Oct 5, 2024
ed9ca5e
perf: 优化复制问卷地址的baseURl (#89)
xixiIBN5100 Oct 5, 2024
20d78a5
feat: 新增黑夜模式 (#93)
mao2006 Oct 9, 2024
a6c81b5
去除了截止日期栏的清除日期叉号按钮,以修复日期为空时提交/保存问卷参数错误的问题
DumbDaiDai Oct 9, 2024
fbf89b1
修复了模态框显示后页面右边产生纵向白条的问题 (#100)
DumbDaiDai Oct 10, 2024
419e574
feat: 新增编辑问卷界面拖动操作
mao2006 Oct 10, 2024
d57c678
fix: 修复客户端多选题传参失败的问题 (#102)
xixiIBN5100 Oct 10, 2024
cd3199c
feat: 新增填空自定义正则功能
mao2006 Oct 12, 2024
afd0eeb
feat: 用户界面新增填空题正则拦截
mao2006 Oct 12, 2024
0074025
fix: 修复了拖拽后显示错误的问题
mao2006 Oct 13, 2024
dca8f88
feat: 新增问卷二维码分享
mao2006 Oct 14, 2024
eac1821
Merge pull request #104 from mao2006/dev
xixiIBN5100 Oct 14, 2024
c194cbd
去除了模态框关闭按钮成为焦点时的白色边框
DumbDaiDai Oct 14, 2024
6eeddb7
Merge pull request #99 from DumbDaiDai/feat/fixDateClearBug
xixiIBN5100 Oct 14, 2024
3293f77
feat: 新增用户答题进度保存功能
mao2006 Oct 13, 2024
4b670dd
fix: 修复了单选框其他选项未保存的问题
mao2006 Oct 15, 2024
d9d7568
fix: 修复了正则显示错误的问题
mao2006 Oct 15, 2024
25d245d
fix: 对齐正则框字间距
mao2006 Oct 15, 2024
b618a63
fix: 修复了多选框勾选状态不会保存的问题
mao2006 Oct 15, 2024
51a9926
fix: 修复了多份问卷本地存储会相互影响的问题
mao2006 Oct 15, 2024
6e95fe0
Merge pull request #107 from DumbDaiDai/fix/modalClosingButtonOutline
xixiIBN5100 Oct 15, 2024
8b2268f
feat: 新增数据展示图片预览功能
mao2006 Oct 16, 2024
6c4a6c6
Merge pull request #103 from mao2006/quit-reserve
xixiIBN5100 Oct 16, 2024
1d9ee44
fix: 修复了错误提示可能过长的问题
mao2006 Oct 16, 2024
ff00524
Merge pull request #106 from mao2006/qrCode
xixiIBN5100 Oct 16, 2024
16f291e
Merge branch 'dev' into customiseReg
xixiIBN5100 Oct 16, 2024
c86e842
Merge pull request #105 from mao2006/customiseReg
xixiIBN5100 Oct 16, 2024
be01c05
Merge pull request #108 from mao2006/previewImg
xixiIBN5100 Oct 16, 2024
bf0b829
fix: 修复了感谢页面没有适配黑夜模式的问题
mao2006 Oct 17, 2024
ecef267
fix: 修复了黑夜模式开关会随着滚动条移动的问题
mao2006 Oct 17, 2024
994e293
Merge pull request #109 from mao2006/dev
xixiIBN5100 Oct 17, 2024
03e8ec2
fix: 修改lock文件错误
xixiIBN5100 Oct 17, 2024
59b5f69
Merge branch 'zjutjh:dev' into dev
xixiIBN5100 Oct 17, 2024
7311cd2
Merge pull request #110 from xixiIBN5100/dev
xixiIBN5100 Oct 17, 2024
cb1bbe6
fix: 修复dev分支的CD功能
xixiIBN5100 Oct 17, 2024
9b926f5
Merge remote-tracking branch 'origin/dev' into dev
xixiIBN5100 Oct 17, 2024
2354f5b
Merge branch 'zjutjh:dev' into dev
xixiIBN5100 Oct 17, 2024
ed73b4c
Merge pull request #111 from xixiIBN5100/dev
xixiIBN5100 Oct 17, 2024
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
5 changes: 4 additions & 1 deletion .env.sample
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
HOST=http://sample.com
# 请求地址的baseURL
VITE_HOST=http://
# 复制问卷的baseURL
VITE_COPY_LINK=http://
7 changes: 3 additions & 4 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
name: CD
name: dev-CD

on:
push:
branches:
- main
- dev

jobs:
Expand All @@ -15,7 +14,7 @@ jobs:
- name: Check if forked
if: github.event.repository.fork == true
run: echo "This action is running on a forked repository and will not deploy." && exit 0

- name: Checkout repository
uses: actions/checkout@v2

Expand Down Expand Up @@ -49,7 +48,7 @@ jobs:
env:
SSH_PRIVATE_KEY: ${{ secrets.DEPLOY_TOKEN_DEV }}
SOURCE: "dist/"
TARGET: "/var/www/dist"
TARGET: "/var/www/qa"
ARGS: "-avzr --delete"
REMOTE_HOST: ${{ secrets.REMOTE_HOST_DEV }}
REMOTE_USER: ${{ secrets.REMOTE_USER_DEV }}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
2. clone仓库到本地
3. 切换至dev分支
4. 在本地dev分支上进行修改
5. Coding结束后运行`pnpm run lint`进行代码质量检测
5. Coding结束后运行`pnpm run lint:fix`进行代码质量检测
6. 提交修改
7. pr至组织仓库的dev分支

Expand Down
10 changes: 10 additions & 0 deletions auto-imports.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
/* eslint-disable */
/* prettier-ignore */
// @ts-nocheck
// noinspection JSUnusedGlobalSymbols
// Generated by unplugin-auto-import
// biome-ignore lint: disable
export {}
declare global {

}
29 changes: 29 additions & 0 deletions components.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/* eslint-disable */
// @ts-nocheck
// Generated by unplugin-vue-components
// Read more: https://github.com/vuejs/core/pull/3399
export {}

/* prettier-ignore */
declare module 'vue' {
export interface GlobalComponents {
ElButton: typeof import('element-plus/es')['ElButton']
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']
ElOption: typeof import('element-plus/es')['ElOption']
ElPagination: typeof import('element-plus/es')['ElPagination']
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']
ElUpload: typeof import('element-plus/es')['ElUpload']
Modal: typeof import('./src/components/Modal/index.vue')['default']
RouterLink: typeof import('vue-router')['RouterLink']
RouterView: typeof import('vue-router')['RouterView']
Skeleton: typeof import('./src/components/Skeleton/index.vue')['default']
}
}
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!doctype html>
<html lang="en" data-theme="light">
<html lang="en" data-theme="light" style="scrollbar-gutter:auto">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
Expand Down
Loading
Loading