Commit 8e1b9f4f by zhaochengxiang

Schema 选范围

parent 414a41ec
...@@ -202,6 +202,10 @@ export function* getCheckoutDataModel(payload) { ...@@ -202,6 +202,10 @@ export function* getCheckoutDataModel(payload) {
return yield call(datamodelerService.getCheckoutDataModel, payload); return yield call(datamodelerService.getCheckoutDataModel, payload);
} }
export function* getRangeList(payload) {
return yield call(datamodelerService.getRangeList, payload);
}
export function* getDataModelLocation(payload) { export function* getDataModelLocation(payload) {
return yield call(datamodelerService.getDataModelLocation, payload); return yield call(datamodelerService.getDataModelLocation, payload);
} }
......
...@@ -193,6 +193,10 @@ export function getCheckoutDataModel(payload) { ...@@ -193,6 +193,10 @@ export function getCheckoutDataModel(payload) {
return GetJSON("/datamodeler/easyDataModelerCURD/getCheckoutDataModel", payload); return GetJSON("/datamodeler/easyDataModelerCURD/getCheckoutDataModel", payload);
} }
export function getRangeList(payload) {
return GetJSON("/datamodeler/easyDataModelerCURD/getRangeList", payload);
}
export function ddlGenerators() { export function ddlGenerators() {
return GetJSON("/datamodeler/easyDataModelerExport/ddlGenerators"); return GetJSON("/datamodeler/easyDataModelerExport/ddlGenerators");
} }
......
...@@ -662,6 +662,7 @@ const ImportAction = React.forwardRef((props, ref) => { ...@@ -662,6 +662,7 @@ const ImportAction = React.forwardRef((props, ref) => {
onChange={onHeaderChange} onChange={onHeaderChange}
terms={terms} terms={terms}
supportedPartitionTypes={supportedPartitionTypes} supportedPartitionTypes={supportedPartitionTypes}
catalogId={catalogId}
/> />
<ImportActionTable <ImportActionTable
modelerData={modelerData||{}} modelerData={modelerData||{}}
......
...@@ -70,7 +70,7 @@ const NameInput = ({ value, prefixName, onChange }) => { ...@@ -70,7 +70,7 @@ const NameInput = ({ value, prefixName, onChange }) => {
} }
const ImportActionHeader = (props) => { const ImportActionHeader = (props) => {
const { editable, form, modelerData, constraints, templates, onConstraintChange, onTemplateChange, validateReports, onChange, terms, supportedPartitionTypes } = props; const { editable, form, modelerData, constraints, templates, onConstraintChange, onTemplateChange, validateReports, onChange, terms, supportedPartitionTypes, catalogId } = props;
const [ options, setOptions ] = useState([]); const [ options, setOptions ] = useState([]);
...@@ -81,6 +81,8 @@ const ImportActionHeader = (props) => { ...@@ -81,6 +81,8 @@ const ImportActionHeader = (props) => {
const [loadingHiveStoredTypes, setLoadingHiveStoredTypes] = useState(false); const [loadingHiveStoredTypes, setLoadingHiveStoredTypes] = useState(false);
const [hiveStoredTypes, setHiveStoredTypes] = useState(); const [hiveStoredTypes, setHiveStoredTypes] = useState();
const [ bindingLoadRangeList, setBindingLoadRangeList ] = useState(null); const [ bindingLoadRangeList, setBindingLoadRangeList ] = useState(null);
const [loadingRangeList, setLoadingRangeList] = useState(false);
const [rangeList, setRangeList] = useState();
const [isCollapse, setCollapse] = useState(true) const [isCollapse, setCollapse] = useState(true)
const [ruleParams, setRuleParams] = useState({ const [ruleParams, setRuleParams] = useState({
visible: false visible: false
...@@ -93,6 +95,12 @@ const ImportActionHeader = (props) => { ...@@ -93,6 +95,12 @@ const ImportActionHeader = (props) => {
}, []) }, [])
useEffect(() => { useEffect(() => {
if (catalogId) {
getRangeList();
}
}, [catalogId])
useEffect(() => {
if (modelerData?.dataType) { if (modelerData?.dataType) {
getBindingLoadRangeList(modelerData?.dataType); getBindingLoadRangeList(modelerData?.dataType);
} else { } else {
...@@ -258,6 +266,23 @@ const ImportActionHeader = (props) => { ...@@ -258,6 +266,23 @@ const ImportActionHeader = (props) => {
}) })
} }
const getRangeList = () => {
setLoadingRangeList(true)
dispatch({
type: 'datamodel.getRangeList',
payload: {
easyDataModelCatalogId: catalogId,
},
callback: data => {
setLoadingRangeList(false)
setRangeList(data)
},
error: () => {
setLoadingRangeList(false)
}
})
}
const onSearch = (searchText) => { const onSearch = (searchText) => {
const _searchText = searchText.replace(/ /g,''); const _searchText = searchText.replace(/ /g,'');
...@@ -687,7 +712,9 @@ const ImportActionHeader = (props) => { ...@@ -687,7 +712,9 @@ const ImportActionHeader = (props) => {
rules={[{ required: true, message: '请输入数据库Schema!' }]} rules={[{ required: true, message: '请输入数据库Schema!' }]}
> >
{ {
editable ? <Input placeholder='描述数据表落地的数据库Schema' /> : <span className='word-wrap'>{highlightSearchContentByTerms(modelerData?.dataResidence, terms)}</span> editable ? <Select loading={loadingRangeList} placeholder='描述数据表落地的数据库Schema'>
{ rangeList?.map(item => <Select.Option key={item} value={item}>{item}</Select.Option>) }
</Select> : <span className='word-wrap'>{highlightSearchContentByTerms(modelerData?.dataResidence, terms)}</span>
} }
</Form.Item> </Form.Item>
</Col> </Col>
......
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