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 | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/templates/calendarconfig/source.jsx b/src/templates/calendarconfig/source.jsx
index 3a9328e..e009ac0 100644
--- a/src/templates/calendarconfig/source.jsx
+++ b/src/templates/calendarconfig/source.jsx
@@ -2,7 +2,7 @@
import zhCN from '@/locales/zh-CN/model.js'
import enUS from '@/locales/en-US/model.js'
-const CommonDict = localStorage.getItem('lang') !== 'en-US' ? zhCN : enUS
+const CommonDict = sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS
class CalendarBaseData {
baseConfig = {
@@ -18,7 +18,7 @@
tableName: '',
primaryKey: '',
dataresource: '',
- interType: 'inner',
+ interType: 'system',
innerFunc: '',
interface: '',
outerFunc: ''
@@ -32,7 +32,8 @@
startfield: '',
endfield: '',
colorfield: '',
- remarkfield: ''
+ remarkfield: '',
+ refresh: 'false'
},
search: [
{
@@ -43,11 +44,9 @@
initval: '',
type: 'text',
resourceType: '0',
- setAll: 'false',
options: [],
orderType: 'asc',
match: 'like',
- display: 'dropdown'
}, {
origin: true,
uuid: Utils.getuuid(),
@@ -56,11 +55,9 @@
initval: '',
type: 'select',
resourceType: '0',
- setAll: 'false',
options: [],
orderType: 'asc',
match: 'equal',
- display: 'dropdown'
}, {
origin: true,
uuid: Utils.getuuid(),
@@ -69,11 +66,9 @@
initval: '',
type: 'date',
resourceType: '0',
- setAll: 'false',
options: [],
orderType: 'asc',
match: 'greater',
- display: 'dropdown'
}
]
}
@@ -105,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