gomtm 0.0.299 → 0.0.301

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

@@ -2,5 +2,4 @@
 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 CommonListViewV2(): import("react").JSX.Element;
 export declare const ListViewActions: () => import("react").JSX.Element;

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

@@ -26,7 +26,7 @@ import { Dialog, DialogContent, DialogTitle } from "mtxuilib/ui/dialog";
 import { DropdownMenu, DropdownMenuContent, DropdownMenuGroup, 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 { Suspense, lazy, use, useMemo, useState } from "react";
+import { Suspense, lazy, useMemo, useState } from "react";
 import { useHotkeys } from "react-hotkeys-hook";
 import { MtmErrorView } from "../../components/MtmErrorView";
 import { HOTKEY_Listview_Switchlayout } from "../../consts";
@@ -80,28 +80,6 @@ function CommonListView() {
     /* @__PURE__ */ jsx("div", { className: "absolute right-1 top-1", children: /* @__PURE__ */ jsx(ListViewActions, {}) })
   ] });
 }
-function CommonListViewV2() {
-  const useListData = useListview((x) => x.loadListData);
-  const bbb = use(useListData());
-  return /* @__PURE__ */ jsxs("div", { className: "relative w-full bg-slate-200 p-2", children: [
-    /* @__PURE__ */ jsxs(
-      "div",
-      {
-        className: cn(
-          "w-full"
-          // 滚动设置
-          // " max-h-[700px] overflow-y-auto"
-        ),
-        children: [
-          /* @__PURE__ */ jsx(MtButton, { onClick: () => {
-          }, children: "fetch next" }),
-          /* @__PURE__ */ jsx("pre", { children: JSON.stringify(bbb, null, 2) })
-        ]
-      }
-    ),
-    /* @__PURE__ */ jsx("div", { className: "absolute right-1 top-1" })
-  ] });
-}
 const PanelRemove = () => {
   const svc = useListview((x) => x.svc);
   const openRemove = useListview((x) => x.openRemove);
@@ -124,8 +102,6 @@ const PanelCreate = () => {
   const openCreate = useListview((x) => x.openCreate);
   const setOpenCreate = useListview((x) => x.setOpenCreate);
   const methodDelete = useListview((x) => x.methodDelete);
-  const mutation = useGomtmMutation(svc, methodDelete);
-  const activateItem = useListview((x) => x.activateItem);
   return /* @__PURE__ */ jsx(Dialog, { open: openCreate, onOpenChange: setOpenCreate, children: /* @__PURE__ */ jsxs(DialogContent, { children: [
     /* @__PURE__ */ jsx(DialogTitle, { children: "TODO create item Dlg" }),
     /* @__PURE__ */ jsx(MtButton, { onClick: () => __async(void 0, null, function* () {
@@ -188,7 +164,6 @@ const ListViewLayoutSwitch = () => {
 };
 export {
   CommonListView,
-  CommonListViewV2,
   ListViewActions,
   LzListViewLayoutDefault,
   LzListViewLayoutDemo

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

@@ -50,7 +50,7 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-import { jsx, jsxs } from "react/jsx-runtime";
+import { jsx } from "react/jsx-runtime";
 import { setCookie } from "mtxlib/clientlib";
 import { createContext, useContext, useRef } from "react";
 import { useStore } from "zustand";
@@ -110,11 +110,7 @@ const ListViewStoreProvider = (props) => {
 const ListView = (props) => {
   const backendUrl = useGomtm((x) => x.backendUrl);
   const _a = props, { children } = _a, etc = __objRest(_a, ["children"]);
-  return /* @__PURE__ */ jsxs(ListViewStoreProvider, __spreadProps(__spreadValues({}, props), { backendUrl: backendUrl || "", children: [
-    "backendUrl: ",
-    backendUrl,
-    children
-  ] }));
+  return /* @__PURE__ */ jsx(ListViewStoreProvider, __spreadProps(__spreadValues({}, props), { backendUrl: backendUrl || "", children }));
 };
 function useListview(selector) {
   const store = useContext(listViewContext);

package/dist/esm/gomtmQuery.js

@@ -3,27 +3,28 @@ import { useMutation, useQuery, useSuspenseInfiniteQuery, useSuspenseQuery } fro
 import { MTM_API_PREFIX } from "./consts";
 import { createInfiniteQueryKey, createQueryKey, goMtmQueryFn } from "./mtmFetcher";
 import { useGomtm } from "./store/mtapp-store";
-const useGomtmQuery = (svc, method, input) => {
-  const cookieStr = useGomtm((x) => x.cookieStr);
+const useGmtmQjeryFn = () => {
   const backendUrl = useGomtm((x) => x.backendUrl);
-  const query = useQuery({
-    queryKey: createQueryKey(svc, method, input),
-    queryFn: (k) => goMtmQueryFn({
+  const cookieStr = useGomtm((x) => x.cookieStr);
+  const token = useGomtm((x) => x.token);
+  return (svc, method, input) => {
+    return goMtmQueryFn({
       svc,
       method,
       input,
       options: {
         url: new URL(MTM_API_PREFIX, backendUrl).toString(),
-        token: cookieStr
+        token,
+        cookieStr
       }
-    })
-  });
-  return query;
+    });
+  };
 };
-const useGomtmSuspenseQuery = (svc, method, input) => {
+const useGomtmQuery = (svc, method, input) => {
   const backendUrl = useGomtm((x) => x.backendUrl);
   const cookieStr = useGomtm((x) => x.cookieStr);
-  const query = useSuspenseQuery({
+  const token = useGomtm((x) => x.token);
+  const query = useQuery({
     queryKey: createQueryKey(svc, method, input),
     queryFn: (k) => goMtmQueryFn({
       svc,
@@ -31,27 +32,26 @@ const useGomtmSuspenseQuery = (svc, method, input) => {
       input,
       options: {
         url: new URL(MTM_API_PREFIX, backendUrl).toString(),
-        token: cookieStr
+        token,
+        cookieStr
       }
     })
   });
   return query;
 };
+const useGomtmSuspenseQuery = (svc, method, input) => {
+  const fn = useGmtmQjeryFn();
+  const query = useSuspenseQuery({
+    queryKey: createQueryKey(svc, method, input),
+    queryFn: (k) => fn(svc, method, input)
+  });
+  return query;
+};
 const useGomtmSuspenseInfiniteQuery = (svc, method, input) => {
-  const backendUrl = useGomtm((x) => x.backendUrl);
-  const cookieStr = useGomtm((x) => x.cookieStr);
-  console.log("useGomtmSuspenseInfiniteQuery, backendUrl", backendUrl);
+  const fn = useGmtmQjeryFn();
   const query = useSuspenseInfiniteQuery({
     queryKey: createInfiniteQueryKey(svc, method, input),
-    queryFn: (k) => goMtmQueryFn({
-      svc,
-      method,
-      input,
-      options: {
-        url: new URL(MTM_API_PREFIX, backendUrl).toString(),
-        token: cookieStr
-      }
-    }),
+    queryFn: (k) => fn(svc, method, input),
     initialPageParam: input,
     getNextPageParam: (lastPage, allPages, lastPageParam, allPageParams) => {
       return lastPage;
@@ -60,18 +60,9 @@ const useGomtmSuspenseInfiniteQuery = (svc, method, input) => {
   return query;
 };
 const useGomtmMutation = (svc, method) => {
-  const backendUrl = useGomtm((x) => x.backendUrl);
-  const cookieStr = useGomtm((x) => x.cookieStr);
+  const fn = useGmtmQjeryFn();
   return useMutation({
-    mutationFn: (input) => goMtmQueryFn({
-      svc,
-      method,
-      input,
-      options: {
-        url: new URL(MTM_API_PREFIX, backendUrl).toString(),
-        token: cookieStr
-      }
-    })
+    mutationFn: (input) => fn(svc, method)
   });
 };
 export {

package/dist/esm/mtmFetcher.d.ts

@@ -8,6 +8,7 @@ interface goMtmQueryFnProps {
     options?: {
         url?: string;
         token?: string;
+        cookieStr?: string;
     };
 }
 export declare const goMtmQueryFn: (props: goMtmQueryFnProps) => Promise<any>;

package/dist/esm/mtmFetcher.js

@@ -105,18 +105,19 @@ function createMtmServiceClientByName(svcName, url, token) {
     throw new Error(`unknown svcType ${svcName}`);
   }
   const baseUrl = url || gomtmApiUrl();
-  console.log("createMtmServiceClientByName, baseUrl", baseUrl);
   return createPromiseClient(
     svcType,
     createConnectTransport({
       baseUrl,
       fetch: gomtmFetcher({
-        cookieStr: token
+        cookieStr: token,
+        token
       })
     })
   );
 }
 const gomtmFetcher = (initGlobal) => {
+  const token = initGlobal == null ? void 0 : initGlobal.token;
   return (input, init) => __async(void 0, null, function* () {
     if (init) {
       delete init.mode;
@@ -137,10 +138,10 @@ const gomtmFetcher = (initGlobal) => {
       cookieStr1 = (yield import("next/headers")).headers().get("cookie") || "";
     }
     init = __spreadValues(__spreadValues({}, init), {
-      headers: __spreadValues({
+      headers: __spreadValues(__spreadValues({
         // ...init.headers,
         "Content-Type": "application/json"
-      }, cookieStr1 && { "Cookie": cookieStr1 })
+      }, cookieStr1 && { "Cookie": cookieStr1 }), token && { "Authorization": "Bearer " + token })
     });
     let fetcher = fetch;
     req.enableCache = true;

package/dist/esm/providers/AuthProvider.js

@@ -20,9 +20,9 @@ function isRoleMatch(currentRoles, allowRoles) {
 }
 function useAuth() {
   const cookieStr = useGomtm((x) => x.cookieStr);
-  console.log("cookieStr-----------", cookieStr);
+  const token = useGomtm((x) => x.token);
+  console.log("\uFF08useAuth\uFF09cookieStr-----------", { token, cookieStr });
   const userInfoQuery = useGomtmSuspenseQuery(userinfo.service.typeName, userinfo.name);
-  console.log("userInfoQuery.data", userInfoQuery.data);
   const userId = useMemo(() => {
     var _a;
     return (_a = userInfoQuery.data.userInfo) == null ? void 0 : _a.ID;

package/dist/esm/providers/GomtmAppSS.js

@@ -39,21 +39,23 @@ var __async = (__this, __arguments, generator) => {
 };
 import { jsx } from "react/jsx-runtime";
 import { cookies, headers } from "next/headers";
-import { CookieConfigState } from "../consts";
+import { CookieConfigState, MtM_TOKEN_NAME } from "../consts";
 import { ssrGetBackendUrl } from "../mtmFetcher";
 import { GoMtmAppProvider } from "../store/mtapp-store";
 function GomtmAppSS(props) {
   return __async(this, null, function* () {
-    var _a;
+    var _a, _b;
     const { children } = props;
     const backend = ssrGetBackendUrl();
     const cookiesStr = headers().get("Cookie");
     const configState = JSON.parse(((_a = cookies().get(CookieConfigState)) == null ? void 0 : _a.value) || "{}");
     const cState = configState["state"];
+    const token = (_b = cookies().get(MtM_TOKEN_NAME)) == null ? void 0 : _b.value;
     return /* @__PURE__ */ jsx(
       GoMtmAppProvider,
       __spreadProps(__spreadValues({}, cState), {
         cookieStr: cookiesStr || "",
+        token,
         backendUrl: (cState == null ? void 0 : cState.backendUrl) || backend,
         children
       })

package/dist/esm/store/mtapp-store.d.ts

@@ -13,6 +13,7 @@ interface GomtmAppProps {
     counter?: number;
     params?: any;
     cookieStr?: string;
+    token?: string;
     globalSearchParams?: any;
     openDebug?: boolean;
 }

package/dist/esm/store/mtapp-store.js

@@ -48,7 +48,6 @@ import { customCookieStorage } from "./customStorage";
 const createGomtmAppStore = (initProps) => {
   const DEFAULT_PROPS = {
     debug: false,
-    // configState: {},
     params: {},
     counter: 0
   };
@@ -88,19 +87,13 @@ const GoMtmAppProvider = (props) => {
   if (!storeRef.current) {
     storeRef.current = createGomtmAppStore(props);
   }
-  return /* @__PURE__ */ jsxs(BearContext.Provider, { value: storeRef.current, children: [
-    /* @__PURE__ */ jsxs("div", { children: [
-      "backendurl: ",
-      storeRef.current.getState().backendUrl
+  return /* @__PURE__ */ jsx(BearContext.Provider, { value: storeRef.current, children: /* @__PURE__ */ jsxs(MtConnectProvider, { children: [
+    /* @__PURE__ */ jsxs(MtReactQueryProvider, { children: [
+      /* @__PURE__ */ jsx(GoMtmDebug, {}),
+      children
     ] }),
-    /* @__PURE__ */ jsxs(MtConnectProvider, { children: [
-      /* @__PURE__ */ jsxs(MtReactQueryProvider, { children: [
-        /* @__PURE__ */ jsx(GoMtmDebug, {}),
-        children
-      ] }),
-      /* @__PURE__ */ jsx(Setup, {})
-    ] })
-  ] });
+    /* @__PURE__ */ jsx(Setup, {})
+  ] }) });
 };
 function useGomtm(selector) {
   const store = useContext(BearContext);
@@ -121,13 +114,14 @@ const MtConnectProvider = (props) => {
   const { children } = props;
   const backendUrl = useGomtm((x) => x.backendUrl);
   const cookieStr = useGomtm((x) => x.cookieStr);
+  const token = useGomtm((x) => x.token);
   const transport = useMemo(() => {
     const baseApiUrl = new URL(MTM_API_PREFIX, backendUrl || "").toString();
-    console.log("MtConnectProvider, baseApiUrl:", baseApiUrl);
     return createConnectTransport({
       baseUrl: baseApiUrl,
       fetch: gomtmFetcher({
-        cookieStr
+        cookieStr,
+        token
       }),
       jsonOptions: {
         typeRegistry: anypbTypeReg
@@ -135,7 +129,7 @@ const MtConnectProvider = (props) => {
       useHttpGet: true,
       useBinaryFormat: false
     });
-  }, [backendUrl, cookieStr]);
+  }, [backendUrl, cookieStr, token]);
   return /* @__PURE__ */ jsx(TransportProvider, { transport, children });
 };
 const DebugCounter = () => {