Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
szse
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhaochengxiang
szse
Commits
483018e8
Commit
483018e8
authored
Dec 05, 2023
by
zhaochengxiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
版本回退
parent
b1019481
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
46 additions
and
2 deletions
+46
-2
datamodel.js
src/model/datamodel.js
+4
-0
datamodeler.js
src/service/datamodeler.js
+4
-0
EditModel.jsx
src/view/Manage/Model/Component/EditModel.jsx
+38
-2
No files found.
src/model/datamodel.js
View file @
483018e8
...
@@ -206,6 +206,10 @@ export function* getCheckoutDataModel(payload) {
...
@@ -206,6 +206,10 @@ export function* getCheckoutDataModel(payload) {
return
yield
call
(
datamodelerService
.
getCheckoutDataModel
,
payload
);
return
yield
call
(
datamodelerService
.
getCheckoutDataModel
,
payload
);
}
}
export
function
*
dataModelRollback
(
payload
)
{
return
yield
call
(
datamodelerService
.
dataModelRollback
,
payload
);
}
export
function
*
getDataModelLocation
(
payload
)
{
export
function
*
getDataModelLocation
(
payload
)
{
return
yield
call
(
datamodelerService
.
getDataModelLocation
,
payload
);
return
yield
call
(
datamodelerService
.
getDataModelLocation
,
payload
);
}
}
...
...
src/service/datamodeler.js
View file @
483018e8
...
@@ -197,6 +197,10 @@ export function getCheckoutDataModel(payload) {
...
@@ -197,6 +197,10 @@ export function getCheckoutDataModel(payload) {
return
GetJSON
(
"/shandatamodeler/easyDataModelerCURD/getCheckoutDataModel"
,
payload
);
return
GetJSON
(
"/shandatamodeler/easyDataModelerCURD/getCheckoutDataModel"
,
payload
);
}
}
export
function
dataModelRollback
(
payload
)
{
return
PostJSON
(
"/shandatamodeler/easyDataModelerCURD/reset"
,
payload
);
}
export
function
ddlGenerators
()
{
export
function
ddlGenerators
()
{
return
GetJSON
(
"/shandatamodeler/easyDataModelerExport/ddlGenerators"
);
return
GetJSON
(
"/shandatamodeler/easyDataModelerExport/ddlGenerators"
);
}
}
...
...
src/view/Manage/Model/Component/EditModel.jsx
View file @
483018e8
import
React
,
{
useState
,
useEffect
,
useRef
}
from
'react'
;
import
React
,
{
useState
,
useEffect
,
useRef
}
from
'react'
;
import
{
Form
,
Button
,
Space
,
Tooltip
}
from
'antd'
;
import
{
Form
,
Button
,
Space
,
Tooltip
,
Modal
}
from
'antd'
;
import
LocalStorage
from
'local-storage'
;
import
LocalStorage
from
'local-storage'
;
import
{
useMount
,
useUnmount
}
from
'ahooks'
;
import
{
useMount
,
useUnmount
}
from
'ahooks'
;
import
ImportAction
from
'./ImportAction'
;
import
ImportAction
from
'./ImportAction'
;
import
CatalogModal
from
'./CatalogModal'
;
import
CatalogModal
from
'./CatalogModal'
;
import
{
dispatchLatest
}
from
'../../../../model'
;
import
{
dispatchLatest
,
dispatch
}
from
'../../../../model'
;
import
{
getQueryParam
,
showMessage
,
showNotifaction
}
from
'../../../../util'
;
import
{
getQueryParam
,
showMessage
,
showNotifaction
}
from
'../../../../util'
;
import
{
Action
,
CatalogId
,
ModelerId
,
Hints
,
ModelerData
,
PermitCheckOut
,
Editable
,
StateId
,
VersionId
,
Holder
,
DDL
,
ReadOnly
}
from
'../../../../util/constant'
;
import
{
Action
,
CatalogId
,
ModelerId
,
Hints
,
ModelerData
,
PermitCheckOut
,
Editable
,
StateId
,
VersionId
,
Holder
,
DDL
,
ReadOnly
}
from
'../../../../util/constant'
;
import
HistoryAndVersionDrawer
from
'./HistoryAndVersionDrawer'
;
import
HistoryAndVersionDrawer
from
'./HistoryAndVersionDrawer'
;
...
@@ -35,6 +35,7 @@ const EditModel = (props) => {
...
@@ -35,6 +35,7 @@ const EditModel = (props) => {
const
{
action
,
catalogId
,
modelerId
,
hints
,
roughModelerData
,
permitCheckOut
,
editable
,
stateId
,
versionId
,
holder
,
ddl
,
readOnly
}
=
actionData
;
const
{
action
,
catalogId
,
modelerId
,
hints
,
roughModelerData
,
permitCheckOut
,
editable
,
stateId
,
versionId
,
holder
,
ddl
,
readOnly
}
=
actionData
;
const
[
form
]
=
Form
.
useForm
();
const
[
form
]
=
Form
.
useForm
();
const
[
modal
,
contextHolder
]
=
Modal
.
useModal
()
const
importActionRef
=
useRef
(
undefined
);
const
importActionRef
=
useRef
(
undefined
);
useEffect
(()
=>
{
useEffect
(()
=>
{
...
@@ -261,6 +262,32 @@ const EditModel = (props) => {
...
@@ -261,6 +262,32 @@ const EditModel = (props) => {
setHistoryAndVersionDrawerVisible
(
false
);
setHistoryAndVersionDrawerVisible
(
false
);
}
}
const
onRollback
=
()
=>
{
modal
.
confirm
({
title
:
'提示'
,
content
:
'确定将该版本创建为新的草稿吗?'
,
onOk
:
()
=>
{
setConfirmLoading
(
true
);
dispatch
({
type
:
'datamodel.dataModelRollback'
,
payload
:
{
params
:
{
easyDataModelerDataModelId
:
modelerId
,
modelVersionId
:
versionId
,
}
},
callback
:
data
=>
{
setConfirmLoading
(
false
);
showMessage
(
'success'
,
'版本回退成功'
)
},
error
:
()
=>
{
setConfirmLoading
(
false
);
}
})
}
})
}
const
attrIsEditingFunction
=
(
value
)
=>
{
const
attrIsEditingFunction
=
(
value
)
=>
{
attrIsEditingRef
.
current
=
value
;
attrIsEditingRef
.
current
=
value
;
}
}
...
@@ -430,6 +457,14 @@ const EditModel = (props) => {
...
@@ -430,6 +457,14 @@ const EditModel = (props) => {
}
}
</
Space
>
</
Space
>
);
);
}
else
if
(
action
===
'detail-version'
)
{
actionsBtn
=
(
<
Space
>
<
Button
type=
'primary'
danger
onClick=
{
onRollback
}
>
回退到该版本
</
Button
>
</
Space
>
)
}
}
return
(
return
(
...
@@ -469,6 +504,7 @@ const EditModel = (props) => {
...
@@ -469,6 +504,7 @@ const EditModel = (props) => {
}
}
}
}
}
}
/>
/>
{
contextHolder
}
</
div
>
</
div
>
</
EditModelContext
.
Provider
>
</
EditModelContext
.
Provider
>
);
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment