gomtm 0.0.371 → 0.0.373

package/dist/esm/components/curdView/curdViewEditor.js

@@ -51,13 +51,13 @@ const CurdViewContentField = (props) => {
   const { name } = props;
   const form = useFormContext();
   const defaultValues = form.getValues()[name];
-  console.log("defaultValues", defaultValues);
   const contentForm = useForm({
     defaultValues
   });
   useEffect(() => {
     const subscription = contentForm.watch((value) => {
-      form.setValue(name, JSON.stringify(value, null, 2));
+      console.log("value", value);
+      form.setValue(name, value);
     });
     return () => subscription.unsubscribe();
   }, [contentForm, contentForm.watch, form, name]);
@@ -88,6 +88,11 @@ const CurdViewContentField = (props) => {
       /* @__PURE__ */ jsx(FormLabel, { children: "methodUpdate" }),
       /* @__PURE__ */ jsx(FormControl, { children: /* @__PURE__ */ jsx(Input, __spreadValues({ placeholder: "methodUpdate" }, field)) }),
       /* @__PURE__ */ jsx(FormMessage, {})
+    ] }) }),
+    /* @__PURE__ */ jsx(FormField, { control: contentForm.control, name: "methodDelete", render: ({ field }) => /* @__PURE__ */ jsxs(FormItem, { children: [
+      /* @__PURE__ */ jsx(FormLabel, { children: "methodDelete" }),
+      /* @__PURE__ */ jsx(FormControl, { children: /* @__PURE__ */ jsx(Input, __spreadValues({ placeholder: "methodDelete" }, field)) }),
+      /* @__PURE__ */ jsx(FormMessage, {})
     ] }) })
   ] });
 };

package/dist/esm/curd/CurdView.js

@@ -21,7 +21,13 @@ const CurdViewView = (props) => {
       if (!query.data.item.value) {
         return /* @__PURE__ */ jsx("div", { children: "missing curd data222" });
       }
-      return /* @__PURE__ */ jsx(ListViewStoreProvider, { curdView: query.data.item.value, children: /* @__PURE__ */ jsx(Suspense, { fallback: /* @__PURE__ */ jsx("div", { children: "loading CommonListView" }), children: /* @__PURE__ */ jsx(CommonListView, {}) }) });
+      if (!query.data.item.value.content) {
+        return /* @__PURE__ */ jsx("div", { children: "missing curdview content" });
+      }
+      if (!query.data.item.value.content.svcName) {
+        return /* @__PURE__ */ jsx("div", { children: "missing curdview svcName" });
+      }
+      return /* @__PURE__ */ jsx(ListViewStoreProvider, { curdView: query.data.item.value, children: /* @__PURE__ */ jsx(Suspense, { fallback: /* @__PURE__ */ jsx("div", { children: "loading CommonListView" }), children: /* @__PURE__ */ jsx(CommonListView, { curdViewContent: query.data.item.value.content }) }) });
   }
 };
 export {

package/dist/esm/curd/CurdViewSS.js

@@ -27,7 +27,7 @@ import { CurdViewGetReq } from "../gomtmpb/mtm/sppb/curd_pb";
 import { createMtmServiceClient } from "../mtmFetcher";
 import { CurdViewView } from "./CurdView";
 const CurdViewSS = (props) => __async(void 0, null, function* () {
-  var _a, _b;
+  var _a, _b, _c, _d;
   const { name } = props;
   const client = createMtmServiceClient(CurdService);
   const curdViewRes = yield client.curdViewGet(new CurdViewGetReq({
@@ -39,8 +39,11 @@ const CurdViewSS = (props) => __async(void 0, null, function* () {
       curdViewRes.item.value.message
     ] });
   }
-  const svc = ((_a = curdViewRes.item.value) == null ? void 0 : _a.svcName) || "";
-  const methodList = ((_b = curdViewRes.item.value) == null ? void 0 : _b.methodList) || "";
+  const svc = ((_b = (_a = curdViewRes.item.value) == null ? void 0 : _a.content) == null ? void 0 : _b.svcName) || "";
+  if (!svc) {
+    return /* @__PURE__ */ jsx("div", { children: "missing svc name" });
+  }
+  const methodList = ((_d = (_c = curdViewRes.item.value) == null ? void 0 : _c.content) == null ? void 0 : _d.methodList) || "";
   return /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsx(
     PrefetchConnectQuery,
     {

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

@@ -2,10 +2,7 @@
 import { Fragment, jsx } from "react/jsx-runtime";
 import { useMtRouter } from "mtxuilib/hooks/use-router";
 import { MtPopupPanel } from "mtxuilib/ui/ui-mt/MtPopupPanel";
-import { useMemo } from "react";
-import { useGomtmSuspenseQuery } from "../../gomtmQuery";
 import { RenderViewByName } from "../DynViews";
-import { useListview } from "../listview/list-store";
 import { useGomtmForm2 } from "./formStore";
 function CurdEditPanel(props) {
   const gomtmForm = useGomtmForm2();
@@ -34,23 +31,6 @@ function CurdEditPanel(props) {
     }
   ) });
 }
-const WithLoadGetData = (props) => {
-  const { children } = props;
-  const methodGet = useListview((x) => x.curdView.methodGet);
-  const svc = useListview((x) => x.curdView.svcName);
-  const activateItem = useListview((x) => x.activateItem);
-  const setDetailData = useListview((x) => x.setDetailData);
-  const detailQuery = useGomtmSuspenseQuery(svc, methodGet, {
-    id: parseInt(activateItem.id)
-  });
-  useMemo(() => {
-    setDetailData(detailQuery.data);
-  }, [detailQuery.data, setDetailData]);
-  if (detailQuery.isLoading) {
-    return /* @__PURE__ */ jsx("div", { children: "loading detail" });
-  }
-  return children;
-};
 export {
   CurdEditPanel as default
 };

package/dist/esm/curd/listview/CommonListView.d.ts

@@ -1,5 +1,9 @@
 /// <reference types="react" />
+import { PlainMessage } from "@bufbuild/protobuf";
+import { CurdViewContent } from "../../gomtmpb/mtm/sppb/curd_pb";
 export declare const LzListViewLayoutDemo: import("react").LazyExoticComponent<typeof import("./listview-layouts/listviewlayout-demo").default>;
 export declare const LzListViewLayoutDefault: import("react").LazyExoticComponent<typeof import("./listview-layouts/default").default>;
-export declare function CommonListView(): import("react").JSX.Element | null;
+export declare function CommonListView(props: {
+    curdViewContent: PlainMessage<CurdViewContent>;
+}): import("react").JSX.Element | null;
 export declare const ListViewActions: () => import("react").JSX.Element;

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

@@ -19,18 +19,19 @@ const ALL_Layouts = [
 ];
 const LzListViewLayoutDemo = lazy(() => import("./listview-layouts/listviewlayout-demo"));
 const LzListViewLayoutDefault = lazy(() => import("./listview-layouts/default"));
-function CommonListView() {
-  const svc = useListview((x) => x.curdView.svcName);
-  const methodList = useListview((x) => x.curdView.methodList);
+function CommonListView(props) {
+  const { curdViewContent } = props;
+  const svc = useListview((x) => curdViewContent.svcName);
+  const methodList = useListview((x) => curdViewContent.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.curdView.routeEdit);
-  const viewCreate = useListview((x) => x.curdView.routeCreate);
-  const methodUpdate = useListview((x) => x.curdView.methodUpdate);
-  const methodCreate = useListview((x) => x.curdView.methodCreate);
+  const viewUpdate = useListview((x) => curdViewContent.routeEdit);
+  const viewCreate = useListview((x) => curdViewContent.routeCreate);
+  const methodUpdate = useListview((x) => curdViewContent.methodUpdate);
+  const methodCreate = useListview((x) => curdViewContent.methodCreate);
   const openCurdViewEditor = useListview((x) => x.openCurdViewEditor);
   const setOpenCurdViewEditor = useListview((x) => x.setOpenCurdViewEditor);
   const curdView = useListview((x) => x.curdView);
@@ -90,7 +91,7 @@ function CommonListView() {
           children: /* @__PURE__ */ jsx(CurdEditPanel, {})
         }
       ),
-      /* @__PURE__ */ jsx(PanelRemove, {}),
+      /* @__PURE__ */ jsx(PanelRemove, { curdViewContent }),
       openCurdViewEditor && /* @__PURE__ */ jsx(
         GomtmForm,
         {

package/dist/esm/curd/remove/RemovePanel.d.ts

@@ -1,7 +1,13 @@
 /// <reference types="react" />
-export declare function useCurdRemove(): {
+import { PlainMessage } from "@bufbuild/protobuf";
+import { CurdViewContent } from "../../gomtmpb/mtm/sppb/curd_pb";
+export declare function useCurdRemove(props: {
+    curdViewContent: PlainMessage<CurdViewContent>;
+}): {
     handlerSubmit: () => Promise<void>;
     open: boolean;
     setOpen: (openRemove: boolean) => void;
 };
-export declare const PanelRemove: () => import("react").JSX.Element;
+export declare const PanelRemove: (props: {
+    curdViewContent: PlainMessage<CurdViewContent>;
+}) => import("react").JSX.Element;

package/dist/esm/curd/remove/RemovePanel.js

@@ -27,12 +27,13 @@ import { useCallback } from "react";
 import { useGomtmMutation } from "../../gomtmQuery";
 import { createQueryKey } from "../../mtmFetcher";
 import { useListview } from "../listview/list-store";
-function useCurdRemove() {
-  const svc = useListview((x) => x.curdView.svcName);
+function useCurdRemove(props) {
+  const { curdViewContent } = props;
+  const svc = useListview((x) => curdViewContent.svcName);
   const openRemove = useListview((x) => x.openRemove);
   const setOpenRemove = useListview((x) => x.setOpenRemove);
-  const methodDelete = useListview((x) => x.curdView.methodDelete);
-  const methodList = useListview((x) => x.curdView.methodList);
+  const methodDelete = useListview((x) => curdViewContent.methodDelete);
+  const methodList = useListview((x) => curdViewContent.methodList);
   const mutation = useGomtmMutation(svc, methodDelete, {
     onSuccess(data, variables, context) {
       queryClient.invalidateQueries({
@@ -55,8 +56,9 @@ function useCurdRemove() {
     setOpen: setOpenRemove
   };
 }
-const PanelRemove = () => {
-  const curdRemove = useCurdRemove();
+const PanelRemove = (props) => {
+  const { curdViewContent } = props;
+  const curdRemove = useCurdRemove({ curdViewContent });
   return /* @__PURE__ */ jsx(Dialog, { open: curdRemove.open, onOpenChange: curdRemove.setOpen, children: /* @__PURE__ */ jsxs(DialogContent, { children: [
     /* @__PURE__ */ jsx(DialogTitle, { children: "remove item" }),
     /* @__PURE__ */ jsx(MtButton, { onClick: () => {

package/dist/esm/gomtmpb/mtm/sppb/curd_pb.d.ts

@@ -157,28 +157,6 @@ export declare class CurdView extends Message<CurdView> {
     name: string;
     title: string;
     enabled: boolean;
-    routeList: string;
-    routeShow: string;
-    routeCreate: string;
-    routeEdit: string;
-    svcName: string;
-    methodList: string;
-    methodGet: string;
-    methodCreate: string;
-    methodUpdate: string;
-    methodDelete: string;
-    rolesView: string[];
-    rolesEdit: string[];
-    rolesDelete: string[];
-    formCreate?: FormSchema;
-    formEdit?: FormSchema;
-    pageSize: number;
-    paginateType: PaginateType;
-    params: {
-        [key: string]: string;
-    };
-    layout: string;
-    defaultDetailView: string;
     content?: CurdViewContent;
     constructor(data?: PartialMessage<CurdView>);
     static readonly runtime: typeof proto3;
@@ -204,6 +182,12 @@ export declare class CurdViewContent extends Message<CurdViewContent> {
     rolesView: string[];
     rolesEdit: string[];
     rolesDelete: string[];
+    formCreate?: FormSchema;
+    formEdit?: FormSchema;
+    pageSize: number;
+    paginateType: PaginateType;
+    layout: string;
+    defaultDetailView: string;
     constructor(data?: PartialMessage<CurdViewContent>);
     static readonly runtime: typeof proto3;
     static readonly typeName = "sppb.CurdViewContent";

package/dist/esm/gomtmpb/mtm/sppb/curd_pb.js

@@ -474,92 +474,28 @@ const _CurdView = class _CurdView extends Message {
      */
     __publicField(this, "title", "");
     /**
+     * string route_list = 4;
+     * string route_show = 5;
+     * string route_create = 6;
+     * string route_edit = 7;
+     * string svc_name = 8;
+     * string method_list = 9;
+     * string method_get = 10;
+     * string method_create = 11;
+     * string method_update = 12;
+     * string method_delete = 13;
+     * repeated string roles_view = 14;
+     * repeated string roles_edit = 15;
+     * repeated string roles_delete = 16;
+     *
      * @generated from field: bool enabled = 3;
      */
     __publicField(this, "enabled", false);
     /**
-     * @generated from field: string route_list = 4;
-     */
-    __publicField(this, "routeList", "");
-    /**
-     * @generated from field: string route_show = 5;
-     */
-    __publicField(this, "routeShow", "");
-    /**
-     * @generated from field: string route_create = 6;
-     */
-    __publicField(this, "routeCreate", "");
-    /**
-     * @generated from field: string route_edit = 7;
-     */
-    __publicField(this, "routeEdit", "");
-    /**
-     * @generated from field: string svc_name = 8;
-     */
-    __publicField(this, "svcName", "");
-    /**
-     * @generated from field: string method_list = 9;
-     */
-    __publicField(this, "methodList", "");
-    /**
-     * @generated from field: string method_get = 10;
-     */
-    __publicField(this, "methodGet", "");
-    /**
-     * @generated from field: string method_create = 11;
-     */
-    __publicField(this, "methodCreate", "");
-    /**
-     * @generated from field: string method_update = 12;
-     */
-    __publicField(this, "methodUpdate", "");
-    /**
-     * @generated from field: string method_delete = 13;
-     */
-    __publicField(this, "methodDelete", "");
-    /**
-     * @generated from field: repeated string roles_view = 14;
-     */
-    __publicField(this, "rolesView", []);
-    /**
-     * @generated from field: repeated string roles_edit = 15;
-     */
-    __publicField(this, "rolesEdit", []);
-    /**
-     * @generated from field: repeated string roles_delete = 16;
-     */
-    __publicField(this, "rolesDelete", []);
-    /**
-     * @generated from field: sppb.FormSchema form_create = 17;
-     */
-    __publicField(this, "formCreate");
-    /**
-     * @generated from field: sppb.FormSchema form_edit = 18;
-     */
-    __publicField(this, "formEdit");
-    /**
-     * @generated from field: uint32 page_size = 19;
-     */
-    __publicField(this, "pageSize", 0);
-    /**
-     * @generated from field: sppb.PaginateType paginate_type = 20;
-     */
-    __publicField(this, "paginateType", PaginateType.INFINITE);
-    /**
-     * 初始查询参数
+     * map<string, string> params = 21; // 初始查询参数
+     * string layout = 22;
+     * string default_detail_view = 24;
      *
-     * @generated from field: map<string, string> params = 21;
-     */
-    __publicField(this, "params", {});
-    /**
-     * @generated from field: string layout = 22;
-     */
-    __publicField(this, "layout", "");
-    /**
-     * @generated from field: string default_detail_view = 24;
-     */
-    __publicField(this, "defaultDetailView", "");
-    /**
      * @generated from field: sppb.CurdViewContent content = 25;
      */
     __publicField(this, "content");
@@ -609,108 +545,6 @@ __publicField(_CurdView, "fields", proto3.util.newFieldList(() => [
     T: 8
     /* ScalarType.BOOL */
   },
-  {
-    no: 4,
-    name: "route_list",
-    kind: "scalar",
-    T: 9
-    /* ScalarType.STRING */
-  },
-  {
-    no: 5,
-    name: "route_show",
-    kind: "scalar",
-    T: 9
-    /* ScalarType.STRING */
-  },
-  {
-    no: 6,
-    name: "route_create",
-    kind: "scalar",
-    T: 9
-    /* ScalarType.STRING */
-  },
-  {
-    no: 7,
-    name: "route_edit",
-    kind: "scalar",
-    T: 9
-    /* ScalarType.STRING */
-  },
-  {
-    no: 8,
-    name: "svc_name",
-    kind: "scalar",
-    T: 9
-    /* ScalarType.STRING */
-  },
-  {
-    no: 9,
-    name: "method_list",
-    kind: "scalar",
-    T: 9
-    /* ScalarType.STRING */
-  },
-  {
-    no: 10,
-    name: "method_get",
-    kind: "scalar",
-    T: 9
-    /* ScalarType.STRING */
-  },
-  {
-    no: 11,
-    name: "method_create",
-    kind: "scalar",
-    T: 9
-    /* ScalarType.STRING */
-  },
-  {
-    no: 12,
-    name: "method_update",
-    kind: "scalar",
-    T: 9
-    /* ScalarType.STRING */
-  },
-  {
-    no: 13,
-    name: "method_delete",
-    kind: "scalar",
-    T: 9
-    /* ScalarType.STRING */
-  },
-  { no: 14, name: "roles_view", kind: "scalar", T: 9, repeated: true },
-  { no: 15, name: "roles_edit", kind: "scalar", T: 9, repeated: true },
-  { no: 16, name: "roles_delete", kind: "scalar", T: 9, repeated: true },
-  { no: 17, name: "form_create", kind: "message", T: FormSchema },
-  { no: 18, name: "form_edit", kind: "message", T: FormSchema },
-  {
-    no: 19,
-    name: "page_size",
-    kind: "scalar",
-    T: 13
-    /* ScalarType.UINT32 */
-  },
-  { no: 20, name: "paginate_type", kind: "enum", T: proto3.getEnumType(PaginateType) },
-  { no: 21, name: "params", kind: "map", K: 9, V: {
-    kind: "scalar",
-    T: 9
-    /* ScalarType.STRING */
-  } },
-  {
-    no: 22,
-    name: "layout",
-    kind: "scalar",
-    T: 9
-    /* ScalarType.STRING */
-  },
-  {
-    no: 24,
-    name: "default_detail_view",
-    kind: "scalar",
-    T: 9
-    /* ScalarType.STRING */
-  },
   { no: 25, name: "content", kind: "message", T: CurdViewContent }
 ]));
 let CurdView = _CurdView;
@@ -773,6 +607,30 @@ const _CurdViewContent = class _CurdViewContent extends Message {
      * @generated from field: repeated string roles_delete = 16;
      */
     __publicField(this, "rolesDelete", []);
+    /**
+     * @generated from field: sppb.FormSchema form_create = 17;
+     */
+    __publicField(this, "formCreate");
+    /**
+     * @generated from field: sppb.FormSchema form_edit = 18;
+     */
+    __publicField(this, "formEdit");
+    /**
+     * @generated from field: uint32 page_size = 19;
+     */
+    __publicField(this, "pageSize", 0);
+    /**
+     * @generated from field: sppb.PaginateType paginate_type = 20;
+     */
+    __publicField(this, "paginateType", PaginateType.INFINITE);
+    /**
+     * @generated from field: string layout = 22;
+     */
+    __publicField(this, "layout", "");
+    /**
+     * @generated from field: string default_detail_view = 24;
+     */
+    __publicField(this, "defaultDetailView", "");
     proto3.util.initPartial(data, this);
   }
   static fromBinary(bytes, options) {
@@ -870,7 +728,31 @@ __publicField(_CurdViewContent, "fields", proto3.util.newFieldList(() => [
   },
   { no: 14, name: "roles_view", kind: "scalar", T: 9, repeated: true },
   { no: 15, name: "roles_edit", kind: "scalar", T: 9, repeated: true },
-  { no: 16, name: "roles_delete", kind: "scalar", T: 9, repeated: true }
+  { no: 16, name: "roles_delete", kind: "scalar", T: 9, repeated: true },
+  { no: 17, name: "form_create", kind: "message", T: FormSchema },
+  { no: 18, name: "form_edit", kind: "message", T: FormSchema },
+  {
+    no: 19,
+    name: "page_size",
+    kind: "scalar",
+    T: 13
+    /* ScalarType.UINT32 */
+  },
+  { no: 20, name: "paginate_type", kind: "enum", T: proto3.getEnumType(PaginateType) },
+  {
+    no: 22,
+    name: "layout",
+    kind: "scalar",
+    T: 9
+    /* ScalarType.STRING */
+  },
+  {
+    no: 24,
+    name: "default_detail_view",
+    kind: "scalar",
+    T: 9
+    /* ScalarType.STRING */
+  }
 ]));
 let CurdViewContent = _CurdViewContent;
 export {