From 35eb1449d4bedac6621de73867a458d8605c0ef6 Mon Sep 17 00:00:00 2001 From: zer0Black Date: Thu, 11 Mar 2021 09:53:44 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E4=BF=AE=E6=94=B9=E4=B8=A4?= =?UTF-8?q?=E4=B8=AA=E7=BB=84=E4=BB=B6=E7=9A=84=E7=88=B6=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/README.md | 3 +- .../src/components/JVxeCells/JVxeFileCell.vue | 6 +-- .../components/JVxeCells/JVxeImageCell.vue | 6 +-- .../components/JVxeCells/JVxePopupCell.vue | 2 +- .../components/JVxeCells/JVxeRadioCell.vue | 2 +- .../JVxeCells/JVxeSelectDictSearchCell.js | 2 +- jero-web/src/components/JVxeCells/install.js | 6 +-- jero-web/src/components/chart/README.md | 2 +- .../{jeecg => jero}/JAreaLinkage.vue | 0 .../{jeecg => jero}/JCategorySelect.vue | 0 .../components/{jeecg => jero}/JCheckbox.vue | 0 .../{jeecg => jero}/JCodeEditor.vue | 0 .../src/components/{jeecg => jero}/JCron.vue | 0 .../src/components/{jeecg => jero}/JDate.vue | 0 .../{jeecg => jero}/JEditableTable.vue | 6 +-- .../components/{jeecg => jero}/JEditor.vue | 0 .../components/{jeecg => jero}/JEllipsis.vue | 0 .../{jeecg => jero}/JFormContainer.vue | 2 +- .../{jeecg => jero}/JImageUpload.vue | 0 .../{jeecg => jero}/JImportModal.vue | 0 .../src/components/{jeecg => jero}/JInput.vue | 0 .../JMarkdownEditor/default-options.js | 0 .../{jeecg => jero}/JMarkdownEditor/index.vue | 2 +- .../{jeecg => jero}/JModal/index.vue | 0 .../src/components/{jeecg => jero}/JPopup.vue | 0 .../{jeecg => jero}/JSelectMultiple.vue | 0 .../components/{jeecg => jero}/JSlider.vue | 0 .../{jeecg => jero}/JSuperQuery.vue | 8 ++-- .../components/{jeecg => jero}/JSwitch.vue | 0 .../src/components/{jeecg => jero}/JTime.vue | 0 .../components/{jeecg => jero}/JTreeDict.vue | 0 .../{jeecg => jero}/JTreeSelect.vue | 0 .../components/{jeecg => jero}/JTreeTable.vue | 0 .../components/{jeecg => jero}/JUpload.vue | 0 .../JVxeTable/components/JVxeDetailsModal.vue | 0 .../JVxeTable/components/JVxePagination.vue | 0 .../JVxeTable/components/JVxeSubPopover.vue | 0 .../JVxeTable/components/JVxeTable.js | 2 +- .../JVxeTable/components/JVxeToolbar.vue | 0 .../components/cells/JVxeCheckboxCell.vue | 2 +- .../components/cells/JVxeDateCell.vue | 4 +- .../components/cells/JVxeDepartSelectCell.vue | 4 +- .../components/cells/JVxeDragSortCell.vue | 2 +- .../components/cells/JVxeInputCell.vue | 4 +- .../components/cells/JVxeNormalCell.vue | 2 +- .../components/cells/JVxeProgressCell.vue | 2 +- .../components/cells/JVxeSelectCell.vue | 4 +- .../components/cells/JVxeSlotCell.js | 2 +- .../components/cells/JVxeTagsCell.js | 2 +- .../components/cells/JVxeTextareaCell.vue | 4 +- .../components/cells/JVxeUploadCell.vue | 2 +- .../components/cells/JVxeUserSelectCell.vue | 4 +- .../components/cells/ReloadEffect.js | 0 .../{jeecg => jero}/JVxeTable/index.js | 0 .../{jeecg => jero}/JVxeTable/install.js | 2 +- .../{jeecg => jero}/JVxeTable/jvxeTypes.js | 0 .../JVxeTable/less/j-vxe-table.less | 0 .../JVxeTable/less/reload-effect.less | 0 .../JVxeTable/less/size/tiny.less | 0 .../JVxeTable/mixins/JVxeCellMixins.js | 2 +- .../JVxeTable/mixins/vxe.web.socket.mixins.js | 0 .../JVxeTable/utils/cellUtils.js | 2 +- .../JVxeTable/utils/vxeUtils.js | 2 +- .../src/components/{jeecg => jero}/README.md | 16 +++---- .../{jeecg => jero}/README_JEditableTable.md | 2 +- .../{jeecg => jero}/README_JPopup.md | 0 .../src/components/{jeecg => jero}/index.js | 14 +++--- .../{jeecg => jero}/minipop/JFilePop.vue | 0 .../{jeecg => jero}/minipop/JInputPop.vue | 0 .../{jeecg => jero}/modal/JCronModal.vue | 0 .../{jeecg => jero}/modal/JPopupOnlReport.vue | 0 .../JSelectBizComponentModal.vue | 0 .../JSelectBizQueryItem.js | 0 .../JSelectBizComponent/README.md | 2 +- .../JSelectBizComponent/index.vue | 0 .../{jeecgbiz => jerobiz}/JSelectDepart.vue | 0 .../JSelectMultiUser.vue | 2 +- .../{jeecgbiz => jerobiz}/JSelectPosition.vue | 0 .../{jeecgbiz => jerobiz}/JSelectRole.vue | 0 .../JSelectUserByDep.vue | 0 .../{jeecgbiz => jerobiz}/README.md | 6 +-- .../modal/JSelectDepartModal.vue | 0 .../modal/JSelectUserByDepModal.vue | 0 .../modal/SelectUserListModal.vue | 0 jero-web/src/components/lazy_antd.js | 2 +- jero-web/src/main.js | 4 +- jero-web/src/mixins/JEditableTableMixin.js | 2 +- jero-web/src/mixins/JVxeTableMixin.js | 2 +- jero-web/src/utils/request.js | 4 +- jero-web/src/views/dashboard/IndexTask.vue | 2 +- .../src/views/jeecg/JVxeDemo/JVxeDemo1.vue | 2 +- .../src/views/jeecg/JVxeDemo/JVxeDemo2.vue | 2 +- .../views/jeecg/JVxeDemo/demo/JSBCDemo.vue | 2 +- .../jeecg/JVxeDemo/demo/PopupSubTable.vue | 2 +- .../jeecg/JVxeDemo/demo/SocketReload.vue | 2 +- .../JVxeDemo/layout-demo/ErpTemplate.vue | 2 +- .../jeecg/JVxeDemo/layout-demo/Template1.vue | 2 +- .../jeecg/JVxeDemo/layout-demo/Template2.vue | 2 +- .../jeecg/JVxeDemo/layout-demo/Template3.vue | 2 +- .../jeecg/JVxeDemo/layout-demo/Template4.vue | 2 +- .../jeecg/JVxeDemo/layout-demo/Template5.vue | 2 +- jero-web/src/views/jeecg/JeecgDemoList.vue | 6 +-- jero-web/src/views/jeecg/JeecgTreeTable.vue | 2 +- jero-web/src/views/jeecg/SelectDemo.vue | 46 +++++++++---------- .../modules/JEditableTable/DefaultTable.vue | 2 +- .../modules/JEditableTable/ReadOnlyTable.vue | 2 +- .../modules/JEditableTable/ThreeLinkage.vue | 2 +- .../jeecg/modules/JeecgOrderMainModal.vue | 2 +- .../JeecgOrderModalForJEditableTable.vue | 4 +- .../tablist/form/JeecgOrderCustomerModal.vue | 2 +- .../tablist/form/JeecgOrderDMainModal.vue | 2 +- .../tablist/form/JeecgOrderTicketModal.vue | 2 +- .../views/modules/message/SysMessageList.vue | 2 +- .../message/SysMessageTemplateList.vue | 2 +- .../modules/SysMessageTemplateModal.vue | 2 +- jero-web/src/views/system/DataLogList.vue | 2 +- jero-web/src/views/system/DepartList2.vue | 2 +- jero-web/src/views/system/LogList.vue | 2 +- .../src/views/system/NewPermissionList.vue | 2 +- jero-web/src/views/system/PermissionList.vue | 2 +- jero-web/src/views/system/QuartzJobList.vue | 2 +- jero-web/src/views/system/RoleList.vue | 2 +- .../src/views/system/SysCheckRuleList.vue | 2 +- .../src/views/system/SysDataSourceList.vue | 2 +- jero-web/src/views/system/UserList.vue | 4 +- .../system/modules/DeptRoleUserModal.vue | 2 +- .../views/system/modules/QuartzJobModal.vue | 2 +- .../system/modules/SysAnnouncementModal.vue | 4 +- .../views/system/modules/SysCategoryModal.vue | 22 ++++----- .../system/modules/SysCheckRuleModal.vue | 2 +- .../system/modules/SysDataSourceModal.vue | 8 ++-- .../system/modules/SysUserAgentModal.vue | 4 +- .../src/views/system/modules/TenantForm.vue | 4 +- .../src/views/system/modules/UserModal.vue | 4 +- jero-web/vue.config.js | 2 +- 135 files changed, 164 insertions(+), 165 deletions(-) rename jero-web/src/components/{jeecg => jero}/JAreaLinkage.vue (100%) rename jero-web/src/components/{jeecg => jero}/JCategorySelect.vue (100%) rename jero-web/src/components/{jeecg => jero}/JCheckbox.vue (100%) rename jero-web/src/components/{jeecg => jero}/JCodeEditor.vue (100%) rename jero-web/src/components/{jeecg => jero}/JCron.vue (100%) rename jero-web/src/components/{jeecg => jero}/JDate.vue (100%) rename jero-web/src/components/{jeecg => jero}/JEditableTable.vue (99%) rename jero-web/src/components/{jeecg => jero}/JEditor.vue (100%) rename jero-web/src/components/{jeecg => jero}/JEllipsis.vue (100%) rename jero-web/src/components/{jeecg => jero}/JFormContainer.vue (96%) rename jero-web/src/components/{jeecg => jero}/JImageUpload.vue (100%) rename jero-web/src/components/{jeecg => jero}/JImportModal.vue (100%) rename jero-web/src/components/{jeecg => jero}/JInput.vue (100%) rename jero-web/src/components/{jeecg => jero}/JMarkdownEditor/default-options.js (100%) rename jero-web/src/components/{jeecg => jero}/JMarkdownEditor/index.vue (99%) rename jero-web/src/components/{jeecg => jero}/JModal/index.vue (100%) rename jero-web/src/components/{jeecg => jero}/JPopup.vue (100%) rename jero-web/src/components/{jeecg => jero}/JSelectMultiple.vue (100%) rename jero-web/src/components/{jeecg => jero}/JSlider.vue (100%) rename jero-web/src/components/{jeecg => jero}/JSuperQuery.vue (98%) rename jero-web/src/components/{jeecg => jero}/JSwitch.vue (100%) rename jero-web/src/components/{jeecg => jero}/JTime.vue (100%) rename jero-web/src/components/{jeecg => jero}/JTreeDict.vue (100%) rename jero-web/src/components/{jeecg => jero}/JTreeSelect.vue (100%) rename jero-web/src/components/{jeecg => jero}/JTreeTable.vue (100%) rename jero-web/src/components/{jeecg => jero}/JUpload.vue (100%) rename jero-web/src/components/{jeecg => jero}/JVxeTable/components/JVxeDetailsModal.vue (100%) rename jero-web/src/components/{jeecg => jero}/JVxeTable/components/JVxePagination.vue (100%) rename jero-web/src/components/{jeecg => jero}/JVxeTable/components/JVxeSubPopover.vue (100%) rename jero-web/src/components/{jeecg => jero}/JVxeTable/components/JVxeTable.js (99%) rename jero-web/src/components/{jeecg => jero}/JVxeTable/components/JVxeToolbar.vue (100%) rename jero-web/src/components/{jeecg => jero}/JVxeTable/components/cells/JVxeCheckboxCell.vue (96%) rename jero-web/src/components/{jeecg => jero}/JVxeTable/components/cells/JVxeDateCell.vue (93%) rename jero-web/src/components/{jeecg => jero}/JVxeTable/components/cells/JVxeDepartSelectCell.vue (96%) rename jero-web/src/components/{jeecg => jero}/JVxeTable/components/cells/JVxeDragSortCell.vue (97%) rename jero-web/src/components/{jeecg => jero}/JVxeTable/components/cells/JVxeInputCell.vue (94%) rename jero-web/src/components/{jeecg => jero}/JVxeTable/components/cells/JVxeNormalCell.vue (91%) rename jero-web/src/components/{jeecg => jero}/JVxeTable/components/cells/JVxeProgressCell.vue (93%) rename jero-web/src/components/{jeecg => jero}/JVxeTable/components/cells/JVxeSelectCell.vue (98%) rename jero-web/src/components/{jeecg => jero}/JVxeTable/components/cells/JVxeSlotCell.js (92%) rename jero-web/src/components/{jeecg => jero}/JVxeTable/components/cells/JVxeTagsCell.js (97%) rename jero-web/src/components/{jeecg => jero}/JVxeTable/components/cells/JVxeTextareaCell.vue (86%) rename jero-web/src/components/{jeecg => jero}/JVxeTable/components/cells/JVxeUploadCell.vue (98%) rename jero-web/src/components/{jeecg => jero}/JVxeTable/components/cells/JVxeUserSelectCell.vue (96%) rename jero-web/src/components/{jeecg => jero}/JVxeTable/components/cells/ReloadEffect.js (100%) rename jero-web/src/components/{jeecg => jero}/JVxeTable/index.js (100%) rename jero-web/src/components/{jeecg => jero}/JVxeTable/install.js (98%) rename jero-web/src/components/{jeecg => jero}/JVxeTable/jvxeTypes.js (100%) rename jero-web/src/components/{jeecg => jero}/JVxeTable/less/j-vxe-table.less (100%) rename jero-web/src/components/{jeecg => jero}/JVxeTable/less/reload-effect.less (100%) rename jero-web/src/components/{jeecg => jero}/JVxeTable/less/size/tiny.less (100%) rename jero-web/src/components/{jeecg => jero}/JVxeTable/mixins/JVxeCellMixins.js (99%) rename jero-web/src/components/{jeecg => jero}/JVxeTable/mixins/vxe.web.socket.mixins.js (100%) rename jero-web/src/components/{jeecg => jero}/JVxeTable/utils/cellUtils.js (98%) rename jero-web/src/components/{jeecg => jero}/JVxeTable/utils/vxeUtils.js (98%) rename jero-web/src/components/{jeecg => jero}/README.md (96%) rename jero-web/src/components/{jeecg => jero}/README_JEditableTable.md (99%) rename jero-web/src/components/{jeecg => jero}/README_JPopup.md (100%) rename jero-web/src/components/{jeecg => jero}/index.js (89%) rename jero-web/src/components/{jeecg => jero}/minipop/JFilePop.vue (100%) rename jero-web/src/components/{jeecg => jero}/minipop/JInputPop.vue (100%) rename jero-web/src/components/{jeecg => jero}/modal/JCronModal.vue (100%) rename jero-web/src/components/{jeecg => jero}/modal/JPopupOnlReport.vue (100%) rename jero-web/src/components/{jeecgbiz => jerobiz}/JSelectBizComponent/JSelectBizComponentModal.vue (100%) rename jero-web/src/components/{jeecgbiz => jerobiz}/JSelectBizComponent/JSelectBizQueryItem.js (100%) rename jero-web/src/components/{jeecgbiz => jerobiz}/JSelectBizComponent/README.md (97%) rename jero-web/src/components/{jeecgbiz => jerobiz}/JSelectBizComponent/index.vue (100%) rename jero-web/src/components/{jeecgbiz => jerobiz}/JSelectDepart.vue (100%) rename jero-web/src/components/{jeecgbiz => jerobiz}/JSelectMultiUser.vue (98%) rename jero-web/src/components/{jeecgbiz => jerobiz}/JSelectPosition.vue (100%) rename jero-web/src/components/{jeecgbiz => jerobiz}/JSelectRole.vue (100%) rename jero-web/src/components/{jeecgbiz => jerobiz}/JSelectUserByDep.vue (100%) rename jero-web/src/components/{jeecgbiz => jerobiz}/README.md (93%) rename jero-web/src/components/{jeecgbiz => jerobiz}/modal/JSelectDepartModal.vue (100%) rename jero-web/src/components/{jeecgbiz => jerobiz}/modal/JSelectUserByDepModal.vue (100%) rename jero-web/src/components/{jeecgbiz => jerobiz}/modal/SelectUserListModal.vue (100%) diff --git a/jero-web/README.md b/jero-web/README.md index f30a64a3..d0a6bd6d 100644 --- a/jero-web/README.md +++ b/jero-web/README.md @@ -7,8 +7,7 @@ Overview ---- 基于 [Ant Design of Vue](https://vuecomponent.github.io/ant-design-vue/docs/vue/introduce-cn/) 实现的 Ant Design Pro Vue 版 -Jero-boot 的前段UI框架,采用前后端分离方案,提供强大代码生成器的快速开发平台。 -前端页面代码和后端功能代码一键生成,不需要写任何代码,保持jeecg一贯的强大!! +Jero-boot 的前端UI框架,采用前后端分离方案,提供强大代码生成器的快速开发平台。 diff --git a/jero-web/src/components/JVxeCells/JVxeFileCell.vue b/jero-web/src/components/JVxeCells/JVxeFileCell.vue index 3171f15c..e4144a79 100644 --- a/jero-web/src/components/JVxeCells/JVxeFileCell.vue +++ b/jero-web/src/components/JVxeCells/JVxeFileCell.vue @@ -61,11 +61,11 @@ \ No newline at end of file diff --git a/jero-web/src/views/system/modules/SysCheckRuleModal.vue b/jero-web/src/views/system/modules/SysCheckRuleModal.vue index db0932a9..60f0b441 100644 --- a/jero-web/src/views/system/modules/SysCheckRuleModal.vue +++ b/jero-web/src/views/system/modules/SysCheckRuleModal.vue @@ -82,7 +82,7 @@ import { httpAction } from '@/api/manage' import { validateDuplicateValue, alwaysResolve, failedSymbol } from '@/utils/util' import { FormTypes } from '@/utils/JEditableTableUtil' - import JEditableTable from '@comp/jeecg/JEditableTable' + import JEditableTable from '@comp/jero/JEditableTable' export default { name: 'SysCheckRuleModal', diff --git a/jero-web/src/views/system/modules/SysDataSourceModal.vue b/jero-web/src/views/system/modules/SysDataSourceModal.vue index 309afaba..82d66163 100644 --- a/jero-web/src/views/system/modules/SysDataSourceModal.vue +++ b/jero-web/src/views/system/modules/SysDataSourceModal.vue @@ -146,17 +146,17 @@ }, dbUrlMap: { // MySQL 数据库 - '1': { dbUrl: 'jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false' }, + '1': { dbUrl: 'jdbc:mysql://127.0.0.1:3306/jero-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false' }, //MySQL5.7+ 数据库 - '4': { dbUrl: 'jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai' }, + '4': { dbUrl: 'jdbc:mysql://127.0.0.1:3306/jero-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai' }, // Oracle '2': { dbUrl: 'jdbc:oracle:thin:@127.0.0.1:1521:ORCL' }, // SQLServer 数据库 '3': { dbUrl: 'jdbc:sqlserver://127.0.0.1:1433;SelectMethod=cursor;DatabaseName=jeecgboot' }, // SQLServer 数据库 - '5': { dbUrl: 'jdbc:mariadb://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useSSL=false' }, + '5': { dbUrl: 'jdbc:mariadb://127.0.0.1:3306/jero-boot?characterEncoding=UTF-8&useSSL=false' }, // SQLServer 数据库 - '6': { dbUrl: 'jdbc:postgresql://127.0.0.1:5432/jeecg-boot' } + '6': { dbUrl: 'jdbc:postgresql://127.0.0.1:5432/jero-boot' } } } }, diff --git a/jero-web/src/views/system/modules/SysUserAgentModal.vue b/jero-web/src/views/system/modules/SysUserAgentModal.vue index 2c40ac43..f3fb3a1c 100644 --- a/jero-web/src/views/system/modules/SysUserAgentModal.vue +++ b/jero-web/src/views/system/modules/SysUserAgentModal.vue @@ -68,8 +68,8 @@