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

【北大开源实践】选项限制 #285

Open
wants to merge 126 commits into
base: feature/peking
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 122 commits
Commits
Show all changes
126 commits
Select commit Hold shift + click to select a range
08f3bb0
[Feature]: 服务端新增eslint (#35)
luch1994 Dec 28, 2023
83cfd57
feat: 新增回收数据存储加密 (#37)
luch1994 Jan 4, 2024
908537e
feat: 新增复制功能 (#40)
luch1994 Jan 11, 2024
31ddefb
feat: 列表页新增复制功能 (#42)
skique Jan 11, 2024
d9e0bdf
fix: 修复存储加密变量不存在
sudoooooo Jan 11, 2024
54adf69
feat: Update README.md
sudoooooo Jan 15, 2024
620011a
feat: 问卷列表接口新增搜索功能
luch1994 Jan 16, 2024
cf9f00a
feat:列表页新增搜索功能 (#46)
skique Jan 16, 2024
f851b0d
feat: 修改参数不正确报错
luch1994 Jan 16, 2024
5fff688
feat: 调整服务端环境变量导入机制 (#43)
alwayrun Jan 16, 2024
c32bbd9
feat: 优化配置管理和lint内容
sudoooooo Jan 17, 2024
e34e5a6
feat: 问卷列表新增类型和状态筛选
Realabiha Jan 18, 2024
43186b8
fix: 修改路由解析问题
luch1994 Jan 19, 2024
0778b68
feat: 问卷列表新增排序功能 (#54)
Realabiha Jan 23, 2024
203537a
fix: 修改排序接口联调bug (#53)
luch1994 Jan 23, 2024
e1f91de
[performance]:压缩图片,优化编辑器图片懒加载 (#59)
nilnoop Feb 1, 2024
dfdc802
fix: 修复已保存数据导致资源丢失问题
sudoooooo Feb 5, 2024
9390295
feat: 升级server到nestjs框架
luch1994 Jan 30, 2024
e3fa804
fix: 修改返回页面路径问题 (#58)
luch1994 Jan 30, 2024
225e450
feat: 修改traceid生成规则,修改readme、图片和windows兼容
sudoooooo Feb 6, 2024
e5f70ad
fix: 修复图片路径问题
sudoooooo Feb 6, 2024
b8c089f
fix: 修改列表页筛选bug
luch1994 Feb 6, 2024
3ef5e75
fix:修复评分组件高级设置显示异常 (#63)
chaorenluo Feb 29, 2024
70f5c45
feat:新增进度条功能 (#68)
chaorenluo Mar 5, 2024
eea5418
fix:修复h5模式下没填完进度条已满问题 (#69)
chaorenluo Mar 7, 2024
c868ca9
feat: 修改readme
sudoooooo Mar 7, 2024
e4a8389
feat: 完善单测 (#71)
luch1994 Mar 14, 2024
565e02e
fix: 升级lodash-es (#73)
skique Mar 17, 2024
456df12
feat: 修改readme&增加issue模板
sudoooooo Mar 18, 2024
4b86073
feat: 增加pr模板
sudoooooo Mar 18, 2024
f86eab9
feat: 修改pr模板
sudoooooo Mar 18, 2024
90243b9
feat: 优化README
sudoooooo Mar 20, 2024
968576b
feat: 皮肤设置 (#78)
skique Mar 22, 2024
5c99bd7
feat: 优化时间排序
sudoooooo Mar 25, 2024
15a41f1
fix: 修改创建问卷允许空字符串,参数错误抛出异常 (#83)
luch1994 Mar 27, 2024
d239243
fix: 修改更新问卷基础信息的接口允许remark字段为空 (#84)
luch1994 Mar 27, 2024
ed56816
feat: Update README.md
sudoooooo Mar 28, 2024
b3b5fa9
Update README.md
sudoooooo Mar 28, 2024
746bece
feat: 新增数据推送功能 (#86)
luch1994 Mar 28, 2024
071afbf
fix: 冲突修复
sudoooooo Apr 1, 2024
05b9416
feat: nps评分 (#79)
chaorenluo Apr 1, 2024
c07fc43
chore: 更新iconfont (#80)
skique Apr 1, 2024
a39f3ed
fix: getListHeadByDataList函数里面的兼容radio-nps (#89)
chaorenluo Apr 3, 2024
0b3a8b5
fix: 修复数据统计兼容展示处理和nps题型问题
sudoooooo Apr 3, 2024
84a3b6e
fix: 优化json
sudoooooo Apr 7, 2024
a357b49
feat: 修改message单独一个module,修改默认json字段 (#90)
luch1994 Apr 3, 2024
dd1d977
feat: 调整字段必填,调整抽出fetch,修改单测 (#92)
luch1994 Apr 7, 2024
78f2a74
fix: 修复评分和nps题型非必填提示没有填写的问题 (#94)
chaorenluo Apr 8, 2024
c5489da
feat: Update README.md
sudoooooo Apr 9, 2024
be81e2a
feat: 消息模块新增参数校验 (#95)
luch1994 Apr 9, 2024
f43b7d7
feat: 新增file模块 (#101)
luch1994 Apr 25, 2024
a58bfe7
feat: Update README.md
sudoooooo May 10, 2024
39b25ac
feat: Update README.md
sudoooooo May 10, 2024
5d88d9a
feat: Update README.md
sudoooooo May 10, 2024
c3bbd35
feat: Update README.md
sudoooooo May 10, 2024
2bca93b
feat: Update README.md
sudoooooo May 10, 2024
6771b83
feat: vue3 (#103)
nilnoop May 9, 2024
255bd8b
feat: 修改docker配置
sudoooooo May 10, 2024
2560f0a
feat: Update README.md
sudoooooo May 10, 2024
f9af621
refactor: 重构 render/pages 目录下三个文件, 使用 Vue3 组合式 API 写法 (#113)
alwayrun May 15, 2024
7668337
feat: lint
sudoooooo May 15, 2024
ee4049b
feat: Update README.md
sudoooooo May 16, 2024
6350c95
Feature/dnd (#132)
nilnoop May 16, 2024
6319ca2
feat: 自动打开浏览器
sudoooooo May 16, 2024
9183819
feat: 增加lint检测和覆盖率报告
sudoooooo May 17, 2024
00d5e98
[Feature]: 补充file模块的单测 (#102)
luch1994 Apr 30, 2024
ba3b1a6
fix: 修改alioss.handler中单测文件的报错 (#105)
luch1994 May 9, 2024
127a589
feat: Update README.md
sudoooooo May 17, 2024
65884f8
refactor: 重构 render/App.vue, 使用 Vue3 组合式 API 写法 (#117)
alwayrun May 17, 2024
ac33ffa
fix: 修复问卷编辑页最后一题处于活动状态下删除导致问题 (#141)
alwayrun May 20, 2024
95917e2
fix:前端项目使用nginx服务代理,不在使用后端服务代理 (#100)
chaorenluo Apr 29, 2024
3629796
feat: nginx配置
sudoooooo May 20, 2024
eed15cd
feat: nginx配置
sudoooooo May 20, 2024
5e50a3a
refactor: 重构 render/components 目录下部分组件, 使用 Vue3 组合式 API 写法 (#115)
alwayrun May 20, 2024
e9b85f7
feat: Update README.md
sudoooooo May 20, 2024
6c9044b
refactor: 重构 materials/setters/widgets 目录下部分组件, 使用 Vue3 组合式 API 写法 (#…
alwayrun May 21, 2024
4f116fd
feat: add branches
sudoooooo May 21, 2024
21cba59
feat: add format
sudoooooo May 21, 2024
142b3b7
feat: 显示逻辑稳定版 (#149)
skique May 21, 2024
0b0f78a
feat: Update README.md
sudoooooo May 23, 2024
8ce6dc7
fix: 修复attrs透传会触发两次select事件 (#138)
skique May 23, 2024
3242ad8
refactor: 重构 management/components 目录下组件, 使用 Vue3 组合式 API 写法 (#151)
alwayrun May 23, 2024
627eabd
fix: 修复单选题报错问题
sudoooooo May 23, 2024
24881d7
fix: 修复活动题型选区多次点击重复触发 select 事件 (#155)
alwayrun May 23, 2024
49f0bfb
feat: 增加类型检测
sudoooooo May 23, 2024
fe31591
feat: Update README.md
sudoooooo May 24, 2024
e268786
Update README.md
sudoooooo May 24, 2024
39ff6ac
feat: Update README.md
sudoooooo May 24, 2024
de7344b
fix: 修复物料题型通用组件 BaseChoice 单选类型题重复触发 change 事件问题 (#164)
alwayrun May 24, 2024
89d416b
refactor: Vue3 组合式 API 写法重构 (#165)
1004801012 May 24, 2024
38566f1
fix:解决ts报错 (#110)
skique May 13, 2024
4c85fcc
format: 代码格式化 (#160)
skique May 23, 2024
4b8bcac
feat: 题型处于活动状态时操作侧边栏默认显示 (#157)
alwayrun May 27, 2024
fd6585d
refactor: 重构 management/pages/publishResult 目录下组件, 使用 Vue3 组合式 API 写法…
alwayrun May 27, 2024
b18d872
feat: Update README.md
sudoooooo May 27, 2024
dc7542d
refactor: 使用vue3组合式API重构登录页代码 (#172)
Codeniu May 27, 2024
89b69a9
fix: C端背景和题型分割线
sudoooooo May 27, 2024
eb6ba7a
fix: 修复物料设置组件 RangeSetter 在设置最大值与最小值引发问题 (#175)
alwayrun May 28, 2024
a64e820
fix: 题型切换 CheckboxGroup 基础设置组件状态监控导致问题 (#177)
alwayrun May 28, 2024
de2af79
fix: 调整重构 setters 组件下几处 watch 初始值引发无法监听问题 (#178)
alwayrun May 28, 2024
668e8a6
feat: Update README.md
sudoooooo May 29, 2024
3dc15ae
feat: Update README.md
sudoooooo May 29, 2024
1bd2968
fix: 修复问卷编辑-活动题型移动选区未移动问题 (#187)
alwayrun May 29, 2024
ea342a0
fix: 修复题型拖拽移动问题 (#218)
alwayrun May 29, 2024
5f8896e
refactor:统一B,C端渲染组件,将其抽离到物料区 (#184)
chaorenluo May 29, 2024
34cc06c
feat: 优化样式
sudoooooo May 29, 2024
f31cd0f
perf: 问卷编辑页标题优化 (#240)
xixiIBN5100 May 30, 2024
c904fd3
feat: 问卷列表操作栏固定 & 登录校验优化(jtest测试文件更新) (#241)
Codeniu May 30, 2024
725ca7b
feat: 增加 README_EN.md
sudoooooo Jun 3, 2024
b26855d
feat: Update README_EN.md
sudoooooo Jun 3, 2024
9448d3c
feat: 新增空间和协作功能 (#252)
luch1994 May 30, 2024
7ad01f6
feat: 问卷空间协作能力前端 (#246)
skique May 30, 2024
caca627
perf: 显示逻辑展示优化 (#249)
xixiIBN5100 Jun 4, 2024
e2e82dc
fix: 修复物料基础组件 BaseRate 重复触发 change 事件问题 (#254)
alwayrun Jun 4, 2024
8a4cad1
Update HistoryPanel.vue (#256)
yujiang0030 Jun 4, 2024
be9da78
feat: 优化初始化请求
sudoooooo Jun 4, 2024
c70a93e
fix: 修复defineProps无需import的warning
sudoooooo Jun 4, 2024
e0da708
feat: 优化空间展示和文案
sudoooooo Jun 4, 2024
89b2492
feat: Update README_EN.md
sudoooooo Jun 5, 2024
d9255db
feat: Update README.md
sudoooooo Jun 5, 2024
cffe037
refactor: 重构 management/pages/edit 目录下组件, 使用 Vue3 组合式 API 写法 (#251)
alwayrun Jun 4, 2024
48fdb31
feat:新增预览功能 (#257)
chaorenluo Jun 11, 2024
8274971
fix: 优化预览展示
sudoooooo Jun 11, 2024
6559154
refactor: 重构vue3组合式API写法 (#265)
Realabiha Jun 11, 2024
4725446
option selection limit
UserUserMyUser Jun 13, 2024
04f6edb
Merge branch 'didi:main' into homework-option-selection-limit
UserUserMyUser Jun 13, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Bug report
about: 反馈遇到的问题 / 发现的Bug
title: ''
labels: 'Bug'
assignees: ''

---

### 分类
<!-- 前端\后端\平台功能\环境 -->

### 系统

### 复现步骤
<!-- 描述具体内容,越详细越好,有截图更好 -->

### 预期结果

### 实际结果
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Feature request
about: 提出需求 / 优化 / 建议
title: ''
labels: 'feature'
assignees: ''

---

### 您的需求是否与某个问题有关?
<!-- 清晰描述问题,比如当你使用xxx时总是有xxx问题,希望xxxx -->

### 描述您希望的需求
<!-- 清晰描述需求,比如在什么场景使用/解决什么问题/满足什么功能/... -->

### 描述您考虑过的备选方案 / 建议
<!-- 清晰描述预期的方案 / 想法 -->

### 我想要认领此需求 / 优化
<!-- 如果想认领,可录入“确认认领” 以及 预计可完成时间,官方将在一周内给出方案链接通您进行沟通 -->
17 changes: 17 additions & 0 deletions .github/ISSUE_TEMPLATE/pr_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
name: PR request
about: 关于某个PR的详细描述
title: '[类型]: xxx'
labels: 'pr'
assignees: ''

---

### 改动原因
<!-- 清晰描述PR目的、原因 -->

### 改动内容
<!-- 详细描述改了什么,必要的话配截图 -->

### 改动验证
<!-- 如何验证的,必要的修改需要补充单测 -->
10 changes: 10 additions & 0 deletions .github/ISSUE_TEMPLATE/😊-抛个问题---想法---建议.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
name: "\U0001F60A 抛个问题 / 想法 / 建议"
about: 提个项目相关的问题 / 想法 / 建议
title: ''
labels: ''
assignees: ''

---

<!-- 提出项目相关的任何问题、想法、建议或您想讨论的话题。或者只是想聊聊 -->
7 changes: 7 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<!-- 请严格遵循贡献规范:https://xiaojusurvey.didi.cn/docs/next/share/%E8%B4%A1%E7%8C%AE%E6%B5%81%E7%A8%8B -->

### 改动内容
<!-- 不同功能拆分成多个PR。简洁记录改动内容,用1、2、3...分序号描述改动点 -->

### Issue
<!-- 确保大的改动创建一个Issue描述详情:https://github.com/didi/xiaoju-survey/issues/new?assignees=&labels=&projects=&template=pr_report.md&title=[类型]: xxx -->
44 changes: 44 additions & 0 deletions .github/workflows/codecov.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# Unit Test Coverage Report
name: Test Coverage

on:
push:
branches:
- main
- releases/**
paths:
- server/**
pull_request:
branches:
- develop
- main
- releases/**
- feature/**
paths:
- server/**
workflow_dispatch:

jobs:
build:
name: Coverage
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v4

- name: Setup node
uses: actions/setup-node@v4
with:
node-version: 20

- name: Install dependencies
run: cd server && npm install

- name: Run tests and collect coverage
run: cd server && npm run test:cov

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v4
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
42 changes: 42 additions & 0 deletions .github/workflows/server-lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# Lint
name: Server Lint

on:
push:
branches:
- main
- releases/**
paths:
- server/**
pull_request:
branches:
- develop
- main
- releases/**
- feature/**
paths:
- server/**
workflow_dispatch:

jobs:
build:
name: Lint
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v4

- name: Setup node
uses: actions/setup-node@v4
with:
node-version: 20

- name: Install dependencies
run: cd server && npm install

- name: Lint
run: cd server && npm run lint

- name: Format
run: cd server && npm run format
45 changes: 45 additions & 0 deletions .github/workflows/web-lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# Lint
name: Web Lint

on:
push:
branches:
- main
- releases/**
paths:
- web/**
pull_request:
branches:
- develop
- main
- releases/**
- feature/**
paths:
- web/**
workflow_dispatch:

jobs:
build:
name: Lint
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v4

- name: Setup node
uses: actions/setup-node@v4
with:
node-version: 20

- name: Install dependencies
run: cd web && npm install

- name: Type-Check
run: cd web && npm run type-check

- name: Lint
run: cd web && npm run lint

- name: Format
run: cd web && npm run format
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
node_modules
dist

package-lock.json

# local env files
.env.local
Expand All @@ -23,4 +24,4 @@ pnpm-debug.log*
*.sln
*.sw?

.history
.history
32 changes: 12 additions & 20 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,35 +1,27 @@
# 镜像集成
FROM ubuntu:latest

# 安装依赖
RUN apt-get -y update
RUN apt-get -y install wget gcc

# 安装node环境
ENV NODE_VERSION v18.17.1
RUN mkdir -p /node/$NODE_VERSION
RUN wget https://nodejs.org/dist/$NODE_VERSION/node-$NODE_VERSION-linux-x64.tar.gz
RUN tar xzf node-$NODE_VERSION-linux-x64.tar.gz -C /node/
ENV PATH /node/node-$NODE_VERSION-linux-x64/bin:$PATH
FROM node:18-slim

# 设置工作区间
WORKDIR /xiaoju-survey

# 复制文件到工作区间
COPY . /xiaoju-survey

# 安装nginx
RUN apt-get update && apt-get install -y nginx

RUN npm config set registry https://registry.npmjs.org/

# 安装项目依赖
RUN cd /xiaoju-survey/web && npm install
RUN cd /xiaoju-survey/server && npm install
RUN cd /xiaoju-survey/web && npm install && npm run build-only

# 覆盖nginx配置文件
COPY ./nginx/nginx.conf /etc/nginx/nginx.conf

# 构建项目,并把产物推送到服务公共目录
RUN cd /xiaoju-survey/web && npm run build
RUN cd /xiaoju-survey && cp -af ./web/dist/* ./server/src/apps/ui/public/
RUN cd /xiaoju-survey/server && npm install && npm run build

# 暴露端口 需要跟server的port一致
EXPOSE 3000
# 暴露端口 需要跟nginx的port一致
EXPOSE 80

# docker入口文件,运行pm2启动,并保证监听不断
# docker入口文件,启动nginx和运行pm2启动,并保证监听不断
CMD ["sh","docker-run.sh"]
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]
Copyright (C) 2023 Beijing Didi Infinity Technology and Development Co.,Ltd. All rights reserved.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
Loading