Skip to content

I
ibztask
提交 112fca94 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

ibiz4j 发布系统代码

上级 0b88be5e
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 1115 行增加 和 361 行删除
app_web/src/components/app-form-group/app-form-group.vue
浏览文件 @ 112fca94
......@@ -93,6 +93,11 @@
<template v-if="!Object.is(layoutType, 'FLEX')">
<row :gutter="10"><slot></slot></row>
</template>
<template v-if="isManageContainer">
<i-button type="primary" :icon="manageContainerStatus?'ios-repeat':'ios-more'" @click="doManageContainer">
{{manageContainerStatus?$t('components.appFormGroup.hide'):$t('components.appFormGroup.showMore')}}
</i-button>
</template>
</card>
<template v-if="isShowCaption === false">
<slot></slot>
......@@ -115,6 +120,22 @@ export default class AppFormGroup extends Vue {
*/
@Prop() public caption?: string;
/**
* 是否为管理容器
*
* @type {string}
* @memberof AppFormGroup
*/
@Prop({ default: false }) public isManageContainer?: boolean;
/**
* 管理容器状态
*
* @type {string}
* @memberof AppFormGroup
*/
@Prop({ default: false }) public manageContainerStatus?: boolean;
/**
* 内置界面样式
*
......@@ -244,6 +265,16 @@ export default class AppFormGroup extends Vue {
public doUIAction($event: any, item: any): void {
this.$emit('groupuiactionclick', { event: $event, item: item });
}
/**
* 操作管理容器
*
* @param {*} $event
* @memberof AppFormGroup
*/
public doManageContainer(){
this.$emit('managecontainerclick');
}
}
</script>
<style lang='less'>
......
app_web/src/components/app-mpicker/app-mpicker.vue
浏览文件 @ 112fca94
......@@ -44,6 +44,11 @@ export default class AppMpicker extends Vue {
*/
@Prop() curvalue?: any;
/**
* 值项
*/
@Prop() valueitem?: any;
/**
* 局部上下文导航参数
*
......@@ -144,14 +149,34 @@ export default class AppMpicker extends Vue {
this.value = [];
this.selectItems = [];
if (newVal) {
this.selectItems = this.parseValue(JSON.parse(newVal));
this.selectItems.forEach((item: any) => {
this.value.push(item[this.deKeyField]);
let index = this.items.findIndex((i) => Object.is(i[this.deKeyField], item[this.deKeyField]));
if (index < 0) {
this.items.push({ [this.deMajorField]: item[this.deMajorField], [this.deKeyField]: item[this.deKeyField] });
try {
this.selectItems = this.parseValue(JSON.parse(newVal));
this.selectItems.forEach((item: any) => {
this.value.push(item[this.deKeyField]);
let index = this.items.findIndex((i) => Object.is(i[this.deKeyField], item[this.deKeyField]));
if (index < 0) {
this.items.push({ [this.deMajorField]: item[this.deMajorField], [this.deKeyField]: item[this.deKeyField] });
}
});
} catch (error) {
if(error.name === 'SyntaxError'){
let srfkeys:any = newVal.split(',');
let srfmajortexts:any = null;
if(this.valueitem && this.activeData[this.valueitem]){
srfmajortexts = this.activeData[this.valueitem].split(',');
}
});
if(srfkeys.length && srfkeys.length > 0 && srfmajortexts.length && srfmajortexts.length > 0 && srfkeys.length == srfmajortexts.length){
srfkeys.forEach((id: any, index: number) => {
this.value.push(id);
this.selectItems.push({[this.deKeyField]: id, [this.deMajorField]: srfmajortexts[index]});
let _index = this.items.findIndex((i) => Object.is(i[this.deKeyField],id));
if (_index < 0) {
this.items.push({[this.deKeyField]: id, [this.deMajorField]: srfmajortexts[index]});
}
});
}
}
}
}
this.$forceUpdate();
}
......
app_web/src/components/context-menu-drag/context-menu-drag.vue
浏览文件 @ 112fca94
......@@ -25,7 +25,7 @@
</span>
</el-col>
<el-col :span="14">
<span>{{ item.label }}</span>
<span>{{ item.fullName ? item.fullName:item.label }}</span>
</el-col>
<el-col :span="6">
<div class="bar">
......@@ -46,7 +46,7 @@
<Drawer class-name="menu-drawer" width="60" :closable="true" :mask="false" placement="left" v-model="rightDrawerVisiable">
<div class="menuItems">
<div @click="skipTo(item)" class="item" v-for="(item) in list" :key="item.id">
<span class="title">{{item.label}}</span>
<span class="title">{{ item.fullName ? item.fullName:item.label }}</span>
<span v-if="isStar(item.id)" class="star" @click.stop="outStar(item)">
<Icon type="ios-star" />
</span>
......
app_web/src/components/filter-tree/filter-mode.vue 0 → 100644
浏览文件 @ 112fca94
<template>
<el-select size="small" class="filter-mode" placeholder="条件逻辑" clearable v-model="curVal" @change="onChange">
<el-option
v-for="mode in filterMode"
:key="mode.value"
:label="mode.en"
:value="mode.value"
>
</el-option>
</el-select>
</template>
<script lang="ts">
import { Vue, Component, Model } from "vue-property-decorator";
@Component({})
export default class FilterMode extends Vue {
/**
* 值属性
*
* @type {*}
* @memberof FilterMode
*/
@Model('change') readonly value: any;
get curVal() {
return this.value;
}
set curVal(val: any) {
const type: string = this.$util.typeOf(val);
val = Object.is(type, 'null') || Object.is(type, 'undefined') ? undefined : val;
this.$emit('change', val);
}
/**
* 过滤模式
*
* @type {*}
* @memberof FilterMode
*/
public filterMode: any[] = [
// { name: 'AND', value: '$and' },
// { name: 'OR', value: '$or' },
{ zh: '等于(=)', en: 'EQ', value: '$eq' },
{ zh: '', en: 'NE', value: '$ne' },
{ zh: '', en: 'GT', value: '$gt' },
{ zh: '', en: 'GE', value: '$gte' },
{ zh: '', en: 'LT', value: '$lt' },
{ zh: '', en: 'LE', value: '$lte' },
{ zh: '', en: 'IS_NULL', value: '$null' },
{ zh: '', en: 'IS_NOT_NULL', value: '$notNull' },
{ zh: '', en: 'IN', value: '$in' },
{ zh: '', en: 'NOTIN', value: '$notIn' },
{ zh: '', en: 'LIKE', value: '$like' },
{ zh: '', en: 'LIFTLIKE', value: '$startsWith' },
{ zh: '', en: 'RIGHTLIKE', value: '$endsWith' },
{ zh: '', en: 'EXISTS', value: '$exists' },
{ zh: '', en: 'NOTEXISTS', value: '$notExists' }
];
/**
* 值改变
*
* @memberof FilterMode
*/
public onChange() {
this.$emit('mode-change', this.value);
}
}
</script>
\ No newline at end of file
app_web/src/components/filter-tree/filter-tree.less 0 → 100644
浏览文件 @ 112fca94
.filter-item {
display: flex;
// margin-top: 10px;
.fa-trash-o {
color: red;
}
.filter-item-group {
width: 100px;
margin-left: 5px;
}
.filter-item-field {
width: 200px;
margin-left: 5px;
}
.filter-item-mode {
width: 200px;
margin-left: 5px;
}
.filter-item-value {
margin-left: 5px;
flex-grow: 1;
}
}
.filter-tree {
.el-tree-node__content {
height: 40px;
.filter-tree-item {
display: flex;
>div {
margin-right: 10px;
}
>div:nth-last-child(1) {
margin-right: 0;
}
.filter-tree-action {
margin-left: 20px;
.ivu-btn {
margin-right: 5px;
}
}
}
}
}
\ No newline at end of file
app_web/src/components/filter-tree/filter-tree.vue 0 → 100644
浏览文件 @ 112fca94
<template>
<el-tree class="filter-tree" :data="treeItems" :props="defaultProps" :expand-on-click-node="false" default-expand-all>
<template slot-scope="{ node, data }">
<template v-if="Object.is(data.name, '$and') || Object.is(data.name, '$or')">
<div class="filter-tree-item">
<el-select size="small" v-model="data.name">
<el-option v-for="mode in relationModes" :key="mode.value" :label="mode.zh" :value="mode.value"></el-option>
</el-select>
<div class="filter-tree-action">
<i-button title="添加条件" @click="onAddItem(data)"><i class="fa fa-plus" aria-hidden="true"></i> 添加条件</i-button>
<i-button title="添加组" @click="onAddGroup(data)"><i class="fa fa-plus" aria-hidden="true"></i> 添加组</i-button>
</div>
</div>
</template>
<template v-else>
<div class="filter-tree-item">
<el-select size="small" class="filter-item-field" v-model="data.field" clearable placeholder="属性" @change="onFieldChange(data)">
<el-option
v-for="item in fields"
:key="item.prop"
:label="item.label"
:value="item.name">
</el-option>
</el-select>
<filter-mode class="filter-item-mode" v-model="data.mode"></filter-mode>
<div class="filter-item-value">
<i-input v-if="!data.field"></i-input>
<slot v-else :data="data"></slot>
</div>
<div class="filter-tree-action">
<i-button @click="onRemoveItem(node, data)" title="删除"><i class="fa fa-trash-o" aria-hidden="true"></i></i-button>
</div>
</div>
</template>
</template>
</el-tree>
</template>
<script lang="ts">
import {Vue, Component, Prop} from 'vue-property-decorator';
import FilterMode from './filter-mode.vue';
@Component({
components: {
FilterMode
}
})
export default class FilterTree extends Vue {
@Prop() datas: any;
@Prop() fields: any;
protected defaultProps: any = {
children: 'items',
label: 'name'
};
protected relationModes: any[] = [
{ zh: '并且', en: 'AND', value: '$and' },
{ zh: '或', en: 'OR', value: '$or' }
];
get treeItems() {
let root: any = {
name: '$and',
items: this.datas
};
if(this.datas.length == 0) {
this.onAddItem(root);
this.onAddItem(root);
}
return [root];
}
public onFieldChange(data: any) {
if(!data.mode) {
data.mode = '$eq';
}
}
public onAddItem(data: any) {
if(data && data.items) {
data.items.push({
field: null,
mode: null
});
}
}
public onAddGroup(data: any) {
if(data && data.items) {
data.items.push({
name: '$and',
items: []
})
}
}
public onRemoveItem(node: any, data: any) {
if(node && node.parent) {
let pData: any = node.parent.data;
if(pData.items.indexOf(data) >= 0) {
pData.items.splice(pData.items.indexOf(data), 1)
}
}
}
}
</script>
<style lang="less">
@import './filter-tree.less';
</style>
\ No newline at end of file
app_web/src/components/tab-page-exp/tab-page-exp.less
浏览文件 @ 112fca94
.ibiz-page-tag {
position: relative;
margin: 8px 0;
.left{
.el-tabs__header{
padding-right:120px;
......@@ -60,7 +61,8 @@
border-bottom:2px solid transparent !important;
}
.el-tabs__header{
margin:0 0 1 0;
margin:0;
border-bottom: none;
}
}
}
......
app_web/src/engine/view/md-view-engine.ts
浏览文件 @ 112fca94
......@@ -395,6 +395,9 @@ export default class MDViewEngine extends ViewEngine {
if (this.getSearchForm() && this.view.isExpandSearchForm) {
Object.assign(arg, this.getSearchForm().getData());
}
if (this.view && this.view.searchbar) {
Object.assign(arg, this.view.searchbar.getData());
}
if (this.view && !this.view.isExpandSearchForm) {
Object.assign(arg, { query: this.view.query });
}
......
app_web/src/locale/lanres/components/components_en_US.ts
浏览文件 @ 112fca94
......@@ -169,4 +169,8 @@ export default {
YouYuan: 'YouYuan',
},
},
appFormGroup: {
hide: 'hide',
showMore: 'show more',
},
};
\ No newline at end of file
app_web/src/locale/lanres/components/components_zh_CN.ts
浏览文件 @ 112fca94
......@@ -170,4 +170,8 @@ export default {
YouYuan: '幼圆',
},
},
appFormGroup: {
hide: '隐藏字段',
showMore: '显示更多字段',
},
};
\ No newline at end of file
app_web/src/model/form-detail/form-detail.ts
浏览文件 @ 112fca94
......@@ -46,6 +46,22 @@ export class FormDetailModel {
*/
public visible: boolean = true;
/**
* 成员是否显示(旧)
*
* @type {boolean}
* @memberof FormDetailModel
*/
public oldVisible: boolean = true;
/**
* 成员是否为受控内容
*
* @type {boolean}
* @memberof FormDetailModel
*/
public isControlledContent: boolean = false;
/**
* 成员是否显示标题
*
......@@ -53,6 +69,7 @@ export class FormDetailModel {
* @memberof FormDetailModel
*/
public isShowCaption: boolean = true;
/**
* Creates an instance of FormDetailModel.
......@@ -67,7 +84,9 @@ export class FormDetailModel {
this.form = opts.form ? opts.form : {};
this.name = !Object.is(opts.name, '') ? opts.name : '';
this.visible = opts.visible ? true : false;
this.oldVisible = opts.visible ? true : false;
this.isShowCaption = opts.isShowCaption ? true : false;
this.isControlledContent = opts.isControlledContent ? true : false;
}
/**
......
app_web/src/model/form-detail/form-group-panel.ts
浏览文件 @ 112fca94
......@@ -16,6 +16,30 @@ export class FormGroupPanelModel extends FormDetailModel {
* @memberof FormGroupPanelModel
*/
public uiActionGroup: any = {};
/**
* 受控内容组
*
* @type {*}
* @memberof FormGroupPanelModel
*/
public showMoreModeItems: any = [];
/**
* 是否为管理容器
*
* @type {*}
* @memberof FormGroupPanelModel
*/
public isManageContainer: boolean = false;
/**
* 管理容器状态 true显示 false隐藏
*
* @type {*}
* @memberof FormGroupPanelModel
*/
public manageContainerStatus: boolean = true;
/**
* Creates an instance of FormGroupPanelModel.
......@@ -27,5 +51,17 @@ export class FormGroupPanelModel extends FormDetailModel {
constructor(opts: any = {}) {
super(opts);
Object.assign(this.uiActionGroup, opts.uiActionGroup);
this.showMoreModeItems = opts.showMoreModeItems;
this.isManageContainer = opts.isManageContainer ? true : false;
}
/**
* 设置管理容器状态
*
* @param {boolean} state
* @memberof FormGroupPanelModel
*/
public setManageContainerStatus(state: boolean): void {
this.manageContainerStatus = state;
}
}
\ No newline at end of file
app_web/src/pages/task/jobs-info-edit-view/jobs-info-edit-view-base.vue
浏览文件 @ 112fca94
......@@ -458,8 +458,8 @@ export default class JobsInfoEditViewBase extends Vue {
*
* @memberof JobsInfoEditViewBase
*/
public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
public initNavDataWithRoute(data:any = null, isNew:boolean = false, isAlways:boolean = false){
if( isAlways || (this.viewDefaultUsage && Object.is(this.navModel,"route")) ){
this.navDataService.addNavData({id:'jobs-info-edit-view',tag:this.viewtag,srfkey:isNew ? null : this.context.jobsinfo,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
}
}
......@@ -469,8 +469,8 @@ export default class JobsInfoEditViewBase extends Vue {
*
* @memberof JobsInfoEditViewBase
*/
public initNavDataWithTab(data:any = null,isOnlyAdd:boolean = true){
if(this.viewDefaultUsage && !Object.is(this.navModel,"route")){
public initNavDataWithTab(data:any = null,isOnlyAdd:boolean = true, isAlways:boolean = false){
if( isAlways || (this.viewDefaultUsage && !Object.is(this.navModel,"route")) ){
this.navDataService.addNavDataByOnly({id:'jobs-info-edit-view',tag:this.viewtag,srfkey:this.context.jobsinfo,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath},isOnlyAdd);
}
}
......
app_web/src/pages/task/jobs-info-grid-view/jobs-info-grid-view-base.vue
浏览文件 @ 112fca94
......@@ -538,8 +538,8 @@ export default class JobsInfoGridViewBase extends Vue {
*
* @memberof JobsInfoGridViewBase
*/
public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
public initNavDataWithRoute(data:any = null, isNew:boolean = false, isAlways:boolean = false){
if( isAlways || (this.viewDefaultUsage && Object.is(this.navModel,"route")) ){
this.navDataService.addNavData({id:'jobs-info-grid-view',tag:this.viewtag,srfkey:isNew ? null : this.context.jobsinfo,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
}
}
......@@ -549,8 +549,8 @@ export default class JobsInfoGridViewBase extends Vue {
*
* @memberof JobsInfoGridViewBase
*/
public initNavDataWithTab(data:any = null,isOnlyAdd:boolean = true){
if(this.viewDefaultUsage && !Object.is(this.navModel,"route")){
public initNavDataWithTab(data:any = null,isOnlyAdd:boolean = true, isAlways:boolean = false){
if( isAlways || (this.viewDefaultUsage && !Object.is(this.navModel,"route")) ){
this.navDataService.addNavDataByOnly({id:'jobs-info-grid-view',tag:this.viewtag,srfkey:this.context.jobsinfo,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath},isOnlyAdd);
}
}
......@@ -1015,51 +1015,14 @@ export default class JobsInfoGridViewBase extends Vue {
}
/**
* 打开编辑数据视图
*
* @param {any[]} args
* @param {*} [params]
* @param {*} [fullargs]
* @param {*} [$event]
* @param {*} [xData]
* @memberof JobsInfoGridView
*/
public opendata(args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) {
let localContext:any = null;
let localViewParam:any =null;
const data: any = {};
let tempContext = JSON.parse(JSON.stringify(this.context));
if(args.length >0){
Object.assign(tempContext,args[0]);
}
const deResParameters: any[] = [];
const parameters: any[] = [
{ pathName: 'jobsinfos', parameterName: 'jobsinfo' },
];
const _this: any = this;
const openDrawer = (view: any, data: any) => {
let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
container.subscribe((result: any) => {
if (!result || !Object.is(result.ret, 'OK')) {
return;
}
if (!xData || !(xData.refresh instanceof Function)) {
return;
}
xData.refresh(result.datas);
});
}
const view: any = {
viewname: 'jobs-info-edit-view',
height: 0,
width: 0,
title: this.$t('entities.jobsinfo.views.editview.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
}
!!!!模版产生代码错误:----
Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
----
----
FTL stack trace ("~" means nesting-related):
- Failed at: #if ctrl.getPSControlContainer().getV... [in template "TEMPLCODE_zh_CN" at line 43, column 5]
----
/**
* 新建
......
app_web/src/pages/task/jobs-log-edit-view/jobs-log-edit-view-base.vue
浏览文件 @ 112fca94
......@@ -428,8 +428,8 @@ export default class JobsLogEditViewBase extends Vue {
*
* @memberof JobsLogEditViewBase
*/
public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
public initNavDataWithRoute(data:any = null, isNew:boolean = false, isAlways:boolean = false){
if( isAlways || (this.viewDefaultUsage && Object.is(this.navModel,"route")) ){
this.navDataService.addNavData({id:'jobs-log-edit-view',tag:this.viewtag,srfkey:isNew ? null : this.context.jobslog,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
}
}
......@@ -439,8 +439,8 @@ export default class JobsLogEditViewBase extends Vue {
*
* @memberof JobsLogEditViewBase
*/
public initNavDataWithTab(data:any = null,isOnlyAdd:boolean = true){
if(this.viewDefaultUsage && !Object.is(this.navModel,"route")){
public initNavDataWithTab(data:any = null,isOnlyAdd:boolean = true, isAlways:boolean = false){
if( isAlways || (this.viewDefaultUsage && !Object.is(this.navModel,"route")) ){
this.navDataService.addNavDataByOnly({id:'jobs-log-edit-view',tag:this.viewtag,srfkey:this.context.jobslog,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath},isOnlyAdd);
}
}
......
app_web/src/pages/task/jobs-log-grid-view/jobs-log-grid-view-base.vue
浏览文件 @ 112fca94
......@@ -462,8 +462,8 @@ export default class JobsLogGridViewBase extends Vue {
*
* @memberof JobsLogGridViewBase
*/
public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
public initNavDataWithRoute(data:any = null, isNew:boolean = false, isAlways:boolean = false){
if( isAlways || (this.viewDefaultUsage && Object.is(this.navModel,"route")) ){
this.navDataService.addNavData({id:'jobs-log-grid-view',tag:this.viewtag,srfkey:isNew ? null : this.context.jobslog,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
}
}
......@@ -473,8 +473,8 @@ export default class JobsLogGridViewBase extends Vue {
*
* @memberof JobsLogGridViewBase
*/
public initNavDataWithTab(data:any = null,isOnlyAdd:boolean = true){
if(this.viewDefaultUsage && !Object.is(this.navModel,"route")){
public initNavDataWithTab(data:any = null,isOnlyAdd:boolean = true, isAlways:boolean = false){
if( isAlways || (this.viewDefaultUsage && !Object.is(this.navModel,"route")) ){
this.navDataService.addNavDataByOnly({id:'jobs-log-grid-view',tag:this.viewtag,srfkey:this.context.jobslog,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath},isOnlyAdd);
}
}
......@@ -708,51 +708,14 @@ export default class JobsLogGridViewBase extends Vue {
}
/**
* 打开编辑数据视图
*
* @param {any[]} args
* @param {*} [params]
* @param {*} [fullargs]
* @param {*} [$event]
* @param {*} [xData]
* @memberof JobsLogGridView
*/
public opendata(args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) {
let localContext:any = null;
let localViewParam:any =null;
const data: any = {};
let tempContext = JSON.parse(JSON.stringify(this.context));
if(args.length >0){
Object.assign(tempContext,args[0]);
}
const deResParameters: any[] = [];
const parameters: any[] = [
{ pathName: 'jobslogs', parameterName: 'jobslog' },
];
const _this: any = this;
const openDrawer = (view: any, data: any) => {
let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
container.subscribe((result: any) => {
if (!result || !Object.is(result.ret, 'OK')) {
return;
}
if (!xData || !(xData.refresh instanceof Function)) {
return;
}
xData.refresh(result.datas);
});
}
const view: any = {
viewname: 'jobs-log-edit-view',
height: 0,
width: 0,
title: this.$t('entities.jobslog.views.editview.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
}
!!!!模版产生代码错误:----
Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
----
----
FTL stack trace ("~" means nesting-related):
- Failed at: #if ctrl.getPSControlContainer().getV... [in template "TEMPLCODE_zh_CN" at line 43, column 5]
----
/**
......
app_web/src/pages/task/jobs-registry-edit-view/jobs-registry-edit-view-base.vue
浏览文件 @ 112fca94
......@@ -458,8 +458,8 @@ export default class JobsRegistryEditViewBase extends Vue {
*
* @memberof JobsRegistryEditViewBase
*/
public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
public initNavDataWithRoute(data:any = null, isNew:boolean = false, isAlways:boolean = false){
if( isAlways || (this.viewDefaultUsage && Object.is(this.navModel,"route")) ){
this.navDataService.addNavData({id:'jobs-registry-edit-view',tag:this.viewtag,srfkey:isNew ? null : this.context.jobsregistry,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
}
}
......@@ -469,8 +469,8 @@ export default class JobsRegistryEditViewBase extends Vue {
*
* @memberof JobsRegistryEditViewBase
*/
public initNavDataWithTab(data:any = null,isOnlyAdd:boolean = true){
if(this.viewDefaultUsage && !Object.is(this.navModel,"route")){
public initNavDataWithTab(data:any = null,isOnlyAdd:boolean = true, isAlways:boolean = false){
if( isAlways || (this.viewDefaultUsage && !Object.is(this.navModel,"route")) ){
this.navDataService.addNavDataByOnly({id:'jobs-registry-edit-view',tag:this.viewtag,srfkey:this.context.jobsregistry,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath},isOnlyAdd);
}
}
......
app_web/src/pages/task/jobs-registry-grid-view/jobs-registry-grid-view-base.vue
浏览文件 @ 112fca94
......@@ -510,8 +510,8 @@ export default class JobsRegistryGridViewBase extends Vue {
*
* @memberof JobsRegistryGridViewBase
*/
public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
public initNavDataWithRoute(data:any = null, isNew:boolean = false, isAlways:boolean = false){
if( isAlways || (this.viewDefaultUsage && Object.is(this.navModel,"route")) ){
this.navDataService.addNavData({id:'jobs-registry-grid-view',tag:this.viewtag,srfkey:isNew ? null : this.context.jobsregistry,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
}
}
......@@ -521,8 +521,8 @@ export default class JobsRegistryGridViewBase extends Vue {
*
* @memberof JobsRegistryGridViewBase
*/
public initNavDataWithTab(data:any = null,isOnlyAdd:boolean = true){
if(this.viewDefaultUsage && !Object.is(this.navModel,"route")){
public initNavDataWithTab(data:any = null,isOnlyAdd:boolean = true, isAlways:boolean = false){
if( isAlways || (this.viewDefaultUsage && !Object.is(this.navModel,"route")) ){
this.navDataService.addNavDataByOnly({id:'jobs-registry-grid-view',tag:this.viewtag,srfkey:this.context.jobsregistry,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath},isOnlyAdd);
}
}
......@@ -922,51 +922,14 @@ export default class JobsRegistryGridViewBase extends Vue {
}
/**
* 打开编辑数据视图
*
* @param {any[]} args
* @param {*} [params]
* @param {*} [fullargs]
* @param {*} [$event]
* @param {*} [xData]
* @memberof JobsRegistryGridView
*/
public opendata(args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) {
let localContext:any = null;
let localViewParam:any =null;
const data: any = {};
let tempContext = JSON.parse(JSON.stringify(this.context));
if(args.length >0){
Object.assign(tempContext,args[0]);
}
const deResParameters: any[] = [];
const parameters: any[] = [
{ pathName: 'jobsregistries', parameterName: 'jobsregistry' },
];
const _this: any = this;
const openDrawer = (view: any, data: any) => {
let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
container.subscribe((result: any) => {
if (!result || !Object.is(result.ret, 'OK')) {
return;
}
if (!xData || !(xData.refresh instanceof Function)) {
return;
}
xData.refresh(result.datas);
});
}
const view: any = {
viewname: 'jobs-registry-edit-view',
height: 0,
width: 0,
title: this.$t('entities.jobsregistry.views.editview.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
}
!!!!模版产生代码错误:----
Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
----
----
FTL stack trace ("~" means nesting-related):
- Failed at: #if ctrl.getPSControlContainer().getV... [in template "TEMPLCODE_zh_CN" at line 43, column 5]
----
/**
* 新建
......
app_web/src/pages/task/task-index-view/task-index-view-base.vue
浏览文件 @ 112fca94
......@@ -6,7 +6,7 @@
<sider :width="collapseChange ? 64 : 200" hide-trigger v-model="collapseChange">
<div class="sider-top">
<div class="page-logo">
<span class="menuicon" @click="contextMenuDragVisiable=!contextMenuDragVisiable"><Icon type="md-menu" /></span>
<span class="menuicon" v-if="isEnableAppSwitch" @click="contextMenuDragVisiable=!contextMenuDragVisiable"><Icon type="md-menu" /></span>
<span v-show="!collapseChange" style="overflow-x: hidden;text-overflow: ellipsis;white-space: nowrap;display: block;text-align: center;font-weight: 300;font-size: 20px;">{{$t(model.srfCaption)}}</span>
</div>
</div>
......@@ -26,7 +26,7 @@
ref='appmenu'
@closeview="closeView($event)">
</view_appmenu>
<context-menu-drag :contextMenuDragVisiable="contextMenuDragVisiable"></context-menu-drag>
<context-menu-drag v-if="isEnableAppSwitch" :contextMenuDragVisiable="contextMenuDragVisiable"></context-menu-drag>
</sider>
<layout>
<header class="index_header">
......@@ -408,8 +408,8 @@ export default class TaskIndexViewBase extends Vue {
*
* @memberof TaskIndexViewBase
*/
public initNavDataWithRoute(data:any = null, isNew:boolean = false){
if(this.viewDefaultUsage && Object.is(this.navModel,"route")){
public initNavDataWithRoute(data:any = null, isNew:boolean = false, isAlways:boolean = false){
if( isAlways || (this.viewDefaultUsage && Object.is(this.navModel,"route")) ){
this.navDataService.addNavData({id:'task-index-view',tag:this.viewtag,srfkey:isNew ? null : null,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
}
}
......@@ -419,8 +419,8 @@ export default class TaskIndexViewBase extends Vue {
*
* @memberof TaskIndexViewBase
*/
public initNavDataWithTab(data:any = null,isOnlyAdd:boolean = true){
if(this.viewDefaultUsage && !Object.is(this.navModel,"route")){
public initNavDataWithTab(data:any = null,isOnlyAdd:boolean = true, isAlways:boolean = false){
if( isAlways || (this.viewDefaultUsage && !Object.is(this.navModel,"route")) ){
this.navDataService.addNavDataByOnly({id:'task-index-view',tag:this.viewtag,srfkey:null,title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath},isOnlyAdd);
}
}
......@@ -542,6 +542,14 @@ export default class TaskIndexViewBase extends Vue {
*/
public contextMenuDragVisiable: boolean = false;
/**
* 是否支持应用切换
*
* @type {boolean}
* @memberof TaskIndexViewBase
*/
public isEnableAppSwitch: boolean = false;
/**
* 初始化之前
*
......
app_web/src/pages/task/task-index-view/task-index-view.less
浏览文件 @ 112fca94
......@@ -91,6 +91,7 @@
display: flex;
align-items: center;
height: 100%;
justify-content: center;
>.menuicon{
display: block;
text-align: center;
......
app_web/src/service/app/app-center-service.ts 0 → 100644
浏览文件 @ 112fca94
import { Subject } from 'rxjs';
export interface Message {
/**
* 名称(通常是应用实体名称)
*
* @memberof Message
*/
name: string;
/**
* 行为（操作数据行为）
*
* @memberof Message
*/
action: string;
/**
* 数据（操作数据）
*
* @memberof Message
*/
data: any;
}
/**
* 应用中心服务类
*
* @export
* @class AppCenterService
*/
export default class AppCenterService {
/**
* Vue 状态管理器
*
* @private
* @type {*}
* @memberof AppCenterService
*/
private static store: any;
/**
* 应用数据状态管理对象
*
* @private
* @type {Subject<any>}
* @memberof AppCenterService
*/
private static subject:Subject<any> = new Subject<any>();
/**
* 单例变量声明
*
* @private
* @static
* @type {AppCenterService}
* @memberof AppCenterService
*/
private static appCenterService: AppCenterService;
/**
* 初始化实例
*
* @memberof AppCenterService
*/
constructor() {}
/**
* 获取 AppCenterService 单例对象
*
* @static
* @returns {AppCenterService}
* @memberof AppCenterService
*/
public static getInstance(store: any): AppCenterService {
if (!AppCenterService.appCenterService) {
AppCenterService.appCenterService = new AppCenterService();
}
this.store = store;
return this.appCenterService;
}
/**
* 通知消息
*
* @static
* @memberof AppCenterService
*/
public static notifyMessage(message:Message){
this.subject.next(message);
}
/**
* 获取消息中心
*
* @static
* @memberof AppCenterService
*/
public static getMessageCenter():Subject<any>{
return this.subject;
}
}
\ No newline at end of file
app_web/src/service/jobs-info/jobs-info-service-base.ts
浏览文件 @ 112fca94
......@@ -48,7 +48,8 @@ export default class JobsInfoServiceBase extends EntityService {
* @memberof JobsInfoServiceBase
*/
public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
return Http.getInstance().get(`/jobsinfos/${context.jobsinfo}/select`,isloading);
let res:any = await Http.getInstance().get(`/jobsinfos/${context.jobsinfo}/select`,isloading);
return res;
}
/**
......@@ -61,7 +62,8 @@ export default class JobsInfoServiceBase extends EntityService {
* @memberof JobsInfoServiceBase
*/
public async Start(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
return Http.getInstance().post(`/jobsinfos/${context.jobsinfo}/start`,data,isloading);
let res:any = await Http.getInstance().post(`/jobsinfos/${context.jobsinfo}/start`,data,isloading);
return res;
}
/**
......@@ -77,7 +79,7 @@ export default class JobsInfoServiceBase extends EntityService {
let masterData:any = {};
Object.assign(data,masterData);
let res:any = await Http.getInstance().put(`/jobsinfos/${context.jobsinfo}`,data,isloading);
return res;
return res;
}
/**
......@@ -90,7 +92,8 @@ export default class JobsInfoServiceBase extends EntityService {
* @memberof JobsInfoServiceBase
*/
public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
return Http.getInstance().post(`/jobsinfos/${context.jobsinfo}/checkkey`,data,isloading);
let res:any = await Http.getInstance().post(`/jobsinfos/${context.jobsinfo}/checkkey`,data,isloading);
return res;
}
/**
......@@ -103,7 +106,8 @@ export default class JobsInfoServiceBase extends EntityService {
* @memberof JobsInfoServiceBase
*/
public async Execute(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
return Http.getInstance().post(`/jobsinfos/${context.jobsinfo}/execute`,data,isloading);
let res:any = await Http.getInstance().post(`/jobsinfos/${context.jobsinfo}/execute`,data,isloading);
return res;
}
/**
......@@ -119,7 +123,7 @@ export default class JobsInfoServiceBase extends EntityService {
let masterData:any = {};
Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/jobsinfos/${context.jobsinfo}/save`,data,isloading);
return res;
return res;
}
/**
......@@ -147,7 +151,8 @@ export default class JobsInfoServiceBase extends EntityService {
* @memberof JobsInfoServiceBase
*/
public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
return Http.getInstance().delete(`/jobsinfos/${context.jobsinfo}`,isloading);
let res:any = await Http.getInstance().delete(`/jobsinfos/${context.jobsinfo}`,isloading);
return res;
}
/**
......@@ -160,8 +165,8 @@ export default class JobsInfoServiceBase extends EntityService {
* @memberof JobsInfoServiceBase
*/
public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().get(`/jobsinfos/${context.jobsinfo}`,isloading);
return res;
let res:any = await Http.getInstance().get(`/jobsinfos/${context.jobsinfo}`,isloading);
return res;
}
/**
......@@ -197,7 +202,8 @@ export default class JobsInfoServiceBase extends EntityService {
* @memberof JobsInfoServiceBase
*/
public async Stop(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
return Http.getInstance().post(`/jobsinfos/${context.jobsinfo}/stop`,data,isloading);
let res:any = await Http.getInstance().post(`/jobsinfos/${context.jobsinfo}/stop`,data,isloading);
return res;
}
/**
......@@ -211,6 +217,7 @@ export default class JobsInfoServiceBase extends EntityService {
*/
public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let tempData:any = JSON.parse(JSON.stringify(data));
return Http.getInstance().get(`/jobsinfos/fetchdefault`,tempData,isloading);
let res:any = await Http.getInstance().get(`/jobsinfos/fetchdefault`,tempData,isloading);
return res;
}
}
\ No newline at end of file
app_web/src/service/jobs-lock/jobs-lock-service-base.ts
浏览文件 @ 112fca94
......@@ -48,7 +48,8 @@ export default class JobsLockServiceBase extends EntityService {
* @memberof JobsLockServiceBase
*/
public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
return Http.getInstance().get(`/jobslocks/${context.jobslock}/select`,isloading);
let res:any = await Http.getInstance().get(`/jobslocks/${context.jobslock}/select`,isloading);
return res;
}
/**
......@@ -87,7 +88,7 @@ export default class JobsLockServiceBase extends EntityService {
let masterData:any = {};
Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/jobslocks/${context.jobslock}/save`,data,isloading);
return res;
return res;
}
/**
......@@ -100,8 +101,8 @@ export default class JobsLockServiceBase extends EntityService {
* @memberof JobsLockServiceBase
*/
public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().get(`/jobslocks/${context.jobslock}`,isloading);
return res;
let res:any = await Http.getInstance().get(`/jobslocks/${context.jobslock}`,isloading);
return res;
}
/**
......@@ -117,7 +118,7 @@ export default class JobsLockServiceBase extends EntityService {
let masterData:any = {};
Object.assign(data,masterData);
let res:any = await Http.getInstance().put(`/jobslocks/${context.jobslock}`,data,isloading);
return res;
return res;
}
/**
......@@ -130,7 +131,8 @@ export default class JobsLockServiceBase extends EntityService {
* @memberof JobsLockServiceBase
*/
public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
return Http.getInstance().post(`/jobslocks/${context.jobslock}/checkkey`,data,isloading);
let res:any = await Http.getInstance().post(`/jobslocks/${context.jobslock}/checkkey`,data,isloading);
return res;
}
/**
......@@ -143,7 +145,8 @@ export default class JobsLockServiceBase extends EntityService {
* @memberof JobsLockServiceBase
*/
public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
return Http.getInstance().delete(`/jobslocks/${context.jobslock}`,isloading);
let res:any = await Http.getInstance().delete(`/jobslocks/${context.jobslock}`,isloading);
return res;
}
/**
......@@ -172,6 +175,7 @@ export default class JobsLockServiceBase extends EntityService {
*/
public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let tempData:any = JSON.parse(JSON.stringify(data));
return Http.getInstance().get(`/jobslocks/fetchdefault`,tempData,isloading);
let res:any = await Http.getInstance().get(`/jobslocks/fetchdefault`,tempData,isloading);
return res;
}
}
\ No newline at end of file
app_web/src/service/jobs-log/jobs-log-service-base.ts
浏览文件 @ 112fca94
......@@ -48,7 +48,8 @@ export default class JobsLogServiceBase extends EntityService {
* @memberof JobsLogServiceBase
*/
public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
return Http.getInstance().get(`/jobslogs/${context.jobslog}/select`,isloading);
let res:any = await Http.getInstance().get(`/jobslogs/${context.jobslog}/select`,isloading);
return res;
}
/**
......@@ -79,7 +80,7 @@ export default class JobsLogServiceBase extends EntityService {
let masterData:any = {};
Object.assign(data,masterData);
let res:any = await Http.getInstance().put(`/jobslogs/${context.jobslog}`,data,isloading);
return res;
return res;
}
/**
......@@ -115,7 +116,8 @@ export default class JobsLogServiceBase extends EntityService {
* @memberof JobsLogServiceBase
*/
public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
return Http.getInstance().post(`/jobslogs/${context.jobslog}/checkkey`,data,isloading);
let res:any = await Http.getInstance().post(`/jobslogs/${context.jobslog}/checkkey`,data,isloading);
return res;
}
/**
......@@ -131,7 +133,7 @@ export default class JobsLogServiceBase extends EntityService {
let masterData:any = {};
Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/jobslogs/${context.jobslog}/save`,data,isloading);
return res;
return res;
}
/**
......@@ -144,7 +146,8 @@ export default class JobsLogServiceBase extends EntityService {
* @memberof JobsLogServiceBase
*/
public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
return Http.getInstance().delete(`/jobslogs/${context.jobslog}`,isloading);
let res:any = await Http.getInstance().delete(`/jobslogs/${context.jobslog}`,isloading);
return res;
}
/**
......@@ -157,8 +160,8 @@ export default class JobsLogServiceBase extends EntityService {
* @memberof JobsLogServiceBase
*/
public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().get(`/jobslogs/${context.jobslog}`,isloading);
return res;
let res:any = await Http.getInstance().get(`/jobslogs/${context.jobslog}`,isloading);
return res;
}
/**
......@@ -172,6 +175,7 @@ export default class JobsLogServiceBase extends EntityService {
*/
public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let tempData:any = JSON.parse(JSON.stringify(data));
return Http.getInstance().get(`/jobslogs/fetchdefault`,tempData,isloading);
let res:any = await Http.getInstance().get(`/jobslogs/fetchdefault`,tempData,isloading);
return res;
}
}
\ No newline at end of file
app_web/src/service/jobs-registry/jobs-registry-service-base.ts
浏览文件 @ 112fca94
......@@ -48,7 +48,8 @@ export default class JobsRegistryServiceBase extends EntityService {
* @memberof JobsRegistryServiceBase
*/
public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
return Http.getInstance().get(`/jobsregistries/${context.jobsregistry}/select`,isloading);
let res:any = await Http.getInstance().get(`/jobsregistries/${context.jobsregistry}/select`,isloading);
return res;
}
/**
......@@ -61,8 +62,8 @@ export default class JobsRegistryServiceBase extends EntityService {
* @memberof JobsRegistryServiceBase
*/
public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().get(`/jobsregistries/${context.jobsregistry}`,isloading);
return res;
let res:any = await Http.getInstance().get(`/jobsregistries/${context.jobsregistry}`,isloading);
return res;
}
/**
......@@ -75,7 +76,8 @@ export default class JobsRegistryServiceBase extends EntityService {
* @memberof JobsRegistryServiceBase
*/
public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
return Http.getInstance().delete(`/jobsregistries/${context.jobsregistry}`,isloading);
let res:any = await Http.getInstance().delete(`/jobsregistries/${context.jobsregistry}`,isloading);
return res;
}
/**
......@@ -91,7 +93,7 @@ export default class JobsRegistryServiceBase extends EntityService {
let masterData:any = {};
Object.assign(data,masterData);
let res:any = await Http.getInstance().put(`/jobsregistries/${context.jobsregistry}`,data,isloading);
return res;
return res;
}
/**
......@@ -107,7 +109,7 @@ export default class JobsRegistryServiceBase extends EntityService {
let masterData:any = {};
Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/jobsregistries/${context.jobsregistry}/save`,data,isloading);
return res;
return res;
}
/**
......@@ -143,7 +145,8 @@ export default class JobsRegistryServiceBase extends EntityService {
* @memberof JobsRegistryServiceBase
*/
public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
return Http.getInstance().post(`/jobsregistries/${context.jobsregistry}/checkkey`,data,isloading);
let res:any = await Http.getInstance().post(`/jobsregistries/${context.jobsregistry}/checkkey`,data,isloading);
return res;
}
/**
......@@ -172,6 +175,7 @@ export default class JobsRegistryServiceBase extends EntityService {
*/
public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let tempData:any = JSON.parse(JSON.stringify(data));
return Http.getInstance().get(`/jobsregistries/fetchdefault`,tempData,isloading);
let res:any = await Http.getInstance().get(`/jobsregistries/fetchdefault`,tempData,isloading);
return res;
}
}
\ No newline at end of file
app_web/src/store/modules/auth-resource/getters.ts
浏览文件 @ 112fca94
......@@ -44,9 +44,11 @@ export const getAuthMenu = (state: any) => (menu:any) =>{
resourceIndex= state.resourceData.findIndex((resourcetag: any, objIndex: any, objs: any) => {
return Object.is(menu.resourcetag, resourcetag);
})
menuIndex= state.menuData.findIndex((menutag: any, objIndex: any, objs: any) => {
return Object.is(menu.authtag, menutag);
})
return (resourceIndex !== -1 || menuIndex !== -1)?true:false;
}else{
return true;
}
menuIndex= state.menuData.findIndex((menutag: any, objIndex: any, objs: any) => {
return Object.is(menu.authtag, menutag);
})
return (resourceIndex !== -1 || menuIndex !== -1)?true:false;
}
\ No newline at end of file
app_web/src/utils/view-tool/view-tool.ts
浏览文件 @ 112fca94
......@@ -63,7 +63,7 @@ export class ViewTool {
public static buildUpRoutePath(route: Route, viewParam: any = {}, deResParameters: any[], parameters: any[], args: any[], data: any): string {
const indexRoutePath = this.getIndexRoutePath(route);
const deResRoutePath = this.getDeResRoutePath(viewParam, deResParameters, args);
const deRoutePath = this.getActiveRoutePath(parameters, args, data);
const deRoutePath = this.getActiveRoutePath(parameters, args, data,viewParam);
return `${indexRoutePath}${deResRoutePath}${deRoutePath}`;
}
......@@ -123,7 +123,7 @@ export class ViewTool {
* @returns {string}
* @memberof ViewTool
*/
public static getActiveRoutePath(parameters: any[], args: any[], data: any): string {
public static getActiveRoutePath(parameters: any[], args: any[], data: any,viewParam: any = {}): string {
let routePath: string = '';
// 不存在应用实体
if(parameters && parameters.length >0){
......@@ -137,8 +137,7 @@ export class ViewTool {
let [arg] = args;
arg = arg ? arg : {};
const [{ pathName: _pathName, parameterName: _parameterName }, { pathName: _pathName2, parameterName: _parameterName2 }] = parameters;
const _value: any = arg[_parameterName] && !Object.is(arg[_parameterName], '') ?
arg[_parameterName] : null;
const _value: any = arg[_parameterName] || viewParam[_parameterName] || null;
routePath = `/${_pathName}/${_value}/${_pathName2}`;
if (Object.keys(data).length > 0) {
routePath = `${routePath}?${qs.stringify(data, { delimiter: ';' })}`;
......
app_web/src/widgets/app/task-index-view-appmenu/task-index-view-appmenu-base.vue
浏览文件 @ 112fca94
......@@ -124,6 +124,7 @@ import { Subject, Subscription } from 'rxjs';
import { ControlInterface } from '@/interface/control';
import { UIActionTool,Util } from '@/utils';
import NavDataService from '@/service/app/navdata-service';
import AppCenterService from "@service/app/app-center-service";
import TaskIndexViewService from './task-index-view-appmenu-service';
import TaskIndexViewModel from './task-index-view-appmenu-model';
......
app_web/src/widgets/jobs-info/default-searchform/default-searchform-base.vue
浏览文件 @ 112fca94
......@@ -52,6 +52,7 @@ import { Subject, Subscription } from 'rxjs';
import { ControlInterface } from '@/interface/control';
import { UIActionTool,Util } from '@/utils';
import NavDataService from '@/service/app/navdata-service';
import AppCenterService from "@service/app/app-center-service";
import JobsInfoService from '@/service/jobs-info/jobs-info-service';
import DefaultService from './default-searchform-service';
......
app_web/src/widgets/jobs-info/default-searchform/default-searchform-service.ts
浏览文件 @ 112fca94
......@@ -80,6 +80,8 @@ export default class DefaultService extends ControlService {
*/
@Errorlog
public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
data.page = data.page ? data.page : 0;
data.size = data.size ? data.size : 1000;
return Promise.reject([])
}
......
app_web/src/widgets/jobs-info/main-form/main-form-service.ts
浏览文件 @ 112fca94
......@@ -80,6 +80,8 @@ export default class MainService extends ControlService {
*/
@Errorlog
public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
data.page = data.page ? data.page : 0;
data.size = data.size ? data.size : 1000;
return Promise.reject([])
}
......
app_web/src/widgets/jobs-info/main-grid/main-grid-base.vue
浏览文件 @ 112fca94
......@@ -179,6 +179,7 @@ import { Subject, Subscription } from 'rxjs';
import { ControlInterface } from '@/interface/control';
import { UIActionTool,Util } from '@/utils';
import NavDataService from '@/service/app/navdata-service';
import AppCenterService from "@service/app/app-center-service";
import JobsInfoService from '@/service/jobs-info/jobs-info-service';
import MainService from './main-grid-service';
......@@ -308,6 +309,15 @@ export default class MainBase extends Vue implements ControlInterface {
*/
public codeListService:CodeListService = new CodeListService({ $store: this.$store });
/**
* 应用状态事件
*
* @public
* @type {(Subscription | undefined)}
* @memberof MainBase
*/
public appStateEvent: Subscription | undefined;
/**
* 获取多项数据
*
......@@ -613,63 +623,72 @@ export default class MainBase extends Vue implements ControlInterface {
label: '主键ID',
langtag: 'entities.jobsinfo.main_grid.columns.id',
show: true,
util: 'PX'
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'app',
label: '服务名',
langtag: 'entities.jobsinfo.main_grid.columns.app',
show: true,
util: 'PX'
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'handler',
label: '执行器任务HANDLER',
langtag: 'entities.jobsinfo.main_grid.columns.handler',
show: true,
util: 'PX'
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'cron',
label: '任务执行CRON',
langtag: 'entities.jobsinfo.main_grid.columns.cron',
show: true,
util: 'PX'
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'last_time',
label: '上次调度时间',
langtag: 'entities.jobsinfo.main_grid.columns.last_time',
show: true,
util: 'PX'
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'next_time',
label: '下次调度时间',
langtag: 'entities.jobsinfo.main_grid.columns.next_time',
show: true,
util: 'PX'
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'status',
label: '状态',
langtag: 'entities.jobsinfo.main_grid.columns.status',
show: true,
util: 'PX'
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'timeout',
label: '任务执行超时时间（秒）',
langtag: 'entities.jobsinfo.main_grid.columns.timeout',
show: true,
util: 'PX'
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'update_time',
label: '更新时间',
langtag: 'entities.jobsinfo.main_grid.columns.update_time',
show: true,
util: 'PX'
util: 'PX',
isEnableRowEdit: false,
},
]
......@@ -1193,6 +1212,16 @@ export default class MainBase extends Vue implements ControlInterface {
}
});
}
if(AppCenterService && AppCenterService.getMessageCenter()){
this.appStateEvent = AppCenterService.getMessageCenter().subscribe(({ name, action, data }) =>{
if(!Object.is(name,"JobsInfo")){
return;
}
if(Object.is(action,'appRefresh')){
this.refresh([data]);
}
})
}
}
/**
......@@ -1213,6 +1242,9 @@ export default class MainBase extends Vue implements ControlInterface {
if (this.viewStateEvent) {
this.viewStateEvent.unsubscribe();
}
if(this.appStateEvent){
this.appStateEvent.unsubscribe();
}
}
/**
......@@ -1658,18 +1690,17 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase
*/
public getCellClassName(args:{row: any, column: any, rowIndex: number, columnIndex:number}){
let hasRowEdit:any = {
'id':false,
'app':false,
'handler':false,
'cron':false,
'last_time':false,
'next_time':false,
'status':false,
'timeout':false,
'update_time':false,
if(args.column.property){
let col = this.allColumns.find((item:any)=>{
return Object.is(args.column.property,item.name);
})
if(col !== undefined){
if(col.isEnableRowEdit && this.actualIsOpenEdit ){
return 'edit-cell';
}
}
}
return ( hasRowEdit[args.column.property] && this.actualIsOpenEdit ) ? "edit-cell" : "info-cell";
return 'info-cell';
}
/**
......
app_web/src/widgets/jobs-info/main-grid/main-grid-service.ts
浏览文件 @ 112fca94
......@@ -81,6 +81,8 @@ export default class MainService extends ControlService {
*/
@Errorlog
public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
data.page = data.page ? data.page : 0;
data.size = data.size ? data.size : 1000;
return Promise.reject([])
}
......
app_web/src/widgets/jobs-log/default-searchform/default-searchform-base.vue
浏览文件 @ 112fca94
......@@ -40,6 +40,7 @@ import { Subject, Subscription } from 'rxjs';
import { ControlInterface } from '@/interface/control';
import { UIActionTool,Util } from '@/utils';
import NavDataService from '@/service/app/navdata-service';
import AppCenterService from "@service/app/app-center-service";
import JobsLogService from '@/service/jobs-log/jobs-log-service';
import DefaultService from './default-searchform-service';
......
app_web/src/widgets/jobs-log/default-searchform/default-searchform-service.ts
浏览文件 @ 112fca94
......@@ -80,6 +80,8 @@ export default class DefaultService extends ControlService {
*/
@Errorlog
public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
data.page = data.page ? data.page : 0;
data.size = data.size ? data.size : 1000;
return Promise.reject([])
}
......
app_web/src/widgets/jobs-log/main-form/main-form-service.ts
浏览文件 @ 112fca94
......@@ -80,6 +80,8 @@ export default class MainService extends ControlService {
*/
@Errorlog
public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
data.page = data.page ? data.page : 0;
data.size = data.size ? data.size : 1000;
return Promise.reject([])
}
......
app_web/src/widgets/jobs-log/main-grid/main-grid-base.vue
浏览文件 @ 112fca94
......@@ -165,6 +165,7 @@ import { Subject, Subscription } from 'rxjs';
import { ControlInterface } from '@/interface/control';
import { UIActionTool,Util } from '@/utils';
import NavDataService from '@/service/app/navdata-service';
import AppCenterService from "@service/app/app-center-service";
import JobsLogService from '@/service/jobs-log/jobs-log-service';
import MainService from './main-grid-service';
......@@ -294,6 +295,15 @@ export default class MainBase extends Vue implements ControlInterface {
*/
public codeListService:CodeListService = new CodeListService({ $store: this.$store });
/**
* 应用状态事件
*
* @public
* @type {(Subscription | undefined)}
* @memberof MainBase
*/
public appStateEvent: Subscription | undefined;
/**
* 获取多项数据
*
......@@ -599,56 +609,64 @@ export default class MainBase extends Vue implements ControlInterface {
label: '主键ID',
langtag: 'entities.jobslog.main_grid.columns.id',
show: true,
util: 'PX'
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'job_id',
label: '任务ID',
langtag: 'entities.jobslog.main_grid.columns.job_id',
show: true,
util: 'PX'
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'handler',
label: '执行器任务HANDLER',
langtag: 'entities.jobslog.main_grid.columns.handler',
show: true,
util: 'PX'
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'address',
label: '执行地址',
langtag: 'entities.jobslog.main_grid.columns.address',
show: true,
util: 'PX'
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'trigger_code',
label: '触发器调度返回码',
langtag: 'entities.jobslog.main_grid.columns.trigger_code',
show: true,
util: 'PX'
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'trigger_type',
label: '触发器调度类型',
langtag: 'entities.jobslog.main_grid.columns.trigger_type',
show: true,
util: 'PX'
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'fail_retry_count',
label: '失败重试次数',
langtag: 'entities.jobslog.main_grid.columns.fail_retry_count',
show: true,
util: 'PX'
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'create_time',
label: '创建时间',
langtag: 'entities.jobslog.main_grid.columns.create_time',
show: true,
util: 'PX'
util: 'PX',
isEnableRowEdit: false,
},
]
......@@ -1164,6 +1182,16 @@ export default class MainBase extends Vue implements ControlInterface {
}
});
}
if(AppCenterService && AppCenterService.getMessageCenter()){
this.appStateEvent = AppCenterService.getMessageCenter().subscribe(({ name, action, data }) =>{
if(!Object.is(name,"JobsLog")){
return;
}
if(Object.is(action,'appRefresh')){
this.refresh([data]);
}
})
}
}
/**
......@@ -1184,6 +1212,9 @@ export default class MainBase extends Vue implements ControlInterface {
if (this.viewStateEvent) {
this.viewStateEvent.unsubscribe();
}
if(this.appStateEvent){
this.appStateEvent.unsubscribe();
}
}
/**
......@@ -1629,17 +1660,17 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase
*/
public getCellClassName(args:{row: any, column: any, rowIndex: number, columnIndex:number}){
let hasRowEdit:any = {
'id':false,
'job_id':false,
'handler':false,
'address':false,
'trigger_code':false,
'trigger_type':false,
'fail_retry_count':false,
'create_time':false,
if(args.column.property){
let col = this.allColumns.find((item:any)=>{
return Object.is(args.column.property,item.name);
})
if(col !== undefined){
if(col.isEnableRowEdit && this.actualIsOpenEdit ){
return 'edit-cell';
}
}
}
return ( hasRowEdit[args.column.property] && this.actualIsOpenEdit ) ? "edit-cell" : "info-cell";
return 'info-cell';
}
/**
......
app_web/src/widgets/jobs-log/main-grid/main-grid-service.ts
浏览文件 @ 112fca94
......@@ -81,6 +81,8 @@ export default class MainService extends ControlService {
*/
@Errorlog
public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
data.page = data.page ? data.page : 0;
data.size = data.size ? data.size : 1000;
return Promise.reject([])
}
......
app_web/src/widgets/jobs-registry/default-searchform/default-searchform-base.vue
浏览文件 @ 112fca94
......@@ -46,6 +46,7 @@ import { Subject, Subscription } from 'rxjs';
import { ControlInterface } from '@/interface/control';
import { UIActionTool,Util } from '@/utils';
import NavDataService from '@/service/app/navdata-service';
import AppCenterService from "@service/app/app-center-service";
import JobsRegistryService from '@/service/jobs-registry/jobs-registry-service';
import DefaultService from './default-searchform-service';
......
app_web/src/widgets/jobs-registry/default-searchform/default-searchform-service.ts
浏览文件 @ 112fca94
......@@ -80,6 +80,8 @@ export default class DefaultService extends ControlService {
*/
@Errorlog
public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
data.page = data.page ? data.page : 0;
data.size = data.size ? data.size : 1000;
return Promise.reject([])
}
......
app_web/src/widgets/jobs-registry/main-form/main-form-service.ts
浏览文件 @ 112fca94
......@@ -80,6 +80,8 @@ export default class MainService extends ControlService {
*/
@Errorlog
public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
data.page = data.page ? data.page : 0;
data.size = data.size ? data.size : 1000;
return Promise.reject([])
}
......
app_web/src/widgets/jobs-registry/main-grid/main-grid-base.vue
浏览文件 @ 112fca94
......@@ -119,6 +119,7 @@ import { Subject, Subscription } from 'rxjs';
import { ControlInterface } from '@/interface/control';
import { UIActionTool,Util } from '@/utils';
import NavDataService from '@/service/app/navdata-service';
import AppCenterService from "@service/app/app-center-service";
import JobsRegistryService from '@/service/jobs-registry/jobs-registry-service';
import MainService from './main-grid-service';
......@@ -248,6 +249,15 @@ export default class MainBase extends Vue implements ControlInterface {
*/
public codeListService:CodeListService = new CodeListService({ $store: this.$store });
/**
* 应用状态事件
*
* @public
* @type {(Subscription | undefined)}
* @memberof MainBase
*/
public appStateEvent: Subscription | undefined;
/**
* 获取多项数据
*
......@@ -553,28 +563,32 @@ export default class MainBase extends Vue implements ControlInterface {
label: '主键ID',
langtag: 'entities.jobsregistry.main_grid.columns.id',
show: true,
util: 'PX'
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'app',
label: '服务名',
langtag: 'entities.jobsregistry.main_grid.columns.app',
show: true,
util: 'PX'
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'address',
label: '执行地址',
langtag: 'entities.jobsregistry.main_grid.columns.address',
show: true,
util: 'PX'
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'status',
label: '状态',
langtag: 'entities.jobsregistry.main_grid.columns.status',
show: true,
util: 'PX'
util: 'PX',
isEnableRowEdit: false,
},
]
......@@ -1098,6 +1112,16 @@ export default class MainBase extends Vue implements ControlInterface {
}
});
}
if(AppCenterService && AppCenterService.getMessageCenter()){
this.appStateEvent = AppCenterService.getMessageCenter().subscribe(({ name, action, data }) =>{
if(!Object.is(name,"JobsRegistry")){
return;
}
if(Object.is(action,'appRefresh')){
this.refresh([data]);
}
})
}
}
/**
......@@ -1118,6 +1142,9 @@ export default class MainBase extends Vue implements ControlInterface {
if (this.viewStateEvent) {
this.viewStateEvent.unsubscribe();
}
if(this.appStateEvent){
this.appStateEvent.unsubscribe();
}
}
/**
......@@ -1563,13 +1590,17 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase
*/
public getCellClassName(args:{row: any, column: any, rowIndex: number, columnIndex:number}){
let hasRowEdit:any = {
'id':false,
'app':false,
'address':false,
'status':false,
if(args.column.property){
let col = this.allColumns.find((item:any)=>{
return Object.is(args.column.property,item.name);
})
if(col !== undefined){
if(col.isEnableRowEdit && this.actualIsOpenEdit ){
return 'edit-cell';
}
}
}
return ( hasRowEdit[args.column.property] && this.actualIsOpenEdit ) ? "edit-cell" : "info-cell";
return 'info-cell';
}
/**
......
app_web/src/widgets/jobs-registry/main-grid/main-grid-service.ts
浏览文件 @ 112fca94
......@@ -81,6 +81,8 @@ export default class MainService extends ControlService {
*/
@Errorlog
public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
data.page = data.page ? data.page : 0;
data.size = data.size ? data.size : 1000;
return Promise.reject([])
}
......
ibztask-core/src/main/java/cn/ibizlab/core/task/service/IJobsInfoService.java
浏览文件 @ 112fca94
......@@ -56,6 +56,7 @@ public interface IJobsInfoService extends IService<JobsInfo>{
boolean execute(String sql, Map param);
}
ibztask-core/src/main/java/cn/ibizlab/core/task/service/IJobsLockService.java
浏览文件 @ 112fca94
......@@ -53,6 +53,7 @@ public interface IJobsLockService extends IService<JobsLock>{
boolean execute(String sql, Map param);
}
ibztask-core/src/main/java/cn/ibizlab/core/task/service/IJobsLogService.java
浏览文件 @ 112fca94
......@@ -53,6 +53,7 @@ public interface IJobsLogService extends IService<JobsLog>{
boolean execute(String sql, Map param);
}
ibztask-core/src/main/java/cn/ibizlab/core/task/service/IJobsRegistryService.java
浏览文件 @ 112fca94
......@@ -53,6 +53,7 @@ public interface IJobsRegistryService extends IService<JobsRegistry>{
boolean execute(String sql, Map param);
}
ibztask-core/src/main/java/cn/ibizlab/core/task/service/impl/JobsInfoServiceImpl.java
浏览文件 @ 112fca94
......@@ -45,7 +45,7 @@ import org.springframework.util.StringUtils;
public class JobsInfoServiceImpl extends ServiceImpl<JobsInfoMapper, JobsInfo> implements IJobsInfoService {
private int batchSize = 500;
protected int batchSize = 500;
@Override
@Transactional
......@@ -158,9 +158,9 @@ public class JobsInfoServiceImpl extends ServiceImpl<JobsInfoMapper, JobsInfo> i
@Override
@Transactional
public JobsInfo stop(JobsInfo et) {
et.set("Next_time","0");
et.set("Last_time","0");
et.set("Status","1");
et.set("Next_time","0");
update(et);
return et;
}
......@@ -209,4 +209,3 @@ public class JobsInfoServiceImpl extends ServiceImpl<JobsInfoMapper, JobsInfo> i
}
ibztask-core/src/main/java/cn/ibizlab/core/task/service/impl/JobsLockServiceImpl.java
浏览文件 @ 112fca94
......@@ -45,7 +45,7 @@ import org.springframework.util.StringUtils;
public class JobsLockServiceImpl extends ServiceImpl<JobsLockMapper, JobsLock> implements IJobsLockService {
private int batchSize = 500;
protected int batchSize = 500;
@Override
@Transactional
......@@ -185,4 +185,3 @@ public class JobsLockServiceImpl extends ServiceImpl<JobsLockMapper, JobsLock> i
}
ibztask-core/src/main/java/cn/ibizlab/core/task/service/impl/JobsLogServiceImpl.java
浏览文件 @ 112fca94
......@@ -45,7 +45,7 @@ import org.springframework.util.StringUtils;
public class JobsLogServiceImpl extends ServiceImpl<JobsLogMapper, JobsLog> implements IJobsLogService {
private int batchSize = 500;
protected int batchSize = 500;
@Override
public JobsLog getDraft(JobsLog et) {
......@@ -185,4 +185,3 @@ public class JobsLogServiceImpl extends ServiceImpl<JobsLogMapper, JobsLog> impl
}
ibztask-core/src/main/java/cn/ibizlab/core/task/service/impl/JobsRegistryServiceImpl.java
浏览文件 @ 112fca94
......@@ -45,7 +45,7 @@ import org.springframework.util.StringUtils;
public class JobsRegistryServiceImpl extends ServiceImpl<JobsRegistryMapper, JobsRegistry> implements IJobsRegistryService {
private int batchSize = 500;
protected int batchSize = 500;
@Override
@Transactional
......@@ -185,4 +185,3 @@ public class JobsRegistryServiceImpl extends ServiceImpl<JobsRegistryMapper, Job
}
ibztask-core/src/main/java/cn/ibizlab/core/util/config/MybatisConfiguration.java
浏览文件 @ 112fca94
......@@ -5,6 +5,7 @@ import cn.ibizlab.util.helper.UniqueNameGenerator;
import com.baomidou.mybatisplus.core.injector.ISqlInjector;
import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
import com.baomidou.mybatisplus.extension.plugins.pagination.optimize.JsqlParserCountOptimize;
import org.apache.ibatis.mapping.DatabaseIdProvider;
import org.apache.ibatis.mapping.VendorDatabaseIdProvider;
import org.springframework.context.annotation.Bean;
......@@ -42,7 +43,14 @@ public class MybatisConfiguration {
*/
@Bean
public PaginationInterceptor paginationInterceptor() {
return new PaginationInterceptor();
PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
// 设置请求的页面大于最大页后操作， true调回到首页，false 继续请求 默认false
// paginationInterceptor.setOverflow(false);
// 设置最大单页限制数量，默认 500 条，-1 不受限制
paginationInterceptor.setLimit(-1);
// 开启 count 的 join 优化,只针对部分 left join
paginationInterceptor.setCountSqlParser(new JsqlParserCountOptimize(true));
return paginationInterceptor;
}
}
\ No newline at end of file
ibztask-provider/ibztask-provider-api/src/main/java/cn/ibizlab/api/rest/JobsInfoResource.java
浏览文件 @ 112fca94
......@@ -32,6 +32,7 @@ import cn.ibizlab.api.mapping.*;
import cn.ibizlab.core.task.domain.JobsInfo;
import cn.ibizlab.core.task.service.IJobsInfoService;
import cn.ibizlab.core.task.filter.JobsInfoSearchContext;
import cn.ibizlab.util.annotation.VersionCheck;
@Slf4j
@Api(tags = {"任务信息" })
......@@ -51,10 +52,10 @@ public class JobsInfoResource {
@RequestMapping(method = RequestMethod.POST, value = "/jobsinfos/{jobsinfo_id}/start")
@Transactional
public ResponseEntity<JobsInfoDTO> start(@PathVariable("jobsinfo_id") String jobsinfo_id, @RequestBody JobsInfoDTO jobsinfodto) {
JobsInfo jobsinfo = jobsinfoMapping.toDomain(jobsinfodto);
jobsinfo.setId(jobsinfo_id);
jobsinfo = jobsinfoService.start(jobsinfo);
jobsinfodto = jobsinfoMapping.toDto(jobsinfo);
JobsInfo domain = jobsinfoMapping.toDomain(jobsinfodto);
domain.setId(jobsinfo_id);
domain = jobsinfoService.start(domain);
jobsinfodto = jobsinfoMapping.toDto(domain);
return ResponseEntity.status(HttpStatus.OK).body(jobsinfodto);
}
......@@ -89,10 +90,10 @@ public class JobsInfoResource {
@RequestMapping(method = RequestMethod.POST, value = "/jobsinfos/{jobsinfo_id}/execute")
@Transactional
public ResponseEntity<JobsInfoDTO> execute(@PathVariable("jobsinfo_id") String jobsinfo_id, @RequestBody JobsInfoDTO jobsinfodto) {
JobsInfo jobsinfo = jobsinfoMapping.toDomain(jobsinfodto);
jobsinfo.setId(jobsinfo_id);
jobsinfo = jobsinfoService.execute(jobsinfo);
jobsinfodto = jobsinfoMapping.toDto(jobsinfo);
JobsInfo domain = jobsinfoMapping.toDomain(jobsinfodto);
domain.setId(jobsinfo_id);
domain = jobsinfoService.execute(domain);
jobsinfodto = jobsinfoMapping.toDto(domain);
return ResponseEntity.status(HttpStatus.OK).body(jobsinfodto);
}
......@@ -166,10 +167,10 @@ public class JobsInfoResource {
@RequestMapping(method = RequestMethod.POST, value = "/jobsinfos/{jobsinfo_id}/stop")
@Transactional
public ResponseEntity<JobsInfoDTO> stop(@PathVariable("jobsinfo_id") String jobsinfo_id, @RequestBody JobsInfoDTO jobsinfodto) {
JobsInfo jobsinfo = jobsinfoMapping.toDomain(jobsinfodto);
jobsinfo.setId(jobsinfo_id);
jobsinfo = jobsinfoService.stop(jobsinfo);
jobsinfodto = jobsinfoMapping.toDto(jobsinfo);
JobsInfo domain = jobsinfoMapping.toDomain(jobsinfodto);
domain.setId(jobsinfo_id);
domain = jobsinfoService.stop(domain);
jobsinfodto = jobsinfoMapping.toDto(domain);
return ResponseEntity.status(HttpStatus.OK).body(jobsinfodto);
}
......
ibztask-provider/ibztask-provider-api/src/main/java/cn/ibizlab/api/rest/JobsLockResource.java
浏览文件 @ 112fca94
......@@ -32,6 +32,7 @@ import cn.ibizlab.api.mapping.*;
import cn.ibizlab.core.task.domain.JobsLock;
import cn.ibizlab.core.task.service.IJobsLockService;
import cn.ibizlab.core.task.filter.JobsLockSearchContext;
import cn.ibizlab.util.annotation.VersionCheck;
@Slf4j
@Api(tags = {"任务锁" })
......
ibztask-provider/ibztask-provider-api/src/main/java/cn/ibizlab/api/rest/JobsLogResource.java
浏览文件 @ 112fca94
......@@ -32,6 +32,7 @@ import cn.ibizlab.api.mapping.*;
import cn.ibizlab.core.task.domain.JobsLog;
import cn.ibizlab.core.task.service.IJobsLogService;
import cn.ibizlab.core.task.filter.JobsLogSearchContext;
import cn.ibizlab.util.annotation.VersionCheck;
@Slf4j
@Api(tags = {"任务调度日志" })
......
ibztask-provider/ibztask-provider-api/src/main/java/cn/ibizlab/api/rest/JobsRegistryResource.java
浏览文件 @ 112fca94
......@@ -32,6 +32,7 @@ import cn.ibizlab.api.mapping.*;
import cn.ibizlab.core.task.domain.JobsRegistry;
import cn.ibizlab.core.task.service.IJobsRegistryService;
import cn.ibizlab.core.task.filter.JobsRegistrySearchContext;
import cn.ibizlab.util.annotation.VersionCheck;
@Slf4j
@Api(tags = {"任务注册信息" })
......
ibztask-util/src/main/java/cn/ibizlab/util/annotation/VersionCheck.java 0 → 100644
浏览文件 @ 112fca94
package cn.ibizlab.util.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME)
@Target({ ElementType.METHOD})
public @interface VersionCheck
{
String entity();
String versionfield();
}
ibztask-util/src/main/java/cn/ibizlab/util/aspect/VersionCheckAspect.java 0 → 100644
浏览文件 @ 112fca94
package cn.ibizlab.util.aspect;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import cn.ibizlab.util.annotation.VersionCheck;
import cn.ibizlab.util.domain.EntityBase;
import cn.ibizlab.util.errors.BadRequestAlertException;
import cn.ibizlab.util.helper.RuleUtils;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Before;
import org.springframework.core.annotation.Order;
import org.springframework.expression.EvaluationContext;
import org.springframework.expression.Expression;
import org.springframework.expression.ExpressionParser;
import org.springframework.expression.spel.standard.SpelExpressionParser;
import org.springframework.expression.spel.support.StandardEvaluationContext;
import org.springframework.stereotype.Component;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import java.lang.reflect.Field;
/**
* 数据库版本检查
*/
@Aspect
@Order(0)
@Component
public class VersionCheckAspect
{
private final ExpressionParser parser = new SpelExpressionParser();
@SneakyThrows
@Before("execution(* cn.ibizlab.*.rest.*.update(..)) && @annotation(versionCheck)")
public void BeforeUpdate(JoinPoint point, VersionCheck versionCheck){
EvaluationContext context = new StandardEvaluationContext();
Object[] args = point.getArgs();
Object id=args[0];
Object dto=args[1];
if(ObjectUtils.isEmpty(id) || ObjectUtils.isEmpty(dto))
return;
String versionField=versionCheck.versionfield();
if(StringUtils.isEmpty(versionCheck))
return;
context.setVariable("dto",dto);
Expression newExp = parser.parseExpression(String.format("#dto.%s",versionField));
Object newVersion=newExp.getValue(context);
if(ObjectUtils.isEmpty(newVersion))
return;
//进行版本检查
Object oldVersion =getDBVersion(versionCheck,getService(point.getTarget(),versionCheck.entity()),id);
if(!ObjectUtils.isEmpty(oldVersion)){
if(RuleUtils.gt(newVersion,oldVersion))
throw new BadRequestAlertException("数据已变更，可能后台数据已被修改，请重新加载数据","VersionCheckAspect","versionCheck");
}
}
/**
* 获取实体服务对象
* @param resource
* @param entity
* @return
*/
@SneakyThrows
private Object getService(Object resource,String entity){
Object service = null;
Field[] fields= resource.getClass().getDeclaredFields();
for(Field field : fields){
if(field.getModifiers()==1 && field.getName().equalsIgnoreCase(String.format("%sService",entity))){
service=field.get(resource);
break;
}
}
return service;
}
/**
* 获取数据库版本
* @param versionCheck
* @param service
* @param id
* @return
*/
@SneakyThrows
private Object getDBVersion(VersionCheck versionCheck,Object service,Object id){
Object dbVersion=null;
String versionField=versionCheck.versionfield();
if(!ObjectUtils.isEmpty(service)){
EvaluationContext oldContext = new StandardEvaluationContext();
oldContext.setVariable("service",service);
oldContext.setVariable("id",id);
Expression oldExp = parser.parseExpression("#service.get(#id)");
EntityBase oldEntity =oldExp.getValue(oldContext, EntityBase.class);
return oldEntity.get(versionField);
}
return dbVersion;
}
}
ibztask-util/src/main/java/cn/ibizlab/util/cache/cache/LayeringCache.java
浏览文件 @ 112fca94
......@@ -94,8 +94,10 @@ public class LayeringCache extends AbstractValueAdaptingCache {
@Override
public void put(Object key, Object value) {
caffeineCache.put(key, value);
redisCache.put(key, value);
if(value!=null) {
caffeineCache.put(key, value);
redisCache.put(key, value);
}
}
@Override
......
ibztask-util/src/main/java/cn/ibizlab/util/rest/AppController.java
浏览文件 @ 112fca94
......@@ -55,6 +55,10 @@ public class AppController {
appData.put("unires",uniRes);
appData.put("appmenu",appMenu);
appData.put("enablepermissionvalid",enablePermissionValid);
if(curUser.getSuperuser()==1)
appData.put("enablepermissionvalid",false);
else
appData.put("enablepermissionvalid",enablePermissionValid);
return ResponseEntity.status(HttpStatus.OK).body(appData);
}
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或