Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibzrt
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibzrt
提交
925fe18e
提交
925fe18e
编写于
11月 16, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
laizhilong 发布系统代码 [ibiz-rt,ibizlab-runtime]
上级
6f025995
变更
5
隐藏空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
133 行增加
和
207 行删除
+133
-207
package-lock.json
app_Web/package-lock.json
+121
-0
sys-role_en_US.ts
...Web/src/locale/lanres/entities/sys-role/sys-role_en_US.ts
+4
-4
sys-role_zh_CN.ts
...Web/src/locale/lanres/entities/sys-role/sys-role_zh_CN.ts
+4
-4
sys-role-edit-view-base.vue
.../pages/uaa/sys-role-edit-view/sys-role-edit-view-base.vue
+3
-198
application-nacos.yml
ibzrt-util/src/main/resources/application-nacos.yml
+1
-1
未找到文件。
app_Web/package-lock.json
0 → 100644
浏览文件 @
925fe18e
{
"name"
:
"app"
,
"version"
:
"0.1.0"
,
"lockfileVersion"
:
1
,
"requires"
:
true
,
"dependencies"
:
{
"adler-32"
:
{
"version"
:
"1.2.0"
,
"resolved"
:
"https://registry.npmjs.org/adler-32/-/adler-32-1.2.0.tgz"
,
"integrity"
:
"sha1-aj5r8KY5ALoVZSgIyxXGgT0aXyU="
,
"requires"
:
{
"exit-on-epipe"
:
"~1.0.1"
,
"printj"
:
"~1.1.0"
}
},
"cfb"
:
{
"version"
:
"1.1.4"
,
"resolved"
:
"https://registry.npmjs.org/cfb/-/cfb-1.1.4.tgz"
,
"integrity"
:
"sha512-rwFkl3aFO3f+ljR27YINwC0x8vPjyiEVbYbrTCKzspEf7Q++3THdfHVgJYNUbxNcupJECrLX+L40Mjm9hm/Bgw=="
,
"requires"
:
{
"adler-32"
:
"~1.2.0"
,
"commander"
:
"^2.16.0"
,
"crc-32"
:
"~1.2.0"
,
"printj"
:
"~1.1.2"
}
},
"codepage"
:
{
"version"
:
"1.14.0"
,
"resolved"
:
"https://registry.npmjs.org/codepage/-/codepage-1.14.0.tgz"
,
"integrity"
:
"sha1-jL4lSBMjVZ19MHVxsP/5HnodL5k="
,
"requires"
:
{
"commander"
:
"~2.14.1"
,
"exit-on-epipe"
:
"~1.0.1"
},
"dependencies"
:
{
"commander"
:
{
"version"
:
"2.14.1"
,
"resolved"
:
"https://registry.npmjs.org/commander/-/commander-2.14.1.tgz"
,
"integrity"
:
"sha512-+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw=="
}
}
},
"commander"
:
{
"version"
:
"2.17.1"
,
"resolved"
:
"https://registry.npmjs.org/commander/-/commander-2.17.1.tgz"
,
"integrity"
:
"sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg=="
},
"crc-32"
:
{
"version"
:
"1.2.0"
,
"resolved"
:
"https://registry.npmjs.org/crc-32/-/crc-32-1.2.0.tgz"
,
"integrity"
:
"sha512-1uBwHxF+Y/4yF5G48fwnKq6QsIXheor3ZLPT80yGBV1oEUwpPojlEhQbWKVw1VwcTQyMGHK1/XMmTjmlsmTTGA=="
,
"requires"
:
{
"exit-on-epipe"
:
"~1.0.1"
,
"printj"
:
"~1.1.0"
}
},
"exit-on-epipe"
:
{
"version"
:
"1.0.1"
,
"resolved"
:
"https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz"
,
"integrity"
:
"sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw=="
},
"file-saver"
:
{
"version"
:
"2.0.2"
,
"resolved"
:
"https://registry.npmjs.org/file-saver/-/file-saver-2.0.2.tgz"
,
"integrity"
:
"sha512-Wz3c3XQ5xroCxd1G8b7yL0Ehkf0TC9oYC6buPFkNnU9EnaPlifeAFCyCh+iewXTyFRcg0a6j3J7FmJsIhlhBdw=="
},
"frac"
:
{
"version"
:
"1.1.2"
,
"resolved"
:
"https://registry.npmjs.org/frac/-/frac-1.1.2.tgz"
,
"integrity"
:
"sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA=="
},
"printj"
:
{
"version"
:
"1.1.2"
,
"resolved"
:
"https://registry.npmjs.org/printj/-/printj-1.1.2.tgz"
,
"integrity"
:
"sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ=="
},
"raw-loader"
:
{
"version"
:
"0.5.1"
,
"resolved"
:
"https://registry.npmjs.org/raw-loader/-/raw-loader-0.5.1.tgz"
,
"integrity"
:
"sha1-DD0L6u2KAclm2Xh793goElKpeao="
,
"dev"
:
true
},
"script-loader"
:
{
"version"
:
"0.7.2"
,
"resolved"
:
"https://registry.npmjs.org/script-loader/-/script-loader-0.7.2.tgz"
,
"integrity"
:
"sha512-UMNLEvgOAQuzK8ji8qIscM3GIrRCWN6MmMXGD4SD5l6cSycgGsCo0tX5xRnfQcoghqct0tjHjcykgI1PyBE2aA=="
,
"dev"
:
true
,
"requires"
:
{
"raw-loader"
:
"~0.5.1"
}
},
"ssf"
:
{
"version"
:
"0.10.3"
,
"resolved"
:
"https://registry.npmjs.org/ssf/-/ssf-0.10.3.tgz"
,
"integrity"
:
"sha512-pRuUdW0WwyB2doSqqjWyzwCD6PkfxpHAHdZp39K3dp/Hq7f+xfMwNAWIi16DyrRg4gg9c/RvLYkJTSawTPTm1w=="
,
"requires"
:
{
"frac"
:
"~1.1.2"
}
},
"wmf"
:
{
"version"
:
"1.0.2"
,
"resolved"
:
"https://registry.npmjs.org/wmf/-/wmf-1.0.2.tgz"
,
"integrity"
:
"sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw=="
},
"xlsx"
:
{
"version"
:
"0.15.6"
,
"resolved"
:
"https://registry.npmjs.org/xlsx/-/xlsx-0.15.6.tgz"
,
"integrity"
:
"sha512-7vD9eutyLs65iDjNFimVN+gk/oDkfkCgpQUjdE82QgzJCrBHC4bGPH7fzKVyy0UPp3gyFVQTQEFJaWaAvZCShQ=="
,
"requires"
:
{
"adler-32"
:
"~1.2.0"
,
"cfb"
:
"^1.1.4"
,
"codepage"
:
"~1.14.0"
,
"commander"
:
"~2.17.1"
,
"crc-32"
:
"~1.2.0"
,
"exit-on-epipe"
:
"~1.0.1"
,
"ssf"
:
"~0.10.3"
,
"wmf"
:
"~1.0.1"
}
}
}
}
app_Web/src/locale/lanres/entities/sys-role/sys-role_en_US.ts
浏览文件 @
925fe18e
...
...
@@ -135,15 +135,15 @@ export default {
caption
:
"Save"
,
tip
:
"Save"
,
},
deuiaction1
:
{
caption
:
"
Save And Close
"
,
tip
:
"
Save And Close Window
"
,
tbitem6
:
{
caption
:
"
-
"
,
tip
:
""
,
},
deuiaction2
:
{
caption
:
"关闭"
,
tip
:
"关闭"
,
},
tbitem
6
:
{
tbitem
11
:
{
caption
:
"-"
,
tip
:
""
,
},
...
...
app_Web/src/locale/lanres/entities/sys-role/sys-role_zh_CN.ts
浏览文件 @
925fe18e
...
...
@@ -134,15 +134,15 @@ export default {
caption
:
"保存"
,
tip
:
"保存"
,
},
deuiaction1
:
{
caption
:
"
保存并关闭
"
,
tip
:
"
保存并关闭
"
,
tbitem6
:
{
caption
:
"
-
"
,
tip
:
""
,
},
deuiaction2
:
{
caption
:
"关闭"
,
tip
:
"关闭"
,
},
tbitem
6
:
{
tbitem
11
:
{
caption
:
"-"
,
tip
:
""
,
},
...
...
app_Web/src/pages/uaa/sys-role-edit-view/sys-role-edit-view-base.vue
浏览文件 @
925fe18e
...
...
@@ -13,13 +13,7 @@
</i-button>
<div
slot=
'content'
>
{{
$t
(
'entities.sysrole.editviewtoolbar_toolbar.tbitem3.tip'
)
}}
</div>
</tooltip>
<tooltip
:transfer=
"true"
:max-width=
"600"
>
<i-button
v-show=
"toolBarModels.deuiaction1.visabled"
:disabled=
"toolBarModels.deuiaction1.disabled"
class=
''
@
click=
"toolbar_click(
{ tag: 'deuiaction1' }, $event)">
<i
class=
'sx-tb-saveandclose'
></i>
<span
class=
'caption'
>
{{
$t
(
'entities.sysrole.editviewtoolbar_toolbar.deuiaction1.caption'
)
}}
</span>
</i-button>
<div
slot=
'content'
>
{{
$t
(
'entities.sysrole.editviewtoolbar_toolbar.deuiaction1.tip'
)
}}
</div>
</tooltip>
<span
class=
'seperator'
>
|
</span>
<tooltip
:transfer=
"true"
:max-width=
"600"
>
<i-button
v-show=
"toolBarModels.deuiaction2.visabled"
:disabled=
"toolBarModels.deuiaction2.disabled"
class=
''
@
click=
"toolbar_click(
{ tag: 'deuiaction2' }, $event)">
<i
class=
'fa fa-sign-out'
></i>
...
...
@@ -288,11 +282,10 @@ export default class SysRoleEditViewBase extends Vue {
public
toolBarModels
:
any
=
{
tbitem3
:
{
name
:
'tbitem3'
,
actiontarget
:
'NONE'
,
caption
:
'保存'
,
disabled
:
false
,
type
:
'DEUIACTION'
,
visabled
:
true
,
noprivdisplaymode
:
2
,
dataaccaction
:
''
,
uiaction
:
{
tag
:
'Save'
,
target
:
''
}
},
deuiaction1
:
{
name
:
'deuiaction1'
,
actiontarget
:
'NONE'
,
caption
:
'保存并关闭'
,
disabled
:
false
,
type
:
'DEUIACTION'
,
visabled
:
true
,
noprivdisplaymode
:
2
,
dataaccaction
:
''
,
uiaction
:
{
tag
:
'SaveAndExit'
,
target
:
''
}
},
tbitem6
:
{
name
:
'tbitem6'
,
type
:
'SEPERATOR'
,
visabled
:
true
,
dataaccaction
:
''
,
uiaction
:
{
}
},
deuiaction2
:
{
name
:
'deuiaction2'
,
actiontarget
:
'NONE'
,
caption
:
'关闭'
,
disabled
:
false
,
type
:
'DEUIACTION'
,
visabled
:
true
,
noprivdisplaymode
:
2
,
dataaccaction
:
''
,
uiaction
:
{
tag
:
'Exit'
,
target
:
''
}
},
tbitem
6
:
{
name
:
'tbitem6
'
,
type
:
'SEPERATOR'
,
visabled
:
true
,
dataaccaction
:
''
,
uiaction
:
{
}
},
tbitem
11
:
{
name
:
'tbitem11
'
,
type
:
'SEPERATOR'
,
visabled
:
true
,
dataaccaction
:
''
,
uiaction
:
{
}
},
tbitem14
:
{
name
:
'tbitem14'
,
actiontarget
:
'NONE'
,
caption
:
'拷贝'
,
disabled
:
false
,
type
:
'DEUIACTION'
,
visabled
:
true
,
noprivdisplaymode
:
2
,
dataaccaction
:
''
,
uiaction
:
{
tag
:
'Copy'
,
target
:
'SINGLEKEY'
}
},
};
...
...
@@ -630,18 +623,9 @@ export default class SysRoleEditViewBase extends Vue {
if
(
Object
.
is
(
$event
.
tag
,
'tbitem3'
))
{
this
.
toolbar_tbitem3_click
(
null
,
''
,
$event2
);
}
if
(
Object
.
is
(
$event
.
tag
,
'deuiaction1'
))
{
this
.
toolbar_deuiaction1_click
(
null
,
''
,
$event2
);
}
if
(
Object
.
is
(
$event
.
tag
,
'deuiaction2'
))
{
this
.
toolbar_deuiaction2_click
(
null
,
''
,
$event2
);
}
if
(
Object
.
is
(
$event
.
tag
,
'tbitem9'
))
{
this
.
toolbar_tbitem9_click
(
null
,
''
,
$event2
);
}
if
(
Object
.
is
(
$event
.
tag
,
'tbitem10'
))
{
this
.
toolbar_tbitem10_click
(
null
,
''
,
$event2
);
}
if
(
Object
.
is
(
$event
.
tag
,
'tbitem14'
))
{
this
.
toolbar_tbitem14_click
(
null
,
''
,
$event2
);
}
...
...
@@ -713,34 +697,6 @@ export default class SysRoleEditViewBase extends Vue {
this
.
Save
(
datas
,
contextJO
,
paramJO
,
$event
,
xData
,
this
,
"SysRole"
);
}
/**
* 逻辑事件
*
* @param {*} [params={}]
* @param {*} [tag]
* @param {*} [$event]
* @memberof
*/
public
toolbar_deuiaction1_click
(
params
:
any
=
{},
tag
?:
any
,
$event
?:
any
)
{
// 参数
// 取数
let
datas
:
any
[]
=
[];
let
xData
:
any
=
null
;
// _this 指向容器对象
const
_this
:
any
=
this
;
let
paramJO
:
any
=
{};
let
contextJO
:
any
=
{};
xData
=
this
.
$refs
.
form
;
if
(
xData
.
getDatas
&&
xData
.
getDatas
instanceof
Function
)
{
datas
=
[...
xData
.
getDatas
()];
}
if
(
params
){
datas
=
[
params
];
}
// 界面行为
this
.
SaveAndExit
(
datas
,
contextJO
,
paramJO
,
$event
,
xData
,
this
,
"SysRole"
);
}
/**
* 逻辑事件
*
...
...
@@ -769,62 +725,6 @@ export default class SysRoleEditViewBase extends Vue {
this
.
Exit
(
datas
,
contextJO
,
paramJO
,
$event
,
xData
,
this
,
"SysRole"
);
}
/**
* 逻辑事件
*
* @param {*} [params={}]
* @param {*} [tag]
* @param {*} [$event]
* @memberof
*/
public
toolbar_tbitem9_click
(
params
:
any
=
{},
tag
?:
any
,
$event
?:
any
)
{
// 参数
// 取数
let
datas
:
any
[]
=
[];
let
xData
:
any
=
null
;
// _this 指向容器对象
const
_this
:
any
=
this
;
let
paramJO
:
any
=
{};
let
contextJO
:
any
=
{};
xData
=
this
.
$refs
.
form
;
if
(
xData
.
getDatas
&&
xData
.
getDatas
instanceof
Function
)
{
datas
=
[...
xData
.
getDatas
()];
}
if
(
params
){
datas
=
[
params
];
}
// 界面行为
this
.
SaveAndStart
(
datas
,
contextJO
,
paramJO
,
$event
,
xData
,
this
,
"SysRole"
);
}
/**
* 逻辑事件
*
* @param {*} [params={}]
* @param {*} [tag]
* @param {*} [$event]
* @memberof
*/
public
toolbar_tbitem10_click
(
params
:
any
=
{},
tag
?:
any
,
$event
?:
any
)
{
// 参数
// 取数
let
datas
:
any
[]
=
[];
let
xData
:
any
=
null
;
// _this 指向容器对象
const
_this
:
any
=
this
;
let
paramJO
:
any
=
{};
let
contextJO
:
any
=
{};
xData
=
this
.
$refs
.
form
;
if
(
xData
.
getDatas
&&
xData
.
getDatas
instanceof
Function
)
{
datas
=
[...
xData
.
getDatas
()];
}
if
(
params
){
datas
=
[
params
];
}
// 界面行为
this
.
ViewWFStep
(
datas
,
contextJO
,
paramJO
,
$event
,
xData
,
this
,
"SysRole"
);
}
/**
* 逻辑事件
*
...
...
@@ -879,39 +779,6 @@ export default class SysRoleEditViewBase extends Vue {
}
}
/**
* 保存并关闭
*
* @param {any[]} args 当前数据
* @param {any} contextJO 行为附加上下文
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @memberof SysRoleEditViewBase
*/
public
SaveAndExit
(
args
:
any
[],
contextJO
?:
any
,
params
?:
any
,
$event
?:
any
,
xData
?:
any
,
actionContext
?:
any
,
srfParentDeName
?:
string
)
{
const
_this
:
any
=
this
;
if
(
xData
&&
xData
.
saveAndExit
instanceof
Function
)
{
xData
.
saveAndExit
().
then
((
response
:
any
)
=>
{
if
(
!
response
||
response
.
status
!==
200
)
{
return
;
}
if
(
window
.
parent
){
window
.
parent
.
postMessage
([{
...
response
.
data
}],
'*'
);
}
});
}
else
if
(
_this
.
saveAndExit
&&
_this
.
saveAndExit
instanceof
Function
)
{
_this
.
saveAndExit
().
then
((
response
:
any
)
=>
{
if
(
!
response
||
response
.
status
!==
200
)
{
return
;
}
if
(
window
.
parent
){
window
.
parent
.
postMessage
([{
...
response
.
data
}],
'*'
);
}
});
}
}
/**
* 关闭
*
...
...
@@ -930,68 +797,6 @@ export default class SysRoleEditViewBase extends Vue {
}
}
/**
* 开始流程
*
* @param {any[]} args 当前数据
* @param {any} contextJO 行为附加上下文
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @memberof SysRoleEditViewBase
*/
public
SaveAndStart
(
args
:
any
[],
contextJO
?:
any
,
params
?:
any
,
$event
?:
any
,
xData
?:
any
,
actionContext
?:
any
,
srfParentDeName
?:
string
)
{
const
_this
:
any
=
this
;
if
(
!
xData
||
!
(
xData
.
wfstart
instanceof
Function
))
{
return
;
}
xData
.
wfstart
(
args
).
then
((
response
:
any
)
=>
{
if
(
!
response
||
response
.
status
!==
200
)
{
return
;
}
const
{
data
:
_data
}
=
response
;
if
(
window
.
parent
){
window
.
parent
.
postMessage
({
...
_data
},
'*'
);
}
if
(
_this
.
viewdata
)
{
_this
.
$emit
(
'viewdataschange'
,
[{
...
_data
}]);
_this
.
$emit
(
'close'
);
}
else
if
(
this
.
$tabPageExp
)
{
this
.
$tabPageExp
.
onClose
(
this
.
$route
.
fullPath
);
}
});
}
/**
* 当前流程步骤
*
* @param {any[]} args 当前数据
* @param {any} contextJO 行为附加上下文
* @param {*} [params] 附加参数
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @memberof SysRoleEditViewBase
*/
public
ViewWFStep
(
args
:
any
[],
contextJO
?:
any
,
params
?:
any
,
$event
?:
any
,
xData
?:
any
,
actionContext
?:
any
,
srfParentDeName
?:
string
)
{
let
_this
:
any
=
this
;
if
(
!
xData
||
!
(
xData
.
wfsubmit
instanceof
Function
))
{
return
;
}
xData
.
wfsubmit
(
args
).
then
((
response
:
any
)
=>
{
if
(
!
response
||
response
.
status
!==
200
)
{
return
;
}
const
{
data
:
_data
}
=
response
;
if
(
_this
.
viewdata
)
{
_this
.
$emit
(
'viewdataschange'
,
[{
...
_data
}]);
_this
.
$emit
(
'close'
);
}
else
if
(
_this
.
$tabPageExp
)
{
_this
.
$tabPageExp
.
onClose
(
_this
.
$route
.
fullPath
);
}
});
}
/**
* 拷贝
*
...
...
ibzrt-util/src/main/resources/application-nacos.yml
浏览文件 @
925fe18e
...
...
@@ -3,7 +3,7 @@ spring:
cloud
:
nacos
:
discovery
:
server-addr
:
172.16.10
2.211
:8848
server-addr
:
172.16.10
0.243
:8848
enabled
:
true
eureka
:
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录