From fb3ec146a9e1444ece749d0bcf232a554e933fb0 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 17 五月 2022 22:56:16 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/utils/option.js | 61 +++++++++++++++++++++++-------
1 files changed, 47 insertions(+), 14 deletions(-)
diff --git a/src/utils/option.js b/src/utils/option.js
index 60f45a3..2c6f1d5 100644
--- a/src/utils/option.js
+++ b/src/utils/option.js
@@ -66,6 +66,13 @@
isSubtable: true
},
{
+ title: '鑷畾涔�',
+ type: 'CustomPage',
+ url: customImg,
+ baseconfig: '',
+ isSystem: true
+ },
+ {
title: '鏍戝舰椤甸潰',
type: 'TreePage',
url: treepage,
@@ -80,13 +87,6 @@
isSystem: true
},
{
- title: '鑷畾涔�',
- type: 'CustomPage',
- url: customImg,
- baseconfig: '',
- isSystem: true
- },
- {
title: '澶栭儴椤甸潰',
type: 'NewPage',
url: customImg,
@@ -97,8 +97,7 @@
title: '瑙掕壊鏉冮檺鍒嗛厤',
type: 'RolePermission',
url: rolemanage,
- isSystem: true,
- hidden: true
+ isSystem: true
}
]
@@ -123,6 +122,11 @@
{value: -7, text: '鍚庝竷澶�'},
{value: -30, text: '鍚�30澶�'},
{value: -90, text: '鍚�90澶�'},
+ {value: -180, text: '鍚庡崐骞�'},
+ {value: -365, text: '鍚�1骞�'},
+ {value: -1095, text: '鍚�3骞�'},
+ {value: -1825, text: '鍚�5骞�'},
+ {value: -3650, text: '鍚�10骞�'},
{value: -7300, text: '鍚�20骞�'},
],
dateweek: [
@@ -158,7 +162,7 @@
],
datetime: [
{value: '', text: _dict['model.empty']},
- {value: '0', text: '浠婂ぉ'},
+ {value: '0', text: '褰撳墠'},
{value: 1, text: '鏄ㄥぉ'},
{value: 3, text: '鍓嶄笁澶�'},
{value: 7, text: '鍓嶄竷澶�'},
@@ -171,6 +175,11 @@
{value: -7, text: '鍚庝竷澶�'},
{value: -30, text: '鍚�30澶�'},
{value: -90, text: '鍚�90澶�'},
+ {value: -180, text: '鍚庡崐骞�'},
+ {value: -365, text: '鍚�1骞�'},
+ {value: -1095, text: '鍚�3骞�'},
+ {value: -1825, text: '鍚�5骞�'},
+ {value: -3650, text: '鍚�10骞�'},
{value: -7300, text: '鍚�20骞�'},
]
}
@@ -186,6 +195,18 @@
}, {
value: '=',
text: '='
+ }, {
+ value: '>',
+ text: '>'
+ }, {
+ value: '<',
+ text: '<'
+ }, {
+ value: '>=',
+ text: '>='
+ }, {
+ value: '<=',
+ text: '<='
}],
multiselect: [{
value: 'like',
@@ -195,14 +216,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: '>=',
@@ -913,4 +946,4 @@
]
}
-export const queryTableSql = 'select TbName,Remark from (select TbName,Remark from sDataDictb where appkey= @appkey@ and Deleted=0 union select a.TbName,Remark from (select TbName,Remark from sDataDictb where appkey= \'\' and Deleted=0 ) a left join (select TbName from sDataDictb where appkey= @appkey@ and Deleted=0 ) b on a.TbName=b.TbName where b.TbName is null ) t'
+export const queryTableSql = 'select top 999999 TbName,Remark from (select TbName,Remark from sDataDictb where appkey= @appkey@ and Deleted=0 union select a.TbName,Remark from (select TbName,Remark from sDataDictb where appkey= \'\' and Deleted=0 ) a left join (select TbName from sDataDictb where appkey= @appkey@ and Deleted=0 ) b on a.TbName=b.TbName where b.TbName is null ) t order by TbName'
--
Gitblit v1.8.0