From 8b0ee2d0a2b4ef98fb776eef6b606b0bc2d96073 Mon Sep 17 00:00:00 2001 From: zhangdaiscott Date: Sat, 23 Jan 2021 23:59:31 +0800 Subject: [PATCH] =?UTF-8?q?JeecgBoot=202.4.2=20=E7=A7=AF=E6=9C=A8=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E7=89=88=E6=9C=AC=E5=8F=91=E5=B8=83=EF=BC=8C=E5=9F=BA?= =?UTF-8?q?=E4=BA=8ESpringBoot=E7=9A=84=E4=BD=8E=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- ant-design-vue-jeecg/.env | 2 +- ant-design-vue-jeecg/.eslintignore | 1 - ant-design-vue-jeecg/README.md | 2 +- ant-design-vue-jeecg/package.json | 4 +- .../cdn/font-icon/font_2316098_umqusozousr.js | 1 + ant-design-vue-jeecg/public/color.less | 7 +- ant-design-vue-jeecg/public/index.html | 4 +- ant-design-vue-jeecg/src/api/api.js | 5 +- .../src/components/dict/JMultiSelectTag.vue | 32 +- .../src/components/dict/JSearchSelectTag.vue | 49 +- .../src/components/dict/index.js | 5 + .../src/components/jeecg/JCodeEditor.vue | 3 + .../src/components/jeecg/JCodeEditor2.vue | 282 - .../src/components/jeecg/JEditableTable.vue | 213 +- .../src/components/jeecg/JPopup.vue | 13 +- .../src/components/jeecg/JSelectMultiple.vue | 28 +- .../src/components/jeecg/JSuperQuery.vue | 33 +- .../src/components/jeecg/JUpload.vue | 19 +- .../JVxeTable/components/JVxeSubPopover.vue | 24 +- .../jeecg/JVxeTable/components/JVxeTable.js | 30 +- .../JVxeTable/components/JVxeToolbar.vue | 2 +- .../components/cells/JVxeDepartSelectCell.vue | 138 + .../components/cells/JVxeUserSelectCell.vue | 136 + .../src/components/jeecg/JVxeTable/index.js | 46 +- .../src/components/jeecg/JVxeTable/install.js | 4 +- .../components/jeecg/JVxeTable/jvxeTypes.js | 44 + .../components/jeecg/dynamic/JEditorDyn.vue | 246 - .../components/jeecg/dynamic/JMdEditorDyn.vue | 142 - .../jeecg/dynamic/JSqlCodeEditorDyn.vue | 325 - .../jeecg/dynamic/JsCodeEditorDyn.vue | 319 - .../src/components/jeecg/dynamic/Resource.js | 24 - .../src/components/jeecg/dynamic/cm_hint.js | 177 - .../components/jeecg/dynamic/cm_sql_hint.js | 305 - .../src/components/jeecg/dynamic/load.js | 92 - .../src/components/jeecg/index.js | 14 + .../src/components/jeecg/minipop/JFilePop.vue | 3 +- .../jeecg/modal/JPopupOnlReport.vue | 2 +- .../src/components/jeecgbiz/JSelectDepart.vue | 23 + .../components/jeecgbiz/JSelectUserByDep.vue | 22 + .../jeecgbiz/modal/JSelectDepartModal.vue | 1 + .../jeecgbiz/modal/JSelectUserByDepModal.vue | 1 + .../src/components/layouts/TabLayout.vue | 16 +- .../src/components/lazy_antd.js | 8 + .../src/components/menu/SideMenu.vue | 35 +- .../src/components/page/GlobalHeader.vue | 1 + .../src/components/page/GlobalLayout.vue | 55 +- .../src/components/setting/SettingDrawer.vue | 11 +- .../src/mixins/JEditableTableMixin.js | 12 +- .../src/mixins/JeecgListMixin.js | 22 +- .../src/store/modules/user.js | 2 + .../src/store/mutation-types.js | 1 - .../src/utils/JEditableTableUtil.js | 3 +- ant-design-vue-jeecg/src/utils/authFilter.js | 31 + .../src/utils/hasPermission.js | 1 + ant-design-vue-jeecg/src/utils/request.js | 1 - ant-design-vue-jeecg/src/utils/util.js | 21 + .../src/views/jeecg/JVxeDemo/JVxeDemo1.vue | 2 +- .../src/views/jeecg/SelectDemo.vue | 7 +- .../src/views/jeecg/helloworld.vue | 6 + .../src/views/system/DictItemList.vue | 3 + .../src/views/system/NewPermissionList.vue | 14 +- .../src/views/system/SysAnnouncementList.vue | 6 + .../src/views/system/SysCategoryList.vue | 56 +- .../src/views/system/SysPositionList.vue | 2 +- .../src/views/system/UserList.vue | 20 +- .../views/system/modules/DictItemModal.vue | 18 +- .../views/system/modules/PermissionModal.vue | 4 +- .../src/views/system/modules/RoleModal.vue | 6 +- .../system/modules/SysDataSourceModal.vue | 14 +- .../src/views/user/LoginSelectTenant.vue | 2 +- .../src/views/user/third/ThirdLogin.vue | 11 +- ant-design-vue-jeecg/vue.config.js | 11 - ant-design-vue-jeecg/yarn | 0 ant-design-vue-jeecg/yarn.lock | 2601 +- jeecg-boot/README.md | 2 +- jeecg-boot/db/jeecgboot-oracle11g.sql | 9453 -------- jeecg-boot/db/jeecgboot-sqlserver2017.sql | 19865 ---------------- .../db/增量SQL/2.3升级到2.4增量mysql.sql | 94 - .../db/增量SQL/2.4升级到2.4.2增量mysql.sql | 28 + jeecg-boot/db/增量SQL/版本升级说明.txt | 10 - .../jeecg-system-cloud-api/pom.xml | 2 +- .../jeecg/common/system/api/ISysBaseAPI.java | 26 +- .../api/fallback/SysBaseAPIFallback.java | 14 + .../jeecg-system-local-api/pom.xml | 2 +- .../jeecg/common/system/api/ISysBaseAPI.java | 24 +- .../jeecg-boot-base-api/pom.xml | 2 +- .../jeecg-boot-base-core/pom.xml | 34 +- .../jeecg/common/constant/CacheConstant.java | 2 +- .../common/constant/ProvinceCityArea.java | 10 +- .../common/es/JeecgElasticsearchTemplate.java | 2 +- .../common/system/query/MatchTypeEnum.java | 1 - .../common/system/query/QueryGenerator.java | 112 +- .../common/system/query/QueryRuleEnum.java | 2 + .../org/jeecg/common/util/CommonUtils.java | 4 - .../java/org/jeecg/common/util/DySmsEnum.java | 2 +- .../jeecg/common/util/FieldPresenceUtil.java | 436 - .../org/jeecg/common/util/FillRuleUtil.java | 2 +- .../java/org/jeecg/common/util/HTMLUtils.java | 2 +- .../java/org/jeecg/common/util/IPUtils.java | 2 +- .../jeecg/common/util/ImportExcelUtil.java | 4 +- .../java/org/jeecg/common/util/MinioUtil.java | 46 +- .../java/org/jeecg/common/util/RedisUtil.java | 44 +- .../java/org/jeecg/common/util/RestUtil.java | 2 +- .../org/jeecg/common/util/TokenUtils.java | 2 +- .../common/util/dynamic/db/DynamicDBUtil.java | 2 +- .../dynamic/db/FreemarkerParseFactory.java | 2 +- .../common/util/dynamic/db/SqlUtils.java | 2 +- .../util/jsonschema/CommonProperty.java | 13 + .../org/jeecg/common/util/oConvertUtils.java | 19 + .../jeecg/common/util/oss/OssBootUtil.java | 13 + .../config/JacksonAutoConfiguration.java | 167 - .../org/jeecg/config/JeecgCloudCondition.java | 22 + .../config/mybatis/MybatisPlusConfig.java | 3 +- .../org/jeecg/config/shiro/ShiroConfig.java | 17 +- .../org/jeecg/config/shiro/ShiroRealm.java | 2 +- .../filters/CustomShiroFilterFactoryBean.java | 76 + .../jeecg/config/shiro/filters/JwtFilter.java | 5 + .../service/impl/BaseCommonServiceImpl.java | 19 +- .../jeecg-boot-base-tools/pom.xml | 2 +- jeecg-boot/jeecg-boot-base/pom.xml | 2 +- jeecg-boot/jeecg-boot-module-demo/pom.xml | 7 +- .../java/org/jeecg/JeecgDemoApplication.java | 30 +- .../vxe/controller/VxeMockController.java | 2 +- .../test/controller/JoaDemoController.java | 2 +- .../demo/test/controller/MinioController.java | 84 - .../dlglong/controller/DlMockController.java | 2 +- .../jeecg-boot-module-system/Dockerfile | 4 +- jeecg-boot/jeecg-boot-module-system/pom.xml | 22 +- .../org/jeecg/JeecgSystemApplication.java | 18 +- .../init/SystemInitListener.java | 7 +- .../jimureport/JimuReportTokenService.java | 41 + .../api/controller/SystemAPIController.java | 33 +- .../message/websocket/SocketHandler.java | 29 + .../websocket/TestSocketController.java | 4 +- .../modules/message/websocket/WebSocket.java | 166 +- .../controller/ActuatorRedisController.java | 50 +- .../modules/monitor/service/RedisService.java | 8 +- .../service/impl/RedisServiceImpl.java | 47 + .../service/impl/NgAlainServiceImpl.java | 1 - .../oss/service/impl/OSSFileServiceImpl.java | 5 +- .../controller/SysAnnouncementController.java | 24 +- .../controller/SysCategoryController.java | 28 +- .../system/controller/SysDictController.java | 40 +- .../controller/SysDictItemController.java | 31 + .../controller/SysPermissionController.java | 1 + .../system/controller/SysUserController.java | 8 +- .../modules/system/entity/SysCategory.java | 11 +- .../modules/system/entity/SysDepart.java | 2 +- .../system/entity/SysGatewayRoute.java | 4 +- .../modules/system/mapper/SysDictMapper.java | 15 +- .../system/service/ISysCategoryService.java | 6 + .../system/service/ISysDictService.java | 11 +- .../system/service/impl/SysBaseApiImpl.java | 44 +- .../service/impl/SysCategoryServiceImpl.java | 97 + .../service/impl/SysDictServiceImpl.java | 12 +- .../impl/SysThirdAccountServiceImpl.java | 2 + .../src/main/resources/application-dev.yml | 16 +- .../src/main/resources/application-prod.yml | 28 +- .../src/main/resources/application-test.yml | 4 +- .../src/main/resources/application.yml | 2 + .../src/main/resources/banner.txt | 2 +- .../code-template-online/common/blob.ftl | 32 + .../code-template-online/common/utils.ftl | 10 + .../common/validatorRulesTemplate/core.ftl | 9 +- .../entity/${entityName}.javai | 33 +- .../vue/${entityName}List.vuei | 92 +- .../vue/modules/${entityName}Form.vuei | 118 +- .../entity/${entityName}.javai | 35 +- .../${entityPackage}/entity/[1-n]Entity.javai | 5 +- .../vo/${entityName}Page.javai | 6 +- .../vue/${entityName}List.vuei | 81 +- .../vue/modules/${entityName}Form.vuei | 123 +- .../vue/modules/[1-n]Form.vuei | 121 +- .../entity/${entityName}.javai | 5 +- .../vue/${entityName}List.vuei | 95 +- .../vue/modules/${entityName}Modal.vuei | 134 +- .../entity/${entityName}.javai | 34 +- .../${entityPackage}/entity/[1-n]Entity.javai | 5 +- .../vue/${entityName}List.vuei | 84 +- .../${entityPackage}/vue/[1-n]List.vuei | 4 +- .../vue/modules/${entityName}Modal.vuei | 114 +- .../vue/modules/[1-n]Modal.vuei | 113 +- .../entity/${entityName}.javai | 34 +- .../${entityPackage}/entity/[1-n]Entity.javai | 5 +- .../vo/${entityName}Page.javai | 6 +- .../vue/${entityName}List.vuei | 4 +- .../vue/modules/${entityName}Modal.vuei | 124 +- .../vue/modules/[1-n]Form.vuei | 77 +- .../vue/subTables/[1-n]SubTable.vuei | 4 +- .../entity/${entityName}.javai | 34 +- .../${entityPackage}/entity/[1-n]Entity.javai | 5 +- .../vo/${entityName}Page.javai | 6 +- .../vue/${entityName}List.vuei | 79 +- .../vue/modules/${entityName}Form.vuei | 125 +- .../vue/modules/[1-n]Form.vuei | 123 +- .../entity/${entityName}.javai | 34 +- .../${entityPackage}/entity/[1-n]Entity.javai | 5 +- .../vo/${entityName}Page.javai | 6 +- .../vue/${entityName}List.vuei | 83 +- .../vue/modules/${entityName}Modal.vuei | 124 +- .../vue/modules/[1-n]Form.vuei | 201 + .../resources/jeecg/jeecg_config.properties | 7 +- .../src/test/java/org/jeecg/SampleTest.java | 2 +- .../online/desform/test/DesformApiTest.java | 3 +- .../online/desform/test/OnlineApiTest.java | 190 + .../modules/system/test/SysUserTest.java | 188 + .../nacos/jeecg-gateway-router.json | 2 +- .../jeecg-boot-starter-cloud/pom.xml | 2 +- .../src/main/resources/bootstrap.yml | 2 - .../jeecg-boot-starter-job/pom.xml | 2 +- .../jeecg-boot-starter-lock/pom.xml | 2 +- .../lock/annotation/DistributedLock.java | 28 +- .../lock/aspect/DistributedLockHandler.java | 218 +- .../lock/client/RedissonLockClient.java | 20 +- .../lock/config/RedissonConfiguration.java | 23 +- .../boot/starter/lock/enums/LockModel.java | 22 + .../jeecg-boot-starter-rabbitmq/pom.xml | 2 +- .../rabbitmq/client/RabbitMqClient.java | 2 +- .../jeecg-boot-starter-redis/pom.xml | 2 +- .../redis/client/JeecgRedisClient.java | 3 +- .../redis/config/RedisConfiguration.java | 5 +- jeecg-boot/jeecg-boot-starter/pom.xml | 5 +- jeecg-boot/jeecg-cloud-module/doc/README.md | 7 - .../jeecg-cloud-module/docker-compose.yml | 70 + .../jeecg-cloud-demo/Dockerfile | 16 + .../jeecg-cloud-demo/pom.xml | 2 +- .../jeecg-cloud-gateway/pom.xml | 2 +- .../org/jeecg/loader/DynamicRouteLoader.java | 5 +- .../src/main/resources/application.yml | 2 +- .../src/main/resources/logback-spring.xml | 59 - .../jeecg-cloud-monitor/pom.xml | 2 +- .../src/main/resources/application.yml | 2 - .../jeecg-cloud-system-start/Dockerfile | 16 + .../jeecg-cloud-system-start/pom.xml | 12 +- .../jeecg-cloud-xxljob/pom.xml | 2 +- jeecg-boot/jeecg-cloud-module/pom.xml | 2 +- jeecg-boot/pom.xml | 75 +- 238 files changed, 4705 insertions(+), 36006 deletions(-) delete mode 100644 ant-design-vue-jeecg/.eslintignore create mode 100644 ant-design-vue-jeecg/public/cdn/font-icon/font_2316098_umqusozousr.js delete mode 100644 ant-design-vue-jeecg/src/components/jeecg/JCodeEditor2.vue create mode 100644 ant-design-vue-jeecg/src/components/jeecg/JVxeTable/components/cells/JVxeDepartSelectCell.vue create mode 100644 ant-design-vue-jeecg/src/components/jeecg/JVxeTable/components/cells/JVxeUserSelectCell.vue create mode 100644 ant-design-vue-jeecg/src/components/jeecg/JVxeTable/jvxeTypes.js delete mode 100644 ant-design-vue-jeecg/src/components/jeecg/dynamic/JEditorDyn.vue delete mode 100644 ant-design-vue-jeecg/src/components/jeecg/dynamic/JMdEditorDyn.vue delete mode 100644 ant-design-vue-jeecg/src/components/jeecg/dynamic/JSqlCodeEditorDyn.vue delete mode 100644 ant-design-vue-jeecg/src/components/jeecg/dynamic/JsCodeEditorDyn.vue delete mode 100644 ant-design-vue-jeecg/src/components/jeecg/dynamic/Resource.js delete mode 100644 ant-design-vue-jeecg/src/components/jeecg/dynamic/cm_hint.js delete mode 100644 ant-design-vue-jeecg/src/components/jeecg/dynamic/cm_sql_hint.js delete mode 100644 ant-design-vue-jeecg/src/components/jeecg/dynamic/load.js delete mode 100644 ant-design-vue-jeecg/yarn delete mode 100644 jeecg-boot/db/jeecgboot-oracle11g.sql delete mode 100644 jeecg-boot/db/jeecgboot-sqlserver2017.sql delete mode 100644 jeecg-boot/db/增量SQL/2.3升级到2.4增量mysql.sql create mode 100644 jeecg-boot/db/增量SQL/2.4升级到2.4.2增量mysql.sql delete mode 100644 jeecg-boot/db/增量SQL/版本升级说明.txt delete mode 100644 jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FieldPresenceUtil.java delete mode 100644 jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/JacksonAutoConfiguration.java create mode 100644 jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/JeecgCloudCondition.java create mode 100644 jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/CustomShiroFilterFactoryBean.java delete mode 100644 jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/MinioController.java rename jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/{modules => config}/init/SystemInitListener.java (81%) create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/config/jimureport/JimuReportTokenService.java create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/websocket/SocketHandler.java create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/common/blob.ftl create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei rename jeecg-boot/{jeecg-boot-module-demo => jeecg-boot-module-system}/src/test/java/org/jeecg/SampleTest.java (97%) create mode 100644 jeecg-boot/jeecg-boot-module-system/src/test/java/org/jeecg/modules/online/desform/test/OnlineApiTest.java create mode 100644 jeecg-boot/jeecg-boot-module-system/src/test/java/org/jeecg/modules/system/test/SysUserTest.java create mode 100644 jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/src/main/java/org/jeecg/boot/starter/lock/enums/LockModel.java delete mode 100644 jeecg-boot/jeecg-cloud-module/doc/README.md create mode 100644 jeecg-boot/jeecg-cloud-module/docker-compose.yml create mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-demo/Dockerfile delete mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/src/main/resources/logback-spring.xml create mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/Dockerfile 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 @@
- 新增 + 新增