Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibzou
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibzou
提交
6d390077
提交
6d390077
编写于
6月 11, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
zhouweidong@lab.ibiz5.com 发布系统代码
上级
1fa53301
变更
25
展开全部
显示空白字符变更
内嵌
并排
正在显示
25 个修改的文件
包含
228 行增加
和
317 行删除
+228
-317
CHANGELOG.md
app_web/CHANGELOG.md
+62
-0
app-form-item.less
app_web/src/components/app-form-item/app-form-item.less
+27
-0
app-form-item.vue
app_web/src/components/app-form-item/app-form-item.vue
+55
-7
app-transfer.vue
app_web/src/components/app-transfer/app-transfer.vue
+47
-21
edit-view2-engine.ts
app_web/src/engine/view/edit-view2-engine.ts
+2
-0
edit-view3-engine.ts
app_web/src/engine/view/edit-view3-engine.ts
+2
-0
uiaction-tool.ts
app_web/src/utils/uiaction-tool/uiaction-tool.ts
+1
-1
view-tool.ts
app_web/src/utils/view-tool/view-tool.ts
+2
-2
edit-grid-grid-base.vue
...gets/ibzdepartment/edit-grid-grid/edit-grid-grid-base.vue
+1
-0
main-grid-base.vue
...eb/src/widgets/ibzdepartment/main-grid/main-grid-base.vue
+1
-0
main-grid-base.vue
...b/src/widgets/ibzdept-member/main-grid/main-grid-base.vue
+1
-0
edit-grid-grid-base.vue
...idgets/ibzemployee/edit-grid-grid/edit-grid-grid-base.vue
+1
-0
main-grid-base.vue
app_web/src/widgets/ibzemployee/main-grid/main-grid-base.vue
+1
-0
main-grid-base.vue
.../src/widgets/ibzorganization/main-grid/main-grid-base.vue
+1
-0
config.xml
config.xml
+0
-5
IBZDepartment.java
...rc/main/java/cn/ibizlab/core/ou/domain/IBZDepartment.java
+2
-0
IBZDeptMember.java
...rc/main/java/cn/ibizlab/core/ou/domain/IBZDeptMember.java
+2
-0
IBZEmployee.java
.../src/main/java/cn/ibizlab/core/ou/domain/IBZEmployee.java
+2
-0
IBZOrganization.java
.../main/java/cn/ibizlab/core/ou/domain/IBZOrganization.java
+2
-0
IBZPost.java
...core/src/main/java/cn/ibizlab/core/ou/domain/IBZPost.java
+2
-0
IBZTeam.java
...core/src/main/java/cn/ibizlab/core/ou/domain/IBZTeam.java
+2
-0
IBZTeamMember.java
...rc/main/java/cn/ibizlab/core/ou/domain/IBZTeamMember.java
+2
-0
h2_table.xml
ibzou-core/src/main/resources/liquibase/h2_table.xml
+8
-267
Dockerfile
ibzou-provider/ibzou-provider-api/src/main/docker/Dockerfile
+1
-1
ibzou-provider-api.yaml
...bzou-provider-api/src/main/docker/ibzou-provider-api.yaml
+1
-13
未找到文件。
app_web/CHANGELOG.md
浏览文件 @
6d390077
## v7.0.0-alpha.9 [2020-6-11]
### Bug修复
数值代码表多语言
树右键菜单滚动条样式bug
列表面板界面行为bug
多选视图界面逻辑修复
图表刷新bug修复
日历部件选中抛出数据逻辑调整
编辑视图,app-span显示0时不显示
树视图右键界面行为刷新bug
快捷菜单控制台报错bug
门户加载自定义模型错误时,正常显示默认看板
修复雷达图显示异常问题
修复编辑类、分页导航视图带数据标题问题
修复饼图、漏斗图 获取序列参数错误问题
### 功能新增及优化
#### 模板
看板和门户布局模板调整,支持门户部件标题栏界面行为组
支持数据选择、地址框、自动完成、下拉列表、标签、选项框列表、单选列表等编辑器导航参数调整
支持树导航栏、表格导航栏、列表导航栏、卡片导航栏、日历导航栏、表单关系界面、数据选择面板、分页导航面板、数据关系栏、界面行为、新建逻辑、编辑逻辑导航参数调整
支持图表无数据时显示暂无数据
支持表格新建默认值
支持日历部件右键菜单
支持表格列触发界面行为
面板布局调整
#### 基础文件
门户部件视图的样式
数据选择,地址框,自动完成,下拉列表,标签,选项框列表,单选列表等编辑器导航参数调整
表单项label位置
调整登录页面
穿梭框编辑器支持
## v7.0.0-alpha.8 [2020-6-4]
## v7.0.0-alpha.8 [2020-6-4]
### Bug修复
### Bug修复
...
...
app_web/src/components/app-form-item/app-form-item.less
浏览文件 @
6d390077
...
@@ -17,3 +17,30 @@
...
@@ -17,3 +17,30 @@
padding: 0 0 10px;
padding: 0 0 10px;
}
}
}
}
.app-form-item-label-left{
.app-form-item-label{
float: left;
text-align: right;
padding-right: 12px;
}
}
.app-form-item-label-right{
.app-form-item-label{
float: right;
text-align: left;
padding-left: 12px;
}
}
.app-form-item-label-top{
.app-form-item-label{
display: block;
padding-bottom: 10px;
}
}
.app-form-item-label-bottom{
.app-form-item-label{
display: block;
padding-top: 10px;
}
}
\ No newline at end of file
app_web/src/components/app-form-item/app-form-item.vue
浏览文件 @
6d390077
...
@@ -21,12 +21,16 @@
...
@@ -21,12 +21,16 @@
:error=
"error"
:error=
"error"
:required=
"required"
:required=
"required"
:rules=
"rules"
:rules=
"rules"
:class=
"classes"
:class=
"classes"
>
:label-width=
"this.isShowCaption ? !Object.is(this.labelPos, 'TOP') ? this.labelWidth : null : 0"
>
<div
v-if=
"Object.is(this.labelPos,'BOTTOM') || Object.is(this.labelPos,'NONE') || !this.labelPos"
class=
"slot-editor"
:style=
"slotstyle"
>
<span
slot=
'label'
v-if=
"this.isShowCaption && this.labelWidth > 0"
:class=
"labelclasses"
>
<slot></slot>
</div>
<span
v-if=
"!Object.is(this.labelPos,'NONE') && this.isShowCaption && this.labelWidth > 0"
:style=
"labelstyle"
:class=
"labelclasses"
>
{{
this
.
isEmptyCaption
?
''
:
this
.
caption
}}
{{
this
.
isEmptyCaption
?
''
:
this
.
caption
}}
</span>
</span>
<div
v-if=
"Object.is(this.labelPos,'TOP') || Object.is(this.labelPos,'LEFT') || Object.is(this.labelPos,'RIGHT')"
class=
"slot-editor"
:style=
"slotstyle"
>
<slot></slot>
<slot></slot>
</div>
</form-item>
</form-item>
</div>
</div>
</div>
</div>
...
@@ -167,9 +171,27 @@ export default class AppFormItem extends Vue {
...
@@ -167,9 +171,27 @@ export default class AppFormItem extends Vue {
* @memberof AppFormItem
* @memberof AppFormItem
*/
*/
get
classes
():
string
[]
{
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
[
return
[
'app-form-item'
,
'app-form-item'
,
Object
.
is
(
this
.
labelPos
,
'TOP'
)
?
'app-form-item-label-top'
:
''
posClass
];
];
}
}
...
@@ -181,7 +203,33 @@ export default class AppFormItem extends Vue {
...
@@ -181,7 +203,33 @@ export default class AppFormItem extends Vue {
* @memberof AppFormItem
* @memberof AppFormItem
*/
*/
get
labelclasses
():
string
{
get
labelclasses
():
string
{
return
this
.
labelStyle
?
this
.
labelStyle
:
''
;
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'
};
}
/**
* 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'
};
}
}
}
/**
/**
...
...
app_web/src/components/app-transfer/app-transfer.vue
浏览文件 @
6d390077
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
@
on-open-change=
"transferRefresh"
@
on-open-change=
"transferRefresh"
@
on-change=
"dataChange"
@
on-change=
"dataChange"
v-model=
"dataRight"
v-model=
"dataRight"
:style=
"
{width:width}"
:style=
"
{width:width
===undefined?'586px':width
}"
multiple
multiple
>
>
<Option
class=
"hidden"
:value=
"item"
v-for=
"(item,i) in dataRight"
:key=
"i"
>
{{
findLabel
(
item
)
}}
</Option>
<Option
class=
"hidden"
:value=
"item"
v-for=
"(item,i) in dataRight"
:key=
"i"
>
{{
findLabel
(
item
)
}}
</Option>
...
@@ -17,7 +17,6 @@ import { ElSelect } from "element-ui/types/select";
...
@@ -17,7 +17,6 @@ import { ElSelect } from "element-ui/types/select";
@
Component
({})
@
Component
({})
export
default
class
AppTransfer
extends
Vue
{
export
default
class
AppTransfer
extends
Vue
{
/**
/**
* 左侧框数据
* 左侧框数据
*/
*/
...
@@ -31,7 +30,7 @@ export default class AppTransfer extends Vue {
...
@@ -31,7 +30,7 @@ export default class AppTransfer extends Vue {
/**
/**
* 穿梭框宽度
* 穿梭框宽度
*/
*/
@
Prop
()
public
width
:
any
;
@
Prop
()
public
width
:
any
;
/**
/**
* 代码表服务对象
* 代码表服务对象
...
@@ -54,7 +53,7 @@ export default class AppTransfer extends Vue {
...
@@ -54,7 +53,7 @@ export default class AppTransfer extends Vue {
/**
/**
* 表单传入字符串值分隔符
* 表单传入字符串值分隔符
*/
*/
@
Prop
()
public
valueSeparator
?
:
string
;
@
Prop
()
public
valueSeparator
!
:
string
;
/**
/**
* 当前选中值
* 当前选中值
* @type {any}
* @type {any}
...
@@ -78,27 +77,48 @@ export default class AppTransfer extends Vue {
...
@@ -78,27 +77,48 @@ export default class AppTransfer extends Vue {
*/
*/
@
Prop
()
public
codelistType
?:
string
;
@
Prop
()
public
codelistType
?:
string
;
/**
* 局部上下文导航参数
*
* @type {*}
* @memberof AppTransfer
*/
@
Prop
()
public
localContext
!
:
any
;
/**
* 局部导航参数
*
* @type {*}
* @memberof AppTransfer
*/
@
Prop
()
public
localParam
!
:
any
;
/**
/**
* 组件change事件,右侧框数据变化时
* 组件change事件,右侧框数据变化时
* @memberof AppTransfer
* @memberof AppTransfer
*/
*/
dataChange
(
e
:
any
)
{
dataChange
(
e
:
any
)
{
let
_valueSeparator
:
any
;
_valueSeparator
=
this
.
initValueSeparator
(
_valueSeparator
);
let
newVal
:
any
;
let
newVal
:
any
;
newVal
=
e
.
join
(
`
${
this
.
valueSeparator
}
`
);
newVal
=
e
.
join
(
`
${
_
valueSeparator
}
`
);
if
(
newVal
)
{
if
(
newVal
)
{
this
.
$emit
(
"change"
,
newVal
);
this
.
$emit
(
"change"
,
newVal
);
}
else
{
}
else
{
this
.
$emit
(
"change"
,
null
);
this
.
$emit
(
"change"
,
null
);
}
}
}
}
/**
/**
* 传入额外参数
* 初始化valueSeparator
*
* @type {*}
* @memberof AppTransfer
*/
*/
@
Prop
()
public
itemParam
?:
any
;
public
initValueSeparator
(
_valueSeparator
:
any
)
{
if
(
this
.
valueSeparator
===
undefined
)
{
return
","
;
}
else
{
return
this
.
valueSeparator
;
}
}
/**
/**
* 视图上下文
* 视图上下文
...
@@ -187,6 +207,7 @@ export default class AppTransfer extends Vue {
...
@@ -187,6 +207,7 @@ export default class AppTransfer extends Vue {
* @returns
* @returns
* @memberof AppTransfer
* @memberof AppTransfer
*/
*/
public
handlePublicParams
(
arg
:
any
)
{
public
handlePublicParams
(
arg
:
any
)
{
// 合并表单参数
// 合并表单参数
arg
.
param
=
this
.
viewparams
arg
.
param
=
this
.
viewparams
...
@@ -194,19 +215,21 @@ export default class AppTransfer extends Vue {
...
@@ -194,19 +215,21 @@ export default class AppTransfer extends Vue {
:
{};
:
{};
arg
.
context
=
this
.
context
?
JSON
.
parse
(
JSON
.
stringify
(
this
.
context
))
:
{};
arg
.
context
=
this
.
context
?
JSON
.
parse
(
JSON
.
stringify
(
this
.
context
))
:
{};
// 附加参数处理
// 附加参数处理
if
(
this
.
itemParam
&&
this
.
itemParam
.
context
)
{
if
(
this
.
localContext
&&
Object
.
keys
(
this
.
localContext
).
length
>
0
)
{
let
_context
=
this
.
$util
.
format
Data
(
let
_context
=
this
.
$util
.
computedNav
Data
(
this
.
itemValue
,
this
.
itemValue
,
arg
.
context
,
arg
.
context
,
this
.
itemParam
.
context
arg
.
param
,
this
.
localContext
);
);
Object
.
assign
(
arg
.
context
,
_context
);
Object
.
assign
(
arg
.
context
,
_context
);
}
}
if
(
this
.
itemParam
&&
this
.
itemParam
.
param
)
{
if
(
this
.
localParam
&&
Object
.
keys
(
this
.
localParam
).
length
>
0
)
{
let
_param
=
this
.
$util
.
format
Data
(
let
_param
=
this
.
$util
.
computedNav
Data
(
this
.
itemValue
,
this
.
itemValue
,
arg
.
context
,
arg
.
param
,
arg
.
param
,
this
.
itemParam
.
p
aram
this
.
localP
aram
);
);
Object
.
assign
(
arg
.
param
,
_param
);
Object
.
assign
(
arg
.
param
,
_param
);
}
}
...
@@ -222,7 +245,7 @@ export default class AppTransfer extends Vue {
...
@@ -222,7 +245,7 @@ export default class AppTransfer extends Vue {
this
.
dataLeft
.
push
({
this
.
dataLeft
.
push
({
key
:
elem
.
id
,
key
:
elem
.
id
,
value
:
elem
.
value
,
value
:
elem
.
value
,
label
:
elem
.
label
,
label
:
elem
.
text
,
disabled
:
elem
.
disabled
disabled
:
elem
.
disabled
});
});
});
});
...
@@ -231,16 +254,20 @@ export default class AppTransfer extends Vue {
...
@@ -231,16 +254,20 @@ export default class AppTransfer extends Vue {
* 初始化右侧框数据
* 初始化右侧框数据
*/
*/
public
initRight
()
{
public
initRight
()
{
let
_valueSeparator
:
any
;
_valueSeparator
=
this
.
initValueSeparator
(
_valueSeparator
);
let
_data
:
any
=
this
.
itemValue
;
let
_data
:
any
=
this
.
itemValue
;
if
(
_data
)
{
if
(
_data
)
{
let
newData
:
any
[]
=
_data
.
split
(
`
${
this
.
valueSeparator
}
`
);
let
_dataRight
:
any
=
[];
let
newData
:
any
[]
=
_data
.
split
(
`
${
_valueSeparator
}
`
);
this
.
dataLeft
.
forEach
((
elem
:
any
)
=>
{
this
.
dataLeft
.
forEach
((
elem
:
any
)
=>
{
newData
.
forEach
((
item
:
any
)
=>
{
newData
.
forEach
((
item
:
any
)
=>
{
if
(
item
===
elem
.
value
)
{
if
(
item
===
elem
.
value
)
{
this
.
dataRight
.
push
(
elem
.
key
);
_
dataRight
.
push
(
elem
.
key
);
}
}
});
});
});
});
this
.
dataRight
=
_dataRight
;
}
}
}
}
/**
/**
...
@@ -249,7 +276,6 @@ export default class AppTransfer extends Vue {
...
@@ -249,7 +276,6 @@ export default class AppTransfer extends Vue {
public
transferRefresh
(
e
:
any
)
{
public
transferRefresh
(
e
:
any
)
{
if
(
e
&&
this
.
codelistType
===
"DYNAMIC"
)
{
if
(
e
&&
this
.
codelistType
===
"DYNAMIC"
)
{
this
.
dataLeft
=
[];
this
.
dataLeft
=
[];
this
.
dataRight
=
[];
this
.
dataHandle
();
this
.
dataHandle
();
}
}
}
}
...
...
app_web/src/engine/view/edit-view2-engine.ts
浏览文件 @
6d390077
...
@@ -89,6 +89,7 @@ export default class EditView2Engine extends EditViewEngine {
...
@@ -89,6 +89,7 @@ export default class EditView2Engine extends EditViewEngine {
*/
*/
public
onFormLoad
(
arg
:
any
=
{}):
void
{
public
onFormLoad
(
arg
:
any
=
{}):
void
{
super
.
onFormLoad
(
arg
);
super
.
onFormLoad
(
arg
);
this
.
view
.
formData
=
arg
;
if
(
this
.
getDRBar
())
{
if
(
this
.
getDRBar
())
{
const
tag
=
this
.
getDRBar
().
name
;
const
tag
=
this
.
getDRBar
().
name
;
this
.
setViewState2
({
tag
:
tag
,
action
:
'state'
,
viewdata
:
this
.
view
.
vieparams
});
this
.
setViewState2
({
tag
:
tag
,
action
:
'state'
,
viewdata
:
this
.
view
.
vieparams
});
...
@@ -103,6 +104,7 @@ export default class EditView2Engine extends EditViewEngine {
...
@@ -103,6 +104,7 @@ export default class EditView2Engine extends EditViewEngine {
*/
*/
public
onFormSave
(
arg
:
any
=
{}):
void
{
public
onFormSave
(
arg
:
any
=
{}):
void
{
super
.
onFormSave
(
arg
);
super
.
onFormSave
(
arg
);
this
.
view
.
formData
=
arg
;
if
(
this
.
getDRBar
())
{
if
(
this
.
getDRBar
())
{
const
tag
=
this
.
getDRBar
().
name
;
const
tag
=
this
.
getDRBar
().
name
;
this
.
setViewState2
({
tag
:
tag
,
action
:
'state'
,
viewdata
:
this
.
view
.
viewparams
});
this
.
setViewState2
({
tag
:
tag
,
action
:
'state'
,
viewdata
:
this
.
view
.
viewparams
});
...
...
app_web/src/engine/view/edit-view3-engine.ts
浏览文件 @
6d390077
...
@@ -89,6 +89,7 @@ export default class EditView3Engine extends EditViewEngine {
...
@@ -89,6 +89,7 @@ export default class EditView3Engine extends EditViewEngine {
*/
*/
public
onFormLoad
(
arg
:
any
=
{}):
void
{
public
onFormLoad
(
arg
:
any
=
{}):
void
{
super
.
onFormLoad
(
arg
);
super
.
onFormLoad
(
arg
);
this
.
view
.
formData
=
arg
;
if
(
this
.
getDrTab
())
{
if
(
this
.
getDrTab
())
{
const
tag
=
this
.
getDrTab
().
name
;
const
tag
=
this
.
getDrTab
().
name
;
this
.
setViewState2
({
tag
:
tag
,
action
:
'state'
,
viewdata
:
this
.
view
.
viewparams
});
this
.
setViewState2
({
tag
:
tag
,
action
:
'state'
,
viewdata
:
this
.
view
.
viewparams
});
...
@@ -103,6 +104,7 @@ export default class EditView3Engine extends EditViewEngine {
...
@@ -103,6 +104,7 @@ export default class EditView3Engine extends EditViewEngine {
*/
*/
public
onFormSave
(
arg
:
any
=
{}):
void
{
public
onFormSave
(
arg
:
any
=
{}):
void
{
super
.
onFormSave
(
arg
);
super
.
onFormSave
(
arg
);
this
.
view
.
formData
=
arg
;
if
(
this
.
getDrTab
())
{
if
(
this
.
getDrTab
())
{
const
tag
=
this
.
getDrTab
().
name
;
const
tag
=
this
.
getDrTab
().
name
;
this
.
setViewState2
({
tag
:
tag
,
action
:
'state'
,
viewdata
:
this
.
view
.
viewparams
});
this
.
setViewState2
({
tag
:
tag
,
action
:
'state'
,
viewdata
:
this
.
view
.
viewparams
});
...
...
app_web/src/utils/uiaction-tool/uiaction-tool.ts
浏览文件 @
6d390077
...
@@ -44,7 +44,7 @@ export class UIActionTool {
...
@@ -44,7 +44,7 @@ export class UIActionTool {
*/
*/
private
static
formatData
(
actionTarget
:
any
,
args
:
any
,
parentContext
:
any
,
parentParams
:
any
,
_params
:
any
):
any
{
private
static
formatData
(
actionTarget
:
any
,
args
:
any
,
parentContext
:
any
,
parentParams
:
any
,
_params
:
any
):
any
{
let
_data
:
any
=
{};
let
_data
:
any
=
{};
if
(
Object
.
is
(
actionTarget
,
'SINGLEKEY'
))
{
if
(
Object
.
is
(
actionTarget
,
'SINGLEKEY'
)
||
Object
.
is
(
actionTarget
,
'NONE'
)
)
{
let
[
arg
]
=
args
;
let
[
arg
]
=
args
;
Object
.
keys
(
_params
).
forEach
((
name
:
string
)
=>
{
Object
.
keys
(
_params
).
forEach
((
name
:
string
)
=>
{
let
hasProperty
=
true
;
let
hasProperty
=
true
;
...
...
app_web/src/utils/view-tool/view-tool.ts
浏览文件 @
6d390077
...
@@ -128,7 +128,7 @@ export class ViewTool {
...
@@ -128,7 +128,7 @@ export class ViewTool {
const
[{
pathName
,
parameterName
}]
=
parameters
;
const
[{
pathName
,
parameterName
}]
=
parameters
;
routePath
=
`/
${
pathName
}
`
;
routePath
=
`/
${
pathName
}
`
;
if
(
Object
.
keys
(
data
).
length
>
0
)
{
if
(
Object
.
keys
(
data
).
length
>
0
)
{
routePath
=
`
${
routePath
}
/
${
qs
.
stringify
(
data
,
{
delimiter
:
';'
})}
`
;
routePath
=
`
${
routePath
}
?
${
qs
.
stringify
(
data
,
{
delimiter
:
';'
})}
`
;
}
}
}
else
if
(
parameters
.
length
===
2
)
{
}
else
if
(
parameters
.
length
===
2
)
{
let
[
arg
]
=
args
;
let
[
arg
]
=
args
;
...
@@ -138,7 +138,7 @@ export class ViewTool {
...
@@ -138,7 +138,7 @@ export class ViewTool {
arg
[
_parameterName
]
:
null
;
arg
[
_parameterName
]
:
null
;
routePath
=
`/
${
_pathName
}
/
${
_value
}
/
${
_pathName2
}
`
;
routePath
=
`/
${
_pathName
}
/
${
_value
}
/
${
_pathName2
}
`
;
if
(
Object
.
keys
(
data
).
length
>
0
)
{
if
(
Object
.
keys
(
data
).
length
>
0
)
{
routePath
=
`
${
routePath
}
/
${
qs
.
stringify
(
data
,
{
delimiter
:
';'
})}
`
;
routePath
=
`
${
routePath
}
?
${
qs
.
stringify
(
data
,
{
delimiter
:
';'
})}
`
;
}
}
}
}
return
routePath
;
return
routePath
;
...
...
app_web/src/widgets/ibzdepartment/edit-grid-grid/edit-grid-grid-base.vue
浏览文件 @
6d390077
...
@@ -1666,6 +1666,7 @@ export default class EditGridBase extends Vue implements ControlInterface {
...
@@ -1666,6 +1666,7 @@ export default class EditGridBase extends Vue implements ControlInterface {
*/
*/
public
uiAction
(
row
:
any
,
tag
:
any
,
$event
:
any
)
{
public
uiAction
(
row
:
any
,
tag
:
any
,
$event
:
any
)
{
// this.rowClick(row, true);
// this.rowClick(row, true);
$event
.
stopPropagation
();
}
}
/**
/**
...
...
app_web/src/widgets/ibzdepartment/main-grid/main-grid-base.vue
浏览文件 @
6d390077
...
@@ -1493,6 +1493,7 @@ export default class MainBase extends Vue implements ControlInterface {
...
@@ -1493,6 +1493,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/
*/
public
uiAction
(
row
:
any
,
tag
:
any
,
$event
:
any
)
{
public
uiAction
(
row
:
any
,
tag
:
any
,
$event
:
any
)
{
// this.rowClick(row, true);
// this.rowClick(row, true);
$event
.
stopPropagation
();
}
}
/**
/**
...
...
app_web/src/widgets/ibzdept-member/main-grid/main-grid-base.vue
浏览文件 @
6d390077
...
@@ -1284,6 +1284,7 @@ export default class MainBase extends Vue implements ControlInterface {
...
@@ -1284,6 +1284,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/
*/
public
uiAction
(
row
:
any
,
tag
:
any
,
$event
:
any
)
{
public
uiAction
(
row
:
any
,
tag
:
any
,
$event
:
any
)
{
// this.rowClick(row, true);
// this.rowClick(row, true);
$event
.
stopPropagation
();
}
}
/**
/**
...
...
app_web/src/widgets/ibzemployee/edit-grid-grid/edit-grid-grid-base.vue
浏览文件 @
6d390077
...
@@ -1666,6 +1666,7 @@ export default class EditGridBase extends Vue implements ControlInterface {
...
@@ -1666,6 +1666,7 @@ export default class EditGridBase extends Vue implements ControlInterface {
*/
*/
public
uiAction
(
row
:
any
,
tag
:
any
,
$event
:
any
)
{
public
uiAction
(
row
:
any
,
tag
:
any
,
$event
:
any
)
{
// this.rowClick(row, true);
// this.rowClick(row, true);
$event
.
stopPropagation
();
}
}
/**
/**
...
...
app_web/src/widgets/ibzemployee/main-grid/main-grid-base.vue
浏览文件 @
6d390077
...
@@ -1432,6 +1432,7 @@ export default class MainBase extends Vue implements ControlInterface {
...
@@ -1432,6 +1432,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/
*/
public
uiAction
(
row
:
any
,
tag
:
any
,
$event
:
any
)
{
public
uiAction
(
row
:
any
,
tag
:
any
,
$event
:
any
)
{
// this.rowClick(row, true);
// this.rowClick(row, true);
$event
.
stopPropagation
();
}
}
/**
/**
...
...
app_web/src/widgets/ibzorganization/main-grid/main-grid-base.vue
浏览文件 @
6d390077
...
@@ -1417,6 +1417,7 @@ export default class MainBase extends Vue implements ControlInterface {
...
@@ -1417,6 +1417,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/
*/
public
uiAction
(
row
:
any
,
tag
:
any
,
$event
:
any
)
{
public
uiAction
(
row
:
any
,
tag
:
any
,
$event
:
any
)
{
// this.rowClick(row, true);
// this.rowClick(row, true);
$event
.
stopPropagation
();
}
}
/**
/**
...
...
config.xml
浏览文件 @
6d390077
...
@@ -37,11 +37,6 @@
...
@@ -37,11 +37,6 @@
git clone -b master $para2 ibzou/
git clone -b master $para2 ibzou/
export NODE_OPTIONS=--max-old-space-size=4096
export NODE_OPTIONS=--max-old-space-size=4096
cd ibzou/
cd ibzou/
mvn clean package -Papi
cd ibzou-provider/ibzou-provider-api
mvn -Papi docker:build
mvn -Papi docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/ibzou-provider-api.yaml ibzlab-rt --with-registry-auth
</command>
</command>
</hudson.tasks.Shell>
</hudson.tasks.Shell>
</builders>
</builders>
...
...
ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/IBZDepartment.java
浏览文件 @
6d390077
...
@@ -17,6 +17,7 @@ import cn.ibizlab.util.domain.EntityBase;
...
@@ -17,6 +17,7 @@ import cn.ibizlab.util.domain.EntityBase;
import
cn.ibizlab.util.annotation.DEField
;
import
cn.ibizlab.util.annotation.DEField
;
import
cn.ibizlab.util.enums.DEPredefinedFieldType
;
import
cn.ibizlab.util.enums.DEPredefinedFieldType
;
import
cn.ibizlab.util.enums.DEFieldDefaultValueType
;
import
cn.ibizlab.util.enums.DEFieldDefaultValueType
;
import
com.fasterxml.jackson.annotation.JsonIgnoreProperties
;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
lombok.*
;
import
lombok.*
;
import
org.springframework.data.annotation.Transient
;
import
org.springframework.data.annotation.Transient
;
...
@@ -33,6 +34,7 @@ import cn.ibizlab.util.domain.EntityMP;
...
@@ -33,6 +34,7 @@ import cn.ibizlab.util.domain.EntityMP;
@Setter
@Setter
@NoArgsConstructor
@NoArgsConstructor
@AllArgsConstructor
@AllArgsConstructor
@JsonIgnoreProperties
(
value
=
"handler"
)
@TableName
(
value
=
"IBZDEPT"
,
resultMap
=
"IBZDepartmentResultMap"
)
@TableName
(
value
=
"IBZDEPT"
,
resultMap
=
"IBZDepartmentResultMap"
)
public
class
IBZDepartment
extends
EntityMP
implements
Serializable
{
public
class
IBZDepartment
extends
EntityMP
implements
Serializable
{
...
...
ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/IBZDeptMember.java
浏览文件 @
6d390077
...
@@ -17,6 +17,7 @@ import cn.ibizlab.util.domain.EntityBase;
...
@@ -17,6 +17,7 @@ import cn.ibizlab.util.domain.EntityBase;
import
cn.ibizlab.util.annotation.DEField
;
import
cn.ibizlab.util.annotation.DEField
;
import
cn.ibizlab.util.enums.DEPredefinedFieldType
;
import
cn.ibizlab.util.enums.DEPredefinedFieldType
;
import
cn.ibizlab.util.enums.DEFieldDefaultValueType
;
import
cn.ibizlab.util.enums.DEFieldDefaultValueType
;
import
com.fasterxml.jackson.annotation.JsonIgnoreProperties
;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
lombok.*
;
import
lombok.*
;
import
org.springframework.data.annotation.Transient
;
import
org.springframework.data.annotation.Transient
;
...
@@ -33,6 +34,7 @@ import cn.ibizlab.util.domain.EntityMP;
...
@@ -33,6 +34,7 @@ import cn.ibizlab.util.domain.EntityMP;
@Setter
@Setter
@NoArgsConstructor
@NoArgsConstructor
@AllArgsConstructor
@AllArgsConstructor
@JsonIgnoreProperties
(
value
=
"handler"
)
@TableName
(
value
=
"IBZDEPTMEMBER"
,
resultMap
=
"IBZDeptMemberResultMap"
)
@TableName
(
value
=
"IBZDEPTMEMBER"
,
resultMap
=
"IBZDeptMemberResultMap"
)
public
class
IBZDeptMember
extends
EntityMP
implements
Serializable
{
public
class
IBZDeptMember
extends
EntityMP
implements
Serializable
{
...
...
ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/IBZEmployee.java
浏览文件 @
6d390077
...
@@ -17,6 +17,7 @@ import cn.ibizlab.util.domain.EntityBase;
...
@@ -17,6 +17,7 @@ import cn.ibizlab.util.domain.EntityBase;
import
cn.ibizlab.util.annotation.DEField
;
import
cn.ibizlab.util.annotation.DEField
;
import
cn.ibizlab.util.enums.DEPredefinedFieldType
;
import
cn.ibizlab.util.enums.DEPredefinedFieldType
;
import
cn.ibizlab.util.enums.DEFieldDefaultValueType
;
import
cn.ibizlab.util.enums.DEFieldDefaultValueType
;
import
com.fasterxml.jackson.annotation.JsonIgnoreProperties
;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
lombok.*
;
import
lombok.*
;
import
org.springframework.data.annotation.Transient
;
import
org.springframework.data.annotation.Transient
;
...
@@ -33,6 +34,7 @@ import cn.ibizlab.util.domain.EntityMP;
...
@@ -33,6 +34,7 @@ import cn.ibizlab.util.domain.EntityMP;
@Setter
@Setter
@NoArgsConstructor
@NoArgsConstructor
@AllArgsConstructor
@AllArgsConstructor
@JsonIgnoreProperties
(
value
=
"handler"
)
@TableName
(
value
=
"IBZEMP"
,
resultMap
=
"IBZEmployeeResultMap"
)
@TableName
(
value
=
"IBZEMP"
,
resultMap
=
"IBZEmployeeResultMap"
)
public
class
IBZEmployee
extends
EntityMP
implements
Serializable
{
public
class
IBZEmployee
extends
EntityMP
implements
Serializable
{
...
...
ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/IBZOrganization.java
浏览文件 @
6d390077
...
@@ -17,6 +17,7 @@ import cn.ibizlab.util.domain.EntityBase;
...
@@ -17,6 +17,7 @@ import cn.ibizlab.util.domain.EntityBase;
import
cn.ibizlab.util.annotation.DEField
;
import
cn.ibizlab.util.annotation.DEField
;
import
cn.ibizlab.util.enums.DEPredefinedFieldType
;
import
cn.ibizlab.util.enums.DEPredefinedFieldType
;
import
cn.ibizlab.util.enums.DEFieldDefaultValueType
;
import
cn.ibizlab.util.enums.DEFieldDefaultValueType
;
import
com.fasterxml.jackson.annotation.JsonIgnoreProperties
;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
lombok.*
;
import
lombok.*
;
import
org.springframework.data.annotation.Transient
;
import
org.springframework.data.annotation.Transient
;
...
@@ -33,6 +34,7 @@ import cn.ibizlab.util.domain.EntityMP;
...
@@ -33,6 +34,7 @@ import cn.ibizlab.util.domain.EntityMP;
@Setter
@Setter
@NoArgsConstructor
@NoArgsConstructor
@AllArgsConstructor
@AllArgsConstructor
@JsonIgnoreProperties
(
value
=
"handler"
)
@TableName
(
value
=
"IBZORG"
,
resultMap
=
"IBZOrganizationResultMap"
)
@TableName
(
value
=
"IBZORG"
,
resultMap
=
"IBZOrganizationResultMap"
)
public
class
IBZOrganization
extends
EntityMP
implements
Serializable
{
public
class
IBZOrganization
extends
EntityMP
implements
Serializable
{
...
...
ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/IBZPost.java
浏览文件 @
6d390077
...
@@ -17,6 +17,7 @@ import cn.ibizlab.util.domain.EntityBase;
...
@@ -17,6 +17,7 @@ import cn.ibizlab.util.domain.EntityBase;
import
cn.ibizlab.util.annotation.DEField
;
import
cn.ibizlab.util.annotation.DEField
;
import
cn.ibizlab.util.enums.DEPredefinedFieldType
;
import
cn.ibizlab.util.enums.DEPredefinedFieldType
;
import
cn.ibizlab.util.enums.DEFieldDefaultValueType
;
import
cn.ibizlab.util.enums.DEFieldDefaultValueType
;
import
com.fasterxml.jackson.annotation.JsonIgnoreProperties
;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
lombok.*
;
import
lombok.*
;
import
org.springframework.data.annotation.Transient
;
import
org.springframework.data.annotation.Transient
;
...
@@ -33,6 +34,7 @@ import cn.ibizlab.util.domain.EntityMP;
...
@@ -33,6 +34,7 @@ import cn.ibizlab.util.domain.EntityMP;
@Setter
@Setter
@NoArgsConstructor
@NoArgsConstructor
@AllArgsConstructor
@AllArgsConstructor
@JsonIgnoreProperties
(
value
=
"handler"
)
@TableName
(
value
=
"IBZPOST"
,
resultMap
=
"IBZPostResultMap"
)
@TableName
(
value
=
"IBZPOST"
,
resultMap
=
"IBZPostResultMap"
)
public
class
IBZPost
extends
EntityMP
implements
Serializable
{
public
class
IBZPost
extends
EntityMP
implements
Serializable
{
...
...
ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/IBZTeam.java
浏览文件 @
6d390077
...
@@ -17,6 +17,7 @@ import cn.ibizlab.util.domain.EntityBase;
...
@@ -17,6 +17,7 @@ import cn.ibizlab.util.domain.EntityBase;
import
cn.ibizlab.util.annotation.DEField
;
import
cn.ibizlab.util.annotation.DEField
;
import
cn.ibizlab.util.enums.DEPredefinedFieldType
;
import
cn.ibizlab.util.enums.DEPredefinedFieldType
;
import
cn.ibizlab.util.enums.DEFieldDefaultValueType
;
import
cn.ibizlab.util.enums.DEFieldDefaultValueType
;
import
com.fasterxml.jackson.annotation.JsonIgnoreProperties
;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
lombok.*
;
import
lombok.*
;
import
org.springframework.data.annotation.Transient
;
import
org.springframework.data.annotation.Transient
;
...
@@ -33,6 +34,7 @@ import cn.ibizlab.util.domain.EntityMP;
...
@@ -33,6 +34,7 @@ import cn.ibizlab.util.domain.EntityMP;
@Setter
@Setter
@NoArgsConstructor
@NoArgsConstructor
@AllArgsConstructor
@AllArgsConstructor
@JsonIgnoreProperties
(
value
=
"handler"
)
@TableName
(
value
=
"IBZTEAM"
,
resultMap
=
"IBZTeamResultMap"
)
@TableName
(
value
=
"IBZTEAM"
,
resultMap
=
"IBZTeamResultMap"
)
public
class
IBZTeam
extends
EntityMP
implements
Serializable
{
public
class
IBZTeam
extends
EntityMP
implements
Serializable
{
...
...
ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/IBZTeamMember.java
浏览文件 @
6d390077
...
@@ -17,6 +17,7 @@ import cn.ibizlab.util.domain.EntityBase;
...
@@ -17,6 +17,7 @@ import cn.ibizlab.util.domain.EntityBase;
import
cn.ibizlab.util.annotation.DEField
;
import
cn.ibizlab.util.annotation.DEField
;
import
cn.ibizlab.util.enums.DEPredefinedFieldType
;
import
cn.ibizlab.util.enums.DEPredefinedFieldType
;
import
cn.ibizlab.util.enums.DEFieldDefaultValueType
;
import
cn.ibizlab.util.enums.DEFieldDefaultValueType
;
import
com.fasterxml.jackson.annotation.JsonIgnoreProperties
;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
lombok.*
;
import
lombok.*
;
import
org.springframework.data.annotation.Transient
;
import
org.springframework.data.annotation.Transient
;
...
@@ -33,6 +34,7 @@ import cn.ibizlab.util.domain.EntityMP;
...
@@ -33,6 +34,7 @@ import cn.ibizlab.util.domain.EntityMP;
@Setter
@Setter
@NoArgsConstructor
@NoArgsConstructor
@AllArgsConstructor
@AllArgsConstructor
@JsonIgnoreProperties
(
value
=
"handler"
)
@TableName
(
value
=
"IBZTEAMMEMBER"
,
resultMap
=
"IBZTeamMemberResultMap"
)
@TableName
(
value
=
"IBZTEAMMEMBER"
,
resultMap
=
"IBZTeamMemberResultMap"
)
public
class
IBZTeamMember
extends
EntityMP
implements
Serializable
{
public
class
IBZTeamMember
extends
EntityMP
implements
Serializable
{
...
...
ibzou-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @
6d390077
此差异已折叠。
点击以展开。
ibzou-provider/ibzou-provider-api/src/main/docker/Dockerfile
浏览文件 @
6d390077
...
@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
...
@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzou-provider-api.jar
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzou-provider-api.jar
EXPOSE
4000
1
EXPOSE
808
1
ADD
ibzou-provider-api.jar /ibzou-provider-api.jar
ADD
ibzou-provider-api.jar /ibzou-provider-api.jar
ibzou-provider/ibzou-provider-api/src/main/docker/ibzou-provider-api.yaml
浏览文件 @
6d390077
...
@@ -3,21 +3,9 @@ services:
...
@@ -3,21 +3,9 @@ services:
ibzou-provider-api
:
ibzou-provider-api
:
image
:
registry.cn-shanghai.aliyuncs.com/ibizsys/ibzou-provider-api:latest
image
:
registry.cn-shanghai.aliyuncs.com/ibizsys/ibzou-provider-api:latest
ports
:
ports
:
-
"
40001:4000
1"
-
"
8081:808
1"
networks
:
networks
:
-
agent_network
-
agent_network
environment
:
-
SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
-
SERVER_PORT=40001
-
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
:
resources
:
resources
:
limits
:
limits
:
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录