Skip to content

I
ibzrt
提交 c2526507 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

ibiz4j 发布系统代码

上级 c88c5b04
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 1972 行增加 和 12 行删除
app_Web/src/locale/lanres/entities/sys-user-auth/sys-user-auth_en_US.ts
浏览文件 @ c2526507
......@@ -24,6 +24,7 @@ export default {
formpage1: "基本信息",
srforikey: "",
srfkey: "标识",
srfmajortext: "人员",
srftempmode: "",
srfuf: "",
srfdeid: "",
......@@ -51,6 +52,8 @@ export default {
default_searchform: {
details: {
formpage1: "常规条件",
n_username_eq: "人员",
n_userid_eq: "",
},
uiactions: {
},
......
app_Web/src/locale/lanres/entities/sys-user-auth/sys-user-auth_zh_CN.ts
浏览文件 @ c2526507
......@@ -23,6 +23,7 @@ export default {
formpage1: "基本信息",
srforikey: "",
srfkey: "标识",
srfmajortext: "人员",
srftempmode: "",
srfuf: "",
srfdeid: "",
......@@ -50,6 +51,8 @@ export default {
default_searchform: {
details: {
formpage1: "常规条件",
n_username_eq: "人员",
n_userid_eq: "",
},
uiactions: {
},
......
app_Web/src/pages/uaa/sys-user-auth-edit-view/sys-user-auth-edit-view-base.vue
浏览文件 @ c2526507
......@@ -311,6 +311,7 @@ export default class SysUserAuthEditViewBase extends Vue {
form: this.$refs.form,
p2k: '0',
keyPSDEField: 'sysuserauth',
majorPSDEField: 'username',
isLoadDefault: true,
});
}
......
app_Web/src/pages/uaa/sys-user-auth-grid-view/sys-user-auth-grid-view-base.vue
浏览文件 @ c2526507
......@@ -9,7 +9,7 @@
<div class='view-top-messages'>
</div>
<div style='margin-bottom: 6px;'>
<i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' placeholder="" />
<i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' placeholder="人员" />
<div class='pull-right'>
<div class='toolbar-container'>
<tooltip :transfer="true" :max-width="600">
......@@ -404,6 +404,7 @@ export default class SysUserAuthGridViewBase extends Vue {
grid: this.$refs.grid,
searchform: this.$refs.searchform,
keyPSDEField: 'sysuserauth',
majorPSDEField: 'username',
isLoadDefault: true,
});
}
......
app_Web/src/service/sys-user-auth/sys-user-auth-service-base.ts
浏览文件 @ c2526507
......@@ -31,7 +31,7 @@ export default class SysUserAuthServiceBase extends EntityService {
this.APPLYDEKEY ='sysuserauth';
this.APPDEKEY = 'id';
this.APPDENAME = 'sysuserauths';
this.APPDETEXT = '';
this.APPDETEXT = 'username';
this.APPNAME = 'web';
this.SYSTEMNAME = 'ibzrt';
}
......
app_Web/src/store/modules/view-action/state.ts
浏览文件 @ c2526507
......@@ -752,6 +752,7 @@ export const viewstate: any = {
viewdatachange: false,
refviews: [
'1ee5253453314436a2c78ca1dfa87bc6',
'32fe9ab4a9e1b8d62b9ee802e4746965',
],
},
],
......
app_Web/src/widgets/sys-user-auth/default-searchform/default-searchform-base.vue
浏览文件 @ c2526507
......@@ -4,7 +4,34 @@
<row>
<i-col span="20" class="form-content">
<row>
</row>
<i-col v-show="detailsModel.n_username_eq.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='n_username_eq' :itemRules="this.rules.n_username_eq" class='' :caption="$t('entities.sysuserauth.default_searchform.details.n_username_eq')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_username_eq.error" :isEmptyCaption="false" labelPos="LEFT">
<app-picker
:formState="formState"
:data="data"
:context="context"
:viewparams="viewparams"
:localContext ='{ }'
:localParam ='{ }'
:disabled="detailsModel.n_username_eq.disabled"
name='n_username_eq'
deMajorField='personname'
deKeyField='sysuser'
:service="service"
:acParams="{ serviceName: 'SysUserService', interfaceName: 'FetchDefault'}"
valueitem='n_userid_eq'
:value="data.n_username_eq"
editortype=""
:pickupView="{ viewname: 'sys-user-pickup-view', title: $t('entities.sysuser.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'sysusers', parameterName: 'sysuser' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
style=""
@formitemvaluechange="onFormItemValueChange">
</app-picker>
</app-form-item>
</i-col>
</row>
</i-col>
<i-col span="4" class="search-button">
<row v-show="Object.keys(data).length>0">
......@@ -260,6 +287,8 @@ export default class DefaultBase extends Vue implements ControlInterface {
* @memberof DefaultBase
*/
public data: any = {
n_username_eq: null,
n_userid_eq: null,
};
/**
......@@ -269,6 +298,18 @@ export default class DefaultBase extends Vue implements ControlInterface {
* @memberof DefaultBase
*/
public rules: any = {
n_username_eq: [
{ type: 'string', message: '人员 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '人员 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '人员 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '人员 值不能为空', trigger: 'blur' },
],
n_userid_eq: [
{ type: 'string', message: ' 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: ' 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: ' 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
],
}
/**
......@@ -279,9 +320,37 @@ export default class DefaultBase extends Vue implements ControlInterface {
*/
public detailsModel: any = {
formpage1: new FormPageModel({ caption: '常规条件', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this })
,
n_username_eq: new FormItemModel({ caption: '人员', detailType: 'FORMITEM', name: 'n_username_eq', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
n_userid_eq: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'n_userid_eq', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
};
/**
* 监控表单属性 n_username_eq 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof DefaultBase
*/
@Watch('data.n_username_eq')
onN_username_eqChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'n_username_eq', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 n_userid_eq 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof DefaultBase
*/
@Watch('data.n_userid_eq')
onN_userid_eqChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'n_userid_eq', newVal: newVal, oldVal: oldVal });
}
/**
* 重置表单项值
......@@ -303,6 +372,8 @@ export default class DefaultBase extends Vue implements ControlInterface {
public formLogic({ name, newVal, oldVal }: { name: string, newVal: any, oldVal: any }): void {
}
/**
......
app_Web/src/widgets/sys-user-auth/default-searchform/default-searchform-model.ts
浏览文件 @ c2526507
......@@ -25,6 +25,14 @@ export default class DefaultModel {
prop: 'srffrontuf',
dataType: 'TEXT',
},
{
name: 'n_username_eq',
prop: 'username',
dataType: 'PICKUPTEXT',
},
{
name: 'n_userid_eq',
},
]
}
......
app_Web/src/widgets/sys-user-auth/default-searchform/default-searchform-service.ts
浏览文件 @ c2526507
......@@ -2,6 +2,7 @@ import { Http,Util,Errorlog } from '@/utils';
import ControlService from '@/widgets/control-service';
import SysUserAuthService from '@/service/sys-user-auth/sys-user-auth-service';
import DefaultModel from './default-searchform-model';
import SysUserService from '@/service/sys-user/sys-user-service';
/**
......@@ -41,6 +42,14 @@ export default class DefaultService extends ControlService {
this.model = new DefaultModel();
}
/**
* 系统用户服务对象
*
* @type {SysUserService}
* @memberof DefaultService
*/
public sysuserService: SysUserService = new SysUserService();
/**
* 处理数据
*
......@@ -82,6 +91,9 @@ export default class DefaultService extends ControlService {
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;
if (Object.is(serviceName, 'SysUserService') && Object.is(interfaceName, 'FetchDefault')) {
return this.doItems(this.sysuserService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'userid', 'sysuser');
}
return Promise.reject([])
}
......
app_Web/src/widgets/sys-user-auth/main-form/main-form-base.vue
浏览文件 @ c2526507
......@@ -420,6 +420,7 @@ export default class MainBase extends Vue implements ControlInterface {
public data: any = {
srforikey: null,
srfkey: null,
srfmajortext: null,
srftempmode: null,
srfuf: null,
srfdeid: null,
......@@ -485,6 +486,12 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: false, type: 'string', message: '标识 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '标识 值不能为空', trigger: 'blur' },
],
srfmajortext: [
{ type: 'string', message: '人员 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '人员 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '人员 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '人员 值不能为空', trigger: 'blur' },
],
srftempmode: [
{ type: 'string', message: ' 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: ' 值必须为字符串类型', trigger: 'blur' },
......@@ -640,6 +647,8 @@ export default class MainBase extends Vue implements ControlInterface {
srforikey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srforikey', visible: true, isShowCaption: true, form: this, isControlledContent: false , disabled: false, enableCond: 3 })
,
srfkey: new FormItemModel({ caption: '标识', detailType: 'FORMITEM', name: 'srfkey', visible: true, isShowCaption: true, form: this, isControlledContent: false , disabled: false, enableCond: 3 })
,
srfmajortext: new FormItemModel({ caption: '人员', detailType: 'FORMITEM', name: 'srfmajortext', visible: true, isShowCaption: true, form: this, isControlledContent: false , disabled: false, enableCond: 3 })
,
srftempmode: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srftempmode', visible: true, isShowCaption: true, form: this, isControlledContent: false , disabled: false, enableCond: 3 })
,
......@@ -687,6 +696,18 @@ export default class MainBase extends Vue implements ControlInterface {
this.formDataChange({ name: 'srfkey', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 srfmajortext 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof MainBase
*/
@Watch('data.srfmajortext')
onSrfmajortextChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'srfmajortext', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 srftempmode 值
*
......@@ -875,6 +896,7 @@ export default class MainBase extends Vue implements ControlInterface {
}
/**
......
app_Web/src/widgets/sys-user-auth/main-form/main-form-model.ts
浏览文件 @ c2526507
......@@ -33,6 +33,11 @@ export default class MainModel {
prop: 'id',
dataType: 'TEXT',
},
{
name: 'srfmajortext',
prop: 'username',
dataType: 'PICKUPTEXT',
},
{
name: 'srftempmode',
},
......
app_Web/src/widgets/sys-user-auth/main-grid/main-grid-model.ts
浏览文件 @ c2526507
......@@ -46,6 +46,11 @@ export default class MainModel {
prop: 'identifier',
dataType: 'TEXT',
},
{
name: 'srfmajortext',
prop: 'username',
dataType: 'PICKUPTEXT',
},
{
name: 'srfdataaccaction',
prop: 'id',
......@@ -66,6 +71,15 @@ export default class MainModel {
name: 'sysuserauth',
prop: 'id',
},
{
name: 'n_username_eq',
prop: 'n_username_eq',
dataType: 'QUERYPARAM'
},
{
name: 'n_userid_eq',
prop: 'n_userid_eq',
},
{
name:'size',
......
ibzrt-util/src/main/java/cn/ibizlab/util/security/AuthorizationTokenFilter.java
浏览文件 @ c2526507
......@@ -32,7 +32,7 @@ public class AuthorizationTokenFilter extends OncePerRequestFilter {
private final UserDetailsService userDetailsService;
private final AuthTokenUtil authTokenUtil;
private final String tokenHeader;
private Set<String> excludesPattern;
private Set<String> excludesPattern = new HashSet<String>();
private PathMatcher pathMatcher = new AntPathMatcher();
public AuthorizationTokenFilter(AuthenticationUserService userDetailsService, AuthTokenUtil authTokenUtil, @Value("${ibiz.jwt.header:Authorization}") String tokenHeader) {
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或