From 465be8b618c1fb139d56ed779ff6f4dbc8d89b89 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 04 八月 2023 15:47:14 +0800
Subject: [PATCH] 2023-08-04
---
src/tabviews/subtabtable/index.jsx | 36 ++++++++----------------------------
1 files changed, 8 insertions(+), 28 deletions(-)
diff --git a/src/tabviews/subtabtable/index.jsx b/src/tabviews/subtabtable/index.jsx
index 3388d62..8e47675 100644
--- a/src/tabviews/subtabtable/index.jsx
+++ b/src/tabviews/subtabtable/index.jsx
@@ -4,8 +4,6 @@
import { notification, Spin, Modal } from 'antd'
import Api from '@/api'
-import zhCN from '@/locales/zh-CN/main.js'
-import enUS from '@/locales/en-US/main.js'
import Utils from '@/utils/utils.js'
import UtilsDM from '@/utils/utils-datamanage.js'
import { updateSubTabTable } from '@/utils/utils-update.js'
@@ -30,7 +28,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
loadingview: true, // 椤甸潰鍔犺浇涓�
viewlost: false, // 椤甸潰涓㈠け锛�1銆佹湭鑾峰彇鍒伴厤缃�-椤甸潰涓㈠け锛�2銆侀〉闈㈡湭鍚敤
lostmsg: '', // 椤甸潰涓㈠け鏃剁殑鎻愮ず淇℃伅
@@ -50,7 +47,6 @@
statFields: [], // 鍚堣瀛楁
statFValue: [], // 鍚堣鍊�
absFields: [], // 缁濆鍊煎瓧娈�
- hasReqFields: false
}
/**
@@ -90,7 +86,7 @@
this.setState({
loadingview: false,
viewlost: true,
- lostmsg: this.state.dict['main.view.unenabled']
+ lostmsg: '鎶辨瓑锛屾偍璁块棶鐨勯〉闈㈡湭鍚敤锛岃鑱旂郴绠＄悊鍛樸��'
})
return
}
@@ -126,14 +122,7 @@
// 鏉冮檺杩囨护
config.action = config.action.filter(item => item.hidden !== 'true')
- config.search = Utils.initSearchVal(config.search)
-
- let hasReqFields = false
- config.search.forEach(field => {
- if (field.required) {
- hasReqFields = true
- }
- })
+ Utils.initSearchVal(config)
// 瀛楁鏉冮檺榛戝悕鍗�
let roleId = sessionStorage.getItem('role_id') || '' // 瑙掕壊ID
@@ -259,10 +248,8 @@
}
if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
- config.setting.dataresource = config.setting.dataresource.replace(/\$@/ig, '/*')
- config.setting.dataresource = config.setting.dataresource.replace(/@\$/ig, '*/')
- config.setting.customScript = config.setting.customScript.replace(/\$@/ig, '/*')
- config.setting.customScript = config.setting.customScript.replace(/@\$/ig, '*/')
+ config.setting.dataresource = config.setting.dataresource.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/')
+ config.setting.customScript = config.setting.customScript.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/')
} else {
config.setting.dataresource = config.setting.dataresource.replace(/@\$|\$@/ig, '')
config.setting.customScript = config.setting.customScript.replace(/@\$|\$@/ig, '')
@@ -270,11 +257,6 @@
let userName = sessionStorage.getItem('User_Name') || ''
let fullName = sessionStorage.getItem('Full_Name') || ''
-
- if (sessionStorage.getItem('isEditState') === 'true') {
- userName = sessionStorage.getItem('CloudUserName') || ''
- fullName = sessionStorage.getItem('CloudFullName') || ''
- }
let regs = [
{ reg: /@userName@/ig, value: `'${userName}'` },
@@ -313,6 +295,7 @@
searchRatio: config.setting.searchRatio || '',
searchLwidth: config.setting.searchLwidth,
borderRadius: config.setting.borderRadius,
+ resetContrl: config.setting.resetContrl,
}
this.setState({
@@ -326,7 +309,6 @@
columns: _columns,
arr_field: _arrField.join(','),
search: Utils.initMainSearch(config.search), // 鎼滅储鏉′欢鍒濆鍖栵紙鍚湁鏃堕棿鏍煎紡锛岄渶瑕佽浆鍖栵級
- hasReqFields
}, () => {
if (config.setting.onload !== 'false') { // 鍒濆鍖栧彲鍔犺浇
this.loadData()
@@ -346,11 +328,11 @@
}
loadData = (id) => {
- const { setting, search, hasReqFields } = this.state
+ const { setting, search, config } = this.state
let searches = fromJS(search).toJS()
- if (hasReqFields) {
+ if (config.$s_req) {
let requireFields = searches.filter(item => item.required && item.value === '')
if (requireFields.length > 0) {
this.setState({
@@ -702,7 +684,7 @@
return (
<div className="subtabtable" id={'subtabtable' + this.props.MenuID}>
{loadingview && <Spin />}
- {config.search && config.search.length ?
+ {config && config.search && config.search.length ?
<SubSearch BID={this.props.BID} config={config} refreshdata={this.refreshbysearch}/> : null
}
{config ? <div style={{minHeight: '25px'}}>
@@ -711,7 +693,6 @@
actions={actions}
columns={columns}
BID={this.props.BID}
- dict={this.state.dict}
BData={this.props.BData}
selectedData={selectedData}
MenuID={this.props.SupMenuID}
@@ -723,7 +704,6 @@
columns={columns}
pageSize={pageSize}
data={this.state.data}
- dict={this.state.dict}
BData={this.props.BData}
total={this.state.total}
MenuID={this.props.MenuID}
--
Gitblit v1.8.0