Commit 34c70bf5 by 和金晶

中移主数据模块

parent c186214e
......@@ -10,8 +10,8 @@
# production
/build
/data-govern*
/data-govern*.zip
/data-govern-bj*
/data-govern-bj*.zip
# misc
.DS_Store
......
......@@ -50,7 +50,7 @@ module.exports = {
},
proxy: {
'/api': {
target: 'http://192.168.0.111:8189',
target: 'http://10.183.29.19:8245',
changeOrigin: true,
},
'/data-quality': {
......
File added
{
"name": "data-govern",
"name": "data-govern-bj",
"version": "0.1.0",
"private": true,
"dependencies": {
......@@ -79,5 +79,5 @@
"last 1 safari version"
]
},
"homepage": "http://myhost/data-govern"
"homepage": "http://myhost/data-govern-bj"
}
No preview for this file type
......@@ -188,7 +188,7 @@ export class App extends React.Component {
setGlobalState,
onGlobalStateChange
}}>
<Router basename={window.__POWERED_BY_QIANKUN__ ? '/data-govern' : '/'}>
<Router basename={window.__POWERED_BY_QIANKUN__ ? '/data-govern-bj' : '/'}>
<Switch>
<Route path={`${ContextPath}/login`} component={Signin} exact />
<Route path={`${ContextPath}/home`} component={Home} />
......@@ -229,7 +229,7 @@ export class App extends React.Component {
<Route path={'/center-home/data-model-action'} component={EditModel} exact />
<Route path={'/center-home/asset-detail'} component={AssetDetailPage} exact />
<Route path={'/center-home/model-review-detail'} component={ModelReviewDetail} />
<Route path={'/data-govern/model-compare-list'} component={ModelCompareList} />
<Route path={'/data-govern-bj/model-compare-list'} component={ModelCompareList} />
<Route path={'/data-model-product/physics-model'} component={Model} exact />
<Route path={'/data-model-product/physics-model-branch'} component={Model} exact />
......
......@@ -41,11 +41,11 @@ if (!window.__POWERED_BY_QIANKUN__) {
}
export async function bootstrap() {
console.log('[data-govern] react app bootstraped');
console.log('[data-govern-bj] react app bootstraped');
}
export async function mount(props) {
console.log('[data-govern] props from main framework', props);
console.log('[data-govern-bj] props from main framework', props);
storeTest(props);
render(props);
}
......@@ -56,6 +56,6 @@ export async function unmount(props) {
}
export async function update(props) {
console.log('[data-govern] props update from main framework', props);
console.log('[data-govern-bj] props update from main framework', props);
$hostParams.next(props?.data);
}
\ No newline at end of file
......@@ -3,7 +3,7 @@ import { PaginationProps, Table, TableColumnType, TableProps } from 'antd'
import type { SortOrder, ColumnGroupType, ColumnType } from 'antd/lib/table/interface'
import { Resizable } from 'react-resizable'
import ResizeObserver from 'rc-resize-observer'
import produce from 'immer'
import {produce} from 'immer'
import { nanoid } from 'nanoid'
import { getScrollbarWidth } from '..'
import { defaultPageSizeOptions } from '../hooks/page'
......
......@@ -16,7 +16,7 @@ export const isSzseEnv = false;
export const inputWidth = isSzseEnv?360:200;
export const ContextPath = '/data-govern';
export const ContextPath = '/data-govern-bj';
export const $hostParams = new Subject();
......@@ -569,13 +569,13 @@ export function openMetadataDetail(id) {
}
export function openModelDetail(id) {
window.open(`/data-govern/data-model-action?${Action}=detail&${ModelerId}=${id}`);
window.open(`/data-govern-bj/data-model-action?${Action}=detail&${ModelerId}=${id}`);
}
export function openNoticeDataModelById(id, versionId) {
window.open(`/data-govern/data-model-action?${Action}=detail&${ModelerId}=${id}&${NoticeModelerId}=${id}&${NoticeModelerLatestVersionId}=${versionId}`);
window.open(`/data-govern-bj/data-model-action?${Action}=detail&${ModelerId}=${id}&${NoticeModelerId}=${id}&${NoticeModelerLatestVersionId}=${versionId}`);
}
export function openNoticeDataModelByVersionId(id) {
window.open(`/data-govern/data-model-action?${Action}=detail&${ModelerId}=${id}&${NoticeModelerId}=${id}`);
window.open(`/data-govern-bj/data-model-action?${Action}=detail&${ModelerId}=${id}&${NoticeModelerId}=${id}`);
}
\ No newline at end of file
......@@ -4,7 +4,7 @@ import { UploadOutlined } from '@ant-design/icons';
import { dispatch } from '../../model';
import { getDatasource } from '../../service/datasourcemanager';
import produce from 'immer';
import { produce } from 'immer';
import { showMessage } from '../../util';
const FC = (props) => {
......
......@@ -5,7 +5,7 @@ import ResizeObserver from 'rc-resize-observer'
import { debounceTime, Subject } from 'rxjs'
import { DownOutlined, UpOutlined } from "@ant-design/icons"
import LocalStorage from 'local-storage'
import produce from 'immer'
import { produce } from 'immer'
import { defaultPage, usePage } from '../../../util/hooks/page'
import Table from '../../../util/Component/Table'
......
......@@ -534,7 +534,7 @@ const AssetAction = (props) => {
{
value => {
value?.onGlobalStateChange&&value?.onGlobalStateChange((state, prev) => {
if (state.message === 'data-govern-show-metadata-list-callback-message') {
if (state.message === 'data-govern-bj-show-metadata-list-callback-message') {
setMetadataId(state.data?.metadataId||'');
onMetadataChange && onMetadataChange(state.data?.metadataId||'');
......
......@@ -43,7 +43,7 @@ const ImportDirectory = (props) => {
}
const download = () => {
window.open("/data-govern/docs/AssetThemeModel.xlsx");
window.open("/data-govern-bj/docs/AssetThemeModel.xlsx");
}
const upload = async (ignoreRepeatPath = false) => {
......
......@@ -12,7 +12,7 @@ const ImportElement = (props) => {
const [ confirmLoading, setConfirmLoading ] = useState(false);
const downloadTemplate = () => {
window.open("/data-govern/docs/ElementModel.xlsx");
window.open("/data-govern-bj/docs/ElementModel.xlsx");
}
const uploadProps = {
......
import React from "react"
import { Modal, Button, Spin, Row, Col, Tree, Tooltip, Typography, Input } from "antd"
import { debounceTime, Subject } from 'rxjs'
import produce from 'immer'
import { produce } from 'immer'
import { dispatch } from '../../../model'
import { getAssetRange, getAssetType, inputWidth, isSzseEnv, showMessage } from "../../../util"
......
......@@ -86,7 +86,7 @@ const FC = ({ value, onChange, readonly = true, terms = [] }) => {
>
<a onClick={() => {
app?.setGlobalState?.({
message: 'data-govern-show-metadata-message',
message: 'data-govern-bj-show-metadata-message',
data: item
})
}}
......
......@@ -2,7 +2,7 @@ import React from 'react'
import { Button, Modal, Spin, Tree, AutoComplete } from 'antd'
import { dispatch } from '../../../model'
import produce from 'immer'
import { produce } from 'immer'
import { getAssetType, highlightSearchContentByTerms, showMessage, showNotifaction } from '../../../util'
import { generateList } from '../AssetResourceManage/tree'
import { AssetManageReference } from '../../../util/constant'
......
......@@ -5,7 +5,7 @@ import ResizeObserver from 'rc-resize-observer'
import { debounceTime, Subject } from 'rxjs'
import { DownOutlined, UpOutlined } from "@ant-design/icons"
import LocalStorage from 'local-storage'
import produce from 'immer'
import { produce } from 'immer'
import { defaultPage, usePage } from '../../../util/hooks/page'
import Table from '../../../util/Component/Table'
......@@ -1019,7 +1019,7 @@ const FC = (props) => {
if (refresh) {
setTimeout(() => {
window.open(`/data-govern/edit-assets?ids=${(selectedRows??[]).map(item => item.id).toString()}&elementIds=${(value??[]).toString()}&type=${AssetManageReference}`)
window.open(`/data-govern-bj/edit-assets?ids=${(selectedRows??[]).map(item => item.id).toString()}&elementIds=${(value??[]).toString()}&type=${AssetManageReference}`)
}, 300)
}
}}
......
import React, { useEffect, useMemo, useState } from 'react';
import { Tooltip, Spin, Modal, Button, AutoComplete, Menu, Dropdown } from 'antd'
import { PlusOutlined, ReloadOutlined, ImportOutlined, ExportOutlined, SettingOutlined } from '@ant-design/icons'
import produce from 'immer'
import { produce } from 'immer'
import { dispatch } from '../../../model'
import { showMessage, highlightSearchContentByTerms, showNotifaction, getAssetType, getAssetRange } from '../../../util'
......
......@@ -2,7 +2,7 @@ import React from 'react'
import * as echarts from 'echarts'
import ResizeObserver from 'rc-resize-observer'
import { Row, Col, Card, Space, Divider, Badge, Select, DatePicker, Spin, Tabs } from 'antd'
import produce from 'immer'
import { produce } from 'immer'
import moment from 'moment'
import Table from '../../../util/Component/Table'
......
......@@ -2,7 +2,7 @@ import React from 'react'
import { Button, Modal, Spin, Tree, AutoComplete } from 'antd'
import { dispatch } from '../../../model'
import produce from 'immer'
import { produce } from 'immer'
import { getAssetType, highlightSearchContentByTerms, showMessage, showNotifaction } from '../../../util'
import { generateList } from '../AssetResourceManage/tree'
import { AssetManageReference } from '../../../util/constant'
......
......@@ -5,7 +5,7 @@ import ResizeObserver from 'rc-resize-observer'
import { debounceTime, Subject } from 'rxjs'
import { DownOutlined, UpOutlined } from "@ant-design/icons"
import LocalStorage from 'local-storage'
import produce from 'immer'
import { produce } from 'immer'
import { defaultPage, usePage } from '../../../util/hooks/page'
import Table from '../../../util/Component/Table'
......
......@@ -5,7 +5,7 @@ import ResizeObserver from 'rc-resize-observer'
import { debounceTime, Subject } from 'rxjs'
import { DownOutlined, UpOutlined } from "@ant-design/icons"
import LocalStorage from 'local-storage'
import produce from 'immer'
import { produce } from 'immer'
import { defaultPage, usePage } from '../../../util/hooks/page'
import Table from '../../../util/Component/Table'
......
......@@ -3,7 +3,7 @@ import { Modal, Button, Spin, Form, Select, TreeSelect, Input, Row, Col, Tree, T
import { debounceTime, Subject } from 'rxjs'
import { dispatch } from '../../../model'
import produce from 'immer'
import { produce } from 'immer'
import { AssetManageReference, ResourceManageReference } from '../../../util/constant'
import { getAssetRange, getAssetType, inputWidth, isSzseEnv } from '../../../util'
import { AppContext } from '../../../App'
......
......@@ -3,7 +3,7 @@ import { Button, Modal, Spin, Tree, AutoComplete } from 'antd'
import { dispatch } from '../../../model'
import { generateList } from './tree'
import produce from 'immer'
import { produce } from 'immer'
import { getAssetType, highlightSearchContentByTerms, showMessage, showNotifaction } from '../../../util'
import { ResourceManageReference } from '../../../util/constant'
......
import React from "react"
import { Modal, Button, Form, Select, Spin, Checkbox, Space, Row } from "antd"
import { debounceTime, Subject } from 'rxjs'
import produce from "immer"
import {produce} from "immer"
import { dispatch } from '../../../model'
import { showMessage } from "../../../util"
......
......@@ -12,7 +12,7 @@ import { getAssetType, getAssetTypeName, getQueryParam, isSzseEnv, showMessage }
import '../Model/Component/EditModel.less'
import { ElementItem, MultipleItem } from '../AssetManage/Component/AssetAction'
import { AssetDictionaryItem } from './add-to-asset'
import produce from 'immer'
import { produce } from 'immer'
const pathElement = {
name: '资产目录',
......
......@@ -34,7 +34,7 @@ const FC = ({ value, onChange, readonly = true, terms = [] }) => {
>
<a onClick={() => {
app?.setGlobalState?.({
message: 'data-govern-show-metadata-message',
message: 'data-govern-bj-show-metadata-message',
data: decodeData[0]
})
}}
......@@ -48,7 +48,7 @@ const FC = ({ value, onChange, readonly = true, terms = [] }) => {
{
!readonly && <Button type='text' icon={<SettingFilled />} onClick={() => {
app?.setGlobalState?.({
message: 'data-govern-show-metadata-list-message',
message: 'data-govern-bj-show-metadata-list-message',
data: (IsArr(decodeData)&&decodeData.length>0) ? decodeData[0] : {}
})
}} />
......
......@@ -5,7 +5,7 @@ import ResizeObserver from 'rc-resize-observer'
import { debounceTime, Subject } from 'rxjs'
import { DownOutlined, UpOutlined } from "@ant-design/icons"
import LocalStorage from 'local-storage'
import produce from 'immer'
import { produce } from 'immer'
import { defaultPage, usePage } from '../../../util/hooks/page'
import Table from '../../../util/Component/Table'
......@@ -676,7 +676,7 @@ const FC = (props) => {
}
const onBatchAddToAssetClick = () => {
window.open(`/data-govern/edit-assets?ids=${(selectedRows??[]).map(item => item.id).toString()}&type=${ResourceManageReference}`)
window.open(`/data-govern-bj/edit-assets?ids=${(selectedRows??[]).map(item => item.id).toString()}&type=${ResourceManageReference}`)
}
const onDistributeTaskClick = () => {
......@@ -1537,7 +1537,7 @@ const FC = (props) => {
if (refresh) {
setTimeout(() => {
window.open(`/data-govern/edit-assets?ids=${(selectedRows??[]).map(item => item.id).toString()}&elementIds=${(value??[]).toString()}&type=${ResourceManageReference}`)
window.open(`/data-govern-bj/edit-assets?ids=${(selectedRows??[]).map(item => item.id).toString()}&elementIds=${(value??[]).toString()}&type=${ResourceManageReference}`)
}, 300)
}
}}
......
import React, { useEffect, useMemo, useState } from 'react';
import { Tooltip, Spin, Modal, Button, AutoComplete, Menu, Dropdown } from 'antd'
import { PlusOutlined, ReloadOutlined, ImportOutlined, ExportOutlined, SettingOutlined } from '@ant-design/icons'
import produce from 'immer'
import { produce } from 'immer'
import { dispatch } from '../../../model'
import { showMessage, highlightSearchContentByTerms, showNotifaction, getAssetType, getAssetRange } from '../../../util'
......
import produce from "immer"
import {produce} from "immer"
export function formatTreeData(datasources, catalogMap) {
const treeData = produce(datasources, (draft) => {
......
......@@ -390,7 +390,7 @@ const EditModel = (props) => {
}
const onCopy = () => {
window.open(`/data-govern/data-model-action?${Action}=add&${CatalogId}=${privilege?.catalogId??''}&${ModelerId}=${modelerId}`)
window.open(`/data-govern-bj/data-model-action?${Action}=add&${CatalogId}=${privilege?.catalogId??''}&${ModelerId}=${modelerId}`)
}
const onMetadataCompare = () => {
......
......@@ -12,7 +12,7 @@ import TagItem from './tag-item'
import './ImportActionHeader.less';
import { importActionSubject } from './ImportAction';
import produce from 'immer';
import { produce } from 'immer';
const { TextArea } = Input;
const { Option } = Select;
......@@ -101,7 +101,7 @@ const ImportActionHeader = (props) => {
useEffect(() => {
if (modelerData?.id) {
getResourceTag()
// getResourceTag()
}
}, [modelerData?.id])
......@@ -207,25 +207,25 @@ const ImportActionHeader = (props) => {
})
}
const getResourceTag = () => {
if (modelerData?.id) {
dispatch({
type: 'tag.getResourceTagIn',
payload: {
params: {
resourceIds: [modelerData?.id],
includeAll: true,
includePrivate: true
}
},
callback: data => {
setResourceTagMap(data?.data)
}
});
} else {
setResourceTagMap()
}
}
// const getResourceTag = () => {
// if (modelerData?.id) {
// dispatch({
// type: 'tag.getResourceTagIn',
// payload: {
// params: {
// resourceIds: [modelerData?.id],
// includeAll: true,
// includePrivate: true
// }
// },
// callback: data => {
// setResourceTagMap(data?.data)
// }
// });
// } else {
// setResourceTagMap()
// }
// }
const onSearch = (searchText) => {
......
......@@ -123,7 +123,7 @@ const FC = (props) => {
relationModelerDatas?.length===0 ? '暂无信息' :
relationModelerDatas?.map((item, index) => (
<a className='mr-3' key={index} onClick={() => {
window.open(`/data-govern/data-model-action?${Action}=detail&${ModelerId}=${item.id}&${PermitCheckOut}=${item.permitCheckOut||false}&${Editable}=${item.editable||false}&${StateId}=${item.state?.id||''}&${ReadOnly}=false`);
window.open(`/data-govern-bj/data-model-action?${Action}=detail&${ModelerId}=${item.id}&${PermitCheckOut}=${item.permitCheckOut||false}&${Editable}=${item.editable||false}&${StateId}=${item.state?.id||''}&${ReadOnly}=false`);
}}>
{item.cnName}
</a>
......
......@@ -273,7 +273,7 @@ export const ImportActionTable = (props) => {
},
{
title: '中文名称',
width: 200,
width: 195,
dataIndex: 'cnName',
editable: true,
ellipsis: true,
......@@ -292,7 +292,7 @@ export const ImportActionTable = (props) => {
},
{
title: '英文名称',
width: 200,
width: 195,
dataIndex: 'name',
editable: true,
ellipsis: true,
......@@ -310,7 +310,7 @@ export const ImportActionTable = (props) => {
},
{
title: '类型',
width: 230,
width: 225,
dataIndex: 'datatype',
editable: true,
ellipsis: true,
......@@ -336,8 +336,8 @@ export const ImportActionTable = (props) => {
}
},
{
title: 'Not Null',
width: 70,
title: '必填',
width: 44,
dataIndex: 'notNull',
editable: true,
render: (notNull, record, index) => {
......@@ -387,6 +387,40 @@ export const ImportActionTable = (props) => {
}
},
{
title: '是否显示',
width: 75,
dataIndex: 'show',
editable: (type==='model'?true:false),
render: (show, record, index) => {
if (!show) {
return '-';
} else if (show === true) {
return (
<CheckOutlined />
)
}
return '';
}
},
{
title: '可编辑',
width: 65,
dataIndex: 'supportedEdit',
editable: (type==='model'?true:false),
render: (supportedEdit, record, index) => {
if (!supportedEdit) {
return '-';
} else if (supportedEdit === true) {
return (
<CheckOutlined />
)
}
return '';
}
},
{
title: '业务含义',
dataIndex: 'remark',
editable: true,
......@@ -421,7 +455,7 @@ export const ImportActionTable = (props) => {
}
},
{
title: '计算规则',
title: '属性类别',
dataIndex: 'definition',
editable: true,
ellipsis: true,
......@@ -797,7 +831,7 @@ export const ImportActionTable = (props) => {
const onAddToStandardClick = (record) => {
app.setGlobalState?.({
message: 'data-govern-show-standard-create',
message: 'data-govern-bj-show-standard-create',
data: {
column: {...record, ...{ modelName: modelerData?.name, modelCnName: modelerData?.cnName }},
type: record?.isPossibleNewRecommendedDefinition?.type
......@@ -807,7 +841,7 @@ export const ImportActionTable = (props) => {
const onAddToWordClick = (record) => {
app.setGlobalState?.({
message: 'data-govern-show-standard-create',
message: 'data-govern-bj-show-standard-create',
data: {
column: record,
type: record?.isPossibleNewTerm?.type
......@@ -945,7 +979,7 @@ export const ImportActionTable = (props) => {
};
const onSuggestChange = (record) => {
const { notNull, partOfPrimaryKeyLogically, foreignKey, ...restRecord } = record;
const { notNull, partOfPrimaryKeyLogically, foreignKey, supportedEdit,show,...restRecord } = record;
form.setFieldsValue({
...restRecord
});
......@@ -982,7 +1016,9 @@ export const ImportActionTable = (props) => {
col.dataIndex==='partOfDistributionKey' ||
col.dataIndex==='partOfPrimaryKeyLogically' ||
col.dataIndex==='needAttention' ||
col.dataIndex==='foreignKey'
col.dataIndex==='foreignKey' ||
col.dataIndex==='supportedEdit' ||
col.dataIndex==='show'
) {
inputType = 'check';
} else if (
......
......@@ -19,7 +19,7 @@ class ImportExcel extends React.Component {
}
downloadTemplate = () => {
window.open("/data-govern/docs/DataModel.xlsx");
window.open("/data-govern-bj/docs/DataModel.xlsx");
}
normFile = (e) => {
......
......@@ -19,7 +19,7 @@ import AuthTransfer from './auth-transfer';
import './ModelTable.less';
import 'react-contexify/dist/ReactContexify.css';
import produce from "immer";
import {produce} from "immer";
const { Paragraph, Text } = Typography;
......@@ -371,7 +371,7 @@ const ModelTable = (props) => {
useEffect(() => {
if (data) {
getResourceTag();
// getResourceTag();
setTimeout(() => {
try {
......@@ -387,7 +387,7 @@ const ModelTable = (props) => {
if (!mountRef.current) {
mountRef.current = true;
} else {
getResourceTag();
// getResourceTag();
}
}, [batchAddTagChange])
......@@ -481,26 +481,26 @@ const ModelTable = (props) => {
})
}
const getResourceTag = () => {
const ids = (data??[]).map(item => item.id);
if (ids.length > 0) {
dispatch({
type: 'tag.getResourceTagIn',
payload: {
params: {
resourceIds: ids,
includeAll: true,
includePrivate: true
}
},
callback: data => {
setResourceTagMap(data?.data)
}
});
} else {
setResourceTagMap()
}
}
// const getResourceTag = () => {
// const ids = (data??[]).map(item => item.id);
// if (ids.length > 0) {
// dispatch({
// type: 'tag.getResourceTagIn',
// payload: {
// params: {
// resourceIds: ids,
// includeAll: true,
// includePrivate: true
// }
// },
// callback: data => {
// setResourceTagMap(data?.data)
// }
// });
// } else {
// setResourceTagMap()
// }
// }
const modelEventChange = (e) => {
if (e.key === 'modelChange') {
......@@ -659,9 +659,9 @@ const ModelTable = (props) => {
historyItem(currentItem);
} else if (key === 'copy') {
if (view !== 'branch') {
window.open(`/data-govern/data-model-action?${Action}=add&${CatalogId}=${(view==='dir')?(catalogId||''):''}&${ModelerId}=${currentItem.id}`);
window.open(`/data-govern-bj/data-model-action?${Action}=add&${CatalogId}=${(view==='dir')?(catalogId||''):''}&${ModelerId}=${currentItem.id}`);
} else {
window.open(`/data-govern/data-model-action?${Action}=add&${BranchId}=${catalogId??''}&${ModelerId}=${currentItem.id}`);
window.open(`/data-govern-bj/data-model-action?${Action}=add&${BranchId}=${catalogId??''}&${ModelerId}=${currentItem.id}`);
}
} else if (key === 'createTable') {
deployAction(currentItem);
......
......@@ -13,7 +13,7 @@ import UpdateBranch from './update-branch';
import './ModelTree.less';
import 'react-contexify/dist/ReactContexify.css';
import produce from "immer";
import {produce} from "immer";
const { Option } = AutoComplete;
......
......@@ -39,7 +39,7 @@ const VersionHistory = (props) => {
}
const onVersionItemClick = (version) => {
window.open(`/data-govern/data-model-action?${Action}=detail-version&${ModelerId}=${version.dataModelId||''}&${VersionId}=${version.id||''}`);
window.open(`/data-govern-bj/data-model-action?${Action}=detail-version&${ModelerId}=${version.dataModelId||''}&${VersionId}=${version.id||''}`);
}
return (
......
import React from "react"
import { Modal, Button, Spin, Form, Select } from "antd"
import produce from "immer"
import {produce} from "immer"
import { useDebounceEffect } from "ahooks"
import { dispatch } from '../../../../model'
......
import React from "react"
import { Modal, Button, Spin, Form, Select } from "antd"
import produce from "immer"
import {produce} from "immer"
import { useDebounceEffect } from "ahooks"
import { dispatch } from '../../../../model'
......
import React from "react"
import { Modal, Button, Tree, Spin, AutoComplete } from "antd"
import produce from "immer"
import {produce} from "immer"
import { dispatch } from '../../../../model'
import { highlightSearchContentByTerms, showMessage } from "../../../../util"
......
......@@ -27,9 +27,9 @@ const FC = (props) => {
callback: data => {
setWaiting(false)
if (type === 'notice') {
window.open(`/data-govern/data-model-action?${Action}=edit&${ModelerId}=${item?.id}&${ModelerMergeId}=${data?.id}&${ConflictItemId}=${item?.conflictItemId}`);
window.open(`/data-govern-bj/data-model-action?${Action}=edit&${ModelerId}=${item?.id}&${ModelerMergeId}=${data?.id}&${ConflictItemId}=${item?.conflictItemId}`);
} else {
window.open(`/data-govern/data-model-action?${Action}=edit&${ModelerId}=${item?.id}&${ModelerMergeId}=${data?.id}`);
window.open(`/data-govern-bj/data-model-action?${Action}=edit&${ModelerId}=${item?.id}&${ModelerMergeId}=${data?.id}`);
}
},
error: () => {
......
......@@ -4,7 +4,7 @@ import { useDebounceEffect } from "ahooks"
import { dispatch } from '../../../../model'
import Table from '../../ResizeableTable'
import produce from 'immer'
import { produce } from 'immer'
import { paginate } from '../../../../util'
import { ModelTree } from './model-compare-select-model'
......
......@@ -4,7 +4,7 @@ import { useDebounceEffect } from "ahooks"
import { dispatch } from '../../../../model'
import Table from '../../ResizeableTable'
import produce from 'immer'
import { produce } from 'immer'
import { highlightSearchContentByTerms, paginate, showMessage } from '../../../../util'
import MetadataCompare from './metadata-compare'
import { viewModes } from './ModelTree'
......
......@@ -4,7 +4,7 @@ import { useDebounceEffect } from "ahooks"
import { dispatch } from '../../../../model'
import Table from '../../ResizeableTable'
import produce from 'immer'
import { produce } from 'immer'
import { highlightSearchContentByTerms, paginate, showMessage } from '../../../../util'
import ModelCompare from './model-compare'
import { viewModes } from './ModelTree'
......
import React from 'react'
import { Modal, Button, Select, Space, Input, Tooltip } from 'antd'
import produce from 'immer'
import { produce } from 'immer'
import { dispatch } from '../../../../model'
import Table from '../../../../util/Component/Table'
......
......@@ -5,7 +5,7 @@ import { useDebounceEffect } from 'ahooks'
import { isSzseEnv, showMessage, showNotifaction } from '../../../../util'
import Table from '../../../../util/Component/Table'
import produce from 'immer'
import { produce } from 'immer'
import { Action, CatalogId, Editable, ModelerId, PermitCheckOut, ReadOnly, StateId } from '../../../../util/constant'
import { dispatch } from '../../../../model'
......@@ -328,7 +328,7 @@ const List = React.forwardRef(function ({ items }, ref) {
<Typography.Paragraph ellipsis={{
rows: 3,
}}><a onClick={() => {
window.open(`/data-govern/data-model-action?${Action}=detail&${ModelerId}=${record.id}&${PermitCheckOut}=${record.permitCheckOut||false}&${Editable}=${record.editable||false}&${StateId}=${record.state?.id||''}&${ReadOnly}=false`);
window.open(`/data-govern-bj/data-model-action?${Action}=detail&${ModelerId}=${record.id}&${PermitCheckOut}=${record.permitCheckOut||false}&${Editable}=${record.editable||false}&${StateId}=${record.state?.id||''}&${ReadOnly}=false`);
}}>{text}</a></Typography.Paragraph>
</Tooltip>
)
......
......@@ -4,7 +4,7 @@ import {
EllipsisOutlined,
PlusOutlined,
} from '@ant-design/icons'
import produce from 'immer'
import { produce } from 'immer'
import DataQuality, { DataQualityFeighTagSelect } from '../../../QianKun/data-quality'
import { showMessage } from '../../../../util'
......@@ -25,7 +25,7 @@ const FC = ({ type, id, did, tags, onChange }) => {
const storageChange = (e) => {
if (e.key === 'tagChangeEvent' && e.id === id) {
getTags()
// getTags()
}
}
......@@ -36,22 +36,22 @@ const FC = ({ type, id, did, tags, onChange }) => {
}
}, [type, id])
const getTags = () => {
dispatch({
type: 'tag.getResourceTagIn',
payload: {
params: {
resourceIds: id,
includeAll: true,
includePrivate: true
}
},
callback: data => {
setData(data?.data?.[`${id}`]);
onChange?.(data?.data?.[`${id}`]);
}
});
}
// const getTags = () => {
// dispatch({
// type: 'tag.getResourceTagIn',
// payload: {
// params: {
// resourceIds: id,
// includeAll: true,
// includePrivate: true
// }
// },
// callback: data => {
// setData(data?.data?.[`${id}`]);
// onChange?.(data?.data?.[`${id}`]);
// }
// });
// }
//资产或者资源详情里的标签同步
const syncTag = () => {
......@@ -68,7 +68,7 @@ const FC = ({ type, id, did, tags, onChange }) => {
<TagCell
value={data}
onChange={(val) => {
getTags()
// getTags()
syncTag()
}}
onAdd={(val) => {
......@@ -88,7 +88,7 @@ const FC = ({ type, id, did, tags, onChange }) => {
})
}}
onChange={(val) => {
getTags()
// getTags()
syncTag()
}}
{...tagSelectPopupParams}
......
......@@ -4,7 +4,7 @@ import {
EllipsisOutlined,
PlusOutlined,
} from '@ant-design/icons'
import produce from 'immer'
import { produce } from 'immer'
import { showMessage } from '../../../../util'
import { dispatch } from '../../../../model'
......@@ -25,7 +25,7 @@ const FC = ({ type, id, did, tags, onChange }) => {
const storageChange = (e) => {
if (e.key === 'tagChangeEvent' && e.id === id) {
getTags()
// getTags()
}
}
......@@ -36,29 +36,29 @@ const FC = ({ type, id, did, tags, onChange }) => {
}
}, [type, id])
const getTags = () => {
dispatch({
type: 'tag.getResourceTagIn',
payload: {
params: {
resourceIds: id,
includeAll: true,
includePrivate: true
}
},
callback: data => {
setData(data?.data?.[`${id}`]);
onChange?.(data?.data?.[`${id}`]);
}
});
}
// const getTags = () => {
// dispatch({
// type: 'tag.getResourceTagIn',
// payload: {
// params: {
// resourceIds: id,
// includeAll: true,
// includePrivate: true
// }
// },
// callback: data => {
// setData(data?.data?.[`${id}`]);
// onChange?.(data?.data?.[`${id}`]);
// }
// });
// }
return (
<React.Fragment>
<TagCell
value={data}
onChange={(val) => {
getTags()
// getTags()
}}
onAdd={(val) => {
setTagSelectPopupParams({
......@@ -77,7 +77,7 @@ const FC = ({ type, id, did, tags, onChange }) => {
})
}}
onChange={(val) => {
getTags()
// getTags()
}}
{...tagSelectPopupParams}
/>
......
......@@ -2,7 +2,7 @@ import React from 'react'
import { Modal, Button, Spin, Form, Input, Select, } from 'antd'
import { useDebounceEffect } from 'ahooks'
import { SettingOutlined } from '@ant-design/icons'
import produce from 'immer'
import { produce } from 'immer'
import { dispatch } from '../../../../model'
import { AppContext } from '../../../../App'
......
......@@ -377,7 +377,7 @@ class Model extends React.Component {
currentBranchId = catalogId
}
window.open(`/data-govern/data-model-action?${Action}=${importModalAction}&${CatalogId}=${currentCatalogId}&${ModelerId}=${modelerId}&${PermitCheckOut}=${record.permitCheckOut||false}&${Editable}=${record.editable||false}&${StateId}=${record.state?.id||''}&${ReadOnly}=${readOnly}&${BranchId}=${currentBranchId}`);
window.open(`/data-govern-bj/data-model-action?${Action}=${importModalAction}&${CatalogId}=${currentCatalogId}&${ModelerId}=${modelerId}&${PermitCheckOut}=${record.permitCheckOut||false}&${Editable}=${record.editable||false}&${StateId}=${record.state?.id||''}&${ReadOnly}=${readOnly}&${BranchId}=${currentBranchId}`);
});
}
......@@ -444,7 +444,7 @@ class Model extends React.Component {
onImportUnconditionBtnClick = () => {
const { catalogId, currentView } = this.state;
window.open(`/data-govern/data-model-action?${Action}=add&${CatalogId}=${(currentView==='dir')?(catalogId||''):''}`);
window.open(`/data-govern-bj/data-model-action?${Action}=add&${CatalogId}=${(currentView==='dir')?(catalogId||''):''}`);
}
onExportDDLBtnClick = () => {
......@@ -536,11 +536,11 @@ class Model extends React.Component {
if ((hints||[]).length > 0) {
setTimeout(() => {
window.open(`/data-govern/data-model-action?${Action}=add&${CatalogId}=${currentCatalogId}&${Hints}=${encodeURIComponent((hints||[]).join(','))}&${BranchId}=${branchId}`);
window.open(`/data-govern-bj/data-model-action?${Action}=add&${CatalogId}=${currentCatalogId}&${Hints}=${encodeURIComponent((hints||[]).join(','))}&${BranchId}=${branchId}`);
}, 1000);
} else {
setTimeout(() => {
window.open(`/data-govern/data-model-action?${Action}=add&${CatalogId}=${currentCatalogId}&${BranchId}=${branchId}`);
window.open(`/data-govern-bj/data-model-action?${Action}=add&${CatalogId}=${currentCatalogId}&${BranchId}=${branchId}`);
}, 1000);
}
}
......@@ -572,7 +572,7 @@ class Model extends React.Component {
}
wordData.content.slice(0, 5).forEach(data => {
window.open(`/data-govern/data-model-action?${Action}=add&${CatalogId}=${currentCatalogId}&${BranchId}=${branchId}&${ModelerData}=${encodeURIComponent(JSON.stringify(data))}`, '_blank');
window.open(`/data-govern-bj/data-model-action?${Action}=add&${CatalogId}=${currentCatalogId}&${BranchId}=${branchId}&${ModelerData}=${encodeURIComponent(JSON.stringify(data))}`, '_blank');
})
}, 2000);
......@@ -597,7 +597,7 @@ class Model extends React.Component {
branchId = catalogId
}
window.open(`/data-govern/data-model-action?${Action}=add&${CatalogId}=${currentCatalogId}&${BranchId}=${branchId}&${DDL}=${encodeURIComponent(ddl)}`, '_blank');
window.open(`/data-govern-bj/data-model-action?${Action}=add&${CatalogId}=${currentCatalogId}&${BranchId}=${branchId}&${DDL}=${encodeURIComponent(ddl)}`, '_blank');
}, 1000);
}
......
......@@ -7,7 +7,7 @@ import { defaultPage } from '../../../util/hooks/page'
import { generateUUID, inputWidth, openMetadataDetail, openModelDetail, paginate, showMessage } from '../../../util'
import './result-detail.less'
import produce from 'immer'
import { produce } from 'immer'
const FC = (props) => {
const { visible, item, onCancel} = props
......
......@@ -2,7 +2,7 @@ import React from 'react'
import { Button, Modal, Spin, Space, Divider, Form, Row, Col, Input, Select, Checkbox, Radio, Switch, TimePicker, Tooltip, TreeSelect, Typography } from 'antd'
import { useClickAway } from 'ahooks'
import moment from 'moment'
import produce from 'immer'
import { produce } from 'immer'
import { CloseOutlined } from '@ant-design/icons';
import { dispatch } from '../../../model'
......
......@@ -158,11 +158,11 @@ const TemplateCURD = (props) => {
}
const editItem = (record) => {
window.open(`/data-govern/model-template-action?${Action}=edit&${TemplateId}=${record.id}`);
window.open(`/data-govern-bj/model-template-action?${Action}=edit&${TemplateId}=${record.id}`);
}
const detailItem = (record) => {
window.open(`/data-govern/model-template-action?${Action}=detail&${TemplateId}=${record.id}`);
window.open(`/data-govern-bj/model-template-action?${Action}=detail&${TemplateId}=${record.id}`);
}
const deleteItem = (record) => {
......@@ -187,7 +187,7 @@ const TemplateCURD = (props) => {
}
const onAddClick = () => {
window.open(`/data-govern/model-template-action?${Action}=add`);
window.open(`/data-govern-bj/model-template-action?${Action}=add`);
}
return (
......
import React from 'react'
import produce from 'immer'
import { produce } from 'immer'
import { Modal, Tooltip, Button, Spin, Space } from 'antd'
import { PlusOutlined, ReloadOutlined } from '@ant-design/icons'
......
import React from "react"
import { Space, Button, Descriptions, Form, Input, Tooltip, Typography, Select, Spin, Modal } from "antd"
import produce from "immer"
import {produce} from "immer"
import Table from '../../../util/Component/Table'
import { isSzseEnv, getQueryParam, showMessage, showNotifaction } from "../../../util"
......
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