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/subtableconfig/source.jsx | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/src/templates/subtableconfig/source.jsx b/src/templates/subtableconfig/source.jsx
index 963efc1..bb48d97 100644
--- a/src/templates/subtableconfig/source.jsx
+++ b/src/templates/subtableconfig/source.jsx
@@ -35,11 +35,9 @@
initval: '',
type: 'text',
resourceType: '0',
- setAll: 'false',
options: [],
orderType: 'asc',
match: 'like',
- display: 'dropdown'
}, {
origin: true,
uuid: Utils.getuuid(),
@@ -48,11 +46,9 @@
initval: '',
type: 'select',
resourceType: '0',
- setAll: 'false',
options: [],
orderType: 'asc',
match: 'equal',
- display: 'dropdown'
}, {
origin: true,
uuid: Utils.getuuid(),
@@ -61,11 +57,9 @@
initval: '',
type: 'date',
resourceType: '0',
- setAll: 'false',
options: [],
orderType: 'asc',
match: 'greater',
- display: 'dropdown'
}
],
action: [
@@ -78,7 +72,6 @@
position: 'toolbar',
execSuccess: 'grid',
execError: 'never',
- errorTime: 15,
OpenType: 'pop',
icon: 'plus',
class: 'green',
@@ -92,7 +85,6 @@
position: 'grid',
execSuccess: 'grid',
execError: 'never',
- errorTime: 15,
OpenType: 'pop',
icon: 'form',
class: 'purple',
@@ -106,7 +98,6 @@
position: 'toolbar',
execSuccess: 'grid',
execError: 'never',
- errorTime: 15,
OpenType: 'prompt',
icon: 'delete',
class: 'red',
@@ -206,13 +197,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