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/chart/chart-custom/index.jsx | 44 +++++++++++++++++++-------------------------
1 files changed, 19 insertions(+), 25 deletions(-)
diff --git a/src/menu/components/chart/chart-custom/index.jsx b/src/menu/components/chart/chart-custom/index.jsx
index b4ecf35..16d9daf 100644
--- a/src/menu/components/chart/chart-custom/index.jsx
+++ b/src/menu/components/chart/chart-custom/index.jsx
@@ -10,10 +10,8 @@
import MKEmitter from '@/utils/events.js'
import asyncComponent from '@/utils/asyncComponent'
import asyncIconComponent from '@/utils/asyncIconComponent'
-import { resetStyle } from '@/utils/utils-custom.js'
+import { resetStyle, getTables, getHeight, checkComponent } from '@/utils/utils-custom.js'
import Utils from '@/utils/utils.js'
-import zhCN from '@/locales/zh-CN/model.js'
-import enUS from '@/locales/en-US/model.js'
import './index.scss'
const SettingComponent = asyncIconComponent(() => import('@/menu/datasource'))
@@ -30,7 +28,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
card: null,
appType: sessionStorage.getItem('appType'),
}
@@ -50,12 +47,9 @@
let _card = {
uuid: card.uuid,
type: card.type,
- tabId: card.tabId || '',
- parentId: card.parentId || '',
format: 'array', // 缁勪欢灞炴�� - 鏁版嵁鏍煎紡
pageable: false, // 缁勪欢灞炴�� - 鏄惁鍙垎椤�
switchable: false, // 缁勪欢灞炴�� - 鏁版嵁鏄惁鍙垏鎹�
- dataName: card.dataName || '',
width: _plot.width,
name: _plot.name,
subtype: card.subtype,
@@ -122,7 +116,7 @@
handleTabsChange = (parentId) => {
const { card } = this.state
- if (parentId === card.parentId || parentId === 'all') {
+ if (parentId.indexOf(card.uuid) > -1 || parentId === 'all') {
let _element = document.getElementById(card.uuid + 'canvas')
if (_element) {
_element.innerHTML = ''
@@ -189,20 +183,12 @@
card.width = card.plot.width
card.name = card.plot.name
- card.errors = []
- let columns = card.columns.map(c => c.field)
+ card.$c_ds = true
+ card.errors = checkComponent(card)
- if (card.setting.interType === 'system' && card.setting.execute !== 'false' && !card.setting.dataresource) {
- card.errors.push({ level: 0, detail: '鏈缃暟鎹簮锛�'})
- } else if (card.setting.interType === 'system' && card.setting.execute === 'false' && card.scripts.filter(script => script.status !== 'false').length === 0) {
- card.errors.push({ level: 0, detail: '鏁版嵁婧愪腑鏃犲彲鐢ㄨ剼鏈紒'})
- } else if (!card.setting.primaryKey) {
- card.errors.push({ level: 0, detail: '鏈缃富閿紒'})
- } else if (!columns.includes(card.setting.primaryKey)) {
- card.errors.push({ level: 0, detail: '涓婚敭宸插け鏁堬紒'})
- } else if (!card.setting.supModule) {
- card.errors.push({ level: 0, detail: '鏈缃笂绾х粍浠讹紒'})
+ if (card.errors.length === 0) {
+ card.$tables = getTables(card)
}
this.setState({
@@ -233,7 +219,7 @@
changeStyle = () => {
const { card } = this.state
- MKEmitter.emit('changeStyle', ['background', 'border', 'padding', 'margin', 'shadow'], card.style, this.getStyle)
+ MKEmitter.emit('changeStyle', ['background', 'border', 'padding', 'margin', 'shadow', 'clear'], card.style, this.getStyle)
}
getStyle = (style) => {
@@ -245,20 +231,26 @@
clickComponent = (e) => {
if (sessionStorage.getItem('style-control') === 'true' || sessionStorage.getItem('style-control') === 'component') {
e.stopPropagation()
- MKEmitter.emit('clickComponent', this.state.card)
+ MKEmitter.emit('clickComponent', this.state.card.uuid, null, (style) => {
+ let _card = {...this.state.card}
+ _card.style = {..._card.style, ...style}
+
+ this.updateComponent(_card)
+ })
}
}
render() {
const { card, appType } = this.state
let _style = resetStyle(card.style)
+ _style.height = 'auto'
return (
- <div className="menu-custom-chart-edit-box" style={{..._style, height: card.plot.height || 400}} onClick={this.clickComponent} id={card.uuid}>
+ <div className="menu-custom-chart-edit-box" style={_style} onClick={this.clickComponent} id={card.uuid}>
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
{appType !== 'mob' ? <PlusCircleOutlined className="plus" title="娣诲姞鎼滅储" onClick={this.addSearch}/> : null}
- <ChartCompileForm config={card} dict={this.state.dict} plotchange={this.updateComponent}/>
+ <ChartCompileForm config={card} plotchange={this.updateComponent}/>
<CopyComponent type="line" card={card}/>
<FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle}/>
<ClockComponent config={card} updateConfig={this.updateComponent}/>
@@ -269,7 +261,9 @@
<ToolOutlined />
</Popover>
<NormalHeader config={card} updateComponent={this.updateComponent}/>
- <div className="canvas" id={card.uuid + 'canvas'} ref={ref => this.wrap = ref}></div>
+ <div className="canvas-wrap" style={{height: card.plot.height}}>
+ <div className="canvas" id={card.uuid + 'canvas'} style={{height: getHeight(card.plot.height)}} ref={ref => this.wrap = ref}></div>
+ </div>
<div className="component-name">
<div className="center">
<div className="title">{card.name}</div>
--
Gitblit v1.8.0