From 729fb5e7f41f45c6962993d86c3a4eb81c2c784b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 10 六月 2025 23:06:06 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/chart/chart-custom/chartcompile/index.jsx | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/menu/components/chart/chart-custom/chartcompile/index.jsx b/src/menu/components/chart/chart-custom/chartcompile/index.jsx
index 2f0871c..562c075 100644
--- a/src/menu/components/chart/chart-custom/chartcompile/index.jsx
+++ b/src/menu/components/chart/chart-custom/chartcompile/index.jsx
@@ -1,7 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { fromJS } from 'immutable'
-import { Modal, Form, Tabs } from 'antd'
+import { Modal, Tabs } from 'antd'
import { EditOutlined } from '@ant-design/icons'
import { getBaseForm } from './formconfig'
@@ -9,12 +9,11 @@
// import './index.scss'
const { TabPane } = Tabs
-const NormalForm = asyncComponent(() => import('@/menu/components/share/normalform'))
+const ModalForm = asyncComponent(() => import('@/components/normalform/modalform'))
const CodeMirror = asyncComponent(() => import('@/templates/zshare/codemirror'))
class CustomChartDrawerForm extends Component {
static propTpyes = {
- dict: PropTypes.object,
plot: PropTypes.object,
config: PropTypes.object,
plotchange: PropTypes.func
@@ -105,10 +104,10 @@
{config.name ? <div className="mk-com-name">{config.name} - 缂栬緫</div> : null}
<Tabs activeKey={view} onChange={this.changeTab}>
<TabPane tab="缁勪欢璁剧疆" key="base">
- <NormalForm dict={this.props.dict} formlist={baseFormlist} inputSubmit={this.onSubmit} wrappedComponentRef={(inst) => this.baseRef = inst}/>
+ <ModalForm formlist={baseFormlist} inputSubmit={this.onSubmit} wrappedComponentRef={(inst) => this.baseRef = inst}/>
</TabPane>
{plot ? <TabPane tab="JS" key="JS">
- {plot.chartType === 'antv' ? <div>鍏ュ弬锛欳hart銆� DataSet銆� wrap锛坉om鑺傜偣锛夈�乨ata銆� config</div> : <div>鍏ュ弬锛歟charts銆� DataSet銆� wrap锛坉om鑺傜偣锛夈�� data銆� config</div>}
+ {plot.chartType === 'antv' ? <div>鍏ュ弬锛欳hart銆� chartId锛坉om鑺傜偣id锛夈�乨ata銆� config</div> : <div>鍏ュ弬锛歟charts銆� chartId锛坉om鑺傜偣id锛夈�� data銆� config</div>}
<CodeMirror mode="text/javascript" theme="cobalt" value={plot.script} onChange={this.onChange} />
</TabPane> : null}
</Tabs>
@@ -118,4 +117,4 @@
}
}
-export default Form.create()(CustomChartDrawerForm)
\ No newline at end of file
+export default CustomChartDrawerForm
\ No newline at end of file
--
Gitblit v1.8.0