From b883ae5d7d46fc7a3503236f16a250c2264ea7c7 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 29 九月 2022 17:45:25 +0800
Subject: [PATCH] 2022-09-29
---
src/menu/components/share/usercomponent/index.jsx | 36 +++++++++++++++++++++++++-----------
1 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/src/menu/components/share/usercomponent/index.jsx b/src/menu/components/share/usercomponent/index.jsx
index fd071da..429e0a8 100644
--- a/src/menu/components/share/usercomponent/index.jsx
+++ b/src/menu/components/share/usercomponent/index.jsx
@@ -1,25 +1,26 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Icon, Modal, notification } from 'antd'
+import { Modal, notification } from 'antd'
+import { UserOutlined } from '@ant-design/icons'
import html2canvas from 'html2canvas'
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'
-class DataSource extends Component {
+class UserComponent extends Component {
static propTpyes = {
- btnlog: PropTypes.array,
- handlelog: PropTypes.func
+ config: PropTypes.object
}
state = {
- dict: localStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
+ dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
visible: false,
loading: false,
name: '',
@@ -53,6 +54,9 @@
_config.search = config.search || []
_config.cols = config.cols || []
_config.plot = config.plot || {}
+ _config.html = config.html || ''
+ _config.css = config.css || ''
+ _config.js = config.js || ''
_config.width = _config.wrap.width || _config.plot.width || config.width || 24
@@ -142,15 +146,26 @@
document.getElementsByClassName('menu-view')[0].classList.add('saving')
this.setState({loading: true})
setTimeout(() => {
- let template = this.getUserComponent()
+ // let template = this.getUserComponent()
+ let template = fromJS(config).toJS()
html2canvas(document.getElementById(config.uuid)).then(canvas => {
- let img = canvas.toDataURL('image/png') // 鑾峰彇鐢熸垚鐨勫浘鐗�
- Api.fileuploadbase64(img, 'cloud').then(result => {
+ let param = {
+ Base64Img: canvas.toDataURL('image/png') // 鑾峰彇鐢熸垚鐨勫浘鐗�
+ }
+
+ if (options.cloudServiceApi) {
+ param.rduri = options.cloudServiceApi
+ param.userid = sessionStorage.getItem('CloudUserID') || ''
+ param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
+ }
+
+ Api.fileuploadbase64(param).then(result => {
if (result.status) {
Api.getSystemConfig({
func: 's_custom_components_adduptdel',
c_id: config.uuid,
images: Utils.getcloudurl(result.Images),
+ typename: sessionStorage.getItem('appType') || '',
c_name: res.name,
long_param: window.btoa(window.encodeURIComponent(JSON.stringify(template))),
del_type: ''
@@ -197,9 +212,8 @@
return (
<div className="user-component-wrap">
- <Icon type="user" title="鐢熸垚鑷畾涔夌粍浠�" onClick={this.trigger} />
+ <UserOutlined title="鐢熸垚鑷畾涔夌粍浠�" onClick={this.trigger} />
<Modal
- wrapClassName="popview-modal"
title="鑷畾涔夌粍浠�"
visible={visible}
width={500}
@@ -216,4 +230,4 @@
}
}
-export default DataSource
\ No newline at end of file
+export default UserComponent
\ No newline at end of file
--
Gitblit v1.8.0