[修改]修改部分组件名称

This commit is contained in:
zer0Black
2021-03-11 10:14:37 +08:00
parent 35eb1449d4
commit 2abbbef916
63 changed files with 92 additions and 95 deletions
+2 -2
View File
@@ -9,8 +9,8 @@ onEnd倒计时结束触发函数
![输入图片说明](https://static.oschina.net/uploads/img/201904/12182046_mwqJ.png "在这里输入图片标题") ![输入图片说明](https://static.oschina.net/uploads/img/201904/12182046_mwqJ.png "在这里输入图片标题")
####5.dict包:数据字典专用,用法参考文件夹下readme文件 ####5.dict包:数据字典专用,用法参考文件夹下readme文件
####6.Ellipsis包:字符串截取组件,可以指定字符串的显示长度,并将全部内容显示到tip中,简单使用参考src\views\system\PermissionList.vue ####6.Ellipsis包:字符串截取组件,可以指定字符串的显示长度,并将全部内容显示到tip中,简单使用参考src\views\system\PermissionList.vue
####7.jeecg包:该包下自定义了很多列表/表单中用到的组件 参考包下readme文件 ####7.jero包:该包下自定义了很多列表/表单中用到的组件 参考包下readme文件
####8.jeecgbiz包:该包下定义了一些业务相关的组件,比如选择用户弹框,根据部门选择用户等等 ####8.jerobiz包:该包下定义了一些业务相关的组件,比如选择用户弹框,根据部门选择用户等等
####9.layouts+page包:系统页面布局相关组件,比如登陆进去之后页面顶部显示什么,底部显示什么,菜单点击触发多个tab的布局等等 一般情况不需要修改 ####9.layouts+page包:系统页面布局相关组件,比如登陆进去之后页面顶部显示什么,底部显示什么,菜单点击触发多个tab的布局等等 一般情况不需要修改
####10.menun包:菜单组件,俩个,一个折叠菜单一个正常显示的菜单 ####10.menun包:菜单组件,俩个,一个折叠菜单一个正常显示的菜单
####11.NumberInfo:数字信息显示组件 如下图 ####11.NumberInfo:数字信息显示组件 如下图
+2 -2
View File
@@ -25,8 +25,8 @@
dataSource: { dataSource: {
type: Array, type: Array,
default: () => [ default: () => [
{ type: 'Jeecg', 'Jan.': 18.9, 'Feb.': 28.8, 'Mar.': 39.3, 'Apr.': 81.4, 'May': 47, 'Jun.': 20.3, 'Jul.': 24, 'Aug.': 35.6 }, { type: 'JeroOne', 'Jan.': 18.9, 'Feb.': 28.8, 'Mar.': 39.3, 'Apr.': 81.4, 'May': 47, 'Jun.': 20.3, 'Jul.': 24, 'Aug.': 35.6 },
{ type: 'Jeebt', 'Jan.': 12.4, 'Feb.': 23.2, 'Mar.': 34.5, 'Apr.': 99.7, 'May': 52.6, 'Jun.': 35.5, 'Jul.': 37.4, 'Aug.': 42.4 } { type: 'JeroTwo', 'Jan.': 12.4, 'Feb.': 23.2, 'Mar.': 34.5, 'Apr.': 99.7, 'May': 52.6, 'Jun.': 35.5, 'Jul.': 37.4, 'Aug.': 42.4 }
] ]
}, },
fields: { fields: {
@@ -26,23 +26,23 @@
dataSource: { dataSource: {
type: Array, type: Array,
default: () => [ default: () => [
{ type: 'Jan', jeecg: 7.0, jeebt: 3.9 }, { type: 'Jan', jeroOne: 7.0, jeroTwo: 3.9 },
{ type: 'Feb', jeecg: 6.9, jeebt: 4.2 }, { type: 'Feb', jeroOne: 6.9, jeroTwo: 4.2 },
{ type: 'Mar', jeecg: 9.5, jeebt: 5.7 }, { type: 'Mar', jeroOne: 9.5, jeroTwo: 5.7 },
{ type: 'Apr', jeecg: 14.5, jeebt: 8.5 }, { type: 'Apr', jeroOne: 14.5, jeroTwo: 8.5 },
{ type: 'May', jeecg: 18.4, jeebt: 11.9 }, { type: 'May', jeroOne: 18.4, jeroTwo: 11.9 },
{ type: 'Jun', jeecg: 21.5, jeebt: 15.2 }, { type: 'Jun', jeroOne: 21.5, jeroTwo: 15.2 },
{ type: 'Jul', jeecg: 25.2, jeebt: 17.0 }, { type: 'Jul', jeroOne: 25.2, jeroTwo: 17.0 },
{ type: 'Aug', jeecg: 26.5, jeebt: 16.6 }, { type: 'Aug', jeroOne: 26.5, jeroTwo: 16.6 },
{ type: 'Sep', jeecg: 23.3, jeebt: 14.2 }, { type: 'Sep', jeroOne: 23.3, jeroTwo: 14.2 },
{ type: 'Oct', jeecg: 18.3, jeebt: 10.3 }, { type: 'Oct', jeroOne: 18.3, jeroTwo: 10.3 },
{ type: 'Nov', jeecg: 13.9, jeebt: 6.6 }, { type: 'Nov', jeroOne: 13.9, jeroTwo: 6.6 },
{ type: 'Dec', jeecg: 9.6, jeebt: 4.8 } { type: 'Dec', jeroOne: 9.6, jeroTwo: 4.8 }
] ]
}, },
fields: { fields: {
type: Array, type: Array,
default: () => ['jeecg', 'jeebt'] default: () => ['jeroOne', 'jeroTwo']
}, },
// 别名,需要的格式:[{field:'name',alias:'姓名'}, {field:'sex',alias:'性别'}] // 别名,需要的格式:[{field:'name',alias:'姓名'}, {field:'sex',alias:'性别'}]
aliases:{ aliases:{
+16 -16
View File
@@ -102,7 +102,7 @@ import BarMultid from '@/components/chart/BarMultid'
```json ```json
[ [
{ {
"type": "Jeecg", // 列名 "type": "jero", // 列名
"Jan.": 18.9, "Jan.": 18.9,
"Feb.": 28.8, "Feb.": 28.8,
"Mar.": 39.3, "Mar.": 39.3,
@@ -113,7 +113,7 @@ import BarMultid from '@/components/chart/BarMultid'
"Aug.": 35.6 "Aug.": 35.6
}, },
{ {
"type": "Jeebt", "type": "jeroTwo",
"Jan.": 12.4, "Jan.": 12.4,
"Feb.": 23.2, "Feb.": 23.2,
"Mar.": 34.5, "Mar.": 34.5,
@@ -219,7 +219,7 @@ import LineChartMultid from '@/components/chart/LineChartMultid'
##### fields 示例 ##### fields 示例
```json ```json
["jero", "jeebt"] ["jero", "jeroTwo"]
``` ```
##### dataSource 示例 ##### dataSource 示例
@@ -228,20 +228,20 @@ import LineChartMultid from '@/components/chart/LineChartMultid'
[ [
{ {
"type": "Jan", // 列名 "type": "Jan", // 列名
"jeecg": 7, "jero": 7,
"jeebt": 3.9 "jeroTwo": 3.9
}, },
{ "type": "Feb", "jeecg": 6.9, "jeebt": 4.2 }, { "type": "Feb", "jero": 6.9, "jeroTwo": 4.2 },
{ "type": "Mar", "jeecg": 9.5, "jeebt": 5.7 }, { "type": "Mar", "jero": 9.5, "jeroTwo": 5.7 },
{ "type": "Apr", "jeecg": 14.5, "jeebt": 8.5 }, { "type": "Apr", "jero": 14.5, "jeroTwo": 8.5 },
{ "type": "May", "jeecg": 18.4, "jeebt": 11.9 }, { "type": "May", "jero": 18.4, "jeroTwo": 11.9 },
{ "type": "Jun", "jeecg": 21.5, "jeebt": 15.2 }, { "type": "Jun", "jero": 21.5, "jeroTwo": 15.2 },
{ "type": "Jul", "jeecg": 25.2, "jeebt": 17 }, { "type": "Jul", "jero": 25.2, "jeroTwo": 17 },
{ "type": "Aug", "jeecg": 26.5, "jeebt": 16.6 }, { "type": "Aug", "jero": 26.5, "jeroTwo": 16.6 },
{ "type": "Sep", "jeecg": 23.3, "jeebt": 14.2 }, { "type": "Sep", "jero": 23.3, "jeroTwo": 14.2 },
{ "type": "Oct", "jeecg": 18.3, "jeebt": 10.3 }, { "type": "Oct", "jero": 18.3, "jeroTwo": 10.3 },
{ "type": "Nov", "jeecg": 13.9, "jeebt": 6.6 }, { "type": "Nov", "jero": 13.9, "jeroTwo": 6.6 },
{ "type": "Dec", "jeecg": 9.6, "jeebt": 4.8 } { "type": "Dec", "jero": 9.6, "jeroTwo": 4.8 }
] ]
``` ```
@@ -1,17 +1,14 @@
<template> <template>
<div class="footer"> <div class="footer">
<div class="links"> <div class="links">
<a href="http://www.jeecg.com" target="_blank">JEECG 首页</a> <a href="http://www.hzwlsoft.com" target="_blank">JERO 首页</a>
<a href="https://github.com/zhangdaiscott/jeecg-boot" target="_blank">
<a-icon type="github"/>
</a>
<a href="https://ant.design/">Ant Design</a> <a href="https://ant.design/">Ant Design</a>
<a href="https://vuecomponent.github.io/ant-design-vue/docs/vue/introduce-cn/">Vue Antd</a> <a href="https://vuecomponent.github.io/ant-design-vue/docs/vue/introduce-cn/">Vue Antd</a>
</div> </div>
<div class="copyright"> <div class="copyright">
Copyright Copyright
<a-icon type="copyright"/> <a-icon type="copyright"/>
2019 <span>JEECG开源社区 出品</span> 2019 <span>hzwl&syxy</span>
</div> </div>
</div> </div>
</template> </template>
@@ -17,7 +17,7 @@
:type="collapsed ? 'menu-unfold' : 'menu-fold'" :type="collapsed ? 'menu-unfold' : 'menu-fold'"
@click="toggle"/> @click="toggle"/>
<span v-if="device === 'desktop'">欢迎进入 Jeecg-Boot 企业级快速开发平台</span> <span v-if="device === 'desktop'">欢迎进入 Jero-Boot 平台</span>
<span v-else>Jeecg-Boot</span> <span v-else>Jeecg-Boot</span>
<user-menu :theme="theme"/> <user-menu :theme="theme"/>
+1 -1
View File
@@ -11,7 +11,7 @@ import { ACCESS_TOKEN, TENANT_ID } from "@/store/mutation-types"
* 则映射后端域名,通过 vue.config.js * 则映射后端域名,通过 vue.config.js
* @type {*|string} * @type {*|string}
*/ */
let apiBaseUrl = window._CONFIG['domianURL'] || "/jeecg-boot"; let apiBaseUrl = window._CONFIG['domianURL'] || "/jero-boot";
//console.log("apiBaseUrl= ",apiBaseUrl) //console.log("apiBaseUrl= ",apiBaseUrl)
// 创建 axios 实例 // 创建 axios 实例
const service = axios.create({ const service = axios.create({
@@ -15,8 +15,8 @@
</template> </template>
<script> <script>
import JVxeDemo1 from '@views/jeecg/JVxeDemo/JVxeDemo1' import JVxeDemo1 from '@views/jero/JVxeDemo/JVxeDemo1'
import JVxeDemo2 from '@views/jeecg/JVxeDemo/JVxeDemo2' import JVxeDemo2 from '@views/jero/JVxeDemo/JVxeDemo2'
export default { export default {
name: 'JVXETableDemo', name: 'JVXETableDemo',
@@ -158,7 +158,7 @@
let radio = randomNumber(0, 2) let radio = randomNumber(0, 2)
values.push({ values.push({
id: randomUUID(), id: randomUUID(),
select_dict_search: ['', 'admin', '', 'jeecg', ''][randomNumber(0, 4)], select_dict_search: ['', 'admin', '', 'jero', ''][randomNumber(0, 4)],
progress: randomNumber(0, 100), progress: randomNumber(0, 100),
radio: radio ? radio.toString() : null radio: radio ? radio.toString() : null
}) })
@@ -500,7 +500,7 @@
jcheckbox: { jcheckbox: {
values: 'spring,jeecgboot', values: 'spring,jeecgboot',
options: [ options: [
{ label: 'Jeecg', value: 'jeecg' }, { label: 'Jeecg', value: 'jero' },
{ label: 'Jeecg-Boot', value: 'jeecgboot' }, { label: 'Jeecg-Boot', value: 'jeecgboot' },
{ label: 'Spring', value: 'spring', disabled: true }, { label: 'Spring', value: 'spring', disabled: true },
{ label: 'MyBaits', value: 'mybatis' } { label: 'MyBaits', value: 'mybatis' }
@@ -98,7 +98,7 @@
<script> <script>
import { getAction } from '@/api/manage' import { getAction } from '@/api/manage'
import JeecgOrderDMainModal from '@/views/jeecg/tablist/form/JeecgOrderDMainModal' import JeecgOrderDMainModal from '@views/jero/tablist/form/JeroOrderDMainModal'
import {JeroListMixin} from '@/mixins/JeroListMixin' import {JeroListMixin} from '@/mixins/JeroListMixin'
export default { export default {
@@ -60,22 +60,22 @@
</div> </div>
<!-- table区域-end --> <!-- table区域-end -->
<!-- 表单区域 --> <!-- 表单区域 -->
<jeecgOrderCustomer-modal ref="modalForm" @ok="modalFormOk"></jeecgOrderCustomer-modal> <jeroOrderCustomer-modal ref="modalForm" @ok="modalFormOk"></jeroOrderCustomer-modal>
</a-card> </a-card>
</template> </template>
<script> <script>
import JeecgOrderCustomerModal from './form/JeecgOrderCustomerModal' import JeroOrderCustomerModal from './form/JeroOrderCustomerModal'
import JeecgOrderDMainList from './JeecgOrderDMainList' import JeroOrderDMainList from './JeroOrderDMainList'
import {JeroListMixin} from '@/mixins/JeroListMixin' import {JeroListMixin} from '@/mixins/JeroListMixin'
import {getAction} from '@/api/manage' import {getAction} from '@/api/manage'
export default { export default {
name: "JeecgOrderCustomerList", name: "JeroOrderDMainModal",
mixins: [JeroListMixin], mixins: [JeroListMixin],
components: { components: {
JeecgOrderDMainList, JeroOrderDMainList,
JeecgOrderCustomerModal JeroOrderCustomerModal
}, },
data() { data() {
return { return {
@@ -85,37 +85,37 @@
<a-tabs defaultActiveKey="1"> <a-tabs defaultActiveKey="1">
<a-tab-pane tab="客户信息" key="1"> <a-tab-pane tab="客户信息" key="1">
<Jeecg-Order-Customer-List ref="JeecgOrderCustomerList"></Jeecg-Order-Customer-List> <Jero-Order-Customer-List ref="JeroOrderCustomerList"></Jero-Order-Customer-List>
</a-tab-pane> </a-tab-pane>
<a-tab-pane tab="机票信息" key="2" forceRender> <a-tab-pane tab="机票信息" key="2" forceRender>
<Jeecg-Order-Ticket-List ref="JeecgOrderTicketList"></Jeecg-Order-Ticket-List> <Jero-Order-Ticket-List ref="JeroOrderTicketList"></Jero-Order-Ticket-List>
</a-tab-pane> </a-tab-pane>
</a-tabs> </a-tabs>
<!-- 表单区域 --> <!-- 表单区域 -->
<jeecgOrderDMain-modal ref="modalForm" @ok="modalFormOk"></jeecgOrderDMain-modal> <jeroOrderDMain-modal ref="modalForm" @ok="modalFormOk"></jeroOrderDMain-modal>
</a-card> </a-card>
</template> </template>
<script> <script>
import JeecgOrderDMainModal from './form/JeecgOrderDMainModal' import JeroOrderDMainModal from './form/JeroOrderDMainModal'
import JeecgOrderCustomerList from './JeecgOrderCustomerList' import JeroOrderCustomerList from './JeroOrderCustomerList'
import JeecgOrderTicketList from './JeecgOrderTicketList' import JeroOrderTicketList from './JeroOrderTicketList'
import {deleteAction} from '@/api/manage' import {deleteAction} from '@/api/manage'
import JeecgOrderCustomerModal from './form/JeecgOrderCustomerModal' import JeroOrderCustomerModal from './form/JeroOrderCustomerModal'
import JeecgOrderTicketModal from './form/JeecgOrderTicketModal' import JeroOrderTicketModal from './form/JeroOrderTicketModal'
import {JeroListMixin} from '@/mixins/JeroListMixin' import {JeroListMixin} from '@/mixins/JeroListMixin'
export default { export default {
name: "JeecgOrderDMainList", name: "JeroOrderDMainList",
mixins: [JeroListMixin], mixins: [JeroListMixin],
components: { components: {
JeecgOrderTicketModal, JeroOrderTicketModal,
JeecgOrderCustomerModal, JeroOrderCustomerModal,
JeecgOrderDMainModal, JeroOrderDMainModal,
JeecgOrderCustomerList, JeroOrderCustomerList,
JeecgOrderTicketList, JeroOrderTicketList,
}, },
data() { data() {
return { return {
@@ -205,20 +205,20 @@
onSelectChange(selectedRowKeys, selectionRows) { onSelectChange(selectedRowKeys, selectionRows) {
this.selectedRowKeys = selectedRowKeys; this.selectedRowKeys = selectedRowKeys;
this.selectionRows = selectionRows; this.selectionRows = selectionRows;
this.$refs.JeecgOrderCustomerList.getOrderMain(this.selectedRowKeys[0]); this.$refs.JeroOrderCustomerList.getOrderMain(this.selectedRowKeys[0]);
this.$refs.JeecgOrderTicketList.getOrderMain(this.selectedRowKeys[0]); this.$refs.JeroOrderTicketList.getOrderMain(this.selectedRowKeys[0]);
}, },
onClearSelected() { onClearSelected() {
this.selectedRowKeys = []; this.selectedRowKeys = [];
this.selectionRows = []; this.selectionRows = [];
this.$refs.JeecgOrderCustomerList.queryParam.mainId = null; this.$refs.JeroOrderCustomerList.queryParam.mainId = null;
this.$refs.JeecgOrderTicketList.queryParam.mainId = null; this.$refs.JeroOrderTicketList.queryParam.mainId = null;
this.$refs.JeecgOrderCustomerList.loadData(); this.$refs.JeroOrderCustomerList.loadData();
this.$refs.JeecgOrderTicketList.loadData(); this.$refs.JeroOrderTicketList.loadData();
this.$refs.JeecgOrderCustomerList.selectedRowKeys = []; this.$refs.JeroOrderCustomerList.selectedRowKeys = [];
this.$refs.JeecgOrderCustomerList.selectionRows = []; this.$refs.JeroOrderCustomerList.selectionRows = [];
this.$refs.JeecgOrderTicketList.selectedRowKeys = []; this.$refs.JeroOrderTicketList.selectedRowKeys = [];
this.$refs.JeecgOrderTicketList.selectionRows = []; this.$refs.JeroOrderTicketList.selectionRows = [];
}, },
handleDelete: function (id) { handleDelete: function (id) {
@@ -227,8 +227,8 @@
if (res.success) { if (res.success) {
that.$message.success(res.message); that.$message.success(res.message);
that.loadData(); that.loadData();
this.$refs.JeecgOrderCustomerList.loadData(); this.$refs.JeroOrderCustomerList.loadData();
this.$refs.JeecgOrderTicketList.loadData(); this.$refs.JeroOrderTicketList.loadData();
} else { } else {
that.$message.warning(res.message); that.$message.warning(res.message);
} }
@@ -237,14 +237,14 @@
searchQuery:function(){ searchQuery:function(){
this.selectedRowKeys = []; this.selectedRowKeys = [];
this.selectionRows = []; this.selectionRows = [];
this.$refs.JeecgOrderCustomerList.queryParam.mainId = null; this.$refs.JeroOrderCustomerList.queryParam.mainId = null;
this.$refs.JeecgOrderTicketList.queryParam.mainId = null; this.$refs.JeroOrderTicketList.queryParam.mainId = null;
this.$refs.JeecgOrderCustomerList.loadData(); this.$refs.JeroOrderCustomerList.loadData();
this.$refs.JeecgOrderTicketList.loadData(); this.$refs.JeroOrderTicketList.loadData();
this.$refs.JeecgOrderCustomerList.selectedRowKeys = []; this.$refs.JeroOrderCustomerList.selectedRowKeys = [];
this.$refs.JeecgOrderCustomerList.selectionRows = []; this.$refs.JeroOrderCustomerList.selectionRows = [];
this.$refs.JeecgOrderTicketList.selectedRowKeys = []; this.$refs.JeroOrderTicketList.selectedRowKeys = [];
this.$refs.JeecgOrderTicketList.selectionRows = []; this.$refs.JeroOrderTicketList.selectionRows = [];
this.loadData(); this.loadData();
} }
} }
@@ -63,20 +63,20 @@
<!-- table区域-end --> <!-- table区域-end -->
<!-- 表单区域 --> <!-- 表单区域 -->
<JeecgOrderTicket-modal ref="modalForm" @ok="modalFormOk"></JeecgOrderTicket-modal> <JeroOrderTicket-modal ref="modalForm" @ok="modalFormOk"></JeroOrderTicket-modal>
</a-card> </a-card>
</template> </template>
<script> <script>
import JeecgOrderTicketModal from './form/JeecgOrderTicketModal' import JeroOrderTicketModal from './form/JeroOrderTicketModal'
import {JeroListMixin} from '@/mixins/JeroListMixin' import {JeroListMixin} from '@/mixins/JeroListMixin'
import {getAction} from '@/api/manage' import {getAction} from '@/api/manage'
export default { export default {
name: "JeecgOrderTicketList", name: "JeroOrderTicketList",
mixins: [JeroListMixin], mixins: [JeroListMixin],
components: { components: {
JeecgOrderTicketModal, JeroOrderTicketModal,
}, },
data() { data() {
return { return {
@@ -74,7 +74,7 @@
import JImageUpload from '../../../../components/jero/JImageUpload' import JImageUpload from '../../../../components/jero/JImageUpload'
export default { export default {
name: "JeecgOrderCustomerModal", name: "JeroOrderCustomerModal",
components: { JImageUpload }, components: { JImageUpload },
data() { data() {
return { return {
@@ -59,7 +59,7 @@
import moment from "moment" import moment from "moment"
export default { export default {
name: "JeecgOrderDMainModal", name: "JeroOrderDMainModal",
components: { components: {
JDate JDate
}, },
@@ -69,7 +69,7 @@
components: { components: {
JDate JDate
}, },
name: 'JeecgOrderTicketModal', name: 'JeroOrderTicketModal',
data() { data() {
return { return {
title: '操作', title: '操作',
@@ -5,7 +5,7 @@ import { mapActions } from 'vuex'
import { postAction } from '@api/manage' import { postAction } from '@api/manage'
import { timeFix } from '@/utils/util' import { timeFix } from '@/utils/util'
export const JeecgThirdLoginMixin = { export const JeroThirdLoginMixin = {
data() { data() {
return { return {
//第三方登录相关信息 //第三方登录相关信息
+2 -2
View File
@@ -77,7 +77,7 @@
</template> </template>
<script> <script>
import { JeecgThirdLoginMixin } from '@views/user/third/JeecgThirdLoginMixin' import { JeroThirdLoginMixin } from '@views/user/third/JeroThirdLoginMixin'
import { Icon } from 'ant-design-vue'; import { Icon } from 'ant-design-vue';
const IconFont = Icon.createFromIconfontCN({ const IconFont = Icon.createFromIconfontCN({
@@ -86,7 +86,7 @@ const IconFont = Icon.createFromIconfontCN({
}); });
export default { export default {
name: 'thirdLogin', name: 'thirdLogin',
mixins: [JeecgThirdLoginMixin], mixins: [JeroThirdLoginMixin],
components: { components: {
IconFont, IconFont,
} }