Commit 4378764e by zhaochengxiang

资产编号判断

parent 6c282bde
...@@ -49,6 +49,10 @@ export function* addOrUpdateDataAsset(payload) { ...@@ -49,6 +49,10 @@ export function* addOrUpdateDataAsset(payload) {
return yield call(service.addOrUpdateDataAsset, payload); return yield call(service.addOrUpdateDataAsset, payload);
} }
export function* checkCodeIsExist(payload) {
return yield call(service.checkCodeIsExist, payload);
}
export function* addDataAssetByDirIds(payload) { export function* addDataAssetByDirIds(payload) {
return yield call(service.addDataAssetByDirIds, payload); return yield call(service.addDataAssetByDirIds, payload);
} }
......
import { PostJSON, GetJSON, PostFile } from "../util/axios" import { PostJSON, GetJSON, PostFile, Post } from "../util/axios"
export function importElement(payload) { export function importElement(payload) {
return PostFile("/dataassetmanager/elementApi/import", payload); return PostFile("/dataassetmanager/elementApi/import", payload);
...@@ -48,6 +48,10 @@ export function addOrUpdateDataAsset(payload) { ...@@ -48,6 +48,10 @@ export function addOrUpdateDataAsset(payload) {
return PostJSON("/dataassetmanager/dataAssetApi/addOrUpdateDataAsset", payload); return PostJSON("/dataassetmanager/dataAssetApi/addOrUpdateDataAsset", payload);
} }
export function checkCodeIsExist(payload) {
return Post("/dataassetmanager/dataAssetApi/checkDataAssetCodeIsExist", payload);
}
export function addDataAssetByDirIds(payload) { export function addDataAssetByDirIds(payload) {
return PostJSON("/dataassetmanager/dataAssetApi/addDataAssetByDirIds", payload); return PostJSON("/dataassetmanager/dataAssetApi/addDataAssetByDirIds", payload);
} }
......
...@@ -11,7 +11,7 @@ import { DataModelerRoleAdmin, DataModelerRoleUser, DataModelerRoleReader } from ...@@ -11,7 +11,7 @@ import { DataModelerRoleAdmin, DataModelerRoleUser, DataModelerRoleReader } from
//内网深交所环境 isSzseEnv true //内网深交所环境 isSzseEnv true
//元曜公网环境 isSzseEnv false //元曜公网环境 isSzseEnv false
export const isSzseEnv = true; export const isSzseEnv = false;
export const inputWidth = isSzseEnv?360:240; export const inputWidth = isSzseEnv?360:240;
......
...@@ -45,6 +45,16 @@ const AddAssetModel = (props) => { ...@@ -45,6 +45,16 @@ const AddAssetModel = (props) => {
setConfirmLoading(true); setConfirmLoading(true);
dispatch({ dispatch({
type: 'assetmanage.checkCodeIsExist',
payload: {
data: { elements: newElements }
},
callback: isExist => {
if (isExist) {
setConfirmLoading(false);
showMessage('warn', '已存在相同的资产编号,请重新输入');
} else {
dispatch({
type: 'assetmanage.addOrUpdateDataAsset', type: 'assetmanage.addOrUpdateDataAsset',
payload: { payload: {
params, params,
...@@ -59,6 +69,12 @@ const AddAssetModel = (props) => { ...@@ -59,6 +69,12 @@ const AddAssetModel = (props) => {
setConfirmLoading(false); setConfirmLoading(false);
} }
}) })
}
},
error: () => {
setConfirmLoading(false);
}
})
} catch (errInfo) { } catch (errInfo) {
console.log('Validate Failed:', errInfo); console.log('Validate Failed:', errInfo);
......
...@@ -259,6 +259,16 @@ const AssetAction = (props) => { ...@@ -259,6 +259,16 @@ const AssetAction = (props) => {
setConfirmLoading(true); setConfirmLoading(true);
dispatch({ dispatch({
type: 'assetmanage.checkCodeIsExist',
payload: {
data: { elements: newElements }
},
callback: isExist => {
if (isExist) {
setConfirmLoading(false);
showMessage('warn', '已存在相同的资产编号,请重新输入');
} else {
dispatch({
type: 'assetmanage.addOrUpdateDataAsset', type: 'assetmanage.addOrUpdateDataAsset',
payload: { payload: {
params, params,
...@@ -275,6 +285,12 @@ const AssetAction = (props) => { ...@@ -275,6 +285,12 @@ const AssetAction = (props) => {
setConfirmLoading(false); setConfirmLoading(false);
} }
}) })
}
},
error: () => {
setConfirmLoading(false);
}
})
} catch (errInfo) { } catch (errInfo) {
console.log('Validate Failed:', errInfo); console.log('Validate Failed:', errInfo);
......
...@@ -3,6 +3,7 @@ import { Modal, Form, Input, Space, Button, Select } from 'antd'; ...@@ -3,6 +3,7 @@ import { Modal, Form, Input, Space, Button, Select } from 'antd';
import { dispatch } from '../../../../model'; import { dispatch } from '../../../../model';
import { AppContext } from '../../../../App'; import { AppContext } from '../../../../App';
import MetadataInfo from './MetadataInfo'; import MetadataInfo from './MetadataInfo';
import { showMessage } from '../../../../util';
const { Option } = Select; const { Option } = Select;
...@@ -150,6 +151,16 @@ const AssetTagModal = (props) => { ...@@ -150,6 +151,16 @@ const AssetTagModal = (props) => {
setConfirmLoading(true); setConfirmLoading(true);
dispatch({ dispatch({
type: 'assetmanage.checkCodeIsExist',
payload: {
data: { elements: newElements }
},
callback: isExist => {
if (isExist) {
setConfirmLoading(false);
showMessage('warn', '已存在相同的资产编号,请重新输入');
} else {
dispatch({
type: 'assetmanage.addOrUpdateDataAsset', type: 'assetmanage.addOrUpdateDataAsset',
payload: { payload: {
params, params,
...@@ -184,6 +195,12 @@ const AssetTagModal = (props) => { ...@@ -184,6 +195,12 @@ const AssetTagModal = (props) => {
setConfirmLoading(false); setConfirmLoading(false);
} }
}) })
}
},
error: () => {
setConfirmLoading(false);
}
})
} catch (errInfo) { } catch (errInfo) {
console.log('Validate Failed:', errInfo); console.log('Validate Failed:', errInfo);
......
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