Commit d17116cb by zhaochengxiang

调整英文名称推荐接口

parent 8843c41d
...@@ -125,3 +125,7 @@ export function* validateDataModel(payload) { ...@@ -125,3 +125,7 @@ export function* validateDataModel(payload) {
export function* autocomplete(payload) { export function* autocomplete(payload) {
return yield call(datamodelerService.autocomplete, payload); return yield call(datamodelerService.autocomplete, payload);
} }
export function* recommandEnglishWords(payload) {
return yield call(datamodelerService.recommandEnglishWords, payload);
}
...@@ -87,3 +87,7 @@ export function validateDataModel(payload) { ...@@ -87,3 +87,7 @@ export function validateDataModel(payload) {
export function autocomplete(payload) { export function autocomplete(payload) {
return PostJSON("/datamodeler/easyDataModelerDesign/autocomplete", payload); return PostJSON("/datamodeler/easyDataModelerDesign/autocomplete", payload);
} }
export function recommandEnglishWords(payload) {
return PostJSON("/datamodeler/easyDataModelerDesign/recommandEnglishWords", payload);
}
...@@ -41,23 +41,45 @@ const ImportActionHeader = (props) => { ...@@ -41,23 +41,45 @@ const ImportActionHeader = (props) => {
}, },
}; };
const onSearch = (searchText) =>{ const onSearch = (searchText) => {
dispatchLatest({
type: 'datamodel.autocomplete', const _searchText = searchText.replace(/ /g,'');
payload: { if (_searchText !== '') {
params: { dispatchLatest({
word: searchText type: 'datamodel.autocomplete',
payload: {
params: {
word: _searchText,
isEasyDataModelerDataModelAttribute: false,
}
},
callback: data => {
const _options = [];
(data||[]).forEach(item => {
_options.push({ value: item });
})
setOptions(_options);
} }
}, })
callback: data => { } else {
const _options = []; dispatchLatest({
(data||[]).forEach(item => { type: 'datamodel.recommandEnglishWords',
_options.push({ value: item }); payload: {
}) params: {
chineseWord: modelerData.cnName,
}
},
callback: data => {
const _options = [];
(data||[]).forEach(item => {
_options.push({ value: item });
})
setOptions(_options); setOptions(_options);
} }
}) })
}
} }
return ( return (
......
...@@ -357,11 +357,6 @@ const ImportActionIndex = (props) => { ...@@ -357,11 +357,6 @@ const ImportActionIndex = (props) => {
return; return;
} }
if (/^[a-zA-Z]+$/.test(row.name) === false) {
form.setFields([{ name: 'name', errors: ['索引名称必须全是字母'] }]);
return;
}
const _indexedEasyDataModelAttributes = [], _indexedAttributeOrders = []; const _indexedEasyDataModelAttributes = [], _indexedAttributeOrders = [];
row.attributesWithOrders.indexedEasyDataModelAttributes.forEach((item, index) => { row.attributesWithOrders.indexedEasyDataModelAttributes.forEach((item, index) => {
if ((item.iid||'')!=='') { if ((item.iid||'')!=='') {
......
...@@ -358,7 +358,8 @@ const ImportActionTable = (props) => { ...@@ -358,7 +358,8 @@ const ImportActionTable = (props) => {
type: 'datamodel.autocomplete', type: 'datamodel.autocomplete',
payload: { payload: {
params: { params: {
word: changedValues.name word: changedValues.name,
isEasyDataModelerDataModelAttribute: true,
} }
}, },
callback: data => { callback: data => {
......
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