Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibizlab-generator
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibizlab-generator
提交
424c94b8
提交
424c94b8
编写于
2月 15, 2022
作者:
Mosher
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
update:调整
1、表格值规则错误调整 2、UIservice发布主状态逻辑调整 3、增加ant-design-vue配置组件,为后续国际化提供支持 4、日期选择器组件默认调整为中文
上级
c065ff2c
变更
6
隐藏空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
29 行增加
和
22 行删除
+29
-22
App.vue
...core/src/main/resources/templ/r7/app_{{apps}}/src/App.vue
+9
-1
app-date-picker.vue
...7/app_{{apps}}/src/components/editors/app-date-picker.vue
+7
-2
grid-control.ts
...s}}/src/core/modules/widgets/grid-control/grid-control.ts
+4
-0
app-form-item.scss
...p_{{apps}}/src/style/components/common/app-form-item.scss
+0
-3
{{appEntities}}-ui-service-base.ts.hbs
...ce/{{appEntities}}/{{appEntities}}-ui-service-base.ts.hbs
+7
-13
{{ctrls@GRID}}-grid-state.ts.hbs
...es}}/{{ctrls@GRID}}-grid/{{ctrls@GRID}}-grid-state.ts.hbs
+2
-3
未找到文件。
modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/App.vue
浏览文件 @
424c94b8
<
script
setup
lang=
"ts"
>
import
{
ref
}
from
'vue'
;
import
{
App
}
from
'./app'
;
import
zhCN
from
'ant-design-vue/es/locale/zh_CN'
;
import
enUS
from
'ant-design-vue/es/locale/en_US'
;
const
locale
=
ref
(
''
);
onMounted
(()
=>
{
(
window
as
any
).
App
=
App
.
getInstance
();
// 设置国际化
locale
.
value
=
'zh-cn'
;
})
</
script
>
<
template
>
<router-view
/>
<a-config-provider
:locale=
"locale === 'zh-cn' ? zhCN : enUS"
>
<router-view
/>
</a-config-provider>
</
template
>
<
style
>
...
...
modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/components/editors/app-date-picker.vue
浏览文件 @
424c94b8
<
script
setup
lang=
"ts"
>
import
{
IActionParam
}
from
'@core'
;
// import dayjs from 'ant-design-vue/lib/time-picker/dayjs';
import
{
computed
,
Ref
}
from
'vue'
;
import
dayjs
,
{
Dayjs
}
from
'dayjs'
;
import
dayjs
from
'dayjs'
;
import
'dayjs/locale/zh-cn'
;
interface
DatePickerProps
{
/**
* checked选中状态
...
...
@@ -80,6 +80,11 @@ const onChange = (date: string, dateString: string) => {
data
:
dateString
,
});
};
onMounted
(()
=>
{
// 设置国际化
dayjs
.
locale
(
'zh-cn'
);
})
</
script
>
<
template
>
...
...
modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/core/modules/widgets/grid-control/grid-control.ts
浏览文件 @
424c94b8
...
...
@@ -399,6 +399,10 @@ export class GridControl extends MDControl {
const
{
mdCtrlPaging
,
mdCtrlGroup
,
columnsModel
}
=
this
.
state
;
const
{
gridAgg
}
=
toRefs
(
this
.
state
);
let
{
aggMode
,
aggData
}
=
gridAgg
.
value
;
// 先置空再添加,避免重复
if
(
aggData
&&
aggData
.
length
>
0
)
{
aggData
.
splice
(
0
,
aggData
.
length
);
}
const
{
enableGroup
}
=
mdCtrlGroup
;
if
(
!
Object
.
is
(
aggMode
,
"NONE"
))
{
const
{
enablePagingBar
,
current
,
pageSize
}
=
mdCtrlPaging
;
...
...
modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/style/components/common/app-form-item.scss
浏览文件 @
424c94b8
...
...
@@ -2,7 +2,4 @@
.ant-form-item-label
{
width
:
130px
;
}
.ant-form-item-explain-success
{
color
:
red
;
}
}
\ No newline at end of file
modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/ui-service/{{appEntities}}/{{appEntities}}-ui-service-base.ts.hbs
浏览文件 @
424c94b8
...
...
@@ -44,19 +44,13 @@ export class {{pascalCase appEntity.codeName}}UIServiceBase extends UIServiceBas
this.allDeMainStateMap.set('
{{
mainState
.
mSTag
}}
', '
{{
mainState
.
mSTag
}}
');
{{/
each
}}
// 主状态操作标识Map
{{#
each
appEntity
.
allPSDEMainStates
as
|
mainState
|
}}
this.allDeMainStateOPPrivsMap.set('
{{
mainState
.
mSTag
}}
', Object.assign({
{{
~#
each
appEntity
.
allPSDEOPPrivs
as
|
deOPPriv
|~
}}
'${deOPPriv.name}':
{{#if
deOPPriv
.
isOPPrivAllowMode
}}
1
{{else}}
0
{{/if}}{{#
unless
@last
}}
,
{{/
unless
}}
{{
~
/
each
~
}}
},
{
{{
~#
each
mainState
.
pSDEMainStateOPPrivs
as
|
deMainStateOPPriv
|~
}}
'${deMainStateOPPriv.name}':
{{#if
deMainStateOPPriv
.
isOPPrivAllowMode
}}
1
{{else}}
0
{{/if}}{{#
unless
@last
}}
,
{{/
unless
}}
{{
~
/
each
~
}}
}));
{{/
each
}}
{{/if}}
{{#
each
appEntity
.
allPSDEMainStates
as
|
mainState
|
}}
this.allDeMainStateOPPrivsMap.set(
'
{{
mainState
.
mSTag
}}
',
Object.assign({
{{#
each
appEntity
.
allPSDEOPPrivs
as
|
deOPPriv
|
}}
'
{{
deOPPriv
.
name
}}
':
{{#if
deOPPriv
.
oPPrivAllowMode
}}
1
{{else}}
0
{{/if}}{{#
unless
@last
}}
,
{{/
unless
}}{{/
each
}}
}, {
{{#
each
mainState
.
pSDEMainStateOPPrivs
as
|
deMainStateOPPriv
|
}}
'
{{
deMainStateOPPriv
.
name
}}
':
{{#if
deMainStateOPPriv
.
oPPrivAllowMode
}}
1
{{else}}
0
{{/if}}{{#
unless
@last
}}
,
{{/
unless
}}{{/
each
}}
})
);
{{/
each
}}
{{/if}}
}
{{!-- 遍历界面行为 --}}
...
...
modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/widgets/{{appEntities}}/{{ctrls@GRID}}-grid/{{ctrls@GRID}}-grid-state.ts.hbs
浏览文件 @
424c94b8
...
...
@@ -212,11 +212,10 @@ export const ctrlState = {
{{>
@macro
/
front-end
/
common
/
derules
.
hbs
item
=
ruleItem
.
psDEFValueRule
.
getPSDEFVRGroupCondition
}}
);
if (!isPast) {
callback(new Error(infoMessage || '
{{
ruleItem
.
psDEFValueRule
.
ruleInfo
}}
')
);
return Promise.reject(infoMessage || '
{{
ruleItem
.
psDEFValueRule
.
ruleInfo
}}
'
);
}
return Promise.resolve();
},
trigger: ['change', 'blur']
}
}
{{/
eq
}}
{{/
each
}}
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录