From c7414c3cc93649479119d51b230c4b8e36884ca7 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 23 七月 2021 18:18:55 +0800
Subject: [PATCH] 2021-07-23
---
src/tabviews/custom/index.jsx | 247 ++++++++++++++-----------------------------------
1 files changed, 72 insertions(+), 175 deletions(-)
diff --git a/src/tabviews/custom/index.jsx b/src/tabviews/custom/index.jsx
index 7236e4d..8cf4cc6 100644
--- a/src/tabviews/custom/index.jsx
+++ b/src/tabviews/custom/index.jsx
@@ -3,15 +3,13 @@
import { connect } from 'react-redux'
import { is, fromJS } from 'immutable'
import { notification, Spin, Row, Col } from 'antd'
-import moment from 'moment'
-import md5 from 'md5'
import Api from '@/api'
import options from '@/store/options.js'
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 UtilsDM, { getStructuredParams, getStructDefaultParam } from '@/utils/utils-datamanage.js'
import asyncComponent from '@/utils/asyncComponent'
import MKEmitter from '@/utils/events.js'
import NotFount from '@/components/404'
@@ -35,6 +33,7 @@
const BraftEditor = asyncComponent(() => import('./components/editor/braft-editor'))
const SandBox = asyncComponent(() => import('./components/code/sand-box'))
const NormalTree = asyncComponent(() => import('./components/tree/antd-tree'))
+const Balcony = asyncComponent(() => import('./components/card/balcony'))
const SettingComponent = asyncComponent(() => import('@/tabviews/zshare/settingcomponent'))
const PagemsgComponent = asyncComponent(() => import('@/tabviews/zshare/pageMessage'))
@@ -191,9 +190,7 @@
})
}
- let isEmpty = mainSearch.filter(item => item.required && (!item.value || item.value.length === 0)).length > 0
-
- config.components = this.formatSetting(config.components, params, mainSearch, inherit, regs, isEmpty)
+ config.components = this.formatSetting(config.components, params, mainSearch, inherit, regs)
this.setState({
BID: BID,
@@ -341,7 +338,7 @@
})
Api.directRequest(url, setting.method, param, setting.cross).then(res => {
- if (typeof(res) !== 'object' || Array.isArray(res)) {
+ if (typeof(res) !== 'object') {
let error = '鏈煡鐨勮繑鍥炵粨鏋滐紒'
if (typeof(res) === 'string') {
@@ -356,6 +353,9 @@
this.customCallbackRequest(_result, setting, inters)
} else {
+ if (Array.isArray(res)) {
+ res = { data: res }
+ }
res.mk_api_key = mkey
this.customCallbackRequest(res, setting, inters)
}
@@ -497,19 +497,12 @@
return false
}
}
- // 鎼滅储榛戝悕鍗曡繃婊�
+
+ // 鎼滅储鏉′欢鍒濆鍖�
if (item.search && item.search.length > 0) {
- item.search = item.search.map(cell => {
- cell.oriInitval = cell.initval
-
- if (!cell.blacklist || cell.blacklist.length === 0) return cell
- if (cell.blacklist.filter(v => roleId.indexOf(v) > -1).length > 0) {
- cell.Hide = 'true'
- }
-
- return item
- })
+ item.search = Utils.initSearchVal(item.search)
}
+
if (item.type === 'table' && item.subtype === 'normaltable') {
let statFields = []
let getCols = (cols) => {
@@ -557,7 +550,7 @@
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.syncComponentId = cell.syncComponent ? (cell.syncComponent.pop() || '') : ''
cell.$menuId = item.uuid
cell.$tabId = tabId
cell.$view = 'CustomPage'
@@ -576,7 +569,7 @@
}
if (item.type === 'card') {
- item.subcards.forEach(card => {
+ item.subcards && item.subcards.forEach(card => {
let _hasheight = card.style.height && card.style.height !== 'auto'
if (card.style.shadow) { // 鍗＄墖闃村奖
@@ -589,7 +582,7 @@
cell.logLabel = item.name + '-' + cell.label
cell.Ot = 'requiredSgl'
cell.ContainerId = this.state.ContainerId
- cell.syncComponentId = cell.syncComponent ? cell.syncComponent.pop() : ''
+ cell.syncComponentId = cell.syncComponent ? (cell.syncComponent.pop() || '') : ''
cell.$menuId = item.uuid
cell.$tabId = tabId
cell.$view = 'CustomPage'
@@ -612,7 +605,7 @@
cell.logLabel = item.name + '-' + cell.label
cell.Ot = 'requiredSgl'
cell.ContainerId = this.state.ContainerId
- cell.syncComponentId = cell.syncComponent ? cell.syncComponent.pop() : ''
+ cell.syncComponentId = cell.syncComponent ? (cell.syncComponent.pop() || '') : ''
cell.$menuId = item.uuid
cell.$tabId = tabId
cell.$view = 'CustomPage'
@@ -630,15 +623,34 @@
return cell.eleType !== 'button' || isHS || permAction[cell.uuid]
})
})
+ } else if (item.type === 'balcony') {
+ item.elements = item.elements.filter(cell => {
+ if (cell.eleType === 'button') {
+ 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)
+ }
+ } else if (['text', 'number', 'link'].includes(cell.eleType) && !cell.height) {
+ cell.innerHeight = 'auto'
+ }
+
+ return cell.eleType !== 'button' || isHS || permAction[cell.uuid]
+ })
} else if ((item.type === 'table' && item.subtype === 'tablecard') || item.type === 'carousel') {
- item.subcards.forEach(card => {
+ item.subcards && item.subcards.forEach(card => {
let _hasheight = card.style.height && card.style.height !== 'auto'
card.elements = card.elements.filter(cell => {
if (cell.eleType === 'button') {
cell.logLabel = item.name + '-' + cell.label
cell.Ot = 'requiredSgl'
cell.ContainerId = this.state.ContainerId
- cell.syncComponentId = cell.syncComponent ? cell.syncComponent.pop() : ''
+ cell.syncComponentId = cell.syncComponent ? (cell.syncComponent.pop() || '') : ''
cell.$menuId = item.uuid
cell.$tabId = tabId
cell.$view = 'CustomPage'
@@ -664,7 +676,7 @@
cell.logLabel = item.name + '-' + cell.label
cell.Ot = 'requiredSgl'
cell.ContainerId = this.state.ContainerId
- cell.syncComponentId = cell.syncComponent ? cell.syncComponent.pop() : ''
+ cell.syncComponentId = cell.syncComponent ? (cell.syncComponent.pop() || '') : ''
cell.$menuId = item.uuid
cell.$tabId = tabId
cell.$view = 'CustomPage'
@@ -722,7 +734,7 @@
}
// 鏍煎紡鍖栭粯璁よ缃�
- formatSetting = (components, params, mainSearch, inherit, regs, isEmpty) => {
+ formatSetting = (components, params, mainSearch, inherit, regs) => {
return components.map(component => {
if (component.type === 'tabs') {
component.subtabs = component.subtabs.map(tab => {
@@ -737,12 +749,19 @@
return component
}
- if (['propcard', 'brafteditor', 'sandbox', 'stepform'].includes(component.subtype) && component.wrap.datatype === 'static') {
- component.format = ''
+ if (component.setting) {
+ component.setting.useMSearch = component.setting.useMSearch === 'true'
+ component.setting.syncRefresh = (component.setting.useMSearch && component.setting.syncRefresh === 'true')
}
- if (!component.setting) return component // 涓嶄娇鐢ㄧ郴缁熷嚱鏁版椂
- if (!component.format) return component // 娌℃湁鍔ㄦ�佹暟鎹� 鏁版嵁鏍煎紡 array 鎴� object
+ if (component.wrap && component.wrap.datatype === 'static') {
+ component.format = ''
+ component.setting = component.setting || {}
+ component.setting.useMSearch = false
+ component.setting.syncRefresh = false
+ }
+
+ if (!component.setting || !component.format) return component // 1銆佷笉浣跨敤绯荤粺鍑芥暟鏃讹紱2銆� 娌℃湁鍔ㄦ�佹暟鎹� 鏁版嵁鏍煎紡 array 鎴� object
if (component.setting.interType !== 'system') { // 涓嶄娇鐢ㄧ郴缁熷嚱鏁版椂
component.setting.sync = 'false'
component.setting.laypage = component.setting.laypage === 'true'
@@ -790,31 +809,24 @@
// dataName 绯荤粺鐢熸垚鐨勬暟鎹簮鍚嶇О
// pageable 鏄惁鍒嗛〉锛岀粍浠跺睘鎬э紝涓嶅垎椤电殑缁勪欢鎵嶅彲浠ョ粺涓�鏌ヨ
if (component.floor === 1 && component.dataName && (!component.pageable || (component.pageable && !component.setting.laypage)) && component.setting.onload === 'true' && component.setting.sync === 'true') {
- if (isEmpty && component.setting.useMSearch === 'true') {
+ let searchlist = []
+ if (component.search && component.search.length > 0) {
+ searchlist = Utils.initMainSearch(component.search)
+ }
+ if (component.setting.useMSearch) {
+ let keys = searchlist.map(item => item.key)
+ mainSearch.forEach(item => {
+ if (!keys.includes(item.key)) {
+ searchlist.push(item)
+ }
+ })
+ }
+
+ if (searchlist.filter(item => item.required && item.value === '').length > 0) {
component.setting.sync = 'false'
component.setting.onload = 'false'
} else {
- let searchlist = []
- if (component.search && component.search.length > 0) {
- searchlist = Utils.initMainSearch(component.search)
- }
-
- let _empty = searchlist.filter(item => item.required && (!item.value || item.value.length === 0)).length > 0
-
- if (_empty) {
- component.setting.sync = 'false'
- component.setting.onload = 'false'
- } else {
- if (component.setting.useMSearch === 'true') {
- let keys = searchlist.map(item => item.key)
- mainSearch.forEach(item => {
- if (!keys.includes(item.key)) {
- searchlist.push(item)
- }
- })
- }
- params.push(this.getDefaultParam(component, searchlist))
- }
+ params.push(getStructDefaultParam(component, searchlist))
}
} else if (component.floor === 1) {
component.setting.sync = 'false'
@@ -825,131 +837,10 @@
}
/**
- * @description 鑾峰彇绯荤粺瀛樺偍杩囩▼ sPC_Get_TableData 鐨勫弬鏁�
- */
- getDefaultParam = (component, searchlist) => {
- const { columns, setting, dataName, format } = component
-
- let arr_field = columns.map(col => col.field)
- let _dataresource = setting.dataresource
- let _customScript = setting.customScript
-
-
- if (setting.queryType === 'statistics' || _customScript) {
- let allSearch = Utils.getAllSearchOptions(searchlist)
- let regoptions = allSearch.map(item => {
- return {
- reg: new RegExp('@' + item.key + '@', 'ig'),
- value: `'${item.value}'`
- }
- })
-
- regoptions.forEach(item => {
- if (_dataresource && setting.queryType === 'statistics') {
- _dataresource = _dataresource.replace(item.reg, item.value)
- }
- _customScript = _customScript.replace(item.reg, item.value)
- })
- }
-
- _dataresource = _dataresource.replace(/@select\$|\$select@/ig, '')
- _customScript = _customScript.replace(/@select\$|\$select@/ig, '')
- _dataresource = _dataresource.replace(/\$sum@/ig, '/*')
- _dataresource = _dataresource.replace(/@sum\$/ig, '*/')
- _customScript = _customScript.replace(/\$sum@/ig, '/*')
- _customScript = _customScript.replace(/@sum\$/ig, '*/')
-
- let _search = ''
- if (setting.queryType !== 'statistics' && _dataresource) {
- _search = Utils.joinMainSearchkey(searchlist)
- _search = _search ? 'where ' + _search : ''
- }
-
- if (setting.order && _dataresource) {
- _dataresource = `select top 1000 ${arr_field.join(',')} from (select ${arr_field.join(',')} ,ROW_NUMBER() over(order by ${setting.order}) as rows from ${_dataresource} ${_search}) tmptable order by tmptable.rows `
- } else if (_dataresource) {
- _dataresource = `select top 1000 ${arr_field.join(',')} from ${_dataresource} ${_search} `
- }
-
- // 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞
- if ((options.sysType === 'local' && !window.GLOB.systemType) || window.debugger === true) {
- _customScript && console.info(`${setting.$name ? `/*缁勪欢-${setting.$name} 鑷畾涔夎剼鏈�*/\n` : ''}${_dataresource ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${_customScript}`)
- _dataresource && console.info(`${setting.$name ? `/*缁勪欢-${setting.$name} 鏁版嵁婧�*/\n` : ''}` + _dataresource)
- }
-
- return {
- name: dataName,
- columns: columns,
- par_tablename: '',
- type: format === 'array' ? format : '',
- primaryKey: setting.primaryKey || '',
- foreign_key: '',
- sql: _dataresource,
- script: _customScript
- }
- }
-
- /**
* @description 涓昏〃鏁版嵁鍔犺浇
*/
loadmaindata = (params) => {
- const { config } = this.state
- let LText_field = []
- 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') || ''
- fullName = sessionStorage.getItem('CloudFullName') || ''
- }
-
- let _LText = params.map((item, index) => {
- let _script = item.script
-
- if (index === 0) {
- _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}
- `
- }
- if (!diffUser && (/@userid@/ig.test(item.sql) || /@userid@/ig.test(_script))) {
- diffUser = true
- }
-
- item.columns.forEach(cell => {
- LText_field.push(`Select '${item.name}' as tablename,'${cell.field}' as fieldname,'${cell.datatype}' as field_type`)
- })
- return `Select '${item.name}' as tablename,'${window.btoa(window.encodeURIComponent(item.sql))}' as LText,'${window.btoa(window.encodeURIComponent(_script))}' as Lcustomize,'${item.type}' as table_type,'${item.primaryKey}' as primary_key,'${item.par_tablename}' as par_tablename,'${item.foreign_key}' as foreign_key,'${index}' as Sort`
- })
-
- // 鎶婂ぇ鎺ュ彛sPC_Get_structured_data鐨刲text鎷嗘垚涓変唤锛岀涓�娈碉細@LText1锛岀浜屾@LText锛岀涓夋@LText2
- let param = {
- func: 'sPC_Get_structured_data',
- LText: _LText.join(' union all '),
- LText_field: LText_field.join(' union all '),
- BID: this.state.BID || ''
- }
-
- let { LText, LText1, LText2 } = Utils.sPCInUpDeFormatOptions(param.LText)
-
- param.LText1 = LText1
- param.LText = LText
- param.LText2 = LText2
- param.LText_field = Utils.formatOptions(param.LText_field)
-
- if (config.cacheUseful === 'true') {
- param.time_type = config.timeUnit
- param.time_limit = config.cacheTime
- if (diffUser) {
- param.userid = sessionStorage.getItem('UserID')
- }
- param.data_md5 = md5(JSON.stringify(param))
- }
-
- param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- param.secretkey = Utils.encrypt(param.LText, param.timestamp)
+ let param = getStructuredParams(params, this.state.config, this.state.BID)
this.setState({loading: true, loadingview: false})
@@ -1083,7 +974,7 @@
} else if (item.type === 'search') {
return (
<Col span={item.width} key={item.uuid}>
- <MainSearch config={item} data={data} BID={_bid} mainSearch={mainSearch} menuType={menuType} refreshdata={this.resetSearch} />
+ <MainSearch config={item} BID={BID} menuType={menuType} refreshdata={this.resetSearch} />
</Col>
)
} else if (item.type === 'tabs') {
@@ -1104,6 +995,12 @@
<PropCard config={item} data={data} BID={_bid} mainSearch={mainSearch} menuType={menuType} />
</Col>
)
+ } else if (item.type === 'balcony') {
+ return (
+ <Col span={item.width} key={item.uuid}>
+ <Balcony menu={config} config={item} data={data} BID={_bid} menuType={menuType} />
+ </Col>
+ )
} else if (item.type === 'carousel' && item.subtype === 'datacard') {
return (
<Col span={item.width} key={item.uuid}>
--
Gitblit v1.8.0