Merge branch 'master' into positec

king

2024-09-10 4d6b9f8a2d7b316633e43b489eae9ada949c07b5

 src/menu/components/chart/chart-custom/chartcompile/index.jsx

@@ -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>入参：Chart、 DataSet、 wrap（dom节点）、data、 config</div> : <div>入参：echarts、 DataSet、 wrap（dom节点）、 data、 config</div>}
              {plot.chartType === 'antv' ? <div>入参：Chart、 chartId（dom节点id）、data、 config</div> : <div>入参：echarts、 chartId（dom节点id）、 data、 config</div>}
              <CodeMirror mode="text/javascript" theme="cobalt" value={plot.script} onChange={this.onChange} />
            </TabPane> : null}
          </Tabs>