From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期二, 02 八月 2022 11:42:43 +0800 Subject: [PATCH] Merge branch 'develop' --- src/templates/calendarconfig/source.jsx | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/templates/calendarconfig/source.jsx b/src/templates/calendarconfig/source.jsx index 061fc0c..e009ac0 100644 --- a/src/templates/calendarconfig/source.jsx +++ b/src/templates/calendarconfig/source.jsx @@ -44,11 +44,9 @@ initval: '', type: 'text', resourceType: '0', - setAll: 'false', options: [], orderType: 'asc', match: 'like', - display: 'dropdown' }, { origin: true, uuid: Utils.getuuid(), @@ -57,11 +55,9 @@ initval: '', type: 'select', resourceType: '0', - setAll: 'false', options: [], orderType: 'asc', match: 'equal', - display: 'dropdown' }, { origin: true, uuid: Utils.getuuid(), @@ -70,11 +66,9 @@ initval: '', type: 'date', resourceType: '0', - setAll: 'false', options: [], orderType: 'asc', match: 'greater', - display: 'dropdown' } ] } @@ -106,13 +100,19 @@ }, { type: 'search', - label: CommonDict['model.form.dateday'], + label: '閫夐」鍗�', + subType: 'checkcard', + url: '' + }, + { + type: 'search', + label: '鏃ユ湡锛堝ぉ锛�', subType: 'date', url: '' }, { type: 'search', - label: CommonDict['model.form.dateweek'], + label: '鏃ユ湡锛堝懆锛�', subType: 'dateweek', url: '' }, -- Gitblit v1.8.0