Skip to content

I
iBiz人力资源
提交 39a0de40 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

jackwang 部署微服务应用

上级 2bfe9df7
显示空白字符变更
内嵌 并排
正在显示 包含 259 行增加 和 233 行删除
app_PIM/src/locale/lanres/entities/hrdistribution/hrdistribution_en_US.ts
浏览文件 @ 39a0de40
......@@ -69,40 +69,6 @@ export default {
uiactions: {
},
},
gridviewtoolbar_toolbar: {
tbitem3: {
caption: "New",
tip: "New",
},
tbitem4: {
caption: "Edit",
tip: "Edit {0}",
},
tbitem7: {
caption: "-",
tip: "",
},
tbitem8: {
caption: "Remove",
tip: "Remove {0}",
},
tbitem9: {
caption: "-",
tip: "",
},
tbitem13: {
caption: "Export",
tip: "Export {0} Data To Excel",
},
tbitem10: {
caption: "-",
tip: "",
},
tbitem19: {
caption: "Filter",
tip: "Filter",
},
},
editviewtoolbar_toolbar: {
tbitem3: {
caption: "Save",
......@@ -149,4 +115,38 @@ export default {
tip: "Help",
},
},
gridviewtoolbar_toolbar: {
tbitem3: {
caption: "New",
tip: "New",
},
tbitem4: {
caption: "Edit",
tip: "Edit {0}",
},
tbitem7: {
caption: "-",
tip: "",
},
tbitem8: {
caption: "Remove",
tip: "Remove {0}",
},
tbitem9: {
caption: "-",
tip: "",
},
tbitem13: {
caption: "Export",
tip: "Export {0} Data To Excel",
},
tbitem10: {
caption: "-",
tip: "",
},
tbitem19: {
caption: "Filter",
tip: "Filter",
},
},
};
\ No newline at end of file
app_PIM/src/locale/lanres/entities/hrdistribution/hrdistribution_zh_CN.ts
浏览文件 @ 39a0de40
......@@ -68,40 +68,6 @@ export default {
uiactions: {
},
},
gridviewtoolbar_toolbar: {
tbitem3: {
caption: "新建",
tip: "新建",
},
tbitem4: {
caption: "编辑",
tip: "编辑",
},
tbitem7: {
caption: "-",
tip: "",
},
tbitem8: {
caption: "删除",
tip: "删除",
},
tbitem9: {
caption: "-",
tip: "",
},
tbitem13: {
caption: "导出",
tip: "导出",
},
tbitem10: {
caption: "-",
tip: "",
},
tbitem19: {
caption: "过滤",
tip: "过滤",
},
},
editviewtoolbar_toolbar: {
tbitem3: {
caption: "保存",
......@@ -148,4 +114,38 @@ export default {
tip: "帮助",
},
},
gridviewtoolbar_toolbar: {
tbitem3: {
caption: "新建",
tip: "新建",
},
tbitem4: {
caption: "编辑",
tip: "编辑",
},
tbitem7: {
caption: "-",
tip: "",
},
tbitem8: {
caption: "删除",
tip: "删除",
},
tbitem9: {
caption: "-",
tip: "",
},
tbitem13: {
caption: "导出",
tip: "导出",
},
tbitem10: {
caption: "-",
tip: "",
},
tbitem19: {
caption: "过滤",
tip: "过滤",
},
},
};
\ No newline at end of file
app_PIM/src/locale/lanres/entities/hrpost-rel/hrpost-rel_en_US.ts
浏览文件 @ 39a0de40
......@@ -69,40 +69,6 @@ export default {
uiactions: {
},
},
gridviewtoolbar_toolbar: {
tbitem3: {
caption: "New",
tip: "New",
},
tbitem4: {
caption: "Edit",
tip: "Edit {0}",
},
tbitem7: {
caption: "-",
tip: "",
},
tbitem8: {
caption: "Remove",
tip: "Remove {0}",
},
tbitem9: {
caption: "-",
tip: "",
},
tbitem13: {
caption: "Export",
tip: "Export {0} Data To Excel",
},
tbitem10: {
caption: "-",
tip: "",
},
tbitem19: {
caption: "Filter",
tip: "Filter",
},
},
editviewtoolbar_toolbar: {
tbitem3: {
caption: "Save",
......@@ -149,4 +115,38 @@ export default {
tip: "Help",
},
},
gridviewtoolbar_toolbar: {
tbitem3: {
caption: "New",
tip: "New",
},
tbitem4: {
caption: "Edit",
tip: "Edit {0}",
},
tbitem7: {
caption: "-",
tip: "",
},
tbitem8: {
caption: "Remove",
tip: "Remove {0}",
},
tbitem9: {
caption: "-",
tip: "",
},
tbitem13: {
caption: "Export",
tip: "Export {0} Data To Excel",
},
tbitem10: {
caption: "-",
tip: "",
},
tbitem19: {
caption: "Filter",
tip: "Filter",
},
},
};
\ No newline at end of file
app_PIM/src/locale/lanres/entities/hrpost-rel/hrpost-rel_zh_CN.ts
浏览文件 @ 39a0de40
......@@ -68,40 +68,6 @@ export default {
uiactions: {
},
},
gridviewtoolbar_toolbar: {
tbitem3: {
caption: "新建",
tip: "新建",
},
tbitem4: {
caption: "编辑",
tip: "编辑",
},
tbitem7: {
caption: "-",
tip: "",
},
tbitem8: {
caption: "删除",
tip: "删除",
},
tbitem9: {
caption: "-",
tip: "",
},
tbitem13: {
caption: "导出",
tip: "导出",
},
tbitem10: {
caption: "-",
tip: "",
},
tbitem19: {
caption: "过滤",
tip: "过滤",
},
},
editviewtoolbar_toolbar: {
tbitem3: {
caption: "保存",
......@@ -148,4 +114,38 @@ export default {
tip: "帮助",
},
},
gridviewtoolbar_toolbar: {
tbitem3: {
caption: "新建",
tip: "新建",
},
tbitem4: {
caption: "编辑",
tip: "编辑",
},
tbitem7: {
caption: "-",
tip: "",
},
tbitem8: {
caption: "删除",
tip: "删除",
},
tbitem9: {
caption: "-",
tip: "",
},
tbitem13: {
caption: "导出",
tip: "导出",
},
tbitem10: {
caption: "-",
tip: "",
},
tbitem19: {
caption: "过滤",
tip: "过滤",
},
},
};
\ No newline at end of file
app_PIM/src/mock/app/pim-appmenu/pim-appmenu.ts
浏览文件 @ 39a0de40
......@@ -282,7 +282,7 @@ mock.onGet('v7/pimappmenu').reply((config: any) => {
hidden: false,
hidesidebar: false,
opendefault: false,
iconcls: 'fa fa-cog',
iconcls: 'fa fa-bars',
icon: '',
textcls: '',
appfunctag: '_5',
......
app_PIM/src/pages/human-resource/hrdistribution-grid-view/hrdistribution-grid-view-base.tsx
浏览文件 @ 39a0de40
......@@ -569,16 +569,28 @@ export class HRDistributionGridViewBase extends GridViewBase {
}
const parameters: any[] = [
{ pathName: 'hrdistributions', parameterName: 'hrdistribution' },
{ pathName: 'editview', parameterName: 'editview' },
];
const _this: any = this;
const openIndexViewTab = (data: any) => {
const _data: any = { w: (new Date().getTime()) };
Object.assign(_data, data);
const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
this.$router.push(routePath);
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;
}
openIndexViewTab(data);
xData.refresh(result.datas);
});
}
const view: any = {
viewname: 'hrdistribution-v-002',
height: 0,
width: 600,
title: this.$t('entities.hrdistribution.views.v_002.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
}
......@@ -608,14 +620,28 @@ export class HRDistributionGridViewBase extends GridViewBase {
}
const parameters: any[] = [
{ pathName: 'hrdistributions', parameterName: 'hrdistribution' },
{ pathName: 'editview', parameterName: 'editview' },
];
const _this: any = this;
const openIndexViewTab = (data: any) => {
const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
this.$router.push(routePath);
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;
}
openIndexViewTab(data);
xData.refresh(result.datas);
});
}
const view: any = {
viewname: 'hrdistribution-v-002',
height: 0,
width: 600,
title: this.$t('entities.hrdistribution.views.v_002.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
}
......
app_PIM/src/pages/human-resource/hrdistribution-v-001/hrdistribution-v-001-base.tsx
浏览文件 @ 39a0de40
......@@ -221,28 +221,16 @@ export class HRDistributionV_001Base extends GridView9Base {
}
const parameters: any[] = [
{ pathName: 'hrdistributions', parameterName: 'hrdistribution' },
{ pathName: 'editview', parameterName: 'editview' },
];
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;
const openIndexViewTab = (data: any) => {
const _data: any = { w: (new Date().getTime()) };
Object.assign(_data, data);
const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
this.$router.push(routePath);
}
if (!xData || !(xData.refresh instanceof Function)) {
return;
}
xData.refresh(result.datas);
});
}
const view: any = {
viewname: 'hrdistribution-v-002',
height: 0,
width: 600,
title: this.$t('entities.hrdistribution.views.v_002.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
openIndexViewTab(data);
}
......@@ -272,28 +260,14 @@ export class HRDistributionV_001Base extends GridView9Base {
}
const parameters: any[] = [
{ pathName: 'hrdistributions', parameterName: 'hrdistribution' },
{ pathName: 'editview', parameterName: 'editview' },
];
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;
const openIndexViewTab = (data: any) => {
const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
this.$router.push(routePath);
}
if (!xData || !(xData.refresh instanceof Function)) {
return;
}
xData.refresh(result.datas);
});
}
const view: any = {
viewname: 'hrdistribution-v-002',
height: 0,
width: 600,
title: this.$t('entities.hrdistribution.views.v_002.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
openIndexViewTab(data);
}
......
app_PIM/src/pages/human-resource/hrpost-rel-grid-view/hrpost-rel-grid-view-base.tsx
浏览文件 @ 39a0de40
......@@ -569,16 +569,28 @@ export class HRPostRelGridViewBase extends GridViewBase {
}
const parameters: any[] = [
{ pathName: 'hrpostrels', parameterName: 'hrpostrel' },
{ pathName: 'editview', parameterName: 'editview' },
];
const _this: any = this;
const openIndexViewTab = (data: any) => {
const _data: any = { w: (new Date().getTime()) };
Object.assign(_data, data);
const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
this.$router.push(routePath);
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;
}
openIndexViewTab(data);
xData.refresh(result.datas);
});
}
const view: any = {
viewname: 'hrpost-rel-v-002',
height: 0,
width: 600,
title: this.$t('entities.hrpostrel.views.v_002.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
}
......@@ -608,14 +620,28 @@ export class HRPostRelGridViewBase extends GridViewBase {
}
const parameters: any[] = [
{ pathName: 'hrpostrels', parameterName: 'hrpostrel' },
{ pathName: 'editview', parameterName: 'editview' },
];
const _this: any = this;
const openIndexViewTab = (data: any) => {
const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
this.$router.push(routePath);
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;
}
openIndexViewTab(data);
xData.refresh(result.datas);
});
}
const view: any = {
viewname: 'hrpost-rel-v-002',
height: 0,
width: 600,
title: this.$t('entities.hrpostrel.views.v_002.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
}
......
app_PIM/src/pages/human-resource/hrpost-rel-v-001/hrpost-rel-v-001-base.tsx
浏览文件 @ 39a0de40
......@@ -221,7 +221,7 @@ export class HRPostRelV_001Base extends GridView9Base {
}
const parameters: any[] = [
{ pathName: 'hrpostrels', parameterName: 'hrpostrel' },
{ pathName: 'v_002', parameterName: 'v_002' },
{ pathName: 'editview', parameterName: 'editview' },
];
const _this: any = this;
const openIndexViewTab = (data: any) => {
......@@ -260,7 +260,7 @@ export class HRPostRelV_001Base extends GridView9Base {
}
const parameters: any[] = [
{ pathName: 'hrpostrels', parameterName: 'hrpostrel' },
{ pathName: 'v_002', parameterName: 'v_002' },
{ pathName: 'editview', parameterName: 'editview' },
];
const _this: any = this;
const openIndexViewTab = (data: any) => {
......
app_PIM/src/pages/ungroup/pim/page-register.ts
浏览文件 @ 39a0de40
......@@ -34,8 +34,8 @@ export const PageComponents = {
Vue.component('hrorg-address-edit-view', () => import('@pages/base/hrorg-address-edit-view/hrorg-address-edit-view.vue'));
Vue.component('hrorganization-edit-view', () => import('@pages/base/hrorganization-edit-view/hrorganization-edit-view.vue'));
Vue.component('hromhierarchy-cat-grid-view', () => import('@pages/base/hromhierarchy-cat-grid-view/hromhierarchy-cat-grid-view.vue'));
Vue.component('hrdistribution-v-002', () => import('@pages/human-resource/hrdistribution-v-002/hrdistribution-v-002.vue'));
Vue.component('hrpost-rel-v-001', () => import('@pages/human-resource/hrpost-rel-v-001/hrpost-rel-v-001.vue'));
Vue.component('hrdistribution-v-002', () => import('@pages/human-resource/hrdistribution-v-002/hrdistribution-v-002.vue'));
Vue.component('hromhierarchy-pickup-view', () => import('@pages/base/hromhierarchy-pickup-view/hromhierarchy-pickup-view.vue'));
Vue.component('hrpost-v-003', () => import('@pages/human-resource/hrpost-v-003/hrpost-v-003.vue'));
Vue.component('hremployee-grid-view', () => import('@pages/human-resource/hremployee-grid-view/hremployee-grid-view.vue'));
......
app_PIM/src/pages/ungroup/pim/router.ts
浏览文件 @ 39a0de40
......@@ -730,62 +730,62 @@ const router = new Router({
component: () => import('@pages/base/hromhierarchy-cat-grid-view/hromhierarchy-cat-grid-view.vue'),
},
{
path: 'hrposts/:hrpost?/hrdistributions/:hrdistribution?/v_002/:v_002?',
path: 'hrposts/:hrpost?/hrpostrels/:hrpostrel?/v_001/:v_001?',
meta: {
caption: 'entities.hrdistribution.views.v_002.title',
caption: 'entities.hrpostrel.views.v_001.title',
info:'',
parameters: [
{ pathName: 'pim', parameterName: 'pim' },
{ pathName: 'hrposts', parameterName: 'hrpost' },
{ pathName: 'hrdistributions', parameterName: 'hrdistribution' },
{ pathName: 'v_002', parameterName: 'v_002' },
{ pathName: 'hrpostrels', parameterName: 'hrpostrel' },
{ pathName: 'v_001', parameterName: 'v_001' },
],
requireAuth: true,
},
component: () => import('@pages/human-resource/hrdistribution-v-002/hrdistribution-v-002.vue'),
component: () => import('@pages/human-resource/hrpost-rel-v-001/hrpost-rel-v-001.vue'),
},
{
path: 'hrdistributions/:hrdistribution?/v_002/:v_002?',
path: 'hrpostrels/:hrpostrel?/v_001/:v_001?',
meta: {
caption: 'entities.hrdistribution.views.v_002.title',
caption: 'entities.hrpostrel.views.v_001.title',
info:'',
parameters: [
{ pathName: 'pim', parameterName: 'pim' },
{ pathName: 'hrdistributions', parameterName: 'hrdistribution' },
{ pathName: 'v_002', parameterName: 'v_002' },
{ pathName: 'hrpostrels', parameterName: 'hrpostrel' },
{ pathName: 'v_001', parameterName: 'v_001' },
],
requireAuth: true,
},
component: () => import('@pages/human-resource/hrdistribution-v-002/hrdistribution-v-002.vue'),
component: () => import('@pages/human-resource/hrpost-rel-v-001/hrpost-rel-v-001.vue'),
},
{
path: 'hrposts/:hrpost?/hrpostrels/:hrpostrel?/v_001/:v_001?',
path: 'hrposts/:hrpost?/hrdistributions/:hrdistribution?/v_002/:v_002?',
meta: {
caption: 'entities.hrpostrel.views.v_001.title',
caption: 'entities.hrdistribution.views.v_002.title',
info:'',
parameters: [
{ pathName: 'pim', parameterName: 'pim' },
{ pathName: 'hrposts', parameterName: 'hrpost' },
{ pathName: 'hrpostrels', parameterName: 'hrpostrel' },
{ pathName: 'v_001', parameterName: 'v_001' },
{ pathName: 'hrdistributions', parameterName: 'hrdistribution' },
{ pathName: 'v_002', parameterName: 'v_002' },
],
requireAuth: true,
},
component: () => import('@pages/human-resource/hrpost-rel-v-001/hrpost-rel-v-001.vue'),
component: () => import('@pages/human-resource/hrdistribution-v-002/hrdistribution-v-002.vue'),
},
{
path: 'hrpostrels/:hrpostrel?/v_001/:v_001?',
path: 'hrdistributions/:hrdistribution?/v_002/:v_002?',
meta: {
caption: 'entities.hrpostrel.views.v_001.title',
caption: 'entities.hrdistribution.views.v_002.title',
info:'',
parameters: [
{ pathName: 'pim', parameterName: 'pim' },
{ pathName: 'hrpostrels', parameterName: 'hrpostrel' },
{ pathName: 'v_001', parameterName: 'v_001' },
{ pathName: 'hrdistributions', parameterName: 'hrdistribution' },
{ pathName: 'v_002', parameterName: 'v_002' },
],
requireAuth: true,
},
component: () => import('@pages/human-resource/hrpost-rel-v-001/hrpost-rel-v-001.vue'),
component: () => import('@pages/human-resource/hrdistribution-v-002/hrdistribution-v-002.vue'),
},
{
path: 'hromhierarchycats/:hromhierarchycat?/hromhierarchies/:hromhierarchy?/pickupview/:pickupview?',
......
app_PIM/src/store/modules/view-action/state.ts
浏览文件 @ 39a0de40
......@@ -226,7 +226,7 @@ export const viewstate: any = {
viewaction: '',
viewdatachange: false,
refviews: [
'd4d0e128d8c7e5c141f99540b62fd9bf',
'6cf9411c3f3597947dfee8dad2968182',
],
},
{
......@@ -275,7 +275,7 @@ export const viewstate: any = {
viewaction: '',
viewdatachange: false,
refviews: [
'9e5d3f17ad97fd735b8abc637018301d',
'cd7f9e0b57fdfdf34307ce460137b152',
],
},
{
......@@ -285,7 +285,7 @@ export const viewstate: any = {
viewaction: '',
viewdatachange: false,
refviews: [
'6cf9411c3f3597947dfee8dad2968182',
'd4d0e128d8c7e5c141f99540b62fd9bf',
],
},
{
......@@ -295,7 +295,7 @@ export const viewstate: any = {
viewaction: '',
viewdatachange: false,
refviews: [
'cd7f9e0b57fdfdf34307ce460137b152',
'9e5d3f17ad97fd735b8abc637018301d',
],
},
{
......
app_PIM/src/uiservice/hrdistribution/hrdistribution-ui-service-base.ts
浏览文件 @ 39a0de40
......@@ -91,8 +91,8 @@ export default class HRDistributionUIServiceBase extends UIService {
public initViewMap(){
this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'hrdistributions'});
this.allViewMap.set(':',{viewname:'v_001',srfappde:'hrdistributions'});
this.allViewMap.set(':',{viewname:'editview',srfappde:'hrdistributions'});
this.allViewMap.set('EDITVIEW:',{viewname:'v_002',srfappde:'hrdistributions'});
this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'hrdistributions'});
this.allViewMap.set(':',{viewname:'v_002',srfappde:'hrdistributions'});
}
/**
......
app_PIM/src/uiservice/hrpost-rel/hrpost-rel-ui-service-base.ts
浏览文件 @ 39a0de40
......@@ -91,8 +91,8 @@ export default class HRPostRelUIServiceBase extends UIService {
public initViewMap(){
this.allViewMap.set(':',{viewname:'v_001',srfappde:'hrpostrels'});
this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'hrpostrels'});
this.allViewMap.set(':',{viewname:'editview',srfappde:'hrpostrels'});
this.allViewMap.set('EDITVIEW:',{viewname:'v_002',srfappde:'hrpostrels'});
this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'hrpostrels'});
this.allViewMap.set(':',{viewname:'v_002',srfappde:'hrpostrels'});
}
/**
......
app_PIM/src/widgets/app/pim-appmenu/pim-appmenu-model.ts
浏览文件 @ 39a0de40
......@@ -312,7 +312,7 @@ export default class PIMModel {
hidden: false,
hidesidebar: false,
opendefault: false,
iconcls: 'fa fa-cog',
iconcls: 'fa fa-bars',
icon: '',
textcls: '',
appfunctag: '_5',
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或