From 07c005cf28acf74e3afde82122e4c53e1000d70c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 12 六月 2023 12:06:18 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/templates/calendarconfig/source.jsx | 73 ++++++++----------------------------
1 files changed, 17 insertions(+), 56 deletions(-)
diff --git a/src/templates/calendarconfig/source.jsx b/src/templates/calendarconfig/source.jsx
index a166193..9638d63 100644
--- a/src/templates/calendarconfig/source.jsx
+++ b/src/templates/calendarconfig/source.jsx
@@ -1,8 +1,4 @@
import Utils from '@/utils/utils.js'
-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
class CalendarBaseData {
baseConfig = {
@@ -18,7 +14,7 @@
tableName: '',
primaryKey: '',
dataresource: '',
- interType: 'inner',
+ interType: 'system',
innerFunc: '',
interface: '',
outerFunc: ''
@@ -35,102 +31,67 @@
remarkfield: '',
refresh: 'false'
},
- search: [
- {
- origin: true,
- uuid: Utils.getuuid(),
- label: 'label',
- field: '',
- initval: '',
- type: 'text',
- resourceType: '0',
- setAll: 'false',
- options: [],
- orderType: 'asc',
- match: 'like',
- display: 'dropdown'
- }, {
- origin: true,
- uuid: Utils.getuuid(),
- label: 'label',
- field: '',
- initval: '',
- type: 'select',
- resourceType: '0',
- setAll: 'false',
- options: [],
- orderType: 'asc',
- match: 'equal',
- display: 'dropdown'
- }, {
- origin: true,
- uuid: Utils.getuuid(),
- label: 'label',
- field: '',
- initval: '',
- type: 'date',
- resourceType: '0',
- setAll: 'false',
- options: [],
- orderType: 'asc',
- match: 'greater',
- display: 'dropdown'
- }
- ]
+ search: []
}
searchItems = [
{
type: 'search',
- label: CommonDict['model.form.text'],
+ label: '鏂囨湰',
subType: 'text',
url: ''
},
{
type: 'search',
- label: CommonDict['model.form.select'],
+ label: '涓嬫媺閫夋嫨',
subType: 'select',
url: ''
},
{
type: 'search',
- label: CommonDict['model.form.multiselect'],
+ label: '涓嬫媺澶氶��',
subType: 'multiselect',
url: ''
},
{
type: 'search',
- label: CommonDict['model.form.link'],
+ label: '鑱斿姩鑿滃崟',
subType: 'link',
url: ''
},
{
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: ''
},
{
type: 'search',
- label: CommonDict['model.form.datemonth'],
+ label: '鏃ユ湡锛堟湀锛�',
subType: 'datemonth',
url: ''
},
{
type: 'search',
- label: CommonDict['model.form.daterange'],
+ label: '鏃ユ湡锛堝尯闂达級',
subType: 'daterange',
url: ''
},
{
type: 'search',
- label: CommonDict['model.form.dategroup'],
+ label: '鏃ユ湡锛堢粍鍚堬級',
subType: 'group',
url: ''
}
--
Gitblit v1.8.0