Commit ecbdb6d4 by zhaochengxiang

模型ddl导出

parent d57c1687
...@@ -3,14 +3,17 @@ ...@@ -3,14 +3,17 @@
@import '~antd/dist/antd.less'; @import '~antd/dist/antd.less';
@import './mixins.less'; @import './mixins.less';
//与center-home中的样式保持统一
body { body {
margin: 0; margin: 0;
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', color: rgba(0, 0, 0, 0.65);
'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', font-size: 14px;
sans-serif; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', 'Helvetica Neue', Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
-webkit-font-smoothing: antialiased; font-variant: tabular-nums;
-moz-osx-font-smoothing: grayscale; line-height: 1.5;
background-color: #ECEEF3; background-color: #fff;
-webkit-font-feature-settings: 'tnum';
font-feature-settings: 'tnum';
} }
code { code {
......
...@@ -107,8 +107,5 @@ export function* ddlGenerators() { ...@@ -107,8 +107,5 @@ export function* ddlGenerators() {
} }
export function* exportDDLString(payload) { export function* exportDDLString(payload) {
return yield call(datamodelerService.exportDDLString, payload);
const { ids, ddlGeneratorName } = payload;
return yield call(datamodelerService.exportDDLString, { id: ids[0], ddlGeneratorName: ddlGeneratorName });
} }
...@@ -68,5 +68,5 @@ export function ddlGenerators() { ...@@ -68,5 +68,5 @@ export function ddlGenerators() {
} }
export function exportDDLString(payload) { export function exportDDLString(payload) {
return Get("/datamodeler/easyDataModelerExport/ddlString", payload); return GetJSON("/datamodeler/easyDataModelerExport/ddlString", payload);
} }
...@@ -99,13 +99,13 @@ class ExportModal extends React.Component { ...@@ -99,13 +99,13 @@ class ExportModal extends React.Component {
dispatch({ dispatch({
type: 'datamodel.exportDDLString', type: 'datamodel.exportDDLString',
payload: { payload: {
ids, ids: ids.join(','),
ddlGeneratorName: selectDDLGeneratorName ddlGeneratorName: selectDDLGeneratorName
}, },
callback: data => { callback: data => {
this.setState({ confirmLoading: false }, () => { this.setState({ confirmLoading: false }, () => {
this.reset(); this.reset();
onCancel && onCancel([ data ]); onCancel && onCancel(data||[]);
}); });
}, },
error: () => { error: () => {
...@@ -118,7 +118,7 @@ class ExportModal extends React.Component { ...@@ -118,7 +118,7 @@ class ExportModal extends React.Component {
} }
reset = () => { reset = () => {
this.setState({ selectedKey: '', ddlGeneratorName: '' }); this.setState({ selectedKey: '', selectDDLGeneratorName: '' });
} }
onDDLGeneratorChange = (value) => { onDDLGeneratorChange = (value) => {
......
...@@ -89,14 +89,14 @@ class Model extends React.Component { ...@@ -89,14 +89,14 @@ class Model extends React.Component {
this.setState({ exportModalVisible: false }); this.setState({ exportModalVisible: false });
if (ddlStrings.length>0) { if (ddlStrings.length>0) {
const tip = ( const tip = (
<> <>
{ {
ddlStrings && ddlStrings.map((ddlString, index) => { ddlStrings && ddlStrings.map((ddlString, index) => {
return ( return (
<Typography.Paragraph <Typography.Paragraph
key='index' key={index}
copyable={{ copyable={{
tooltips: ['复制', '复制成功'], tooltips: ['复制', '复制成功'],
}} }}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment