From 0245e64a9dff794903e546c3bdf9fef7efeefdf1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 06 十二月 2022 16:09:04 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/templates/comtableconfig/source.jsx | 95 ++++++++++++++++++++++++-----------------------
1 files changed, 49 insertions(+), 46 deletions(-)
diff --git a/src/templates/comtableconfig/source.jsx b/src/templates/comtableconfig/source.jsx
index daf9aff..1b7d5de 100644
--- a/src/templates/comtableconfig/source.jsx
+++ b/src/templates/comtableconfig/source.jsx
@@ -1,8 +1,4 @@
import Utils from '@/utils/utils.js'
-import zhCN from '@/locales/zh-CN/model.js'
-import enUS from '@/locales/en-US/model.js'
-
-const CommonDict = (!localStorage.getItem('lang') || localStorage.getItem('lang') === 'zh-CN') ? zhCN : enUS
class CommonTableBaseData {
baseConfig = {
@@ -10,6 +6,7 @@
type: 'system',
Template: 'CommonTable',
enabled: false,
+ easyCode: '',
setting: {
actionfixed: false,
columnfixed: false,
@@ -18,7 +15,7 @@
primaryKey: '',
order: '',
dataresource: '',
- interType: 'inner',
+ interType: 'system',
sysInterface: 'false',
innerFunc: '',
interface: '',
@@ -35,11 +32,9 @@
initval: '',
type: 'text',
resourceType: '0',
- setAll: 'false',
options: [],
orderType: 'asc',
match: 'like',
- display: 'dropdown'
}, {
origin: true,
uuid: Utils.getuuid(),
@@ -48,11 +43,9 @@
initval: '',
type: 'select',
resourceType: '0',
- setAll: 'false',
options: [],
orderType: 'asc',
- match: 'equal',
- display: 'dropdown'
+ match: '=',
}, {
origin: true,
uuid: Utils.getuuid(),
@@ -61,11 +54,9 @@
initval: '',
type: 'date',
resourceType: '0',
- setAll: 'false',
options: [],
orderType: 'asc',
match: 'greater',
- display: 'dropdown'
}
],
action: [
@@ -73,13 +64,11 @@
origin: true,
uuid: Utils.getuuid(),
label: 'add',
- intertype: 'inner',
- method: 'POST',
+ intertype: 'system',
Ot: 'notRequired',
position: 'toolbar',
execSuccess: 'grid',
execError: 'never',
- errorTime: 15,
OpenType: 'pop',
icon: 'plus',
class: 'green',
@@ -88,13 +77,11 @@
origin: true,
uuid: Utils.getuuid(),
label: 'update',
- intertype: 'inner',
- method: 'POST',
+ intertype: 'system',
Ot: 'requiredSgl',
- position: 'grid',
+ position: 'toolbar',
execSuccess: 'grid',
execError: 'never',
- errorTime: 15,
OpenType: 'pop',
icon: 'form',
class: 'purple',
@@ -103,13 +90,11 @@
origin: true,
uuid: Utils.getuuid(),
label: 'delete',
- intertype: 'inner',
- method: 'POST',
+ intertype: 'system',
Ot: 'required',
position: 'toolbar',
execSuccess: 'grid',
execError: 'never',
- errorTime: 15,
OpenType: 'prompt',
icon: 'delete',
class: 'red',
@@ -164,7 +149,7 @@
Align: 'center',
IsSort: 'false',
uuid: Utils.getuuid(),
- label: CommonDict['header.form.column.action'],
+ label: '鎿嶄綔',
type: 'action',
style: 'button',
show: 'horizontal',
@@ -206,49 +191,55 @@
searchItems = [
{
type: 'search',
- label: CommonDict['header.form.text'],
+ label: '鏂囨湰',
subType: 'text',
url: ''
},
{
type: 'search',
- label: CommonDict['header.form.select'],
+ label: '涓嬫媺閫夋嫨',
subType: 'select',
url: ''
},
{
type: 'search',
- label: CommonDict['header.form.multiselect'],
+ label: '涓嬫媺澶氶��',
subType: 'multiselect',
url: ''
},
{
type: 'search',
- label: CommonDict['header.form.link'],
+ label: '鑱斿姩鑿滃崟',
subType: 'link',
url: ''
},
{
type: 'search',
- label: CommonDict['header.form.dateday'],
+ label: '閫夐」鍗�',
+ subType: 'checkcard',
+ url: ''
+ },
+ {
+ type: 'search',
+ label: '鏃ユ湡锛堝ぉ锛�',
subType: 'date',
url: ''
},
{
type: 'search',
- label: CommonDict['header.form.dateweek'],
+ label: '鏃ユ湡锛堝懆锛�',
subType: 'dateweek',
url: ''
},
{
type: 'search',
- label: CommonDict['header.form.datemonth'],
+ label: '鏃ユ湡锛堟湀锛�',
subType: 'datemonth',
url: ''
},
{
type: 'search',
- label: CommonDict['header.form.daterange'],
+ label: '鏃ユ湡锛堝尯闂达級',
subType: 'daterange',
url: ''
},
@@ -263,55 +254,55 @@
actionItems = [
{
type: 'action',
- label: CommonDict['header.form.popform'],
+ label: '寮圭獥锛堣〃鍗曪級',
subType: 'pop',
url: ''
},
{
type: 'action',
- label: CommonDict['header.form.prompt'],
+ label: '鎻愮ず妗�',
subType: 'prompt',
url: ''
},
{
type: 'action',
- label: CommonDict['header.form.exec'],
+ label: '鐩存帴鎵ц',
subType: 'exec',
url: ''
},
{
type: 'action',
- label: CommonDict['header.form.excelIn'],
+ label: '瀵煎叆Excel',
subType: 'excelIn',
url: ''
},
{
type: 'action',
- label: CommonDict['header.form.excelOut'],
+ label: '瀵煎嚭Excel',
subType: 'excelOut',
url: ''
},
{
type: 'action',
- label: CommonDict['header.form.popview'],
+ label: '寮圭獥锛堟爣绛撅級',
subType: 'popview',
url: ''
},
{
type: 'action',
- label: CommonDict['header.form.tab'],
+ label: '鏍囩椤�',
subType: 'tab',
url: ''
},
{
type: 'action',
- label: CommonDict['header.form.newpage'],
+ label: '鏂伴〉闈�',
subType: 'innerpage',
url: ''
},
{
type: 'action',
- label: CommonDict['header.form.funcbutton'],
+ label: '鍔熻兘鎸夐挳',
subType: 'funcbutton',
url: ''
}
@@ -320,32 +311,44 @@
columnItems = [
{
type: 'columns',
- label: CommonDict['header.form.text'],
+ label: '鏂囨湰',
subType: 'text',
url: ''
},
{
type: 'columns',
- label: CommonDict['header.form.number'],
+ label: '鏁板瓧',
subType: 'number',
url: ''
},
{
type: 'columns',
- label: CommonDict['header.form.picture'],
+ label: '鍥剧墖',
subType: 'picture',
url: ''
},
{
type: 'columns',
- label: CommonDict['header.form.textarea'],
+ label: '閾炬帴',
+ subType: 'link',
+ url: ''
+ },
+ {
+ type: 'columns',
+ label: '澶氳鏂囨湰',
subType: 'textarea',
url: ''
},
{
type: 'columns',
- label: CommonDict['header.form.colspan'],
+ label: '鍚堝苟鍒�',
subType: 'colspan',
+ url: ''
+ },
+ {
+ type: 'columns',
+ label: '搴忓彿',
+ subType: 'index',
url: ''
}
]
@@ -353,7 +356,7 @@
tabItems = [
{
type: 'tabs',
- label: CommonDict['header.menu.tab.subtable'],
+ label: '瀛愯〃',
subType: 'SubTable',
}
]
--
Gitblit v1.8.0