wip fix page
This commit is contained in:
parent
680a433734
commit
1d6ed73f2b
|
|
@ -175,7 +175,7 @@ export const EdPopPage = () => {
|
|||
id: opt.dragSourceId as string,
|
||||
},
|
||||
data: {
|
||||
parent_id: (opt.dropTargetId === "ROOT" ||
|
||||
parent_id: (opt.dropTargetId === "root" ||
|
||||
!opt.dropTargetId
|
||||
? null
|
||||
: opt.dropTargetId) as string,
|
||||
|
|
|
|||
|
|
@ -17,7 +17,8 @@ export const pagePicker = {
|
|||
status: "ready" as "loading" | "ready",
|
||||
search: "",
|
||||
render: () => {},
|
||||
rename_id: ""
|
||||
rename_id: "",
|
||||
new_parent_id: ""
|
||||
};
|
||||
|
||||
export const reloadPagePicker = async (p: PG) => {
|
||||
|
|
|
|||
|
|
@ -76,9 +76,12 @@ export const edPageTreeRender: NodeRender<PageItem> = (
|
|||
data: {
|
||||
name: local.rename_to,
|
||||
id_site: p.site.id,
|
||||
parent_id: validate(rename_id) ? rename_id : null,
|
||||
parent_id: validate(pagePicker.new_parent_id)
|
||||
? pagePicker.new_parent_id
|
||||
: null,
|
||||
},
|
||||
});
|
||||
pagePicker.new_parent_id = "";
|
||||
}
|
||||
} else {
|
||||
await db.page_folder.update({
|
||||
|
|
@ -126,7 +129,9 @@ export const edPageTreeRender: NodeRender<PageItem> = (
|
|||
type: "folder",
|
||||
},
|
||||
});
|
||||
|
||||
pagePicker.rename_id = "NEW";
|
||||
pagePicker.new_parent_id = item.id;
|
||||
p.render();
|
||||
}}
|
||||
>
|
||||
|
|
|
|||
|
|
@ -251,14 +251,16 @@ export const PageManager = () => {
|
|||
data.pages = newTree;
|
||||
local.render();
|
||||
|
||||
const is_drop_root =
|
||||
opt.dropTargetId === "ROOT" || opt.dropTargetId === "root";
|
||||
|
||||
if (!opt.dragSource?.droppable) {
|
||||
await db.page.update({
|
||||
where: {
|
||||
id: opt.dragSourceId as string,
|
||||
},
|
||||
data: {
|
||||
id_folder: (opt.dropTargetId === "ROOT" ||
|
||||
!opt.dropTargetId
|
||||
id_folder: (is_drop_root || !opt.dropTargetId
|
||||
? null
|
||||
: opt.dropTargetId) as string,
|
||||
},
|
||||
|
|
@ -270,8 +272,7 @@ export const PageManager = () => {
|
|||
id: opt.dragSourceId as string,
|
||||
},
|
||||
data: {
|
||||
parent_id: (opt.dropTargetId === "ROOT" ||
|
||||
!opt.dropTargetId
|
||||
parent_id: (is_drop_root || !opt.dropTargetId
|
||||
? null
|
||||
: opt.dropTargetId) as string,
|
||||
},
|
||||
|
|
@ -643,11 +644,9 @@ const Elbow = () => (
|
|||
xmlns="http://www.w3.org/2000/svg"
|
||||
width={10}
|
||||
height={10}
|
||||
className={cx(
|
||||
css`
|
||||
className={cx(css`
|
||||
opacity: 0.3;
|
||||
`
|
||||
)}
|
||||
`)}
|
||||
fill="none"
|
||||
viewBox="0 0 15 15"
|
||||
>
|
||||
|
|
|
|||
Loading…
Reference in New Issue