diff --git a/README.md b/README.md index 10e55ede..d64a726d 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Jeecg-Boot 快速开发平台(前后端分离版本) =============== -当前最新版本: 2.0.2(发布日期:20190708) +当前最新版本: 2.1.0(发布日期:20190826) [![AUR](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://github.com/zhangdaiscott/jeecg-boot/blob/master/LICENSE) [![](https://img.shields.io/badge/Author-JEECG团队-orange.svg)](http://www.jeecg.com) @@ -239,7 +239,7 @@ Jeecg-Boot快速开发平台,可以应用在任何J2EE项目的开发中,尤 │ └─异常页面 │ └─个人页面 ├─Online在线开发(暂未开源) -│ ├─Online在线表单 +│ ├─Online在线表单 - 已开放功能 │ ├─Online在线图表 │ ├─Online图表模板配置 │ ├─Online在线报表 diff --git a/ant-design-vue-jeecg/README.md b/ant-design-vue-jeecg/README.md index d53272a7..cf0ae032 100644 --- a/ant-design-vue-jeecg/README.md +++ b/ant-design-vue-jeecg/README.md @@ -1,7 +1,7 @@ Ant Design Jeecg Vue ==== -当前最新版本: 2.0.2(发布日期:20190708) +当前最新版本: 2.1.0(发布日期:20190826) Overview ---- diff --git a/ant-design-vue-jeecg/package.json b/ant-design-vue-jeecg/package.json index 901957f9..9e045224 100644 --- a/ant-design-vue-jeecg/package.json +++ b/ant-design-vue-jeecg/package.json @@ -1,16 +1,16 @@ { - "name": "ant-design-vue-jeecg", - "version": "2.0.2", - "private": true, + "name": "vue-antd-jeecg", + "version": "2.1.0", + "private": false, "scripts": { - "serve": "vue-cli-service serve --open", + "pre": "cnpm install || yarn --registry https://registry.npm.taobao.org || npm install --registry https://registry.npm.taobao.org ", + "serve": "vue-cli-service serve", "build": "vue-cli-service build", - "lint": "vue-cli-service lint", - "test:unit": "vue-cli-service test:unit", - "test:e2e": "vue-cli-service test:e2e" + "lint": "vue-cli-service lint" }, "dependencies": { "@antv/data-set": "^0.10.2", + "@jeecg/antd-onine": "^1.0.1", "@tinymce/tinymce-vue": "^2.0.0", "ant-design-vue": "^1.3.9", "apexcharts": "^3.6.5", diff --git a/ant-design-vue-jeecg/public/index.html b/ant-design-vue-jeecg/public/index.html index 09d73f4d..d38c0220 100644 --- a/ant-design-vue-jeecg/public/index.html +++ b/ant-design-vue-jeecg/public/index.html @@ -242,9 +242,10 @@ @@ -261,15 +262,6 @@ - - - - \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/api/api.js b/ant-design-vue-jeecg/src/api/api.js index fa457410..d2956a79 100644 --- a/ant-design-vue-jeecg/src/api/api.js +++ b/ant-design-vue-jeecg/src/api/api.js @@ -45,11 +45,11 @@ const getPermissionRuleList = (params)=>getAction("/sys/permission/getPermRuleLi const queryPermissionRule = (params)=>getAction("/sys/permission/queryPermissionRule",params); // 部门管理 -const queryDepartTreeList = (params)=>getAction("/sysdepart/sysDepart/queryTreeList",params); -const queryIdTree = (params)=>getAction("/sysdepart/sysDepart/queryIdTree",params); -const queryParentName = (params)=>getAction("/sysdepart/sysDepart/queryParentName",params); -const searchByKeywords = (params)=>getAction("/sysdepart/sysDepart/searchBy",params); -const deleteByDepartId = (params)=>deleteAction("/sysdepart/sysDepart/delete",params); +const queryDepartTreeList = (params)=>getAction("/sys/sysDepart/queryTreeList",params); +const queryIdTree = (params)=>getAction("/sys/sysDepart/queryIdTree",params); +const queryParentName = (params)=>getAction("/sys/sysDepart/queryParentName",params); +const searchByKeywords = (params)=>getAction("/sys/sysDepart/searchBy",params); +const deleteByDepartId = (params)=>deleteAction("/sys/sysDepart/delete",params); //日志管理 //const getLogList = (params)=>getAction("/sys/log/list",params); diff --git a/ant-design-vue-jeecg/src/assets/logo-white.png b/ant-design-vue-jeecg/src/assets/logo-white.png new file mode 100644 index 00000000..6d5f2e84 Binary files /dev/null and b/ant-design-vue-jeecg/src/assets/logo-white.png differ diff --git a/ant-design-vue-jeecg/src/cas/sso.js b/ant-design-vue-jeecg/src/cas/sso.js new file mode 100644 index 00000000..dc230def --- /dev/null +++ b/ant-design-vue-jeecg/src/cas/sso.js @@ -0,0 +1,73 @@ +import Vue from 'vue' +import { ACCESS_TOKEN } from "@/store/mutation-types" +import store from '@/store' +/** + * 单点登录 + */ +const init = (callback) => { + console.log("-------单点登录开始-------"); + let token = Vue.ls.get(ACCESS_TOKEN); + let st = getUrlParam("ticket"); + var sevice = "http://"+window.location.host+"/"; + if(token){ + loginSuccess(callback); + }else{ + if(st){ + validateSt(st,sevice,callback); + }else{ + var serviceUrl = encodeURIComponent(sevice); + window.location.href = window._CONFIG['casPrefixUrl']+"/login?service="+serviceUrl; + } + } + console.log("-------单点登录结束-------"); +}; +const SSO = { + init: init +}; + +function getUrlParam(paraName) { + var url = document.location.toString(); + var arrObj = url.split("?"); + + if (arrObj.length > 1) { + var arrPara = arrObj[1].split("&"); + var arr; + + for (var i = 0; i < arrPara.length; i++) { + arr = arrPara[i].split("="); + + if (arr != null && arr[0] == paraName) { + return arr[1]; + } + } + return ""; + } + else { + return ""; + } +} + +function validateSt(ticket,service,callback){ + let params = { + ticket: ticket, + service:service + }; + store.dispatch('ValidateLogin',params).then(res => { + //this.departConfirm(res) + if(res.success){ + loginSuccess(callback); + }else{ + var sevice = "http://"+window.location.host+"/"; + var serviceUrl = encodeURIComponent(sevice); + window.location.href = window._CONFIG['casPrefixUrl']+"/login?service="+serviceUrl; + } + }).catch((err) => { + console.log(err); + //that.requestFailed(err); + }); +} + +function loginSuccess (callback) { + callback(); +} +export default SSO; \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/components/README.md b/ant-design-vue-jeecg/src/components/README.md index 4adb1073..1742c705 100644 --- a/ant-design-vue-jeecg/src/components/README.md +++ b/ant-design-vue-jeecg/src/components/README.md @@ -39,3 +39,5 @@ UserMenu.vue:首页右上侧的内容 ![输入图片说明](https://static.oschina.net/uploads/img/201904/12201226_laQK.png "在这里输入图片标题") ####16.trend包 趋势显示组件(如下图) ![输入图片说明](https://static.oschina.net/uploads/img/201904/12201600_Wo8K.png "在这里输入图片标题") +![corn表达式](https://oscimg.oschina.net/oscnet/661f9ac09016395f9f49286143af3241623.jpg) +![corn控件添加清除按钮](https://oscimg.oschina.net/oscnet/15096e49f2e29bd829e304d56770025d03c.jpg) \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/components/chart/DashChartDemo.vue b/ant-design-vue-jeecg/src/components/chart/DashChartDemo.vue index 07d9b8ce..9f00127b 100644 --- a/ant-design-vue-jeecg/src/components/chart/DashChartDemo.vue +++ b/ant-design-vue-jeecg/src/components/chart/DashChartDemo.vue @@ -32,7 +32,7 @@ type="arc" :zIndex="1" :start="arcGuide2Start" - :end="getArcGuide2End" + :end="getArcGuide2End()" :vStyle="arcGuide2Style" > +
+ + + + + +
+ + + diff --git a/ant-design-vue-jeecg/src/components/jeecg/JEditableTable.vue b/ant-design-vue-jeecg/src/components/jeecg/JEditableTable.vue index f2a5d1ad..0a9c9414 100644 --- a/ant-design-vue-jeecg/src/components/jeecg/JEditableTable.vue +++ b/ant-design-vue-jeecg/src/components/jeecg/JEditableTable.vue @@ -1,5 +1,5 @@ - +