Commit dea3afbc by zhaochengxiang

支持hive

parent b0e974ed
...@@ -178,7 +178,7 @@ export function setRootDomainId(payload) { ...@@ -178,7 +178,7 @@ export function setRootDomainId(payload) {
} }
export function getMaintenanceRecords(payload) { export function getMaintenanceRecords(payload) {
return PostJSON("/datamodeler/easyDataModelerCURD/getMaintenanceRecords", payload); return GetJSON("/datamodeler/easyDataModelerCURD/getMaintenanceRecords", payload);
} }
export function getCheckoutDataModel(payload) { export function getCheckoutDataModel(payload) {
......
...@@ -378,14 +378,14 @@ const ImportActionHeader = (props) => { ...@@ -378,14 +378,14 @@ const ImportActionHeader = (props) => {
<Col xs={24} sm={24} lg={12} xl={8}> <Col xs={24} sm={24} lg={12} xl={8}>
<Form.Item <Form.Item
label="数据表类型" label="数据表类型"
name="hiveExternalTable" name="externalTable"
style={{ marginBottom }} style={{ marginBottom }}
> >
{ {
editable ? <Select allowClear> editable ? <Select allowClear>
<Select.Option value={false}>内部表</Select.Option> <Select.Option value={false}>内部表</Select.Option>
<Select.Option value={true}>外部表</Select.Option> <Select.Option value={true}>外部表</Select.Option>
</Select> : <span className='word-wrap'>{highlightSearchContentByTerms(modelerData?.hiveExternalTable?'外部表':'内部表', terms)}</span> </Select> : <span className='word-wrap'>{highlightSearchContentByTerms(modelerData?.externalTable?'外部表':'内部表', terms)}</span>
} }
</Form.Item> </Form.Item>
</Col> </Col>
...@@ -900,7 +900,7 @@ const DistributionBucketItem = ({ value, modelerData, onChange, ...restProps }) ...@@ -900,7 +900,7 @@ const DistributionBucketItem = ({ value, modelerData, onChange, ...restProps })
} }
return ( return (
<Row> <Row gutter={10}>
<Col span={12}> <Col span={12}>
<Select <Select
onChange={(val) => { onChange={(val) => {
......
...@@ -46,9 +46,7 @@ const FC = (props) => { ...@@ -46,9 +46,7 @@ const FC = (props) => {
dispatch({ dispatch({
type: 'datamodel.getMaintenanceRecords', type: 'datamodel.getMaintenanceRecords',
payload: { payload: {
params: { id: modelerData?.id
id: modelerData?.id
}
}, },
callback: data => { callback: data => {
setMaintenanceRecords(data); setMaintenanceRecords(data);
......
...@@ -967,7 +967,7 @@ export const ImportActionTable = (props) => { ...@@ -967,7 +967,7 @@ export const ImportActionTable = (props) => {
inputType, inputType,
colTitle: col.title, colTitle: col.title,
editing: isEditing(record), editing: isEditing(record),
datatypes: supportedDatatypes, datatypes: (supportedDatatypes??[]).filter(item => item.supportedDBTypes.indexOf(modelerData?.dbType) !== -1),
require: col.require, require: col.require,
onPressEnter: () => { onPressEnter: () => {
onColumnPressEnter(col.title) onColumnPressEnter(col.title)
......
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