Skip to content

I
ibzuaa
提交 6d2e2ea2 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

Nnancy 发布系统代码

上级 8f9b9319
隐藏空白字符变更
内嵌 并排
正在显示 包含 264 行增加 和 322 行删除
app_web/src/app-register.ts
浏览文件 @ 6d2e2ea2
......@@ -78,6 +78,7 @@ import AppOrgSelect from './components/app-org-select/app-org-select.vue'
import AppDepartmentSelect from './components/app-department-select/app-department-select.vue'
import AppGroupSelect from './components/app-group-select/app-group-select.vue'
import UpdatePwd from './components/app-update-password/app-update-password.vue'
import AppMenuItem from './components/app-menu-item/app-menu-item.vue'
// 全局挂载UI实体服务注册中心
window['uiServiceRegister'] = uiServiceRegister;
// 全局挂载实体权限服务注册中心
......@@ -168,5 +169,6 @@ export const AppComponents = {
v.component('app-transfer',AppTransfer);
v.component('context-menu-drag',ContextMenuDrag);
v.component('app-update-password',UpdatePwd);
v.component('app-menu-item', AppMenuItem);
},
};
\ No newline at end of file
app_web/src/components/app-actionbar/app-actionbar.vue
浏览文件 @ 6d2e2ea2
<template>
<div class="app-actionbar">
<div class="app-actionbar-item" v-for="(item,index) in items" :key="index">
<Badge v-if="item.counterService&&item.counterService.counterData" :count="item.counterService.counterData[item.counterId]" type="primary">
<i-button @click="handleClick(item.viewlogicname)"><i v-if="item.icon" style="margin-right: 5px;" :class="item.icon"></i>{{item.actionName}}</i-button>
<Badge v-if="item.counterService&&item.counterService.counterData" v-show="item.visabled" :count="item.counterService.counterData[item.counterId]" type="primary">
<i-button :style="{'pointer-events':item.disabled?'none':'auto'}" @click="handleClick(item.viewlogicname)"><i v-if="item.icon" style="margin-right: 5px;" :class="item.icon"></i>{{item.actionName}}</i-button>
</Badge>
<i-button v-else @click="handleClick(item.viewlogicname)">{{item.actionName}}</i-button>
<i-button v-show="item.visabled" :style="{'pointer-events':item.disabled?'none':'auto'}" v-else @click="handleClick(item.viewlogicname)">{{item.actionName}}</i-button>
</div>
</div>
</template>
<script lang="ts">
import { Vue, Component, Prop, Model, Emit } from "vue-property-decorator";
import { Subject } from "rxjs";
import { Vue, Component, Prop, Model, Emit,Inject, Watch } from "vue-property-decorator";
import { Subject,Subscription } from "rxjs";
@Component({})
export default class AppActionBar extends Vue {
......@@ -24,6 +24,49 @@ export default class AppActionBar extends Vue {
*/
@Prop() public items!:any;
/**
* 注入的UI服务
*
* @type {*}
* @memberof AppActionBar
*/
@Prop() public uiService!: any;
/**
* 视图通讯对象
*
* @type {Subject<ViewState>}
* @memberof AppActionBar
*/
@Prop() public viewState!: Subject<ViewState>;
/**
* 视图状态事件
*
* @public
* @type {(Subscription | undefined)}
* @memberof ActionlinetestBase
*/
public viewStateEvent: Subscription | undefined;
/**
* 组件初始化
*
* @memberof AppActionBar
*/
public created(){
if (this.viewState) {
this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
if (!Object.is(tag, "app-actionbar")) {
return;
}
if(Object.is(action,'loadmodel')){
this.calcActionItemAuthState(data,this.items,this.uiService);
}
});
}
}
/**
* 触发界面行为
*
......@@ -33,6 +76,51 @@ export default class AppActionBar extends Vue {
this.$emit('itemClick',$event);
}
/**
* 计算界面行为项权限状态
*
* @param {*} [data] 传入数据
* @param {*} [ActionModel] 界面行为模型
* @param {*} [UIService] 界面行为服务
* @memberof AppActionBar
*/
public calcActionItemAuthState(data:any,ActionModel:any,UIService:any){
for (const key in ActionModel) {
if (!ActionModel.hasOwnProperty(key)) {
return;
}
const _item = ActionModel[key];
if(_item && _item['dataaccaction'] && UIService && data && Object.keys(data).length >0){
let dataActionResult:any = UIService.getAllOPPrivs(data)[_item['dataaccaction']];
// 无权限:0;有权限:1
if(!dataActionResult){
// 禁用:1;隐藏:2;隐藏且默认隐藏:6
if(_item.noprivdisplaymode === 1){
_item.disabled = true;
}
if((_item.noprivdisplaymode === 2) || (_item.noprivdisplaymode === 6)){
_item.visabled = false;
}else{
_item.visabled = true;
}
}else{
_item.visabled = true;
_item.disabled = false;
}
}
}
}
/**
* 组件销毁
*
* @memberof AppActionBar
*/
public destory(){
if (this.viewStateEvent) {
this.viewStateEvent.unsubscribe();
}
}
}
</script>
......
app_web/src/components/app-menu-item/app-menu-item.vue 0 → 100644
浏览文件 @ 6d2e2ea2
<template>
<div class="app-menu-item">
<template v-for="item in menus">
<template v-if="item.items && Array.isArray(item.items) && item.items.length > 0">
<el-submenu v-show="!item.hidden" :index="item.name" :popper-class="popperClass" :key="item.id">
<template slot='title'>
<template v-if="item.icon && item.icon != ''">
<img :src="item.icon" class='app-menu-icon' />
</template>
<template v-else-if="item.iconcls && item.iconcls != ''">
<i :class="[item.iconcls, 'app-menu-icon']"></i>
</template>
<template v-else-if="isFirst">
<i class='fa fa-cogs app-menu-icon'></i>
</template>
<span class='text' :title="$t(`app.menus.${ctrlName}.${item.name}`)">{{$t(`app.menus.${ctrlName}.${item.name}`)}}</span>
</template>
<app-menu-item :menus="item.items" :ctrlName="ctrlName" :isFirst="false" :counterdata="counterdata" :popperclass="popperClass"></app-menu-item>
</el-submenu>
</template>
<template v-else>
<template v-if="item.type =='MENUITEM'">
<el-menu-item v-show="!item.hidden" :index="item.name" :key="item.id">
<template v-if="item.icon && item.icon != ''">
<img :src="item.icon" class='app-menu-icon' />
</template>
<template v-else-if="item.iconcls && item.iconcls != ''">
<i :class="[item.iconcls, 'app-menu-icon']"></i>
</template>
<template v-else-if="isFirst">
<i class='fa fa-cogs app-menu-icon'></i>
</template>
<template slot="title">
<span class="text" :title="$t(`app.menus.${ctrlName}.${item.name}`)">{{$t(`app.menus.${ctrlName}.${item.name}`)}}</span>
<template v-if="counterdata && counterdata[item.counterid] && counterdata[item.counterid] > 0">
<span class="pull-right">
<badge :count="counterdata[item.counterid]" :overflow-count="9999"></badge>
</span>
</template>
</template>
</el-menu-item>
</template>
<template v-if="item.type =='SEPERATOR'">
<divider :key="item.id" />
</template>
</template>
</template>
</div>
</template>
<script lang="ts">
import { Component, Vue, Prop } from 'vue-property-decorator';
@Component({})
export default class AppMenuItem extends Vue {
/**
* 菜单数据
*
* @type {*}
* @memberof AppMenuItem
*/
@Prop( {default: []} ) public menus!: any;
/**
* 部件名称
*
* @type {*}
* @memberof AppMenuItem
*/
@Prop() public ctrlName!: string;
/**
* 计数器数据
*
* @type {*}
* @memberof AppMenuItem
*/
@Prop() public counterdata!: any;
/**
* 提示框主题样式
*
* @type {*}
* @memberof AppMenuItem
*/
@Prop() public popperClass!: any;
/**
* 是否是一级菜单
*
* @type {*}
* @memberof AppMenuItem
*/
@Prop() public isFirst!: boolean;
}
</script>
\ No newline at end of file
app_web/src/pages/uaa/sys-app-edit-view/sys-app-edit-view-base.vue
浏览文件 @ 6d2e2ea2
......@@ -97,7 +97,7 @@ export default class SysAppEditViewBase extends Vue {
public appEntityService: SysAppService = new SysAppService;
/**
* 实体权限服务对象
* 实体UI服务对象
*
* @type SysAppUIService
* @memberof SysAppEditViewBase
......
app_web/src/pages/uaa/sys-app-grid-view/sys-app-grid-view-base.vue
浏览文件 @ 6d2e2ea2
......@@ -155,7 +155,7 @@ export default class SysAppGridViewBase extends Vue {
public appEntityService: SysAppService = new SysAppService;
/**
* 实体权限服务对象
* 实体UI服务对象
*
* @type SysAppUIService
* @memberof SysAppGridViewBase
......@@ -1349,7 +1349,7 @@ export default class SysAppGridViewBase extends Vue {
public NewRow(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
const data: any = {};
if (_this.newRow && _this.newRow instanceof Function) {
if (_this.hasOwnProperty('newRow') && _this.newRow instanceof Function) {
_this.newRow([{ ...data }], params, $event, xData);
} else if(xData.newRow && xData.newRow instanceof Function) {
xData.newRow([{ ...data }], params, $event, xData);
......
app_web/src/pages/uaa/sys-auth-log-grid-view/sys-auth-log-grid-view-base.vue
浏览文件 @ 6d2e2ea2
......@@ -93,7 +93,7 @@ export default class SysAuthLogGridViewBase extends Vue {
public appEntityService: SysAuthLogService = new SysAuthLogService;
/**
* 实体权限服务对象
* 实体UI服务对象
*
* @type SysAuthLogUIService
* @memberof SysAuthLogGridViewBase
......
app_web/src/pages/uaa/sys-permissionedit-view/sys-permissionedit-view-base.vue
浏览文件 @ 6d2e2ea2
......@@ -97,7 +97,7 @@ export default class SYS_PERMISSIONEditViewBase extends Vue {
public appEntityService: SysPermissionService = new SysPermissionService;
/**
* 实体权限服务对象
* 实体UI服务对象
*
* @type SysPermissionUIService
* @memberof SYS_PERMISSIONEditViewBase
......
app_web/src/pages/uaa/sys-permissionedit-view2/sys-permissionedit-view2-base.vue
浏览文件 @ 6d2e2ea2
......@@ -108,7 +108,7 @@ export default class SYS_PERMISSIONEditView2Base extends Vue {
public appEntityService: SysPermissionService = new SysPermissionService;
/**
* 实体权限服务对象
* 实体UI服务对象
*
* @type SysPermissionUIService
* @memberof SYS_PERMISSIONEditView2Base
......
app_web/src/pages/uaa/sys-permissiongrid-view/sys-permissiongrid-view-base.vue
浏览文件 @ 6d2e2ea2
......@@ -134,7 +134,7 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
public appEntityService: SysPermissionService = new SysPermissionService;
/**
* 实体权限服务对象
* 实体UI服务对象
*
* @type SysPermissionUIService
* @memberof SYS_PERMISSIONGridViewBase
......@@ -1295,7 +1295,7 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
public NewRow(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
const data: any = {};
if (_this.newRow && _this.newRow instanceof Function) {
if (_this.hasOwnProperty('newRow') && _this.newRow instanceof Function) {
_this.newRow([{ ...data }], params, $event, xData);
} else if(xData.newRow && xData.newRow instanceof Function) {
xData.newRow([{ ...data }], params, $event, xData);
......
app_web/src/pages/uaa/sys-permissionmpickup-view/sys-permissionmpickup-view-base.vue
浏览文件 @ 6d2e2ea2
......@@ -91,7 +91,7 @@ export default class SYS_PERMISSIONMPickupViewBase extends Vue {
public appEntityService: SysPermissionService = new SysPermissionService;
/**
* 实体权限服务对象
* 实体UI服务对象
*
* @type SysPermissionUIService
* @memberof SYS_PERMISSIONMPickupViewBase
......
app_web/src/pages/uaa/sys-permissionpickup-grid-view/sys-permissionpickup-grid-view-base.vue
浏览文件 @ 6d2e2ea2
......@@ -73,7 +73,7 @@ export default class SYS_PERMISSIONPickupGridViewBase extends Vue {
public appEntityService: SysPermissionService = new SysPermissionService;
/**
* 实体权限服务对象
* 实体UI服务对象
*
* @type SysPermissionUIService
* @memberof SYS_PERMISSIONPickupGridViewBase
......
app_web/src/pages/uaa/sys-permissionpickup-view/sys-permissionpickup-view-base.vue
浏览文件 @ 6d2e2ea2
......@@ -58,7 +58,7 @@ export default class SYS_PERMISSIONPickupViewBase extends Vue {
public appEntityService: SysPermissionService = new SysPermissionService;
/**
* 实体权限服务对象
* 实体UI服务对象
*
* @type SysPermissionUIService
* @memberof SYS_PERMISSIONPickupViewBase
......
app_web/src/pages/uaa/sys-permissionredirect-view/sys-permissionredirect-view-base.vue
浏览文件 @ 6d2e2ea2
......@@ -34,7 +34,7 @@ export default class SYS_PERMISSIONRedirectViewBase extends Vue {
public appEntityService: SysPermissionService = new SysPermissionService;
/**
* 实体权限服务对象
* 实体UI服务对象
*
* @type SysPermissionUIService
* @memberof SYS_PERMISSIONRedirectViewBase
......
app_web/src/pages/uaa/sys-role-edit-view/sys-role-edit-view-base.vue
浏览文件 @ 6d2e2ea2
......@@ -97,7 +97,7 @@ export default class SysRoleEditViewBase extends Vue {
public appEntityService: SysRoleService = new SysRoleService;
/**
* 实体权限服务对象
* 实体UI服务对象
*
* @type SysRoleUIService
* @memberof SysRoleEditViewBase
......
app_web/src/pages/uaa/sys-role-edit-view2/sys-role-edit-view2-base.vue
浏览文件 @ 6d2e2ea2
......@@ -108,7 +108,7 @@ export default class SysRoleEditView2Base extends Vue {
public appEntityService: SysRoleService = new SysRoleService;
/**
* 实体权限服务对象
* 实体UI服务对象
*
* @type SysRoleUIService
* @memberof SysRoleEditView2Base
......
app_web/src/pages/uaa/sys-role-grid-view/sys-role-grid-view-base.vue
浏览文件 @ 6d2e2ea2
......@@ -134,7 +134,7 @@ export default class SysRoleGridViewBase extends Vue {
public appEntityService: SysRoleService = new SysRoleService;
/**
* 实体权限服务对象
* 实体UI服务对象
*
* @type SysRoleUIService
* @memberof SysRoleGridViewBase
......@@ -1295,7 +1295,7 @@ export default class SysRoleGridViewBase extends Vue {
public NewRow(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
const data: any = {};
if (_this.newRow && _this.newRow instanceof Function) {
if (_this.hasOwnProperty('newRow') && _this.newRow instanceof Function) {
_this.newRow([{ ...data }], params, $event, xData);
} else if(xData.newRow && xData.newRow instanceof Function) {
xData.newRow([{ ...data }], params, $event, xData);
......
app_web/src/pages/uaa/sys-role-permission-custom-view/sys-role-permission-custom-view-base.vue
浏览文件 @ 6d2e2ea2
......@@ -40,7 +40,7 @@ export default class SysRolePermissionCustomViewBase extends Vue {
public appEntityService: SysRolePermissionService = new SysRolePermissionService;
/**
* 实体权限服务对象
* 实体UI服务对象
*
* @type SysRolePermissionUIService
* @memberof SysRolePermissionCustomViewBase
......
app_web/src/pages/uaa/sys-role-permission-grid-view/sys-role-permission-grid-view-base.vue
浏览文件 @ 6d2e2ea2
......@@ -131,7 +131,7 @@ export default class SysRolePermissionGridViewBase extends Vue {
public appEntityService: SysRolePermissionService = new SysRolePermissionService;
/**
* 实体权限服务对象
* 实体UI服务对象
*
* @type SysRolePermissionUIService
* @memberof SysRolePermissionGridViewBase
......@@ -1320,7 +1320,7 @@ export default class SysRolePermissionGridViewBase extends Vue {
public NewRow(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
const data: any = {};
if (_this.newRow && _this.newRow instanceof Function) {
if (_this.hasOwnProperty('newRow') && _this.newRow instanceof Function) {
_this.newRow([{ ...data }], params, $event, xData);
} else if(xData.newRow && xData.newRow instanceof Function) {
xData.newRow([{ ...data }], params, $event, xData);
......
app_web/src/pages/uaa/sys-role-permission-mpickup-view/sys-role-permission-mpickup-view-base.vue
浏览文件 @ 6d2e2ea2
......@@ -91,7 +91,7 @@ export default class SysRolePermissionMPickupViewBase extends Vue {
public appEntityService: SysRolePermissionService = new SysRolePermissionService;
/**
* 实体权限服务对象
* 实体UI服务对象
*
* @type SysRolePermissionUIService
* @memberof SysRolePermissionMPickupViewBase
......
app_web/src/pages/uaa/sys-role-permission-pickup-view/sys-role-permission-pickup-view-base.vue
浏览文件 @ 6d2e2ea2
......@@ -58,7 +58,7 @@ export default class SysRolePermissionPickupViewBase extends Vue {
public appEntityService: SysRolePermissionService = new SysRolePermissionService;
/**
* 实体权限服务对象
* 实体UI服务对象
*
* @type SysRolePermissionUIService
* @memberof SysRolePermissionPickupViewBase
......
app_web/src/pages/uaa/sys-role-permission-redirect-view/sys-role-permission-redirect-view-base.vue
浏览文件 @ 6d2e2ea2
......@@ -34,7 +34,7 @@ export default class SysRolePermissionRedirectViewBase extends Vue {
public appEntityService: SysRolePermissionService = new SysRolePermissionService;
/**
* 实体权限服务对象
* 实体UI服务对象
*
* @type SysRolePermissionUIService
* @memberof SysRolePermissionRedirectViewBase
......
app_web/src/pages/uaa/sys-role-permissionedit-view/sys-role-permissionedit-view-base.vue
浏览文件 @ 6d2e2ea2
......@@ -97,7 +97,7 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue {
public appEntityService: SysRolePermissionService = new SysRolePermissionService;
/**
* 实体权限服务对象
* 实体UI服务对象
*
* @type SysRolePermissionUIService
* @memberof SYS_ROLE_PERMISSIONEditViewBase
......
app_web/src/pages/uaa/sys-role-permissionedit-view2/sys-role-permissionedit-view2-base.vue
浏览文件 @ 6d2e2ea2
......@@ -108,7 +108,7 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue {
public appEntityService: SysRolePermissionService = new SysRolePermissionService;
/**
* 实体权限服务对象
* 实体UI服务对象
*
* @type SysRolePermissionUIService
* @memberof SYS_ROLE_PERMISSIONEditView2Base
......
app_web/src/pages/uaa/sys-role-permissionpickup-grid-view/sys-role-permissionpickup-grid-view-base.vue
浏览文件 @ 6d2e2ea2
......@@ -73,7 +73,7 @@ export default class SYS_ROLE_PERMISSIONPickupGridViewBase extends Vue {
public appEntityService: SysRolePermissionService = new SysRolePermissionService;
/**
* 实体权限服务对象
* 实体UI服务对象
*
* @type SysRolePermissionUIService
* @memberof SYS_ROLE_PERMISSIONPickupGridViewBase
......
app_web/src/pages/uaa/sys-role-pickup-grid-view/sys-role-pickup-grid-view-base.vue
浏览文件 @ 6d2e2ea2
......@@ -73,7 +73,7 @@ export default class SysRolePickupGridViewBase extends Vue {
public appEntityService: SysRoleService = new SysRoleService;
/**
* 实体权限服务对象
* 实体UI服务对象
*
* @type SysRoleUIService
* @memberof SysRolePickupGridViewBase
......
app_web/src/pages/uaa/sys-rolempickup-view/sys-rolempickup-view-base.vue
浏览文件 @ 6d2e2ea2
......@@ -91,7 +91,7 @@ export default class SYS_ROLEMPickupViewBase extends Vue {
public appEntityService: SysRoleService = new SysRoleService;
/**
* 实体权限服务对象
* 实体UI服务对象
*
* @type SysRoleUIService
* @memberof SYS_ROLEMPickupViewBase
......
app_web/src/pages/uaa/sys-rolepickup-view/sys-rolepickup-view-base.vue
浏览文件 @ 6d2e2ea2
......@@ -58,7 +58,7 @@ export default class SYS_ROLEPickupViewBase extends Vue {
public appEntityService: SysRoleService = new SysRoleService;
/**
* 实体权限服务对象
* 实体UI服务对象
*
* @type SysRoleUIService
* @memberof SYS_ROLEPickupViewBase
......
app_web/src/pages/uaa/sys-roleredirect-view/sys-roleredirect-view-base.vue
浏览文件 @ 6d2e2ea2
......@@ -34,7 +34,7 @@ export default class SYS_ROLERedirectViewBase extends Vue {
public appEntityService: SysRoleService = new SysRoleService;
/**
* 实体权限服务对象
* 实体UI服务对象
*
* @type SysRoleUIService
* @memberof SYS_ROLERedirectViewBase
......
app_web/src/pages/uaa/sys-user-edit-view/sys-user-edit-view-base.vue
浏览文件 @ 6d2e2ea2
......@@ -97,7 +97,7 @@ export default class SysUserEditViewBase extends Vue {
public appEntityService: SysUserService = new SysUserService;
/**
* 实体权限服务对象
* 实体UI服务对象
*
* @type SysUserUIService
* @memberof SysUserEditViewBase
......
app_web/src/pages/uaa/sys-user-grid-view/sys-user-grid-view-base.vue
浏览文件 @ 6d2e2ea2
......@@ -134,7 +134,7 @@ export default class SysUserGridViewBase extends Vue {
public appEntityService: SysUserService = new SysUserService;
/**
* 实体权限服务对象
* 实体UI服务对象
*
* @type SysUserUIService
* @memberof SysUserGridViewBase
......@@ -1295,7 +1295,7 @@ export default class SysUserGridViewBase extends Vue {
public NewRow(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
const data: any = {};
if (_this.newRow && _this.newRow instanceof Function) {
if (_this.hasOwnProperty('newRow') && _this.newRow instanceof Function) {
_this.newRow([{ ...data }], params, $event, xData);
} else if(xData.newRow && xData.newRow instanceof Function) {
xData.newRow([{ ...data }], params, $event, xData);
......
app_web/src/pages/uaa/sys-user-role-edit-view/sys-user-role-edit-view-base.vue
浏览文件 @ 6d2e2ea2
......@@ -97,7 +97,7 @@ export default class SysUserRoleEditViewBase extends Vue {
public appEntityService: SysUserRoleService = new SysUserRoleService;
/**
* 实体权限服务对象
* 实体UI服务对象
*
* @type SysUserRoleUIService
* @memberof SysUserRoleEditViewBase
......
app_web/src/pages/uaa/sys-user-role-edit-view2/sys-user-role-edit-view2-base.vue
浏览文件 @ 6d2e2ea2
......@@ -108,7 +108,7 @@ export default class SysUserRoleEditView2Base extends Vue {
public appEntityService: SysUserRoleService = new SysUserRoleService;
/**
* 实体权限服务对象
* 实体UI服务对象
*
* @type SysUserRoleUIService
* @memberof SysUserRoleEditView2Base
......
app_web/src/pages/uaa/sys-user-rolegrid-view/sys-user-rolegrid-view-base.vue
浏览文件 @ 6d2e2ea2
......@@ -131,7 +131,7 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
public appEntityService: SysUserRoleService = new SysUserRoleService;
/**
* 实体权限服务对象
* 实体UI服务对象
*
* @type SysUserRoleUIService
* @memberof SYS_USER_ROLEGridViewBase
......@@ -1334,7 +1334,7 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
public NewRow(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
const data: any = {};
if (_this.newRow && _this.newRow instanceof Function) {
if (_this.hasOwnProperty('newRow') && _this.newRow instanceof Function) {
_this.newRow([{ ...data }], params, $event, xData);
} else if(xData.newRow && xData.newRow instanceof Function) {
xData.newRow([{ ...data }], params, $event, xData);
......
app_web/src/pages/uaa/sys-user-rolempickup-view/sys-user-rolempickup-view-base.vue
浏览文件 @ 6d2e2ea2
......@@ -91,7 +91,7 @@ export default class SYS_USER_ROLEMPickupViewBase extends Vue {
public appEntityService: SysUserRoleService = new SysUserRoleService;
/**
* 实体权限服务对象
* 实体UI服务对象
*
* @type SysUserRoleUIService
* @memberof SYS_USER_ROLEMPickupViewBase
......
app_web/src/pages/uaa/sys-user-rolepickup-grid-view/sys-user-rolepickup-grid-view-base.vue
浏览文件 @ 6d2e2ea2
......@@ -73,7 +73,7 @@ export default class SYS_USER_ROLEPickupGridViewBase extends Vue {
public appEntityService: SysUserRoleService = new SysUserRoleService;
/**
* 实体权限服务对象
* 实体UI服务对象
*
* @type SysUserRoleUIService
* @memberof SYS_USER_ROLEPickupGridViewBase
......
app_web/src/pages/uaa/sys-user-rolepickup-view/sys-user-rolepickup-view-base.vue
浏览文件 @ 6d2e2ea2
......@@ -58,7 +58,7 @@ export default class SYS_USER_ROLEPickupViewBase extends Vue {
public appEntityService: SysUserRoleService = new SysUserRoleService;
/**
* 实体权限服务对象
* 实体UI服务对象
*
* @type SysUserRoleUIService
* @memberof SYS_USER_ROLEPickupViewBase
......
app_web/src/pages/uaa/sys-user-roleredirect-view/sys-user-roleredirect-view-base.vue
浏览文件 @ 6d2e2ea2
......@@ -34,7 +34,7 @@ export default class SYS_USER_ROLERedirectViewBase extends Vue {
public appEntityService: SysUserRoleService = new SysUserRoleService;
/**
* 实体权限服务对象
* 实体UI服务对象
*
* @type SysUserRoleUIService
* @memberof SYS_USER_ROLERedirectViewBase
......
app_web/src/pages/uaa/sys-useredit-view2/sys-useredit-view2-base.vue
浏览文件 @ 6d2e2ea2
......@@ -108,7 +108,7 @@ export default class SYS_USEREditView2Base extends Vue {
public appEntityService: SysUserService = new SysUserService;
/**
* 实体权限服务对象
* 实体UI服务对象
*
* @type SysUserUIService
* @memberof SYS_USEREditView2Base
......
app_web/src/pages/uaa/sys-usermpickup-view/sys-usermpickup-view-base.vue
浏览文件 @ 6d2e2ea2
......@@ -91,7 +91,7 @@ export default class SYS_USERMPickupViewBase extends Vue {
public appEntityService: SysUserService = new SysUserService;
/**
* 实体权限服务对象
* 实体UI服务对象
*
* @type SysUserUIService
* @memberof SYS_USERMPickupViewBase
......
app_web/src/pages/uaa/sys-userpickup-grid-view/sys-userpickup-grid-view-base.vue
浏览文件 @ 6d2e2ea2
......@@ -73,7 +73,7 @@ export default class SYS_USERPickupGridViewBase extends Vue {
public appEntityService: SysUserService = new SysUserService;
/**
* 实体权限服务对象
* 实体UI服务对象
*
* @type SysUserUIService
* @memberof SYS_USERPickupGridViewBase
......
app_web/src/pages/uaa/sys-userpickup-view/sys-userpickup-view-base.vue
浏览文件 @ 6d2e2ea2
......@@ -58,7 +58,7 @@ export default class SYS_USERPickupViewBase extends Vue {
public appEntityService: SysUserService = new SysUserService;
/**
* 实体权限服务对象
* 实体UI服务对象
*
* @type SysUserUIService
* @memberof SYS_USERPickupViewBase
......
app_web/src/pages/uaa/sys-userredirect-view/sys-userredirect-view-base.vue
浏览文件 @ 6d2e2ea2
......@@ -34,7 +34,7 @@ export default class SYS_USERRedirectViewBase extends Vue {
public appEntityService: SysUserService = new SysUserService;
/**
* 实体权限服务对象
* 实体UI服务对象
*
* @type SysUserUIService
* @memberof SYS_USERRedirectViewBase
......
app_web/src/service/entity-service.ts
浏览文件 @ 6d2e2ea2
......@@ -294,7 +294,8 @@ export default class EntityService {
let result:any = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_'+this.APPDENAME) as any);
if(result){
let tempResult:any = result.filter((item:any) =>{
return !( Object.is(item[this.APPDEKEY],data[this.APPDEKEY]) && Object.is(item[this.APPDETEXT],data[this.APPDETEXT]));
// return !( Object.is(item[this.APPDEKEY],data[this.APPDEKEY]) && Object.is(item[this.APPDETEXT],data[this.APPDETEXT]));
return !Object.is(item[this.APPDEKEY],data[this.APPDEKEY]);
})
this.tempStorage.setItem(context.srfsessionkey+'_'+this.APPDENAME,JSON.stringify(tempResult));
return {"status":200,"data":data};
......@@ -596,6 +597,19 @@ export default class EntityService {
return Http.getInstance().post(`/${this.APPDENAME}/batch`,data,isloading);
}
/**
* saveBatch接口方法
*
* @param {*} [context={}]
* @param {*} [data]
* @param {boolean} [isloading]
* @returns {Promise<any>}
* @memberof EntityService
*/
public async saveBatch(context: any = {},data: any, isloading?: boolean): Promise<any> {
return Http.getInstance().post(`/${this.APPDENAME}/savebatch`,data,isloading);
}
/**
* updateBatch接口方法
*
......
app_web/src/widgets/app/main-appmenu/main-appmenu-base.vue
浏览文件 @ 6d2e2ea2
......@@ -8,111 +8,7 @@
:collapse="isCollapse"
@select="select"
:default-active="defaultActive">
<template v-for="item0 in menus">
<template v-if="item0.items && Array.isArray(item0.items) && item0.items.length > 0">
<el-submenu v-show="!item0.hidden" :index="item0.name" :popper-class="popperClass" :key="item0.id">
<template slot='title'>
<template v-if="item0.icon && item0.icon != ''">
<img :src="item0.icon" class='app-menu-icon' />
</template>
<template v-else-if="item0.iconcls && item0.iconcls != ''">
<i :class="[item0.iconcls, 'app-menu-icon']"></i>
</template>
<template v-else>
<i class='fa fa-cogs app-menu-icon'></i>
</template>
<span class='text' :title="$t('app.menus.main.' + item0.name)">{{$t('app.menus.main.' + item0.name)}}</span>
</template>
<template v-for="item1 in item0.items">
<template v-if="item1.items && Array.isArray(item1.items) && item1.items.length > 0">
<el-submenu v-show="!item1.hidden" :index="item1.name" :popper-class="popperClass" :key="item1.id">
<template slot='title'>
<template v-if="item1.icon && item1.icon != ''">
<img :src="item1.icon" class='app-menu-icon' />
</template>
<template v-else-if="item1.iconcls && item1.iconcls != ''">
<i :class="[item1.iconcls, 'app-menu-icon']"></i>
</template>
<span class='text' :title="$t('app.menus.main.' + item1.name)">{{$t('app.menus.main.' + item1.name)}}</span>
</template>
<template v-for="item2 in item1.items">
<template v-if="item2.type =='MENUITEM'">
<el-menu-item v-show="!item2.hidden" :index="item2.name" :key="item2.id">
<template v-if="item2.icon && item2.icon != ''">
<img :src="item2.icon" class='app-menu-icon' />
</template>
<template v-else-if="item2.iconcls && item2.iconcls != ''">
<i :class="[item2.iconcls, 'app-menu-icon']"></i>
</template>
<template slot="title">
<span class="text" :title="$t('app.menus.main.' + item2.name)">{{$t('app.menus.main.' + item2.name)}}</span>
<template v-if="counterdata && counterdata[item2.counterid] && counterdata[item2.counterid] > 0">
<span class="pull-right">
<badge :count="counterdata[item2.counterid]" :overflow-count="9999"></badge>
</span>
</template>
</template>
</el-menu-item>
</template>
<template v-if="item2.type =='SEPERATOR'">
<divider :key="item2.id" />
</template>
</template>
</el-submenu>
</template>
<template v-else>
<template v-if="item1.type =='MENUITEM'">
<el-menu-item v-show="!item1.hidden" :index="item1.name" :key="item1.id">
<template v-if="item1.icon && item1.icon != ''">
<img :src="item1.icon" class='app-menu-icon' />
</template>
<template v-else-if="item1.iconcls && item1.iconcls != ''">
<i :class="[item1.iconcls, 'app-menu-icon']"></i>
</template>
<template slot="title">
<span class="text" :title="$t('app.menus.main.' + item1.name)">{{$t('app.menus.main.' + item1.name)}} </span>
<template v-if="counterdata && counterdata[item1.counterid] && counterdata[item1.counterid] > 0">
<span class="pull-right">
<badge :count="counterdata[item1.counterid]" :overflow-count="9999"></badge>
</span>
</template>
</template>
</el-menu-item>
</template>
<template v-if="item1.type =='SEPERATOR'">
<divider :key="item1.id" />
</template>
</template>
</template>
</el-submenu>
</template>
<template v-else>
<template v-if="item0.type =='MENUITEM'">
<el-menu-item v-show="!item0.hidden" :index="item0.name" :key="item0.id">
<template v-if="item0.icon && item0.icon != ''">
<img :src="item0.icon" class='app-menu-icon' />
</template>
<template v-else-if="item0.iconcls && item0.iconcls != ''">
<i :class="[item0.iconcls, 'app-menu-icon']"></i>
</template>
<template v-else>
<i class='fa fa-cogs app-menu-icon'></i>
</template>
<template slot="title">
<span class="text" :title="$t('app.menus.main.' + item0.name)">{{$t('app.menus.main.' + item0.name)}}</span>
<template v-if="counterdata && counterdata[item0.counterid] && counterdata[item0.counterid] > 0">
<span class="pull-right">
<badge :count="counterdata[item0.counterid]" :overflow-count="9999"></badge>
</span>
</template>
</template>
</el-menu-item>
</template>
<template v-if="item0.type =='SEPERATOR'">
<divider :key="item0.id" />
</template>
</template>
</template>
<app-menu-item :menus="menus" :ctrlName="'main'" :isFirst="true" :counterdata="counterdata" :popperclass="popperClass"></app-menu-item>
</el-menu>
</div>
</template>
......
config.xml
浏览文件 @ 6d2e2ea2
......@@ -37,11 +37,6 @@
git clone -b master $para2 ibzuaa/
export NODE_OPTIONS=--max-old-space-size=4096
cd ibzuaa/
mvn clean package -Pweb
cd ibzuaa-app/ibzuaa-app-web
mvn -Pweb docker:build
mvn -Pweb docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/ibzuaa-app-web.yaml ibzlab-rt --with-registry-auth
</command>
</hudson.tasks.Shell>
</builders>
......
ibzuaa-app/ibzuaa-app-web/src/main/docker/Dockerfile
浏览文件 @ 6d2e2ea2
......@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzuaa-app-web.jar
EXPOSE 30002
EXPOSE 8080
ADD ibzuaa-app-web.jar /ibzuaa-app-web.jar
ibzuaa-app/ibzuaa-app-web/src/main/docker/ibzuaa-app-web.yaml
浏览文件 @ 6d2e2ea2
......@@ -3,24 +3,9 @@ services:
ibzuaa-app-web:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-app-web:latest
ports:
- "30002:30002"
- "8080:8080"
networks:
- agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
- SERVER_PORT=30002
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211:8848
- SPRING_REDIS_HOST=172.16.100.243
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
- SPRING_DATASOURCE_PASSWORD=@6dEfb3@
- SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
- SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
- ABC=1
- DEC=3
- NACOS=172.16.102.211:8848
deploy:
resources:
limits:
......
ibzuaa-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 6d2e2ea2
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<!--输出实体[SYS_AUTHLOG]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-sys_authlog-40-1">
<createTable tableName="IBZAUTHLOG">
<column name="LOGID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_AUTHLOG_LOGID"/>
</column>
<column name="USERNAME" remarks="" type="VARCHAR(100)">
</column>
<column name="PERSONNAME" remarks="" type="VARCHAR(100)">
</column>
<column name="DOMAIN" remarks="" type="VARCHAR(100)">
</column>
<column name="AUTHTIME" remarks="" type="DATETIME">
</column>
<column name="IPADDR" remarks="" type="VARCHAR(100)">
</column>
<column name="MACADDR" remarks="" type="VARCHAR(100)">
</column>
<column name="USERAGENT" remarks="" type="VARCHAR(100)">
</column>
<column name="AUTHCODE" remarks="" type="VARCHAR(15)">
</column>
</createTable>
</changeSet>
<!--输出实体[SYS_PSSYSTEM]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-sys_pssystem-39-2">
<createTable tableName="IBZPSSYSTEM">
<column name="PSSYSTEMID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_PSSYSTEM_PSSYSTEMID"/>
</column>
<column name="PSSYSTEMNAME" remarks="" type="VARCHAR(100)">
</column>
<column name="SYSSTRUCTURE" remarks="" type="TEXT(1048576)">
</column>
<column name="APPS" remarks="" type="TEXT(1048576)">
</column>
<column name="MD5CHECK" remarks="" type="VARCHAR(100)">
</column>
<column name="SHOWORDER" remarks="" type="INT">
</column>
</createTable>
</changeSet>
<!--输出实体[SYS_PERMISSION]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-sys_permission-219-3">
<createTable tableName="IBZPERMISSION">
<column name="SYS_PERMISSIONID" remarks="" type="VARCHAR(200)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_PERMISSION_SYS_PERMISSI"/>
</column>
<column name="SYS_PERMISSIONNAME" remarks="" type="VARCHAR(200)">
</column>
<column name="PERMISSIONTYPE" remarks="" type="VARCHAR(60)">
</column>
<column name="PSSYSTEMID" remarks="" type="VARCHAR(100)">
</column>
<column name="ENABLE" remarks="" type="INT">
</column>
<column name="CREATEDATE" remarks="" type="DATETIME">
</column>
<column name="UPDATEDATE" remarks="" type="DATETIME">
</column>
</createTable>
</changeSet>
<!--输出实体[SYS_ROLE]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-sys_role-94-4">
<createTable tableName="IBZROLE">
<column name="SYS_ROLEID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_ROLE_SYS_ROLEID"/>
</column>
<column name="SYS_ROLENAME" remarks="" type="VARCHAR(200)">
</column>
<column name="MEMO" remarks="" type="VARCHAR(100)">
</column>
<column name="CREATEDATE" remarks="" type="DATETIME">
</column>
<column name="UPDATEDATE" remarks="" type="DATETIME">
</column>
</createTable>
</changeSet>
<!--输出实体[SYS_ROLE_PERMISSION]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-sys_role_permission-98-5">
<createTable tableName="IBZROLE_PERMISSION">
<column name="SYS_ROLE_PERMISSIONID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_ROLE_PERMISSION_SYS_ROL"/>
</column>
<column name="SYS_ROLEID" remarks="" type="VARCHAR(100)">
</column>
<column name="SYS_PERMISSIONID" remarks="" type="VARCHAR(200)">
</column>
<column name="CREATEDATE" remarks="" type="DATETIME">
</column>
<column name="UPDATEDATE" remarks="" type="DATETIME">
</column>
</createTable>
</changeSet>
<!--输出实体[SYS_USER_ROLE]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-sys_user_role-72-6">
<createTable tableName="IBZUSER_ROLE">
<column name="SYS_USER_ROLEID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_USER_ROLE_SYS_USER_ROLE"/>
</column>
<column name="SYS_ROLEID" remarks="" type="VARCHAR(100)">
</column>
<column name="SYS_USERID" remarks="" type="VARCHAR(100)">
</column>
<column name="CREATEDATE" remarks="" type="DATETIME">
</column>
<column name="UPDATEDATE" remarks="" type="DATETIME">
</column>
</createTable>
</changeSet>
<!--输出实体[SYS_AUTHLOG]外键关系 -->
<!--输出实体[SYS_PSSYSTEM]外键关系 -->
<!--输出实体[SYS_PERMISSION]外键关系 -->
<!--输出实体[SYS_ROLE]外键关系 -->
<!--输出实体[SYS_ROLE_PERMISSION]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-sys_role_permission-98-7">
<addForeignKeyConstraint baseColumnNames="SYS_PERMISSIONID" baseTableName="IBZROLE_PERMISSION" constraintName="DER1N_SYS_ROLE_PERMISSION_SYS_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SYS_PERMISSIONID" referencedTableName="IBZPERMISSION" validate="true"/>
</changeSet>
<!--输出实体[SYS_USER_ROLE]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-sys_user_role-72-9">
<addForeignKeyConstraint baseColumnNames="SYS_ROLEID" baseTableName="IBZUSER_ROLE" constraintName="DER1N_SYS_USER_ROLE_SYS_ROLE_S" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SYS_ROLEID" referencedTableName="IBZROLE" validate="true"/>
</changeSet>
</databaseChangeLog>
!!!!模版产生代码错误:----
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: ${dbinst.getUserName()} [in template "CODETEMPL_zh_CN" at line 28, column 24]
----
\ No newline at end of file
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或