Commit 34c70bf5 by 和金晶

中移主数据模块

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