From d1cd5af5adb53e91efdd278328e1b6f8ad834fb5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 06 二月 2025 21:11:56 +0800
Subject: [PATCH] Merge branch 'positec' into dms
---
src/menu/components/chart/antv-scatter/index.jsx | 127 +++++++++++++-----------------------------
1 files changed, 39 insertions(+), 88 deletions(-)
diff --git a/src/menu/components/chart/antv-scatter/index.jsx b/src/menu/components/chart/antv-scatter/index.jsx
index 5b5d93a..41bf3bd 100644
--- a/src/menu/components/chart/antv-scatter/index.jsx
+++ b/src/menu/components/chart/antv-scatter/index.jsx
@@ -1,27 +1,23 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Popover } from 'antd'
+import { Popover, message } from 'antd'
import { ToolOutlined, DeleteOutlined, FontColorsOutlined, PlusCircleOutlined, PlusSquareOutlined } from '@ant-design/icons'
import { Chart } from '@antv/g2'
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'))
const ChartCompileForm = asyncIconComponent(() => import('./chartcompile'))
-// const LogComponent = asyncIconComponent(() => import('@/menu/components/share/logcomponent'))
const CopyComponent = asyncIconComponent(() => import('@/menu/components/share/copycomponent'))
const PasteComponent = asyncIconComponent(() => import('@/menu/components/share/pastecomponent'))
const NormalHeader = asyncComponent(() => import('@/menu/components/share/normalheader'))
const ActionComponent = asyncComponent(() => import('@/menu/components/share/actioncomponent'))
-const UserComponent = asyncIconComponent(() => import('@/menu/components/share/usercomponent'))
const ClockComponent = asyncIconComponent(() => import('@/menu/components/share/clockcomponent'))
class antvScatterChart extends Component {
@@ -32,7 +28,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
card: null,
appType: sessionStorage.getItem('appType'),
eventListener: null
@@ -58,12 +53,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,
@@ -78,29 +70,6 @@
search: [],
action: [],
plot: _plot,
- btnlog: [],
- }
-
- if (card.config) {
- let config = fromJS(card.config).toJS()
-
- _card.plot = config.plot
- _card.plot.name = card.name
- _card.style = config.style
- _card.headerStyle = config.headerStyle
-
- _card.setting = config.setting
- _card.columns = config.columns
- _card.scripts = config.scripts
-
- _card.action = config.action.map(col => {
- col.uuid = Utils.getuuid()
- return col
- })
- _card.search = config.search.map(col => {
- col.uuid = Utils.getuuid()
- return col
- })
}
this.updateComponent(_card, true)
@@ -137,7 +106,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 = ''
@@ -193,7 +162,7 @@
const chart = new Chart({
container: card.uuid + 'canvas',
autoFit: true,
- height: this.wrap.offsetHeight - 25
+ height: getHeight(plot.height)
})
chart.data(data);
@@ -261,30 +230,24 @@
card.width = card.plot.width
card.name = card.plot.name
- card.errors = []
-
- let columns = card.columns.map(c => c.field)
- 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: '鏈缃笂绾х粍浠讹紒'})
+ card.$c_ds = true
+ card.$c_ac = this.state.appType !== 'mob'
+
+ card.errors = checkComponent(card)
+
+ if (card.errors.length === 0) {
+ card.$tables = getTables(card)
}
if (!card.plot.Xaxis) {
card.errors.push({ level: 0, detail: '鍧愭爣杞村皻鏈缃紒'})
} else {
+ let columns = card.columns.map(c => c.field)
if (!columns.includes(card.plot.Xaxis)) {
- card.errors.push({ level: 1, detail: 'X杞村湪瀛楁闆嗕腑涓嶅瓨鍦�'})
- }
- if (!columns.includes(card.plot.Yaxis)) {
- card.errors.push({ level: 1, detail: 'Y杞村湪瀛楁闆嗕腑涓嶅瓨鍦�'})
+ card.errors.push({ level: 0, detail: 'X杞村湪瀛楁闆嗕腑涓嶅瓨鍦�'})
+ } else if (!columns.includes(card.plot.Yaxis)) {
+ card.errors.push({ level: 0, detail: 'Y杞村湪瀛楁闆嗕腑涓嶅瓨鍦�'})
}
}
@@ -315,12 +278,12 @@
plusSearch = (uuid, search, type) => {
const { card } = this.state
- if (card.uuid !== uuid || type !== 'simple') return
+ if (card.uuid !== uuid || (type !== 'simple' && type !== 'replace')) return
search.uuid = Utils.getuuid()
search.focus = true
- MKEmitter.emit('addSearch', card.uuid, search)
+ MKEmitter.emit('addSearch', card.uuid, search, type === 'replace' ? 'replace' : '')
}
addButton = () => {
@@ -354,7 +317,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) => {
@@ -363,54 +326,34 @@
this.updateComponent(_card)
}
- // handleLog = (type, logs, item) => {
- // let card = fromJS(this.state.card).toJS()
-
- // if (type === 'revert') {
- // card.action = card.action ? [...card.action, item] : [item]
- // card.btnlog = logs
-
- // this.updateComponent(card)
- // notification.success({
- // top: 92,
- // message: '鎭㈠鎴愬姛锛�',
- // duration: 2
- // })
- // } else {
- // card.btnlog = logs
- // this.updateComponent(card)
- // notification.success({
- // top: 92,
- // message: '娓呴櫎鎴愬姛锛�',
- // duration: 2
- // })
- // }
- // }
-
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-scatter-chart-edit-box" style={{..._style, height: card.plot.height || 400}} onClick={this.clickComponent} id={card.uuid}>
+ <div className="menu-scatter-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}
{appType !== 'mob' ? <PlusSquareOutlined className="plus" title="娣诲姞鎸夐挳" onClick={this.addButton}/> : null}
- <ChartCompileForm config={card} dict={this.state.dict} plotchange={this.updateComponent}/>
- <CopyComponent type="line" card={card}/>
+ <ChartCompileForm config={card} plotchange={this.updateComponent}/>
+ <CopyComponent type="scatter" card={card}/>
<PasteComponent config={card} options={['action', 'search']} updateConfig={this.updateComponent}/>
<FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle}/>
- {/* <LogComponent btnlog={card.btnlog || []} handlelog={this.handleLog}/> */}
<ClockComponent config={card} updateConfig={this.updateComponent}/>
- <UserComponent config={card}/>
<DeleteOutlined className="close" title="delete" onClick={() => this.props.deletecomponent(card.uuid)}/>
<SettingComponent config={card} updateConfig={this.updateComponent}/>
</div>
@@ -418,11 +361,19 @@
<ToolOutlined/>
</Popover>
<NormalHeader config={card} updateComponent={this.updateComponent}/>
- <div className="canvas" id={card.uuid + 'canvas'} ref={ref => this.wrap = ref}></div>
- {appType !== 'mob' ? <ActionComponent type="chart" config={card} updateaction={this.updateComponent}/> : null}
+ <div className="canvas" style={{minHeight: card.plot.height}} id={card.uuid + 'canvas'}></div>
+ {appType !== 'mob' ? <ActionComponent config={card} updateaction={this.updateComponent}/> : null}
<div className="component-name">
<div className="center">
- <div className="title">{card.name}</div>
+ <div className="title" onDoubleClick={() => {
+ let oInput = document.createElement('input')
+ oInput.value = 'anchor' + card.uuid
+ document.body.appendChild(oInput)
+ oInput.select()
+ document.execCommand('Copy')
+ document.body.removeChild(oInput)
+ message.success('澶嶅埗鎴愬姛銆�')
+ }}>{card.name}</div>
<div className="content">
{card.errors && card.errors.map((err, index) => {
if (err.level === 0) {
--
Gitblit v1.8.0