Merge remote-tracking branch 'upstream/dev-20190415' into dev-up

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
 
 
-
-
-
-
-
-
-
-

README.md

@@ -41,6 +41,8 @@ Easy Scheduler
 
 - [**使用手册**](https://analysys.github.io/easyscheduler_docs_cn/系统使用手册.html?_blank "系统使用手册") 
 
+- [**升级文档**](https://analysys.github.io/easyscheduler_docs_cn/升级文档.html?_blank "升级文档") 
+
 - <a href="http://52.82.13.76:8888" target="_blank">我要体验</a> 普通用户登录：demo/demo123
 
 更多文档请参考 <a href="https://analysys.github.io/easyscheduler_docs_cn/" target="_blank">easyscheduler中文在线文档</a>

docs/zh_CN/README.md

@@ -41,6 +41,8 @@ Easy Scheduler
 
 - [**使用手册**](https://analysys.github.io/easyscheduler_docs_cn/系统使用手册.html?_blank "系统使用手册") 
 
+- [**升级文档**](https://analysys.github.io/easyscheduler_docs_cn/升级文档.html?_blank "升级文档") 
+
 - <a href="http://52.82.13.76:8888" target="_blank">我要体验</a> 普通用户登录：demo/demo123
 
 更多文档请参考 <a href="https://analysys.github.io/easyscheduler_docs_cn/" target="_blank">easyscheduler中文在线文档</a>

docs/zh_CN/SUMMARY.md

@@ -22,6 +22,8 @@
     * [开发环境搭建](后端开发文档.md#项目编译)
     * [自定义任务插件文档](任务插件开发.md#任务插件开发)
     
+* 系统版本升级文档
+    * [版本升级](升级文档.md)
 * 历次版本发布内容
     * [1.0.2 release](1.0.2-release.md)
     * [1.0.1 release](1.0.1-release.md)

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 手动部署

docs/zh_CN/升级文档.md

 
 # EasyScheduler升级文档
 
-## 1. 备份上一版本文件和数据库。
+## 1. 备份上一版本文件和数据库
 
-## 2. 停止escheduler所有服务.
+## 2. 停止escheduler所有服务
 
  `sh ./script/stop_all.sh`
 

escheduler-api/src/main/java/cn/escheduler/api/controller/UsersController.java

@@ -64,7 +64,7 @@ public class UsersController extends BaseController{
                                                      @RequestParam(value = "userName") String userName,
                                                      @RequestParam(value = "userPassword") String userPassword,
                                                      @RequestParam(value = "tenantId") int tenantId,
-                                                     @RequestParam(value = "queue") String queue,
+                                                     @RequestParam(value = "queue",required = false,defaultValue = "") String queue,
                                                      @RequestParam(value = "email") String email,
                                                      @RequestParam(value = "phone", required = false) String phone) {
         logger.info("login user {}, create user, userName: {}, email: {}, tenantId: {}, userPassword: {}, phone: {}, user queue: {}",
@@ -128,7 +128,7 @@ public class UsersController extends BaseController{
                                                      @RequestParam(value = "id") int id,
                                                      @RequestParam(value = "userName") String userName,
                                                      @RequestParam(value = "userPassword") String userPassword,
-                                                     @RequestParam(value = "queue") String queue,
+                                                     @RequestParam(value = "queue",required = false,defaultValue = "") String queue,
                                                      @RequestParam(value = "email") String email,
                                                      @RequestParam(value = "tenantId") int tenantId,
                                                      @RequestParam(value = "phone", required = false) String phone) {

escheduler-ui/.env

 
 # 后端接口地址
-API_BASE = http://192.168.220.247:12345
+API_BASE = http://192.168.xx.xx:12345
 
 # 本地开发如需ip访问项目把"#"号去掉
 #DEV_HOST = 192.168.xx.xx

escheduler-ui/dist/index.html

@@ -4,4 +4,4 @@
 d="M37.3496987939662 -7 L47.3496987939662 -7 L47.3496987939662 7 L37.3496987939662 7 A38 38 0 0 1 31.359972760794346 21.46047782418268 L31.359972760794346 21.46047782418268 L38.431040572659825 28.531545636048154 L28.531545636048154 38.431040572659825 L21.46047782418268 31.359972760794346 A38 38 0 0 1 7.0000000000000036 37.3496987939662 L7.0000000000000036 37.3496987939662 L7.000000000000004 47.3496987939662 L-6.999999999999999 47.3496987939662 L-7 37.3496987939662 A38 38 0 0 1 -21.46047782418268 31.35997276079435 L-21.46047782418268 31.35997276079435 L-28.531545636048154 38.431040572659825 L-38.43104057265982 28.531545636048158 L-31.359972760794346 21.460477824182682 A38 38 0 0 1 -37.3496987939662 7.000000000000007 L-37.3496987939662 7.000000000000007 L-47.3496987939662 7.000000000000008 L-47.3496987939662 -6.9999999999999964 L-37.3496987939662 -6.999999999999997 A38 38 0 0 1 -31.35997276079435 -21.460477824182675 L-31.35997276079435 -21.460477824182675 L-38.431040572659825 -28.531545636048147 L-28.53154563604818 -38.4310405726598 L-21.4604778241827 -31.35997276079433 A38 38 0 0 1 -6.999999999999992 -37.3496987939662 L-6.999999999999992 -37.3496987939662 L-6.999999999999994 -47.3496987939662 L6.999999999999977 -47.3496987939662 L6.999999999999979 -37.3496987939662 A38 38 0 0 1 21.460477824182686 -31.359972760794342 L21.460477824182686 -31.359972760794342 L28.531545636048158 -38.43104057265982 L38.4310405726598 -28.53154563604818 L31.35997276079433 -21.4604778241827 A38 38 0 0 1 37.3496987939662 -6.999999999999995 M0 -23A23 23 0 1 0 0 23 A23 23 0 1 0 0 -23" 
 fill="#0097e0"></path></g></g><g transform="translate(19 19) scale(0.6)"><g transform="rotate(229.634)"><animateTransform attributeName="transform" type="rotate" values="360;0" keyTimes="0;1" dur="1s" begin="-0.0625s" repeatCount="indefinite"></animateTransform><path 
 d="M37.3496987939662 -7 L47.3496987939662 -7 L47.3496987939662 7 L37.3496987939662 7 A38 38 0 0 1 31.359972760794346 21.46047782418268 L31.359972760794346 21.46047782418268 L38.431040572659825 28.531545636048154 L28.531545636048154 38.431040572659825 L21.46047782418268 31.359972760794346 A38 38 0 0 1 7.0000000000000036 37.3496987939662 L7.0000000000000036 37.3496987939662 L7.000000000000004 47.3496987939662 L-6.999999999999999 47.3496987939662 L-7 37.3496987939662 A38 38 0 0 1 -21.46047782418268 31.35997276079435 L-21.46047782418268 31.35997276079435 L-28.531545636048154 38.431040572659825 L-38.43104057265982 28.531545636048158 L-31.359972760794346 21.460477824182682 A38 38 0 0 1 -37.3496987939662 7.000000000000007 L-37.3496987939662 7.000000000000007 L-47.3496987939662 7.000000000000008 L-47.3496987939662 -6.9999999999999964 L-37.3496987939662 -6.999999999999997 A38 38 0 0 1 -31.35997276079435 -21.460477824182675 L-31.35997276079435 -21.460477824182675 L-38.431040572659825 -28.531545636048147 L-28.53154563604818 -38.4310405726598 L-21.4604778241827 -31.35997276079433 A38 38 0 0 1 -6.999999999999992 -37.3496987939662 L-6.999999999999992 -37.3496987939662 L-6.999999999999994 -47.3496987939662 L6.999999999999977 -47.3496987939662 L6.999999999999979 -37.3496987939662 A38 38 0 0 1 21.460477824182686 -31.359972760794342 L21.460477824182686 -31.359972760794342 L28.531545636048158 -38.43104057265982 L38.4310405726598 -28.53154563604818 L31.35997276079433 -21.4604778241827 A38 38 0 0 1 37.3496987939662 -6.999999999999995 M0 -23A23 23 0 1 0 0 23 A23 23 0 1 0 0 -23" 
-fill="#7f8b95"></path></g></g></g></svg> <span class="sp1">Loading ...</span></div></div><script src="/combo/1.0.0/3rd.js?v1.0.0.1"></script><script src="/js/common.467dcfa.js"></script><script src="/js/home/index.1b09c2f.js"></script></body></html>
\ No newline at end of file
+fill="#7f8b95"></path></g></g></g></svg> <span class="sp1">Loading ...</span></div></div><script src="/combo/1.0.0/3rd.js?v1.0.0.1"></script><script src="/js/common.6428411.js"></script><script src="/js/home/index.1b09c2f.js"></script></body></html>
\ No newline at end of file

escheduler-ui/dist/js/35.39a1f26.js

-webpackJsonp([35],{1143:function(t,s,e){"use strict";s.__esModule=!0;var n=r(e(1285)),a=r(e(697));function r(t){return t&&t.__esModule?t:{default:t}}s.default={name:"password-index",components:{mListConstruction:a.default,mInfo:n.default}}},1144:function(t,s,e){"use strict";s.__esModule=!0;var n=o(e(36)),a=e(123),r=o(e(224));function o(t){return t&&t.__esModule?t:{default:t}}s.default={name:"password-info",data:function(){return{spinnerLoading:!1,userPassword:"",oldUserPassword:""}},props:{},methods:Object.assign({},(0,a.mapActions)("user",["signOut"]),(0,a.mapActions)("security",["updateUser"]),{_edit:function(){var t=this;if(this._verification()){var s={id:this.userInfo.id,userName:this.userInfo.userName,userPassword:this.userPassword,tenantId:this.userInfo.tenantId,email:this.userInfo.email,phone:this.userInfo.phone};this.spinnerLoading=!0,this.updateUser(s).then(function(s){t.$message.success(s.msg),setTimeout(function(){t.spinnerLoading=!1,t.signOut()},1500)}).catch(function(s){t.$message.error(s.msg||"")})}},_verification:function(){var t=new RegExp("[\\u4E00-\\u9FFF]+","g");return t.test(this.userPassword)?(this.$message.warning(""+n.default.$t("Password cannot be in Chinese")),!1):this.userPassword?this.userPassword.length<6||this.userPassword.length>22?(this.$message.warning(""+n.default.$t("Please enter a password (6-22) character password")),!1):t.test(this.oldUserPassword)?(this.$message.warning(""+n.default.$t("Confirmation password cannot be in Chinese")),!1):this.oldUserPassword?this.oldUserPassword.length<6||this.oldUserPassword.length>22?(this.$message.warning(""+n.default.$t("Please enter a confirmation password (6-22) character password")),!1):this.userPassword===this.oldUserPassword||(this.$message.warning(""+n.default.$t("The password is inconsistent with the confirmation password")),!1):(this.$message.warning(""+n.default.$t("Please enter a confirmation password (6-22) character password")),!1):(this.$message.warning(""+n.default.$t("Please enter a password (6-22) character password")),!1)}}),computed:Object.assign({},(0,a.mapState)("user",["userInfo"])),components:{mListBoxF:r.default}}},1285:function(t,s,e){"use strict";Object.defineProperty(s,"__esModule",{value:!0});var n=e(1144),a=e.n(n);for(var r in n)"default"!==r&&function(t){e.d(s,t,function(){return n[t]})}(r);var o=e(1288);var i=function(t){e(1286)},u=e(29)(a.a,o.a,!1,i,null,null);s.default=u.exports},1286:function(t,s,e){var n=e(1287);"string"==typeof n&&(n=[[t.i,n,""]]),n.locals&&(t.exports=n.locals);e(35)("4ae3c66c",n,!0,{})},1287:function(t,s,e){(t.exports=e(34)(!1)).push([t.i,".password-model .list-box-f{margin-bottom:30px}",""])},1288:function(t,s,e){"use strict";var n={render:function(){var t=this,s=t.$createElement,e=t._self._c||s;return e("div",{staticClass:"user-info-model password-model"},[e("m-list-box-f",[e("template",{slot:"name"},[t._v(t._s(t.$t("User Name")))]),t._v(" "),e("template",{slot:"content"},[e("span",{staticClass:"sp1"},[t._v(t._s(t.userInfo.userName))])])],2),t._v(" "),e("m-list-box-f",[e("template",{slot:"name"},[t._v(t._s(t.$t("Password")))]),t._v(" "),e("template",{slot:"content"},[e("x-input",{staticStyle:{width:"320px"},attrs:{type:"password",placeholder:t.$t("Please enter your password")},model:{value:t.userPassword,callback:function(s){t.userPassword=s},expression:"userPassword"}})],1)],2),t._v(" "),e("m-list-box-f",[e("template",{slot:"name"},[t._v(t._s(t.$t("Confirm Password")))]),t._v(" "),e("template",{slot:"content"},[e("x-input",{staticStyle:{width:"320px"},attrs:{type:"password",placeholder:t.$t("Please enter confirm password")},model:{value:t.oldUserPassword,callback:function(s){t.oldUserPassword=s},expression:"oldUserPassword"}})],1)],2),t._v(" "),e("m-list-box-f",[e("template",{slot:"name"},[t._v(" ")]),t._v(" "),e("template",{slot:"content"},[e("x-button",{attrs:{type:"primary",shape:"circle",loading:t.spinnerLoading},on:{click:function(s){return t._edit()}}},[t._v(t._s(t.spinnerLoading?"Loading...":"Edit"))])],1)],2)],1)},staticRenderFns:[]};s.a=n},1289:function(t,s,e){"use strict";var n={render:function(){var t=this.$createElement,s=this._self._c||t;return s("m-list-construction",{attrs:{title:this.$t("Edit Password")}},[s("template",{slot:"content"},[s("m-info")],1)],2)},staticRenderFns:[]};s.a=n},645:function(t,s,e){"use strict";Object.defineProperty(s,"__esModule",{value:!0});var n=e(1143),a=e.n(n);for(var r in n)"default"!==r&&function(t){e.d(s,t,function(){return n[t]})}(r);var o=e(1289),i=e(29)(a.a,o.a,!1,null,null,null);s.default=i.exports},663:function(t,s,e){"use strict";s.__esModule=!0,s.default={name:"list-construction",data:function(){return{}},props:{title:String}}},697:function(t,s,e){"use strict";Object.defineProperty(s,"__esModule",{value:!0});var n=e(663),a=e.n(n);for(var r in n)"default"!==r&&function(t){e.d(s,t,function(){return n[t]})}(r);var o=e(700);var i=function(t){e(698)},u=e(29)(a.a,o.a,!1,i,null,null);s.default=u.exports},698:function(t,s,e){var n=e(699);"string"==typeof n&&(n=[[t.i,n,""]]),n.locals&&(t.exports=n.locals);e(35)("70439c42",n,!0,{})},699:function(t,s,e){(t.exports=e(34)(!1)).push([t.i,"",""])},700:function(t,s,e){"use strict";var n={render:function(){var t=this.$createElement,s=this._self._c||t;return s("div",{staticClass:"home-main list-construction-model"},[s("div",{staticClass:"content-title"},[s("span",[this._v(this._s(this.title))])]),this._v(" "),s("div",{staticClass:"conditions-box"},[this._t("conditions")],2),this._v(" "),s("div",{staticClass:"list-box"},[this._t("content")],2)])},staticRenderFns:[]};s.a=n}});
-//# sourceMappingURL=35.39a1f26.js.map
\ No newline at end of file

escheduler-ui/dist/js/35.54f8ec4.js

+webpackJsonp([35],{1143:function(t,s,e){"use strict";s.__esModule=!0;var n=r(e(1285)),a=r(e(697));function r(t){return t&&t.__esModule?t:{default:t}}s.default={name:"password-index",components:{mListConstruction:a.default,mInfo:n.default}}},1144:function(t,s,e){"use strict";s.__esModule=!0;var n=o(e(36)),a=e(123),r=o(e(224));function o(t){return t&&t.__esModule?t:{default:t}}s.default={name:"password-info",data:function(){return{spinnerLoading:!1,userPassword:"",oldUserPassword:""}},props:{},methods:Object.assign({},(0,a.mapActions)("user",["signOut"]),(0,a.mapActions)("security",["updateUser"]),{_edit:function(){var t=this;if(this._verification()){var s={id:this.userInfo.id,userName:this.userInfo.userName,userPassword:this.userPassword,tenantId:this.userInfo.tenantId,email:this.userInfo.email,phone:this.userInfo.phone};this.spinnerLoading=!0,this.updateUser(s).then(function(s){t.$message.success(s.msg),setTimeout(function(){t.spinnerLoading=!1,t.signOut()},1500)}).catch(function(s){t.$message.error(s.msg||""),t.spinnerLoading=!1})}},_verification:function(){var t=new RegExp("[\\u4E00-\\u9FFF]+","g");return t.test(this.userPassword)?(this.$message.warning(""+n.default.$t("Password cannot be in Chinese")),!1):this.userPassword?this.userPassword.length<6||this.userPassword.length>22?(this.$message.warning(""+n.default.$t("Please enter a password (6-22) character password")),!1):t.test(this.oldUserPassword)?(this.$message.warning(""+n.default.$t("Confirmation password cannot be in Chinese")),!1):this.oldUserPassword?this.oldUserPassword.length<6||this.oldUserPassword.length>22?(this.$message.warning(""+n.default.$t("Please enter a confirmation password (6-22) character password")),!1):this.userPassword===this.oldUserPassword||(this.$message.warning(""+n.default.$t("The password is inconsistent with the confirmation password")),!1):(this.$message.warning(""+n.default.$t("Please enter a confirmation password (6-22) character password")),!1):(this.$message.warning(""+n.default.$t("Please enter a password (6-22) character password")),!1)}}),computed:Object.assign({},(0,a.mapState)("user",["userInfo"])),components:{mListBoxF:r.default}}},1285:function(t,s,e){"use strict";Object.defineProperty(s,"__esModule",{value:!0});var n=e(1144),a=e.n(n);for(var r in n)"default"!==r&&function(t){e.d(s,t,function(){return n[t]})}(r);var o=e(1288);var i=function(t){e(1286)},u=e(29)(a.a,o.a,!1,i,null,null);s.default=u.exports},1286:function(t,s,e){var n=e(1287);"string"==typeof n&&(n=[[t.i,n,""]]),n.locals&&(t.exports=n.locals);e(35)("2324498a",n,!0,{})},1287:function(t,s,e){(t.exports=e(34)(!1)).push([t.i,".password-model .list-box-f{margin-bottom:30px}",""])},1288:function(t,s,e){"use strict";var n={render:function(){var t=this,s=t.$createElement,e=t._self._c||s;return e("div",{staticClass:"user-info-model password-model"},[e("m-list-box-f",[e("template",{slot:"name"},[t._v(t._s(t.$t("User Name")))]),t._v(" "),e("template",{slot:"content"},[e("span",{staticClass:"sp1"},[t._v(t._s(t.userInfo.userName))])])],2),t._v(" "),e("m-list-box-f",[e("template",{slot:"name"},[t._v(t._s(t.$t("Password")))]),t._v(" "),e("template",{slot:"content"},[e("x-input",{staticStyle:{width:"320px"},attrs:{type:"password",placeholder:t.$t("Please enter your password")},model:{value:t.userPassword,callback:function(s){t.userPassword=s},expression:"userPassword"}})],1)],2),t._v(" "),e("m-list-box-f",[e("template",{slot:"name"},[t._v(t._s(t.$t("Confirm Password")))]),t._v(" "),e("template",{slot:"content"},[e("x-input",{staticStyle:{width:"320px"},attrs:{type:"password",placeholder:t.$t("Please enter confirm password")},model:{value:t.oldUserPassword,callback:function(s){t.oldUserPassword=s},expression:"oldUserPassword"}})],1)],2),t._v(" "),e("m-list-box-f",[e("template",{slot:"name"},[t._v(" ")]),t._v(" "),e("template",{slot:"content"},[e("x-button",{attrs:{type:"primary",shape:"circle",loading:t.spinnerLoading},on:{click:function(s){return t._edit()}}},[t._v(t._s(t.spinnerLoading?"Loading...":t.$t("Edit")))])],1)],2)],1)},staticRenderFns:[]};s.a=n},1289:function(t,s,e){"use strict";var n={render:function(){var t=this.$createElement,s=this._self._c||t;return s("m-list-construction",{attrs:{title:this.$t("Edit Password")}},[s("template",{slot:"content"},[s("m-info")],1)],2)},staticRenderFns:[]};s.a=n},645:function(t,s,e){"use strict";Object.defineProperty(s,"__esModule",{value:!0});var n=e(1143),a=e.n(n);for(var r in n)"default"!==r&&function(t){e.d(s,t,function(){return n[t]})}(r);var o=e(1289),i=e(29)(a.a,o.a,!1,null,null,null);s.default=i.exports},663:function(t,s,e){"use strict";s.__esModule=!0,s.default={name:"list-construction",data:function(){return{}},props:{title:String}}},697:function(t,s,e){"use strict";Object.defineProperty(s,"__esModule",{value:!0});var n=e(663),a=e.n(n);for(var r in n)"default"!==r&&function(t){e.d(s,t,function(){return n[t]})}(r);var o=e(700);var i=function(t){e(698)},u=e(29)(a.a,o.a,!1,i,null,null);s.default=u.exports},698:function(t,s,e){var n=e(699);"string"==typeof n&&(n=[[t.i,n,""]]),n.locals&&(t.exports=n.locals);e(35)("70439c42",n,!0,{})},699:function(t,s,e){(t.exports=e(34)(!1)).push([t.i,"",""])},700:function(t,s,e){"use strict";var n={render:function(){var t=this.$createElement,s=this._self._c||t;return s("div",{staticClass:"home-main list-construction-model"},[s("div",{staticClass:"content-title"},[s("span",[this._v(this._s(this.title))])]),this._v(" "),s("div",{staticClass:"conditions-box"},[this._t("conditions")],2),this._v(" "),s("div",{staticClass:"list-box"},[this._t("content")],2)])},staticRenderFns:[]};s.a=n}});
+//# sourceMappingURL=35.54f8ec4.js.map
\ No newline at end of file

escheduler-ui/dist/view/login/index.html

 <!doctype html><html><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"><meta http-equiv="Cache-Control" content="no-siteapp"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-title" content="标题"><meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"><meta name="format-detection" content="telphone=no, email=no"><meta name="screen-orientation" content="portrait"><meta name="x5-orientation" content="portrait"><meta name="theme-color" content="#4a8dee"><meta name="msapplication-navbutton-color" content="#4a8dee"><meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><link rel="shortcut icon" href="/images/favicon.ico"><link href="/combo/1.0.0/base.css?v1.0.0.1" rel="stylesheet"><link href="/combo/1.0.0/3rd.css?v1.0.0.1" rel="stylesheet"><!--[if lt IE 9]>
 <script src="/combo/1.0.0/es5.js"></script>
-<![endif]--><script>let NODE_ENV = 'true'</script><title>Login - EasyScheduler</title><link href="/css/common.8ba9af7.css" rel="stylesheet"><link href="/css/login/index.5866c64.css" rel="stylesheet"></head><body><div id="app"></div><div class="login-bg"></div><script src="/combo/1.0.0/3rd.js?v1.0.0.1"></script><script src="/js/common.467dcfa.js"></script><script src="/js/login/index.97eaebb.js"></script></body></html>
\ No newline at end of file
+<![endif]--><script>let NODE_ENV = 'true'</script><title>Login - EasyScheduler</title><link href="/css/common.8ba9af7.css" rel="stylesheet"><link href="/css/login/index.5866c64.css" rel="stylesheet"></head><body><div id="app"></div><div class="login-bg"></div><script src="/combo/1.0.0/3rd.js?v1.0.0.1"></script><script src="/js/common.6428411.js"></script><script src="/js/login/index.97eaebb.js"></script></body></html>
\ No newline at end of file

escheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js

@@ -489,6 +489,9 @@ JSP.prototype.removeNodes = function ($id) {
   })
   // delete node
   this.JspInstance.remove($id)
+
+  // delete dom
+  $(`#${$id}`).remove()
 }
 
 /**
@@ -557,7 +560,7 @@ JSP.prototype.copyNodes = function ($id) {
   // Add new node
   store.commit('dag/addTasks', newNodeInfo)
   // Add node location information
-  store.commit('dag/setLocations', {
+  store.commit('dag/addLocations', {
     [newId]: {
       name: newName,
       targetarr: '',
@@ -642,6 +645,8 @@ JSP.prototype.saveStore = function () {
       })
     })
 
+    console.log(tasksAll())
+
     _.map(tasksAll(), v => {
       locations[v.id] = {
         name: v.name,
@@ -651,6 +656,8 @@ JSP.prototype.saveStore = function () {
       }
     })
 
+    console.log(locations)
+
     // Storage node
     store.commit('dag/setTasks', tasks)
     // Store coordinate information

escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue

@@ -9,7 +9,7 @@
       </div>
       <div class="cont">
         <x-datepicker
-                style="width: 300px;"
+                style="width: 360px;"
                 :panel-num="2"
                 placement="bottom-start"
                 @on-change="_datepicker"
@@ -32,7 +32,7 @@
             </div>
             <template slot="reference">
               <x-input
-                      style="width: 300px;"
+                      style="width: 360px;"
                       type="text"
                       readonly
                       :value="crontab"

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 => {

escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue

@@ -39,7 +39,7 @@
             </x-select>
           </template>
         </m-list-box-f>
-        <m-list-box-f>
+        <m-list-box-f v-if="isADMIN">
           <template slot="name"><b>*</b>{{$t('Queue')}}</template>
           <template slot="content">
             <x-select v-model="queueName">

escheduler-ui/src/js/conf/home/pages/user/pages/password/_source/info.vue

@@ -31,7 +31,7 @@
     <m-list-box-f>
       <template slot="name">&nbsp;</template>
       <template slot="content">
-        <x-button type="primary" shape="circle" @click="_edit()" :loading="spinnerLoading">{{spinnerLoading ? 'Loading...' : 'Edit'}}</x-button>
+        <x-button type="primary" shape="circle" @click="_edit()" :loading="spinnerLoading">{{spinnerLoading ? 'Loading...' : $t('Edit')}}</x-button>
       </template>
     </m-list-box-f>
   </div>
@@ -80,6 +80,7 @@
             }, 1500)
           }).catch(e => {
             this.$message.error(e.msg || '')
+            this.spinnerLoading = false
           })
         }
       },

escheduler-ui/src/js/conf/home/store/dag/mutations.js

@@ -32,13 +32,13 @@ export default {
    * set locations
    * */
   setLocations (state, payload) {
-    state.locations = Object.assign(state.locations, {}, payload)
+    state.locations = payload
   },
   /**
    * add locations
    * */
   addLocations (state, payload) {
-    state.locations = payload
+    state.locations = Object.assign(state.locations, {}, payload)
   },
   /**
    * set connects

escheduler-ui/src/lib/external/config.js

@@ -3,5 +3,5 @@
  */
 export default {
   // qianfan task record switch
-  recordSwitch:true
+  recordSwitch:false
 }
\ No newline at end of file