From eed5279d84fd59bc32f060a31b4006590cee4320 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 一月 2024 17:01:59 +0800
Subject: [PATCH] Merge branch 'master' into positec

---
 src/menu/components/chart/antv-bar/chartcompile/index.jsx |   52 ++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/src/menu/components/chart/antv-bar/chartcompile/index.jsx b/src/menu/components/chart/antv-bar/chartcompile/index.jsx
index 8b6a146..ca696d2 100644
--- a/src/menu/components/chart/antv-bar/chartcompile/index.jsx
+++ b/src/menu/components/chart/antv-bar/chartcompile/index.jsx
@@ -181,10 +181,15 @@
 
     plot.zoomYaxis = plot.zoomYaxis || 'default'
 
+    let datatype = plot.datatype || 'query'
+    if (plot.enabled === 'true') {
+      datatype = 'custom'
+    }
+
     this.setState({
       visible: true,
       view: 'base',
-      datatype: plot.datatype || 'query',
+      datatype: datatype,
       fieldName: fieldName,
       plot: plot,
       baseFormlist: getBaseForm(plot, config.columns),
@@ -299,6 +304,7 @@
           { value: 'false', text: '闅愯棌'}
         ],
         render: (text, record) => {
+          if (record.axis !== 'true') return ''
           let trans = {'true': '鏄剧ず', 'false': '闅愯棌'}
           return trans[text] || ''
         }
@@ -317,7 +323,7 @@
         ],
         render: (text, record) => {
           let trans = {value: '鏁板��', percent: '鐧惧垎姣�', thdSeparator: '鍗冨垎浣�'}
-          return trans[text] || ''
+          return trans[text] || '鏁板��'
         }
       },
       {
@@ -359,9 +365,18 @@
       this.normalRef.handleConfirm().then(values => {
         let _plot = {...plot, ...values}
 
+        if (_plot.datatype === 'custom') {
+          _plot.datatype = 'query'
+          _plot.enabled = 'true'
+          _plot.show = 'value'
+        } else {
+          _plot.enabled = 'false'
+        }
+
         if (_plot.datatype !== plot.datatype) {
           _plot.colors = null
         }
+
         this.resetPlot(_plot)
 
         this.setState({
@@ -398,6 +413,14 @@
     if (view === 'normal') {
       this.normalRef.handleConfirm().then(values => {
         let _plot = {...plot, ...values}
+
+        if (_plot.datatype === 'custom') {
+          _plot.datatype = 'query'
+          _plot.enabled = 'true'
+          _plot.show = 'value'
+        } else {
+          _plot.enabled = 'false'
+        }
 
         if (_plot.datatype !== plot.datatype) {
           _plot.colors = null
@@ -482,6 +505,14 @@
   resetPlot = (_plot) => {
     const { config } = this.props
 
+    if (_plot.chartType === 'bar') {
+      _plot.transpose = _plot.shape === 'barChart' ? 'true' : 'false'
+      _plot.coordinate = _plot.shape === 'roseChart' ? 'polar' : 'angle'
+      if (_plot.shape === 'barChart' || _plot.shape === 'roseChart') {
+        _plot.shape = 'rect'
+      }
+    }
+
     if (_plot.axis) {
       _plot.grid = _plot.axis.includes('grid') ? 'show' : 'hidden'
       _plot.x_line = _plot.axis.includes('x_line') ? 'show' : 'hidden'
@@ -531,7 +562,8 @@
             name: labels[item] || item,
             axis: i === 0 ? 'true' : 'false',
             label: _plot.label === 'false' ? 'false' : true,
-            title: 'true',
+            show: 'value',
+            title: 'false',
             shape: _plot.chartType === 'bar' && i === 0 ? ['bar', 'rect'] : ['line', 'smooth']
           }
         })
@@ -668,15 +700,15 @@
                 {datatype === 'statistics' ? <Button className="color-add mk-green" onClick={this.addColor}>娣诲姞</Button> : null}
                 {datatype === 'statistics' ? <EditTable actions={['edit', 'move', 'del']} data={plot.colors || []} columns={plot.ramp ==='true' ? rampStatColorColumns : statColorColumns} onChange={this.changeColor}/> : null}
                 {datatype !== 'statistics' ? <EditTable actions={['edit']} data={plot.colors || []} columns={plot.ramp ==='true' ? rampColorColumns : colorColumns} onChange={this.changeColor}/> : null}
-                {plot.chartType === 'bar' && plot.datatype === 'query' ? <div className="mk-bar-colors">
-                  <p>鏌卞舰棰滆壊锛氬彲鏍规嵁鏌卞浘搴忓彿璁剧疆棰滆壊銆傛敞锛氫娇鐢ㄨ嚜瀹氫箟鍥惧舰璁剧疆鎴栧鏍规煴鍥炬椂鏃犳晥銆�</p>
+                {plot.chartType === 'bar' && datatype === 'query' ? <div className="mk-bar-colors">
+                  <p>鏌卞舰棰滆壊锛氬彲鏍规嵁鏌卞浘搴忓彿璁剧疆棰滆壊銆傛敞锛氬鏍规煴鍥炬椂鏃犳晥銆�</p>
                   <div className="bar-color-add"><PlusOutlined onClick={this.addbarColor}/></div>
                   <EditTable actions={['edit', 'move', 'del']} data={plot.barcolors || []} columns={barColorColumns} onChange={this.changebarColor}/>
                 </div> : null}
               </div>
             </TabPane> : null}
-            {plot ? <TabPane tab="鑷畾涔夊浘褰㈣缃�" disabled={datatype === 'statistics'} key="custom">
-              <Col span={8}>
+            {plot ? <TabPane tab="鑷畾涔夊浘褰㈣缃�" disabled={datatype !== 'custom'} key="custom">
+              {/* <Col span={8}>
                 <Form {...formItemLayout}>
                   <Form.Item label="鏄惁鍚敤" style={{marginBottom: 10}}>
                     <Radio.Group value={plot.enabled || 'false'} onChange={(e) => this.optionChange(e.target.value, 'enabled')}>
@@ -685,8 +717,8 @@
                     </Radio.Group>
                   </Form.Item>
                 </Form>
-              </Col>
-              <Col span={8}>
+              </Col> */}
+              {/* <Col span={8}>
                 <Form {...formItemLayout}>
                   <Form.Item label="澶氭煴鎺掑垪" style={{marginBottom: 10}}>
                     <Radio.Group value={plot.mutilBar || 'dodge'} onChange={(e) => this.optionChange(e.target.value, 'mutilBar')}>
@@ -696,7 +728,7 @@
                     </Radio.Group>
                   </Form.Item>
                 </Form>
-              </Col>
+              </Col> */}
               <Col span={8}>
                 <Form {...formItemLayout}>
                   <Form.Item label="Y杞村尯闂�" style={{marginBottom: 10}}>

--
Gitblit v1.8.0