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/formtabconfig/source.jsx | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/src/templates/formtabconfig/source.jsx b/src/templates/formtabconfig/source.jsx
index cb82f99..e5ddf6c 100644
--- a/src/templates/formtabconfig/source.jsx
+++ b/src/templates/formtabconfig/source.jsx
@@ -2,7 +2,7 @@
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 CommonTableBaseData {
baseConfig = {
@@ -29,7 +29,6 @@
initval: '',
type: 'text',
resourceType: '0',
- setAll: 'false',
options: [],
orderType: 'asc'
}, {
@@ -40,7 +39,6 @@
initval: '',
type: 'select',
resourceType: '0',
- setAll: 'false',
options: [],
orderType: 'asc'
}, {
@@ -51,7 +49,6 @@
initval: '',
type: 'date',
resourceType: '0',
- setAll: 'false',
options: [],
orderType: 'asc'
}
@@ -63,7 +60,7 @@
btnType: 'confirm',
uuid: Utils.getuuid(),
label: '纭畾',
- intertype: 'inner',
+ intertype: 'system',
innerFunc: '',
interface: '',
outerFunc: '',
@@ -73,7 +70,6 @@
Ot: 'notRequired',
execSuccess: 'grid',
execError: 'never',
- errorTime: 15,
OpenType: 'exec',
icon: '',
class: 'border-primary',
@@ -84,7 +80,6 @@
label: '鍏抽棴',
execSuccess: 'grid',
execError: 'never',
- errorTime: 15,
OpenType: 'exec',
pageTemplate: '',
url: '',
@@ -169,13 +164,13 @@
actionItems = [
{
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: ''
}
@@ -184,7 +179,7 @@
tabItems = [
{
type: 'tabs',
- label: CommonDict['header.menu.tab.subtable'],
+ label: CommonDict['model.menu.tab.subtable'],
subType: 'SubTable',
}
]
--
Gitblit v1.8.0