fix
This commit is contained in:
parent
afed8e9d40
commit
630812a7f4
|
|
@ -1,5 +1,4 @@
|
|||
import { GFCol } from "lib/gen/utils";
|
||||
import { parseGenField } from "../../../..";
|
||||
import { GFCol, parseGenField } from "lib/gen/utils";
|
||||
import { getFilter } from "../utils/get-filter";
|
||||
import { parseSingleFilter } from "./single-filter";
|
||||
import { softDeleteFilter } from "./soft-delete-filter";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
import { getPathname } from "../../../..";
|
||||
import { getPathname } from "lib/utils/pathname";
|
||||
import { filter_window } from "./types";
|
||||
|
||||
export const getFilter = (name: string) => {
|
||||
|
|
|
|||
|
|
@ -317,7 +317,6 @@ export const genTableEdit = async (
|
|||
name: "btn-submit",
|
||||
type: "item",
|
||||
edit: null as any,
|
||||
padding: { b: 10, l: 10, r: 10, t: 0 },
|
||||
childs: [
|
||||
{
|
||||
id: createId(),
|
||||
|
|
|
|||
|
|
@ -150,6 +150,7 @@ export type FieldInternal<T extends FieldProp["type"]> = {
|
|||
disabled: boolean;
|
||||
required_msg: FieldProp["required_msg"];
|
||||
col?: GFCol;
|
||||
ref?: any;
|
||||
Child: () => ReactNode;
|
||||
custom: FieldProp["custom"];
|
||||
input: Record<string, any> & {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
import { GenFn } from "lib/gen/utils";
|
||||
import { generateList } from "./md-list";
|
||||
import { generateForm } from "../../../..";
|
||||
import { generateMDForm } from "./md-form";
|
||||
import { generateList } from "./md-list";
|
||||
|
||||
const w = window as unknown as {
|
||||
generating_prasi_md: Record<string, true>;
|
||||
|
|
|
|||
|
|
@ -43,27 +43,28 @@ export interface ButtonProps
|
|||
asChild?: boolean;
|
||||
}
|
||||
|
||||
const Button = React.forwardRef<HTMLDivElement, ButtonProps>(
|
||||
({ className, variant, size, asChild = false, ...props }, ref) => {
|
||||
const Comp = asChild ? Slot : "button";
|
||||
const Button = React.forwardRef<
|
||||
HTMLDivElement | HTMLButtonElement,
|
||||
ButtonProps
|
||||
>(({ className, variant, size, asChild = false, ...props }, ref) => {
|
||||
const Comp = asChild ? Slot : "button";
|
||||
|
||||
return (
|
||||
<div
|
||||
className={cn(
|
||||
buttonVariants({ variant, size, className }),
|
||||
`btn-${variant || "default"} btn c-transition-all c-duration-300`,
|
||||
css`
|
||||
> div {
|
||||
border-radius: calc(var(--radius) - 2px);
|
||||
}
|
||||
`
|
||||
)}
|
||||
ref={ref}
|
||||
{...props}
|
||||
/>
|
||||
);
|
||||
}
|
||||
);
|
||||
return (
|
||||
<div
|
||||
className={cn(
|
||||
buttonVariants({ variant, size, className }),
|
||||
`btn-${variant || "default"} btn c-transition-all c-duration-300`,
|
||||
css`
|
||||
> div {
|
||||
border-radius: calc(var(--radius) - 2px);
|
||||
}
|
||||
`
|
||||
)}
|
||||
ref={ref as any}
|
||||
{...props}
|
||||
/>
|
||||
);
|
||||
});
|
||||
Button.displayName = "Button";
|
||||
|
||||
const FloatButton = React.forwardRef<HTMLDivElement, ButtonProps>(
|
||||
|
|
|
|||
Loading…
Reference in New Issue