提交 a97e675f 编写于 作者: ibizdev's avatar ibizdev

kuaikuai 发布系统代码 [后台服务,演示应用]

上级 51a29b53
......@@ -242,6 +242,7 @@ export default {
menuitem96: "内置功能",
menuitem97: "时间轴样式",
menuitem109: "项布局面板",
menuitem64: "自定义插件",
menuitem101: "看板",
menuitem102: "看板内置功能",
menuitem104: "代码表分组",
......
......@@ -242,6 +242,7 @@ export default {
menuitem96: "内置功能",
menuitem97: "时间轴样式",
menuitem109: "项布局面板",
menuitem64: "自定义插件",
menuitem101: "看板",
menuitem102: "看板内置功能",
menuitem104: "代码表分组",
......
......@@ -1323,6 +1323,24 @@ mock.onGet('v7/main-menuappmenu').reply((config: any) => {
textcls: '',
appfunctag: 'AppFunc29',
resourcetag: '',
},
{
id: '9118D94A-9D3F-43E3-A0F1-6909BE09996F',
name: 'menuitem64',
text: '自定义插件',
type: 'MENUITEM',
counterid: '',
tooltip: '自定义插件',
expanded: false,
separator: false,
hidden: false,
hidesidebar: false,
opendefault: false,
iconcls: '',
icon: '',
textcls: '',
appfunctag: 'AppFunc72',
resourcetag: '',
},
],
},
......
<script lang='tsx'>
import { Component } from 'vue-property-decorator';
import IBIZBOOKUsr4CalendarViewBase from './ibizbookusr4-calendar-view-base.vue';
import view_calendar from '@widgets/ibizbook/custom-calendar-calendar/custom-calendar-calendar.vue';
@Component({
components: {
view_calendar,
},
beforeRouteEnter: (to: any, from: any, next: any) => {
next((vm: any) => {
if(!Object.is(vm.navModel,"route")){
vm.initNavDataWithTab(vm.viewCacheData);
}
vm.$store.commit('addCurPageViewtag', { fullPath: to.fullPath, viewtag: vm.viewtag });
});
},
})
export default class IBIZBOOKUsr4CalendarView extends IBIZBOOKUsr4CalendarViewBase {
}
</script>
\ No newline at end of file
......@@ -181,6 +181,7 @@ export const PageComponents = {
Vue.component('ibizuniproduct-index-pickup-data-view', () => import('@pages/sample/ibizuniproduct-index-pickup-data-view/ibizuniproduct-index-pickup-data-view.vue'));
Vue.component('ibizorder-type-usr2-grid-view', () => import('@pages/sample/ibizorder-type-usr2-grid-view/ibizorder-type-usr2-grid-view.vue'));
Vue.component('ibizorder-tab-exp-view', () => import('@pages/sample/ibizorder-tab-exp-view/ibizorder-tab-exp-view.vue'));
Vue.component('ibizbookusr4-calendar-view', () => import('@pages/sample/ibizbookusr4-calendar-view/ibizbookusr4-calendar-view.vue'));
Vue.component('ibizsample0018-grid-view', () => import('@pages/sample/ibizsample0018-grid-view/ibizsample0018-grid-view.vue'));
Vue.component('ibizsample0014-grid-view', () => import('@pages/sample/ibizsample0014-grid-view/ibizsample0014-grid-view.vue'));
Vue.component('app-panel-view', () => import('@pages/ungroup/app-panel-view/app-panel-view.vue'));
......
......@@ -2853,6 +2853,20 @@ const router = new Router({
},
component: () => import('@pages/sample/ibizorder-tab-exp-view/ibizorder-tab-exp-view.vue'),
},
{
path: 'ibizbooks/:ibizbook?/usr4calendarview/:usr4calendarview?',
meta: {
caption: 'entities.ibizbook.views.usr4calendarview.caption',
info:'',
parameters: [
{ pathName: 'index', parameterName: 'index' },
{ pathName: 'ibizbooks', parameterName: 'ibizbook' },
{ pathName: 'usr4calendarview', parameterName: 'usr4calendarview' },
],
requireAuth: true,
},
component: () => import('@pages/sample/ibizbookusr4-calendar-view/ibizbookusr4-calendar-view.vue'),
},
...indexRoutes,
],
},
......@@ -4325,6 +4339,19 @@ const router = new Router({
},
component: () => import('@pages/sample/ibizbookusr4-grid-view/ibizbookusr4-grid-view.vue'),
},
{
path: '/ibizbooks/:ibizbook?/usr4calendarview/:usr4calendarview?',
meta: {
caption: 'entities.ibizbook.views.usr4calendarview.caption',
info:'',
parameters: [
{ pathName: 'ibizbooks', parameterName: 'ibizbook' },
{ pathName: 'usr4calendarview', parameterName: 'usr4calendarview' },
],
requireAuth: true,
},
component: () => import('@pages/sample/ibizbookusr4-calendar-view/ibizbookusr4-calendar-view.vue'),
},
{
path: '/ibizbooks/:ibizbook?/interfunckanbanview/:interfunckanbanview?',
meta: {
......
......@@ -290,6 +290,7 @@ export const viewstate: any = {
'e57dd501c75c6933363fa245edcadbbd',
'14eddc6d2c858a72c796b017959cc4ef',
'1247febf206e1e0dbb4f384b4cfa565c',
'95984592003cd9b15f3fd01371cc384c',
],
},
{
......@@ -1119,6 +1120,15 @@ export const viewstate: any = {
'b3429ecc4d89a02bc5f5279f1bd7f620',
],
},
{
viewtag: '95984592003cd9b15f3fd01371cc384c',
viewmodule: 'Sample',
viewname: 'IBIZBOOKUsr4CalendarView',
viewaction: '',
viewdatachange: false,
refviews: [
],
},
{
viewtag: '98865bf786ea85b14932dd5e48a74983',
viewmodule: 'Sample',
......
......@@ -587,6 +587,9 @@ export default class MainMenuBase extends Vue implements ControlInterface {
case 'AppFunc25':
this.clickAppFunc25(item);
return;
case 'AppFunc72':
this.clickAppFunc72(item);
return;
case 'Auto286':
this.clickAuto286(item);
return;
......@@ -1410,6 +1413,29 @@ export default class MainMenuBase extends Vue implements ControlInterface {
})
}
/**
* 图书日历自定义插件
*
* @param {*} [item={}]
* @memberof MainMenu
*/
public clickAppFunc72(item: any = {}) {
const viewparam: any = {};
Object.assign(viewparam, {});
const deResParameters: any[] = [];
const parameters: any[] = [
{ pathName: 'ibizbooks', parameterName: 'ibizbook' },
{ pathName: 'usr4calendarview', parameterName: 'usr4calendarview' },
];
const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
if(Object.is(this.$route.fullPath,path)){
return;
}
this.$nextTick(function(){
this.$router.push(path);
})
}
/**
* 列操作表格
*
......
......@@ -1399,6 +1399,25 @@ export default class MainMenuModel {
appfunctag: 'AppFunc29',
resourcetag: '',
authtag:'Web-MainMenu-menuitem109',
},
{
id: '9118D94A-9D3F-43E3-A0F1-6909BE09996F',
name: 'menuitem64',
text: '自定义插件',
type: 'MENUITEM',
counterid: '',
tooltip: '自定义插件',
expanded: false,
separator: false,
hidden: false,
hidesidebar: false,
opendefault: false,
iconcls: '',
icon: '',
textcls: '',
appfunctag: 'AppFunc72',
resourcetag: '',
authtag:'Web-MainMenu-menuitem64',
},
],
},
......
......@@ -26,6 +26,11 @@ export default class MainModel {
]
}else{
return [
{
name: 'amount',
prop: 'amount',
dataType: 'INT',
},
{
name: 'ibizappctrltype',
prop: 'ibizappctrltype',
......
......@@ -26,6 +26,11 @@ export default class MainModel {
]
}else{
return [
{
name: 'amount',
prop: 'amount',
dataType: 'INT',
},
{
name: 'instanceaddress',
prop: 'instanceaddress',
......
/**
* CustomCalendar 部件模型
*
* @export
* @class CustomCalendarModel
*/
export default class CustomCalendarModel {
/**
* 日历项类型
*
* @returns {any[]}
* @memberof CustomCalendarCalendarMode
*/
public itemType: string = "";
/**
* 获取数据项集合
*
* @returns {any[]}
* @memberof CustomCalendarCalendarMode
*/
public getDataItems(): any[] {
let dataItems: any = [
// 前端新增修改标识,新增为"0",修改为"1"或未设值
{
name: 'srffrontuf',
prop: 'srffrontuf',
dataType: 'TEXT',
},
{
name: 'color',
},
{
name: 'textColor',
},
{
name: 'itemType',
},
{
name: 'query',
prop: 'query',
},
];
switch(this.itemType){
case "item":
dataItems = [...dataItems,
{
name: 'ibizbook',
prop: 'ibizbookid'
},
{
name: 'title',
prop: 'ibizbookname'
},
{
name:'start',
prop:'lendouttime'
},
{
name:'end',
prop:'returntime'
},
];
break;
}
return dataItems;
}
}
\ No newline at end of file
import { Http,Util,Errorlog } from '@/utils';
import ControlService from '@/widgets/control-service';
import IBIZBOOKService from '@/service/ibizbook/ibizbook-service';
import CustomCalendarModel from './custom-calendar-calendar-model';
/**
* CustomCalendar 部件服务对象
*
* @export
* @class CustomCalendarService
*/
export default class CustomCalendarService extends ControlService {
/**
* 图书服务对象
*
* @type {IBIZBOOKService}
* @memberof CustomCalendarService
*/
public appEntityService: IBIZBOOKService = new IBIZBOOKService({ $store: this.getStore() });
/**
* 设置从数据模式
*
* @type {boolean}
* @memberof CustomCalendarService
*/
public setTempMode(){
this.isTempMode = false;
}
/**
* Creates an instance of CustomCalendarService.
*
* @param {*} [opts={}]
* @memberof CustomCalendarService
*/
constructor(opts: any = {}) {
super(opts);
this.model = new CustomCalendarModel();
}
/**
* 事件配置集合
*
* @public
* @type {any[]}
* @memberof CustomCalendar
*/
public eventsConfig: any[] = [
{
itemName : '图书',
itemType : 'item',
color : '',
textColor : '',
},
];
/**
* 查询数据
*
* @param {string} action
* @param {*} [context={}]
* @param {*} [data={}]
* @param {boolean} [isloading]
* @returns {Promise<any>}
* @memberof CustomCalendarService
*/
@Errorlog
public search(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let _this = this;
return new Promise((resolve: any, reject: any) => {
let promises:any = [];
let tempRequest:any;
tempRequest = this.handleRequestData(action,context,data,true,"item");
promises.push(this.appEntityService.FetchDefault(tempRequest.context, tempRequest.data, isloading));
Promise.all(promises).then((resArray: any) => {
let _data:any = [];
resArray.forEach((response:any,resIndex:number) => {
if (!response || response.status !== 200) {
return;
}
let _response: any = JSON.parse(JSON.stringify(response));
_response.data.forEach((item:any,index:number) =>{
_response.data[index].color = _this.eventsConfig[resIndex].color;
_response.data[index].textColor = _this.eventsConfig[resIndex].textColor;
_response.data[index].itemType = _this.eventsConfig[resIndex].itemType;
});
;
_this.handleResponse(action, _response,false,_this.eventsConfig[resIndex].itemType);
_data.push(..._response.data);
});
// 排序
_data.sort((a:any, b:any)=>{
let dateA = new Date(Date.parse(a.start.replace(/-/g, "/")));
let dateB = new Date(Date.parse(b.start.replace(/-/g, "/")));
return dateA > dateB ? 1 : -1 ;
});
let result = {status: 200, data: _data};
resolve(result);
}).catch((response: any) => {
reject(response);
});
});
}
/**
* 修改数据
*
* @param {string} action
* @param {*} [context={}]
* @param {*} [data={}]
* @param {boolean} [isloading]
* @returns {Promise<any>}
* @memberof CustomCalendarService
*/
@Errorlog
public update(itemType: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
return new Promise((resolve: any, reject: any) => {
let result: any;
let tempRequest:any;
switch(itemType) {
case "item":
tempRequest = this.handleRequestData("",context,data,false,"item");
result = this.appEntityService.Update(tempRequest.context, tempRequest.data, isloading);
break;
}
if(result){
result.then((response: any) => {
this.handleResponse("", response);
resolve(response);
}).catch((response: any) => {
reject(response);
});
}else{
reject("没有匹配的实体服务");
}
});
}
/**
* 处理request请求数据
*
* @param action 行为
* @param data 数据
* @memberof ControlService
*/
public handleRequestData(action: string,context:any ={},data: any = {},isMerge:boolean = false,itemType:string=""){
let model: any = this.getMode();
model.itemType = itemType;
return super.handleRequestData(action,context,data,isMerge);
}
/**
* 处理response返回数据
*
* @param {string} action
* @param {*} response
* @memberof ControlService
*/
public async handleResponse(action: string, response: any,isCreate:boolean = false,itemType:string=""){
let model: any = this.getMode();
model.itemType = itemType;
super.handleResponse(action,response,isCreate);
}
}
\ No newline at end of file
// this is less
@import '~@fullcalendar/core/main.css';
@import '~@fullcalendar/daygrid/main.css';
@import '~@fullcalendar/timegrid/main.css';
@import '~@fullcalendar/list/main.css';
.calendar{
height:100%;
overflow: auto;
.context-menu-container {
height: calc(100% - 70px);
}
.el-timeline{
padding-left: 2px;
}
.app-data-empty{
margin: 0 auto;
display: flex;
align-items: center;
justify-content: center;
height: 100%;
}
.event-legends{
width: 100%;
text-align: center;
.event-lengend{
display: inline-block;
margin-left: 10px;
height: 20px;
.lengend-icon{
display: inline-block;
width: 30px;
height: 20px;
border-radius: 5px;
}
span{
display: inline-block;
margin-left: 5px;
line-height: 20px;
vertical-align: top;
}
}
.event-lengend.event-disabled{
.lengend-icon{
background:#cccccc !important;
}
span{
color:#cccccc !important;
}
}
}
}
// 选中样式
.calendar .selected-event,
.select-first-calendar .select-first-event{
border: 2px solid #ff8711 !important;
}
.calendar .fc-dayGrid-view .selected-event:before,
.select-first-calendar .fc-dayGrid-view .select-first-event:before,
.calendar .fc-timeGrid-view .selected-event:before,
.select-first-calendar .fc-timeGrid-view .select-first-event:before{
content: '';
display: block;
position: absolute;
right: 0;
bottom: 0;
border: 9px solid #ff8711;
border-top-color: transparent;
border-left-color: transparent;
color: #fff;
}
.calendar .fc-dayGrid-view .selected-event:after,
.select-first-calendar .fc-dayGrid-view .select-first-event:after,
.calendar .fc-timeGrid-view .selected-event:after,
.select-first-calendar .fc-timeGrid-view .select-first-event:after{
content: '';
display: block;
width: 4px;
height: 11px;
position: absolute;
right: 1px;
bottom: 0px;
border: 2px solid #fff;
border-top-color: transparent;
border-left-color: transparent;
-webkit-transform: rotate(45deg);
transform: rotate(45deg);
box-sizing: content-box;
}
// 选择跳转日期模态
.date-select-modal{
display: flex;
align-items: center;
justify-content: center;
.ivu-modal{
top: 0;
.ivu-modal-body {
text-align: center;
}
}
}
\ No newline at end of file
<script lang='tsx'>
import { Component } from 'vue-property-decorator';
import CustomCalendarBase from './custom-calendar-calendar-base.vue';
@Component({
components: {
}
})
export default class CustomCalendar extends CustomCalendarBase {
}
</script>
\ No newline at end of file
......@@ -37,11 +37,6 @@
git clone -b master $para2 demosys/
export NODE_OPTIONS=--max-old-space-size=4096
cd demosys/
mvn clean package -Pdemoapi
cd demo-provider/demo-provider-demoapi
mvn -Pdemoapi docker:build
mvn -Pdemoapi docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/demo-provider-demoapi.yaml iBizDemo --with-registry-auth
</command>
</hudson.tasks.Shell>
</builders>
......
......@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /demo-provider-demoapi.jar
EXPOSE 51000
EXPOSE 8081
ADD demo-provider-demoapi.jar /demo-provider-demoapi.jar
......@@ -3,24 +3,9 @@ services:
demo-provider-demoapi:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/demo-provider-demoapi:latest
ports:
- "51000:51000"
- "8081:8081"
networks:
- agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
- SERVER_PORT=51000
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
- SPRING_REDIS_HOST=172.16.240.110
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=a_LAB01_df847bdfd
- SPRING_DATASOURCE_PASSWORD=3d6@460A
- SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_df847bdfd?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
- SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_df847bdfd
- NACOS=172.16.240.110:8848
- SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
- SEATA_ENABLED=true
deploy:
resources:
limits:
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册