From 94f09287d3424f96a6d60ac67b9bf4ac58455e25 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 07 八月 2022 10:32:09 +0800
Subject: [PATCH] 2022-08-07
---
src/tabviews/calendar/index.jsx | 322 +++++++++++++++++++++--------------------------------
1 files changed, 128 insertions(+), 194 deletions(-)
diff --git a/src/tabviews/calendar/index.jsx b/src/tabviews/calendar/index.jsx
index b64ab9b..735d55a 100644
--- a/src/tabviews/calendar/index.jsx
+++ b/src/tabviews/calendar/index.jsx
@@ -2,7 +2,7 @@
import PropTypes from 'prop-types'
import {connect} from 'react-redux'
import { is, fromJS } from 'immutable'
-import { notification, Spin, Modal, Button, message, Tree, Typography } from 'antd'
+import { notification, Spin, Modal, Button } from 'antd'
import moment from 'moment'
import Api from '@/api'
@@ -10,19 +10,17 @@
import zhCN from '@/locales/zh-CN/main.js'
import enUS from '@/locales/en-US/main.js'
import Utils from '@/utils/utils.js'
+import asyncComponent from '@/utils/asyncComponent'
import asyncSpinComponent from '@/utils/asyncSpinComponent'
-import { refreshTabView } from '@/store/action'
-
-import MainSearch from '@/tabviews/zshare/topSearch'
+import MKEmitter from '@/utils/events.js'
import NotFount from '@/components/404'
import './index.scss'
// 閫氱敤缁勪欢
+const MainSearch = asyncComponent(() => import('@/tabviews/zshare/topSearch'))
const CalendarComponent = asyncSpinComponent(() => import('@/tabviews/zshare/calendar'))
const SubTabTable = asyncSpinComponent(() => import('@/tabviews/subtabtable'))
-
-const { TreeNode } = Tree
-const { Paragraph } = Typography
+const PagemsgComponent = asyncComponent(() => import('@/tabviews/zshare/pageMessage'))
class NormalTable extends Component {
static propTpyes = {
@@ -42,15 +40,15 @@
config: {}, // 椤甸潰閰嶇疆淇℃伅锛屽寘鎷寜閽�佹悳绱€�佹樉绀哄垪銆佹爣绛剧瓑
userConfig: null, // 鐢ㄦ埛鑷畾涔夎缃�
searchlist: null, // 鎼滅储鏉′欢
- arr_field: '', // 浣跨敤 sPC_Get_TableData 鏃剁殑鏌ヨ瀛楁闆�
+ arr_field: '', // 鏌ヨ瀛楁闆�
setting: null, // 椤甸潰鍏ㄥ眬璁剧疆锛氭暟鎹簮銆佹寜閽強鏄剧ず鍒楀浐瀹氥�佷富閿瓑
data: null, // 鍒楄〃鏁版嵁闆�
loading: false, // 鍒楄〃鏁版嵁鍔犺浇涓�
search: '', // 鎼滅储鏉′欢鏁扮粍锛屼娇鐢ㄦ椂闇�鍒嗗満鏅鐞�
visible: false, // 鏍囩椤垫帶鍒�
triggerTime: '', // 鐐瑰嚮鏃堕棿
- treevisible: false, // 鑿滃崟缁撴瀯鏍戝脊妗嗘樉绀洪殣钘忔帶鍒�
- calendarYear: moment().format('YYYY') // 鏃ュ巻骞翠唤
+ calendarYear: moment().format('YYYY'), // 鏃ュ巻骞翠唤
+ hasReqFields: false
}
/**
@@ -78,7 +76,7 @@
}
// HS涓嶄娇鐢ㄨ嚜瀹氫箟璁剧疆
- if (result.LongParamUser && this.props.menuType !== 'HS') {
+ if (result.LongParamUser && !window.GLOB.mkHS) {
try { // 閰嶇疆淇℃伅瑙ｆ瀽
userConfig = JSON.parse(window.decodeURIComponent(window.atob(result.LongParamUser)))
_curUserConfig = userConfig[this.props.MenuID]
@@ -108,10 +106,13 @@
}
// 鏉冮檺杩囨护
- if (this.props.menuType !== 'HS') {
+ if (!window.GLOB.mkHS) {
if (config.tab && !permAction[config.tab.linkTab]) {
config.tab = null
}
+ }
+ if (config.tab) {
+ config.tab.uuid = Utils.getuuid()
}
if (_curUserConfig) {
@@ -119,32 +120,17 @@
config.easyCode = _curUserConfig.easyCode || config.easyCode || ''
}
- // 瀛楁鏉冮檺榛戝悕鍗曘�佸繀濉�佸瓧娈甸�忚
- let valid = true
+ config.search = Utils.initSearchVal(config.search)
+
+ // 瀛楁閫忚
+ let hasReqFields = false
config.search = config.search.map(item => {
- item.oriInitval = item.initval
- if (['text', 'select', 'link'].includes(item.type) && param) {
- if (param.searchkey === item.field) {
- item.initval = param.searchval
- } else if (param.BID && item.field.toLowerCase() === 'bid') {
- item.initval = param.BID
- } else if (param.data && param.data[item.field]) {
- item.initval = param.data[item.field]
- }
+ if (param && ['text', 'select', 'link'].includes(item.type) && param.$searchkey === item.field) {
+ item.initval = param.$searchval
}
- if (item.required === 'true' && !item.initval) {
- valid = false
- }
-
- if (!item.blacklist || item.blacklist.length === 0) return item
-
- let _black = item.blacklist.filter(v => {
- return this.props.permRoles.indexOf(v) !== -1
- })
-
- if (_black.length > 0) {
- item.Hide = 'true'
+ if (item.required) {
+ hasReqFields = true
}
return item
@@ -170,7 +156,7 @@
config.setting.dataresource = '(' + config.setting.dataresource + ') tb'
}
- if (this.props.dataManager) { // 鏁版嵁鏉冮檺
+ if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
config.setting.dataresource = config.setting.dataresource.replace(/\$@/ig, '/*')
config.setting.dataresource = config.setting.dataresource.replace(/@\$/ig, '*/')
_customScript = _customScript.replace(/\$@/ig, '/*')
@@ -180,20 +166,49 @@
_customScript = _customScript.replace(/@\$|\$@/ig, '')
}
+ 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}'` },
+ { reg: /@fullName@/ig, value: `'${fullName}'` }
+ ]
+
+ regs.forEach(cell => {
+ config.setting.dataresource = config.setting.dataresource.replace(cell.reg, cell.value)
+ _customScript = _customScript.replace(cell.reg, cell.value)
+ })
+
+ if (config.urlFields) {
+ let _param = param || {}
+ config.urlFields.forEach(field => {
+ let reg = new RegExp('@' + field + '@', 'ig')
+ let val = `'${_param[field] || ''}'`
+ config.setting.dataresource = config.setting.dataresource.replace(reg, val)
+ _customScript = _customScript.replace(reg, val)
+ })
+ }
+
config.setting.customScript = _customScript
}
this.setState({
- BID: param && param.BID ? param.BID : '',
+ hasReqFields,
+ BID: param && param.$BID ? param.$BID : '',
loadingview: false,
config: config,
userConfig: userConfig,
setting: config.setting,
searchlist: config.search,
arr_field: config.columns.map(item => item.field).join(','),
- search: Utils.initMainSearch(config.search) // 鎼滅储鏉′欢鍒濆鍖栵紙鍚湁鏃堕棿鏍煎紡锛岄渶瑕佽浆鍖栵級
+ search: Utils.initMainSearch(config.search)
}, () => {
- if (config.setting.onload !== 'false' && valid) { // 鍒濆鍖栧彲鍔犺浇
+ if (config.setting.onload !== 'false') {
this.loadmaindata()
}
})
@@ -214,20 +229,15 @@
* @description 涓昏〃鏁版嵁鍔犺浇
*/
async loadmaindata () {
- const { setting, search, BID } = this.state
+ const { setting, search, BID, hasReqFields } = this.state
let param = ''
- let requireFields = search.filter(item => item.required && (!item.value || item.value.length === 0))
- if (requireFields.length > 0) {
- let labels = requireFields.map(item => item.label)
- labels = Array.from(new Set(labels))
-
- notification.warning({
- top: 92,
- message: this.state.dict['form.required.input'] + labels.join('銆�') + ' !',
- duration: 3
- })
- return
+ if (hasReqFields) {
+ let requireFields = search.filter(item => item.required && item.value === '')
+
+ if (requireFields.length > 0) {
+ return
+ }
}
this.setState({
@@ -244,7 +254,7 @@
param.BID = BID
}
// 鏁版嵁绠＄悊鏉冮檺
- if (this.props.dataManager) {
+ if (sessionStorage.getItem('dataM') === 'true') {
param.dataM = 'Y'
}
@@ -288,7 +298,7 @@
if (setting.interType === 'inner') {
param.func = setting.innerFunc
} else {
- if (this.props.menuType === 'HS') {
+ if (window.GLOB.mkHS) {
if (setting.sysInterface === 'true' && options.cloudServiceApi) {
param.rduri = options.cloudServiceApi
} else if (setting.sysInterface !== 'true') {
@@ -311,7 +321,7 @@
}
/**
- * @description 鑾峰彇绯荤粺瀛樺偍杩囩▼ sPC_Get_TableData 鐨勫弬鏁�
+ * @description 鑾峰彇绯荤粺瀛樺偍杩囩▼鐨勫弬鏁�
*/
getDefaultParam = () => {
const { arr_field, search, setting, config, calendarYear } = this.state
@@ -324,34 +334,58 @@
obj_name: 'data',
arr_field: arr_field,
custom_script: setting.customScript,
- default_sql: setting.execute || 'true'
+ default_sql: setting.execute || 'true',
+ menuname: this.props.MenuName || ''
}
let _dataresource = setting.dataresource
- let regoptions = null
+ let regoptions = []
+ let userName = sessionStorage.getItem('User_Name') || ''
+ let fullName = sessionStorage.getItem('Full_Name') || ''
+ let RoleID = sessionStorage.getItem('role_id') || ''
+ let departmentcode = sessionStorage.getItem('departmentcode') || ''
+ let organization = sessionStorage.getItem('organization') || ''
+ let mk_user_type = sessionStorage.getItem('mk_user_type') || ''
+ let nation = sessionStorage.getItem('nation') || ''
+ let province = sessionStorage.getItem('province') || ''
+ let city = sessionStorage.getItem('city') || ''
+ let district = sessionStorage.getItem('district') || ''
+ let address = sessionStorage.getItem('address') || ''
+
+ if (sessionStorage.getItem('isEditState') === 'true') {
+ userName = sessionStorage.getItem('CloudUserName') || ''
+ fullName = sessionStorage.getItem('CloudFullName') || ''
+ }
+
if (setting.queryType === 'statistics' || param.custom_script) {
let allSearch = Utils.getAllSearchOptions(search)
-
regoptions = allSearch.map(item => {
return {
reg: new RegExp('@' + item.key + '@', 'ig'),
value: `'${item.value}'`
}
})
+ regoptions.push({
+ reg: new RegExp('@userName@', 'ig'),
+ value: userName
+ }, {
+ reg: new RegExp('@fullName@', 'ig'),
+ value: fullName
+ })
}
- if (config.calendar.refresh === 'true' && regoptions) {
+ if (config.calendar.refresh === 'true') {
regoptions.push({
reg: new RegExp('@calendarDate@', 'ig'),
- value: `${calendarYear}-01-01 00:00:00.000`
+ value: `'${calendarYear}-01-01 00:00:00.000'`
})
regoptions.push({
reg: new RegExp('@calendarDate1@', 'ig'),
- value: `${calendarYear}-12-31 23:59:59.999`
+ value: `'${calendarYear}-12-31 23:59:59.999'`
})
}
- if (setting.queryType === 'statistics' && setting.execute !== 'false') { // 缁熻鏁版嵁婧愶紝鍐呭鏇挎崲
+ if ((setting.queryType === 'statistics' || config.calendar.refresh === 'true') && setting.execute !== 'false') { // 缁熻鏁版嵁婧愶紝鍐呭鏇挎崲
regoptions.forEach(item => {
_dataresource = _dataresource.replace(item.reg, item.value)
})
@@ -368,8 +402,9 @@
regoptions.forEach(item => {
param.custom_script = param.custom_script.replace(item.reg, item.value)
})
-
- param.custom_script = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000) select @ErrorCode='',@retmsg =''
+
+ param.custom_script = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(50),@mk_organization nvarchar(50),@mk_user_type nvarchar(20),@mk_nation nvarchar(50),@mk_province nvarchar(50),@mk_city nvarchar(50),@mk_district nvarchar(50),@mk_address nvarchar(100)
+ Select @ErrorCode='',@retmsg ='',@UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @mk_departmentcode='${departmentcode}', @mk_organization='${organization}', @mk_user_type='${mk_user_type}', @mk_nation='${nation}', @mk_province='${province}', @mk_city='${city}', @mk_district='${district}', @mk_address='${address}'
${param.custom_script}
`
@@ -389,9 +424,9 @@
}
// 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞
- if ((options.sysType === 'local' && !window.GLOB.systemType) || window.debugger === true) {
- param.custom_script && console.log(`${LText ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${param.custom_script}`)
- LText && console.log(LText)
+ if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
+ param.custom_script && console.info(`${LText ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${param.custom_script}`)
+ LText && console.info(LText)
}
param.custom_script = Utils.formatOptions(param.custom_script)
@@ -400,7 +435,7 @@
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
param.DateCount = ''
- if (this.props.menuType === 'HS') { // 浜戠鏁版嵁楠岃瘉
+ if (window.GLOB.mkHS) { // 浜戠鏁版嵁楠岃瘉
param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
}
@@ -441,63 +476,12 @@
})
}
- handleviewconfig = (e) => {
- e.stopPropagation()
+ reloadMenuView = (menuId) => {
+ const { MenuID } = this.props
- const { MenuNo } = this.props
- const { config } = this.state
+ if (MenuID !== menuId) return
- if (config && config.funcs && config.funcs.length > 0) {
- this.setState({
- treevisible: true
- })
- } else {
- let oInput = document.createElement('input')
- oInput.value = MenuNo || ''
- document.body.appendChild(oInput)
- oInput.select()
- document.execCommand('Copy')
- document.body.removeChild(oInput)
- message.success(this.state.dict['main.copy.success'])
- }
- }
-
- getTreeNode = (data) => {
- let _type = {
- view: '椤甸潰',
- btn: '鎸夐挳',
- tab: '鏍囩'
- }
-
- return data.map(item => {
- let _title = _type[item.subtype]
- let _others = []
-
- _others.push(
- (item.menuNo ? item.menuNo + '(鑿滃崟鍙傛暟)' : ''),
- (item.tableName ? item.tableName + '(琛ㄥ悕) ' : ''),
- (item.innerFunc ? item.innerFunc + '(鍐呴儴鍑芥暟) ' : ''),
- (item.outerFunc ? item.outerFunc + '(澶栭儴鍑芥暟)' : '')
- )
- _others = _others.filter(Boolean)
- _others = _others.join('銆�')
-
- if (item.label) {
- _title = _title + '(' + item.label + ')'
- }
- if (_others) {
- _title = _title + ': ' + _others
- }
-
- if (item.subfuncs && item.subfuncs.length > 0) {
- return (
- <TreeNode title={_title} key={item.uuid} dataRef={item} selectable={false}>
- {this.getTreeNode(item.subfuncs)}
- </TreeNode>
- )
- }
- return <TreeNode key={item.uuid} title={_title} isLeaf selectable={false} />
- })
+ this.reloadview()
}
UNSAFE_componentWillMount () {
@@ -505,27 +489,14 @@
this.loadconfig()
}
- UNSAFE_componentWillReceiveProps(nextProps) {
- if (nextProps.refreshTab && nextProps.refreshTab.MenuID === this.props.MenuID) {
- if (nextProps.refreshTab.position === 'grid') {
- this.loadmaindata()
- } else if (nextProps.refreshTab.position === 'view') {
- this.reloadview()
- }
- this.props.refreshTabView('')
- } else if (nextProps.param && !is(fromJS(this.props.param), fromJS(nextProps.param))) {
- let search = this.state.search.map(item => {
- if (item.type === 'text' && item.key === nextProps.param.searchkey) {
- item.value = nextProps.param.searchval
- }
- return item
- })
- this.refreshbysearch(search)
- }
- }
-
shouldComponentUpdate (nextProps, nextState) {
return !is(fromJS(this.props), fromJS(nextProps)) || !is(fromJS(this.state), fromJS(nextState))
+ }
+
+ componentDidMount () {
+ MKEmitter.addListener('openNewTab', this.closeTab)
+ MKEmitter.addListener('reloadMenuView', this.reloadMenuView)
+ MKEmitter.addListener('refreshPopButton', this.refreshPopButton)
}
/**
@@ -535,12 +506,17 @@
this.setState = () => {
return
}
+ MKEmitter.removeListener('openNewTab', this.closeTab)
+ MKEmitter.removeListener('reloadMenuView', this.reloadMenuView)
+ MKEmitter.removeListener('refreshPopButton', this.refreshPopButton)
}
- changeDate = (value) => {
- this.setState({calendarYear: value}, () => {
- this.loadmaindata()
- })
+ refreshPopButton = (tabId) => {
+ const { config } = this.props
+
+ if (!config.tab || config.tab.uuid !== tabId) return
+
+ this.loadmaindata()
}
triggerDate = (item) => {
@@ -562,48 +538,16 @@
}
render() {
- const { BID, searchlist, loadingview, viewlost, config, loading, data, triggerTime } = this.state
+ const { BID, setting, searchlist, loadingview, viewlost, config, loading, data, triggerTime } = this.state
return (
<div className="calendar-page" id={this.state.ContainerId}>
{loadingview && <Spin size="large" />}
{searchlist && searchlist.length > 0 ?
- <MainSearch
- BID={BID}
- dict={this.state.dict}
- searchlist={searchlist}
- menuType={this.props.menuType}
- dataManager={this.props.dataManager}
- refreshdata={this.refreshbysearch}
- /> : null
+ <MainSearch BID={BID} searchlist={searchlist} setting={setting} refreshdata={this.refreshbysearch}/> : null
}
{config && config.calendar ? <CalendarComponent calendar={config.calendar} loading={loading} data={data} triggerDate={this.triggerDate} changeDate={this.changeDate}/> : null}
- {options.sysType !== 'cloud' ? <Button
- icon="copy"
- shape="circle"
- className="common-table-copy"
- onClick={this.handleviewconfig}
- /> : null}
- <Modal
- className="menu-tree-modal"
- title={'鑿滃崟缁撴瀯鏍�'}
- width={'650px'}
- maskClosable={false}
- visible={this.state.treevisible}
- onCancel={() => this.setState({treevisible: false})}
- footer={[
- <Button key="close" onClick={() => this.setState({treevisible: false})}>{this.state.dict['main.close']}</Button>
- ]}
- destroyOnClose
- >
- <div className="menu-header">
- <span>鑿滃崟鍚嶇О锛歿this.props.MenuName}</span>
- <span>鑿滃崟鍙傛暟锛歿<Paragraph copyable>{this.props.MenuNo}</Paragraph>}</span>
- </div>
- {this.state.treevisible ? <Tree defaultExpandAll showLine={true}>
- {this.getTreeNode(config.funcs)}
- </Tree> : null}
- </Modal>
+ {!window.GLOB.mkHS && window.GLOB.systemType !== 'production' ? <PagemsgComponent menu={{MenuName: this.props.MenuName, MenuNo: this.props.MenuNo}} config={config} dict={this.state.dict} /> : null}
<Modal
title={config.tab ? config.tab.label : ''}
width={'80vw'}
@@ -616,13 +560,10 @@
destroyOnClose
>
{config.tab ? <SubTabTable
- type="calendar"
BID={triggerTime}
Tab={config.tab}
- SupMenuID={this.props.MenuID}
MenuID={config.tab.linkTab}
- refreshSupView={() => this.loadmaindata()}
- closeModalView={this.closeTab}
+ SupMenuID={this.props.MenuID}
/> : null}
</Modal>
{viewlost ? <NotFount msg={this.state.lostmsg} /> : null}
@@ -633,19 +574,12 @@
const mapStateToProps = (state) => {
return {
- menuType: state.editLevel,
- tabviews: state.tabviews,
- refreshTab: state.refreshTab,
- permAction: state.permAction,
- permRoles: state.permRoles,
- dataManager: state.dataManager
+ permAction: state.permAction
}
}
-const mapDispatchToProps = (dispatch) => {
- return {
- refreshTabView: (refreshTab) => dispatch(refreshTabView(refreshTab))
- }
+const mapDispatchToProps = () => {
+ return {}
}
export default connect(mapStateToProps, mapDispatchToProps)(NormalTable)
\ No newline at end of file
--
Gitblit v1.8.0