From ac1d52c46ff9019fcc93cf3d5e7ab17cf850824e Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期四, 10 八月 2023 16:05:24 +0800 Subject: [PATCH] 2023-08-10 --- src/menu/components/share/usercomponent/index.jsx | 59 +++++++++++++++++++++++++---------------------------------- 1 files changed, 25 insertions(+), 34 deletions(-) diff --git a/src/menu/components/share/usercomponent/index.jsx b/src/menu/components/share/usercomponent/index.jsx index 429e0a8..d3cec9a 100644 --- a/src/menu/components/share/usercomponent/index.jsx +++ b/src/menu/components/share/usercomponent/index.jsx @@ -8,8 +8,6 @@ import Api from '@/api' import Utils from '@/utils/utils.js' import options from '@/store/options.js' -import zhCN from '@/locales/zh-CN/model.js' -import enUS from '@/locales/en-US/model.js' import UserForm from './settingform' import MKEmitter from '@/utils/events.js' import './index.scss' @@ -20,7 +18,6 @@ } state = { - dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS, visible: false, loading: false, name: '', @@ -85,36 +82,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) => { @@ -161,7 +152,7 @@ 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), @@ -208,7 +199,7 @@ } render () { - const { visible, dict, loading, name } = this.state + const { visible, loading, name } = this.state return ( <div className="user-component-wrap"> @@ -223,7 +214,7 @@ onCancel={this.cancel} destroyOnClose > - <UserForm dict={dict} name={name} inputSubmit={this.submit} wrappedComponentRef={(inst) => this.verifyRef = inst}/> + <UserForm name={name} inputSubmit={this.submit} wrappedComponentRef={(inst) => this.verifyRef = inst}/> </Modal> </div> ) -- Gitblit v1.8.0