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/formtabconfig/source.jsx | 227 ++++++++++++++++----------------------------------------
1 files changed, 67 insertions(+), 160 deletions(-)
diff --git a/src/templates/formtabconfig/source.jsx b/src/templates/formtabconfig/source.jsx
index 267165c..57eeafd 100644
--- a/src/templates/formtabconfig/source.jsx
+++ b/src/templates/formtabconfig/source.jsx
@@ -1,23 +1,13 @@
import Utils from '@/utils/utils.js'
-import zhCN from '@/locales/zh-CN/comtable.js'
-import enUS from '@/locales/en-US/comtable.js'
-
-const CommonDict = (!localStorage.getItem('lang') || localStorage.getItem('lang') === 'zh-CN') ? zhCN : enUS
class CommonTableBaseData {
baseConfig = {
- type: 'formTab',
+ Template: 'FormTab',
enabled: false,
setting: {
- tableName: '',
- primaryKey: '',
- dataresource: '',
- interType: 'inner',
- innerFunc: '',
- interface: '',
- outerFunc: '',
- cols: 2,
- subtabs: []
+ datatype: 'query',
+ cols: '2',
+ width: 90
},
tables: [],
groups: [
@@ -25,6 +15,7 @@
isDefault: true,
uuid: Utils.getuuid(),
label: 'label',
+ sort: 101,
sublist: [
{
origin: true,
@@ -34,15 +25,8 @@
initval: '',
type: 'text',
resourceType: '0',
- setAll: 'false',
options: [],
- dataSource: '',
- linkField: '',
- valueField: '',
- valueText: '',
- orderBy: '',
- orderType: 'asc',
- match: 'like'
+ orderType: 'asc'
}, {
origin: true,
uuid: Utils.getuuid(),
@@ -51,15 +35,8 @@
initval: '',
type: 'select',
resourceType: '0',
- setAll: 'false',
options: [],
- dataSource: '',
- linkField: '',
- valueField: '',
- valueText: '',
- orderBy: '',
- orderType: 'asc',
- match: 'equal'
+ orderType: 'asc'
}, {
origin: true,
uuid: Utils.getuuid(),
@@ -68,184 +45,114 @@
initval: '',
type: 'date',
resourceType: '0',
- setAll: 'false',
options: [],
- dataSource: '',
- linkField: '',
- valueField: '',
- valueText: '',
- orderBy: '',
- orderType: 'asc',
- match: 'greater'
+ orderType: 'asc'
}
]
}
],
- search: [
- {
- origin: true,
- uuid: Utils.getuuid(),
- label: 'label',
- field: '',
- initval: '',
- type: 'text',
- resourceType: '0',
- setAll: 'false',
- options: [],
- dataSource: '',
- linkField: '',
- valueField: '',
- valueText: '',
- orderBy: '',
- orderType: 'asc',
- match: 'like'
- }, {
- origin: true,
- uuid: Utils.getuuid(),
- label: 'label',
- field: '',
- initval: '',
- type: 'select',
- resourceType: '0',
- setAll: 'false',
- options: [],
- dataSource: '',
- linkField: '',
- valueField: '',
- valueText: '',
- orderBy: '',
- orderType: 'asc',
- match: 'equal'
- }, {
- origin: true,
- uuid: Utils.getuuid(),
- label: 'label',
- field: '',
- initval: '',
- type: 'date',
- resourceType: '0',
- setAll: 'false',
- options: [],
- dataSource: '',
- linkField: '',
- valueField: '',
- valueText: '',
- orderBy: '',
- orderType: 'asc',
- match: 'greater'
- }
- ],
action: [
{
- origin: true,
+ btnType: 'confirm',
uuid: Utils.getuuid(),
- label: 'add',
- intertype: 'inner',
+ label: '纭畾',
+ intertype: 'system',
innerFunc: '',
interface: '',
- method: 'POST',
outerFunc: '',
sql: '',
sqlType: '',
callbackFunc: '',
Ot: 'notRequired',
- position: 'toolbar',
execSuccess: 'grid',
execError: 'never',
- errorTime: 15,
- OpenType: 'pop',
- pageTemplate: '',
- url: '',
- icon: 'plus',
- class: 'green',
+ OpenType: 'exec',
+ icon: '',
+ class: 'border-primary',
verify: null
}, {
- origin: true,
+ btnType: 'cancel',
uuid: Utils.getuuid(),
- label: 'update',
- intertype: 'inner',
- innerFunc: '',
- interface: '',
- method: 'POST',
- outerFunc: '',
- sql: '',
- sqlType: '',
- callbackFunc: '',
- Ot: 'requiredSgl',
- position: 'grid',
+ label: '鍏抽棴',
execSuccess: 'grid',
execError: 'never',
- errorTime: 15,
- OpenType: 'pop',
+ OpenType: 'exec',
pageTemplate: '',
url: '',
- icon: 'form',
- class: 'purple',
- verify: null
+ icon: '',
+ class: 'border-danger'
}
],
- tabs: [
- {
- origin: true, // 鏄惁涓虹ず渚�
- groupId: 'tabs',
- uuid: Utils.getuuid(),
- label: 'tab1',
- icon: '',
- type: 'SubTable',
- linkTab: '',
- subtabs: [],
- supMenu: ''
- },
- {
- origin: true,
- groupId: 'tabs',
- uuid: Utils.getuuid(),
- label: 'tab2',
- icon: '',
- type: 'SubTable',
- linkTab: '',
- subtabs: [],
- supMenu: ''
- }
- ],
- tabgroups: ['tabs']
+ tabgroups: [{
+ uuid: 'tabs',
+ sublist: [
+ {
+ origin: true, // 鏄惁涓虹ず渚�
+ uuid: Utils.getuuid(),
+ label: 'tab1',
+ type: 'SubTable',
+ linkTab: '',
+ supMenu: ''
+ },
+ {
+ origin: true,
+ uuid: Utils.getuuid(),
+ label: 'tab2',
+ type: 'SubTable',
+ linkTab: '',
+ supMenu: ''
+ }
+ ]
+ }]
}
searchItems = [
{
type: 'search',
- label: '鏂囨湰妗�',
+ label: '鏂囨湰',
subType: 'text',
url: ''
},
{
type: 'search',
- label: '涓嬫媺妗�',
+ label: '鏁板瓧',
+ subType: 'number',
+ url: ''
+ },
+ {
+ type: 'search',
+ label: '涓嬫媺閫夋嫨',
subType: 'select',
url: ''
},
{
type: 'search',
- label: '鏃堕棿妗嗭紙澶╋級',
+ label: '鏂囦欢涓婁紶',
+ subType: 'fileupload',
+ url: ''
+ },
+ {
+ type: 'search',
+ label: '鏃堕棿锛堝ぉ锛�',
subType: 'date',
url: ''
},
{
type: 'search',
- label: '鏃堕棿妗嗭紙鍛級',
- subType: 'dateweek',
- url: ''
- },
- {
- type: 'search',
- label: '鏃堕棿妗嗭紙鏈堬級',
+ label: '鏃堕棿锛堟湀锛�',
subType: 'datemonth',
url: ''
},
{
type: 'search',
- label: '鏃堕棿妗嗭紙鍖洪棿锛�',
- subType: 'daterange',
+ label: '鏃堕棿锛堢锛�',
+ subType: 'datetime',
+ url: ''
+ },
+ {
+ type: 'search',
+ label: '澶氳鏂囨湰',
+ subType: 'textarea',
url: ''
}
]
@@ -253,13 +160,13 @@
actionItems = [
{
type: 'action',
- label: CommonDict['header.form.prompt'],
+ label: '鎻愮ず妗�',
subType: 'prompt',
url: ''
},
{
type: 'action',
- label: CommonDict['header.form.exec'],
+ label: '鐩存帴鎵ц',
subType: 'exec',
url: ''
}
@@ -268,7 +175,7 @@
tabItems = [
{
type: 'tabs',
- label: CommonDict['header.menu.tab.subtable'],
+ label: '瀛愯〃',
subType: 'SubTable',
}
]
--
Gitblit v1.8.0