Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
功
功能演示系统
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
示例
功能演示系统
提交
64d31264
提交
64d31264
编写于
12月 02, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
tony001 发布系统代码 [后台服务,演示应用]
上级
ff21ecb5
变更
14
隐藏空白字符变更
内嵌
并排
正在显示
14 个修改的文件
包含
25 行增加
和
243 行删除
+25
-243
data-dictionary.json
app_Web/public/assets/json/data-dictionary.json
+0
-8
codelist-register.ts
app_Web/src/codelist/codelist-register.ts
+0
-1
codelist_en_US.ts
app_Web/src/locale/lanres/codelist/codelist_en_US.ts
+0
-3
codelist_zh_CN.ts
app_Web/src/locale/lanres/codelist/codelist_zh_CN.ts
+0
-3
ibizorder_en_US.ts
...b/src/locale/lanres/entities/ibizorder/ibizorder_en_US.ts
+0
-1
ibizorder_zh_CN.ts
...b/src/locale/lanres/entities/ibizorder/ibizorder_zh_CN.ts
+0
-1
codelist.ts
app_Web/src/mock/codelist/codelist.ts
+0
-8
state.ts
app_Web/src/store/modules/view-action/state.ts
+0
-1
tree-table-treegridex-base.vue
...book/tree-table-treegridex/tree-table-treegridex-base.vue
+5
-5
usr-gantt-base.vue
app_Web/src/widgets/ibizbook/usr-gantt/usr-gantt-base.vue
+15
-15
data-0024-form-base.vue
.../widgets/ibizorder/data-0024-form/data-0024-form-base.vue
+2
-2
main-form-base.vue
app_Web/src/widgets/ibizorder/main-form/main-form-base.vue
+2
-2
tree-exp-treeview-service.ts
.../ibizorder/tree-exp-treeview/tree-exp-treeview-service.ts
+1
-186
tree-exp-viewtreeexpbar-treeexpbar-base.vue
...ar-treeexpbar/tree-exp-viewtreeexpbar-treeexpbar-base.vue
+0
-7
未找到文件。
app_Web/public/assets/json/data-dictionary.json
浏览文件 @
64d31264
...
...
@@ -364,14 +364,6 @@
}
]
},
{
"srfkey"
:
"ORDERENTITYDATA"
,
"emptytext"
:
"未定义"
,
"codelisttype"
:
"dynamic"
,
"appdataentity"
:
"IBIZOrder"
,
"appdedataset"
:
"FetchDefault"
,
"items"
:
[]
},
{
"srfkey"
:
"ORDERTYPE"
,
"emptytext"
:
"未定义"
,
...
...
app_Web/src/codelist/codelist-register.ts
浏览文件 @
64d31264
...
...
@@ -40,7 +40,6 @@ export class CodeListRegister {
*/
protected
init
():
void
{
this
.
allCodeList
.
set
(
'SysOperator'
,
()
=>
import
(
'@/codelist/sys-operator'
));
this
.
allCodeList
.
set
(
'ORDERENTITYDATA'
,
()
=>
import
(
'@/codelist/orderentitydata'
));
this
.
allCodeList
.
set
(
'ORDERTYPE'
,
()
=>
import
(
'@/codelist/ordertype'
));
}
...
...
app_Web/src/locale/lanres/codelist/codelist_en_US.ts
浏览文件 @
64d31264
...
...
@@ -51,9 +51,6 @@ export default {
"40"
:
"未通过"
,
"empty"
:
""
},
ORDERENTITYDATA
:
{
"empty"
:
""
,
},
ORDERTYPE
:
{
"empty"
:
""
,
},
...
...
app_Web/src/locale/lanres/codelist/codelist_zh_CN.ts
浏览文件 @
64d31264
...
...
@@ -51,9 +51,6 @@ export default {
"40"
:
"未通过"
,
"empty"
:
""
,
},
ORDERENTITYDATA
:
{
"empty"
:
""
,
},
ORDERTYPE
:
{
"empty"
:
""
,
},
...
...
app_Web/src/locale/lanres/entities/ibizorder/ibizorder_en_US.ts
浏览文件 @
64d31264
...
...
@@ -1988,7 +1988,6 @@ export default {
nodata
:
""
,
nodes
:
{
root
:
"默认根节点"
,
top1
:
"订单实体数据"
,
},
uiactions
:
{
},
...
...
app_Web/src/locale/lanres/entities/ibizorder/ibizorder_zh_CN.ts
浏览文件 @
64d31264
...
...
@@ -1987,7 +1987,6 @@ export default {
nodata
:
""
,
nodes
:
{
root
:
"默认根节点"
,
top1
:
"订单实体数据"
,
},
uiactions
:
{
},
...
...
app_Web/src/mock/codelist/codelist.ts
浏览文件 @
64d31264
...
...
@@ -372,14 +372,6 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
},
]
},
{
"srfkey"
:
"ORDERENTITYDATA"
,
"emptytext"
:
"未定义"
,
"codelisttype"
:
"dynamic"
,
"appdataentity"
:
"IBIZOrder"
,
"appdedataset"
:
"FetchDefault"
,
"items"
:
[]
},
{
"srfkey"
:
"ORDERTYPE"
,
"emptytext"
:
"未定义"
,
...
...
app_Web/src/store/modules/view-action/state.ts
浏览文件 @
64d31264
...
...
@@ -739,7 +739,6 @@ export const viewstate: any = {
viewaction
:
''
,
viewdatachange
:
false
,
refviews
:
[
'2567fdd6130699509d22512564bbb650'
,
],
},
{
...
...
app_Web/src/widgets/ibizbook/tree-table-treegridex/tree-table-treegridex-base.vue
浏览文件 @
64d31264
...
...
@@ -15,6 +15,11 @@
<template
slot=
"empty"
>
{{
$t
(
'entities.ibizbook.treetable_treegridex.nodata'
)
}}
</
template
>
<el-table-column
show-overflow-tooltip
prop=
"author"
label=
"作者"
:width=
"50"
:align=
"''"
>
<
template
v-slot=
"{ row }"
>
<span>
{{
getColumnValue
(
row
,
'author'
)
}}
</span>
</
template
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop=
"subtext"
label=
"图书描述"
:width=
"50"
:align=
"''"
>
<
template
v-slot=
"{ row }"
>
<span>
{{
getColumnValue
(
row
,
'subtext'
)
}}
</span>
...
...
@@ -25,11 +30,6 @@
<span>
{{
getColumnValue
(
row
,
'ibizbookname'
)
}}
</span>
</
template
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop=
"author"
label=
"作者"
:width=
"50"
:align=
"''"
>
<
template
v-slot=
"{ row }"
>
<span>
{{
getColumnValue
(
row
,
'author'
)
}}
</span>
</
template
>
</el-table-column>
</el-table>
</template>
...
...
app_Web/src/widgets/ibizbook/usr-gantt/usr-gantt-base.vue
浏览文件 @
64d31264
...
...
@@ -238,42 +238,42 @@ export default class UsrBase extends Vue implements ControlInterface {
labelField
:
'text'
,
columns
:
[
{
label
:
'
作者
'
,
value
:
'
author
'
,
label
:
'
图书名称
'
,
value
:
'
ibizbookname
'
,
render
:
(
task
:
any
)
=>
{
return
this
.
getColumnValue
(
task
,
'
author
'
)
return
this
.
getColumnValue
(
task
,
'
ibizbookname
'
)
},
width
:
200
,
},
{
label
:
'
借出日期
'
,
value
:
'
lendouttime
'
,
label
:
'
出版社
'
,
value
:
'
press
'
,
render
:
(
task
:
any
)
=>
{
return
this
.
getColumnValue
(
task
,
'
lendouttime
'
)
return
this
.
getColumnValue
(
task
,
'
press
'
)
},
width
:
200
,
},
{
label
:
'
归还日期
'
,
value
:
'
returntime
'
,
label
:
'
作者
'
,
value
:
'
author
'
,
render
:
(
task
:
any
)
=>
{
return
this
.
getColumnValue
(
task
,
'
returntime
'
)
return
this
.
getColumnValue
(
task
,
'
author
'
)
},
width
:
200
,
},
{
label
:
'
图书名称
'
,
value
:
'
ibizbookna
me'
,
label
:
'
借出日期
'
,
value
:
'
lendoutti
me'
,
render
:
(
task
:
any
)
=>
{
return
this
.
getColumnValue
(
task
,
'
ibizbookna
me'
)
return
this
.
getColumnValue
(
task
,
'
lendoutti
me'
)
},
width
:
200
,
},
{
label
:
'
出版社
'
,
value
:
'
press
'
,
label
:
'
归还日期
'
,
value
:
'
returntime
'
,
render
:
(
task
:
any
)
=>
{
return
this
.
getColumnValue
(
task
,
'
press
'
)
return
this
.
getColumnValue
(
task
,
'
returntime
'
)
},
width
:
200
,
},
...
...
app_Web/src/widgets/ibizorder/data-0024-form/data-0024-form-base.vue
浏览文件 @
64d31264
...
...
@@ -147,8 +147,8 @@
]"
:context="context"
:viewparams="viewparams"
:localContext ='{}'
:localParam ='{}'
:localContext ='{
CONTEXTPARAM1:"%orderstate%"
}'
:localParam ='{
param2:"%orderstate%"
}'
parameterName='ibizorder'
parentName="IBIZOrder"
refviewtype='DEGRIDVIEW'
...
...
app_Web/src/widgets/ibizorder/main-form/main-form-base.vue
浏览文件 @
64d31264
...
...
@@ -162,8 +162,8 @@
]"
:context="context"
:viewparams="viewparams"
:localContext ='{
CONTEXTPARAM1:"%orderstate%"
}'
:localParam ='{
param2:"%orderstate%"
}'
:localContext ='{}'
:localParam ='{}'
parameterName='ibizorder'
parentName="IBIZOrder"
refviewtype='DEGRIDVIEW9'
...
...
app_Web/src/widgets/ibizorder/tree-exp-treeview/tree-exp-treeview-service.ts
浏览文件 @
64d31264
...
...
@@ -62,15 +62,6 @@ export default class TreeExpService extends ControlService {
*/
public
TREENODE_SEPARATOR
:
string
=
';'
;
/**
* 订单名称节点分隔符号
*
* @public
* @type {string}
* @memberof TreeExpService
*/
public
TREENODE_ORDERENTITY
:
string
=
'orderentity'
;
/**
* 默认根节点节点分隔符号
*
...
...
@@ -80,15 +71,6 @@ export default class TreeExpService extends ControlService {
*/
public
TREENODE_ROOT
:
string
=
'ROOT'
;
/**
* 订单实体数据节点分隔符号
*
* @public
* @type {string}
* @memberof TreeExpService
*/
public
TREENODE_TOP1
:
string
=
'top1'
;
/**
* 获取节点数据
*
...
...
@@ -163,101 +145,13 @@ export default class TreeExpService extends ControlService {
}
}
if
(
Object
.
is
(
strNodeType
,
this
.
TREENODE_ORDERENTITY
))
{
await
this
.
fillOrderentityNodeChilds
(
context
,
filter
,
list
);
return
Promise
.
resolve
({
status
:
200
,
data
:
list
});
}
if
(
Object
.
is
(
strNodeType
,
this
.
TREENODE_ROOT
))
{
await
this
.
fillRootNodeChilds
(
context
,
filter
,
list
);
return
Promise
.
resolve
({
status
:
200
,
data
:
list
});
}
if
(
Object
.
is
(
strNodeType
,
this
.
TREENODE_TOP1
))
{
await
this
.
fillTop1NodeChilds
(
context
,
filter
,
list
);
return
Promise
.
resolve
({
status
:
200
,
data
:
list
});
}
return
Promise
.
resolve
({
status
:
500
,
data
:
{
title
:
'失败'
,
message
:
`树节点
${
strTreeNodeId
}
标识无效`
}
});
}
/**
* 填充 树视图节点[订单名称]
*
* @public
* @param {any{}} context
* @param {*} filter
* @param {any[]} list
* @param {*} rsNavContext
* @param {*} rsNavParams
* @param {*} rsParams
* @returns {Promise<any>}
* @memberof TreeExpService
*/
@
Errorlog
public
fillOrderentityNodes
(
context
:
any
=
{},
filter
:
any
,
list
:
any
[],
rsNavContext
?:
any
,
rsNavParams
?:
any
,
rsParams
?:
any
):
Promise
<
any
>
{
context
=
this
.
handleResNavContext
(
context
,
filter
,
rsNavContext
);
filter
=
this
.
handleResNavParams
(
context
,
filter
,
rsNavParams
,
rsParams
);
return
new
Promise
((
resolve
:
any
,
reject
:
any
)
=>
{
this
.
codeListService
.
getItems
(
'ORDERENTITYDATA'
,
context
).
then
((
codeListIems
:
any
)
=>
{
if
(
codeListIems
&&
codeListIems
.
length
>
0
){
const
handleChildData
=
(
context
:
any
,
item
:
any
,)
=>
{
Object
.
assign
(
item
,{
srfappctx
:
context
});
Object
.
assign
(
item
,
{
text
:
item
.
text
});
Object
.
assign
(
item
,
{
srfmajortext
:
item
.
text
});
let
strNodeId
:
string
=
"orderentity"
;
Object
.
assign
(
item
,
{
srfkey
:
item
.
value
});
strNodeId
+=
this
.
TREENODE_SEPARATOR
;
strNodeId
+=
item
.
value
;
Object
.
assign
(
item
,
{
id
:
strNodeId
});
Object
.
assign
(
item
,
{
expanded
:
filter
.
isautoexpand
});
Object
.
assign
(
item
,
{
nodeid
:
item
.
srfkey
});
Object
.
assign
(
item
,
{
nodeid2
:
item
.
pvalue
});
Object
.
assign
(
item
,
{
nodeType
:
"CODELIST"
,
appEntityName
:
"ibizorder"
});
}
codeListIems
=
this
.
handleDataSet
(
JSON
.
parse
(
JSON
.
stringify
(
codeListIems
)),
context
,
handleChildData
);
codeListIems
.
forEach
((
item
:
any
)
=>
{
let
treeNode
:
any
=
{};
Object
.
assign
(
treeNode
,{
srfappctx
:
context
});
Object
.
assign
(
treeNode
,
{
text
:
item
.
text
});
Object
.
assign
(
treeNode
,
{
srfmajortext
:
treeNode
.
text
});
let
strNodeId
:
string
=
"orderentity"
;
Object
.
assign
(
treeNode
,
{
srfkey
:
item
.
value
});
strNodeId
+=
this
.
TREENODE_SEPARATOR
;
strNodeId
+=
item
.
value
;
Object
.
assign
(
treeNode
,
{
id
:
strNodeId
});
Object
.
assign
(
treeNode
,
{
expanded
:
filter
.
isautoexpand
});
Object
.
assign
(
treeNode
,
{
leaf
:
true
});
if
(
item
.
children
&&
item
.
children
.
length
>
0
){
Object
.
assign
(
treeNode
,
{
children
:
item
.
children
});
}
Object
.
assign
(
treeNode
,
{
nodeid
:
treeNode
.
srfkey
});
Object
.
assign
(
treeNode
,
{
nodeid2
:
filter
.
strRealNodeId
});
Object
.
assign
(
treeNode
,
{
nodeType
:
"CODELIST"
,
appEntityName
:
"ibizorder"
});
list
.
push
(
treeNode
);
resolve
(
list
);
})
}
else
{
resolve
(
list
);
}
});
});
}
/**
* 填充 树视图节点[订单名称]子节点
*
* @public
* @param {any{}} context
* @param {*} filter
* @param {any[]} list
* @returns {Promise<any>}
* @memberof TreeExpService
*/
@
Errorlog
public
async
fillOrderentityNodeChilds
(
context
:
any
=
{},
filter
:
any
,
list
:
any
[]):
Promise
<
any
>
{
if
(
filter
.
srfnodefilter
&&
!
Object
.
is
(
filter
.
srfnodefilter
,
""
))
{
}
else
{
}
}
/**
* 填充 树视图节点[默认根节点]
*
...
...
@@ -290,7 +184,7 @@ export default class TreeExpService extends ControlService {
Object
.
assign
(
treeNode
,
{
id
:
strNodeId
});
Object
.
assign
(
treeNode
,
{
expanded
:
filter
.
isAutoexpand
});
Object
.
assign
(
treeNode
,
{
leaf
:
fals
e
});
Object
.
assign
(
treeNode
,
{
leaf
:
tru
e
});
Object
.
assign
(
treeNode
,
{
nodeid
:
treeNode
.
srfkey
});
Object
.
assign
(
treeNode
,
{
nodeid2
:
filter
.
strRealNodeId
});
Object
.
assign
(
treeNode
,
{
nodeType
:
"STATIC"
});
...
...
@@ -312,86 +206,7 @@ export default class TreeExpService extends ControlService {
@
Errorlog
public
async
fillRootNodeChilds
(
context
:
any
=
{},
filter
:
any
,
list
:
any
[]):
Promise
<
any
>
{
if
(
filter
.
srfnodefilter
&&
!
Object
.
is
(
filter
.
srfnodefilter
,
""
))
{
// 填充订单实体数据
let
Top1RsNavContext
:
any
=
{};
let
Top1RsNavParams
:
any
=
{};
let
Top1RsParams
:
any
=
{};
await
this
.
fillTop1Nodes
(
context
,
filter
,
list
,
Top1RsNavContext
,
Top1RsNavParams
,
Top1RsParams
);
}
else
{
// 填充订单实体数据
let
Top1RsNavContext
:
any
=
{};
let
Top1RsNavParams
:
any
=
{};
let
Top1RsParams
:
any
=
{};
await
this
.
fillTop1Nodes
(
context
,
filter
,
list
,
Top1RsNavContext
,
Top1RsNavParams
,
Top1RsParams
);
}
}
/**
* 填充 树视图节点[订单实体数据]
*
* @public
* @param {any{}} context
* @param {*} filter
* @param {any[]} list
* @param {*} rsNavContext
* @param {*} rsNavParams
* @param {*} rsParams
* @returns {Promise<any>}
* @memberof TreeExpService
*/
@
Errorlog
public
fillTop1Nodes
(
context
:
any
=
{},
filter
:
any
,
list
:
any
[],
rsNavContext
?:
any
,
rsNavParams
?:
any
,
rsParams
?:
any
):
Promise
<
any
>
{
context
=
this
.
handleResNavContext
(
context
,
filter
,
rsNavContext
);
filter
=
this
.
handleResNavParams
(
context
,
filter
,
rsNavParams
,
rsParams
);
return
new
Promise
((
resolve
:
any
,
reject
:
any
)
=>
{
let
treeNode
:
any
=
{};
Object
.
assign
(
treeNode
,
{
text
:
i18n
.
t
(
'entities.ibizorder.treeexp_treeview.nodes.top1'
)
});
Object
.
assign
(
treeNode
,
{
isUseLangRes
:
true
});
Object
.
assign
(
treeNode
,{
srfappctx
:
context
});
Object
.
assign
(
treeNode
,
{
srfmajortext
:
treeNode
.
text
});
let
strNodeId
:
string
=
'top1'
;
// 没有指定节点值,直接使用父节点值
Object
.
assign
(
treeNode
,
{
srfkey
:
filter
.
strRealNodeId
});
strNodeId
+=
this
.
TREENODE_SEPARATOR
;
strNodeId
+=
filter
.
strRealNodeId
;
Object
.
assign
(
treeNode
,
{
id
:
strNodeId
});
Object
.
assign
(
treeNode
,
{
expanded
:
filter
.
isAutoexpand
});
Object
.
assign
(
treeNode
,
{
leaf
:
false
});
Object
.
assign
(
treeNode
,
{
nodeid
:
treeNode
.
srfkey
});
Object
.
assign
(
treeNode
,
{
nodeid2
:
filter
.
strRealNodeId
});
Object
.
assign
(
treeNode
,
{
nodeType
:
"STATIC"
});
list
.
push
(
treeNode
);
resolve
(
list
);
});
}
/**
* 填充 树视图节点[订单实体数据]子节点
*
* @public
* @param {any{}} context
* @param {*} filter
* @param {any[]} list
* @returns {Promise<any>}
* @memberof TreeExpService
*/
@
Errorlog
public
async
fillTop1NodeChilds
(
context
:
any
=
{},
filter
:
any
,
list
:
any
[]):
Promise
<
any
>
{
if
(
filter
.
srfnodefilter
&&
!
Object
.
is
(
filter
.
srfnodefilter
,
""
))
{
// 填充订单名称
let
OrderentityRsNavContext
:
any
=
{};
let
OrderentityRsNavParams
:
any
=
{};
let
OrderentityRsParams
:
any
=
{};
await
this
.
fillOrderentityNodes
(
context
,
filter
,
list
,
OrderentityRsNavContext
,
OrderentityRsNavParams
,
OrderentityRsParams
);
}
else
{
// 填充订单名称
let
OrderentityRsNavContext
:
any
=
{};
let
OrderentityRsNavParams
:
any
=
{};
let
OrderentityRsParams
:
any
=
{};
await
this
.
fillOrderentityNodes
(
context
,
filter
,
list
,
OrderentityRsNavContext
,
OrderentityRsNavParams
,
OrderentityRsParams
);
}
}
...
...
app_Web/src/widgets/ibizorder/tree-exp-viewtreeexpbar-treeexpbar/tree-exp-viewtreeexpbar-treeexpbar-base.vue
浏览文件 @
64d31264
...
...
@@ -330,13 +330,6 @@ export default class TreeExpViewtreeexpbarBase extends Vue implements ControlInt
if
(
!
expmode
)
{
expmode
=
''
;
}
if
(
Object
.
is
(
expmode
,
'ORDERENTITY'
))
{
return
{
viewname
:
'ibizorder-detail-grid-view9'
,
parentdata
:
{
"srfparentdefname"
:
"IBIZORDERID"
,
"srfparentdename"
:
"IBIZORDER"
,
"srfparentmode"
:
"DER1N_IBIZORDERDETAIL_IBIZORDER_IBIZORDERID"
},
deKeyField
:
'ibizorderdetail'
};
}
return
null
;
}
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录