diff --git a/README.md b/README.md index 93b031ef..decfc584 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ JEECG BOOT 低代码开发平台(前后端分离版本) =============== -当前最新版本: 2.4.0(发布日期:2020-12-01) +当前最新版本: 2.4.2(发布日期:2021-01-26) [![AUR](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://github.com/zhangdaiscott/jeecg-boot/blob/master/LICENSE) diff --git a/ant-design-vue-jeecg/.env b/ant-design-vue-jeecg/.env index 8745553e..a184f564 100644 --- a/ant-design-vue-jeecg/.env +++ b/ant-design-vue-jeecg/.env @@ -1,3 +1,3 @@ NODE_ENV=production -VUE_APP_PLATFORM_NAME=Jeecg-Boot 企业级快速开发平台 +VUE_APP_PLATFORM_NAME=JeecgBoot 企业级快速开发平台 VUE_APP_SSO=false \ No newline at end of file diff --git a/ant-design-vue-jeecg/.eslintignore b/ant-design-vue-jeecg/.eslintignore deleted file mode 100644 index dbc86908..00000000 --- a/ant-design-vue-jeecg/.eslintignore +++ /dev/null @@ -1 +0,0 @@ -/src \ No newline at end of file diff --git a/ant-design-vue-jeecg/README.md b/ant-design-vue-jeecg/README.md index e10b24e2..ed50e497 100644 --- a/ant-design-vue-jeecg/README.md +++ b/ant-design-vue-jeecg/README.md @@ -1,7 +1,7 @@ Ant Design Jeecg Vue ==== -当前最新版本: 2.4.0(发布日期:20201201) +当前最新版本: 2.4.2(发布日期:20210126) Overview ---- diff --git a/ant-design-vue-jeecg/package.json b/ant-design-vue-jeecg/package.json index 3c46d11f..04d33e2e 100644 --- a/ant-design-vue-jeecg/package.json +++ b/ant-design-vue-jeecg/package.json @@ -1,6 +1,6 @@ { "name": "vue-antd-jeecg", - "version": "2.4.0", + "version": "2.4.2", "private": true, "scripts": { "pre": "cnpm install || yarn --registry https://registry.npm.taobao.org || npm install --registry https://registry.npm.taobao.org ", @@ -10,7 +10,7 @@ "lint": "vue-cli-service lint" }, "dependencies": { - "@jeecg/antd-online-mini": "2.4.0-beta4", + "@jeecg/antd-online-mini": "2.4.21-beta", "ant-design-vue": "^1.7.2", "@antv/data-set": "^0.11.4", "viser-vue": "^2.4.8", diff --git a/ant-design-vue-jeecg/public/cdn/font-icon/font_2316098_umqusozousr.js b/ant-design-vue-jeecg/public/cdn/font-icon/font_2316098_umqusozousr.js new file mode 100644 index 00000000..b098acff --- /dev/null +++ b/ant-design-vue-jeecg/public/cdn/font-icon/font_2316098_umqusozousr.js @@ -0,0 +1 @@ +!function(c){var a,t,e,i,l,n,o='',d=(d=document.getElementsByTagName("script"))[d.length-1].getAttribute("data-injectcss");if(d&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(c){console&&console.log(c)}}function h(){l||(l=!0,e())}a=function(){var c,a,t,e;(e=document.createElement("div")).innerHTML=o,o=null,(t=e.getElementsByTagName("svg")[0])&&(t.setAttribute("aria-hidden","true"),t.style.position="absolute",t.style.width=0,t.style.height=0,t.style.overflow="hidden",c=t,(a=document.body).firstChild?(e=c,(t=a.firstChild).parentNode.insertBefore(e,t)):a.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(a,0):(t=function(){document.removeEventListener("DOMContentLoaded",t,!1),a()},document.addEventListener("DOMContentLoaded",t,!1)):document.attachEvent&&(e=a,i=c.document,l=!1,(n=function(){try{i.documentElement.doScroll("left")}catch(c){return void setTimeout(n,50)}h()})(),i.onreadystatechange=function(){"complete"==i.readyState&&(i.onreadystatechange=null,h())})}(window); \ No newline at end of file diff --git a/ant-design-vue-jeecg/public/color.less b/ant-design-vue-jeecg/public/color.less index 95366c98..0f799c1d 100644 --- a/ant-design-vue-jeecg/public/color.less +++ b/ant-design-vue-jeecg/public/color.less @@ -2421,7 +2421,9 @@ a.listItemMetaTitle { color: rgba(0, 0, 0, 0.85); } .main { - background-color: #fff; + //update-begin---author:liusq Date:20210108 for:[JT-409]编译主题色,然后退出登录后的首页是这样子------------ + //background-color: #fff; + //update-end---author:liusq Date:20210108 for:[JT-409]编译主题色,然后退出登录后的首页是这样子------------ } .main .leftmenu { border-right: 1px solid #e8e8e8; @@ -7687,9 +7689,6 @@ font.weak { color: @primary-color; } } -.ant-menu-submenu-selected { - color: @primary-color; -} // begin -------- JAreaLinkage 三级联动样式 -------------- .cascader-menu-list .cascader-menu-option.hover, diff --git a/ant-design-vue-jeecg/public/index.html b/ant-design-vue-jeecg/public/index.html index bdbcfee2..e4e81bd8 100644 --- a/ant-design-vue-jeecg/public/index.html +++ b/ant-design-vue-jeecg/public/index.html @@ -5,7 +5,7 @@ - Jeecg-Boot 企业级快速开发平台 + JeecgBoot 企业级快速开发平台 \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/components/jeecg/JEditableTable.vue b/ant-design-vue-jeecg/src/components/jeecg/JEditableTable.vue index 31029757..13ebedaa 100644 --- a/ant-design-vue-jeecg/src/components/jeecg/JEditableTable.vue +++ b/ant-design-vue-jeecg/src/components/jeecg/JEditableTable.vue @@ -11,13 +11,13 @@
- 新增 + 新增