Skip to content

I
ibzou
提交 0be2f99c 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

ibiz4j 发布系统代码

上级 90a716b7
隐藏空白字符变更
内嵌 并排
正在显示 包含 84 行增加 和 346 行删除
app_web/src/locale/lanres/ibzdept-member/ibzdept-member_en_US.ts
浏览文件 @ 0be2f99c
...@@ -59,18 +59,6 @@ export default { ...@@ -59,18 +59,6 @@ export default {
caption: "-", caption: "-",
tip: "", tip: "",
}, },
tbitem24: {
caption: "行编辑",
tip: "行编辑",
},
tbitem25: {
caption: "新建行",
tip: "新建行",
},
tbitem26: {
caption: "-",
tip: "",
},
tbitem8: { tbitem8: {
caption: "Remove", caption: "Remove",
tip: "Remove {0}", tip: "Remove {0}",
......
app_web/src/locale/lanres/ibzdept-member/ibzdept-member_zh_CN.ts
浏览文件 @ 0be2f99c
...@@ -58,18 +58,6 @@ export default { ...@@ -58,18 +58,6 @@ export default {
caption: '-', caption: '-',
tip: '', tip: '',
}, },
tbitem24: {
caption: '行编辑',
tip: '行编辑',
},
tbitem25: {
caption: '新建行',
tip: '新建行',
},
tbitem26: {
caption: '-',
tip: '',
},
tbitem8: { tbitem8: {
caption: '删除', caption: '删除',
tip: '删除', tip: '删除',
......
app_web/src/pages/ou/ibzdept-member-grid-view/ibzdept-member-grid-view-base.vue
浏览文件 @ 0be2f99c
...@@ -22,20 +22,6 @@ ...@@ -22,20 +22,6 @@
</i-button> </i-button>
<div slot='content'>{{$t('entities.ibzdeptmember.gridviewtoolbar_toolbar.tbitem6.tip')}}</div> <div slot='content'>{{$t('entities.ibzdeptmember.gridviewtoolbar_toolbar.tbitem6.tip')}}</div>
</tooltip> </tooltip>
<span class='seperator'>|</span> <tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem24.visabled" :disabled="toolBarModels.tbitem24.disabled" class='' @click="toolbar_click({ tag: 'tbitem24' }, $event)">
<i class='fa fa-table'></i>
<span class='caption'>{{$t('entities.ibzdeptmember.gridviewtoolbar_toolbar.tbitem24.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.ibzdeptmember.gridviewtoolbar_toolbar.tbitem24.tip')}}</div>
</tooltip>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem25.visabled" :disabled="toolBarModels.tbitem25.disabled" class='' @click="toolbar_click({ tag: 'tbitem25' }, $event)">
<i class='fa fa-plus'></i>
</i-button>
<div slot='content'>{{$t('entities.ibzdeptmember.gridviewtoolbar_toolbar.tbitem25.tip')}}</div>
</tooltip>
<span class='seperator'>|</span> <tooltip :transfer="true" :max-width="600"> <span class='seperator'>|</span> <tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem8.visabled" :disabled="toolBarModels.tbitem8.disabled" class='' @click="toolbar_click({ tag: 'tbitem8' }, $event)"> <i-button v-show="toolBarModels.tbitem8.visabled" :disabled="toolBarModels.tbitem8.disabled" class='' @click="toolbar_click({ tag: 'tbitem8' }, $event)">
<i class='fa fa-remove'></i> <i class='fa fa-remove'></i>
...@@ -56,14 +42,14 @@ ...@@ -56,14 +42,14 @@
:context="context" :context="context"
:isSingleSelect="isSingleSelect" :isSingleSelect="isSingleSelect"
:showBusyIndicator="true" :showBusyIndicator="true"
:isOpenEdit="true" :isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode" :gridRowActiveMode="gridRowActiveMode"
@save="onSave" @save="onSave"
updateAction="Update" updateAction=""
removeAction="Remove" removeAction="Remove"
loaddraftAction="GetDraft" loaddraftAction=""
loadAction="Get" loadAction=""
createAction="Create" createAction=""
fetchAction="FetchDefault" fetchAction="FetchDefault"
:newdata="newdata" :newdata="newdata"
:opendata="opendata" :opendata="opendata"
...@@ -276,11 +262,6 @@ export default class IBZDeptMemberGridViewBase extends Vue { ...@@ -276,11 +262,6 @@ export default class IBZDeptMemberGridViewBase extends Vue {
tbitem6: { name: 'tbitem6', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } }, tbitem6: { name: 'tbitem6', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } },
tbitem7: { name: 'tbitem7', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } }, tbitem7: { name: 'tbitem7', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem24: { name: 'tbitem24', caption: '行编辑', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'ToggleRowEdit', target: '' } },
tbitem25: { name: 'tbitem25', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'NewRow', target: '' } },
tbitem26: { name: 'tbitem26', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem8: { name: 'tbitem8', caption: '删除', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Remove', target: 'MULTIKEY' } }, tbitem8: { name: 'tbitem8', caption: '删除', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Remove', target: 'MULTIKEY' } },
tbitem9: { name: 'tbitem9', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } }, tbitem9: { name: 'tbitem9', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
......
app_web/src/pages/ou/ibzemployee-edit-grid-view/ibzemployee-edit-grid-view-base.vue
浏览文件 @ 0be2f99c
...@@ -793,16 +793,28 @@ export default class IBZEmployeeEditGridViewBase extends Vue { ...@@ -793,16 +793,28 @@ export default class IBZEmployeeEditGridViewBase extends Vue {
} }
const parameters: any[] = [ const parameters: any[] = [
{ pathName: 'ibzemployees', parameterName: 'ibzemployee' }, { pathName: 'ibzemployees', parameterName: 'ibzemployee' },
{ pathName: 'editview', parameterName: 'editview' },
]; ];
const _this: any = this; const _this: any = this;
const openIndexViewTab = (data: any) => { const openDrawer = (view: any, data: any) => {
const _data: any = { w: (new Date().getTime()) }; let container: Subject<any> = this.$appdrawer.openDrawer(view, curViewParam, data);
Object.assign(_data, data); container.subscribe((result: any) => {
const routePath = this.$viewTool.buildUpRoutePath(this.$route, curViewParam, deResParameters, parameters, args, _data); if (!result || !Object.is(result.ret, 'OK')) {
this.$router.push(routePath); return;
}
if (!xData || !(xData.refresh instanceof Function)) {
return;
}
xData.refresh(result.datas);
});
} }
openIndexViewTab(data); const view: any = {
viewname: 'ibzemployee-edit-view',
height: 0,
width: 0,
title: this.$t('entities.ibzemployee.views.editview.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
} }
...@@ -830,14 +842,28 @@ export default class IBZEmployeeEditGridViewBase extends Vue { ...@@ -830,14 +842,28 @@ export default class IBZEmployeeEditGridViewBase extends Vue {
} }
const parameters: any[] = [ const parameters: any[] = [
{ pathName: 'ibzemployees', parameterName: 'ibzemployee' }, { pathName: 'ibzemployees', parameterName: 'ibzemployee' },
{ pathName: 'editview', parameterName: 'editview' },
]; ];
const _this: any = this; const _this: any = this;
const openIndexViewTab = (data: any) => { const openDrawer = (view: any, data: any) => {
const routePath = this.$viewTool.buildUpRoutePath(this.$route, curViewParam, deResParameters, parameters, args, data); let container: Subject<any> = this.$appdrawer.openDrawer(view, curViewParam, data);
this.$router.push(routePath); container.subscribe((result: any) => {
if (!result || !Object.is(result.ret, 'OK')) {
return;
}
if (!xData || !(xData.refresh instanceof Function)) {
return;
}
xData.refresh(result.datas);
});
} }
openIndexViewTab(data); const view: any = {
viewname: 'ibzemployee-edit-view',
height: 0,
width: 0,
title: this.$t('entities.ibzemployee.views.editview.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
} }
......
app_web/src/pages/ou/ouindex-view/page-register.ts
浏览文件 @ 0be2f99c
...@@ -19,7 +19,6 @@ export const PageComponents = { ...@@ -19,7 +19,6 @@ export const PageComponents = {
Vue.component('ibzdepartment-mpickup-view', () => import('@pages/ou/ibzdepartment-mpickup-view/ibzdepartment-mpickup-view.vue')); Vue.component('ibzdepartment-mpickup-view', () => import('@pages/ou/ibzdepartment-mpickup-view/ibzdepartment-mpickup-view.vue'));
Vue.component('ibzdept-member-edit-view', () => import('@pages/ou/ibzdept-member-edit-view/ibzdept-member-edit-view.vue')); Vue.component('ibzdept-member-edit-view', () => import('@pages/ou/ibzdept-member-edit-view/ibzdept-member-edit-view.vue'));
Vue.component('ibzorganization-pickup-view', () => import('@pages/ou/ibzorganization-pickup-view/ibzorganization-pickup-view.vue')); Vue.component('ibzorganization-pickup-view', () => import('@pages/ou/ibzorganization-pickup-view/ibzorganization-pickup-view.vue'));
Vue.component('ibzemployee-edit-grid-view', () => import('@pages/ou/ibzemployee-edit-grid-view/ibzemployee-edit-grid-view.vue'));
Vue.component('ibzdepartment-tree-exp-view', () => import('@pages/ou/ibzdepartment-tree-exp-view/ibzdepartment-tree-exp-view.vue')); Vue.component('ibzdepartment-tree-exp-view', () => import('@pages/ou/ibzdepartment-tree-exp-view/ibzdepartment-tree-exp-view.vue'));
Vue.component('ibzemployee-option-view', () => import('@pages/ou/ibzemployee-option-view/ibzemployee-option-view.vue')); Vue.component('ibzemployee-option-view', () => import('@pages/ou/ibzemployee-option-view/ibzemployee-option-view.vue'));
Vue.component('ibzdepartment-pickup-view', () => import('@pages/ou/ibzdepartment-pickup-view/ibzdepartment-pickup-view.vue')); Vue.component('ibzdepartment-pickup-view', () => import('@pages/ou/ibzdepartment-pickup-view/ibzdepartment-pickup-view.vue'));
......
app_web/src/pages/ou/ouindex-view/router.ts
浏览文件 @ 0be2f99c
...@@ -700,62 +700,6 @@ const router = new Router({ ...@@ -700,62 +700,6 @@ const router = new Router({
}, },
component: () => import('@pages/ou/ibzorganization-pickup-view/ibzorganization-pickup-view.vue'), component: () => import('@pages/ou/ibzorganization-pickup-view/ibzorganization-pickup-view.vue'),
}, },
{
path: 'ibzorganizations/:ibzorganization?/ibzdepartments/:ibzdepartment?/ibzemployees/:ibzemployee?/editgridview/:editgridview?',
meta: {
caption: 'entities.ibzemployee.views.editgridview.caption',
parameters: [
{ pathName: 'ouindexview', parameterName: 'ouindexview' },
{ pathName: 'ibzorganizations', parameterName: 'ibzorganization' },
{ pathName: 'ibzdepartments', parameterName: 'ibzdepartment' },
{ pathName: 'ibzemployees', parameterName: 'ibzemployee' },
{ pathName: 'editgridview', parameterName: 'editgridview' },
],
requireAuth: true,
},
component: () => import('@pages/ou/ibzemployee-edit-grid-view/ibzemployee-edit-grid-view.vue'),
},
{
path: 'ibzorganizations/:ibzorganization?/ibzemployees/:ibzemployee?/editgridview/:editgridview?',
meta: {
caption: 'entities.ibzemployee.views.editgridview.caption',
parameters: [
{ pathName: 'ouindexview', parameterName: 'ouindexview' },
{ pathName: 'ibzorganizations', parameterName: 'ibzorganization' },
{ pathName: 'ibzemployees', parameterName: 'ibzemployee' },
{ pathName: 'editgridview', parameterName: 'editgridview' },
],
requireAuth: true,
},
component: () => import('@pages/ou/ibzemployee-edit-grid-view/ibzemployee-edit-grid-view.vue'),
},
{
path: 'ibzdepartments/:ibzdepartment?/ibzemployees/:ibzemployee?/editgridview/:editgridview?',
meta: {
caption: 'entities.ibzemployee.views.editgridview.caption',
parameters: [
{ pathName: 'ouindexview', parameterName: 'ouindexview' },
{ pathName: 'ibzdepartments', parameterName: 'ibzdepartment' },
{ pathName: 'ibzemployees', parameterName: 'ibzemployee' },
{ pathName: 'editgridview', parameterName: 'editgridview' },
],
requireAuth: true,
},
component: () => import('@pages/ou/ibzemployee-edit-grid-view/ibzemployee-edit-grid-view.vue'),
},
{
path: 'ibzemployees/:ibzemployee?/editgridview/:editgridview?',
meta: {
caption: 'entities.ibzemployee.views.editgridview.caption',
parameters: [
{ pathName: 'ouindexview', parameterName: 'ouindexview' },
{ pathName: 'ibzemployees', parameterName: 'ibzemployee' },
{ pathName: 'editgridview', parameterName: 'editgridview' },
],
requireAuth: true,
},
component: () => import('@pages/ou/ibzemployee-edit-grid-view/ibzemployee-edit-grid-view.vue'),
},
{ {
path: 'ibzorganizations/:ibzorganization?/ibzdepartments/:ibzdepartment?/treeexpview/:treeexpview?', path: 'ibzorganizations/:ibzorganization?/ibzdepartments/:ibzdepartment?/treeexpview/:treeexpview?',
meta: { meta: {
...@@ -869,58 +813,6 @@ const router = new Router({ ...@@ -869,58 +813,6 @@ const router = new Router({
...indexRoutes, ...indexRoutes,
], ],
}, },
{
path: '/ibzorganizations/:ibzorganization?/ibzdepartments/:ibzdepartment?/ibzemployees/:ibzemployee?/editgridview/:editgridview?',
meta: {
caption: 'entities.ibzemployee.views.editgridview.caption',
parameters: [
{ pathName: 'ibzorganizations', parameterName: 'ibzorganization' },
{ pathName: 'ibzdepartments', parameterName: 'ibzdepartment' },
{ pathName: 'ibzemployees', parameterName: 'ibzemployee' },
{ pathName: 'editgridview', parameterName: 'editgridview' },
],
requireAuth: true,
},
component: () => import('@pages/ou/ibzemployee-edit-grid-view/ibzemployee-edit-grid-view.vue'),
},
{
path: '/ibzorganizations/:ibzorganization?/ibzemployees/:ibzemployee?/editgridview/:editgridview?',
meta: {
caption: 'entities.ibzemployee.views.editgridview.caption',
parameters: [
{ pathName: 'ibzorganizations', parameterName: 'ibzorganization' },
{ pathName: 'ibzemployees', parameterName: 'ibzemployee' },
{ pathName: 'editgridview', parameterName: 'editgridview' },
],
requireAuth: true,
},
component: () => import('@pages/ou/ibzemployee-edit-grid-view/ibzemployee-edit-grid-view.vue'),
},
{
path: '/ibzdepartments/:ibzdepartment?/ibzemployees/:ibzemployee?/editgridview/:editgridview?',
meta: {
caption: 'entities.ibzemployee.views.editgridview.caption',
parameters: [
{ pathName: 'ibzdepartments', parameterName: 'ibzdepartment' },
{ pathName: 'ibzemployees', parameterName: 'ibzemployee' },
{ pathName: 'editgridview', parameterName: 'editgridview' },
],
requireAuth: true,
},
component: () => import('@pages/ou/ibzemployee-edit-grid-view/ibzemployee-edit-grid-view.vue'),
},
{
path: '/ibzemployees/:ibzemployee?/editgridview/:editgridview?',
meta: {
caption: 'entities.ibzemployee.views.editgridview.caption',
parameters: [
{ pathName: 'ibzemployees', parameterName: 'ibzemployee' },
{ pathName: 'editgridview', parameterName: 'editgridview' },
],
requireAuth: true,
},
component: () => import('@pages/ou/ibzemployee-edit-grid-view/ibzemployee-edit-grid-view.vue'),
},
{ {
path: '/ibzorganizations/:ibzorganization?/editview/:editview?', path: '/ibzorganizations/:ibzorganization?/editview/:editview?',
meta: { meta: {
......
app_web/src/store/modules/view-action/state.ts
浏览文件 @ 0be2f99c
...@@ -236,7 +236,7 @@ export const viewstate: any = { ...@@ -236,7 +236,7 @@ export const viewstate: any = {
viewaction: '', viewaction: '',
viewdatachange: false, viewdatachange: false,
refviews: [ refviews: [
'0c24f382fdfded375e4ef737707fdd80', '2300119cfeaff98d4bc48c1679515968',
], ],
}, },
{ {
......
app_web/src/uiservice/ibzemployee/ibzemployee-ui-service-base.ts
浏览文件 @ 0be2f99c
...@@ -131,14 +131,29 @@ export default class IBZEmployeeUIServiceBase extends UIService { ...@@ -131,14 +131,29 @@ export default class IBZEmployeeUIServiceBase extends UIService {
} }
const parameters: any[] = [ const parameters: any[] = [
{ pathName: 'ibzemployees', parameterName: 'ibzemployee' }, { pathName: 'ibzemployees', parameterName: 'ibzemployee' },
{ pathName: 'editview', parameterName: 'editview' },
]; ];
const openIndexViewTab = (data: any) => { const openDrawer = (view: any, data: any) => {
const routePath = actionContext.$viewTool.buildUpRoutePath(actionContext.$route, context, deResParameters, parameters, _args, data); let container: Subject<any> = actionContext.$appdrawer.openDrawer(view, context,data);
actionContext.$router.push(routePath); container.subscribe((result: any) => {
return null; if (!result || !Object.is(result.ret, 'OK')) {
} return;
openIndexViewTab(data); }
const _this: any = actionContext;
if(window.opener){
window.opener.postMessage({status:'OK',identification:'WF'},Environment.uniteAddress);
window.close();
}
return result.datas;
});
}
const view: any = {
viewname: 'ibzemployee-edit-view',
height: 0,
width: 0,
title: actionContext.$t('entities.ibzemployee.views.editview.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
} }
/** /**
......
app_web/src/widgets/ibzdepartment/tree-exp-viewtreeexpbar-treeexpbar/tree-exp-viewtreeexpbar-treeexpbar-base.vue
浏览文件 @ 0be2f99c
<template> <template>
<split id="treeexpviewtreeexpbar" class='app-tree-exp-bar' v-model="split" mode="horizontal" @on-move-end="onSplitChange"> <split id="treeexpviewtreeexpbar" class='app-tree-exp-bar' v-model="split" mode="horizontal" @on-move-end="onSplitChange">
<div slot='left'> <div slot='left'>
<div class='tree-exp-bar-header'> <div class='tree-exp-content2'>
<div>树视图导航栏</div>
</div>
<div class='tree-exp-content'>
<view_treeexpbar_tree <view_treeexpbar_tree
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="viewparams"
...@@ -289,7 +286,7 @@ export default class TreeExpViewtreeexpbarBase extends Vue implements ControlInt ...@@ -289,7 +286,7 @@ export default class TreeExpViewtreeexpbarBase extends Vue implements ControlInt
} }
if (Object.is(expmode, 'DEPT')) { if (Object.is(expmode, 'DEPT')) {
return { return {
viewname: 'ibzemployee-edit-grid-view', viewname: 'ibzemployee-grid-view',
parentdata: {"srfparentdefname":"MDEPTID","srfparentdename":"IBZDEPT","srfparentmode":"DER1N_IBZEMP_IBZDEPT_MDEPTID"}, parentdata: {"srfparentdefname":"MDEPTID","srfparentdename":"IBZDEPT","srfparentmode":"DER1N_IBZEMP_IBZDEPT_MDEPTID"},
deKeyField:'ibzemployee' deKeyField:'ibzemployee'
}; };
......
app_web/src/widgets/ibzdepartment/tree-exp-viewtreeexpbar-treeexpbar/tree-exp-viewtreeexpbar-treeexpbar.less
浏览文件 @ 0be2f99c
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
padding: 10px 5px 10px 5px; padding: 10px 5px 10px 5px;
} }
.tree-exp-content { .tree-exp-content {
height: calc(100% - 40px); height: 100%;
overflow: auto; overflow: auto;
padding: 16px 0; padding: 16px 0;
margin-bottom: 10px; margin-bottom: 10px;
......
app_web/src/widgets/ibzdept-member/main-grid/main-grid-base.vue
浏览文件 @ 0be2f99c
...@@ -30,14 +30,7 @@ ...@@ -30,14 +30,7 @@
</span> </span>
</template> </template>
<template v-slot="{row,column,$index}"> <template v-slot="{row,column,$index}">
<template v-if="actualIsOpenEdit"> <span>{{row.deptname}}</span>
<app-form-item :error="gridItemsModel[$index][column.property].error">
<dropdown-list v-model="row[column.property]" :disabled="row.srfuf === 1 ? (3 & 2) !== 2 : (3 & 1) !== 1" placeholder='请选择...' style="" @change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}"></dropdown-list>
</app-form-item>
</template>
<template v-if="!actualIsOpenEdit">
<app-span name='deptname' editorType="DROPDOWNLIST" :value="row.deptname"></app-span>
</template>
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
...@@ -61,22 +54,7 @@ ...@@ -61,22 +54,7 @@
</span> </span>
</template> </template>
<template v-slot="{row,column,$index}"> <template v-slot="{row,column,$index}">
<template v-if="actualIsOpenEdit"> <span>{{row.deptid}}</span>
<app-form-item :error="gridItemsModel[$index][column.property].error">
<input-box
:disabled="row.srfuf === 1 ? (3 & 2) !== 2 : (3 & 1) !== 1"
v-model="row[column.property]"
style=""
type="text"
@change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}">
</input-box>
</app-form-item>
</template>
<template v-if="!actualIsOpenEdit">
<app-span name='deptid' editorType="HIDDEN" :value="row.deptid"></app-span>
</template>
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
...@@ -596,8 +574,6 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -596,8 +574,6 @@ export default class MainBase extends Vue implements ControlInterface {
*/ */
public getGridRowModel(){ public getGridRowModel(){
return { return {
deptid: new FormItemModel(),
deptname: new FormItemModel(),
srfkey: new FormItemModel(), srfkey: new FormItemModel(),
} }
} }
...@@ -609,14 +585,6 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -609,14 +585,6 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof Main * @memberof Main
*/ */
public rules: any = { public rules: any = {
deptid: [
{ required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '部门标识 值不能为空', trigger: 'change' },
{ required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '部门标识 值不能为空', trigger: 'blur' },
],
deptname: [
{ required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '部门 值不能为空', trigger: 'change' },
{ required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '部门 值不能为空', trigger: 'blur' },
],
srfkey: [ srfkey: [
{ required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '标识 值不能为空', trigger: 'change' }, { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '标识 值不能为空', trigger: 'change' },
{ required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '标识 值不能为空', trigger: 'blur' }, { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '标识 值不能为空', trigger: 'blur' },
...@@ -1429,119 +1397,6 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1429,119 +1397,6 @@ export default class MainBase extends Vue implements ControlInterface {
return successItems; return successItems;
} }
/**
* 新建行
*
* @param {*} $event
* @returns {void}
* @memberof Main
*/
public newRow(args: any[], params?: any, $event?: any, xData?: any): void {
if(!this.loaddraftAction){
this.$Notice.error({ title: '错误', desc: 'IBZDeptMemberGridView视图表格loaddraftAction参数未配置' });
return;
}
let _this = this;
Object.assign(args[0],{viewparams:this.viewparams});
let post: Promise<any> = this.service.loadDraft(this.loaddraftAction, JSON.parse(JSON.stringify(this.context)), args[0], this.showBusyIndicator);
post.then((response: any) => {
if (!response.status || response.status !== 200) {
if (response.errorMessage) {
this.$Notice.error({ title: '错误', desc: response.errorMessage });
}
return;
}
const data = response.data;
data.rowDataState = "create";
_this.items.push(data);
_this.gridItemsModel.push(_this.getGridRowModel());
}).catch((response: any) => {
if (response && response.status === 401) {
return;
}
if (!response || !response.status || !response.data) {
this.$Notice.error({ title: '错误', desc: '系统异常' });
return;
}
});
}
/**
* 表格编辑项值变更
*
* @param row 行数据
* @param {{ name: string, value: any }} $event
* @returns {void}
* @memberof Main
*/
public onGridItemValueChange(row: any,$event: { name: string, value: any },rowIndex: number): void {
if (!$event) {
return;
}
if (!$event.name || Object.is($event.name, '') || !row.hasOwnProperty($event.name)) {
return;
}
row[$event.name] = $event.value;
this.gridEditItemChange(row, $event.name, $event.value, rowIndex);
}
/**
* 表格编辑项值变化
*
* @public
* @param row 行数据
* @param property 列编辑项名
* @param row 列编辑项值
* @returns {void}
* @memberof Main
*/
public gridEditItemChange(row: any, property: string, value: any, rowIndex: number){
row.rowDataState = row.rowDataState ? row.rowDataState : "update" ;
this.validate(property,row,rowIndex);
}
/**
* 表格编辑项更新
*
* @param {string} mode 界面行为名称
* @param {*} [data={}] 请求数据
* @param {string[]} updateDetails 更新项
* @param {boolean} [showloading] 是否显示加载状态
* @returns {void}
* @memberof Main
*/
public updateGridEditItem(mode: string, data: any = {}, updateDetails: string[], showloading?: boolean): void {
if (!mode || (mode && Object.is(mode, ''))) {
return;
}
const arg: any = JSON.parse(JSON.stringify(data));
Object.assign(arg,{viewparams:this.viewparams});
const post: Promise<any> = this.service.frontLogic(mode,JSON.parse(JSON.stringify(this.context)),arg, showloading);
post.then((response: any) => {
if (!response || response.status !== 200) {
this.$Notice.error({ title: '错误', desc: '表单项更新失败' });
return;
}
const _data: any = response.data;
if(!_data){
return;
}
updateDetails.forEach((name: string) => {
if (!_data.hasOwnProperty(name)) {
return;
}
data[name] = _data[name];
});
}).catch((response: any) => {
if (response && response.status === 401) {
return;
}
if (!response || !response.status || !response.data) {
this.$Notice.error({ title: '错误', desc: '系统异常' });
return;
}
});
}
/** /**
* 获取对应行class * 获取对应行class
......
app_web/src/widgets/ibzorganization/tree-exp-viewtreeexpbar-treeexpbar/tree-exp-viewtreeexpbar-treeexpbar-base.vue
浏览文件 @ 0be2f99c
<template> <template>
<split id="treeexpviewtreeexpbar" class='app-tree-exp-bar' v-model="split" mode="horizontal" @on-move-end="onSplitChange"> <split id="treeexpviewtreeexpbar" class='app-tree-exp-bar' v-model="split" mode="horizontal" @on-move-end="onSplitChange">
<div slot='left'> <div slot='left'>
<div class='tree-exp-bar-header'> <div class='tree-exp-content2'>
<div>树视图导航栏</div>
</div>
<div class='tree-exp-content'>
<view_treeexpbar_tree <view_treeexpbar_tree
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="viewparams"
......
app_web/src/widgets/ibzorganization/tree-exp-viewtreeexpbar-treeexpbar/tree-exp-viewtreeexpbar-treeexpbar.less
浏览文件 @ 0be2f99c
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
padding: 10px 5px 10px 5px; padding: 10px 5px 10px 5px;
} }
.tree-exp-content { .tree-exp-content {
height: calc(100% - 40px); height: 100%;
overflow: auto; overflow: auto;
padding: 16px 0; padding: 16px 0;
margin-bottom: 10px; margin-bottom: 10px;
......
ibzou-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 0be2f99c
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<!--输出实体[IBZORG]数据结构 --> <!--输出实体[IBZORG]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-ibzorg-439-1"> <changeSet author="a_A_5d9d78509" id="tab-ibzorg-440-1">
<createTable tableName="IBZORG"> <createTable tableName="IBZORG">
<column name="ORGID" remarks="" type="VARCHAR(100)"> <column name="ORGID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_IBZORG_ORGID"/> <constraints primaryKey="true" primaryKeyName="PK_IBZORG_ORGID"/>
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<!--输出实体[IBZEMP]数据结构 --> <!--输出实体[IBZEMP]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-ibzemp-634-2"> <changeSet author="a_A_5d9d78509" id="tab-ibzemp-640-2">
<createTable tableName="IBZEMP"> <createTable tableName="IBZEMP">
<column name="USERID" remarks="" type="VARCHAR(100)"> <column name="USERID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_IBZEMP_USERID"/> <constraints primaryKey="true" primaryKeyName="PK_IBZEMP_USERID"/>
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
<!--输出实体[IBZDEPTMEMBER]数据结构 --> <!--输出实体[IBZDEPTMEMBER]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-ibzdeptmember-28-3"> <changeSet author="a_A_5d9d78509" id="tab-ibzdeptmember-30-3">
<createTable tableName="IBZDEPTMEMBER"> <createTable tableName="IBZDEPTMEMBER">
<column name="MEMBERID" remarks="" type="VARCHAR(100)"> <column name="MEMBERID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_IBZDEPTMEMBER_MEMBERID"/> <constraints primaryKey="true" primaryKeyName="PK_IBZDEPTMEMBER_MEMBERID"/>
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
<!--输出实体[IBZDEPT]数据结构 --> <!--输出实体[IBZDEPT]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-ibzdept-692-4"> <changeSet author="a_A_5d9d78509" id="tab-ibzdept-694-4">
<createTable tableName="IBZDEPT"> <createTable tableName="IBZDEPT">
<column name="DEPTID" remarks="" type="VARCHAR(100)"> <column name="DEPTID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_IBZDEPT_DEPTID"/> <constraints primaryKey="true" primaryKeyName="PK_IBZDEPT_DEPTID"/>
...@@ -161,28 +161,28 @@ ...@@ -161,28 +161,28 @@
</changeSet> </changeSet>
<!--输出实体[IBZORG]外键关系 --> <!--输出实体[IBZORG]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-ibzorg-439-5"> <changeSet author="a_A_5d9d78509" id="fk-ibzorg-440-5">
<addForeignKeyConstraint baseColumnNames="PORGID" baseTableName="IBZORG" constraintName="DER1N_IBZORG_IBZORG_PORGID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGID" referencedTableName="IBZORG" validate="true"/> <addForeignKeyConstraint baseColumnNames="PORGID" baseTableName="IBZORG" constraintName="DER1N_IBZORG_IBZORG_PORGID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGID" referencedTableName="IBZORG" validate="true"/>
</changeSet> </changeSet>
<!--输出实体[IBZEMP]外键关系 --> <!--输出实体[IBZEMP]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-ibzemp-634-6"> <changeSet author="a_A_5d9d78509" id="fk-ibzemp-640-6">
<addForeignKeyConstraint baseColumnNames="MDEPTID" baseTableName="IBZEMP" constraintName="DER1N_IBZEMP_IBZDEPT_MDEPTID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="DEPTID" referencedTableName="IBZDEPT" validate="true"/> <addForeignKeyConstraint baseColumnNames="MDEPTID" baseTableName="IBZEMP" constraintName="DER1N_IBZEMP_IBZDEPT_MDEPTID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="DEPTID" referencedTableName="IBZDEPT" validate="true"/>
</changeSet> </changeSet>
<changeSet author="a_A_5d9d78509" id="fk-ibzemp-634-7"> <changeSet author="a_A_5d9d78509" id="fk-ibzemp-640-7">
<addForeignKeyConstraint baseColumnNames="ORGID" baseTableName="IBZEMP" constraintName="DER1N_IBZEMP_IBZORG_ORGID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGID" referencedTableName="IBZORG" validate="true"/> <addForeignKeyConstraint baseColumnNames="ORGID" baseTableName="IBZEMP" constraintName="DER1N_IBZEMP_IBZORG_ORGID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGID" referencedTableName="IBZORG" validate="true"/>
</changeSet> </changeSet>
<!--输出实体[IBZDEPTMEMBER]外键关系 --> <!--输出实体[IBZDEPTMEMBER]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-ibzdeptmember-28-8"> <changeSet author="a_A_5d9d78509" id="fk-ibzdeptmember-30-8">
<addForeignKeyConstraint baseColumnNames="DEPTID" baseTableName="IBZDEPTMEMBER" constraintName="DER1N_IBZDEPTMEMBER_IBZDEPT_DE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="DEPTID" referencedTableName="IBZDEPT" validate="true"/> <addForeignKeyConstraint baseColumnNames="DEPTID" baseTableName="IBZDEPTMEMBER" constraintName="DER1N_IBZDEPTMEMBER_IBZDEPT_DE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="DEPTID" referencedTableName="IBZDEPT" validate="true"/>
</changeSet> </changeSet>
<changeSet author="a_A_5d9d78509" id="fk-ibzdeptmember-28-9"> <changeSet author="a_A_5d9d78509" id="fk-ibzdeptmember-30-9">
<addForeignKeyConstraint baseColumnNames="USERID" baseTableName="IBZDEPTMEMBER" constraintName="DER1N_IBZDEPTMEMBER_IBZEMP_USE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="USERID" referencedTableName="IBZEMP" validate="true"/> <addForeignKeyConstraint baseColumnNames="USERID" baseTableName="IBZDEPTMEMBER" constraintName="DER1N_IBZDEPTMEMBER_IBZEMP_USE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="USERID" referencedTableName="IBZEMP" validate="true"/>
</changeSet> </changeSet>
<!--输出实体[IBZDEPT]外键关系 --> <!--输出实体[IBZDEPT]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-ibzdept-692-10"> <changeSet author="a_A_5d9d78509" id="fk-ibzdept-694-10">
<addForeignKeyConstraint baseColumnNames="PDEPTID" baseTableName="IBZDEPT" constraintName="DER1N_IBZDEPT_IBZDEPT_PDEPTID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="DEPTID" referencedTableName="IBZDEPT" validate="true"/> <addForeignKeyConstraint baseColumnNames="PDEPTID" baseTableName="IBZDEPT" constraintName="DER1N_IBZDEPT_IBZDEPT_PDEPTID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="DEPTID" referencedTableName="IBZDEPT" validate="true"/>
</changeSet> </changeSet>
<changeSet author="a_A_5d9d78509" id="fk-ibzdept-692-11"> <changeSet author="a_A_5d9d78509" id="fk-ibzdept-694-11">
<addForeignKeyConstraint baseColumnNames="ORGID" baseTableName="IBZDEPT" constraintName="DER1N_IBZDEPT_IBZORG_ORGID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGID" referencedTableName="IBZORG" validate="true"/> <addForeignKeyConstraint baseColumnNames="ORGID" baseTableName="IBZDEPT" constraintName="DER1N_IBZDEPT_IBZORG_ORGID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGID" referencedTableName="IBZORG" validate="true"/>
</changeSet> </changeSet>
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或