Skip to content

Commit

Permalink
Merge pull request #112 from zjutjh/dev
Browse files Browse the repository at this point in the history
release: 问卷v1.1.0发布
  • Loading branch information
xixiIBN5100 authored Oct 18, 2024
2 parents fc1134d + ed73b4c commit e20ae68
Show file tree
Hide file tree
Showing 43 changed files with 8,134 additions and 199 deletions.
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

0 comments on commit e20ae68

Please sign in to comment.