From 6afdec0062dacbded57e166230eb22cc55ced0c1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 08 五月 2021 14:30:21 +0800
Subject: [PATCH] 2021-05-08
---
src/tabviews/custom/index.jsx | 555 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 473 insertions(+), 82 deletions(-)
diff --git a/src/tabviews/custom/index.jsx b/src/tabviews/custom/index.jsx
index 47a8849..40f0818 100644
--- a/src/tabviews/custom/index.jsx
+++ b/src/tabviews/custom/index.jsx
@@ -2,7 +2,7 @@
import PropTypes from 'prop-types'
import { connect } from 'react-redux'
import { is, fromJS } from 'immutable'
-import { notification, Spin, Row, Col, Button, message } from 'antd'
+import { notification, Spin, Row, Col } from 'antd'
import moment from 'moment'
import md5 from 'md5'
@@ -11,6 +11,7 @@
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 asyncComponent from '@/utils/asyncComponent'
import MKEmitter from '@/utils/events.js'
import NotFount from '@/components/404'
@@ -20,16 +21,26 @@
const AntvBarAndLine = asyncComponent(() => import('./components/chart/antv-bar-line'))
const AntvPie = asyncComponent(() => import('./components/chart/antv-pie'))
const AntvTabs = asyncComponent(() => import('./components/tabs/antv-tabs'))
+const AntvDashboard = asyncComponent(() => import('./components/chart/antv-dashboard'))
+const AntvScatter = asyncComponent(() => import('./components/chart/antv-scatter'))
const DataCard = asyncComponent(() => import('./components/card/data-card'))
const PropCard = asyncComponent(() => import('./components/card/prop-card'))
+const NormalForm = asyncComponent(() => import('./components/form/normal-form'))
+const CarouselDataCard = asyncComponent(() => import('./components/carousel/data-card'))
+const CarouselPropCard = asyncComponent(() => import('./components/carousel/prop-card'))
const TableCard = asyncComponent(() => import('./components/card/table-card'))
const MainSearch = asyncComponent(() => import('@/tabviews/zshare/topSearch'))
const NormalTable = asyncComponent(() => import('./components/table/normal-table'))
const NormalGroup = asyncComponent(() => import('./components/group/normal-group'))
+const BraftEditor = asyncComponent(() => import('./components/editor/braft-editor'))
+const SandBox = asyncComponent(() => import('./components/code/sand-box'))
+const SettingComponent = asyncComponent(() => import('@/tabviews/zshare/settingcomponent'))
+const PagemsgComponent = asyncComponent(() => import('@/tabviews/zshare/pageMessage'))
class CustomPage extends Component {
static propTpyes = {
param: PropTypes.any, // 鍏朵粬椤甸潰浼犻�掔殑鍙傛暟
+ Tab: PropTypes.string, // 寮圭獥鏍囩
MenuID: PropTypes.string, // 鑿滃崟Id
MenuNo: PropTypes.string, // 鑿滃崟鍙傛暟
MenuName: PropTypes.string // 鑿滃崟鍚嶇О
@@ -49,7 +60,7 @@
loading: false, // 鍒楄〃鏁版嵁鍔犺浇涓�
visible: false, // 鏍囩椤垫帶鍒�
treevisible: false, // 鑿滃崟缁撴瀯鏍戝脊妗嗘樉绀洪殣钘忔帶鍒�
- debug: sessionStorage.getItem('debug') === 'true'
+ shortcuts: null // 蹇嵎閿�
}
/**
@@ -66,7 +77,7 @@
if (result.status) {
let config = ''
- let userConfig = null
+ let shortcuts = []
try { // 閰嶇疆淇℃伅瑙ｆ瀽
config = JSON.parse(window.decodeURIComponent(window.atob(result.LongParam)))
@@ -78,10 +89,15 @@
// HS涓嶄娇鐢ㄨ嚜瀹氫箟璁剧疆
if (result.LongParamUser && this.props.menuType !== 'HS') {
try { // 閰嶇疆淇℃伅瑙ｆ瀽
- userConfig = JSON.parse(window.decodeURIComponent(window.atob(result.LongParamUser)))
+ let userConfig = JSON.parse(window.decodeURIComponent(window.atob(result.LongParamUser)))
+ if (userConfig) {
+ shortcuts = userConfig.action
+ userConfig.printers.forEach(item => {
+ window.GLOB.UserCacheMap.set(item.parentId + item.uuid, item)
+ })
+ }
} catch (e) {
console.warn('Parse Failure')
- userConfig = null
}
}
@@ -123,14 +139,8 @@
component.search = component.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 (['text', 'select', 'link'].includes(item.type) && param && param.$searchkey === item.field) {
+ item.initval = param.$searchval
}
return item
@@ -140,7 +150,7 @@
})
let params = []
- let BID = param && param.BID ? param.BID : ''
+ let BID = param && param.$BID ? param.$BID : ''
let inherit = {}
if (config.cacheUseful === 'true') { // 缂撳瓨缁ф壙
@@ -149,11 +159,42 @@
inherit.cacheTime = config.cacheTime
}
- config.components = this.formatSetting(config.components, params, mainSearch, inherit)
+ let userName = sessionStorage.getItem('User_Name') || ''
+ let fullName = sessionStorage.getItem('Full_Name') || ''
+ let city = sessionStorage.getItem('city') || ''
+
+ 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 },
+ { reg: /@login_city@/ig, value: city }
+ ]
+
+ if (window.GLOB.externalDatabase !== null) {
+ regs.push({
+ reg: /@db@/ig,
+ value: window.GLOB.externalDatabase
+ })
+ }
+ if (config.urlFields) {
+ config.urlFields.forEach(field => {
+ let val = `'${param ? (param[field] || '') : ''}'`
+ regs.push({
+ reg: new RegExp('@' + field + '@', 'ig'),
+ value: val
+ })
+ })
+ }
+
+ config.components = this.formatSetting(config.components, params, mainSearch, inherit, regs)
this.setState({
BID: BID,
- userConfig: userConfig,
+ shortcuts,
config,
mainSearch
}, () => {
@@ -166,6 +207,12 @@
} else {
this.loadmaindata(params)
}
+
+ if (!this.props.Tab) {
+ this.setShortcut()
+ }
+
+ this.loadData()
})
} else {
this.setState({
@@ -180,6 +227,213 @@
}
}
+ setShortcut = () => {
+ const { shortcuts } = this.state
+
+ if (!shortcuts || shortcuts.length === 0) {
+ document.onkeydown = () => {}
+ return
+ }
+
+ document.onkeydown = (event) => {
+ let e = event || window.event
+ let keyCode = e.keyCode || e.which || e.charCode
+ let preKey = ''
+
+ if (e.ctrlKey) {
+ preKey = 'ctrl'
+ } else if (e.shiftKey) {
+ preKey = 'shift'
+ } else if (e.altKey) {
+ preKey = 'alt'
+ }
+
+ if (!preKey || !keyCode) return
+
+ let _shortcut = `${preKey}+${keyCode}`
+
+ shortcuts.some(item => {
+ if (item.$shortcut === _shortcut) {
+ MKEmitter.emit('triggerBtnId', item.uuid)
+ return true
+ }
+ return false
+ })
+ }
+ }
+
+ loadData = () => {
+ const { config } = this.state
+
+ if (!config.interfaces || config.interfaces.length === 0) return
+
+ let inters = []
+
+ config.interfaces.forEach(item => {
+ if (item.status !== 'true') return
+
+ if (window.GLOB.systemType === 'production' && !item.proInterface) {
+ notification.warning({
+ top: 92,
+ message: `銆�${item.name}銆嬫湭璁剧疆姝ｅ紡绯荤粺鍦板潃!`,
+ duration: 3
+ })
+ return
+ }
+
+ inters.push(item)
+ })
+
+ if (inters.length > 0) {
+ this.loadOutResource(inters)
+ }
+ }
+
+ loadOutResource = (inters) => {
+ let setting = inters.shift()
+ let param = UtilsDM.getPrevQueryParams(setting, [], this.state.BID, this.props.menuType)
+
+ Api.genericInterface(param).then(res => {
+ if (res.status) {
+ if (res.mk_ex_invoke === 'false' || res.mk_ex_invoke === false) {
+ if (inters.length > 0) {
+ this.loadOutResource(inters)
+ }
+ } else {
+ this.customOuterRequest(res, setting, inters)
+ }
+ } else {
+ notification.error({
+ top: 92,
+ message: res.message,
+ duration: 10
+ })
+ }
+ })
+ }
+
+ customOuterRequest = (result, setting, inters) => {
+ let url = ''
+
+ if (window.GLOB.systemType === 'production') {
+ url = setting.proInterface
+ } else {
+ url = setting.interface
+ }
+
+ let mkey = result.mk_api_key || ''
+
+ delete result.mk_ex_invoke
+ delete result.status
+ delete result.message
+ delete result.ErrCode
+ delete result.ErrMesg
+ delete result.mk_api_key
+
+ let param = {}
+
+ Object.keys(result).forEach(key => {
+ key = key.replace(/^mk_/ig, '')
+ param[key] = result[key]
+ })
+
+ Api.directRequest(url, setting.method, param, setting.cross).then(res => {
+ if (typeof(res) !== 'object' || Array.isArray(res)) {
+ let error = '鏈煡鐨勮繑鍥炵粨鏋滐紒'
+
+ if (typeof(res) === 'string') {
+ error = res.replace(/'/ig, '"')
+ }
+
+ let _result = {
+ mk_api_key: mkey,
+ $ErrCode: 'E',
+ $ErrMesg: error
+ }
+
+ this.customCallbackRequest(_result, setting, inters)
+ } else {
+ res.mk_api_key = mkey
+ this.customCallbackRequest(res, setting, inters)
+ }
+ }, (e) => {
+ let _result = {
+ mk_api_key: mkey,
+ $ErrCode: 'E',
+ $ErrMesg: e && e.statusText ? e.statusText : ''
+ }
+
+ this.customCallbackRequest(_result, setting, inters)
+ })
+ }
+
+ customCallbackRequest = (result, setting, inters) => {
+ let errSql = ''
+ if (result.$ErrCode === 'E') {
+ errSql = `
+ set @ErrorCode='E'
+ set @retmsg='${result.$ErrMesg}'
+ `
+ delete result.$ErrCode
+ delete result.$ErrMesg
+ }
+
+ let lines = UtilsDM.getCallBackSql(setting, result)
+ let param = {}
+
+ if (setting.callbackType === 'script') { // 浣跨敤鑷畾涔夎剼鏈�
+ let sql = lines.map(item => (`
+ ${item.insert}
+ ${item.selects.join(` union all
+ `)}
+ `))
+ sql = sql.join('')
+
+ param = UtilsDM.getCallBackQueryParams(setting, sql, errSql)
+
+ if (this.state.BID) {
+ param.BID = this.state.BID
+ }
+
+ if (this.props.menuType === 'HS') { // 鍑芥暟 sPC_TableData_InUpDe 浜戠楠岃瘉
+ param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
+ }
+ } else {
+ param.func = 's_ex_result_back'
+ param.s_ex_result = lines.map((item, index) => ({
+ MenuID: this.props.MenuID || '',
+ MenuName: this.props.MenuName || '',
+ TableName: item.table,
+ LongText: window.btoa(window.encodeURIComponent(`${item.insert} ${item.selects.join(` union all `)}`)),
+ Sort: index + 1
+ }))
+
+ if ((window.GLOB.systemType !== 'production' && options.sysType !== 'cloud') || window.debugger === true) {
+ let sql = lines.map(item => (`
+ ${item.insert}
+ ${item.selects.join(` union all
+ `)}
+ `))
+ sql = sql.join('')
+ console.info(sql.replace(/\n\s{10}/ig, '\n'))
+ }
+ }
+
+ Api.genericInterface(param).then(res => {
+ if (res.status) {
+ if (inters.length > 0) {
+ this.loadOutResource(inters)
+ }
+ } else {
+ notification.error({
+ top: 92,
+ message: res.message,
+ duration: 10
+ })
+ }
+ })
+ }
+
filterComponent = (components, roleId, permAction, permMenus) => {
return components.filter(item => {
if (item.type === 'tabs') {
@@ -189,6 +443,16 @@
) {
return false
}
+
+ item.subtabs = item.subtabs.filter(tab => {
+ if (
+ tab.blacklist && tab.blacklist.length > 0 &&
+ tab.blacklist.filter(v => roleId.indexOf(v) > -1).length > 0
+ ) {
+ return false
+ }
+ return true
+ })
item.subtabs = item.subtabs.map(tab => {
tab.components = this.filterComponent(tab.components, roleId, permAction, permMenus)
@@ -200,7 +464,7 @@
tab.components.forEach(comp => {
if (comp.type === 'tabs' && comp.parentIds) {
supIds.push(...comp.parentIds)
- } else if (comp.setting.supModule) {
+ } else if (comp.setting && comp.setting.supModule) {
supIds.push(comp.setting.supModule)
}
})
@@ -215,14 +479,14 @@
}
item.components = this.filterComponent(item.components, roleId, permAction, permMenus)
- } else if (item.type === 'pie' || item.type === 'bar' || item.type === 'line') {
+ } else if (['pie', 'bar', 'line', 'dashboard', 'scatter'].includes(item.type)) {
if (
item.plot.blacklist && item.plot.blacklist.length > 0 &&
item.plot.blacklist.filter(v => roleId.indexOf(v) > -1).length > 0
) {
return false
}
- } else {
+ } else if (item.wrap) {
if (
item.wrap.blacklist && item.wrap.blacklist.length > 0 &&
item.wrap.blacklist.filter(v => roleId.indexOf(v) > -1).length > 0
@@ -244,20 +508,70 @@
})
}
if (item.type === 'table' && item.subtype === 'normaltable') {
- item.cols = this.getCols(item.cols, roleId, permMenus)
+ let statFields = []
+ let getCols = (cols) => {
+ return cols.filter(col => {
+ if (col.blacklist && col.blacklist.filter(v => roleId.indexOf(v) > -1).length > 0) {
+ return false
+ } else if (col.Hide === 'true') {
+ return false
+ }
+ if (col.type === 'number' && col.sum === 'true' && !statFields.includes(col.field)) {
+ statFields.push(col)
+ } else if (col.type === 'colspan') {
+ col.subcols = getCols(col.subcols || [])
+ if (col.subcols.length === 0) {
+ return false
+ }
+ } else if (col.type === 'custom') {
+ col.elements = col.elements.map(cell => {
+ if (['text', 'number', 'link'].includes(cell.eleType) && !cell.height) {
+ cell.innerHeight = 'auto'
+ }
+ return cell
+ })
+ }
+
+ if (col.linkmenu && col.linkmenu.length > 0) {
+ let menu_id = col.linkmenu.pop()
+ col.linkThdMenu = permMenus.filter(m => m.MenuID === menu_id)[0] || ''
+ } else {
+ col.linkThdMenu = ''
+ }
+
+ return true
+ })
+ }
+
+ item.cols = getCols(item.cols)
+ item.statFields = statFields
}
// 鏉冮檺杩囨护
let isHS = this.props.menuType === 'HS'
+ let tabId = this.props.Tab ? this.props.Tab.uuid : '' // 寮圭獥鏍囩鎸夐挳Id
if (item.action && item.action.length > 0) {
item.action = item.action.filter(cell => {
cell.logLabel = item.name + '-' + cell.label
cell.ContainerId = this.state.ContainerId
+ cell.syncComponentId = cell.syncComponent ? cell.syncComponent.pop() : ''
cell.$menuId = item.uuid
+ cell.$tabId = tabId
+ cell.$view = 'CustomPage'
+
+ if (cell.OpenType === 'funcbutton' && cell.funcType === 'print' && cell.verify) { // 鎵撳嵃鏈鸿缃�
+ cell = this.getPrinter(cell, item.uuid)
+ }
+
+ if (cell.btnstyle) { // 鍏煎
+ cell.style = cell.style || {}
+ cell.style = {...cell.style, ...cell.btnstyle}
+ }
return isHS || permAction[cell.uuid]
})
}
+
if (item.type === 'card') {
item.subcards.forEach(card => {
let _hasheight = card.style.height && card.style.height !== 'auto'
@@ -272,7 +586,18 @@
cell.logLabel = item.name + '-' + cell.label
cell.Ot = 'requiredSgl'
cell.ContainerId = this.state.ContainerId
+ cell.syncComponentId = cell.syncComponent ? cell.syncComponent.pop() : ''
cell.$menuId = item.uuid
+ cell.$tabId = tabId
+ cell.$view = 'CustomPage'
+
+ if (cell.OpenType === 'funcbutton' && cell.funcType === 'print' && cell.verify) { // 鎵撳嵃鏈鸿缃�
+ cell = this.getPrinter(cell, item.uuid)
+ }
+ if (card.btnstyle) { // 鍏煎
+ card.style = card.style || {}
+ card.style = {...card.style, ...card.btnstyle}
+ }
} else if (['text', 'number', 'link'].includes(cell.eleType) && !cell.height && _hasheight) {
cell.innerHeight = 'auto'
}
@@ -284,14 +609,25 @@
cell.logLabel = item.name + '-' + cell.label
cell.Ot = 'requiredSgl'
cell.ContainerId = this.state.ContainerId
+ cell.syncComponentId = cell.syncComponent ? cell.syncComponent.pop() : ''
cell.$menuId = item.uuid
+ cell.$tabId = tabId
+ cell.$view = 'CustomPage'
+
+ if (cell.OpenType === 'funcbutton' && cell.funcType === 'print' && cell.verify) { // 鎵撳嵃鏈鸿缃�
+ cell = this.getPrinter(cell, item.uuid)
+ }
+ if (card.btnstyle) { // 鍏煎
+ card.style = card.style || {}
+ card.style = {...card.style, ...card.btnstyle}
+ }
} else if (['text', 'number', 'link'].includes(cell.eleType) && !cell.height && _hasheight) {
cell.innerHeight = 'auto'
}
return cell.eleType !== 'button' || isHS || permAction[cell.uuid]
})
})
- } else if (item.type === 'table' && item.subtype === 'tablecard') {
+ } else if ((item.type === 'table' && item.subtype === 'tablecard') || item.type === 'carousel') {
item.subcards.forEach(card => {
let _hasheight = card.style.height && card.style.height !== 'auto'
card.elements = card.elements.filter(cell => {
@@ -299,7 +635,19 @@
cell.logLabel = item.name + '-' + cell.label
cell.Ot = 'requiredSgl'
cell.ContainerId = this.state.ContainerId
+ cell.syncComponentId = cell.syncComponent ? cell.syncComponent.pop() : ''
cell.$menuId = item.uuid
+ cell.$tabId = tabId
+ cell.$view = 'CustomPage'
+
+ if (cell.OpenType === 'funcbutton' && cell.funcType === 'print' && cell.verify) { // 鎵撳嵃鏈鸿缃�
+ cell = this.getPrinter(cell, item.uuid)
+ }
+
+ if (card.btnstyle) { // 鍏煎
+ card.style = card.style || {}
+ card.style = {...card.style, ...card.btnstyle}
+ }
} else if (['text', 'number', 'link'].includes(cell.eleType) && !cell.height && _hasheight) {
cell.innerHeight = 'auto'
}
@@ -313,7 +661,19 @@
cell.logLabel = item.name + '-' + cell.label
cell.Ot = 'requiredSgl'
cell.ContainerId = this.state.ContainerId
+ cell.syncComponentId = cell.syncComponent ? cell.syncComponent.pop() : ''
cell.$menuId = item.uuid
+ cell.$tabId = tabId
+ cell.$view = 'CustomPage'
+
+ if (cell.OpenType === 'funcbutton' && cell.funcType === 'print' && cell.verify) { // 鎵撳嵃鏈鸿缃�
+ cell = this.getPrinter(cell, item.uuid)
+ }
+
+ if (cell.btnstyle) { // 鍏煎
+ cell.style = cell.style || {}
+ cell.style = {...cell.style, ...cell.btnstyle}
+ }
return isHS || permAction[cell.uuid]
})
@@ -322,7 +682,7 @@
}
if (item.setting && item.setting.supModule) {
- let pid = item.setting.supModule.slice(-1)[0]
+ let pid = item.setting.supModule.pop()
if (pid && pid !== 'empty') {
item.setting.supModule = pid
} else {
@@ -340,49 +700,46 @@
})
}
- getCols = (cols, roleId, permMenus) => {
- return cols.filter(col => {
- if (col.blacklist && col.blacklist.filter(v => roleId.indexOf(v) > -1).length > 0) {
- return false
- } else if (col.Hide === 'true') {
- return false
- }
- if (col.type === 'colspan') {
- col.subcols = this.getCols(col.subcols || [], roleId, permMenus)
- if (col.subcols.length === 0) {
- return false
- }
- }
+ getPrinter = (item, parentId) => {
+ let _item = window.GLOB.UserCacheMap.get(parentId + item.uuid)
- if (col.linkmenu && col.linkmenu.length > 0) {
- let menu_id = col.linkmenu.slice(-1)[0]
- col.linkThdMenu = permMenus.filter(m => m.MenuID === menu_id)[0] || ''
- } else {
- col.linkThdMenu = ''
- }
+ if (_item) {
+ item.printer = _item.printer || ''
+ item.verify.defaultPrinter = _item.printer || ''
+ if (item.verify.printerTypeList && _item.printerList) {
+ item.verify.printerTypeList = item.verify.printerTypeList.map(cell => {
+ cell.printer = _item.printerList[cell.Value] || ''
- return true
- })
+ return cell
+ })
+ }
+ }
+
+ return item
}
// 鏍煎紡鍖栭粯璁よ缃�
- formatSetting = (components, params, mainSearch, inherit) => {
+ formatSetting = (components, params, mainSearch, inherit, regs) => {
return components.map(component => {
if (component.type === 'tabs') {
component.subtabs = component.subtabs.map(tab => {
- tab.components = this.formatSetting(tab.components, [], [], inherit)
+ tab.components = this.formatSetting(tab.components, [], [], inherit, regs)
tab = {...tab, ...inherit}
return tab
})
return component
} else if (component.type === 'group') {
- component.components = this.formatSetting(component.components, [], [], inherit)
+ component.components = this.formatSetting(component.components, [], [], inherit, regs)
component = {...component, ...inherit}
return component
}
+ if (['propcard', 'brafteditor', 'sandbox', 'stepform'].includes(component.subtype) && component.wrap.datatype === 'static') {
+ component.format = ''
+ }
+
if (!component.setting) return component // 涓嶄娇鐢ㄧ郴缁熷嚱鏁版椂
- if (!component.format || (component.subtype === 'propcard' && component.wrap.datatype === 'static')) return component // 娌℃湁鍔ㄦ�佹暟鎹� 鏁版嵁鏍煎紡 array 鎴� object
+ if (!component.format) return component // 娌℃湁鍔ㄦ�佹暟鎹� 鏁版嵁鏍煎紡 array 鎴� object
if (component.setting.interType !== 'system') { // 涓嶄娇鐢ㄧ郴缁熷嚱鏁版椂
component.setting.sync = 'false'
component.setting.laypage = component.setting.laypage === 'true'
@@ -398,7 +755,7 @@
}
})
delete component.scripts
-
+ component.setting.$name = component.name || ''
component.setting.execute = component.setting.execute !== 'false' // 榛樿sql鏄惁鎵ц锛岃浆涓篵oolean 缁熶竴鏍煎紡
component.setting.laypage = component.setting.laypage === 'true' // 鏄惁鍒嗛〉锛岃浆涓篵oolean 缁熶竴鏍煎紡
@@ -418,6 +775,11 @@
component.setting.dataresource = component.setting.dataresource.replace(/@\$|\$@/ig, '')
_customScript = _customScript.replace(/@\$|\$@/ig, '')
}
+
+ regs.forEach(cell => {
+ component.setting.dataresource = component.setting.dataresource.replace(cell.reg, cell.value)
+ _customScript = _customScript.replace(cell.reg, cell.value)
+ })
component.setting.customScript = _customScript // 鏁寸悊鍚庤嚜瀹氫箟鑴氭湰
@@ -491,8 +853,8 @@
// 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞
if ((options.sysType === 'local' && !window.GLOB.systemType) || window.debugger === true) {
- _customScript && console.info(`${_dataresource ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${_customScript}`)
- _dataresource && console.info(_dataresource)
+ _customScript && console.info(`${setting.$name ? `/*缁勪欢-${setting.$name} 鑷畾涔夎剼鏈�*/\n` : ''}${_dataresource ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${_customScript}`)
+ _dataresource && console.info(`${setting.$name ? `/*缁勪欢-${setting.$name} 鏁版嵁婧�*/\n` : ''}` + _dataresource)
}
return {
@@ -516,6 +878,7 @@
let diffUser = false
let userName = sessionStorage.getItem('User_Name') || ''
let fullName = sessionStorage.getItem('Full_Name') || ''
+ let city = sessionStorage.getItem('city') || ''
if (sessionStorage.getItem('isEditState') === 'true') {
userName = sessionStorage.getItem('CloudUserName') || ''
@@ -526,8 +889,8 @@
let _script = item.script
if (index === 0) {
- _script = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50)
- select @ErrorCode='',@retmsg ='',@UserName='${userName}', @FullName='${fullName}'
+ _script = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50),@login_city nvarchar(50)
+ select @ErrorCode='',@retmsg ='',@UserName='${userName}', @FullName='${fullName}', @login_city='${city}'
${_script}
`
}
@@ -595,33 +958,20 @@
})
}
- handleviewconfig = (e) => {
- e.stopPropagation()
-
- const { MenuNo } = this.props
- const { config } = this.state
-
- 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'])
- }
- }
-
reloadMenuView = (menuId) => {
const { MenuID } = this.props
if (MenuID !== menuId) return
this.reloadview()
+ }
+
+ resetActiveMenu = (menuId) => {
+ const { MenuID, Tab } = this.props
+
+ if (MenuID !== menuId || Tab) return
+
+ this.setShortcut()
}
UNSAFE_componentWillMount () {
@@ -635,6 +985,7 @@
componentDidMount () {
MKEmitter.addListener('reloadMenuView', this.reloadMenuView)
+ MKEmitter.addListener('resetActiveMenu', this.resetActiveMenu)
}
/**
@@ -645,6 +996,7 @@
return
}
MKEmitter.removeListener('reloadMenuView', this.reloadMenuView)
+ MKEmitter.removeListener('resetActiveMenu', this.resetActiveMenu)
}
reloadview = () => {
@@ -653,7 +1005,8 @@
loadingview: true, // 椤甸潰鍔犺浇涓�
viewlost: false, // 椤甸潰涓㈠け锛�1銆佹湭鑾峰彇鍒伴厤缃�-椤甸潰涓㈠け锛�2銆侀〉闈㈡湭鍚敤
config: null, // 椤甸潰閰嶇疆淇℃伅锛屽寘鎷粍浠剁瓑
- loading: false // 鍒楄〃鏁版嵁鍔犺浇涓�
+ loading: false, // 鍒楄〃鏁版嵁鍔犺浇涓�
+ shortcuts: null
}, () => {
this.loadconfig()
})
@@ -689,6 +1042,24 @@
<AntvPie config={item} data={data} BID={_bid} mainSearch={mainSearch} menuType={menuType} />
</Col>
)
+ } else if (item.type === 'scatter') {
+ return (
+ <Col span={item.width} key={item.uuid}>
+ <AntvScatter config={item} data={data} BID={_bid} mainSearch={mainSearch} menuType={menuType} />
+ </Col>
+ )
+ } else if (item.type === 'dashboard') {
+ return (
+ <Col span={item.width} key={item.uuid}>
+ <AntvDashboard config={item} data={data} BID={_bid} mainSearch={mainSearch} menuType={menuType} />
+ </Col>
+ )
+ } else if (item.type === 'form') {
+ return (
+ <Col span={item.width} key={item.uuid}>
+ <NormalForm config={item} data={data} BID={_bid} mainSearch={mainSearch} menuType={menuType} />
+ </Col>
+ )
} else if (item.type === 'search') {
return (
<Col span={item.width} key={item.uuid}>
@@ -713,6 +1084,18 @@
<PropCard config={item} data={data} BID={_bid} mainSearch={mainSearch} menuType={menuType} />
</Col>
)
+ } else if (item.type === 'carousel' && item.subtype === 'datacard') {
+ return (
+ <Col span={item.width} key={item.uuid}>
+ <CarouselDataCard config={item} data={data} BID={_bid} mainSearch={mainSearch} menuType={menuType} />
+ </Col>
+ )
+ } else if (item.type === 'carousel' && item.subtype === 'propcard') {
+ return (
+ <Col span={item.width} key={item.uuid}>
+ <CarouselPropCard config={item} data={data} BID={_bid} mainSearch={mainSearch} menuType={menuType} />
+ </Col>
+ )
} else if (item.type === 'table' && item.subtype === 'tablecard') {
return (
<Col span={item.width} key={item.uuid}>
@@ -731,6 +1114,18 @@
<NormalGroup config={item} BID={_bid} mainSearch={mainSearch} menuType={menuType} />
</Col>
)
+ } else if (item.type === 'editor') {
+ return (
+ <Col span={item.width} key={item.uuid}>
+ <BraftEditor config={item} data={data} BID={_bid} mainSearch={mainSearch} menuType={menuType} />
+ </Col>
+ )
+ } else if (item.type === 'code') {
+ return (
+ <Col span={item.width} key={item.uuid}>
+ <SandBox config={item} data={data} BID={_bid} mainSearch={mainSearch} menuType={menuType} />
+ </Col>
+ )
} else {
return null
}
@@ -738,19 +1133,15 @@
}
render() {
- const { menuType, MenuNo } = this.props
- const { debug, loadingview, viewlost, config, loading } = this.state
+ const { menuType } = this.props
+ const { loadingview, viewlost, config, loading, shortcuts } = this.state
return (
<div className={'custom-page-wrap ' + (loadingview || loading ? 'loading' : '')} id={this.state.ContainerId} style={config ? config.style : null}>
{(loadingview || loading) ? <Spin className="view-spin" size="large" /> : null}
<Row>{this.getComponents()}</Row>
- {debug && MenuNo && options.sysType !== 'cloud' && menuType !== 'HS' ? <Button
- icon="copy"
- shape="circle"
- className="common-table-copy"
- onClick={this.handleviewconfig}
- /> : null}
+ {menuType !== 'HS' ? <PagemsgComponent menu={{MenuName: this.props.MenuName, MenuNo: this.props.MenuNo}} config={config} dict={this.state.dict} /> : null}
+ {menuType !== 'HS' && shortcuts ? <SettingComponent config={config} dict={this.state.dict} shortcuts={shortcuts} permAction={this.props.permAction}/> : null}
{viewlost ? <NotFount msg={this.state.lostmsg} /> : null}
</div>
)
--
Gitblit v1.8.0