From 23c19efebd9f59fb6e78beff64782b39b3795a5d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 24 八月 2022 12:01:42 +0800
Subject: [PATCH] 2022-08-24
---
src/tabviews/custom/components/share/normalTable/index.jsx | 31 ++++++++++++-------------------
1 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/src/tabviews/custom/components/share/normalTable/index.jsx b/src/tabviews/custom/components/share/normalTable/index.jsx
index 0aa9953..4654657 100644
--- a/src/tabviews/custom/components/share/normalTable/index.jsx
+++ b/src/tabviews/custom/components/share/normalTable/index.jsx
@@ -1,7 +1,6 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import md5 from 'md5'
-import { connect } from 'react-redux'
import { is, fromJS } from 'immutable'
import { Table, Typography, Col, Switch, message } from 'antd'
@@ -11,6 +10,7 @@
import MKEmitter from '@/utils/events.js'
import zhCN from '@/locales/zh-CN/main.js'
import enUS from '@/locales/en-US/main.js'
+import Encrypts from '@/components/encrypts'
import '@/assets/css/table.scss'
import './index.scss'
@@ -123,9 +123,13 @@
content = `${content.substr(0, 4)}-${content.substr(5, 2)}-${content.substr(8, 2)}`
} else if (col.textFormat === 'YYYY-MM-DD HH:mm:ss' && /^[1-9]\d{3}(-|\/)(0[1-9]|1[0-2])(-|\/)(0[1-9]|[1-2][0-9]|3[0-1]).([0-1][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]/.test(content)) {
content = `${content.substr(0, 4)}-${content.substr(5, 2)}-${content.substr(8, 2)} ${content.substr(11, 2)}:${content.substr(14, 2)}:${content.substr(17, 2)}`
+ } else if (col.textFormat === 'encryption') {
+ content = <span>{col.prefix || ''}<Encrypts value={content} />{col.postfix || ''}</span>
}
-
- content = (col.prefix || '') + content + (col.postfix || '')
+
+ if (col.textFormat !== 'encryption') {
+ content = (col.prefix || '') + content + (col.postfix || '')
+ }
}
if (col.marks) {
@@ -415,18 +419,18 @@
}
UNSAFE_componentWillMount () {
- const { menuType, memberLevel, setting, fields, columns } = this.props
+ const { setting, fields, columns } = this.props
let radio = 5 // 铏氬寲姣斾緥
let _format = false // 鏄惁铏氬寲澶勭悊
let rowspans = []
let orderfields = {}
- if (window.GLOB.dataFormat && menuType !== 'HS' && memberLevel) {
+ if (window.GLOB.dataFormat && !window.GLOB.mkHS) {
_format = true
- if (memberLevel >= 30) {
+ if (window.GLOB.memberLevel >= 30) {
radio = 20
- } else if (memberLevel >= 20) {
+ } else if (window.GLOB.memberLevel >= 20) {
radio = 10
}
}
@@ -936,15 +940,4 @@
}
}
-const mapStateToProps = (state) => {
- return {
- menuType: state.editLevel,
- memberLevel: state.memberLevel
- }
-}
-
-const mapDispatchToProps = () => {
- return {}
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(NormalTable)
\ No newline at end of file
+export default NormalTable
\ No newline at end of file
--
Gitblit v1.8.0