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 | 119 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 78 insertions(+), 41 deletions(-)
diff --git a/src/templates/subtableconfig/source.jsx b/src/templates/subtableconfig/source.jsx
index ba636c4..bb48d97 100644
--- a/src/templates/subtableconfig/source.jsx
+++ b/src/templates/subtableconfig/source.jsx
@@ -2,10 +2,11 @@
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
+const CommonDict = sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS
class SubTableBaseData {
baseConfig = {
+ version: '1.0',
type: 'system',
Template: 'SubTable',
enabled: false,
@@ -19,7 +20,7 @@
primaryKey: '',
order: '',
dataresource: '',
- interType: 'inner',
+ interType: 'system',
innerFunc: '',
interface: '',
outerFunc: ''
@@ -34,11 +35,9 @@
initval: '',
type: 'text',
resourceType: '0',
- setAll: 'false',
options: [],
orderType: 'asc',
match: 'like',
- display: 'dropdown'
}, {
origin: true,
uuid: Utils.getuuid(),
@@ -47,11 +46,9 @@
initval: '',
type: 'select',
resourceType: '0',
- setAll: 'false',
options: [],
orderType: 'asc',
match: 'equal',
- display: 'dropdown'
}, {
origin: true,
uuid: Utils.getuuid(),
@@ -60,11 +57,9 @@
initval: '',
type: 'date',
resourceType: '0',
- setAll: 'false',
options: [],
orderType: 'asc',
match: 'greater',
- display: 'dropdown'
}
],
action: [
@@ -72,13 +67,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',
@@ -87,13 +80,11 @@
origin: true,
uuid: Utils.getuuid(),
label: 'update',
- intertype: 'inner',
- method: 'POST',
+ intertype: 'system',
Ot: 'requiredSgl',
position: 'grid',
execSuccess: 'grid',
execError: 'never',
- errorTime: 15,
OpenType: 'pop',
icon: 'form',
class: 'purple',
@@ -102,13 +93,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',
@@ -163,7 +152,7 @@
Align: 'center',
IsSort: 'false',
uuid: Utils.getuuid(),
- label: CommonDict['header.form.column.action'],
+ label: CommonDict['model.operation'],
type: 'action',
style: 'button',
show: 'horizontal',
@@ -184,38 +173,62 @@
searchItems = [
{
type: 'search',
- label: '鏂囨湰妗�',
+ label: CommonDict['model.form.text'],
subType: 'text',
url: ''
},
{
type: 'search',
- label: '涓嬫媺妗�',
+ label: CommonDict['model.form.select'],
subType: 'select',
url: ''
},
{
type: 'search',
- label: '鏃堕棿妗嗭紙澶╋級',
+ label: CommonDict['model.form.multiselect'],
+ subType: 'multiselect',
+ url: ''
+ },
+ {
+ type: 'search',
+ label: CommonDict['model.form.link'],
+ subType: 'link',
+ url: ''
+ },
+ {
+ type: 'search',
+ label: '閫夐」鍗�',
+ subType: 'checkcard',
+ url: ''
+ },
+ {
+ type: 'search',
+ label: '鏃ユ湡锛堝ぉ锛�',
subType: 'date',
url: ''
},
{
type: 'search',
- label: '鏃堕棿妗嗭紙鍛級',
+ label: '鏃ユ湡锛堝懆锛�',
subType: 'dateweek',
url: ''
},
{
type: 'search',
- label: '鏃堕棿妗嗭紙鏈堬級',
+ label: CommonDict['model.form.datemonth'],
subType: 'datemonth',
url: ''
},
{
type: 'search',
- label: '鏃堕棿妗嗭紙鍖洪棿锛�',
+ label: CommonDict['model.form.daterange'],
subType: 'daterange',
+ url: ''
+ },
+ {
+ type: 'search',
+ label: CommonDict['model.form.dategroup'],
+ subType: 'group',
url: ''
}
]
@@ -223,43 +236,55 @@
actionItems = [
{
type: 'action',
- label: CommonDict['header.form.popform'],
+ label: CommonDict['model.form.popform'],
subType: 'pop',
url: ''
},
{
type: 'action',
- label: CommonDict['header.form.popview'],
- subType: 'popview',
- url: ''
- },
- {
- type: 'action',
- label: CommonDict['header.form.prompt'],
+ label: CommonDict['model.form.prompt'],
subType: 'prompt',
url: ''
},
{
type: 'action',
- label: CommonDict['header.form.exec'],
+ label: CommonDict['model.form.exec'],
subType: 'exec',
url: ''
},
{
type: 'action',
- label: CommonDict['header.form.excelIn'],
+ label: CommonDict['model.form.excelIn'],
subType: 'excelIn',
url: ''
},
{
type: 'action',
- label: CommonDict['header.form.excelOut'],
+ label: CommonDict['model.form.excelOut'],
subType: 'excelOut',
url: ''
},
{
type: 'action',
- label: CommonDict['header.form.funcbutton'],
+ label: CommonDict['model.form.popview'],
+ subType: 'popview',
+ url: ''
+ },
+ {
+ type: 'action',
+ label: CommonDict['model.form.tab'],
+ subType: 'tab',
+ url: ''
+ },
+ {
+ type: 'action',
+ label: CommonDict['model.form.newpage'],
+ subType: 'innerpage',
+ url: ''
+ },
+ {
+ type: 'action',
+ label: CommonDict['model.form.funcbutton'],
subType: 'funcbutton',
url: ''
}
@@ -268,33 +293,45 @@
columnItems = [
{
type: 'columns',
- label: CommonDict['header.form.text'],
+ label: CommonDict['model.form.text'],
subType: 'text',
url: ''
},
{
type: 'columns',
- label: CommonDict['header.form.picture'],
+ label: CommonDict['model.form.picture'],
subType: 'picture',
url: ''
},
{
type: 'columns',
- label: CommonDict['header.form.number'],
+ label: CommonDict['model.form.number'],
subType: 'number',
url: ''
},
{
type: 'columns',
- label: CommonDict['header.form.textarea'],
+ label: CommonDict['model.form.href'],
+ subType: 'link',
+ url: ''
+ },
+ {
+ type: 'columns',
+ label: CommonDict['model.form.textarea'],
subType: 'textarea',
url: ''
},
{
type: 'columns',
- label: CommonDict['header.form.colspan'],
+ label: CommonDict['model.form.colspan'],
subType: 'colspan',
url: ''
+ },
+ {
+ type: 'columns',
+ label: '搴忓彿',
+ subType: 'index',
+ url: ''
}
]
}
--
Gitblit v1.8.0