From f3167f8371d19d0ea8fe7d0e7af5517ff0b08cd2 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 07 四月 2021 23:25:29 +0800
Subject: [PATCH] 2021-04-07
---
src/templates/formtabconfig/index.jsx | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/src/templates/formtabconfig/index.jsx b/src/templates/formtabconfig/index.jsx
index abd4a79..47db6ac 100644
--- a/src/templates/formtabconfig/index.jsx
+++ b/src/templates/formtabconfig/index.jsx
@@ -10,8 +10,7 @@
import Api from '@/api'
import zhCN from '@/locales/zh-CN/model.js'
import enUS from '@/locales/en-US/model.js'
-import Utils from '@/utils/utils.js'
-import DevUtils from '@/utils/devutils.js'
+import Utils, { FuncUtils } from '@/utils/utils.js'
import { getModalForm, getActionForm } from '@/templates/zshare/formconfig'
import { queryTableSql } from '@/utils/option.js'
@@ -44,7 +43,7 @@
}
state = {
- dict: localStorage.getItem('lang') !== 'en-US' ? zhCN : enUS, // 瀛楀吀
+ dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS, // 瀛楀吀
config: null, // 椤甸潰閰嶇疆
modaltype: '', // 妯℃�佹绫诲瀷锛屾帶鍒舵ā鎬佹鏄剧ず
tableVisible: false, // 鏁版嵁琛ㄥ瓧娈垫ā鎬佹
@@ -731,8 +730,8 @@
menuNo: menu.MenuNo
}
- newLText = Utils.formatOptions(DevUtils.getfunc(_param, btn, menu, _config))
- DelText = Utils.formatOptions(DevUtils.dropfunc(_param.funcName))
+ newLText = Utils.formatOptions(FuncUtils.getfunc(_param, btn, menu, _config))
+ DelText = Utils.formatOptions(FuncUtils.dropfunc(_param.funcName))
this.refs.btnCreatFunc.exec(btn.innerFunc, newLText, DelText)
})
@@ -771,8 +770,8 @@
}
let _config = {...config, setting: setting}
- let newLText = Utils.formatOptions(DevUtils.getTableFunc(setting, menu, _config)) // 鍒涘缓瀛樺偍杩囩▼sql
- let DelText = Utils.formatOptions(DevUtils.dropfunc(setting.innerFunc)) // 鍒犻櫎瀛樺偍杩囩▼sql
+ let newLText = Utils.formatOptions(FuncUtils.getTableFunc(setting, menu, _config)) // 鍒涘缓瀛樺偍杩囩▼sql
+ let DelText = Utils.formatOptions(FuncUtils.dropfunc(setting.innerFunc)) // 鍒犻櫎瀛樺偍杩囩▼sql
this.refs.tableCreatFunc.exec(setting.innerFunc, newLText, DelText).then(result => {
if (result === 'success') {
@@ -906,7 +905,7 @@
if (_ismutil && group.sublist.length === 0) {
_config.enabled = false
}
- let arr = group.sublist.filter(item => item.field.toLowerCase() === _primary)
+ let arr = group.sublist.filter(item => item.field && item.field.toLowerCase() === _primary)
if (arr.length > 0) {
_config.enabled = false
@@ -1620,7 +1619,7 @@
let primaryrepeat = false
config.groups.forEach(group => {
- let arr = group.sublist.filter(item => item.field.toLowerCase() === _primary)
+ let arr = group.sublist.filter(item => item.field && item.field.toLowerCase() === _primary)
if (arr.length > 0) {
primaryrepeat = true
@@ -2014,7 +2013,6 @@
visible={this.state.tableVisible}
width={'65vw'}
maskClosable={false}
- style={{minWidth: '900px', maxWidth: '1200px'}}
cancelText={this.state.dict['model.close']}
onOk={this.addFieldSubmit}
onCancel={() => { // 鍙栨秷娣诲姞
@@ -2038,7 +2036,6 @@
visible={this.state.profileVisible}
width={'75vw'}
maskClosable={false}
- style={{minWidth: '900px', maxWidth: '1200px'}}
okText={this.state.dict['model.submit']}
onOk={this.verifySubmit}
onCancel={() => { this.setState({ profileVisible: false }) }}
--
Gitblit v1.8.0