Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibzuaa
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibzuaa
提交
d634e1bc
提交
d634e1bc
编写于
5月 26, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
zhouweidong@lab.ibiz5.com 发布系统代码
上级
e12859d2
变更
13
显示空白字符变更
内嵌
并排
正在显示
13 个修改的文件
包含
183 行增加
和
28 行删除
+183
-28
package.json
app_web/package.json
+1
-1
main-grid-base.vue
...web/src/widgets/sys-auth-log/main-grid/main-grid-base.vue
+48
-0
main-grid-base.vue
...b/src/widgets/sys-permission/main-grid/main-grid-base.vue
+12
-0
main-grid-base.vue
.../widgets/sys-role-permission/main-grid/main-grid-base.vue
+18
-0
main-grid-base.vue
app_web/src/widgets/sys-role/main-grid/main-grid-base.vue
+24
-0
main-grid-base.vue
...eb/src/widgets/sys-user-role/main-grid/main-grid-base.vue
+18
-0
main-grid-base.vue
app_web/src/widgets/sys-user/main-grid/main-grid-base.vue
+18
-0
yarn.lock
app_web/yarn.lock
+40
-5
config.xml
config.xml
+0
-5
SysPermission.java
...c/main/java/cn/ibizlab/core/uaa/domain/SysPermission.java
+1
-2
h2_table.xml
ibzuaa-core/src/main/resources/liquibase/h2_table.xml
+1
-1
Dockerfile
...a-provider/ibzuaa-provider-api/src/main/docker/Dockerfile
+1
-1
ibzuaa-provider-api.yaml
...uaa-provider-api/src/main/docker/ibzuaa-provider-api.yaml
+1
-13
未找到文件。
app_web/package.json
浏览文件 @
d634e1bc
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
"element-ui"
:
"^2.13.0"
,
"element-ui"
:
"^2.13.0"
,
"file-saver"
:
"^2.0.2"
,
"file-saver"
:
"^2.0.2"
,
"font-awesome"
:
"^4.7.0"
,
"font-awesome"
:
"^4.7.0"
,
"ibiz-gantt-elastic"
:
"^1.0.1
2
"
,
"ibiz-gantt-elastic"
:
"^1.0.1
3
"
,
"ibiz-vue-lib"
:
"^0.1.7"
,
"ibiz-vue-lib"
:
"^0.1.7"
,
"interactjs"
:
"^1.9.4"
,
"interactjs"
:
"^1.9.4"
,
"moment"
:
"^2.24.0"
,
"moment"
:
"^2.24.0"
,
...
...
app_web/src/widgets/sys-auth-log/main-grid/main-grid-base.vue
浏览文件 @
d634e1bc
...
@@ -23,6 +23,12 @@
...
@@ -23,6 +23,12 @@
</
template
>
</
template
>
<
template
v-if=
"getColumnState('username')"
>
<
template
v-if=
"getColumnState('username')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'username'"
:label=
"$t('entities.sysauthlog.main_grid.columns.username')"
:width=
"250"
:align=
"'left'"
:sortable=
"'custom'"
>
<el-table-column
show-overflow-tooltip
:prop=
"'username'"
:label=
"$t('entities.sysauthlog.main_grid.columns.username')"
:width=
"250"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.sysauthlog.main_grid.columns.username'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<
template
v-slot=
"{row,column}"
>
<span>
{{
row
.
username
}}
</span>
<span>
{{
row
.
username
}}
</span>
</
template
>
</
template
>
...
@@ -30,6 +36,12 @@
...
@@ -30,6 +36,12 @@
</template>
</template>
<
template
v-if=
"getColumnState('personname')"
>
<
template
v-if=
"getColumnState('personname')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'personname'"
:label=
"$t('entities.sysauthlog.main_grid.columns.personname')"
:width=
"250"
:align=
"'left'"
:sortable=
"'custom'"
>
<el-table-column
show-overflow-tooltip
:prop=
"'personname'"
:label=
"$t('entities.sysauthlog.main_grid.columns.personname')"
:width=
"250"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.sysauthlog.main_grid.columns.personname'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<
template
v-slot=
"{row,column}"
>
<span>
{{
row
.
personname
}}
</span>
<span>
{{
row
.
personname
}}
</span>
</
template
>
</
template
>
...
@@ -37,6 +49,12 @@
...
@@ -37,6 +49,12 @@
</template>
</template>
<
template
v-if=
"getColumnState('authtime')"
>
<
template
v-if=
"getColumnState('authtime')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'authtime'"
:label=
"$t('entities.sysauthlog.main_grid.columns.authtime')"
:width=
"250"
:align=
"'left'"
:sortable=
"'custom'"
>
<el-table-column
show-overflow-tooltip
:prop=
"'authtime'"
:label=
"$t('entities.sysauthlog.main_grid.columns.authtime')"
:width=
"250"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.sysauthlog.main_grid.columns.authtime'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<
template
v-slot=
"{row,column}"
>
<app-format-data
format=
"YYYY-MM-DD hh:mm:ss"
:data=
"row.authtime"
></app-format-data>
<app-format-data
format=
"YYYY-MM-DD hh:mm:ss"
:data=
"row.authtime"
></app-format-data>
</
template
>
</
template
>
...
@@ -44,6 +62,12 @@
...
@@ -44,6 +62,12 @@
</template>
</template>
<
template
v-if=
"getColumnState('authcode')"
>
<
template
v-if=
"getColumnState('authcode')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'authcode'"
:label=
"$t('entities.sysauthlog.main_grid.columns.authcode')"
:width=
"100"
:align=
"'left'"
:sortable=
"'custom'"
>
<el-table-column
show-overflow-tooltip
:prop=
"'authcode'"
:label=
"$t('entities.sysauthlog.main_grid.columns.authcode')"
:width=
"100"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.sysauthlog.main_grid.columns.authcode'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<
template
v-slot=
"{row,column}"
>
<template
>
<template
>
<codelist
:value=
"row.authcode"
tag=
'CLAuthCode'
codelistType=
'STATIC'
></codelist>
<codelist
:value=
"row.authcode"
tag=
'CLAuthCode'
codelistType=
'STATIC'
></codelist>
...
@@ -53,6 +77,12 @@
...
@@ -53,6 +77,12 @@
</template>
</template>
<
template
v-if=
"getColumnState('ipaddr')"
>
<
template
v-if=
"getColumnState('ipaddr')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'ipaddr'"
:label=
"$t('entities.sysauthlog.main_grid.columns.ipaddr')"
:width=
"250"
:align=
"'left'"
:sortable=
"'custom'"
>
<el-table-column
show-overflow-tooltip
:prop=
"'ipaddr'"
:label=
"$t('entities.sysauthlog.main_grid.columns.ipaddr')"
:width=
"250"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.sysauthlog.main_grid.columns.ipaddr'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<
template
v-slot=
"{row,column}"
>
<span>
{{
row
.
ipaddr
}}
</span>
<span>
{{
row
.
ipaddr
}}
</span>
</
template
>
</
template
>
...
@@ -60,6 +90,12 @@
...
@@ -60,6 +90,12 @@
</template>
</template>
<
template
v-if=
"getColumnState('macaddr')"
>
<
template
v-if=
"getColumnState('macaddr')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'macaddr'"
:label=
"$t('entities.sysauthlog.main_grid.columns.macaddr')"
:width=
"250"
:align=
"'left'"
:sortable=
"'custom'"
>
<el-table-column
show-overflow-tooltip
:prop=
"'macaddr'"
:label=
"$t('entities.sysauthlog.main_grid.columns.macaddr')"
:width=
"250"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.sysauthlog.main_grid.columns.macaddr'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<
template
v-slot=
"{row,column}"
>
<span>
{{
row
.
macaddr
}}
</span>
<span>
{{
row
.
macaddr
}}
</span>
</
template
>
</
template
>
...
@@ -67,6 +103,12 @@
...
@@ -67,6 +103,12 @@
</template>
</template>
<
template
v-if=
"getColumnState('useragent')"
>
<
template
v-if=
"getColumnState('useragent')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'useragent'"
:label=
"$t('entities.sysauthlog.main_grid.columns.useragent')"
:width=
"250"
:align=
"'left'"
:sortable=
"'custom'"
>
<el-table-column
show-overflow-tooltip
:prop=
"'useragent'"
:label=
"$t('entities.sysauthlog.main_grid.columns.useragent')"
:width=
"250"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.sysauthlog.main_grid.columns.useragent'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<
template
v-slot=
"{row,column}"
>
<span>
{{
row
.
useragent
}}
</span>
<span>
{{
row
.
useragent
}}
</span>
</
template
>
</
template
>
...
@@ -74,6 +116,12 @@
...
@@ -74,6 +116,12 @@
</template>
</template>
<
template
v-if=
"getColumnState('domain')"
>
<
template
v-if=
"getColumnState('domain')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'domain'"
:label=
"$t('entities.sysauthlog.main_grid.columns.domain')"
:width=
"100"
:align=
"'left'"
:sortable=
"'custom'"
>
<el-table-column
show-overflow-tooltip
:prop=
"'domain'"
:label=
"$t('entities.sysauthlog.main_grid.columns.domain')"
:width=
"100"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.sysauthlog.main_grid.columns.domain'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<
template
v-slot=
"{row,column}"
>
<span>
{{
row
.
domain
}}
</span>
<span>
{{
row
.
domain
}}
</span>
</
template
>
</
template
>
...
...
app_web/src/widgets/sys-permission/main-grid/main-grid-base.vue
浏览文件 @
d634e1bc
...
@@ -23,6 +23,12 @@
...
@@ -23,6 +23,12 @@
</
template
>
</
template
>
<
template
v-if=
"getColumnState('sys_permissionid')"
>
<
template
v-if=
"getColumnState('sys_permissionid')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'sys_permissionid'"
:label=
"$t('entities.syspermission.main_grid.columns.sys_permissionid')"
:width=
"150"
:align=
"'left'"
:sortable=
"'custom'"
>
<el-table-column
show-overflow-tooltip
:prop=
"'sys_permissionid'"
:label=
"$t('entities.syspermission.main_grid.columns.sys_permissionid')"
:width=
"150"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.syspermission.main_grid.columns.sys_permissionid'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<
template
v-slot=
"{row,column}"
>
<span>
{{
row
.
sys_permissionid
}}
</span>
<span>
{{
row
.
sys_permissionid
}}
</span>
</
template
>
</
template
>
...
@@ -30,6 +36,12 @@
...
@@ -30,6 +36,12 @@
</template>
</template>
<
template
v-if=
"getColumnState('sys_permissionname')"
>
<
template
v-if=
"getColumnState('sys_permissionname')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'sys_permissionname'"
:label=
"$t('entities.syspermission.main_grid.columns.sys_permissionname')"
:width=
"250"
:align=
"'left'"
:sortable=
"'custom'"
>
<el-table-column
show-overflow-tooltip
:prop=
"'sys_permissionname'"
:label=
"$t('entities.syspermission.main_grid.columns.sys_permissionname')"
:width=
"250"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.syspermission.main_grid.columns.sys_permissionname'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<
template
v-slot=
"{row,column}"
>
<span>
{{
row
.
sys_permissionname
}}
</span>
<span>
{{
row
.
sys_permissionname
}}
</span>
</
template
>
</
template
>
...
...
app_web/src/widgets/sys-role-permission/main-grid/main-grid-base.vue
浏览文件 @
d634e1bc
...
@@ -23,6 +23,12 @@
...
@@ -23,6 +23,12 @@
</
template
>
</
template
>
<
template
v-if=
"getColumnState('sys_rolename')"
>
<
template
v-if=
"getColumnState('sys_rolename')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'sys_rolename'"
:label=
"$t('entities.sysrolepermission.main_grid.columns.sys_rolename')"
:width=
"250"
:align=
"'left'"
:sortable=
"'custom'"
>
<el-table-column
show-overflow-tooltip
:prop=
"'sys_rolename'"
:label=
"$t('entities.sysrolepermission.main_grid.columns.sys_rolename')"
:width=
"250"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.sysrolepermission.main_grid.columns.sys_rolename'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<
template
v-slot=
"{row,column}"
>
<app-column-link
deKeyField=
'sysrole'
:context=
"JSON.parse(JSON.stringify(context))"
:viewparams=
"JSON.parse(JSON.stringify(viewparams))"
:data=
"row"
:linkview=
"
{viewname: 'sys-roleredirect-view', height: 0,width: 0,title: $t('entities.sysrole.views.redirectview.title'),placement: '', isRedirectView: true,deResParameters: [
<app-column-link
deKeyField=
'sysrole'
:context=
"JSON.parse(JSON.stringify(context))"
:viewparams=
"JSON.parse(JSON.stringify(viewparams))"
:data=
"row"
:linkview=
"
{viewname: 'sys-roleredirect-view', height: 0,width: 0,title: $t('entities.sysrole.views.redirectview.title'),placement: '', isRedirectView: true,deResParameters: [
]
]
...
@@ -37,6 +43,12 @@
...
@@ -37,6 +43,12 @@
</template>
</template>
<
template
v-if=
"getColumnState('sys_permissionname')"
>
<
template
v-if=
"getColumnState('sys_permissionname')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'sys_permissionname'"
:label=
"$t('entities.sysrolepermission.main_grid.columns.sys_permissionname')"
:width=
"250"
:align=
"'left'"
:sortable=
"'custom'"
>
<el-table-column
show-overflow-tooltip
:prop=
"'sys_permissionname'"
:label=
"$t('entities.sysrolepermission.main_grid.columns.sys_permissionname')"
:width=
"250"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.sysrolepermission.main_grid.columns.sys_permissionname'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<
template
v-slot=
"{row,column}"
>
<app-column-link
deKeyField=
'syspermission'
:context=
"JSON.parse(JSON.stringify(context))"
:viewparams=
"JSON.parse(JSON.stringify(viewparams))"
:data=
"row"
:linkview=
"
{viewname: 'sys-permissionredirect-view', height: 0,width: 0,title: $t('entities.syspermission.views.redirectview.title'),placement: '', isRedirectView: true,deResParameters: [
<app-column-link
deKeyField=
'syspermission'
:context=
"JSON.parse(JSON.stringify(context))"
:viewparams=
"JSON.parse(JSON.stringify(viewparams))"
:data=
"row"
:linkview=
"
{viewname: 'sys-permissionredirect-view', height: 0,width: 0,title: $t('entities.syspermission.views.redirectview.title'),placement: '', isRedirectView: true,deResParameters: [
]
]
...
@@ -51,6 +63,12 @@
...
@@ -51,6 +63,12 @@
</template>
</template>
<
template
v-if=
"getColumnState('updatedate')"
>
<
template
v-if=
"getColumnState('updatedate')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'updatedate'"
:label=
"$t('entities.sysrolepermission.main_grid.columns.updatedate')"
:width=
"250"
:align=
"'left'"
:sortable=
"'custom'"
>
<el-table-column
show-overflow-tooltip
:prop=
"'updatedate'"
:label=
"$t('entities.sysrolepermission.main_grid.columns.updatedate')"
:width=
"250"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.sysrolepermission.main_grid.columns.updatedate'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<
template
v-slot=
"{row,column}"
>
<app-format-data
format=
"YYYY-MM-DD hh:mm:ss"
:data=
"row.updatedate"
></app-format-data>
<app-format-data
format=
"YYYY-MM-DD hh:mm:ss"
:data=
"row.updatedate"
></app-format-data>
</
template
>
</
template
>
...
...
app_web/src/widgets/sys-role/main-grid/main-grid-base.vue
浏览文件 @
d634e1bc
...
@@ -23,6 +23,12 @@
...
@@ -23,6 +23,12 @@
</
template
>
</
template
>
<
template
v-if=
"getColumnState('sys_roleid')"
>
<
template
v-if=
"getColumnState('sys_roleid')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'sys_roleid'"
:label=
"$t('entities.sysrole.main_grid.columns.sys_roleid')"
:width=
"250"
:align=
"'left'"
:sortable=
"'custom'"
>
<el-table-column
show-overflow-tooltip
:prop=
"'sys_roleid'"
:label=
"$t('entities.sysrole.main_grid.columns.sys_roleid')"
:width=
"250"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.sysrole.main_grid.columns.sys_roleid'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<
template
v-slot=
"{row,column}"
>
<span>
{{
row
.
sys_roleid
}}
</span>
<span>
{{
row
.
sys_roleid
}}
</span>
</
template
>
</
template
>
...
@@ -30,6 +36,12 @@
...
@@ -30,6 +36,12 @@
</template>
</template>
<
template
v-if=
"getColumnState('sys_rolename')"
>
<
template
v-if=
"getColumnState('sys_rolename')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'sys_rolename'"
:label=
"$t('entities.sysrole.main_grid.columns.sys_rolename')"
:width=
"350"
:align=
"'left'"
:sortable=
"'custom'"
>
<el-table-column
show-overflow-tooltip
:prop=
"'sys_rolename'"
:label=
"$t('entities.sysrole.main_grid.columns.sys_rolename')"
:width=
"350"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.sysrole.main_grid.columns.sys_rolename'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<
template
v-slot=
"{row,column}"
>
<span>
{{
row
.
sys_rolename
}}
</span>
<span>
{{
row
.
sys_rolename
}}
</span>
</
template
>
</
template
>
...
@@ -37,6 +49,12 @@
...
@@ -37,6 +49,12 @@
</template>
</template>
<
template
v-if=
"getColumnState('memo')"
>
<
template
v-if=
"getColumnState('memo')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'memo'"
:label=
"$t('entities.sysrole.main_grid.columns.memo')"
:width=
"250"
:align=
"'left'"
:sortable=
"'custom'"
>
<el-table-column
show-overflow-tooltip
:prop=
"'memo'"
:label=
"$t('entities.sysrole.main_grid.columns.memo')"
:width=
"250"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.sysrole.main_grid.columns.memo'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<
template
v-slot=
"{row,column}"
>
<span>
{{
row
.
memo
}}
</span>
<span>
{{
row
.
memo
}}
</span>
</
template
>
</
template
>
...
@@ -44,6 +62,12 @@
...
@@ -44,6 +62,12 @@
</template>
</template>
<
template
v-if=
"getColumnState('updatedate')"
>
<
template
v-if=
"getColumnState('updatedate')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'updatedate'"
:label=
"$t('entities.sysrole.main_grid.columns.updatedate')"
:width=
"250"
:align=
"'left'"
:sortable=
"'custom'"
>
<el-table-column
show-overflow-tooltip
:prop=
"'updatedate'"
:label=
"$t('entities.sysrole.main_grid.columns.updatedate')"
:width=
"250"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.sysrole.main_grid.columns.updatedate'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<
template
v-slot=
"{row,column}"
>
<app-format-data
format=
"YYYY-MM-DD hh:mm:ss"
:data=
"row.updatedate"
></app-format-data>
<app-format-data
format=
"YYYY-MM-DD hh:mm:ss"
:data=
"row.updatedate"
></app-format-data>
</
template
>
</
template
>
...
...
app_web/src/widgets/sys-user-role/main-grid/main-grid-base.vue
浏览文件 @
d634e1bc
...
@@ -23,6 +23,12 @@
...
@@ -23,6 +23,12 @@
</
template
>
</
template
>
<
template
v-if=
"getColumnState('sys_username')"
>
<
template
v-if=
"getColumnState('sys_username')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'sys_username'"
:label=
"$t('entities.sysuserrole.main_grid.columns.sys_username')"
:width=
"250"
:align=
"'left'"
:sortable=
"'custom'"
>
<el-table-column
show-overflow-tooltip
:prop=
"'sys_username'"
:label=
"$t('entities.sysuserrole.main_grid.columns.sys_username')"
:width=
"250"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.sysuserrole.main_grid.columns.sys_username'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<
template
v-slot=
"{row,column}"
>
<app-column-link
deKeyField=
'sysuser'
:context=
"JSON.parse(JSON.stringify(context))"
:viewparams=
"JSON.parse(JSON.stringify(viewparams))"
:data=
"row"
:linkview=
"
{viewname: 'sys-userredirect-view', height: 0,width: 0,title: $t('entities.sysuser.views.redirectview.title'),placement: '', isRedirectView: true,deResParameters: [
<app-column-link
deKeyField=
'sysuser'
:context=
"JSON.parse(JSON.stringify(context))"
:viewparams=
"JSON.parse(JSON.stringify(viewparams))"
:data=
"row"
:linkview=
"
{viewname: 'sys-userredirect-view', height: 0,width: 0,title: $t('entities.sysuser.views.redirectview.title'),placement: '', isRedirectView: true,deResParameters: [
]
]
...
@@ -37,6 +43,12 @@
...
@@ -37,6 +43,12 @@
</template>
</template>
<
template
v-if=
"getColumnState('sys_rolename')"
>
<
template
v-if=
"getColumnState('sys_rolename')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'sys_rolename'"
:label=
"$t('entities.sysuserrole.main_grid.columns.sys_rolename')"
:width=
"250"
:align=
"'left'"
:sortable=
"'custom'"
>
<el-table-column
show-overflow-tooltip
:prop=
"'sys_rolename'"
:label=
"$t('entities.sysuserrole.main_grid.columns.sys_rolename')"
:width=
"250"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.sysuserrole.main_grid.columns.sys_rolename'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<
template
v-slot=
"{row,column}"
>
<app-column-link
deKeyField=
'sysrole'
:context=
"JSON.parse(JSON.stringify(context))"
:viewparams=
"JSON.parse(JSON.stringify(viewparams))"
:data=
"row"
:linkview=
"
{viewname: 'sys-roleredirect-view', height: 0,width: 0,title: $t('entities.sysrole.views.redirectview.title'),placement: '', isRedirectView: true,deResParameters: [
<app-column-link
deKeyField=
'sysrole'
:context=
"JSON.parse(JSON.stringify(context))"
:viewparams=
"JSON.parse(JSON.stringify(viewparams))"
:data=
"row"
:linkview=
"
{viewname: 'sys-roleredirect-view', height: 0,width: 0,title: $t('entities.sysrole.views.redirectview.title'),placement: '', isRedirectView: true,deResParameters: [
]
]
...
@@ -51,6 +63,12 @@
...
@@ -51,6 +63,12 @@
</template>
</template>
<
template
v-if=
"getColumnState('updatedate')"
>
<
template
v-if=
"getColumnState('updatedate')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'updatedate'"
:label=
"$t('entities.sysuserrole.main_grid.columns.updatedate')"
:width=
"250"
:align=
"'left'"
:sortable=
"'custom'"
>
<el-table-column
show-overflow-tooltip
:prop=
"'updatedate'"
:label=
"$t('entities.sysuserrole.main_grid.columns.updatedate')"
:width=
"250"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.sysuserrole.main_grid.columns.updatedate'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<
template
v-slot=
"{row,column}"
>
<app-format-data
format=
"YYYY-MM-DD hh:mm:ss"
:data=
"row.updatedate"
></app-format-data>
<app-format-data
format=
"YYYY-MM-DD hh:mm:ss"
:data=
"row.updatedate"
></app-format-data>
</
template
>
</
template
>
...
...
app_web/src/widgets/sys-user/main-grid/main-grid-base.vue
浏览文件 @
d634e1bc
...
@@ -23,6 +23,12 @@
...
@@ -23,6 +23,12 @@
</
template
>
</
template
>
<
template
v-if=
"getColumnState('userid')"
>
<
template
v-if=
"getColumnState('userid')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'userid'"
:label=
"$t('entities.sysuser.main_grid.columns.userid')"
:width=
"250"
:align=
"'left'"
:sortable=
"'custom'"
>
<el-table-column
show-overflow-tooltip
:prop=
"'userid'"
:label=
"$t('entities.sysuser.main_grid.columns.userid')"
:width=
"250"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.sysuser.main_grid.columns.userid'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<
template
v-slot=
"{row,column}"
>
<span>
{{
row
.
userid
}}
</span>
<span>
{{
row
.
userid
}}
</span>
</
template
>
</
template
>
...
@@ -30,6 +36,12 @@
...
@@ -30,6 +36,12 @@
</template>
</template>
<
template
v-if=
"getColumnState('username')"
>
<
template
v-if=
"getColumnState('username')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'username'"
:label=
"$t('entities.sysuser.main_grid.columns.username')"
:width=
"250"
:align=
"'left'"
:sortable=
"'custom'"
>
<el-table-column
show-overflow-tooltip
:prop=
"'username'"
:label=
"$t('entities.sysuser.main_grid.columns.username')"
:width=
"250"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.sysuser.main_grid.columns.username'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<
template
v-slot=
"{row,column}"
>
<span>
{{
row
.
username
}}
</span>
<span>
{{
row
.
username
}}
</span>
</
template
>
</
template
>
...
@@ -37,6 +49,12 @@
...
@@ -37,6 +49,12 @@
</template>
</template>
<
template
v-if=
"getColumnState('personname')"
>
<
template
v-if=
"getColumnState('personname')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'personname'"
:label=
"$t('entities.sysuser.main_grid.columns.personname')"
:width=
"250"
:align=
"'left'"
:sortable=
"'custom'"
>
<el-table-column
show-overflow-tooltip
:prop=
"'personname'"
:label=
"$t('entities.sysuser.main_grid.columns.personname')"
:width=
"250"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.sysuser.main_grid.columns.personname'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column}"
>
<
template
v-slot=
"{row,column}"
>
<span>
{{
row
.
personname
}}
</span>
<span>
{{
row
.
personname
}}
</span>
</
template
>
</
template
>
...
...
app_web/yarn.lock
浏览文件 @
d634e1bc
...
@@ -2157,6 +2157,13 @@ axios@^0.19.1:
...
@@ -2157,6 +2157,13 @@ axios@^0.19.1:
dependencies:
dependencies:
follow-redirects "1.5.10"
follow-redirects "1.5.10"
axios@^0.19.2:
version "0.19.2"
resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.2.tgz#3ea36c5d8818d0d5f8a8a97a6d36b86cdc00cb27"
integrity sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==
dependencies:
follow-redirects "1.5.10"
babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
version "6.26.0"
version "6.26.0"
resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
...
@@ -3258,6 +3265,11 @@ core-js@^3.4.4:
...
@@ -3258,6 +3265,11 @@ core-js@^3.4.4:
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.4.tgz#440a83536b458114b9cb2ac1580ba377dc470647"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.4.tgz#440a83536b458114b9cb2ac1580ba377dc470647"
integrity sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==
integrity sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==
core-js@^3.6.4:
version "3.6.5"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.5.tgz#7395dc273af37fb2e50e9bd3d9fe841285231d1a"
integrity sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==
core-util-is@1.0.2, core-util-is@~1.0.0:
core-util-is@1.0.2, core-util-is@~1.0.0:
version "1.0.2"
version "1.0.2"
resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
...
@@ -4022,6 +4034,18 @@ element-ui@^2.13.0:
...
@@ -4022,6 +4034,18 @@ element-ui@^2.13.0:
resize-observer-polyfill "^1.5.0"
resize-observer-polyfill "^1.5.0"
throttle-debounce "^1.0.1"
throttle-debounce "^1.0.1"
element-ui@^2.13.2:
version "2.13.2"
resolved "https://registry.yarnpkg.com/element-ui/-/element-ui-2.13.2.tgz#582bf47aaaaaafe23ea1958fae217a687ad06447"
integrity sha512-r761DRPssMPKDiJZWFlG+4e4vr0cRG/atKr3Eqr8Xi0tQMNbtmYU1QXvFnKiFPFFGkgJ6zS6ASkG+sellcoHlQ==
dependencies:
async-validator "~1.8.1"
babel-helper-vue-jsx-merge-props "^2.0.0"
deepmerge "^1.2.0"
normalize-wheel "^1.0.1"
resize-observer-polyfill "^1.5.0"
throttle-debounce "^1.0.1"
elliptic@^6.0.0:
elliptic@^6.0.0:
version "6.5.2"
version "6.5.2"
resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.2.tgz#05c5678d7173c049d8ca433552224a495d0e3762"
resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.2.tgz#05c5678d7173c049d8ca433552224a495d0e3762"
...
@@ -5209,10 +5233,10 @@ human-signals@^1.1.1:
...
@@ -5209,10 +5233,10 @@ human-signals@^1.1.1:
resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
ibiz-gantt-elastic@^1.0.1
2
:
ibiz-gantt-elastic@^1.0.1
3
:
version "1.0.1
2
"
version "1.0.1
3
"
resolved "https://registry.yarnpkg.com/ibiz-gantt-elastic/-/ibiz-gantt-elastic-1.0.1
2.tgz#6865ef41e94b8b31f00f4cd1f0f60f132f7398d
3"
resolved "https://registry.yarnpkg.com/ibiz-gantt-elastic/-/ibiz-gantt-elastic-1.0.1
3.tgz#420751337f7d4352df7f351a72ba0e13551bdf2
3"
integrity sha512-
UHmnTG5q13xUuCKXSf73ZpwN/iOM9M73jFQ+C9wJWAsZcrDVc/36bPaSalMcfRWpfWREtU9wMnONXtFGVvS6pw
==
integrity sha512-
floFaw93UNo9y/9BAExApvz8ATuUuxv2bOUOUbj9jvqY5WkWFKo4C9Bmu4779M5foTHy6SGWItNgZnvbm8i0QQ
==
dependencies:
dependencies:
dayjs "^1.8.16"
dayjs "^1.8.16"
resize-observer-polyfill "^1.5.1"
resize-observer-polyfill "^1.5.1"
...
@@ -5220,6 +5244,17 @@ ibiz-gantt-elastic@^1.0.12:
...
@@ -5220,6 +5244,17 @@ ibiz-gantt-elastic@^1.0.12:
vue-slider-component "^3.0.40"
vue-slider-component "^3.0.40"
vue-switches "^2.0.1"
vue-switches "^2.0.1"
ibiz-vue-lib@^0.1.7:
version "0.1.7"
resolved "https://registry.yarnpkg.com/ibiz-vue-lib/-/ibiz-vue-lib-0.1.7.tgz#33d51fd08f9e527b5576910c7314f6803714ff37"
integrity sha512-EFreVH9JOVSyIZY/1ZRrIYYlfBWCEZnDKeAs1339SZa1IhaJ06kzpwziOENc4vzGBDh+ps11LJLAWrIjUEjVLQ==
dependencies:
axios "^0.19.2"
core-js "^3.6.4"
element-ui "^2.13.2"
view-design "^4.1.0"
vue "^2.6.11"
iconv-lite@0.4.24:
iconv-lite@0.4.24:
version "0.4.24"
version "0.4.24"
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
...
@@ -10185,7 +10220,7 @@ vue-template-es2015-compiler@^1.6.0, vue-template-es2015-compiler@^1.9.0:
...
@@ -10185,7 +10220,7 @@ vue-template-es2015-compiler@^1.6.0, vue-template-es2015-compiler@^1.9.0:
resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825"
resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825"
integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==
integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==
vue@^2.2.6, vue@^2.6.10:
vue@^2.2.6, vue@^2.6.10
, vue@^2.6.11
:
version "2.6.11"
version "2.6.11"
resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.11.tgz#76594d877d4b12234406e84e35275c6d514125c5"
resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.11.tgz#76594d877d4b12234406e84e35275c6d514125c5"
integrity sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ==
integrity sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ==
...
...
config.xml
浏览文件 @
d634e1bc
...
@@ -37,11 +37,6 @@
...
@@ -37,11 +37,6 @@
git clone -b master $para2 ibzuaa/
git clone -b master $para2 ibzuaa/
export NODE_OPTIONS=--max-old-space-size=4096
export NODE_OPTIONS=--max-old-space-size=4096
cd ibzuaa/
cd ibzuaa/
mvn clean package -Papi
cd ibzuaa-provider/ibzuaa-provider-api
mvn -Papi docker:build
mvn -Papi docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/ibzuaa-provider-api.yaml ibzlab-rt --with-registry-auth
</command>
</command>
</hudson.tasks.Shell>
</hudson.tasks.Shell>
</builders>
</builders>
...
...
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysPermission.java
浏览文件 @
d634e1bc
...
@@ -68,8 +68,7 @@ public class SysPermission extends EntityMP implements Serializable {
...
@@ -68,8 +68,7 @@ public class SysPermission extends EntityMP implements Serializable {
/**
/**
* 逻辑有效
* 逻辑有效
*/
*/
@DEField
(
preType
=
DEPredefinedFieldType
.
LOGICVALID
,
logicval
=
"1"
,
logicdelval
=
"0"
)
@DEField
(
preType
=
DEPredefinedFieldType
.
LOGICVALID
)
@TableLogic
(
value
=
"1"
,
delval
=
"0"
)
@TableField
(
value
=
"enable"
)
@TableField
(
value
=
"enable"
)
@JSONField
(
name
=
"enable"
)
@JSONField
(
name
=
"enable"
)
@JsonProperty
(
"enable"
)
@JsonProperty
(
"enable"
)
...
...
ibzuaa-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @
d634e1bc
...
@@ -124,7 +124,7 @@
...
@@ -124,7 +124,7 @@
<!--输出实体[SYS_PERMISSION]数据结构 -->
<!--输出实体[SYS_PERMISSION]数据结构 -->
<changeSet
author=
"a_A_5d9d78509"
id=
"tab-sys_permission-21
3
-6"
>
<changeSet
author=
"a_A_5d9d78509"
id=
"tab-sys_permission-21
5
-6"
>
<createTable
tableName=
"IBZPERMISSION"
>
<createTable
tableName=
"IBZPERMISSION"
>
<column
name=
"SYS_PERMISSIONID"
remarks=
""
type=
"VARCHAR(200)"
>
<column
name=
"SYS_PERMISSIONID"
remarks=
""
type=
"VARCHAR(200)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_SYS_PERMISSION_SYS_PERMISSI"
/>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_SYS_PERMISSION_SYS_PERMISSI"
/>
...
...
ibzuaa-provider/ibzuaa-provider-api/src/main/docker/Dockerfile
浏览文件 @
d634e1bc
...
@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
...
@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \
sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzuaa-provider-api.jar
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzuaa-provider-api.jar
EXPOSE
40002
EXPOSE
8081
ADD
ibzuaa-provider-api.jar /ibzuaa-provider-api.jar
ADD
ibzuaa-provider-api.jar /ibzuaa-provider-api.jar
ibzuaa-provider/ibzuaa-provider-api/src/main/docker/ibzuaa-provider-api.yaml
浏览文件 @
d634e1bc
...
@@ -3,21 +3,9 @@ services:
...
@@ -3,21 +3,9 @@ services:
ibzuaa-provider-api
:
ibzuaa-provider-api
:
image
:
registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-provider-api:latest
image
:
registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-provider-api:latest
ports
:
ports
:
-
"
40002:40002
"
-
"
8081:8081
"
networks
:
networks
:
-
agent_network
-
agent_network
environment
:
-
SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
-
SERVER_PORT=40002
-
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
deploy
:
deploy
:
mode
:
replicated
mode
:
replicated
replicas
:
1
replicas
:
1
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录