From 42fae277ae5ebe794fc070bf38482a919eb661fc Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 25 十一月 2020 14:36:02 +0800
Subject: [PATCH] 2020-11-25
---
src/menu/components/chart/antv-bar/chartcompile/index.jsx | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/menu/components/chart/antv-bar/chartcompile/index.jsx b/src/menu/components/chart/antv-bar/chartcompile/index.jsx
index 283faf1..de83451 100644
--- a/src/menu/components/chart/antv-bar/chartcompile/index.jsx
+++ b/src/menu/components/chart/antv-bar/chartcompile/index.jsx
@@ -19,7 +19,6 @@
MenuType: PropTypes.any,
dict: PropTypes.object,
plot: PropTypes.object,
- sysRoles: PropTypes.array,
config: PropTypes.object,
plotchange: PropTypes.func
}
@@ -148,7 +147,7 @@
}
showDrawer = () => {
- const { config, sysRoles, MenuType } = this.props
+ const { config, MenuType } = this.props
let fieldName = {}
config.columns.forEach(col => {
@@ -168,7 +167,7 @@
datatype: config.plot.datatype || 'query',
fieldName: fieldName,
plot: fromJS(config.plot).toJS(),
- baseFormlist: getBaseForm(config.plot, sysRoles, MenuType),
+ baseFormlist: getBaseForm(config.plot, MenuType),
formlist: getOptionForm(config.plot, config.columns, MenuType)
})
}
@@ -266,8 +265,8 @@
})(
<Select mode={item.multi ? 'multiple' : ''}>
{item.options.map((option, index) =>
- <Select.Option key={index} value={option.field}>
- {option.label}
+ <Select.Option key={index} value={option.field || option.value}>
+ {option.label || option.text}
</Select.Option>
)}
</Select>
--
Gitblit v1.8.0