From 4adb8b8868aeed1f5f3b89ae269a7724c6b451ad Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期五, 11 八月 2023 16:58:31 +0800 Subject: [PATCH] 2023-08-11 --- src/menu/components/share/usercomponent/index.jsx | 57 +++++++++++++++++++++++++-------------------------------- 1 files changed, 25 insertions(+), 32 deletions(-) diff --git a/src/menu/components/share/usercomponent/index.jsx b/src/menu/components/share/usercomponent/index.jsx index 07c968b..4f72b16 100644 --- a/src/menu/components/share/usercomponent/index.jsx +++ b/src/menu/components/share/usercomponent/index.jsx @@ -7,7 +7,6 @@ import Api from '@/api' import Utils from '@/utils/utils.js' -import options from '@/store/options.js' import UserForm from './settingform' import MKEmitter from '@/utils/events.js' import './index.scss' @@ -82,36 +81,30 @@ return item }) - _config.cols = _config.cols.map(col => { - if (col.type === 'colspan' && col.subcols) { - col = this.loopCol(col) - } else if (col.type === 'custom' && col.elements) { - col.elements = col.elements.map(cell => this.resetElement(cell)) - } else if (col.type === 'action' && col.elements) { - col.elements = col.elements.map(cell => { - cell.verify = null - return cell - }) - } - col.marks = null - return col - }) + let loopCol = (cols) => { + return cols.map(col => { + col.uuid = Utils.getuuid() + col.marks = null + + if (col.type === 'colspan' && col.subcols) { + col.subcols = loopCol(col.subcols) + } else if (col.type === 'custom' && col.elements) { + col.elements = col.elements.map(cell => { + if (cell.eleType === 'button') { + cell.verify = null + } else { + cell = this.resetElement(cell) + } + return cell + }) + } + return col + }) + } + + _config.cols = loopCol(_config.cols) return _config - } - - loopCol = (col) => { - col.subcols = col.subcols.map(c => { - if (c.type === 'colspan' && c.subcols) { - c = this.loopCol(c) - } else if (c.type === 'custom' && c.elements) { - c.elements = c.elements.map(cell => this.resetElement(cell)) - } - c.marks = null - return c - }) - - return col } resetElement = (item) => { @@ -150,15 +143,15 @@ Base64Img: canvas.toDataURL('image/png') // 鑾峰彇鐢熸垚鐨勫浘鐗� } - if (options.cloudServiceApi) { - param.rduri = options.cloudServiceApi + if (window.GLOB.cloudServiceApi) { + param.rduri = window.GLOB.cloudServiceApi param.userid = sessionStorage.getItem('CloudUserID') || '' param.LoginUID = sessionStorage.getItem('CloudLoginUID') || '' } Api.fileuploadbase64(param).then(result => { if (result.status) { - Api.getSystemConfig({ + Api.getCloudConfig({ func: 's_custom_components_adduptdel', c_id: config.uuid, images: Utils.getcloudurl(result.Images), -- Gitblit v1.8.0