gomtm 0.0.350 → 0.0.352

package/dist/esm/curd/CurdView.js

@@ -37,11 +37,8 @@ import { createStore, useStore } from "zustand";
 import { useSuspenseQuery } from "../connectquery";
 import { curdViewGet } from "../gomtmpb/mtm/sppb/mtm-MtmService_connectquery";
 import { CurdView } from "../gomtmpb/mtm/sppb/mtm_pb";
-import CurdCreatePanel from "./create/CurdCreatePanel";
-import CurdEditPanel from "./edit/CurdEditPanel";
 import { CommonListView } from "./listview/CommonListView";
 import { ListViewStoreProvider } from "./listview/list-store";
-import { PanelRemove } from "./remove/RemovePanel";
 const createListviewStore = (initProps) => {
   const DEFAULT_PROPS = {
     backendUrl: "",
@@ -85,7 +82,7 @@ const CurdViewView = (props) => {
         return /* @__PURE__ */ jsx("div", { children: "missing curd data222" });
       }
       const curdViewData = query.data.item.value;
-      return /* @__PURE__ */ jsx(CurdViewProvider, { curdView: curdViewData, children: /* @__PURE__ */ jsxs(
+      return /* @__PURE__ */ jsx(CurdViewProvider, { curdView: curdViewData, children: /* @__PURE__ */ jsx(
         ListViewStoreProvider,
         {
           slugPath: "/post",
@@ -97,14 +94,7 @@ const CurdViewView = (props) => {
           methodDelete: curdViewData.methodDelete,
           viewUpdate: curdViewData.routeEdit,
           viewCreate: curdViewData.routeCreate,
-          children: [
-            /* @__PURE__ */ jsx(Suspense, { fallback: /* @__PURE__ */ jsx("div", { children: "loading CommonListView" }), children: /* @__PURE__ */ jsx(CommonListView, {}) }),
-            /* @__PURE__ */ jsxs(Suspense, { children: [
-              /* @__PURE__ */ jsx(CurdCreatePanel, { fullScreen: true }),
-              /* @__PURE__ */ jsx(CurdEditPanel, { fullScreen: true }),
-              /* @__PURE__ */ jsx(PanelRemove, {})
-            ] })
-          ]
+          children: /* @__PURE__ */ jsx(Suspense, { fallback: /* @__PURE__ */ jsx("div", { children: "loading CommonListView" }), children: /* @__PURE__ */ jsx(CommonListView, {}) })
         }
       ) });
   }

package/dist/esm/curd/edit/CurdEditPanel.d.ts

@@ -1,4 +1,2 @@
 /// <reference types="react" />
-export default function CurdEditPanel(props: {
-    fullScreen?: boolean;
-}): import("react").JSX.Element | null | undefined;
+export default function CurdEditPanel(props: {}): import("react").JSX.Element | null | undefined;

package/dist/esm/curd/edit/CurdEditPanel.js

@@ -1,35 +1,42 @@
 "use client";
-import { jsx, jsxs } from "react/jsx-runtime";
+import { Fragment, jsx } from "react/jsx-runtime";
 import { useMtRouter } from "mtxuilib/hooks/use-router";
-import { Dialog, DialogContent, DialogTitle } from "mtxuilib/ui/dialog";
-import { FullScreenPanel } from "mtxuilib/ui/ui-mt/FullScreenEditPanel";
+import { MtPopupPanel } from "mtxuilib/ui/ui-mt/MtPopupPanel";
 import { useMemo } from "react";
 import { useGomtmSuspenseQuery } from "../../gomtmQuery";
 import { RenderViewByName } from "../DynViews";
+import { useGomtmForm } from "../form-context";
 import { useListview } from "../listview/list-store";
 function CurdEditPanel(props) {
-  const { fullScreen } = props;
-  const setOpenEdit = useListview((x) => x.setOpenEdit);
-  const openEdit = useListview((x) => x.openEdit);
-  const viewUpdate = useListview((x) => x.viewUpdate);
+  const open = useGomtmForm((x) => x.open);
+  const setOpen = useGomtmForm((x) => x.setOpen);
+  const fullScreen = useGomtmForm((x) => x.fullScreen);
+  const viewName = useGomtmForm((x) => x.viewName);
+  const title = useGomtmForm((x) => x.title);
   const router = useMtRouter();
-  if (!openEdit) {
+  if (!open) {
     return null;
   }
-  if (!viewUpdate) {
+  if (!viewName) {
     return /* @__PURE__ */ jsx("div", { children: "missing viewUpdate value" });
   }
-  if (viewUpdate.startsWith("/")) {
-    router.push(viewUpdate);
+  if (viewName.startsWith("/")) {
+    router.push(viewName);
     return;
   }
-  if (fullScreen) {
-    return /* @__PURE__ */ jsx(WithLoadGetData, { children: /* @__PURE__ */ jsx(FullScreenPanel, { children: /* @__PURE__ */ jsx(RenderViewByName, { name: viewUpdate }) }) });
+  if (!viewName) {
+    return /* @__PURE__ */ jsx("div", { children: "missing viewName" });
   }
-  return /* @__PURE__ */ jsx(Dialog, { open: openEdit, onOpenChange: setOpenEdit, children: /* @__PURE__ */ jsxs(DialogContent, { children: [
-    /* @__PURE__ */ jsx(DialogTitle, { children: " Edit " }),
-    /* @__PURE__ */ jsx(RenderViewByName, { name: viewUpdate })
-  ] }) });
+  return /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsx(
+    MtPopupPanel,
+    {
+      open,
+      onOpenChange: setOpen,
+      fullScreen,
+      title,
+      children: /* @__PURE__ */ jsx(RenderViewByName, { name: viewName })
+    }
+  ) });
 }
 const WithLoadGetData = (props) => {
   const { children } = props;

package/dist/esm/curd/form-context.d.ts

@@ -0,0 +1,17 @@
+import { PropsWithChildren } from 'react';
+interface GomtmFormProps {
+    open?: boolean;
+    fullScreen?: boolean;
+    viewName: string;
+    title?: string;
+}
+export interface GomtmFormState extends GomtmFormProps {
+    setOpen: (open: boolean) => void;
+    setFullScreen: (open: boolean) => void;
+    setTitle: (title: string) => void;
+}
+export declare const gomtmFormContext: import("react").Context<import("zustand").StoreApi<GomtmFormState> | null>;
+export declare const GomtmFormProvider: (props: PropsWithChildren<GomtmFormProps>) => import("react").JSX.Element;
+export declare function useGomtmForm<T>(selector: (state: GomtmFormState) => T): T;
+export declare function GomtmFormDebug(): import("react").JSX.Element;
+export {};

package/dist/esm/curd/form-context.js

@@ -0,0 +1,89 @@
+"use client";
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+var __objRest = (source, exclude) => {
+  var target = {};
+  for (var prop in source)
+    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
+      target[prop] = source[prop];
+  if (source != null && __getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
+        target[prop] = source[prop];
+    }
+  return target;
+};
+import { jsx, jsxs } from "react/jsx-runtime";
+import { MtButton } from "mtxuilib/ui/ui-mt/Button";
+import { createContext, useContext, useMemo, useRef } from "react";
+import { useStore } from "zustand";
+import { createStore } from "zustand/vanilla";
+const createGomtmFormStore = (initProps) => {
+  const DEFAULT_PROPS = {
+    open: false,
+    viewName: ""
+  };
+  return createStore()((set, get) => __spreadProps(__spreadValues(__spreadValues({}, DEFAULT_PROPS), initProps), {
+    setOpen: (open) => set({ open }),
+    setFullScreen: (fullScreen) => set({ fullScreen }),
+    setTitle: (title) => set({ title })
+  }));
+};
+const gomtmFormContext = createContext(null);
+const GomtmFormProvider = (props) => {
+  const _a = props, { children } = _a, etc = __objRest(_a, ["children"]);
+  const storeRef = useRef();
+  if (!storeRef.current) {
+    storeRef.current = createGomtmFormStore(props);
+  }
+  useMemo(() => {
+    var _a2;
+    (_a2 = storeRef.current) == null ? void 0 : _a2.setState({ open: props.open });
+  }, [props.open]);
+  useMemo(() => {
+    var _a2;
+    (_a2 = storeRef.current) == null ? void 0 : _a2.setState({ viewName: props.viewName });
+  }, [props.viewName]);
+  return /* @__PURE__ */ jsxs(gomtmFormContext.Provider, { value: storeRef.current, children: [
+    children,
+    /* @__PURE__ */ jsx(GomtmFormDebug, {})
+  ] });
+};
+function useGomtmForm(selector) {
+  const store = useContext(gomtmFormContext);
+  if (!store)
+    throw new Error("useGomtmForm Missing GomtmFormProvider in the tree");
+  return useStore(store, selector);
+}
+function GomtmFormDebug() {
+  const open = useGomtmForm((x) => x.open);
+  const viewName = useGomtmForm((x) => x.viewName);
+  return /* @__PURE__ */ jsxs("div", { children: [
+    /* @__PURE__ */ jsx(MtButton, { onClick: () => {
+    }, children: "forminfo" }),
+    /* @__PURE__ */ jsx("pre", { children: JSON.stringify({ open, viewName }, null, 2) })
+  ] });
+}
+export {
+  GomtmFormDebug,
+  GomtmFormProvider,
+  gomtmFormContext,
+  useGomtmForm
+};

package/dist/esm/curd/list-item/ListViewLayoutRender.js

@@ -186,17 +186,6 @@ const PostCardItemActions = (props) => {
       }
     ) }),
     /* @__PURE__ */ jsxs(DropdownMenuContent, { align: "end", className: "w-[160px]", children: [
-      /* @__PURE__ */ jsx(
-        DropdownMenuItem,
-        {
-          onClick: (e) => {
-            e.preventDefault();
-            setOpenCreate(true);
-            setOpen(false);
-          },
-          children: "create"
-        }
-      ),
       /* @__PURE__ */ jsx(
         DropdownMenuItem,
         {

package/dist/esm/curd/listview/CommonListView.js

@@ -1,14 +1,18 @@
 "use client";
 import { jsx, jsxs } from "react/jsx-runtime";
+import { useMtRouter } from "mtxuilib/hooks/use-router";
 import { Icons } from "mtxuilib/icons/icons";
 import { cn } from "mtxuilib/lib/utils";
 import { DropdownMenu, DropdownMenuContent, DropdownMenuGroup, DropdownMenuItem, DropdownMenuLabel, DropdownMenuSeparator, DropdownMenuTrigger } from "mtxuilib/ui/dropdown-menu";
 import { Pagination, PaginationContent, PaginationEllipsis, PaginationItem, PaginationLink, PaginationNext, PaginationPrevious } from "mtxuilib/ui/pagination";
 import { MtButton } from "mtxuilib/ui/ui-mt/Button";
-import { lazy, useState } from "react";
+import { Suspense, lazy, useCallback, useMemo, useState } from "react";
 import { MtmErrorView } from "../../components/MtmErrorView";
 import { useGomtmSuspenseInfiniteQuery } from "../../gomtmQuery";
+import CurdEditPanel from "../edit/CurdEditPanel";
+import { GomtmFormProvider } from "../form-context";
 import { CommontListResView } from "../list-item/ListViewLayoutRender";
+import { PanelRemove } from "../remove/RemovePanel";
 import { useListview } from "./list-store";
 const ALL_Layouts = [
   "default",
@@ -20,6 +24,31 @@ function CommonListView() {
   const svc = useListview((x) => x.svc);
   const methodList = useListview((x) => x.methodList);
   const paramList = useListview((x) => x.paramsList);
+  const setOpenEdit = useListview((x) => x.setOpenEdit);
+  const openEdit = useListview((x) => x.openEdit);
+  const openCreate = useListview((x) => x.openCreate);
+  const setOpenCreate = useListview((x) => x.setOpenCreate);
+  const viewUpdate = useListview((x) => x.viewUpdate);
+  const viewCreate = useListview((x) => x.viewCreate);
+  const open = openEdit || openCreate;
+  const setOpen = useCallback((open2) => {
+    if (openCreate) {
+      setOpenCreate(false);
+    }
+    if (openEdit) {
+      setOpenEdit(false);
+    }
+  }, [openCreate, openEdit, setOpenCreate, setOpenEdit]);
+  const router = useMtRouter();
+  const viewName = useMemo(() => {
+    if (openCreate) {
+      return viewCreate;
+    }
+    if (openEdit) {
+      return viewUpdate;
+    }
+    return "";
+  }, [openCreate, openEdit, viewCreate, viewUpdate]);
   const listQuery = useGomtmSuspenseInfiniteQuery(svc, methodList, paramList);
   if (!(listQuery == null ? void 0 : listQuery.data)) {
     return null;
@@ -50,7 +79,27 @@ function CommonListView() {
       /* @__PURE__ */ jsx(PaginationItem, { children: /* @__PURE__ */ jsx(PaginationEllipsis, {}) }),
       /* @__PURE__ */ jsx(PaginationItem, { children: /* @__PURE__ */ jsx(PaginationNext, { href: "#" }) })
     ] }) }),
-    /* @__PURE__ */ jsx("div", { className: "absolute right-1 top-1", children: /* @__PURE__ */ jsx(ListViewActions, {}) })
+    /* @__PURE__ */ jsx("div", { className: "absolute right-1 top-1", children: /* @__PURE__ */ jsx(ListViewActions, {}) }),
+    /* @__PURE__ */ jsxs(Suspense, { children: [
+      /* @__PURE__ */ jsx("pre", { children: JSON.stringify({
+        open,
+        viewName,
+        viewUpdate,
+        viewCreate
+      }, null, 2) }),
+      /* @__PURE__ */ jsxs(
+        GomtmFormProvider,
+        {
+          open,
+          fullScreen: true,
+          viewName,
+          children: [
+            /* @__PURE__ */ jsx(CurdEditPanel, {}),
+            /* @__PURE__ */ jsx(PanelRemove, {})
+          ]
+        }
+      )
+    ] })
   ] });
 }
 const ListViewActions = () => {
@@ -63,6 +112,7 @@ const ListViewActions = () => {
       /* @__PURE__ */ jsx(DropdownMenuLabel, { children: "List \u64CD\u4F5C" }),
       /* @__PURE__ */ jsx(DropdownMenuSeparator, {}),
       /* @__PURE__ */ jsx(DropdownMenuGroup, { children: /* @__PURE__ */ jsx(DropdownMenuItem, { onClick: () => {
+        console.log("setOpenCreate");
         setOpenCreate(true);
         setOpen(false);
       }, children: "create" }) }),

package/dist/esm/curd/listview/ListViewRender.js

@@ -2,7 +2,6 @@
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import { CommonListView } from "./CommonListView";
 import { Suspense } from "react";
-import CurdCreatePanel from "../create/CurdCreatePanel";
 import CurdEditPanel from "../edit/CurdEditPanel";
 import { PanelRemove } from "../remove/RemovePanel";
 const ListViewRender = (props) => {
@@ -10,7 +9,6 @@ const ListViewRender = (props) => {
   return /* @__PURE__ */ jsxs(Fragment, { children: [
     /* @__PURE__ */ jsx(CommonListView, {}),
     /* @__PURE__ */ jsxs(Suspense, { children: [
-      /* @__PURE__ */ jsx(CurdCreatePanel, { fullScreen: true }),
       /* @__PURE__ */ jsx(CurdEditPanel, { fullScreen: true }),
       /* @__PURE__ */ jsx(PanelRemove, {})
     ] }),

package/dist/esm/curd/listview/list-store.d.ts

@@ -17,8 +17,8 @@ interface ListViewStateProps {
     layout?: string;
     data?: any;
     error?: any;
-    viewUpdate?: string;
-    viewCreate?: string;
+    viewUpdate: string;
+    viewCreate: string;
     curdView?: PlainMessage<CurdView>;
 }
 export interface ListViewState extends ListViewStateProps {
@@ -34,8 +34,7 @@ export interface ListViewState extends ListViewStateProps {
     setDetailData: (detailData: any) => void;
 }
 export declare const listViewContext: import("react").Context<import("zustand").StoreApi<ListViewState> | null>;
-type BearProviderProps = React.PropsWithChildren<ListViewStateProps>;
-export declare const ListViewStoreProvider: (props: BearProviderProps) => import("react").JSX.Element;
+export declare const ListViewStoreProvider: (props: PropsWithChildren<ListViewStateProps>) => import("react").JSX.Element;
 export declare const ListView: (props: Omit<ComponentProps<typeof ListViewStoreProvider>, 'backendUrl'> & PropsWithChildren) => import("react").JSX.Element;
 export declare function useListview<T>(selector: (state: ListViewState) => T): T;
 export declare const useCurdUpdateMutation: () => import("@tanstack/react-query").UseMutationResult<unknown, any, any, any>;

package/dist/esm/curd/listview/list-store.js

@@ -46,7 +46,9 @@ const createListviewStore = (initProps) => {
     methodGet: "",
     methodDelete: "",
     methodCreate: "",
-    backendUrl: ""
+    backendUrl: "",
+    viewUpdate: "",
+    viewCreate: ""
   };
   return createStore()((set, get) => __spreadProps(__spreadValues(__spreadValues({}, DEFAULT_PROPS), initProps), {
     openRemove: false,
@@ -60,27 +62,9 @@ const createListviewStore = (initProps) => {
       setCookie(CONST_cookieListViewLayout, layout);
       return set((state) => ({ layout }));
     },
-    // loadListData: async () => {
-    //   const baseUrl = get().backendUrl || ""
-    //   const apiUrl = (new URL(MTM_API_PREFIX, baseUrl)).toString()
-    //   console.log("loadListData, apiUrl:", apiUrl)
-    //   const data = await goMtmQueryFn({
-    //     svc: get().svc,
-    //     method: get().methodList,
-    //     input: get().paramsList,
-    //     options: {
-    //       url: apiUrl
-    //     }
-    //   })
-    //   set({ data })
-    //   return data
-    // },
     nextPage: () => {
     },
-    // setEditRender: (editRender) => set({ editRender }),
-    // setCreateRender: (createRender) => set({ createRender }),
     setDetailData: (detailData) => set({ detailData })
-    // setEeditorComponentName: (editorComponentName) => set({ editorComponentName }),
   }));
 };
 const listViewContext = createContext(null);

package/dist/esm/form/GoMtmForm.d.ts

@@ -0,0 +1,5 @@
+import { PropsWithChildren } from 'react';
+export declare const GomtmForm: (props: {
+    methodGet: string;
+    methodSutmit: string;
+} & PropsWithChildren) => import("react").JSX.Element;

package/dist/esm/form/GoMtmForm.js

@@ -0,0 +1,31 @@
+"use client";
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+import { jsx } from "react/jsx-runtime";
+import { Form } from "mtxuilib/ui/form";
+import { useForm } from "react-hook-form";
+const GomtmForm = (props) => {
+  const { children } = props;
+  const form = useForm();
+  return /* @__PURE__ */ jsx(Form, __spreadProps(__spreadValues({}, form), { children }));
+};
+export {
+  GomtmForm
+};