wip fix
This commit is contained in:
parent
0bdffb4b3a
commit
9ac42edde0
File diff suppressed because one or more lines are too long
|
|
@ -35,13 +35,15 @@ export const EdTreeAction = ({
|
|||
e.stopPropagation();
|
||||
const meta = getMetaById(p, item.id);
|
||||
if (meta) meta.mitem?.set("hidden", false);
|
||||
treeRebuild(p, { note: "show" });
|
||||
p.render();
|
||||
}}
|
||||
>
|
||||
<HideAll />
|
||||
<HideEditor />
|
||||
</div>
|
||||
</Tooltip>
|
||||
)}
|
||||
{item.hidden === "only-editor" && (
|
||||
{/* {item.hidden === "only-editor" && (
|
||||
<Tooltip content="Hidden: Only Editor">
|
||||
<div
|
||||
className="mx-1 cursor-pointer hover:opacity-60"
|
||||
|
|
@ -54,7 +56,7 @@ export const EdTreeAction = ({
|
|||
<HideEditor />
|
||||
</div>
|
||||
</Tooltip>
|
||||
)}
|
||||
)} */}
|
||||
|
||||
{(!comp.enabled || (comp.enabled && comp.id === active.comp_id)) && (
|
||||
<Tooltip
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
import { IContent } from "../../../../../../../utils/types/general";
|
||||
import { getMetaById } from "../../../../../logic/active/get-meta";
|
||||
import { PG } from "../../../../../logic/ed-global";
|
||||
import { treeRebuild } from "../../../../../logic/tree/build";
|
||||
|
||||
export const edActionHide = (
|
||||
p: PG,
|
||||
|
|
@ -10,13 +11,8 @@ export const edActionHide = (
|
|||
const mitem = getMetaById(p, item.id)?.mitem;
|
||||
if (mitem) {
|
||||
const hidden = mitem.get("hidden");
|
||||
if (mode === "toggle") {
|
||||
if (!hidden) mitem.set("hidden", "only-editor");
|
||||
else mitem.delete("hidden");
|
||||
} else {
|
||||
if (!hidden) mitem.set("hidden", "all");
|
||||
else if (hidden === "all") mitem.set("hidden", "only-editor");
|
||||
else if (hidden === "only-editor") mitem.delete("hidden");
|
||||
}
|
||||
else mitem.delete("hidden");
|
||||
treeRebuild(p, { note: "hidden" });
|
||||
}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ export const instantiate = (arg: {
|
|||
if (item.id) {
|
||||
newitem.id = item.id;
|
||||
}
|
||||
newitem.hidden = item.hidden;
|
||||
|
||||
if (newitem.component) {
|
||||
if (newitem.component.props && item.component) {
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ import { ErrorBox } from "../utils/error-box";
|
|||
import { ViGlobal } from "./global";
|
||||
import { viParts } from "./parts";
|
||||
import { ViScript } from "./script";
|
||||
import get from "lodash.get";
|
||||
|
||||
const MAX_RENDER_IN_SECOND = 70;
|
||||
export const render_stat = {
|
||||
|
|
@ -57,7 +58,6 @@ export const ViRender: FC<{
|
|||
if (meta.item.hidden) return null;
|
||||
|
||||
if (meta.item.adv?.js || meta.item.component?.id) {
|
||||
|
||||
return (
|
||||
<ErrorBox meta={meta}>
|
||||
<ViScript
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ import { updatePropScope } from "./eval-prop";
|
|||
import { extractNavigate } from "./extract-nav";
|
||||
import { createViLocal } from "./local";
|
||||
import { createViPassProp } from "./passprop";
|
||||
|
||||
import get from "lodash.get";
|
||||
export const viEvalScript = (
|
||||
vi: {
|
||||
page: VG["page"];
|
||||
|
|
@ -61,6 +61,7 @@ export const viEvalScript = (
|
|||
...passprop,
|
||||
};
|
||||
|
||||
|
||||
if (typeof passprop === "object") {
|
||||
for (const [k, v] of Object.entries(passprop)) {
|
||||
if (typeof v === "object" && v && (v as any)._jsx) {
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ import { VG } from "../global";
|
|||
import { ViRender } from "../render";
|
||||
|
||||
export const createViPassProp = (
|
||||
vi: { meta: VG["meta"] },
|
||||
vi: { meta: VG["meta"]; render: () => void },
|
||||
is_layout: boolean,
|
||||
meta: IMeta,
|
||||
passprop: any
|
||||
|
|
@ -52,9 +52,17 @@ export const createViPassProp = (
|
|||
}
|
||||
if (is_meta) {
|
||||
return children.map((item) => {
|
||||
const cmeta = vi.meta[item.id];
|
||||
let cmeta = vi.meta[item.id];
|
||||
|
||||
if (!cmeta) {
|
||||
vi.meta[item.id] = { item };
|
||||
cmeta = vi.meta[item.id];
|
||||
}
|
||||
|
||||
if (cmeta) {
|
||||
if (Object.keys(cmeta.item).length === 1 && cmeta.mitem) {
|
||||
cmeta.item = cmeta.mitem.toJSON() as any;
|
||||
}
|
||||
return (
|
||||
<ViRender
|
||||
key={item.id}
|
||||
|
|
|
|||
|
|
@ -49,6 +49,7 @@ export const Vi: FC<{
|
|||
vi.entry = entry;
|
||||
vi.on_preload = on_preload;
|
||||
|
||||
|
||||
w.siteurl = (pathname: string, forceOriginal?: boolean) => {
|
||||
if (pathname.startsWith("http://") || pathname.startsWith("https://"))
|
||||
return pathname;
|
||||
|
|
|
|||
Loading…
Reference in New Issue