Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibzuaa
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibzuaa
提交
f9b298fe
提交
f9b298fe
编写于
6月 16, 2020
作者:
laizhilong
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'origin/master'
上级
7eed2e17
15fe40a8
变更
14
隐藏空白字符变更
内嵌
并排
正在显示
14 个修改的文件
包含
288 行增加
和
341 行删除
+288
-341
app-form-group.less
app_web/src/components/app-form-group/app-form-group.less
+11
-3
app-form-group.vue
app_web/src/components/app-form-group/app-form-group.vue
+12
-12
app-form-item.less
app_web/src/components/app-form-item/app-form-item.less
+32
-34
app-form-item.vue
app_web/src/components/app-form-item/app-form-item.vue
+227
-214
interceptor.ts
app_web/src/utils/interceptor/interceptor.ts
+4
-1
main-grid-service.ts
app_web/src/widgets/sys-app/main-grid/main-grid-service.ts
+0
-11
main-grid-service.ts
...b/src/widgets/sys-auth-log/main-grid/main-grid-service.ts
+0
-11
main-grid-service.ts
...src/widgets/sys-permission/main-grid/main-grid-service.ts
+0
-11
main-grid-service.ts
...idgets/sys-role-permission/main-grid/main-grid-service.ts
+0
-11
main-grid-service.ts
app_web/src/widgets/sys-role/main-grid/main-grid-service.ts
+0
-11
main-grid-service.ts
.../src/widgets/sys-user-role/main-grid/main-grid-service.ts
+0
-11
main-grid-service.ts
app_web/src/widgets/sys-user/main-grid/main-grid-service.ts
+0
-11
ibzrt_rsa
...a-app/ibzuaa-app-web/src/main/resources/keypair/ibzrt_rsa
+1
-0
ibzrt_rsa.pub
...p/ibzuaa-app-web/src/main/resources/keypair/ibzrt_rsa.pub
+1
-0
未找到文件。
app_web/src/components/app-form-group/app-form-group.less
浏览文件 @
f9b298fe
.app-form-group {
>.ivu-card-head {
>p {
>i {
...
...
@@ -7,9 +8,12 @@
}
}
}
>.ivu-card-extra {
.item-extract-mode {
display: flex;
.item {
margin-left: 12px;
}
...
...
@@ -18,6 +22,7 @@
}
.app-form-group.app-group-collapse-contant {
.ivu-card-body {
display: none;
}
...
...
@@ -25,9 +30,12 @@
.app-group-flex {
height: 100%;
overflow: auto;
> .ivu-card-body {
overflow-y: auto;
overflow-x: hidden;
>.ivu-card-body {
height: calc(100% - 51px);
overflow: auto;
overflow-y: auto;
overflow-x: hidden;
}
}
\ No newline at end of file
app_web/src/components/app-form-group/app-form-group.vue
浏览文件 @
f9b298fe
<
template
>
<div
class=
"app-form-group
"
>
<
div
v-if=
"uiStyle=='STYLE2'"
>
<div
:class=
"classes
"
>
<
template
v-if=
"uiStyle=='STYLE2'"
>
<app-form-group2
:caption=
"caption"
:uiStyle=
"uiStyle"
...
...
@@ -10,8 +10,8 @@
:titleBarCloseMode=
"titleBarCloseMode"
>
<slot></slot>
</app-form-group2>
</
div
>
<
div
v-else
>
</
template
>
<
template
v-else
>
<card
v-if=
"isShowCaption === true"
:bordered=
"false"
:dis-hover=
"true"
:class=
"classes"
>
<p
class=
''
slot=
'title'
>
<icon
v-if=
"titleBarCloseMode !== 0"
:type=
"collapseContant ? 'ios-arrow-dropright-circle' : 'ios-arrow-dropdown-circle'"
...
...
@@ -87,17 +87,17 @@
<
/template
>
<
/a
>
<
/template
>
<
div
v
-
if
=
"Object.is(layoutType, 'FLEX')"
>
<
template
v
-
if
=
"Object.is(layoutType, 'FLEX')"
>
<
slot
><
/slot
>
<
/
div
>
<
div
v
-
if
=
"!Object.is(layoutType, 'FLEX')"
>
<
/
template
>
<
template
v
-
if
=
"!Object.is(layoutType, 'FLEX')"
>
<
row
:
gutter
=
"10"
><
slot
><
/slot></
row
>
<
/
div
>
<
/
template
>
<
/card
>
<
row
v
-
if
=
"isShowCaption === false"
:
class
=
"classes
"
>
<
slot
><
/slot
>
<
/
row
>
<
/
div
>
<
template
v
-
if
=
"isShowCaption === false
"
>
<
slot
><
/slot
>
<
/
template
>
<
/
template
>
<
/div
>
<
/template
>
...
...
app_web/src/components/app-form-item/app-form-item.less
浏览文件 @
f9b298fe
.app-form-item {
// margin-bottom: 16px;
>.ivu-form-item-label {
text-decoration: none;
display: block;
overflow: hidden;
white-space: nowrap;
}
>.ivu-form-item-content {
min-height: 36px;
}
height: 100%;
.editor {
height: 100%;
.ivu-form-item-content {
height: 100%;
min-height: 36px;
}
}
.app-form-item-label {
padding: 6px 12px 6px 0px;
}
}
.app-form-item-label-top {
>.ivu-form-item-label {
float: none;
display: inline-block;
padding: 0 0 10px;
}
.app-form-item.label-top, .app-form-item.label-bottom {
.app-form-item-label {
display: block;
}
}
.app-form-item-label-left{
.app-form-item-label{
float: left;
text-align: right;
padding-right: 12px;
.app-form-item.label-left, .app-form-item.label-right {
.app-form-item-label, .editor {
height: 100%;
}
}
.app-form-item-label-right{
.app-form-item-label{
float: right;
text-align: left;
padding-left: 12px;
.app-form-item.label-left {
.app-form-item-label {
float: left;
}
}
.app-form-item-label-top{
.app-form-item-label{
display: block;
padding-bottom: 10px;
.app-form-item.label-right {
.app-form-item-label {
float: right;
padding-left: 12px;
}
}
.app-form-item-label-bottom{
.app-form-item-label
{
display: block;
padding-top: 10px
;
.app-form-item.label-none
{
.app-form-item-label {
display: none !important
;
}
}
\ No newline at end of file
app_web/src/components/app-form-item/app-form-item.vue
浏览文件 @
f9b298fe
<
template
>
<div>
<
div
v-if=
"this.uiStyle === 'STYLE2'"
>
<app-form-item2
<div
:class=
"classes"
>
<
template
v-if=
"this.uiStyle === 'STYLE2'"
>
<app-form-item2
:caption=
"caption"
:labelStyle=
"labelStyle"
:error=
"error"
...
...
@@ -14,248 +14,261 @@
:itemRules=
"itemRules"
>
<slot></slot>
</app-form-item2>
</div>
<div
v-if=
"this.uiStyle !== 'STYLE2'"
>
<form-item
:prop=
"name"
:error=
"error"
:required=
"required"
:rules=
"rules"
:class=
"classes"
>
<div
v-if=
"Object.is(this.labelPos,'BOTTOM') || Object.is(this.labelPos,'NONE') || !this.labelPos"
class=
"slot-editor"
:style=
"slotstyle"
>
</
template
>
<
template
v-if=
"this.uiStyle !== 'STYLE2'"
>
<div
v-if=
"Object.is(this.labelPos,'BOTTOM') || Object.is(this.labelPos,'NONE') || !this.labelPos"
class=
"editor"
:style=
"slotstyle"
>
<form-item
:prop=
"name"
:error=
"error"
:required=
"required"
:rules=
"rules"
>
<slot></slot>
</div>
<span
v-if=
"!Object.is(this.labelPos,'NONE') && this.isShowCaption && this.labelWidth > 0"
:style=
"labelstyle"
:class=
"labelclasses"
>
{{
this
.
isEmptyCaption
?
''
:
this
.
caption
}}
</span>
<div
v-if=
"Object.is(this.labelPos,'TOP') || Object.is(this.labelPos,'LEFT') || Object.is(this.labelPos,'RIGHT')"
class=
"slot-editor"
:style=
"slotstyle"
>
</form-item>
</div>
<span
v-if=
"!Object.is(this.labelPos,'NONE') && this.isShowCaption && this.labelWidth > 0"
:style=
"labelstyle"
:class=
"labelclasses"
>
<span
v-if=
"required"
style=
"color:red;"
>
*
</span>
{{
this
.
isEmptyCaption
?
''
:
this
.
caption
}}
</span>
<div
v-if=
"Object.is(this.labelPos,'TOP') || Object.is(this.labelPos,'LEFT') || Object.is(this.labelPos,'RIGHT')"
class=
"editor"
:style=
"slotstyle"
>
<form-item
:prop=
"name"
:error=
"error"
:required=
"required"
:rules=
"rules"
>
<slot></slot>
</div
>
</
form-item
>
</
div
>
</form-item
>
</
div
>
</
template
>
</div>
</template>
<
script
lang=
"ts"
>
import
{
Vue
,
Component
,
Prop
,
Watch
}
from
'vue-property-decorator'
;
import
{
Vue
,
Component
,
Prop
,
Watch
}
from
"vue-property-decorator"
;
@
Component
({})
export
default
class
AppFormItem
extends
Vue
{
/**
* 名称
*
* @type {string}
* @memberof AppFormItem
*/
@
Prop
()
public
caption
!
:
string
;
/**
* 名称
*
* @type {string}
* @memberof AppFormItem
*/
@
Prop
()
public
caption
!
:
string
;
/**
* 错误信息
*
* @type {string}
* @memberof AppFormItem
*/
@
Prop
()
public
error
?:
string
;
/**
* 错误信息
*
* @type {string}
* @memberof AppFormItem
*/
@
Prop
()
public
error
?:
string
;
/**
* label样式
*
* @type {string}
* @memberof AppFormItem
*/
@
Prop
()
public
labelStyle
?:
string
;
/**
* label样式
*
* @type {string}
* @memberof AppFormItem
*/
@
Prop
()
public
labelStyle
?:
string
;
/**
* 标签位置
*
* @type {(string | 'BOTTOM' | 'LEFT' | 'NONE' | 'RIGHT' | 'TOP')}
* @memberof AppFormItem
*/
@
Prop
()
public
labelPos
?:
string
|
'BOTTOM'
|
'LEFT'
|
'NONE'
|
'RIGHT'
|
'TOP'
;
/**
* 标签位置
*
* @type {(string | 'BOTTOM' | 'LEFT' | 'NONE' | 'RIGHT' | 'TOP')}
* @memberof AppFormItem
*/
@
Prop
()
public
labelPos
?:
|
string
|
"BOTTOM"
|
"LEFT"
|
"NONE"
|
"RIGHT"
|
"TOP"
;
/**
* 标签宽度
*
* @type {number}
* @memberof AppFormItem
*/
@
Prop
({})
public
labelWidth
!
:
number
;
/**
* 标签宽度
*
* @type {number}
* @memberof AppFormItem
*/
@
Prop
({})
public
labelWidth
!
:
number
;
/**
* 是否显示标题
*
* @type {boolean}
* @memberof AppFormItem
*/
@
Prop
()
public
isShowCaption
?:
boolean
;
/**
* 是否显示标题
*
* @type {boolean}
* @memberof AppFormItem
*/
@
Prop
()
public
isShowCaption
?:
boolean
;
/**
* 标签是否空白
*
* @type {boolean}
* @memberof AppFormItem
*/
@
Prop
()
public
isEmptyCaption
?:
boolean
;
/**
* 标签是否空白
*
* @type {boolean}
* @memberof AppFormItem
*/
@
Prop
()
public
isEmptyCaption
?:
boolean
;
/**
* 表单项名称
*
* @type {string}
* @memberof AppFormItem
*/
@
Prop
()
public
name
!
:
string
;
/**
* 表单项名称
*
* @type {string}
* @memberof AppFormItem
*/
@
Prop
()
public
name
!
:
string
;
/**
* 内置样式
*
* @type {string}
* @memberof AppFormItem
*/
@
Prop
()
public
uiStyle
?:
string
;
/**
* 内置样式
*
* @type {string}
* @memberof AppFormItem
*/
@
Prop
()
public
uiStyle
?:
string
;
/**
* 表单项值规则
*
* @type {string}
* @memberof AppFormItem
*/
@
Prop
()
public
itemRules
!
:
any
;
/**
* 表单项值规则
*
* @type {string}
* @memberof AppFormItem
*/
@
Prop
()
public
itemRules
!
:
any
;
/**
* 值规则数组
*
* @type {any[]}
* @memberof AppFormItem
*/
public
rules
:
any
[]
=
[];
/**
* 值规则数组
*
* @type {any[]}
* @memberof AppFormItem
*/
public
rules
:
any
[]
=
[];
/**
* 是否必填
*
* @type {boolean}
* @memberof AppFormItem
*/
public
required
:
boolean
=
false
;
/**
* 是否必填
*
* @type {boolean}
* @memberof AppFormItem
*/
public
required
:
boolean
=
false
;
/**
* 表单项值规则监控
*
* @param {*} newVal
* @param {*} oldVal
* @memberof AppFormItem
*/
@
Watch
(
'itemRules'
,{
deep
:
true
})
onItemRulesChange
(
newVal
:
any
,
oldVal
:
any
)
{
if
(
newVal
)
{
try
{
this
.
rules
=
[];
const
_rules
:
any
[]
=
newVal
;
this
.
rules
=
[...
_rules
];
this
.
rules
.
some
((
rule
:
any
)
=>
{
if
(
rule
.
hasOwnProperty
(
'required'
))
{
this
.
required
=
rule
.
required
;
return
true
;
}
return
false
;
});
}
catch
(
error
)
{
}
}
/**
* 表单项值规则监控
*
* @param {*} newVal
* @param {*} oldVal
* @memberof AppFormItem
*/
@
Watch
(
"itemRules"
,
{
deep
:
true
})
onItemRulesChange
(
newVal
:
any
,
oldVal
:
any
)
{
if
(
newVal
)
{
try
{
this
.
rules
=
[];
const
_rules
:
any
[]
=
newVal
;
this
.
rules
=
[...
_rules
];
this
.
rules
.
some
((
rule
:
any
)
=>
{
if
(
rule
.
hasOwnProperty
(
"required"
))
{
this
.
required
=
rule
.
required
;
return
true
;
}
return
false
;
});
}
catch
(
error
)
{}
}
}
/**
* 计算样式
*
* @readonly
* @type {string []}
* @memberof AppFormItem
*/
get
classes
():
string
[]
{
let
posClass
=
''
;
switch
(
this
.
labelPos
)
{
case
'TOP'
:
posClass
=
'app-form-item-label-top'
;
break
;
case
'LEFT'
:
posClass
=
'app-form-item-label-left'
;
break
;
case
'BOTTOM'
:
posClass
=
'app-form-item-label-bottom'
;
break
;
case
'RIGHT'
:
posClass
=
'app-form-item-label-right'
;
break
;
case
'NONE'
:
posClass
=
'app-form-item-label-none'
;
break
;
}
return
[
'app-form-item'
,
posClass
];
/**
* 计算样式
*
* @readonly
* @type {string []}
* @memberof AppFormItem
*/
get
classes
():
string
[]
{
let
posClass
=
""
;
switch
(
this
.
labelPos
)
{
case
"TOP"
:
posClass
=
"label-top"
;
break
;
case
"LEFT"
:
posClass
=
"label-left"
;
break
;
case
"BOTTOM"
:
posClass
=
"label-bottom"
;
break
;
case
"RIGHT"
:
posClass
=
"label-right"
;
break
;
case
"NONE"
:
posClass
=
"label-none"
;
break
;
}
return
[
"app-form-item"
,
posClass
];
}
/**
* label样式
*
* @readonly
* @type {string}
* @memberof AppFormItem
*/
get
labelclasses
():
string
{
return
this
.
labelStyle
?
this
.
labelStyle
+
' app-form-item-label'
:
'app-form-item-label'
;
}
/**
* label样式
*
* @readonly
* @type {string}
* @memberof AppFormItem
*/
get
labelclasses
():
string
{
return
this
.
labelStyle
?
this
.
labelStyle
+
" app-form-item-label"
:
"app-form-item-label"
;
}
/**
* label行内样式
*
* @readonly
* @type {string}
* @memberof AppFormItem
*/
get
labelstyle
():
any
{
return
{
width
:
this
.
labelWidth
+
'px'
};
/**
* label行内样式
*
* @readonly
* @type {string}
* @memberof AppFormItem
*/
get
labelstyle
():
any
{
if
(
Object
.
is
(
this
.
labelPos
,
'LEFT'
)
||
Object
.
is
(
this
.
labelPos
,
'RIGHT'
))
{
return
{
width
:
this
.
labelWidth
+
"px"
};
}
}
/**
* slot行内样式
*
* @readonly
* @type {string}
* @memberof AppFormItem
*/
get
slotstyle
():
any
{
if
(
Object
.
is
(
this
.
labelPos
,
'LEFT'
)){
return
{
marginLeft
:
this
.
labelWidth
+
'px'
};
}
else
if
(
Object
.
is
(
this
.
labelPos
,
'RIGHT'
)){
return
{
marginRight
:
this
.
labelWidth
+
'px'
};
}
/**
* slot行内样式
*
* @readonly
* @type {string}
* @memberof AppFormItem
*/
get
slotstyle
():
any
{
if
(
Object
.
is
(
this
.
labelPos
,
"LEFT"
))
{
return
{
marginLeft
:
this
.
labelWidth
+
"px"
};
}
else
if
(
Object
.
is
(
this
.
labelPos
,
"RIGHT"
))
{
return
{
marginRight
:
this
.
labelWidth
+
"px"
};
}
}
/**
* vue 生命周期
*
* @memberof AppFormItem
*/
public
mounted
()
{
if
(
this
.
itemRules
)
{
try
{
const
_rules
:
any
[]
=
this
.
itemRules
;
this
.
rules
=
[...
_rules
];
this
.
rules
.
some
((
rule
:
any
)
=>
{
if
(
rule
.
hasOwnProperty
(
'required'
))
{
this
.
required
=
rule
.
required
;
return
true
;
}
return
false
;
});
}
catch
(
error
)
{
}
}
/**
* vue 生命周期
*
* @memberof AppFormItem
*/
public
mounted
()
{
if
(
this
.
itemRules
)
{
try
{
const
_rules
:
any
[]
=
this
.
itemRules
;
this
.
rules
=
[...
_rules
];
this
.
rules
.
some
((
rule
:
any
)
=>
{
if
(
rule
.
hasOwnProperty
(
"required"
))
{
this
.
required
=
rule
.
required
;
return
true
;
}
return
false
;
});
}
catch
(
error
)
{}
}
}
}
</
script
>
<
style
lang=
'less'
>
@import
'./app-form-item.less'
;
@import
"./app-form-item.less"
;
</
style
>
\ No newline at end of file
app_web/src/utils/interceptor/interceptor.ts
浏览文件 @
f9b298fe
...
...
@@ -132,13 +132,16 @@ export class Interceptors {
* @memberof Interceptors
*/
private
doNoLogin
(
data
:
any
=
{}):
void
{
// 清除user
和token
// 清除user
、token和cookie
if
(
localStorage
.
getItem
(
'user'
)){
localStorage
.
removeItem
(
'user'
);
}
if
(
localStorage
.
getItem
(
'token'
)){
localStorage
.
removeItem
(
'token'
);
}
let
leftTime
=
new
Date
();
leftTime
.
setTime
(
leftTime
.
getSeconds
()
-
1
);
document
.
cookie
=
"ibzuaa-token=;expires="
+
leftTime
.
toUTCString
();
if
(
data
.
loginurl
&&
!
Object
.
is
(
data
.
loginurl
,
''
)
&&
data
.
originurl
&&
!
Object
.
is
(
data
.
originurl
,
''
))
{
let
_url
=
encodeURIComponent
(
encodeURIComponent
(
window
.
location
.
href
));
let
loginurl
:
string
=
data
.
loginurl
;
...
...
app_web/src/widgets/sys-app/main-grid/main-grid-service.ts
浏览文件 @
f9b298fe
...
...
@@ -267,7 +267,6 @@ export default class MainService extends ControlService {
response
.
data
.
id
=
Util
.
createUUID
();
}
this
.
handleResponse
(
action
,
response
,
true
);
this
.
mergeDefaults
(
response
);
resolve
(
response
);
}).
catch
(
response
=>
{
reject
(
response
);
...
...
@@ -275,16 +274,6 @@ export default class MainService extends ControlService {
});
}
/**
* 合并配置的默认值
* @param {*}
* @memberof MainService
*/
public
mergeDefaults
(
response
:
any
=
{}){
if
(
response
.
data
){
}
}
/**
* 前台逻辑
...
...
app_web/src/widgets/sys-auth-log/main-grid/main-grid-service.ts
浏览文件 @
f9b298fe
...
...
@@ -267,7 +267,6 @@ export default class MainService extends ControlService {
response
.
data
.
logid
=
Util
.
createUUID
();
}
this
.
handleResponse
(
action
,
response
,
true
);
this
.
mergeDefaults
(
response
);
resolve
(
response
);
}).
catch
(
response
=>
{
reject
(
response
);
...
...
@@ -275,16 +274,6 @@ export default class MainService extends ControlService {
});
}
/**
* 合并配置的默认值
* @param {*}
* @memberof MainService
*/
public
mergeDefaults
(
response
:
any
=
{}){
if
(
response
.
data
){
}
}
/**
* 前台逻辑
...
...
app_web/src/widgets/sys-permission/main-grid/main-grid-service.ts
浏览文件 @
f9b298fe
...
...
@@ -267,7 +267,6 @@ export default class MainService extends ControlService {
response
.
data
.
permissionid
=
Util
.
createUUID
();
}
this
.
handleResponse
(
action
,
response
,
true
);
this
.
mergeDefaults
(
response
);
resolve
(
response
);
}).
catch
(
response
=>
{
reject
(
response
);
...
...
@@ -275,16 +274,6 @@ export default class MainService extends ControlService {
});
}
/**
* 合并配置的默认值
* @param {*}
* @memberof MainService
*/
public
mergeDefaults
(
response
:
any
=
{}){
if
(
response
.
data
){
}
}
/**
* 前台逻辑
...
...
app_web/src/widgets/sys-role-permission/main-grid/main-grid-service.ts
浏览文件 @
f9b298fe
...
...
@@ -267,7 +267,6 @@ export default class MainService extends ControlService {
response
.
data
.
rolepermissionid
=
Util
.
createUUID
();
}
this
.
handleResponse
(
action
,
response
,
true
);
this
.
mergeDefaults
(
response
);
resolve
(
response
);
}).
catch
(
response
=>
{
reject
(
response
);
...
...
@@ -275,16 +274,6 @@ export default class MainService extends ControlService {
});
}
/**
* 合并配置的默认值
* @param {*}
* @memberof MainService
*/
public
mergeDefaults
(
response
:
any
=
{}){
if
(
response
.
data
){
}
}
/**
* 前台逻辑
...
...
app_web/src/widgets/sys-role/main-grid/main-grid-service.ts
浏览文件 @
f9b298fe
...
...
@@ -267,7 +267,6 @@ export default class MainService extends ControlService {
response
.
data
.
roleid
=
Util
.
createUUID
();
}
this
.
handleResponse
(
action
,
response
,
true
);
this
.
mergeDefaults
(
response
);
resolve
(
response
);
}).
catch
(
response
=>
{
reject
(
response
);
...
...
@@ -275,16 +274,6 @@ export default class MainService extends ControlService {
});
}
/**
* 合并配置的默认值
* @param {*}
* @memberof MainService
*/
public
mergeDefaults
(
response
:
any
=
{}){
if
(
response
.
data
){
}
}
/**
* 前台逻辑
...
...
app_web/src/widgets/sys-user-role/main-grid/main-grid-service.ts
浏览文件 @
f9b298fe
...
...
@@ -267,7 +267,6 @@ export default class MainService extends ControlService {
response
.
data
.
userroleid
=
Util
.
createUUID
();
}
this
.
handleResponse
(
action
,
response
,
true
);
this
.
mergeDefaults
(
response
);
resolve
(
response
);
}).
catch
(
response
=>
{
reject
(
response
);
...
...
@@ -275,16 +274,6 @@ export default class MainService extends ControlService {
});
}
/**
* 合并配置的默认值
* @param {*}
* @memberof MainService
*/
public
mergeDefaults
(
response
:
any
=
{}){
if
(
response
.
data
){
}
}
/**
* 前台逻辑
...
...
app_web/src/widgets/sys-user/main-grid/main-grid-service.ts
浏览文件 @
f9b298fe
...
...
@@ -267,7 +267,6 @@ export default class MainService extends ControlService {
response
.
data
.
userid
=
Util
.
createUUID
();
}
this
.
handleResponse
(
action
,
response
,
true
);
this
.
mergeDefaults
(
response
);
resolve
(
response
);
}).
catch
(
response
=>
{
reject
(
response
);
...
...
@@ -275,16 +274,6 @@ export default class MainService extends ControlService {
});
}
/**
* 合并配置的默认值
* @param {*}
* @memberof MainService
*/
public
mergeDefaults
(
response
:
any
=
{}){
if
(
response
.
data
){
}
}
/**
* 前台逻辑
...
...
ibzuaa-app/ibzuaa-app-web/src/main/resources/keypair/ibzrt_rsa
0 → 100644
浏览文件 @
f9b298fe
MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAKaTz4pgOR/p0RjlczM0dErf4ZUNziE/HJcfKDLPu77Gs2EJdDK0uGfPI3GX/eRwX9L9bTZJtz9sX2fkRqRt3gWnsMypT2P/cO/2GgtRCPHRFD7BI+Df32isEJZ6M4kD9tyKLw8Y9KuP0C20ZMMDeCrrbjMagMMrwTOM4/4eFjzVAgMBAAECgYEAnH3mj2hgolOmhg4hkOxpiGIV6lMi4OcKtAqoWDwCdHL12GbqTCytxZC7Cp+w/Wh5DZ3aeRL93c6xPsgdeaJh3kYa4ooo6b5tFHPU63VU5MBgwGzi26/6GB4GCXxGMB+SxmdigDmmPIYbXD+jO2oj1s8hj+DOE4U2fIjeZ//DumECQQDlA74KHNZlKxoWl0FoHCgcIHFBZcQWKO3puhrH7VsRYI7CVVguE57NBT6QvAmU9r32PDt64tS0Qd1sCrk4uEqtAkEAujSj/cwF4ctQZCbUoMMzK/mw8ZxW3M6VK3urbq8fyFJ2iT2aLV3jE3+tnDdpezcfnbs/9SVXeFmJpdg/L7hnyQJAQyxo1qCExmHxIgU1uyrfHPjrH2qRLIrO1gqvhkr5tkwjM59C4SkCIFLUejGdgeMp7wrVy4KzLzhOkT1H/PoZdQJAEbKxJ409veFKKcq7CPCkq3hXBg/a/a+w4+okOCfy+GJGG/M79TXoQFExWhi2MNzjZ2WFxbIf5zNzbszn7Iw1aQJBAIXpKrQ0sLxr0rFzsoHBrobPcnQeutzypQNTPkoItILVP9pWz+aUfIKnOHEC5GAdD2LPZZ/pF7ixdRd9nBab+pk=
\ No newline at end of file
ibzuaa-app/ibzuaa-app-web/src/main/resources/keypair/ibzrt_rsa.pub
0 → 100644
浏览文件 @
f9b298fe
MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCmk8+KYDkf6dEY5XMzNHRK3+GVDc4hPxyXHygyz7u+xrNhCXQytLhnzyNxl/3kcF/S/W02Sbc/bF9n5Eakbd4Fp7DMqU9j/3Dv9hoLUQjx0RQ+wSPg399orBCWejOJA/bcii8PGPSrj9AttGTDA3gq624zGoDDK8EzjOP+HhY81QIDAQAB
\ No newline at end of file
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录