From 79e4981aa6cc9354276fc54cdf6d14eb08ab7fee Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 22 六月 2023 15:59:04 +0800
Subject: [PATCH] Merge branch 'develop' of ssh://121.36.20.145:29418/~jinfei/pc-plat into develop
---
src/utils/option.js | 90 +++++++++++----------------------------------
1 files changed, 22 insertions(+), 68 deletions(-)
diff --git a/src/utils/option.js b/src/utils/option.js
index fac69e0..4fe5606 100644
--- a/src/utils/option.js
+++ b/src/utils/option.js
@@ -1,7 +1,6 @@
import nortable from '@/assets/img/normaltable.jpg'
// import mainsubtable from '@/assets/img/mainsubtable.jpg'
import treepage from '@/assets/img/treepage.jpg'
-import calendar from '@/assets/img/calendar.jpg'
import customImg from '@/assets/img/custom.jpg'
import newpage from '@/assets/img/newpage.jpg'
import rolemanage from '@/assets/img/rolemanage.jpg'
@@ -45,20 +44,20 @@
// 绯荤粺妯℃澘
export const sysTemps = [
- {
- title: '鍩虹琛ㄦ牸',
- type: 'CommonTable',
- url: nortable,
- baseconfig: '',
- isSystem: true
- },
// {
- // title: '鍩虹琛ㄦ牸锛堟柊锛�',
- // type: 'BaseTable',
+ // title: '鍩虹琛ㄦ牸',
+ // type: 'CommonTable',
// url: nortable,
// baseconfig: '',
// isSystem: true
// },
+ {
+ title: '鍩虹琛ㄦ牸',
+ type: 'BaseTable',
+ url: nortable,
+ baseconfig: '',
+ isSystem: true
+ },
// {
// title: '涓诲瓙琛ㄨ〃鏍�',
// type: 'CommonTable',
@@ -78,13 +77,6 @@
title: '鏍戝舰椤甸潰',
type: 'TreePage',
url: treepage,
- baseconfig: '',
- isSystem: true
- },
- {
- title: '鏃ュ巻',
- type: 'CalendarPage',
- url: calendar,
baseconfig: '',
isSystem: true
},
@@ -157,6 +149,8 @@
{value: '[7, -7]', text: '鍓嶅悗涓冨ぉ'},
{value: '[30, -30]', text: '鍓嶅悗30澶�'},
{value: '[90, -90]', text: '鍓嶅悗90澶�'},
+ {value: '[180, -180]', label: '鍓嶅悗180澶�'},
+ {value: '[365, -365]', label: '鍓嶅悗365澶�'},
{value: '[-1, -1]', text: '鏄庡ぉ'},
{value: '[-2, -2]', text: '鍚庡ぉ'},
{value: 'week', text: '鏈懆'},
@@ -188,7 +182,7 @@
// 鍖归厤瑙勫垯
export const matchReg = {
- text: [{
+ class1: [{
value: 'like',
text: 'like'
}, {
@@ -210,20 +204,7 @@
value: '<=',
text: '<='
}],
- multiselect: [{
- value: 'like',
- text: 'like'
- }, {
- value: 'not like',
- text: 'not like'
- }],
- select: [{
- value: 'like',
- text: 'like'
- }, {
- value: 'not like',
- text: 'not like'
- }, {
+ class2: [{
value: '=',
text: '='
}, {
@@ -239,7 +220,14 @@
value: '<=',
text: '<='
}],
- date: [{
+ class3: [{
+ value: 'like',
+ text: 'like'
+ }, {
+ value: 'not like',
+ text: 'not like'
+ }],
+ class4: [{
value: '>=',
text: '>='
}, {
@@ -249,11 +237,7 @@
value: '=',
text: '='
}],
- datemonth: [{
- value: 'between',
- text: 'between'
- }],
- daterange: [{
+ class5: [{
value: 'between',
text: 'between'
}]
@@ -389,36 +373,6 @@
}, {
value: 'border-purple',
text: '鐧藉簳绱'
-}]
-
-// 鎸夐挳棰滆壊闆�
-export const btnCustomClasses = [{
- value: 'primary',
- text: '钃濊壊'
-}, {
- value: 'yellow',
- text: '榛勮壊'
-}, {
- value: 'orange',
- text: '姗欒壊'
-}, {
- value: 'danger',
- text: '绾㈣壊'
-}, {
- value: 'green',
- text: '缁胯壊'
-}, {
- value: 'dgreen',
- text: '娣辩豢鑹�'
-}, {
- value: 'purple',
- text: '绱壊'
-}, {
- value: 'cyan',
- text: '闈掕壊'
-}, {
- value: 'gray',
- text: '鐏拌壊'
}]
export const calendarColors = [
--
Gitblit v1.8.0