Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibzuaa
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibzuaa
提交
0cbcaef6
提交
0cbcaef6
编写于
5月 15, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ibizdev提交
上级
1f78cff4
变更
30
隐藏空白字符变更
内嵌
并排
正在显示
30 个修改的文件
包含
222 行增加
和
72 行删除
+222
-72
CHANGELOG.md
app_web/CHANGELOG.md
+43
-0
app-form-druipart.vue
...eb/src/components/app-form-druipart/app-form-druipart.vue
+3
-1
sys-permissionedit-view-base.vue
.../sys-permissionedit-view/sys-permissionedit-view-base.vue
+3
-3
sys-permissionedit-view2-base.vue
...ys-permissionedit-view2/sys-permissionedit-view2-base.vue
+3
-3
sys-permissiongrid-view-base.vue
.../sys-permissiongrid-view/sys-permissiongrid-view-base.vue
+6
-3
sys-role-permissionedit-view-base.vue
...permissionedit-view/sys-role-permissionedit-view-base.vue
+3
-3
sys-role-permissionedit-view2-base.vue
...rmissionedit-view2/sys-role-permissionedit-view2-base.vue
+3
-3
sys-role-permissiongrid-view-base.vue
...permissiongrid-view/sys-role-permissiongrid-view-base.vue
+3
-3
sys-roleedit-view-base.vue
...rc/pages/uaa/sys-roleedit-view/sys-roleedit-view-base.vue
+3
-3
sys-roleedit-view2-base.vue
.../pages/uaa/sys-roleedit-view2/sys-roleedit-view2-base.vue
+3
-3
sys-rolegrid-view-base.vue
...rc/pages/uaa/sys-rolegrid-view/sys-rolegrid-view-base.vue
+6
-3
sys-user-roleedit-view-base.vue
...aa/sys-user-roleedit-view/sys-user-roleedit-view-base.vue
+3
-3
sys-user-roleedit-view2-base.vue
.../sys-user-roleedit-view2/sys-user-roleedit-view2-base.vue
+3
-3
sys-user-rolegrid-view-base.vue
...aa/sys-user-rolegrid-view/sys-user-rolegrid-view-base.vue
+3
-3
sys-useredit-view-base.vue
...rc/pages/uaa/sys-useredit-view/sys-useredit-view-base.vue
+3
-3
sys-useredit-view2-base.vue
.../pages/uaa/sys-useredit-view2/sys-useredit-view2-base.vue
+3
-3
sys-usergrid-view-base.vue
...rc/pages/uaa/sys-usergrid-view/sys-usergrid-view-base.vue
+6
-3
getters.ts
app_web/src/store/getters.ts
+13
-0
mutations.ts
app_web/src/store/mutations.ts
+12
-0
state.ts
app_web/src/store/state.ts
+1
-0
main-form-base.vue
...b/src/widgets/sys-permission/main-form/main-form-base.vue
+17
-3
main-form-base.vue
.../widgets/sys-role-permission/main-form/main-form-base.vue
+17
-3
main-form-base.vue
app_web/src/widgets/sys-role/main-form/main-form-base.vue
+17
-3
main-form-base.vue
...eb/src/widgets/sys-user-role/main-form/main-form-base.vue
+17
-3
main-form-base.vue
app_web/src/widgets/sys-user/main-form/main-form-base.vue
+17
-3
config.xml
config.xml
+5
-5
Dockerfile
ibzuaa-app/ibzuaa-app-web/src/main/docker/Dockerfile
+1
-1
ibzuaa-app-web.yaml
...aa-app/ibzuaa-app-web/src/main/docker/ibzuaa-app-web.yaml
+3
-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
-3
未找到文件。
app_web/CHANGELOG.md
浏览文件 @
0cbcaef6
## v7.0.0-alpha.4 [2020-5-14]
### Bug修复
修复代码表代码项图标和数据
修复数据多项选择视图UI逻辑不匹配
修复列表高度异常
修复树节点上下文
修复表格(视图)高度,滚动条问题
修复表单loaddraft服务仿真主键丢失修复
修复user显示名称逻辑
修复issue地址为正式环境地址
### 功能新增及优化
#### 模板
模态时视图样式调整
增加菜单权限
增加快速分组搜索或快速搜索表单功能
增加表格内置工具栏
代码表多选控件分割符从分号转化为逗号
#### 基础文件
增加数据选择类插件表格呈现插件
## v7.0.0-alpha.3 [2020-5-10]
### Bug修复
...
...
@@ -65,3 +106,5 @@
## v7.0.0-alpha.1 [2020-4-29]
初始化文件
app_web/src/components/app-form-druipart/app-form-druipart.vue
浏览文件 @
0cbcaef6
...
...
@@ -263,7 +263,9 @@ export default class AppFormDRUIPart extends Vue {
}
}
if
(
!
this
.
isForbidLoad
){
this
.
formDruipart
.
next
({
action
:
'load'
,
data
:{
srfparentdename
:
this
.
parentName
,
srfparentkey
:
_paramitem
}});
this
.
$nextTick
(()
=>
{
this
.
formDruipart
.
next
({
action
:
'load'
,
data
:{
srfparentdename
:
this
.
parentName
,
srfparentkey
:
_paramitem
}});
});
}
}
...
...
app_web/src/pages/uaa/sys-permissionedit-view/sys-permissionedit-view-base.vue
浏览文件 @
0cbcaef6
...
...
@@ -899,14 +899,14 @@ export default class SYS_PERMISSIONEditViewBase extends Vue {
const
data
:
any
=
{};
if
(
args
.
length
>
0
)
{
Object
.
assign
(
data
,
{
srfsourcekey
:
args
[
0
].
srfkey
})
actionContext
.
$store
.
commit
(
'addCopyData'
,
{
srfkey
:
args
[
0
].
srfkey
,
copyData
:
args
[
0
]
});
}
_this
.
newdata
([{
...
data
}],[{
...
data
}],
params
,
$event
,
xData
);
}
else
if
(
xData
&&
xData
.
copy
instanceof
Function
)
{
const
data2
:
any
=
{};
if
(
args
.
length
>
0
)
{
Object
.
assign
(
data2
,
{
srfsourcekey
:
args
[
0
].
srfkey
})
actionContext
.
$store
.
commit
(
'addCopyData'
,
{
srfkey
:
args
[
0
].
srfkey
,
copyData
:
args
[
0
]
});
}
xData
.
copy
(
data2
);
xData
.
copy
(
args
[
0
].
srfkey
);
}
else
{
_this
.
$Notice
.
error
({
title
:
'错误'
,
desc
:
'opendata 视图处理逻辑不存在,请添加!'
});
}
...
...
app_web/src/pages/uaa/sys-permissionedit-view2/sys-permissionedit-view2-base.vue
浏览文件 @
0cbcaef6
...
...
@@ -931,14 +931,14 @@ export default class SYS_PERMISSIONEditView2Base extends Vue {
const
data
:
any
=
{};
if
(
args
.
length
>
0
)
{
Object
.
assign
(
data
,
{
srfsourcekey
:
args
[
0
].
srfkey
})
actionContext
.
$store
.
commit
(
'addCopyData'
,
{
srfkey
:
args
[
0
].
srfkey
,
copyData
:
args
[
0
]
});
}
_this
.
newdata
([{
...
data
}],[{
...
data
}],
params
,
$event
,
xData
);
}
else
if
(
xData
&&
xData
.
copy
instanceof
Function
)
{
const
data2
:
any
=
{};
if
(
args
.
length
>
0
)
{
Object
.
assign
(
data2
,
{
srfsourcekey
:
args
[
0
].
srfkey
})
actionContext
.
$store
.
commit
(
'addCopyData'
,
{
srfkey
:
args
[
0
].
srfkey
,
copyData
:
args
[
0
]
});
}
xData
.
copy
(
data2
);
xData
.
copy
(
args
[
0
].
srfkey
);
}
else
{
_this
.
$Notice
.
error
({
title
:
'错误'
,
desc
:
'opendata 视图处理逻辑不存在,请添加!'
});
}
...
...
app_web/src/pages/uaa/sys-permissiongrid-view/sys-permissiongrid-view-base.vue
浏览文件 @
0cbcaef6
...
...
@@ -956,6 +956,9 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
*/
public
newdata
(
args
:
any
[],
fullargs
?:
any
[],
params
?:
any
,
$event
?:
any
,
xData
?:
any
)
{
const
data
:
any
=
{};
if
(
args
[
0
].
srfsourcekey
){
data
.
srfsourcekey
=
args
[
0
].
srfsourcekey
;
}
let
curViewParam
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
context
));
if
(
args
.
length
>
0
){
Object
.
assign
(
curViewParam
,
args
[
0
]);
...
...
@@ -1098,14 +1101,14 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
const
data
:
any
=
{};
if
(
args
.
length
>
0
)
{
Object
.
assign
(
data
,
{
srfsourcekey
:
args
[
0
].
srfkey
})
actionContext
.
$store
.
commit
(
'addCopyData'
,
{
srfkey
:
args
[
0
].
srfkey
,
copyData
:
args
[
0
]
});
}
_this
.
newdata
([{
...
data
}],[{
...
data
}],
params
,
$event
,
xData
);
}
else
if
(
xData
&&
xData
.
copy
instanceof
Function
)
{
const
data2
:
any
=
{};
if
(
args
.
length
>
0
)
{
Object
.
assign
(
data2
,
{
srfsourcekey
:
args
[
0
].
srfkey
})
actionContext
.
$store
.
commit
(
'addCopyData'
,
{
srfkey
:
args
[
0
].
srfkey
,
copyData
:
args
[
0
]
});
}
xData
.
copy
(
data2
);
xData
.
copy
(
args
[
0
].
srfkey
);
}
else
{
_this
.
$Notice
.
error
({
title
:
'错误'
,
desc
:
'opendata 视图处理逻辑不存在,请添加!'
});
}
...
...
app_web/src/pages/uaa/sys-role-permissionedit-view/sys-role-permissionedit-view-base.vue
浏览文件 @
0cbcaef6
...
...
@@ -899,14 +899,14 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue {
const
data
:
any
=
{};
if
(
args
.
length
>
0
)
{
Object
.
assign
(
data
,
{
srfsourcekey
:
args
[
0
].
srfkey
})
actionContext
.
$store
.
commit
(
'addCopyData'
,
{
srfkey
:
args
[
0
].
srfkey
,
copyData
:
args
[
0
]
});
}
_this
.
newdata
([{
...
data
}],[{
...
data
}],
params
,
$event
,
xData
);
}
else
if
(
xData
&&
xData
.
copy
instanceof
Function
)
{
const
data2
:
any
=
{};
if
(
args
.
length
>
0
)
{
Object
.
assign
(
data2
,
{
srfsourcekey
:
args
[
0
].
srfkey
})
actionContext
.
$store
.
commit
(
'addCopyData'
,
{
srfkey
:
args
[
0
].
srfkey
,
copyData
:
args
[
0
]
});
}
xData
.
copy
(
data2
);
xData
.
copy
(
args
[
0
].
srfkey
);
}
else
{
_this
.
$Notice
.
error
({
title
:
'错误'
,
desc
:
'opendata 视图处理逻辑不存在,请添加!'
});
}
...
...
app_web/src/pages/uaa/sys-role-permissionedit-view2/sys-role-permissionedit-view2-base.vue
浏览文件 @
0cbcaef6
...
...
@@ -931,14 +931,14 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue {
const
data
:
any
=
{};
if
(
args
.
length
>
0
)
{
Object
.
assign
(
data
,
{
srfsourcekey
:
args
[
0
].
srfkey
})
actionContext
.
$store
.
commit
(
'addCopyData'
,
{
srfkey
:
args
[
0
].
srfkey
,
copyData
:
args
[
0
]
});
}
_this
.
newdata
([{
...
data
}],[{
...
data
}],
params
,
$event
,
xData
);
}
else
if
(
xData
&&
xData
.
copy
instanceof
Function
)
{
const
data2
:
any
=
{};
if
(
args
.
length
>
0
)
{
Object
.
assign
(
data2
,
{
srfsourcekey
:
args
[
0
].
srfkey
})
actionContext
.
$store
.
commit
(
'addCopyData'
,
{
srfkey
:
args
[
0
].
srfkey
,
copyData
:
args
[
0
]
});
}
xData
.
copy
(
data2
);
xData
.
copy
(
args
[
0
].
srfkey
);
}
else
{
_this
.
$Notice
.
error
({
title
:
'错误'
,
desc
:
'opendata 视图处理逻辑不存在,请添加!'
});
}
...
...
app_web/src/pages/uaa/sys-role-permissiongrid-view/sys-role-permissiongrid-view-base.vue
浏览文件 @
0cbcaef6
...
...
@@ -1126,14 +1126,14 @@ export default class SYS_ROLE_PERMISSIONGridViewBase extends Vue {
const
data
:
any
=
{};
if
(
args
.
length
>
0
)
{
Object
.
assign
(
data
,
{
srfsourcekey
:
args
[
0
].
srfkey
})
actionContext
.
$store
.
commit
(
'addCopyData'
,
{
srfkey
:
args
[
0
].
srfkey
,
copyData
:
args
[
0
]
});
}
_this
.
newdata
([{
...
data
}],[{
...
data
}],
params
,
$event
,
xData
);
}
else
if
(
xData
&&
xData
.
copy
instanceof
Function
)
{
const
data2
:
any
=
{};
if
(
args
.
length
>
0
)
{
Object
.
assign
(
data2
,
{
srfsourcekey
:
args
[
0
].
srfkey
})
actionContext
.
$store
.
commit
(
'addCopyData'
,
{
srfkey
:
args
[
0
].
srfkey
,
copyData
:
args
[
0
]
});
}
xData
.
copy
(
data2
);
xData
.
copy
(
args
[
0
].
srfkey
);
}
else
{
_this
.
$Notice
.
error
({
title
:
'错误'
,
desc
:
'opendata 视图处理逻辑不存在,请添加!'
});
}
...
...
app_web/src/pages/uaa/sys-roleedit-view/sys-roleedit-view-base.vue
浏览文件 @
0cbcaef6
...
...
@@ -899,14 +899,14 @@ export default class SYS_ROLEEditViewBase extends Vue {
const
data
:
any
=
{};
if
(
args
.
length
>
0
)
{
Object
.
assign
(
data
,
{
srfsourcekey
:
args
[
0
].
srfkey
})
actionContext
.
$store
.
commit
(
'addCopyData'
,
{
srfkey
:
args
[
0
].
srfkey
,
copyData
:
args
[
0
]
});
}
_this
.
newdata
([{
...
data
}],[{
...
data
}],
params
,
$event
,
xData
);
}
else
if
(
xData
&&
xData
.
copy
instanceof
Function
)
{
const
data2
:
any
=
{};
if
(
args
.
length
>
0
)
{
Object
.
assign
(
data2
,
{
srfsourcekey
:
args
[
0
].
srfkey
})
actionContext
.
$store
.
commit
(
'addCopyData'
,
{
srfkey
:
args
[
0
].
srfkey
,
copyData
:
args
[
0
]
});
}
xData
.
copy
(
data2
);
xData
.
copy
(
args
[
0
].
srfkey
);
}
else
{
_this
.
$Notice
.
error
({
title
:
'错误'
,
desc
:
'opendata 视图处理逻辑不存在,请添加!'
});
}
...
...
app_web/src/pages/uaa/sys-roleedit-view2/sys-roleedit-view2-base.vue
浏览文件 @
0cbcaef6
...
...
@@ -931,14 +931,14 @@ export default class SYS_ROLEEditView2Base extends Vue {
const
data
:
any
=
{};
if
(
args
.
length
>
0
)
{
Object
.
assign
(
data
,
{
srfsourcekey
:
args
[
0
].
srfkey
})
actionContext
.
$store
.
commit
(
'addCopyData'
,
{
srfkey
:
args
[
0
].
srfkey
,
copyData
:
args
[
0
]
});
}
_this
.
newdata
([{
...
data
}],[{
...
data
}],
params
,
$event
,
xData
);
}
else
if
(
xData
&&
xData
.
copy
instanceof
Function
)
{
const
data2
:
any
=
{};
if
(
args
.
length
>
0
)
{
Object
.
assign
(
data2
,
{
srfsourcekey
:
args
[
0
].
srfkey
})
actionContext
.
$store
.
commit
(
'addCopyData'
,
{
srfkey
:
args
[
0
].
srfkey
,
copyData
:
args
[
0
]
});
}
xData
.
copy
(
data2
);
xData
.
copy
(
args
[
0
].
srfkey
);
}
else
{
_this
.
$Notice
.
error
({
title
:
'错误'
,
desc
:
'opendata 视图处理逻辑不存在,请添加!'
});
}
...
...
app_web/src/pages/uaa/sys-rolegrid-view/sys-rolegrid-view-base.vue
浏览文件 @
0cbcaef6
...
...
@@ -956,6 +956,9 @@ export default class SYS_ROLEGridViewBase extends Vue {
*/
public
newdata
(
args
:
any
[],
fullargs
?:
any
[],
params
?:
any
,
$event
?:
any
,
xData
?:
any
)
{
const
data
:
any
=
{};
if
(
args
[
0
].
srfsourcekey
){
data
.
srfsourcekey
=
args
[
0
].
srfsourcekey
;
}
let
curViewParam
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
context
));
if
(
args
.
length
>
0
){
Object
.
assign
(
curViewParam
,
args
[
0
]);
...
...
@@ -1098,14 +1101,14 @@ export default class SYS_ROLEGridViewBase extends Vue {
const
data
:
any
=
{};
if
(
args
.
length
>
0
)
{
Object
.
assign
(
data
,
{
srfsourcekey
:
args
[
0
].
srfkey
})
actionContext
.
$store
.
commit
(
'addCopyData'
,
{
srfkey
:
args
[
0
].
srfkey
,
copyData
:
args
[
0
]
});
}
_this
.
newdata
([{
...
data
}],[{
...
data
}],
params
,
$event
,
xData
);
}
else
if
(
xData
&&
xData
.
copy
instanceof
Function
)
{
const
data2
:
any
=
{};
if
(
args
.
length
>
0
)
{
Object
.
assign
(
data2
,
{
srfsourcekey
:
args
[
0
].
srfkey
})
actionContext
.
$store
.
commit
(
'addCopyData'
,
{
srfkey
:
args
[
0
].
srfkey
,
copyData
:
args
[
0
]
});
}
xData
.
copy
(
data2
);
xData
.
copy
(
args
[
0
].
srfkey
);
}
else
{
_this
.
$Notice
.
error
({
title
:
'错误'
,
desc
:
'opendata 视图处理逻辑不存在,请添加!'
});
}
...
...
app_web/src/pages/uaa/sys-user-roleedit-view/sys-user-roleedit-view-base.vue
浏览文件 @
0cbcaef6
...
...
@@ -899,14 +899,14 @@ export default class SYS_USER_ROLEEditViewBase extends Vue {
const
data
:
any
=
{};
if
(
args
.
length
>
0
)
{
Object
.
assign
(
data
,
{
srfsourcekey
:
args
[
0
].
srfkey
})
actionContext
.
$store
.
commit
(
'addCopyData'
,
{
srfkey
:
args
[
0
].
srfkey
,
copyData
:
args
[
0
]
});
}
_this
.
newdata
([{
...
data
}],[{
...
data
}],
params
,
$event
,
xData
);
}
else
if
(
xData
&&
xData
.
copy
instanceof
Function
)
{
const
data2
:
any
=
{};
if
(
args
.
length
>
0
)
{
Object
.
assign
(
data2
,
{
srfsourcekey
:
args
[
0
].
srfkey
})
actionContext
.
$store
.
commit
(
'addCopyData'
,
{
srfkey
:
args
[
0
].
srfkey
,
copyData
:
args
[
0
]
});
}
xData
.
copy
(
data2
);
xData
.
copy
(
args
[
0
].
srfkey
);
}
else
{
_this
.
$Notice
.
error
({
title
:
'错误'
,
desc
:
'opendata 视图处理逻辑不存在,请添加!'
});
}
...
...
app_web/src/pages/uaa/sys-user-roleedit-view2/sys-user-roleedit-view2-base.vue
浏览文件 @
0cbcaef6
...
...
@@ -931,14 +931,14 @@ export default class SYS_USER_ROLEEditView2Base extends Vue {
const
data
:
any
=
{};
if
(
args
.
length
>
0
)
{
Object
.
assign
(
data
,
{
srfsourcekey
:
args
[
0
].
srfkey
})
actionContext
.
$store
.
commit
(
'addCopyData'
,
{
srfkey
:
args
[
0
].
srfkey
,
copyData
:
args
[
0
]
});
}
_this
.
newdata
([{
...
data
}],[{
...
data
}],
params
,
$event
,
xData
);
}
else
if
(
xData
&&
xData
.
copy
instanceof
Function
)
{
const
data2
:
any
=
{};
if
(
args
.
length
>
0
)
{
Object
.
assign
(
data2
,
{
srfsourcekey
:
args
[
0
].
srfkey
})
actionContext
.
$store
.
commit
(
'addCopyData'
,
{
srfkey
:
args
[
0
].
srfkey
,
copyData
:
args
[
0
]
});
}
xData
.
copy
(
data2
);
xData
.
copy
(
args
[
0
].
srfkey
);
}
else
{
_this
.
$Notice
.
error
({
title
:
'错误'
,
desc
:
'opendata 视图处理逻辑不存在,请添加!'
});
}
...
...
app_web/src/pages/uaa/sys-user-rolegrid-view/sys-user-rolegrid-view-base.vue
浏览文件 @
0cbcaef6
...
...
@@ -1126,14 +1126,14 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
const
data
:
any
=
{};
if
(
args
.
length
>
0
)
{
Object
.
assign
(
data
,
{
srfsourcekey
:
args
[
0
].
srfkey
})
actionContext
.
$store
.
commit
(
'addCopyData'
,
{
srfkey
:
args
[
0
].
srfkey
,
copyData
:
args
[
0
]
});
}
_this
.
newdata
([{
...
data
}],[{
...
data
}],
params
,
$event
,
xData
);
}
else
if
(
xData
&&
xData
.
copy
instanceof
Function
)
{
const
data2
:
any
=
{};
if
(
args
.
length
>
0
)
{
Object
.
assign
(
data2
,
{
srfsourcekey
:
args
[
0
].
srfkey
})
actionContext
.
$store
.
commit
(
'addCopyData'
,
{
srfkey
:
args
[
0
].
srfkey
,
copyData
:
args
[
0
]
});
}
xData
.
copy
(
data2
);
xData
.
copy
(
args
[
0
].
srfkey
);
}
else
{
_this
.
$Notice
.
error
({
title
:
'错误'
,
desc
:
'opendata 视图处理逻辑不存在,请添加!'
});
}
...
...
app_web/src/pages/uaa/sys-useredit-view/sys-useredit-view-base.vue
浏览文件 @
0cbcaef6
...
...
@@ -899,14 +899,14 @@ export default class SYS_USEREditViewBase extends Vue {
const
data
:
any
=
{};
if
(
args
.
length
>
0
)
{
Object
.
assign
(
data
,
{
srfsourcekey
:
args
[
0
].
srfkey
})
actionContext
.
$store
.
commit
(
'addCopyData'
,
{
srfkey
:
args
[
0
].
srfkey
,
copyData
:
args
[
0
]
});
}
_this
.
newdata
([{
...
data
}],[{
...
data
}],
params
,
$event
,
xData
);
}
else
if
(
xData
&&
xData
.
copy
instanceof
Function
)
{
const
data2
:
any
=
{};
if
(
args
.
length
>
0
)
{
Object
.
assign
(
data2
,
{
srfsourcekey
:
args
[
0
].
srfkey
})
actionContext
.
$store
.
commit
(
'addCopyData'
,
{
srfkey
:
args
[
0
].
srfkey
,
copyData
:
args
[
0
]
});
}
xData
.
copy
(
data2
);
xData
.
copy
(
args
[
0
].
srfkey
);
}
else
{
_this
.
$Notice
.
error
({
title
:
'错误'
,
desc
:
'opendata 视图处理逻辑不存在,请添加!'
});
}
...
...
app_web/src/pages/uaa/sys-useredit-view2/sys-useredit-view2-base.vue
浏览文件 @
0cbcaef6
...
...
@@ -931,14 +931,14 @@ export default class SYS_USEREditView2Base extends Vue {
const
data
:
any
=
{};
if
(
args
.
length
>
0
)
{
Object
.
assign
(
data
,
{
srfsourcekey
:
args
[
0
].
srfkey
})
actionContext
.
$store
.
commit
(
'addCopyData'
,
{
srfkey
:
args
[
0
].
srfkey
,
copyData
:
args
[
0
]
});
}
_this
.
newdata
([{
...
data
}],[{
...
data
}],
params
,
$event
,
xData
);
}
else
if
(
xData
&&
xData
.
copy
instanceof
Function
)
{
const
data2
:
any
=
{};
if
(
args
.
length
>
0
)
{
Object
.
assign
(
data2
,
{
srfsourcekey
:
args
[
0
].
srfkey
})
actionContext
.
$store
.
commit
(
'addCopyData'
,
{
srfkey
:
args
[
0
].
srfkey
,
copyData
:
args
[
0
]
});
}
xData
.
copy
(
data2
);
xData
.
copy
(
args
[
0
].
srfkey
);
}
else
{
_this
.
$Notice
.
error
({
title
:
'错误'
,
desc
:
'opendata 视图处理逻辑不存在,请添加!'
});
}
...
...
app_web/src/pages/uaa/sys-usergrid-view/sys-usergrid-view-base.vue
浏览文件 @
0cbcaef6
...
...
@@ -956,6 +956,9 @@ export default class SYS_USERGridViewBase extends Vue {
*/
public
newdata
(
args
:
any
[],
fullargs
?:
any
[],
params
?:
any
,
$event
?:
any
,
xData
?:
any
)
{
const
data
:
any
=
{};
if
(
args
[
0
].
srfsourcekey
){
data
.
srfsourcekey
=
args
[
0
].
srfsourcekey
;
}
let
curViewParam
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
context
));
if
(
args
.
length
>
0
){
Object
.
assign
(
curViewParam
,
args
[
0
]);
...
...
@@ -1098,14 +1101,14 @@ export default class SYS_USERGridViewBase extends Vue {
const
data
:
any
=
{};
if
(
args
.
length
>
0
)
{
Object
.
assign
(
data
,
{
srfsourcekey
:
args
[
0
].
srfkey
})
actionContext
.
$store
.
commit
(
'addCopyData'
,
{
srfkey
:
args
[
0
].
srfkey
,
copyData
:
args
[
0
]
});
}
_this
.
newdata
([{
...
data
}],[{
...
data
}],
params
,
$event
,
xData
);
}
else
if
(
xData
&&
xData
.
copy
instanceof
Function
)
{
const
data2
:
any
=
{};
if
(
args
.
length
>
0
)
{
Object
.
assign
(
data2
,
{
srfsourcekey
:
args
[
0
].
srfkey
})
actionContext
.
$store
.
commit
(
'addCopyData'
,
{
srfkey
:
args
[
0
].
srfkey
,
copyData
:
args
[
0
]
});
}
xData
.
copy
(
data2
);
xData
.
copy
(
args
[
0
].
srfkey
);
}
else
{
_this
.
$Notice
.
error
({
title
:
'错误'
,
desc
:
'opendata 视图处理逻辑不存在,请添加!'
});
}
...
...
app_web/src/store/getters.ts
浏览文件 @
0cbcaef6
...
...
@@ -75,4 +75,17 @@ export const getZIndex = (state: any) => () => {
*/
export
const
getViewSplit
=
(
state
:
any
)
=>
(
viewUID
:
string
)
=>
{
return
state
.
viewSplit
[
viewUID
];
}
/**
* 获取拷贝数据
*
* @param state
*/
export
const
getCopyData
=
(
state
:
any
)
=>
(
srfkey
:
string
)
=>
{
let
copyData
=
state
.
copyDataMap
[
srfkey
];
if
(
copyData
){
delete
state
.
copyDataMap
[
srfkey
];
}
return
copyData
;
}
\ No newline at end of file
app_web/src/store/mutations.ts
浏览文件 @
0cbcaef6
...
...
@@ -253,4 +253,16 @@ export const updateZIndex = (state: any, zIndex: number) => {
*/
export
const
setViewSplit
=
(
state
:
any
,
args
:
{
viewSplit
:
number
,
viewUID
:
string
})
=>
{
state
.
viewSplit
[
args
.
viewUID
]
=
args
.
viewSplit
;
}
/**
* 添加拷贝数据
*
* @param state
* @param localdata
*/
export
const
addCopyData
=
(
state
:
any
,
args
:
{
srfkey
:
string
,
copyData
:
any
})
=>
{
if
(
args
&&
args
.
srfkey
&&
args
.
copyData
){
state
.
copyDataMap
[
args
.
srfkey
]
=
JSON
.
parse
(
JSON
.
stringify
(
args
.
copyData
));
}
}
\ No newline at end of file
app_web/src/store/state.ts
浏览文件 @
0cbcaef6
...
...
@@ -13,4 +13,5 @@ export const rootstate: any = {
localdata
:
{},
zIndex
:
300
,
viewSplit
:
{},
copyDataMap
:{},
}
\ No newline at end of file
app_web/src/widgets/sys-permission/main-form/main-form-base.vue
浏览文件 @
0cbcaef6
...
...
@@ -873,7 +873,11 @@ export default class MainBase extends Vue implements ControlInterface {
this
.
load
(
data
);
}
if
(
Object
.
is
(
'loaddraft'
,
action
))
{
this
.
loadDraft
(
data
);
if
(
this
.
context
.
srfsourcekey
){
this
.
copy
(
this
.
context
.
srfsourcekey
);
}
else
{
this
.
loadDraft
(
data
);
}
}
if
(
Object
.
is
(
'save'
,
action
))
{
this
.
save
(
data
,
data
.
showResultInfo
);
...
...
@@ -937,8 +941,18 @@ export default class MainBase extends Vue implements ControlInterface {
* @param {*} [arg={}]
* @memberof @memberof Main
*/
public
copy
(
arg
:
any
=
{}):
void
{
this
.
loadDraft
(
arg
);
public
copy
(
srfkey
:
string
):
void
{
let
copyData
=
this
.
$store
.
getters
.
getCopyData
(
srfkey
);
copyData
.
srfkey
=
Util
.
createUUID
();
copyData
.
sys_permission
=
copyData
.
srfkey
;
copyData
.
permissionid
=
copyData
.
srfkey
;
Object
.
assign
(
this
.
context
,{
sys_permission
:
copyData
.
sys_permission
})
this
.
data
=
copyData
;
this
.
$nextTick
(()
=>
{
this
.
formState
.
next
({
type
:
'load'
,
data
:
copyData
});
this
.
data
.
srfuf
=
'0'
;
this
.
setFormEnableCond
(
this
.
data
);
});
}
/**
...
...
app_web/src/widgets/sys-role-permission/main-form/main-form-base.vue
浏览文件 @
0cbcaef6
...
...
@@ -965,7 +965,11 @@ export default class MainBase extends Vue implements ControlInterface {
this
.
load
(
data
);
}
if
(
Object
.
is
(
'loaddraft'
,
action
))
{
this
.
loadDraft
(
data
);
if
(
this
.
context
.
srfsourcekey
){
this
.
copy
(
this
.
context
.
srfsourcekey
);
}
else
{
this
.
loadDraft
(
data
);
}
}
if
(
Object
.
is
(
'save'
,
action
))
{
this
.
save
(
data
,
data
.
showResultInfo
);
...
...
@@ -1029,8 +1033,18 @@ export default class MainBase extends Vue implements ControlInterface {
* @param {*} [arg={}]
* @memberof @memberof Main
*/
public
copy
(
arg
:
any
=
{}):
void
{
this
.
loadDraft
(
arg
);
public
copy
(
srfkey
:
string
):
void
{
let
copyData
=
this
.
$store
.
getters
.
getCopyData
(
srfkey
);
copyData
.
srfkey
=
Util
.
createUUID
();
copyData
.
sys_role_permission
=
copyData
.
srfkey
;
copyData
.
rolepermissionid
=
copyData
.
srfkey
;
Object
.
assign
(
this
.
context
,{
sys_role_permission
:
copyData
.
sys_role_permission
})
this
.
data
=
copyData
;
this
.
$nextTick
(()
=>
{
this
.
formState
.
next
({
type
:
'load'
,
data
:
copyData
});
this
.
data
.
srfuf
=
'0'
;
this
.
setFormEnableCond
(
this
.
data
);
});
}
/**
...
...
app_web/src/widgets/sys-role/main-form/main-form-base.vue
浏览文件 @
0cbcaef6
...
...
@@ -982,7 +982,11 @@ export default class MainBase extends Vue implements ControlInterface {
this
.
load
(
data
);
}
if
(
Object
.
is
(
'loaddraft'
,
action
))
{
this
.
loadDraft
(
data
);
if
(
this
.
context
.
srfsourcekey
){
this
.
copy
(
this
.
context
.
srfsourcekey
);
}
else
{
this
.
loadDraft
(
data
);
}
}
if
(
Object
.
is
(
'save'
,
action
))
{
this
.
save
(
data
,
data
.
showResultInfo
);
...
...
@@ -1046,8 +1050,18 @@ export default class MainBase extends Vue implements ControlInterface {
* @param {*} [arg={}]
* @memberof @memberof Main
*/
public
copy
(
arg
:
any
=
{}):
void
{
this
.
loadDraft
(
arg
);
public
copy
(
srfkey
:
string
):
void
{
let
copyData
=
this
.
$store
.
getters
.
getCopyData
(
srfkey
);
copyData
.
srfkey
=
Util
.
createUUID
();
copyData
.
sys_role
=
copyData
.
srfkey
;
copyData
.
roleid
=
copyData
.
srfkey
;
Object
.
assign
(
this
.
context
,{
sys_role
:
copyData
.
sys_role
})
this
.
data
=
copyData
;
this
.
$nextTick
(()
=>
{
this
.
formState
.
next
({
type
:
'load'
,
data
:
copyData
});
this
.
data
.
srfuf
=
'0'
;
this
.
setFormEnableCond
(
this
.
data
);
});
}
/**
...
...
app_web/src/widgets/sys-user-role/main-form/main-form-base.vue
浏览文件 @
0cbcaef6
...
...
@@ -1006,7 +1006,11 @@ export default class MainBase extends Vue implements ControlInterface {
this
.
load
(
data
);
}
if
(
Object
.
is
(
'loaddraft'
,
action
))
{
this
.
loadDraft
(
data
);
if
(
this
.
context
.
srfsourcekey
){
this
.
copy
(
this
.
context
.
srfsourcekey
);
}
else
{
this
.
loadDraft
(
data
);
}
}
if
(
Object
.
is
(
'save'
,
action
))
{
this
.
save
(
data
,
data
.
showResultInfo
);
...
...
@@ -1070,8 +1074,18 @@ export default class MainBase extends Vue implements ControlInterface {
* @param {*} [arg={}]
* @memberof @memberof Main
*/
public
copy
(
arg
:
any
=
{}):
void
{
this
.
loadDraft
(
arg
);
public
copy
(
srfkey
:
string
):
void
{
let
copyData
=
this
.
$store
.
getters
.
getCopyData
(
srfkey
);
copyData
.
srfkey
=
Util
.
createUUID
();
copyData
.
sys_user_role
=
copyData
.
srfkey
;
copyData
.
userroleid
=
copyData
.
srfkey
;
Object
.
assign
(
this
.
context
,{
sys_user_role
:
copyData
.
sys_user_role
})
this
.
data
=
copyData
;
this
.
$nextTick
(()
=>
{
this
.
formState
.
next
({
type
:
'load'
,
data
:
copyData
});
this
.
data
.
srfuf
=
'0'
;
this
.
setFormEnableCond
(
this
.
data
);
});
}
/**
...
...
app_web/src/widgets/sys-user/main-form/main-form-base.vue
浏览文件 @
0cbcaef6
...
...
@@ -883,7 +883,11 @@ export default class MainBase extends Vue implements ControlInterface {
this
.
load
(
data
);
}
if
(
Object
.
is
(
'loaddraft'
,
action
))
{
this
.
loadDraft
(
data
);
if
(
this
.
context
.
srfsourcekey
){
this
.
copy
(
this
.
context
.
srfsourcekey
);
}
else
{
this
.
loadDraft
(
data
);
}
}
if
(
Object
.
is
(
'save'
,
action
))
{
this
.
save
(
data
,
data
.
showResultInfo
);
...
...
@@ -947,8 +951,18 @@ export default class MainBase extends Vue implements ControlInterface {
* @param {*} [arg={}]
* @memberof @memberof Main
*/
public
copy
(
arg
:
any
=
{}):
void
{
this
.
loadDraft
(
arg
);
public
copy
(
srfkey
:
string
):
void
{
let
copyData
=
this
.
$store
.
getters
.
getCopyData
(
srfkey
);
copyData
.
srfkey
=
Util
.
createUUID
();
copyData
.
sys_user
=
copyData
.
srfkey
;
copyData
.
userid
=
copyData
.
srfkey
;
Object
.
assign
(
this
.
context
,{
sys_user
:
copyData
.
sys_user
})
this
.
data
=
copyData
;
this
.
$nextTick
(()
=>
{
this
.
formState
.
next
({
type
:
'load'
,
data
:
copyData
});
this
.
data
.
srfuf
=
'0'
;
this
.
setFormEnableCond
(
this
.
data
);
});
}
/**
...
...
config.xml
浏览文件 @
0cbcaef6
...
...
@@ -37,11 +37,11 @@
git clone -b master $para2 ibzuaa/
export NODE_OPTIONS=--max-old-space-size=4096
cd ibzuaa/
mvn clean package -P
api
cd ibzuaa-
provider/ibzuaa-provider-api
mvn -P
api
docker:build
mvn -P
api
docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/ibzuaa-
provider-api.yaml ibzlab-rt --with-registry-auth
mvn clean package -P
web
cd ibzuaa-
app/ibzuaa-app-web
mvn -P
web
docker:build
mvn -P
web
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
浏览文件 @
0cbcaef6
...
...
@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzuaa-app-web.jar
EXPOSE
8080
EXPOSE
30002
ADD
ibzuaa-app-web.jar /ibzuaa-app-web.jar
ibzuaa-app/ibzuaa-app-web/src/main/docker/ibzuaa-app-web.yaml
浏览文件 @
0cbcaef6
...
...
@@ -3,9 +3,11 @@ services:
ibzuaa-app-web
:
image
:
registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-app-web:latest
ports
:
-
"
8080:8080
"
-
"
30002:30002
"
networks
:
-
agent_network
environment
:
SPRING_CLOUD_NACOS_DISCOVERY_IP
:
172.16.180.237
deploy
:
mode
:
replicated
replicas
:
1
...
...
ibzuaa-provider/ibzuaa-provider-api/src/main/docker/Dockerfile
浏览文件 @
0cbcaef6
...
...
@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \
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
ibzuaa-provider/ibzuaa-provider-api/src/main/docker/ibzuaa-provider-api.yaml
浏览文件 @
0cbcaef6
...
...
@@ -3,11 +3,9 @@ services:
ibzuaa-provider-api
:
image
:
registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-provider-api:latest
ports
:
-
"
40002:40002
"
-
"
8081:8081
"
networks
:
-
agent_network
environment
:
SPRING_CLOUD_NACOS_DISCOVERY_IP
:
172.16.180.237
deploy
:
mode
:
replicated
replicas
:
1
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录