Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibzdst
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
1
议题
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibzdst
提交
38895eca
提交
38895eca
编写于
1年前
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
hebao1234 发布系统代码 [ibz-dst,应用]
上级
38accbc9
变更
8
显示空白字符变更
内嵌
并排
正在显示
8 个修改的文件
包含
37 行增加
和
25 行删除
+37
-25
data-dictionary.json
app_web/public/assets/json/data-dictionary.json
+11
-0
codelist_BO_CN_base.ts
app_web/src/locale/lanres/codelist/codelist_BO_CN_base.ts
+1
-0
codelist_en_US_base.ts
app_web/src/locale/lanres/codelist/codelist_en_US_base.ts
+1
-0
codelist_zh_CN_base.ts
app_web/src/locale/lanres/codelist/codelist_zh_CN_base.ts
+1
-0
codelist.ts
app_web/src/mock/codelist/codelist.ts
+11
-0
main-grid-base.vue
...web/src/widgets/dict-catalog/main-grid/main-grid-base.vue
+8
-22
default-searchform-base.vue
...eta-entity/default-searchform/default-searchform-base.vue
+2
-2
StaticDict.java
...t-util/src/main/java/cn/ibizlab/util/dict/StaticDict.java
+2
-1
未找到文件。
app_web/public/assets/json/data-dictionary.json
浏览文件 @
38895eca
...
...
@@ -167,6 +167,17 @@
"codename"
:
"Min"
,
"value"
:
"MIN"
,
"disabled"
:
false
}
,
{
"id"
:
"COUNT_DISTINCT_EXT1"
,
"label"
:
"COUNT_DISTINCT_EXT1"
,
"text"
:
"COUNT_DISTINCT_EXT1"
,
"class"
:
""
,
"data"
:
""
,
"codename"
:
"Count_distinct_ext1"
,
"value"
:
"COUNT_DISTINCT_EXT1"
,
"disabled"
:
false
}
]
...
...
This diff is collapsed.
Click to expand it.
app_web/src/locale/lanres/codelist/codelist_BO_CN_base.ts
浏览文件 @
38895eca
...
...
@@ -25,6 +25,7 @@ function getLocaleResourceBase(){
"AVG"
:
commonLogic
.
appcommonhandle
(
"AVG"
,
null
),
"MAX"
:
commonLogic
.
appcommonhandle
(
"MAX"
,
null
),
"MIN"
:
commonLogic
.
appcommonhandle
(
"MIN"
,
null
),
"COUNT_DISTINCT_EXT1"
:
commonLogic
.
appcommonhandle
(
"COUNT_DISTINCT_EXT1"
,
null
),
"empty"
:
commonLogic
.
appcommonhandle
(
""
,
null
)
},
CLModel
:
{
...
...
This diff is collapsed.
Click to expand it.
app_web/src/locale/lanres/codelist/codelist_en_US_base.ts
浏览文件 @
38895eca
...
...
@@ -25,6 +25,7 @@ function getLocaleResourceBase(){
"AVG"
:
commonLogic
.
appcommonhandle
(
"AVG"
,
null
),
"MAX"
:
commonLogic
.
appcommonhandle
(
"MAX"
,
null
),
"MIN"
:
commonLogic
.
appcommonhandle
(
"MIN"
,
null
),
"COUNT_DISTINCT_EXT1"
:
commonLogic
.
appcommonhandle
(
"COUNT_DISTINCT_EXT1"
,
null
),
"empty"
:
commonLogic
.
appcommonhandle
(
""
,
null
)
},
CLModel
:
{
...
...
This diff is collapsed.
Click to expand it.
app_web/src/locale/lanres/codelist/codelist_zh_CN_base.ts
浏览文件 @
38895eca
...
...
@@ -25,6 +25,7 @@ function getLocaleResourceBase(){
"AVG"
:
commonLogic
.
appcommonhandle
(
"AVG"
,
null
),
"MAX"
:
commonLogic
.
appcommonhandle
(
"MAX"
,
null
),
"MIN"
:
commonLogic
.
appcommonhandle
(
"MIN"
,
null
),
"COUNT_DISTINCT_EXT1"
:
commonLogic
.
appcommonhandle
(
"COUNT_DISTINCT_EXT1"
,
null
),
"empty"
:
commonLogic
.
appcommonhandle
(
""
,
null
),
},
CLModel
:
{
...
...
This diff is collapsed.
Click to expand it.
app_web/src/mock/codelist/codelist.ts
浏览文件 @
38895eca
...
...
@@ -175,6 +175,17 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
"codename"
:
"Min"
,
value
:
"MIN"
,
disabled
:
false
,
},
{
id
:
"COUNT_DISTINCT_EXT1"
,
label
:
"COUNT_DISTINCT_EXT1"
,
text
:
"COUNT_DISTINCT_EXT1"
,
"class"
:
""
,
"data"
:
""
,
"codename"
:
"Count_distinct_ext1"
,
value
:
"COUNT_DISTINCT_EXT1"
,
disabled
:
false
,
},
]
...
...
This diff is collapsed.
Click to expand it.
app_web/src/widgets/dict-catalog/main-grid/main-grid-base.vue
浏览文件 @
38895eca
...
...
@@ -331,20 +331,6 @@ export default class MainBase extends Vue implements ControlInterface {
return
this
.
selections
[
0
];
}
/**
* 打开新建数据视图
*
* @type {any}
* @memberof MainBase
*/
@
Prop
()
public
newdata
:
any
;
/**
* 打开编辑数据视图
*
* @type {any}
* @memberof MainBase
*/
@
Prop
()
public
opendata
:
any
;
/**
* 是否嵌入关系界面
...
...
@@ -867,7 +853,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/
public
load
(
opt
:
any
=
{},
pageReset
:
boolean
=
false
):
void
{
if
(
!
this
.
fetchAction
){
this
.
$Notice
.
error
({
title
:
(
this
.
$t
(
'app.commonWords.wrong'
)
as
string
),
desc
:
'DictCatalogGridView'
+
(
this
.
$t
(
'app.gridpage.notConfig.fetchAction'
)
as
string
)
});
this
.
$Notice
.
error
({
title
:
(
this
.
$t
(
'app.commonWords.wrong'
)
as
string
),
desc
:
'DictCatalog
Pickup
GridView'
+
(
this
.
$t
(
'app.gridpage.notConfig.fetchAction'
)
as
string
)
});
return
;
}
if
(
pageReset
){
...
...
@@ -962,7 +948,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/
public
async
remove
(
datas
:
any
[]):
Promise
<
any
>
{
if
(
!
this
.
removeAction
){
this
.
$Notice
.
error
({
title
:
(
this
.
$t
(
'app.commonWords.wrong'
)
as
string
),
desc
:
'DictCatalogGridView'
+
(
this
.
$t
(
'app.gridpage.notConfig.removeAction'
)
as
string
)
});
this
.
$Notice
.
error
({
title
:
(
this
.
$t
(
'app.commonWords.wrong'
)
as
string
),
desc
:
'DictCatalog
Pickup
GridView'
+
(
this
.
$t
(
'app.gridpage.notConfig.removeAction'
)
as
string
)
});
return
;
}
let
_datas
:
any
[]
=
[];
...
...
@@ -1068,7 +1054,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/
public
addBatch
(
arg
:
any
=
{}):
void
{
if
(
!
this
.
fetchAction
){
this
.
$Notice
.
error
({
title
:
(
this
.
$t
(
'app.commonWords.wrong'
)
as
string
),
desc
:
'DictCatalogGridView'
+
(
this
.
$t
(
'app.gridpage.notConfig.fetchAction'
)
as
string
)
});
this
.
$Notice
.
error
({
title
:
(
this
.
$t
(
'app.commonWords.wrong'
)
as
string
),
desc
:
'DictCatalog
Pickup
GridView'
+
(
this
.
$t
(
'app.gridpage.notConfig.fetchAction'
)
as
string
)
});
return
;
}
if
(
!
arg
){
...
...
@@ -1861,7 +1847,7 @@ export default class MainBase extends Vue implements ControlInterface {
public
setColState
()
{
this
.
resetColModel
=
Util
.
deepCopy
(
this
.
allColumns
);
const
viewParams
:
any
=
Util
.
deepCopy
(
this
.
viewparams
);
Object
.
assign
(
viewParams
,{
utilServiceName
:
'grid_dynaconfig'
,
modelid
:
'ibzdst_web_dictcataloggridview_grid_main'
});
Object
.
assign
(
viewParams
,{
utilServiceName
:
'grid_dynaconfig'
,
modelid
:
'ibzdst_web_dictcatalog
pickup
gridview_grid_main'
});
const
post
=
this
.
service
.
loadModel
(
'grid_dynaconfig'
,
this
.
context
,
viewParams
);
post
.
then
((
response
:
any
)
=>
{
if
(
response
.
status
==
200
&&
response
.
data
)
{
...
...
@@ -1928,7 +1914,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/
public
saveDynaConfig
()
{
const
viewParams
:
any
=
Util
.
deepCopy
(
this
.
viewparams
);
Object
.
assign
(
viewParams
,{
utilServiceName
:
'grid_dynaconfig'
,
modelid
:
'ibzdst_web_dictcataloggridview_grid_main'
,
model
:
this
.
allColumns
});
Object
.
assign
(
viewParams
,{
utilServiceName
:
'grid_dynaconfig'
,
modelid
:
'ibzdst_web_dictcatalog
pickup
gridview_grid_main'
,
model
:
this
.
allColumns
});
const
post
=
this
.
service
.
saveModel
(
'grid_dynaconfig'
,
this
.
context
,
viewParams
);
post
.
then
((
response
:
any
)
=>
{
if
(
response
.
status
==
200
)
{
...
...
@@ -1999,7 +1985,7 @@ export default class MainBase extends Vue implements ControlInterface {
try
{
if
(
Object
.
is
(
item
.
rowDataState
,
'create'
)){
if
(
!
this
.
createAction
){
this
.
$Notice
.
error
({
title
:
(
this
.
$t
(
'app.commonWords.wrong'
)
as
string
),
desc
:
'DictCatalogGridView'
+
(
this
.
$t
(
'app.gridpage.notConfig.createAction'
)
as
string
)
});
this
.
$Notice
.
error
({
title
:
(
this
.
$t
(
'app.commonWords.wrong'
)
as
string
),
desc
:
'DictCatalog
Pickup
GridView'
+
(
this
.
$t
(
'app.gridpage.notConfig.createAction'
)
as
string
)
});
}
else
{
Object
.
assign
(
item
,{
viewparams
:
this
.
viewparams
});
let
response
=
await
this
.
service
.
add
(
this
.
createAction
,
JSON
.
parse
(
JSON
.
stringify
(
this
.
context
)),
item
,
this
.
showBusyIndicator
);
...
...
@@ -2007,7 +1993,7 @@ export default class MainBase extends Vue implements ControlInterface {
}
}
else
if
(
Object
.
is
(
item
.
rowDataState
,
'update'
)){
if
(
!
this
.
updateAction
){
this
.
$Notice
.
error
({
title
:
(
this
.
$t
(
'app.commonWords.wrong'
)
as
string
),
desc
:
'DictCatalogGridView'
+
(
this
.
$t
(
'app.gridpage.notConfig.updateAction'
)
as
string
)
});
this
.
$Notice
.
error
({
title
:
(
this
.
$t
(
'app.commonWords.wrong'
)
as
string
),
desc
:
'DictCatalog
Pickup
GridView'
+
(
this
.
$t
(
'app.gridpage.notConfig.updateAction'
)
as
string
)
});
}
else
{
Object
.
assign
(
item
,{
viewparams
:
this
.
viewparams
});
if
(
item
.
dictcatalog
){
...
...
@@ -2074,7 +2060,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/
public
newRow
(
args
:
any
[],
params
?:
any
,
$event
?:
any
,
xData
?:
any
):
void
{
if
(
!
this
.
loaddraftAction
){
this
.
$Notice
.
error
({
title
:
(
this
.
$t
(
'app.commonWords.wrong'
)
as
string
),
desc
:
'DictCatalogGridView'
+
(
this
.
$t
(
'app.gridpage.notConfig.loaddraftAction'
)
as
string
)
});
this
.
$Notice
.
error
({
title
:
(
this
.
$t
(
'app.commonWords.wrong'
)
as
string
),
desc
:
'DictCatalog
Pickup
GridView'
+
(
this
.
$t
(
'app.gridpage.notConfig.loaddraftAction'
)
as
string
)
});
return
;
}
let
_this
=
this
;
...
...
This diff is collapsed.
Click to expand it.
app_web/src/widgets/meta-entity/default-searchform/default-searchform-base.vue
浏览文件 @
38895eca
...
...
@@ -795,7 +795,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
*/
public
load
(
opt
:
any
=
{}):
void
{
if
(
!
this
.
loadAction
){
this
.
$Notice
.
error
({
title
:
(
this
.
$t
(
'app.commonWords.wrong'
)
as
string
),
desc
:
'MetaEntityGridView'
+
(
this
.
$t
(
'app.searchForm.notConfig.loadAction'
)
as
string
)
});
this
.
$Notice
.
error
({
title
:
(
this
.
$t
(
'app.commonWords.wrong'
)
as
string
),
desc
:
'MetaEntity
Pickup
GridView'
+
(
this
.
$t
(
'app.searchForm.notConfig.loadAction'
)
as
string
)
});
return
;
}
const
arg
:
any
=
{
...
opt
};
...
...
@@ -831,7 +831,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
*/
public
loadDraft
(
opt
:
any
=
{},
mode
?:
string
):
void
{
if
(
!
this
.
loaddraftAction
){
this
.
$Notice
.
error
({
title
:
(
this
.
$t
(
'app.commonWords.wrong'
)
as
string
),
desc
:
'MetaEntityGridView'
+
(
this
.
$t
(
'app.searchForm.notConfig.loaddraftAction'
)
as
string
)
});
this
.
$Notice
.
error
({
title
:
(
this
.
$t
(
'app.commonWords.wrong'
)
as
string
),
desc
:
'MetaEntity
Pickup
GridView'
+
(
this
.
$t
(
'app.searchForm.notConfig.loaddraftAction'
)
as
string
)
});
return
;
}
const
arg
:
any
=
{
...
opt
}
;
...
...
This diff is collapsed.
Click to expand it.
ibzdst-util/src/main/java/cn/ibizlab/util/dict/StaticDict.java
浏览文件 @
38895eca
...
...
@@ -2476,7 +2476,8 @@ public class StaticDict {
SUM
(
"SUM"
,
"SUM"
),
AVG
(
"AVG"
,
"AVG"
),
MAX
(
"MAX"
,
"MAX"
),
MIN
(
"MIN"
,
"MIN"
);
MIN
(
"MIN"
,
"MIN"
),
COUNT_DISTINCT_EXT1
(
"COUNT_DISTINCT_EXT1"
,
"COUNT_DISTINCT_EXT1"
);
private
String
value
;
private
String
text
;
...
...
This diff is collapsed.
Click to expand it.
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录