From 1c74a7897b7fe934014fab5729d0ecf14dc6842d Mon Sep 17 00:00:00 2001 From: baoliang Date: Sun, 28 Apr 2019 14:59:16 +0800 Subject: [PATCH 01/10] update commit process --- CONTRIBUTING.md | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 440ade4ad7..6352e7f0eb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,8 +4,13 @@ EasyScheduler提交代码流程 * 远端仓库中目前有三个分支： * master 正常交付分支 - * dev 日常开发分支 + 发布稳定版本以后，将稳定版本分支的代码合并到master上。 + + * dev 日常开发分支 + 日常dev开发分支，新提交的代码都可以pull request到这个分支上。 + * branch-1.0.0 发布版本分支 + 发布版本分支，后续会有2.0...等版本分支，版本分支只修改bug，不增加新功能。 * 把自己仓库clone到本地 @@ -38,7 +43,13 @@ git pull upstream dev ``` git checkout origin/dev git merge --no-ff upstream/dev +``` + +如果远端分支有新加的分支`dev-1.0`,需要同步这个分支到本地仓库 +``` +git checkout -b dev-1.0 upstream/dev-1.0 +git push --set-upstream origin dev1.0 ``` * 在本地修改代码以后，提交到自己仓库： @@ -60,11 +71,3 @@ git pull upstream dev * 接下来由管理员负责将**Merge**完成此次pull request - - - - - - - - From c222386ddddd56e12f66731376d6e0e4966bda21 Mon Sep 17 00:00:00 2001 From: gongzijian Date: Sun, 28 Apr 2019 18:21:30 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E6=96=87=E6=A1=A3=20=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=BC=96=E8=BE=91bug=20=E4=B8=AD=E8=8B=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/zh_CN/前端部署文档.md | 10 +++++----- ...stall(线上环境).sh => install-escheduler-ui.sh} | 0 .../projects/pages/definition/timing/_source/list.vue | 5 ++++- .../pages/security/pages/users/_source/createUser.vue | 2 +- .../home/pages/user/pages/password/_source/info.vue | 3 ++- 5 files changed, 12 insertions(+), 8 deletions(-) rename escheduler-ui/{install(线上环境).sh => install-escheduler-ui.sh} (100%) diff --git a/docs/zh_CN/前端部署文档.md b/docs/zh_CN/前端部署文档.md index 9b9bfe5266..96d1d48cf3 100644 --- a/docs/zh_CN/前端部署文档.md +++ b/docs/zh_CN/前端部署文档.md @@ -7,8 +7,8 @@ 目前最新安装包版本是1.0.2，下载地址： [码云下载](https://gitee.com/easyscheduler/EasyScheduler/attach_files/) -下载escheduler-ui-1.0.2.tar.gz后，解压后会产生dist目录,进入dist目录 -> cd dist +下载 escheduler-ui-1.0.2.tar.gz 后，解压`tar -zxvf escheduler-ui-1.0.2.tar.gz ./`后，进入`escheduler-ui`目录 + @@ -16,7 +16,7 @@ 以下两种方式任选其一部署即可，推荐自动化部署 ### 2.1 自动化部署 -在`escheduler-ui`目录下编辑安装文件`vi install(线上环境).sh`(执行时，最好修改install(线上环境).sh为install-ui.sh,跟后端部署区分) +在`escheduler-ui`目录下编辑安装文件`vi install-escheduler-ui.sh` 更改前端访问端口和后端代理接口地址 @@ -28,9 +28,9 @@ esc_proxy="8888" esc_proxy_port="http://192.168.xx.xx:12345" ``` -前端自动部署基于linux系统`yum`操作，部署之前请先安装更新`yum` +>前端自动部署基于linux系统`yum`操作，部署之前请先安装更新`yum` -在`escheduler-ui`目录下执行`./install(线上环境).sh` 或者改名后的 `./install-ui.sh` +在该目录下执行`./install-escheduler-ui.sh` ### 2.2 手动部署 diff --git a/escheduler-ui/install(线上环境).sh b/escheduler-ui/install-escheduler-ui.sh similarity index 100% rename from escheduler-ui/install(线上环境).sh rename to escheduler-ui/install-escheduler-ui.sh diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/_source/list.vue b/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/_source/list.vue index 7a3ab13091..22a9dee15f 100644 --- a/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/_source/list.vue +++ b/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/_source/list.vue @@ -160,7 +160,10 @@ pageNo: this.pageNo, pageSize: this.pageSize }).then(res => { - this.list = res.data.totalList + this.list = [] + setTimeout(() => { + this.list = res.data.totalList + }) this.total = res.data.total this.isLoading = false }).catch(e => { diff --git a/escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue b/escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue index 44c4f19b2a..f2da80ce84 100644 --- a/escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue +++ b/escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue @@ -39,7 +39,7 @@ - +