From f8c7ddd2230c201aa538c33a089754aa617e83eb Mon Sep 17 00:00:00 2001 From: zhangdaiscott Date: Thu, 24 Feb 2022 15:13:05 +0800 Subject: [PATCH] =?UTF-8?q?JeecgBoot=203.1.0=20=E7=89=88=E6=9C=AC=E5=8F=91?= =?UTF-8?q?=E5=B8=83=EF=BC=8C=E5=9F=BA=E4=BA=8E=E4=BB=A3=E7=A0=81=E7=94=9F?= =?UTF-8?q?=E6=88=90=E5=99=A8=E7=9A=84=E4=BC=81=E4=B8=9A=E7=BA=A7=E4=BD=8E?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=B9=B3=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 9 +- ant-design-vue-jeecg/.env | 5 +- ant-design-vue-jeecg/.env.development | 5 +- ant-design-vue-jeecg/README.md | 2 +- ant-design-vue-jeecg/package.json | 5 +- ant-design-vue-jeecg/public/index.html | 4 +- ant-design-vue-jeecg/public/static/config.js | 11 + .../src/assets/less/AppIcon.less | 33 + .../src/components/dict/JSearchSelectTag.vue | 12 +- .../jeecg/JEasyCron/tabs/mixin.less | 7 + .../components/jeecg/JEasyCron/tabs/week.vue | 6 +- .../src/components/jeecg/JEditableTable.vue | 8 +- .../src/components/jeecg/JPopup.vue | 4 + .../src/components/jeecg/JSuperQuery.vue | 13 +- .../jeecg/JVxeTable/components/JVxeTable.js | 4 +- .../JVxeTable/components/JVxeToolbar.vue | 1 + .../components/cells/JVxeDepartSelectCell.vue | 6 +- .../components/cells/JVxeUserSelectCell.vue | 6 +- .../components/jeecg/minipop/JInputPop.vue | 4 + .../jeecg/modal/JPopupOnlReport.vue | 19 +- .../jeecgbiz/modal/JSelectDepartModal.vue | 42 +- .../jeecgbiz/modal/JSelectUserByDepModal.vue | 33 +- .../src/components/layouts/TabLayout.vue | 12 + .../src/components/menu/SideMenu.vue | 3 +- .../src/components/page/GlobalLayout.vue | 4 +- .../src/components/tools/ShowAnnouncement.vue | 10 + .../src/components/tools/UserMenu.vue | 22 +- ant-design-vue-jeecg/src/config/index.js | 6 +- .../src/config/router.config.js | 2 +- ant-design-vue-jeecg/src/qiankun/apps.js | 22 + ant-design-vue-jeecg/src/qiankun/index.js | 68 + ant-design-vue-jeecg/src/qiankun/state.js | 41 + ant-design-vue-jeecg/src/store/index.js | 2 +- .../src/utils/desform/CustomExpression.js | 8 + ant-design-vue-jeecg/src/utils/util.js | 32 +- .../src/views/jeecg/SelectDemo.vue | 13 +- .../src/views/jeecg/TableOrderTotal.vue | 231 + .../views/jeecg/modules/SplitPanelModal.vue | 4 +- .../views/modules/monitor/DiskMonitoring.vue | 7 +- .../src/views/modules/monitor/RedisInfo.vue | 6 +- .../src/views/system/DepartListSync.vue | 23 +- .../src/views/system/LogList.vue | 17 +- .../views/system/PermissionDataRuleList.vue | 13 +- .../src/views/system/QuartzJobList.vue | 3 +- .../src/views/system/RoleList.vue | 1 + .../src/views/system/RoleUserList.vue | 2 + .../src/views/system/SysAnnouncementList.vue | 6 +- .../src/views/system/SysFillRuleList.vue | 13 +- .../src/views/system/SysUserOnlineList.vue | 10 +- .../src/views/system/UserList.vue | 10 +- .../views/system/modules/AddressListLeft.vue | 15 +- .../views/system/modules/AddressListRight.vue | 2 +- .../src/views/system/modules/DeptBaseInfo.vue | 146 +- .../modules/PermissionDataRuleModal.vue | 2 +- .../system/modules/SelectUserListModal.vue | 20 +- .../system/modules/SysAnnouncementModal.vue | 233 +- .../system/modules/SysDepartRoleModal.vue | 6 +- .../system/modules/SysUserAgentModal.vue | 2 +- .../src/views/system/modules/UserModal.vue | 24 +- .../src/views/user/alteration/Step2.vue | 16 +- ant-design-vue-jeecg/vue.config.js | 13 +- ant-design-vue-jeecg/yarn.lock | 42 +- jeecg-boot/README.md | 2 +- jeecg-boot/db/jeecgboot-mysql-5.7.sql | 301 +- jeecg-boot/db/jeecgboot-oracle11g.sql | 104009 +----------- jeecg-boot/db/jeecgboot-sqlserver2017.sql | 126999 --------------- jeecg-boot/db/jeecgboot-sqlserver2019.sql | 26407 +++ jeecg-boot/db/tables_nacos.sql | 15 +- .../db/增量SQL/2.4.6升级到3.0增量脚本sql | 63 - .../db/增量SQL/3.0.0升级到3.1.0增量脚本sql | 36 + .../jeecg-system-cloud-api/pom.xml | 2 +- .../jeecg/common/bpm/api/IBpmBaseExtAPI.java | 12 +- .../common/online/api/IOnlineBaseExtAPI.java | 3 +- .../jeecg-system-local-api/pom.xml | 2 +- .../jeecg/common/bpm/api/IBpmBaseExtAPI.java | 6 +- .../jeecg-boot-base-api/pom.xml | 2 +- .../jeecg-boot-base-core/pom.xml | 2 +- .../java/org/jeecg/common/api/vo/Result.java | 22 +- .../jeecg/common/aspect/AutoLogAspect.java | 2 +- .../org/jeecg/common/aspect/DictAspect.java | 11 +- .../common/aspect/PermissionDataAspect.java | 20 +- .../org/jeecg/common/aspect/UrlMatchEnum.java | 10 +- .../common/aspect/annotation/AutoDict.java | 23 + .../common/aspect/annotation/AutoLowApp.java | 33 + .../jeecg/common/constant/CommonConstant.java | 18 +- .../common/constant/ProvinceCityArea.java | 69 +- .../common/constant/enums/LowAppAopEnum.java | 22 + .../constant/enums/RoleIndexConfigEnum.java | 33 +- .../base/controller/JeecgController.java | 11 +- .../common/system/query/QueryGenerator.java | 66 +- .../org/jeecg/common/system/util/JwtUtil.java | 5 +- .../org/jeecg/common/system/vo/DictModel.java | 6 + .../org/jeecg/common/util/CommonUtils.java | 36 + .../java/org/jeecg/common/util/MinioUtil.java | 5 +- .../jeecg/common/util/SqlInjectionUtil.java | 2 +- .../common/util/dynamic/db/DbTypeUtils.java | 2 +- .../jeecg/common/util/oss/OssBootUtil.java | 46 +- .../org/jeecg/config/AutoPoiDictConfig.java | 22 +- .../org/jeecg/config/JeeccgBaseConfig.java | 26 + .../java/org/jeecg/config/StaticConfig.java | 10 +- .../org/jeecg/config/shiro/ShiroConfig.java | 21 +- .../org/jeecg/config/shiro/ShiroRealm.java | 5 +- .../org/jeecg/config/sign/util/SignUtil.java | 7 +- .../main/java/org/jeecg/config/vo/Shiro.java | 18 + .../jeecg-boot-base-tools/pom.xml | 2 +- .../jeecg/common/constant/CacheConstant.java | 4 + jeecg-boot/jeecg-boot-base/pom.xml | 2 +- jeecg-boot/jeecg-boot-module-demo/pom.xml | 2 +- .../modules/demo/mock/MockController.java | 2 +- .../demo/online/OnlCgformDemoController.java | 117 + .../test/controller/JeecgDemoController.java | 11 +- ....java => JeecgOrderErpMainController.java} | 33 +- .../controller/JeecgOrderMainController.java | 2 +- .../jeecg-boot-module-system/Dockerfile | 4 +- jeecg-boot/jeecg-boot-module-system/pom.xml | 8 +- .../org/jeecg/JeecgSystemApplication.java | 8 + .../jimureport/JimuReportTokenService.java | 15 +- .../modules/ngalain/aop/LogRecordAspect.java | 92 +- .../ngalain/controller/NgAlainController.java | 172 +- .../controller/QuartzJobController.java | 18 +- .../jeecg/modules/quartz/job/SampleJob.java | 2 +- .../controller/DuplicateCheckController.java | 9 + .../system/controller/LoginController.java | 82 +- .../system/controller/MockVue3Controller.java | 19 - .../controller/SysAnnouncementController.java | 38 +- .../SysAnnouncementSendController.java | 6 + .../controller/SysCategoryController.java | 49 +- .../controller/SysCheckRuleController.java | 2 +- .../controller/SysDataSourceController.java | 2 + .../controller/SysDepartController.java | 11 +- .../SysDepartPermissionController.java | 2 +- .../controller/SysDepartRoleController.java | 2 +- .../system/controller/SysDictController.java | 19 +- .../controller/SysFillRuleController.java | 2 +- .../controller/SysPermissionController.java | 67 +- .../controller/SysPositionController.java | 5 +- .../controller/SysTenantController.java | 38 +- .../system/controller/SysUserController.java | 50 +- .../controller/SysUserOnlineController.java | 29 +- .../system/controller/ThirdAppController.java | 16 +- .../modules/system/entity/SysDepart.java | 2 +- .../modules/system/entity/SysPosition.java | 2 - .../system/entity/SysThirdAccount.java | 20 +- .../modules/system/mapper/SysDictMapper.java | 11 + .../system/mapper/xml/SysDictMapper.xml | 36 +- .../system/mapper/xml/SysUserDepartMapper.xml | 12 +- .../system/model/AnnouncementSendModel.java | 9 +- .../modules/system/rule/CategoryCodeRule.java | 3 + .../system/service/ISysDepartService.java | 2 +- .../system/service/ISysTenantService.java | 2 +- .../system/service/IThirdAppService.java | 2 +- .../system/service/impl/SysBaseApiImpl.java | 4 +- .../impl/SysDepartPermissionServiceImpl.java | 2 +- .../service/impl/SysDepartServiceImpl.java | 14 +- .../service/impl/SysDictServiceImpl.java | 38 +- .../service/impl/SysTenantServiceImpl.java | 6 +- .../impl/SysThirdAccountServiceImpl.java | 3 + .../impl/SysUserDepartServiceImpl.java | 21 +- .../service/impl/SysUserServiceImpl.java | 1 + .../impl/ThirdAppDingtalkServiceImpl.java | 78 +- .../ThirdAppWechatEnterpriseServiceImpl.java | 20 +- .../src/main/resources/application-prod.yml | 2 +- .../src/main/resources/banner.txt | 2 +- .../code-template-online/common/utils.ftl | 4 +- .../controller/${entityName}Controller.javai | 20 +- .../vue/modules/${entityName}Form.vuei | 4 +- .../vue3/${entityName}List.vuei | 218 + .../vue3/${entityName}__api.tsi | 61 + .../vue3/${entityName}__data.tsi | 354 + .../vue3/components/${entityName}Modal.vuei | 58 + .../controller/${entityName}Controller.javai | 2 +- .../vue/modules/${entityName}Form.vuei | 17 +- .../vue/modules/[1-n]Form.vuei | 15 +- .../controller/${entityName}Controller.javai | 2 +- .../vue3/${entityName}List.vuei | 272 + .../vue3/${entityName}__api.tsi | 82 + .../vue3/${entityName}__data.tsi | 354 + .../vue3/components/${entityName}Modal.vuei | 87 + .../controller/${entityName}Controller.javai | 4 +- .../vue/${entityName}List.vuei | 2 +- .../${entityPackage}/vue/[1-n]List.vuei | 15 +- .../vue3/${entityName}List.vuei | 236 + .../vue3/${entityName}__api.tsi | 113 + .../vue3/${entityName}__data.tsi | 601 + .../${entityPackage}/vue3/[1-n]List.vuei | 157 + .../vue3/components/${entityName}Modal.vuei | 58 + .../vue3/components/[1-n]Modal.vuei | 66 + .../controller/${entityName}Controller.javai | 2 +- .../vue/${entityName}List.vuei | 4 +- .../vue/modules/${entityName}Form.vuei | 17 +- .../vue/modules/[1-n]Form.vuei | 15 +- .../vue3/${entityName}List.vuei | 244 + .../vue3/${entityName}__api.tsi | 80 + .../vue3/${entityName}__data.tsi | 763 + .../vue3/components/${entityName}Modal.vuei | 179 + .../vue3/components/[1-n]Form.vuei | 64 + .../vue3/subTables/[1-n]SubTable.vuei | 69 + .../vue/modules/${entityName}Form.vuei | 17 +- .../vue/modules/[1-n]Form.vuei | 15 +- .../vue3/${entityName}List.vuei | 218 + .../vue3/${entityName}__api.tsi | 72 + .../vue3/${entityName}__data.tsi | 700 + .../vue3/components/${entityName}Modal.vuei | 179 + .../vue3/components/[1-n]Form.vuei | 64 + .../controller/${entityName}Controller.javai | 2 +- .../vue/modules/${entityName}Form.vuei | 21 +- .../vue/modules/[1-n]Form.vuei | 15 +- .../vue3/${entityName}List.vuei | 218 + .../vue3/${entityName}__api.tsi | 72 + .../vue3/${entityName}__data.tsi | 700 + .../vue3/components/${entityName}Modal.vuei | 183 + .../vue3/components/[1-n]Form.vuei | 64 + .../controller/${entityName}Controller.javai | 2 +- .../vue-app/${entityName}Form.vuei | 93 + .../vue-app/${entityName}List.vuei | 44 + .../vue3/${entityName}List.vuei | 153 + .../vue3/${entityName}__api.tsi | 61 + .../vue3/${entityName}__data.tsi | 56 + .../vue3/modules/${entityName}Modal.vuei | 56 + .../${entityName}Controller.javai | 2 +- .../${entityPackage}/${entityName}.javai | 0 .../${entityName}Mapper.javai | 0 .../xml/${entityName}Mapper.xml | 0 .../I${entityName}Service.javai | 0 .../impl/${entityName}ServiceImpl.javai | 0 .../${entityPackage}/${entityName}List.vuei | 0 .../modules/${entityName}Modal.vuei | 0 .../${entityName}Modal__Style#Drawer.vuei | 0 .../vue3/${entityName}List.vuei | 153 + .../vue3/${entityName}__api.tsi | 61 + .../vue3/${entityName}__data.tsi | 56 + .../vue3/modules/${entityName}Modal.vuei | 56 + .../controller/${entityName}Controller.javai | 2 +- .../vue3/${entityName}List.vuei | 152 + .../vue3/${entityName}__api.tsi | 72 + .../vue3/${entityName}__data.tsi | 95 + .../vue3/modules/${entityName}Modal.vuei | 119 + .../controller/${entityName}Controller.javai | 4 +- .../vue3/${entityName}List.vuei | 171 + .../vue3/${entityName}__api.tsi | 113 + .../vue3/${entityName}__data.tsi | 110 + .../${entityPackage}/vue3/[1-n]List.vuei | 147 + .../vue3/modules/${entityName}Modal.vuei | 56 + .../vue3/modules/[1-n]Modal.vuei | 64 + .../templates/announcement/showContent.ftl | 2 +- .../jeecg-boot-starter-cloud/pom.xml | 2 +- .../src/main/resources/bootstrap.yml | 4 +- .../jeecg-boot-starter-job/pom.xml | 2 +- .../jeecg-boot-starter-lock/pom.xml | 2 +- .../lock/aspect/DistributedLockHandler.java | 6 +- .../jeecg-boot-starter-rabbitmq/pom.xml | 2 +- .../jeecg-boot-starter-seata/pom.xml | 27 + .../jeecg-boot-starter-shardingsphere/pom.xml | 28 + .../config/DataSourceConfiguration.java | 78 + .../src/main/resources/application.yml | 3 + jeecg-boot/jeecg-boot-starter/pom.xml | 93 +- .../jeecg-cloud-gateway/Dockerfile | 4 +- .../jeecg-cloud-gateway/pom.xml | 2 +- .../src/main/resources/application.yml | 2 +- .../jeecg-cloud-monitor/pom.xml | 2 +- .../jeecg-cloud-nacos/Dockerfile | 4 +- .../jeecg-cloud-nacos/pom.xml | 2 +- .../jeecg-cloud-sentinel/pom.xml | 2 +- .../jeecg-cloud-system-start/Dockerfile | 4 +- .../jeecg-cloud-system-start/pom.xml | 2 +- .../jeecg-cloud-test-seata/pom.xml | 22 + .../controller/SeataOrderController.java | 59 + .../test/seata/dto/PlaceOrderRequest.java | 28 + .../test/seata/dto/ReduceBalanceRequest.java | 21 + .../test/seata/dto/ReduceStockRequest.java | 21 + .../test/seata/entity/SeataAccount.java | 30 + .../modules/test/seata/entity/SeataOrder.java | 44 + .../test/seata/entity/SeataProduct.java | 33 + .../modules/test/seata/enums/OrderStatus.java | 22 + .../test/seata/mapper/SeataAccountMapper.java | 16 + .../test/seata/mapper/SeataOrderMapper.java | 17 + .../test/seata/mapper/SeataProductMapper.java | 15 + .../seata/service/SeataAccountService.java | 15 + .../test/seata/service/SeataOrderService.java | 18 + .../seata/service/SeataProductService.java | 18 + .../service/impl/SeataAccountServiceImpl.java | 52 + .../service/impl/SeataOrderServiceImpl.java | 67 + .../service/impl/SeataProductServiceImpl.java | 57 + .../src/main/resources/application-seata.yml | 38 + .../src/main/resources/sql/schema-account.sql | 29 + .../src/main/resources/sql/schema-order.sql | 32 + .../src/main/resources/sql/schema-product.sql | 31 + .../src/main/resources/sql/seata.sql | 79 + .../src/main/resources/sql/undo_log.sql | 12 + .../doc/db.sql | 46 + .../jeecg-cloud-test-shardingsphere/pom.xml | 22 + .../StandardModTableShardAlgorithm.java | 86 + .../JeecgShardingDemoController.java | 49 + .../test/sharding/entity/ShardingSysLog.java | 109 + .../sharding/mapper/ShardingSysLogMapper.java | 15 + .../mapper/xml/ShardingSysLogMapper.xml | 5 + .../service/IShardingSysLogService.java | 14 + .../impl/ShardingSysLogServiceImpl.java | 19 + .../main/resources/application-sharding.yml | 42 + .../jeecg-cloud-test/pom.xml | 26 + .../jeecg-cloud-xxljob/Dockerfile | 4 +- .../jeecg-cloud-xxljob/pom.xml | 2 +- jeecg-boot/jeecg-cloud-module/pom.xml | 3 +- jeecg-boot/pom.xml | 20 +- 304 files changed, 40313 insertions(+), 230872 deletions(-) create mode 100644 ant-design-vue-jeecg/public/static/config.js create mode 100644 ant-design-vue-jeecg/src/assets/less/AppIcon.less create mode 100644 ant-design-vue-jeecg/src/qiankun/apps.js create mode 100644 ant-design-vue-jeecg/src/qiankun/index.js create mode 100644 ant-design-vue-jeecg/src/qiankun/state.js create mode 100644 ant-design-vue-jeecg/src/views/jeecg/TableOrderTotal.vue delete mode 100644 jeecg-boot/db/jeecgboot-sqlserver2017.sql create mode 100644 jeecg-boot/db/jeecgboot-sqlserver2019.sql delete mode 100644 jeecg-boot/db/增量SQL/2.4.6升级到3.0增量脚本sql create mode 100644 jeecg-boot/db/增量SQL/3.0.0升级到3.1.0增量脚本sql create mode 100644 jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/AutoDict.java create mode 100644 jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/AutoLowApp.java create mode 100644 jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/LowAppAopEnum.java create mode 100644 jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/vo/Shiro.java create mode 100644 jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/online/OnlCgformDemoController.java rename jeecg-boot/jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/{JeecgOrderTabMainController.java => JeecgOrderErpMainController.java} (92%) delete mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/MockVue3Controller.java create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__api.tsi create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__api.tsi create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__api.tsi create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/[1-n]List.vuei create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/[1-n]Modal.vuei create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__api.tsi create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/[1-n]Form.vuei create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/subTables/[1-n]SubTable.vuei create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__api.tsi create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/[1-n]Form.vuei create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__api.tsi create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/[1-n]Form.vuei create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/vue-app/${entityName}Form.vuei create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/vue-app/${entityName}List.vuei create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__api.tsi create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/vue3/modules/${entityName}Modal.vuei rename jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/{ => ${entityPackage}}/controller/${entityPackage}/${entityName}Controller.javai (98%) rename jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/{ => ${entityPackage}}/entity/${entityPackage}/${entityName}.javai (100%) rename jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/{ => ${entityPackage}}/mapper/${entityPackage}/${entityName}Mapper.javai (100%) rename jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/{ => ${entityPackage}}/mapper/${entityPackage}/xml/${entityName}Mapper.xml (100%) rename jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/{ => ${entityPackage}}/service/${entityPackage}/I${entityName}Service.javai (100%) rename jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/{ => ${entityPackage}}/service/${entityPackage}/impl/${entityName}ServiceImpl.javai (100%) rename jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/{ => ${entityPackage}}/vue/${entityPackage}/${entityName}List.vuei (100%) rename jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/{ => ${entityPackage}}/vue/${entityPackage}/modules/${entityName}Modal.vuei (100%) rename jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/{ => ${entityPackage}}/vue/${entityPackage}/modules/${entityName}Modal__Style#Drawer.vuei (100%) create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__api.tsi create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/one2/java/${bussiPackage}/${entityPackage}/vue3/modules/${entityName}Modal.vuei create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__api.tsi create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue3/modules/${entityName}Modal.vuei create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__api.tsi create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue3/[1-n]List.vuei create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue3/modules/${entityName}Modal.vuei create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue3/modules/[1-n]Modal.vuei create mode 100644 jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-seata/pom.xml create mode 100644 jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-shardingsphere/pom.xml create mode 100644 jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-shardingsphere/src/main/java/org/jeecg/boot/shardingsphere/config/DataSourceConfiguration.java create mode 100644 jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-shardingsphere/src/main/resources/application.yml create mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/pom.xml create mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/src/main/java/org/jeecg/modules/test/seata/controller/SeataOrderController.java create mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/src/main/java/org/jeecg/modules/test/seata/dto/PlaceOrderRequest.java create mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/src/main/java/org/jeecg/modules/test/seata/dto/ReduceBalanceRequest.java create mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/src/main/java/org/jeecg/modules/test/seata/dto/ReduceStockRequest.java create mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/src/main/java/org/jeecg/modules/test/seata/entity/SeataAccount.java create mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/src/main/java/org/jeecg/modules/test/seata/entity/SeataOrder.java create mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/src/main/java/org/jeecg/modules/test/seata/entity/SeataProduct.java create mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/src/main/java/org/jeecg/modules/test/seata/enums/OrderStatus.java create mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/src/main/java/org/jeecg/modules/test/seata/mapper/SeataAccountMapper.java create mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/src/main/java/org/jeecg/modules/test/seata/mapper/SeataOrderMapper.java create mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/src/main/java/org/jeecg/modules/test/seata/mapper/SeataProductMapper.java create mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/src/main/java/org/jeecg/modules/test/seata/service/SeataAccountService.java create mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/src/main/java/org/jeecg/modules/test/seata/service/SeataOrderService.java create mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/src/main/java/org/jeecg/modules/test/seata/service/SeataProductService.java create mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/src/main/java/org/jeecg/modules/test/seata/service/impl/SeataAccountServiceImpl.java create mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/src/main/java/org/jeecg/modules/test/seata/service/impl/SeataOrderServiceImpl.java create mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/src/main/java/org/jeecg/modules/test/seata/service/impl/SeataProductServiceImpl.java create mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/src/main/resources/application-seata.yml create mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/src/main/resources/sql/schema-account.sql create mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/src/main/resources/sql/schema-order.sql create mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/src/main/resources/sql/schema-product.sql create mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/src/main/resources/sql/seata.sql create mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/src/main/resources/sql/undo_log.sql create mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/doc/db.sql create mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/pom.xml create mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/src/main/java/org/jeecg/modules/test/sharding/algorithm/StandardModTableShardAlgorithm.java create mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/src/main/java/org/jeecg/modules/test/sharding/controller/JeecgShardingDemoController.java create mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/src/main/java/org/jeecg/modules/test/sharding/entity/ShardingSysLog.java create mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/src/main/java/org/jeecg/modules/test/sharding/mapper/ShardingSysLogMapper.java create mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/src/main/java/org/jeecg/modules/test/sharding/mapper/xml/ShardingSysLogMapper.xml create mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/src/main/java/org/jeecg/modules/test/sharding/service/IShardingSysLogService.java create mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/src/main/java/org/jeecg/modules/test/sharding/service/impl/ShardingSysLogServiceImpl.java create mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/src/main/resources/application-sharding.yml create mode 100644 jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/pom.xml diff --git a/README.md b/README.md index 11f71f54..360b4d44 100644 --- a/README.md +++ b/README.md @@ -7,17 +7,16 @@ JEECG BOOT 低代码开发平台（前后端分离版本） =============== -当前最新版本： 3.0（发布日期：2021-11-01） +当前最新版本： 3.1.0（发布日期：2022-03-01） [![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-北京国炬软件-orange.svg)](http://www.jeecg.com) [![](https://img.shields.io/badge/Blog-官方博客-blue.svg)](https://jeecg.blog.csdn.net) -[![](https://img.shields.io/badge/version-3.0-brightgreen.svg)](https://github.com/zhangdaiscott/jeecg-boot) +[![](https://img.shields.io/badge/version-3.1.0-brightgreen.svg)](https://github.com/zhangdaiscott/jeecg-boot) [![GitHub stars](https://img.shields.io/github/stars/zhangdaiscott/jeecg-boot.svg?style=social&label=Stars)](https://github.com/zhangdaiscott/jeecg-boot) [![GitHub forks](https://img.shields.io/github/forks/zhangdaiscott/jeecg-boot.svg?style=social&label=Fork)](https://github.com/zhangdaiscott/jeecg-boot) -

新年快乐！！！

项目介绍： @@ -48,8 +47,6 @@ Jeecg-Boot低代码开发平台，可以应用在任何J2EE项目的开发中， - 在线演示 ： [http://boot.jeecg.com](http://boot.jeecg.com) -- 在线演示(VUE3beta版)：[http://boot3.jeecg.com](http://boot3.jeecg.com) - - 开发文档： [http://doc.jeecg.com](http://doc.jeecg.com) - 视频教程 ：[JeecgBoot入门视频](http://www.jeecg.com/doc/video) @@ -60,6 +57,8 @@ Jeecg-Boot低代码开发平台，可以应用在任何J2EE项目的开发中， - 更新日志： [版本日志](http://www.jeecg.com/doc/log) +- VUE3版演示(未正式发布)：[http://boot3.jeecg.com](http://boot3.jeecg.com) + 交流互动 diff --git a/ant-design-vue-jeecg/.env b/ant-design-vue-jeecg/.env index 63279f6b..f1dd8896 100644 --- a/ant-design-vue-jeecg/.env +++ b/ant-design-vue-jeecg/.env @@ -1,3 +1,6 @@ NODE_ENV=production VUE_APP_PLATFORM_NAME=JeecgBoot 企业级低代码平台 -VUE_APP_SSO=false \ No newline at end of file +# 开启单点登录 +VUE_APP_SSO=false +# 开启微应用模式 +VUE_APP_QIANKUN=false diff --git a/ant-design-vue-jeecg/.env.development b/ant-design-vue-jeecg/.env.development index c514e743..c9c6c757 100644 --- a/ant-design-vue-jeecg/.env.development +++ b/ant-design-vue-jeecg/.env.development @@ -1,4 +1,7 @@ NODE_ENV=development VUE_APP_API_BASE_URL=http://localhost:8080/jeecg-boot VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas -VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview \ No newline at end of file +VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview + +# 微应用列表必须VUE_APP_SUB_开头,jeecg-app-1为子应用的项目名称,也是子应用的路由父路径 +VUE_APP_SUB_jeecg-app-1 = '//localhost:8092' diff --git a/ant-design-vue-jeecg/README.md b/ant-design-vue-jeecg/README.md index 53617b05..1a76874e 100644 --- a/ant-design-vue-jeecg/README.md +++ b/ant-design-vue-jeecg/README.md @@ -1,7 +1,7 @@ Ant Design Jeecg Vue ==== -当前最新版本： 3.0.0（发布日期：2021-11-01） +当前最新版本： 3.1.0（发布日期：20220301） Overview ---- diff --git a/ant-design-vue-jeecg/package.json b/ant-design-vue-jeecg/package.json index d1100fbb..50fd0f8c 100644 --- a/ant-design-vue-jeecg/package.json +++ b/ant-design-vue-jeecg/package.json @@ -1,6 +1,6 @@ { "name": "vue-antd-jeecg", - "version": "3.0.0", + "version": "3.1.0", "private": true, "scripts": { "pre": "cnpm install || yarn --registry https://registry.npm.taobao.org || npm install --registry https://registry.npm.taobao.org ", @@ -44,7 +44,8 @@ "xe-utils": "2.4.8", "vxe-table": "2.9.13", "vxe-table-plugin-antd": "1.8.10", - "cron-parser": "^2.10.0" + "cron-parser": "^2.10.0", + "qiankun": "^2.5.1" }, "devDependencies": { "@babel/polyfill": "^7.2.5", diff --git a/ant-design-vue-jeecg/public/index.html b/ant-design-vue-jeecg/public/index.html index 620b5e22..d3b55bb8 100644 --- a/ant-design-vue-jeecg/public/index.html +++ b/ant-design-vue-jeecg/public/index.html @@ -240,9 +240,7 @@ /* 滚动条优化 end */ - + diff --git a/ant-design-vue-jeecg/public/static/config.js b/ant-design-vue-jeecg/public/static/config.js new file mode 100644 index 00000000..2222138e --- /dev/null +++ b/ant-design-vue-jeecg/public/static/config.js @@ -0,0 +1,11 @@ +/** + * 存放配置常量(当值不为空时会覆盖env配置) + */ +window._CONFIG = { + //接口父路径 + VUE_APP_API_BASE_URL: '', + //单点登录地址 + VUE_APP_CAS_BASE_URL: '', + //文件预览路径 + VUE_APP_ONLINE_BASE_URL: '' +} \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/assets/less/AppIcon.less b/ant-design-vue-jeecg/src/assets/less/AppIcon.less new file mode 100644 index 00000000..54128e75 --- /dev/null +++ b/ant-design-vue-jeecg/src/assets/less/AppIcon.less @@ -0,0 +1,33 @@ +@active-color: #11da75; +ul { + max-height: 700px; + overflow-y: auto; + padding-left: .5rem; + img { + width:64px; + height:64px; + padding: .2rem; + margin: .3rem; + cursor: pointer; + &.active, &:hover { + border: 1px solid @active-color; + border-radius: 2px; + color: #fff; + transition: all .3s; + } + } + li { + list-style: none; + float: left; + text-align: center; + cursor: pointer; + color: #555; + transition: color .3s ease-in-out,background-color .3s ease-in-out; + position: relative; + margin: 3px 0; + border-radius: 4px; + background-color: #fff; + overflow: hidden; + padding: 10px 0 0; + } +} diff --git a/ant-design-vue-jeecg/src/components/dict/JSearchSelectTag.vue b/ant-design-vue-jeecg/src/components/dict/JSearchSelectTag.vue index 6705fa7a..28695f51 100644 --- a/ant-design-vue-jeecg/src/components/dict/JSearchSelectTag.vue +++ b/ant-design-vue-jeecg/src/components/dict/JSearchSelectTag.vue @@ -123,7 +123,17 @@ if(this.async){ if(!this.selectedAsyncValue || !this.selectedAsyncValue.key || this.selectedAsyncValue.key!=this.value){ console.log("这才请求后台") - getAction(`/sys/dict/loadDictItem/${this.dict}`,{key:this.value}).then(res=>{ + //update-begin-author:taoyan date:20220112 for: 方法initSelectValue 根据下拉框实际值查询下拉框的显示的文本 因后台接口只处理3个参数，所以将过滤条件去掉 + // TODO 隐患 查询效率问题 还是应该在后台作筛选 + let itemDictStr = this.dict + let arr = itemDictStr.split(',') + if(arr && arr.length==4){ + // 删除最后一个元素 + arr.pop(); + itemDictStr = arr.join(',') + } + //update-end-author:taoyan date:20220112 for: 方法initSelectValue 根据下拉框实际值查询下拉框的显示的文本 因后台接口只处理3个参数，所以将过滤条件去掉 + getAction(`/sys/dict/loadDictItem/${itemDictStr}`,{key:this.value}).then(res=>{ if(res.success){ let obj = { key:this.value, diff --git a/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/tabs/mixin.less b/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/tabs/mixin.less index 7278ab43..8f0d36e6 100644 --- a/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/tabs/mixin.less +++ b/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/tabs/mixin.less @@ -29,6 +29,13 @@ width: 4em; } +.week { + .list-check-item { + width: 5em; + text-align: left; + } +} + .tip-info { color: #999 } diff --git a/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/tabs/week.vue b/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/tabs/week.vue index 1f1b6041..0711c25c 100644 --- a/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/tabs/week.vue +++ b/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/tabs/week.vue @@ -1,5 +1,5 @@