[修改]修改列表混入的名称

This commit is contained in:
zer0Black
2021-03-11 09:48:13 +08:00
parent 9dc75e5961
commit 042d25053f
39 changed files with 96 additions and 96 deletions
+14 -14
View File
@@ -1,13 +1,13 @@
Ant Design Jeecg Vue
Jero-Web
====
当前最新版本: 2.4.2(发布日期:20210126
当前最新版本: 2.4.2
Overview
----
基于 [Ant Design of Vue](https://vuecomponent.github.io/ant-design-vue/docs/vue/introduce-cn/) 实现的 Ant Design Pro Vue 版
Jeecg-boot 的前段UI框架,采用前后端分离方案,提供强大代码生成器的快速开发平台。
Jero-boot 的前段UI框架,采用前后端分离方案,提供强大代码生成器的快速开发平台。
前端页面代码和后端功能代码一键生成,不需要写任何代码,保持jeecg一贯的强大!!
@@ -32,8 +32,8 @@ Jeecg-boot 的前段UI框架,采用前后端分离方案,提供强大代码
- 拉取项目代码
```bash
git clone https://github.com/zhangdaiscott/jeecg-boot.git
cd jeecg-boot/ant-design-jeecg-vue
git clone http://git.hzwlsoft.com/JeroBoot/jero-boot.git
cd jero-boot/jero-web
```
- 安装依赖
@@ -93,9 +93,9 @@ yarn run lint
- [Vue](https://cn.vuejs.org/v2/guide)
- [路由/菜单说明](https://github.com/zhangdaiscott/jeecg-boot/tree/master/ant-design-jeecg-vue/src/router/README.md)
- [路由/菜单说明](https://github.com/zhangdaiscott/Jero-boot/tree/master/ant-design-jeecg-vue/src/router/README.md)
- [ANTD 默认配置项](https://github.com/zhangdaiscott/jeecg-boot/tree/master/ant-design-jeecg-vue/src/defaultSettings.js)
- [ANTD 默认配置项](https://github.com/zhangdaiscott/Jero-boot/tree/master/ant-design-jeecg-vue/src/defaultSettings.js)
- 其他待补充...
@@ -112,23 +112,23 @@ Docker 镜像使用
```
# 1.修改前端项目的后台域名
.env.development
域名改成: http://jeecg-boot-system:8080/jeecg-boot
域名改成: http://Jero-boot-system:8080/Jero-boot
# 2.先进入打包前端项目
yarn run build
# 3.构建镜像
docker build -t nginx:jeecgboot .
docker build -t nginx:jeroboot .
# 4.启动镜像
docker run --name jeecg-boot-nginx -p 80:80 -d nginx:jeecgboot
docker run --name Jero-boot-nginx -p 80:80 -d nginx:jeroboot
# 5.配置host
# jeecgboot
127.0.0.1 jeecg-boot-redis
127.0.0.1 jeecg-boot-mysql
127.0.0.1 jeecg-boot-system
# jeroboot
127.0.0.1 Jero-boot-redis
127.0.0.1 Jero-boot-mysql
127.0.0.1 Jero-boot-system
# 6.访问前台项目
http://localhost:80
@@ -61,13 +61,13 @@
<script>
import { getAction } from '@/api/manage'
import Ellipsis from '@/components/Ellipsis'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { JeroListMixin } from '@/mixins/JeroListMixin'
import { cloneObject, pushIfNotExist } from '@/utils/util'
import JSelectBizQueryItem from './JSelectBizQueryItem'
export default {
name: 'JSelectBizComponentModal',
mixins: [JeecgListMixin],
mixins: [JeroListMixin],
components: {Ellipsis, JSelectBizQueryItem},
props: {
value: {
@@ -22,11 +22,11 @@
<script>
import {getUserList} from '@/api/api'
import {JeecgListMixin} from '@/mixins/JeecgListMixin'
import {JeroListMixin} from '@/mixins/JeroListMixin'
export default {
name: "SelectUserListModal",
mixins: [JeecgListMixin],
mixins: [JeroListMixin],
data() {
return {
title: "操作",
@@ -10,7 +10,7 @@ import { ACCESS_TOKEN, TENANT_ID } from "@/store/mutation-types"
import store from '@/store'
import {Modal} from 'ant-design-vue'
export const JeecgListMixin = {
export const JeroListMixin = {
data(){
return {
/* 查询条件-请不要在queryParam中声明非字符串值的属性 */
+2 -2
View File
@@ -165,7 +165,7 @@
import JInput from '@/components/jeecg/JInput.vue';
import JeecgDemoTabsModal from './modules/JeecgDemoTabsModal'
import {initDictOptions, filterDictText,filterDictTextByCache} from '@/components/dict/JDictSelectUtil'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { JeroListMixin } from '@/mixins/JeroListMixin'
import Vue from 'vue'
import { filterObj } from '@/utils/util';
@@ -187,7 +187,7 @@
]
export default {
name: "JeecgDemoList",
mixins:[JeecgListMixin],
mixins:[JeroListMixin],
components: {
JeecgDemoModal,
JSuperQuery,
@@ -93,11 +93,11 @@
<script>
import JeecgOrderMainModal from './modules/JeecgOrderMainModal'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { JeroListMixin } from '@/mixins/JeroListMixin'
export default {
name: "JeecgOrderMainList",
mixins: [JeecgListMixin],
mixins: [JeroListMixin],
components: {
JeecgOrderMainModal
},
@@ -100,12 +100,12 @@
<script>
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { JeroListMixin } from '@/mixins/JeroListMixin'
import JeecgOrderModalForJEditableTable from './modules/JeecgOrderModalForJEditableTable'
export default {
name: 'JeecgOrderMainListForJEditableTable',
mixins: [JeecgListMixin],
mixins: [JeroListMixin],
components: {
JeecgOrderModalForJEditableTable
},
+2 -2
View File
@@ -99,11 +99,11 @@
<script>
import { getAction } from '@/api/manage'
import JeecgOrderDMainModal from '@/views/jeecg/tablist/form/JeecgOrderDMainModal'
import {JeecgListMixin} from '@/mixins/JeecgListMixin'
import {JeroListMixin} from '@/mixins/JeroListMixin'
export default {
name: "TableDemo",
mixins: [JeecgListMixin],
mixins: [JeroListMixin],
components: {
JeecgOrderDMainModal
},
@@ -67,12 +67,12 @@
<script>
import JeecgOrderCustomerModal from './form/JeecgOrderCustomerModal'
import JeecgOrderDMainList from './JeecgOrderDMainList'
import {JeecgListMixin} from '@/mixins/JeecgListMixin'
import {JeroListMixin} from '@/mixins/JeroListMixin'
import {getAction} from '@/api/manage'
export default {
name: "JeecgOrderCustomerList",
mixins: [JeecgListMixin],
mixins: [JeroListMixin],
components: {
JeecgOrderDMainList,
JeecgOrderCustomerModal
@@ -105,11 +105,11 @@
import {deleteAction} from '@/api/manage'
import JeecgOrderCustomerModal from './form/JeecgOrderCustomerModal'
import JeecgOrderTicketModal from './form/JeecgOrderTicketModal'
import {JeecgListMixin} from '@/mixins/JeecgListMixin'
import {JeroListMixin} from '@/mixins/JeroListMixin'
export default {
name: "JeecgOrderDMainList",
mixins: [JeecgListMixin],
mixins: [JeroListMixin],
components: {
JeecgOrderTicketModal,
JeecgOrderCustomerModal,
@@ -69,12 +69,12 @@
<script>
import JeecgOrderTicketModal from './form/JeecgOrderTicketModal'
import {JeecgListMixin} from '@/mixins/JeecgListMixin'
import {JeroListMixin} from '@/mixins/JeroListMixin'
import {getAction} from '@/api/manage'
export default {
name: "JeecgOrderTicketList",
mixins: [JeecgListMixin],
mixins: [JeroListMixin],
components: {
JeecgOrderTicketModal,
},
@@ -112,12 +112,12 @@
<script>
import SysMessageModal from './modules/SysMessageModal'
import {JeecgListMixin} from '@/mixins/JeecgListMixin'
import {JeroListMixin} from '@/mixins/JeroListMixin'
import JEllipsis from "@/components/jeecg/JEllipsis";
export default {
name: "SysMessageList",
mixins: [JeecgListMixin],
mixins: [JeroListMixin],
components: {
JEllipsis,
SysMessageModal
@@ -123,12 +123,12 @@
<script>
import SysMessageTemplateModal from './modules/SysMessageTemplateModal'
import SysMessageTestModal from './modules/SysMessageTestModal'
import {JeecgListMixin} from '@/mixins/JeecgListMixin'
import {JeroListMixin} from '@/mixins/JeroListMixin'
import JEllipsis from "@/components/jeecg/JEllipsis";
export default {
name: "SysMessageTemplateList",
mixins: [JeecgListMixin],
mixins: [JeroListMixin],
components: {
JEllipsis,
SysMessageTemplateModal,
@@ -90,11 +90,11 @@
</template>
<script>
import {JeecgListMixin} from '@/mixins/JeecgListMixin'
import {JeroListMixin} from '@/mixins/JeroListMixin'
export default {
name: "OSSFileList",
mixins: [JeecgListMixin],
mixins: [JeroListMixin],
data() {
return {
description: '文件列表',
+2 -2
View File
@@ -61,12 +61,12 @@
<script>
import DataLogModal from './modules/DataLogModal'
import {JeecgListMixin} from '@/mixins/JeecgListMixin'
import {JeroListMixin} from '@/mixins/JeroListMixin'
import JEllipsis from "@/components/jeecg/JEllipsis";
export default {
name: 'DataLogList',
mixins: [JeecgListMixin],
mixins: [JeroListMixin],
components: {
JEllipsis,
DataLogModal
+3 -3
View File
@@ -169,7 +169,7 @@
import pick from 'lodash.pick'
import {queryDepartTreeList, searchByKeywords, deleteByDepartId} from '@/api/api'
import {httpAction, deleteAction} from '@/api/manage'
import {JeecgListMixin} from '@/mixins/JeecgListMixin'
import {JeroListMixin} from '@/mixins/JeroListMixin'
import DepartAuthModal from './modules/DepartAuthModal'
// 表头
const columns = [
@@ -212,7 +212,7 @@
]
export default {
name: 'DepartList',
mixins: [JeecgListMixin],
mixins: [JeroListMixin],
components: {
DepartAuthModal,
DepartModal
@@ -584,7 +584,7 @@
}
}
// <!---- author:os_chengtgen -- date:20190827 -- for:切换父子勾选模式 =======------>
},
created() {
this.currFlowId = this.$route.params.id
+2 -2
View File
@@ -50,12 +50,12 @@
import DeptBaseInfo from './modules/DeptBaseInfo'
import DeptUserInfo from './modules/DeptUserInfo'
import {queryMyDepartTreeList, searchByKeywords} from '@/api/api'
import {JeecgListMixin} from '@/mixins/JeecgListMixin'
import {JeroListMixin} from '@/mixins/JeroListMixin'
import DeptRoleInfo from './modules/DeptRoleInfo'
export default {
name: 'DepartUserList',
mixins: [JeecgListMixin],
mixins: [JeroListMixin],
components: {
DeptRoleInfo,
DeptBaseInfo,
+2 -2
View File
@@ -81,11 +81,11 @@
import pick from 'lodash.pick'
import {filterObj} from '@/utils/util';
import DictItemModal from './modules/DictItemModal'
import {JeecgListMixin} from '@/mixins/JeecgListMixin'
import {JeroListMixin} from '@/mixins/JeroListMixin'
export default {
name: "DictItemList",
mixins: [JeecgListMixin],
mixins: [JeroListMixin],
components: {DictItemModal},
data() {
return {
+2 -2
View File
@@ -67,7 +67,7 @@
<script>
import { filterObj } from '@/utils/util';
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { JeroListMixin } from '@/mixins/JeroListMixin'
import DictModal from './modules/DictModal'
import DictItemList from './DictItemList'
import DictDeleteList from './DictDeleteList'
@@ -77,7 +77,7 @@
export default {
name: "DictList",
mixins:[JeecgListMixin],
mixins:[JeroListMixin],
components: {DictModal, DictItemList,DictDeleteList},
data() {
return {
+2 -2
View File
@@ -74,12 +74,12 @@
<script>
import { filterObj } from '@/utils/util';
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { JeroListMixin } from '@/mixins/JeroListMixin'
import JEllipsis from '@/components/jeecg/JEllipsis'
export default {
name: "LogList",
mixins:[JeecgListMixin],
mixins:[JeroListMixin],
components: {
JEllipsis
},
@@ -82,7 +82,7 @@
<script>
import PermissionModal from './modules/PermissionModal'
import { getSystemMenuList, getSystemSubmenu, getSystemSubmenuBatch } from '@/api/api'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { JeroListMixin } from '@/mixins/JeroListMixin'
import PermissionDataRuleList from './PermissionDataRuleList'
import JEllipsis from '@/components/jeecg/JEllipsis'
@@ -143,7 +143,7 @@
export default {
name: 'PermissionListAsync',
mixins: [JeecgListMixin],
mixins: [JeroListMixin],
components: {
PermissionDataRuleList,
PermissionModal,
@@ -199,7 +199,7 @@
fn(data.children)
}
})
}
}
}
fn(dataList)
}
@@ -65,7 +65,7 @@
</template>
<script>
import {getPermissionRuleList, queryPermissionRule} from '@/api/api'
import {JeecgListMixin} from '@/mixins/JeecgListMixin'
import {JeroListMixin} from '@/mixins/JeroListMixin'
import PermissionDataRuleModal from './modules/PermissionDataRuleModal'
const columns = [
@@ -93,7 +93,7 @@
]
export default {
name: 'PermissionDataRuleList',
mixins: [JeecgListMixin],
mixins: [JeroListMixin],
components: {
PermissionDataRuleModal
},
+2 -2
View File
@@ -82,7 +82,7 @@
<script>
import PermissionModal from './modules/PermissionModal'
import { getPermissionList } from '@/api/api'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { JeroListMixin } from '@/mixins/JeroListMixin'
import PermissionDataRuleList from './PermissionDataRuleList'
import JEllipsis from '@/components/jeecg/JEllipsis'
@@ -144,7 +144,7 @@
export default {
name: 'PermissionList',
mixins: [JeecgListMixin],
mixins: [JeroListMixin],
components: {
PermissionDataRuleList,
PermissionModal,
+2 -2
View File
@@ -111,12 +111,12 @@
<script>
import QuartzJobModal from './modules/QuartzJobModal'
import { getAction } from '@/api/manage'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { JeroListMixin } from '@/mixins/JeroListMixin'
import JEllipsis from "@/components/jeecg/JEllipsis";
export default {
name: "QuartzJobList",
mixins:[JeecgListMixin],
mixins:[JeroListMixin],
components: {
QuartzJobModal,
JEllipsis
+2 -2
View File
@@ -100,12 +100,12 @@
<script>
import RoleModal from './modules/RoleModal'
import UserRoleModal from './modules/UserRoleModal'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { JeroListMixin } from '@/mixins/JeroListMixin'
import JDate from '@/components/jeecg/JDate'
export default {
name: "RoleList",
mixins:[JeecgListMixin],
mixins:[JeroListMixin],
components: {
RoleModal,
UserRoleModal,
+2 -2
View File
@@ -178,7 +178,7 @@
</a-row>
</template>
<script>
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { JeroListMixin } from '@/mixins/JeroListMixin'
import { deleteAction, postAction, getAction } from '@/api/manage'
import SelectUserModal from './modules/SelectUserModal'
import RoleModal from './modules/RoleModal'
@@ -189,7 +189,7 @@
export default {
name: 'RoleUserList',
mixins: [JeecgListMixin],
mixins: [JeroListMixin],
components: {
UserRoleModal,
SelectUserModal,
@@ -109,11 +109,11 @@
import SysAnnouncementModal from './modules/SysAnnouncementModal'
import {doReleaseData, doReovkeData} from '@/api/api'
import {getAction} from '@/api/manage'
import {JeecgListMixin} from '@/mixins/JeecgListMixin'
import {JeroListMixin} from '@/mixins/JeroListMixin'
export default {
name: "SysAnnouncementList",
mixins: [JeecgListMixin],
mixins: [JeroListMixin],
components: {
SysAnnouncementModal
},
@@ -1,6 +1,6 @@
<template>
<a-card :bordered="false">
<!-- 操作按钮区域 -->
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
@@ -35,7 +35,7 @@
@change="handleTableChange"
@expand="handleExpand"
v-bind="tableProps">
<span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical" />
@@ -56,13 +56,13 @@
<script>
import { getAction } from '@/api/manage'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { JeroListMixin } from '@/mixins/JeroListMixin'
import SysCategoryModal from './modules/SysCategoryModal'
import { deleteAction } from '@/api/manage'
export default {
name: "SysCategoryList",
mixins:[JeecgListMixin],
mixins:[JeroListMixin],
components: {
SysCategoryModal
},
@@ -326,8 +326,8 @@
return Promise.resolve()
}
},
}
}
</script>
@@ -109,13 +109,13 @@
<script>
import JEllipsis from '@/components/jeecg/JEllipsis'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { JeroListMixin } from '@/mixins/JeroListMixin'
import SysCheckRuleModal from './modules/SysCheckRuleModal'
import SysCheckRuleTestModal from './modules/SysCheckRuleTestModal'
export default {
name: 'SysCheckRuleList',
mixins: [JeecgListMixin],
mixins: [JeroListMixin],
components: { SysCheckRuleModal, SysCheckRuleTestModal, JEllipsis },
data() {
return {
@@ -101,12 +101,12 @@
<script>
import JEllipsis from '@/components/jeecg/JEllipsis'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { JeroListMixin } from '@/mixins/JeroListMixin'
import SysDataSourceModal from './modules/SysDataSourceModal'
export default {
name: 'SysDataSourceList',
mixins: [JeecgListMixin],
mixins: [JeroListMixin],
components: { JEllipsis, SysDataSourceModal },
data() {
let ellipsis = (v, l = 20) => (<j-ellipsis value={v} length={l}/>)
@@ -99,11 +99,11 @@
<script>
import { getAction } from '@/api/manage'
import SysFillRuleModal from './modules/SysFillRuleModal'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { JeroListMixin } from '@/mixins/JeroListMixin'
export default {
name: 'SysFillRuleList',
mixins: [JeecgListMixin],
mixins: [JeroListMixin],
components: { SysFillRuleModal },
data() {
return {
@@ -47,12 +47,12 @@
import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { JeroListMixin } from '@/mixins/JeroListMixin'
import GateWayRouteModal from './modules/GateWayRouteModal'
export default {
name: 'TenantList',
mixins: [JeecgListMixin, mixinDevice],
mixins: [JeroListMixin, mixinDevice],
components: {
GateWayRouteModal
},
@@ -105,12 +105,12 @@
<script>
import SysPositionModal from './modules/SysPositionModal'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { JeroListMixin } from '@/mixins/JeroListMixin'
import JDictSelectTag from '@/components/dict/JDictSelectTag'
export default {
name: 'SysPositionList',
mixins: [JeecgListMixin],
mixins: [JeroListMixin],
components: {
SysPositionModal,
JDictSelectTag
+2 -2
View File
@@ -91,13 +91,13 @@
import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { JeroListMixin } from '@/mixins/JeroListMixin'
import TenantModal from './modules/TenantModal'
export default {
name: "TenantList",
mixins:[JeecgListMixin, mixinDevice],
mixins:[JeroListMixin, mixinDevice],
components: {
TenantModal
},
@@ -54,12 +54,12 @@
import { filterObj } from '@/utils/util'
import { getAction,putAction } from '@/api/manage'
import ShowAnnouncement from '@/components/tools/ShowAnnouncement'
import {JeecgListMixin} from '@/mixins/JeecgListMixin'
import {JeroListMixin} from '@/mixins/JeroListMixin'
import DynamicNotice from '../../components/tools/DynamicNotice'
export default {
name: "UserAnnouncementList",
mixins: [JeecgListMixin],
mixins: [JeroListMixin],
components: {
DynamicNotice,
ShowAnnouncement
+2 -2
View File
@@ -178,14 +178,14 @@
import PasswordModal from './modules/PasswordModal'
import {putAction,getFileAccessHttpUrl} from '@/api/manage';
import {frozenBatch} from '@/api/api'
import {JeecgListMixin} from '@/mixins/JeecgListMixin'
import {JeroListMixin} from '@/mixins/JeroListMixin'
import JInput from '@/components/jeecg/JInput'
import UserRecycleBinModal from './modules/UserRecycleBinModal'
import JSuperQuery from '@/components/jeecg/JSuperQuery'
export default {
name: "UserList",
mixins: [JeecgListMixin],
mixins: [JeroListMixin],
components: {
UserModal,
PasswordModal,
@@ -44,11 +44,11 @@
<script>
import { getAction } from '@/api/manage'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { JeroListMixin } from '@/mixins/JeroListMixin'
export default {
name: 'AddressListRight',
mixins: [JeecgListMixin],
mixins: [JeroListMixin],
components: {},
props: ['value'],
data() {
@@ -76,7 +76,7 @@
</template>
<script>
import {JeecgListMixin} from '@/mixins/JeecgListMixin'
import {JeroListMixin} from '@/mixins/JeroListMixin'
import {getAction} from '@/api/manage'
import SysDepartRoleModal from './SysDepartRoleModal'
import DeptRoleAuthModal from './DeptRoleAuthModal'
@@ -84,7 +84,7 @@
export default {
name: 'DeptRoleInfo',
components: { DeptRoleAuthModal, SysDepartRoleModal },
mixins: [JeecgListMixin],
mixins: [JeroListMixin],
data() {
return {
description: '部门角色信息',
@@ -105,7 +105,7 @@
</template>
<script>
import {JeecgListMixin} from '@/mixins/JeecgListMixin'
import {JeroListMixin} from '@/mixins/JeroListMixin'
import {getAction, postAction, deleteAction} from '@/api/manage'
import SelectUserModal from './SelectUserModal'
import UserModal from './UserModal'
@@ -113,7 +113,7 @@
export default {
name: "DeptUserInfo",
mixins: [JeecgListMixin],
mixins: [JeroListMixin],
components: {
DeptRoleUserModal,
SelectUserModal,