gomtm 0.0.370 → 0.0.372

package/dist/esm/components/curdView/curdViewEditor.d.ts

@@ -4,5 +4,4 @@ export default function CurdViewEditor(props: {
 }): import("react").JSX.Element;
 export declare const CurdViewContentField: (props: {
     name: string;
-    defaultValues: any;
 }) => import("react").JSX.Element;

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

@@ -44,13 +44,13 @@ function CurdViewEditor(props) {
       /* @__PURE__ */ jsx(FormControl, { children: /* @__PURE__ */ jsx(Input, __spreadValues({ placeholder: "title" }, field)) }),
       /* @__PURE__ */ jsx(FormMessage, {})
     ] }) }),
-    /* @__PURE__ */ jsx(CurdViewContentField, { name: "content", defaultValues: form.getValues()["content"] })
+    /* @__PURE__ */ jsx(CurdViewContentField, { name: "content" })
   ] });
 }
 const CurdViewContentField = (props) => {
-  const { name, defaultValues } = props;
+  const { name } = props;
   const form = useFormContext();
-  console.log("defaultValues", defaultValues);
+  const defaultValues = form.getValues()[name];
   const contentForm = useForm({
     defaultValues
   });
@@ -61,14 +61,36 @@ const CurdViewContentField = (props) => {
     return () => subscription.unsubscribe();
   }, [contentForm, contentForm.watch, form, name]);
   return /* @__PURE__ */ jsxs(Fragment, { children: [
-    /* @__PURE__ */ jsx(FormField, { control: contentForm.control, name: "someField", render: ({ field }) => /* @__PURE__ */ jsxs(FormItem, { children: [
-      /* @__PURE__ */ jsx(FormLabel, { children: "someField" }),
-      /* @__PURE__ */ jsx(FormControl, { children: /* @__PURE__ */ jsx(Input, __spreadValues({ placeholder: "someField" }, field)) }),
+    /* @__PURE__ */ jsx(
+      FormField,
+      {
+        control: contentForm.control,
+        name: "svcName",
+        render: ({ field }) => /* @__PURE__ */ jsxs(FormItem, { children: [
+          /* @__PURE__ */ jsx(FormLabel, { children: "Svc" }),
+          /* @__PURE__ */ jsx(FormControl, { children: /* @__PURE__ */ jsx(Input, __spreadValues({ placeholder: "svcName" }, field)) }),
+          /* @__PURE__ */ jsx(FormMessage, {})
+        ] })
+      }
+    ),
+    /* @__PURE__ */ jsx(FormField, { control: contentForm.control, name: "methodList", render: ({ field }) => /* @__PURE__ */ jsxs(FormItem, { children: [
+      /* @__PURE__ */ jsx(FormLabel, { children: "methodList" }),
+      /* @__PURE__ */ jsx(FormControl, { children: /* @__PURE__ */ jsx(Input, __spreadValues({ placeholder: "methodList" }, field)) }),
+      /* @__PURE__ */ jsx(FormMessage, {})
+    ] }) }),
+    /* @__PURE__ */ jsx(FormField, { control: contentForm.control, name: "methodGet", render: ({ field }) => /* @__PURE__ */ jsxs(FormItem, { children: [
+      /* @__PURE__ */ jsx(FormLabel, { children: "methodGet" }),
+      /* @__PURE__ */ jsx(FormControl, { children: /* @__PURE__ */ jsx(Input, __spreadValues({ placeholder: "methodGet" }, field)) }),
+      /* @__PURE__ */ jsx(FormMessage, {})
+    ] }) }),
+    /* @__PURE__ */ jsx(FormField, { control: contentForm.control, name: "methodUpdate", render: ({ field }) => /* @__PURE__ */ jsxs(FormItem, { children: [
+      /* @__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: "someField22", render: ({ field }) => /* @__PURE__ */ jsxs(FormItem, { children: [
-      /* @__PURE__ */ jsx(FormLabel, { children: "someField" }),
-      /* @__PURE__ */ jsx(FormControl, { children: /* @__PURE__ */ jsx(Input, __spreadValues({ placeholder: "someField" }, field)) }),
+    /* @__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,10 @@ 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" });
+      }
+      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,8 @@ 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) || "";
+  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,6 +157,18 @@ export declare class CurdView extends Message<CurdView> {
     name: string;
     title: string;
     enabled: boolean;
+    content?: CurdViewContent;
+    constructor(data?: PartialMessage<CurdView>);
+    static readonly runtime: typeof proto3;
+    static readonly typeName = "sppb.CurdView";
+    static readonly fields: FieldList;
+    static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): CurdView;
+    static fromJson(jsonValue: JsonValue, options?: Partial<JsonReadOptions>): CurdView;
+    static fromJsonString(jsonString: string, options?: Partial<JsonReadOptions>): CurdView;
+    static equals(a: CurdView | PlainMessage<CurdView> | undefined, b: CurdView | PlainMessage<CurdView> | undefined): boolean;
+}
+export declare class CurdViewContent extends Message<CurdViewContent> {
+    title: string;
     routeList: string;
     routeShow: string;
     routeCreate: string;
@@ -174,18 +186,14 @@ export declare class CurdView extends Message<CurdView> {
     formEdit?: FormSchema;
     pageSize: number;
     paginateType: PaginateType;
-    params: {
-        [key: string]: string;
-    };
     layout: string;
     defaultDetailView: string;
-    content: string;
-    constructor(data?: PartialMessage<CurdView>);
+    constructor(data?: PartialMessage<CurdViewContent>);
     static readonly runtime: typeof proto3;
-    static readonly typeName = "sppb.CurdView";
+    static readonly typeName = "sppb.CurdViewContent";
     static readonly fields: FieldList;
-    static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): CurdView;
-    static fromJson(jsonValue: JsonValue, options?: Partial<JsonReadOptions>): CurdView;
-    static fromJsonString(jsonString: string, options?: Partial<JsonReadOptions>): CurdView;
-    static equals(a: CurdView | PlainMessage<CurdView> | undefined, b: CurdView | PlainMessage<CurdView> | undefined): boolean;
+    static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): CurdViewContent;
+    static fromJson(jsonValue: JsonValue, options?: Partial<JsonReadOptions>): CurdViewContent;
+    static fromJsonString(jsonString: string, options?: Partial<JsonReadOptions>): CurdViewContent;
+    static equals(a: CurdViewContent | PlainMessage<CurdViewContent> | undefined, b: CurdViewContent | PlainMessage<CurdViewContent> | undefined): boolean;
 }

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

@@ -474,9 +474,87 @@ 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);
+    /**
+     * map<string, string> params = 21; // 初始查询参数
+     * string layout = 22;
+     * string default_detail_view = 24;
+     *
+     * @generated from field: sppb.CurdViewContent content = 25;
+     */
+    __publicField(this, "content");
+    proto3.util.initPartial(data, this);
+  }
+  static fromBinary(bytes, options) {
+    return new _CurdView().fromBinary(bytes, options);
+  }
+  static fromJson(jsonValue, options) {
+    return new _CurdView().fromJson(jsonValue, options);
+  }
+  static fromJsonString(jsonString, options) {
+    return new _CurdView().fromJsonString(jsonString, options);
+  }
+  static equals(a, b) {
+    return proto3.util.equals(_CurdView, a, b);
+  }
+};
+__publicField(_CurdView, "runtime", proto3);
+__publicField(_CurdView, "typeName", "sppb.CurdView");
+__publicField(_CurdView, "fields", proto3.util.newFieldList(() => [
+  {
+    no: 1,
+    name: "id",
+    kind: "scalar",
+    T: 13
+    /* ScalarType.UINT32 */
+  },
+  {
+    no: 23,
+    name: "name",
+    kind: "scalar",
+    T: 9
+    /* ScalarType.STRING */
+  },
+  {
+    no: 2,
+    name: "title",
+    kind: "scalar",
+    T: 9
+    /* ScalarType.STRING */
+  },
+  {
+    no: 3,
+    name: "enabled",
+    kind: "scalar",
+    T: 8
+    /* ScalarType.BOOL */
+  },
+  { no: 25, name: "content", kind: "message", T: CurdViewContent }
+]));
+let CurdView = _CurdView;
+const _CurdViewContent = class _CurdViewContent extends Message {
+  constructor(data) {
+    super();
+    /**
+     * @generated from field: string title = 1;
+     */
+    __publicField(this, "title", "");
     /**
      * @generated from field: string route_list = 4;
      */
@@ -545,12 +623,6 @@ const _CurdView = class _CurdView extends Message {
      * @generated from field: sppb.PaginateType paginate_type = 20;
      */
     __publicField(this, "paginateType", PaginateType.INFINITE);
-    /**
-     * 初始查询参数
-     *
-     * @generated from field: map<string, string> params = 21;
-     */
-    __publicField(this, "params", {});
     /**
      * @generated from field: string layout = 22;
      */
@@ -559,56 +631,31 @@ const _CurdView = class _CurdView extends Message {
      * @generated from field: string default_detail_view = 24;
      */
     __publicField(this, "defaultDetailView", "");
-    /**
-     * @generated from field: string content = 25;
-     */
-    __publicField(this, "content", "");
     proto3.util.initPartial(data, this);
   }
   static fromBinary(bytes, options) {
-    return new _CurdView().fromBinary(bytes, options);
+    return new _CurdViewContent().fromBinary(bytes, options);
   }
   static fromJson(jsonValue, options) {
-    return new _CurdView().fromJson(jsonValue, options);
+    return new _CurdViewContent().fromJson(jsonValue, options);
   }
   static fromJsonString(jsonString, options) {
-    return new _CurdView().fromJsonString(jsonString, options);
+    return new _CurdViewContent().fromJsonString(jsonString, options);
   }
   static equals(a, b) {
-    return proto3.util.equals(_CurdView, a, b);
+    return proto3.util.equals(_CurdViewContent, a, b);
   }
 };
-__publicField(_CurdView, "runtime", proto3);
-__publicField(_CurdView, "typeName", "sppb.CurdView");
-__publicField(_CurdView, "fields", proto3.util.newFieldList(() => [
+__publicField(_CurdViewContent, "runtime", proto3);
+__publicField(_CurdViewContent, "typeName", "sppb.CurdViewContent");
+__publicField(_CurdViewContent, "fields", proto3.util.newFieldList(() => [
   {
     no: 1,
-    name: "id",
-    kind: "scalar",
-    T: 13
-    /* ScalarType.UINT32 */
-  },
-  {
-    no: 23,
-    name: "name",
-    kind: "scalar",
-    T: 9
-    /* ScalarType.STRING */
-  },
-  {
-    no: 2,
     name: "title",
     kind: "scalar",
     T: 9
     /* ScalarType.STRING */
   },
-  {
-    no: 3,
-    name: "enabled",
-    kind: "scalar",
-    T: 8
-    /* ScalarType.BOOL */
-  },
   {
     no: 4,
     name: "route_list",
@@ -692,11 +739,6 @@ __publicField(_CurdView, "fields", proto3.util.newFieldList(() => [
     /* 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",
@@ -710,16 +752,9 @@ __publicField(_CurdView, "fields", proto3.util.newFieldList(() => [
     kind: "scalar",
     T: 9
     /* ScalarType.STRING */
-  },
-  {
-    no: 25,
-    name: "content",
-    kind: "scalar",
-    T: 9
-    /* ScalarType.STRING */
   }
 ]));
-let CurdView = _CurdView;
+let CurdViewContent = _CurdViewContent;
 export {
   CurdConfig,
   CurdConfigSvc,
@@ -729,6 +764,7 @@ export {
   CurdConfigSvc_List,
   CurdConfigSvc_Update,
   CurdView,
+  CurdViewContent,
   CurdViewCreateReq,
   CurdViewGetReq,
   CurdViewGetRes,