center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #1628 from dataease/pr@dev@refactor_dynamic_filter_year_month

Browse Source 
refactor: 优化年月过滤组件动态时间
This commit is contained in:
fit2cloud-chenyw 2022-01-12 11:28:29 +08:00 committed by GitHub
commit abf0a4a5d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/src/components/canvas/utils/utils.js
View File

@ -66,7 +66,8 @@ export function mobile2MainCanvas(mainSource, mobileSource) {
export function panelInit(componentDatas) { export function panelInit(componentDatas) {
componentDatas.forEach(item => { componentDatas.forEach(item => {
if (item.component && item.component === 'de-date') { if (item.component && item.component === 'de-date') {
if (item.options.attrs && !item.options.attrs.default) { if (item.options.attrs &&
(!item.options.attrs.default || (item.serviceName === 'timeYearWidget' && item.options.attrs.default.dynamicInfill !== 'year') || (item.serviceName === 'timeMonthWidget' && item.options.attrs.default.dynamicInfill !== 'month'))) {
const widget = ApplicationContext.getService(item.serviceName) const widget = ApplicationContext.getService(item.serviceName)
if (widget && widget.defaultSetting) { if (widget && widget.defaultSetting) {
item.options.attrs.default = widget.defaultSetting() item.options.attrs.default = widget.defaultSetting()