Merge pull request #11 from certd/client_sync

[client] sync upgrade [trident-sync]
pull/21/merge
Greper 2023-02-10 03:24:09 +08:00 committed by GitHub
commit 5ccb4a6f08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 88 additions and 9 deletions

View File

@ -0,0 +1,42 @@
> 感谢您支持fast-crud请按如下规范提交issue
> 如果有条件,请尽量在[github上提交](https://github.com/fast-crud/fast-crud/issues)
## 一、问题描述
`请在此处简要描述你所遇到的问题,必要时请贴出相关截图辅助理解和定位`
### 复现步骤
`请描述复现问题的详细步骤`
`如果非示例页面的问题,最好能提供最小复现示例的代码、或者仓库链接`
### 代码截图
`请贴出出错的相关代码截图`
### 报错截图
`请贴出报错日志截图`
### 效果截图
`请贴出效果截图`
#### 1. 期望效果
#### 2. 实际效果
## 二、当前使用的库版本
### 1. fast-crud版本
`请您填写fast-crud的版本`
### 2. 使用的ui库以及版本
`中括号中输入x即选中或者删除其他仅保留你正使用的ui库`
- [x] Antdv (版本?)
- [ ] ElementPlus版本
- [ ] NaiveUI版本
### 3. 使用的admin框架
`请您填写您当前使用的admin框架是哪一套`
- [x] fs-admin-antdv
- [ ] fs-admin-element
- [ ] fs-admin-naive
- [ ] fs-in-vben
- [ ] vben-admin
- [ ] cool-admin
- [ ] 其他:`请注明`

View File

@ -0,0 +1,35 @@
name: sync-to-gitee
on:
push:
branches: [ "main" ]
pull_request:
branches: [ "main" ]
# schedule:
# - # 国际时间 19:17 执行北京时间3:17 ↙↙↙ 改成你想要每天自动执行的时间
# - cron: '17 19 * * *'
permissions:
contents: read
jobs:
sync:
runs-on: ubuntu-latest
steps:
- name: Checkout work repo # 1. 检出当前仓库(certd-sync-work)
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Set git user # 2. 给git命令设置用户名和邮箱,↙↙↙ 改成你的name和email
run: |
git config --global user.name "xiaojunnuo"
git config --global user.email "xiaojunnuo@qq.com"
- name: Set git token # 3. 给git命令设置token用于push到目标仓库
uses: de-vri-es/setup-git-credentials@v2
with:
credentials: https://${{secrets.PUSH_TOKEN_GITEE}}@gitee.com
- name: push to gitee # 4. 执行同步
run: |
git remote add upstream https://gitee.com/fast-crud/fs-admin-antdv
git push --set-upstream upstream main

View File

@ -34,4 +34,3 @@ https://github.com/fast-crud/fs-server-js

View File

@ -1,6 +1,6 @@
{
"name": "@fast-crud/fs-admin-antdv",
"version": "1.8.5",
"version": "1.9.0",
"private": true,
"scripts": {
"dev": "vite",
@ -22,9 +22,9 @@
"dependencies": {
"@ant-design/colors": "^6.0.0",
"@ant-design/icons-vue": "^6.0.1",
"@fast-crud/fast-crud": "^1.8.5",
"@fast-crud/fast-extends": "^1.8.5",
"@fast-crud/ui-antdv": "^1.8.4",
"@fast-crud/fast-crud": "^1.9.0",
"@fast-crud/fast-extends": "^1.9.0",
"@fast-crud/ui-antdv": "^1.9.0",
"@iconify/iconify": "^3.0.1",
"@iconify/json": "^2.1.151",
"@purge-icons/generated": "^0.9.0",
@ -38,6 +38,7 @@
"core-js": "^3.26.1",
"cos-js-sdk-v5": "^1.4.15-beta.0",
"cropperjs": "^1.5.13",
"dayjs": "^1.11.7",
"deepdash-es": "5.3.5",
"highlight.js": "^11.7.0",
"lodash-es": "^4.17.15",
@ -107,8 +108,8 @@
"vite-plugin-theme": "^0.8.1",
"vite-plugin-windicss": "^1.8.10",
"vue-eslint-parser": "^9.1.0",
"windicss": "^3.5.6",
"vue-tsc": "^0.40.13"
"vue-tsc": "^0.40.13",
"windicss": "^3.5.6"
},
"husky": {
"hooks": {

View File

@ -54,6 +54,9 @@ export default function ({ expose }) {
);
}
}
},
click() {
console.log("test");
}
}
}

View File

@ -28,9 +28,8 @@ export default ({ command, mode }) => {
{ find: /@fast-crud\/ui-antdv$/, replacement: path.resolve("../../ui/ui-antdv/src/") }
];
devServerFs = {
// 如果是你自己的项目,这项可以删掉
// 这里配置dev启动时读取的项目根目录
allow: ["../../"]
allow: ["../../../"]
};
console.log("devAlias", devAlias);
}