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/utils/option.js | 68 ++++++++++++++++++++++-----------
1 files changed, 45 insertions(+), 23 deletions(-)
diff --git a/src/utils/option.js b/src/utils/option.js
index 0d59ac9..6e6bb25 100644
--- a/src/utils/option.js
+++ b/src/utils/option.js
@@ -1,10 +1,11 @@
import zhCN from '@/locales/zh-CN/model.js'
import enUS from '@/locales/en-US/model.js'
import nortable from '@/assets/img/normaltable.jpg'
-import mainsubtable from '@/assets/img/mainsubtable.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'
const _dict = sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS
@@ -17,8 +18,6 @@
formMessage: '鏈�澶欯max涓瓧绗︺��', // 鏂囨湰琛ㄥ崟鏈�澶ф彁绀�
numbermsg: '璇疯緭鍏ユ暟瀛楋紒',
lettermsg: '璇疯緭鍏ュ瓧姣嶏紒',
- letternummsg: '璇疯緭鍏ユ暟瀛楁垨瀛楁瘝锛�',
- quotemsg: '涓嶅彲浣跨敤鑻辨枃鐘舵�佺殑鍗曞紩鍙凤紒',
funcname: '璇疯緭鍏ユ暟瀛椼�佸瓧姣嶃�佹眽瀛椾互鍙奯'
},
field: { // 瀛楁鍚�
@@ -57,13 +56,20 @@
baseconfig: '',
isSystem: true
},
+ // {
+ // title: '涓诲瓙琛ㄨ〃鏍�',
+ // type: 'CommonTable',
+ // url: mainsubtable,
+ // baseconfig: '',
+ // isSystem: true,
+ // isSubtable: true
+ // },
{
- title: '涓诲瓙琛ㄨ〃鏍�',
- type: 'CommonTable',
- url: mainsubtable,
+ title: '鑷畾涔�',
+ type: 'CustomPage',
+ url: customImg,
baseconfig: '',
- isSystem: true,
- isSubtable: true
+ isSystem: true
},
{
title: '鏍戝舰椤甸潰',
@@ -80,16 +86,9 @@
isSystem: true
},
{
- title: '鑷畾涔�',
- type: 'CustomPage',
- url: customImg,
- baseconfig: '',
- isSystem: true
- },
- {
title: '澶栭儴椤甸潰',
type: 'NewPage',
- url: customImg,
+ url: newpage,
baseconfig: '',
isSystem: true
},
@@ -97,13 +96,12 @@
title: '瑙掕壊鏉冮檺鍒嗛厤',
type: 'RolePermission',
url: rolemanage,
- isSystem: true,
- hidden: true
+ isSystem: true
}
]
// 鍥捐〃鑹茬郴
-export const chartColors = ['rgb(91, 143, 249)', 'rgb(90, 216, 166)', 'rgb(93, 112, 146)', 'rgb(246, 189, 22)', 'rgb(232, 100, 82)', 'rgb(109, 200, 236)', 'rgb(148, 95, 185)', 'rgb(246, 189, 22)', 'rgb(205, 221, 253)', 'rgb(248, 208, 203)']
+export const chartColors = ['rgb(91, 143, 249)', 'rgb(90, 216, 166)', 'rgb(93, 112, 146)', 'rgb(246, 189, 22)', 'rgb(232, 100, 82)', 'rgb(109, 200, 236)', 'rgb(148, 95, 185)', 'rgb(205, 221, 253)', 'rgb(248, 208, 203)', 'rgb(145, 213, 255)', 'rgb(211, 173, 247)']
// 鏃ユ湡榛樿鍊奸�夋嫨鑼冨洿
export const dateOptions = {
@@ -163,7 +161,7 @@
],
datetime: [
{value: '', text: _dict['model.empty']},
- {value: '0', text: '浠婂ぉ'},
+ {value: '0', text: '褰撳墠'},
{value: 1, text: '鏄ㄥぉ'},
{value: 3, text: '鍓嶄笁澶�'},
{value: 7, text: '鍓嶄竷澶�'},
@@ -196,6 +194,18 @@
}, {
value: '=',
text: '='
+ }, {
+ value: '>',
+ text: '>'
+ }, {
+ value: '<',
+ text: '<'
+ }, {
+ value: '>=',
+ text: '>='
+ }, {
+ value: '<=',
+ text: '<='
}],
multiselect: [{
value: 'like',
@@ -205,14 +215,26 @@
text: 'not like'
}],
select: [{
- value: '=',
- text: '='
- }, {
value: 'like',
text: 'like'
}, {
value: 'not like',
text: 'not like'
+ }, {
+ value: '=',
+ text: '='
+ }, {
+ value: '>',
+ text: '>'
+ }, {
+ value: '<',
+ text: '<'
+ }, {
+ value: '>=',
+ text: '>='
+ }, {
+ value: '<=',
+ text: '<='
}],
date: [{
value: '>=',
--
Gitblit v1.8.0