jmash-core-mp 0.1.50 → 0.1.52

package/lib/api/storage/index.d.ts

@@ -1,8 +1,9 @@
 import { ResponseData } from "../../api/types";
-import { StorageOrganInfoReq, StorageOrganInfoList, StorageOrganBrowserUpdateReq, StorageOrganBrowserModel } from "./types";
+import { StorageOrganInfoReq, StorageOrganInfoList, StorageOrganBrowserUpdateReq, StorageOrganBrowserModel, StorageOrganInfoModel } from "./types";
 declare class StorageApiImpl {
     findMyOrganList(data: StorageOrganInfoReq): Promise<ResponseData<StorageOrganInfoList>>;
     findStorageBrowserOrganList(data: StorageOrganInfoReq): Promise<ResponseData<StorageOrganInfoList>>;
+    findOrganTenant(): Promise<ResponseData<StorageOrganInfoModel>>;
     findStorageOrganInfoList(data: StorageOrganInfoReq): Promise<ResponseData<StorageOrganInfoList>>;
     updateStorageOrganBrowser(data: StorageOrganBrowserUpdateReq): Promise<ResponseData<StorageOrganBrowserModel>>;
 }

package/lib/api/storage/index.js

@@ -1,5 +1,6 @@
 import mpx from "@mpxjs/core";
 import { grpc } from "../../utils/grpc";
+import { useOrganStore } from "../../store/organ";
 class StorageApiImpl {
     // 查询我的组织列表
     findMyOrganList(data) {
@@ -18,6 +19,15 @@ class StorageApiImpl {
             method: "GET",
         });
     }
+    // 查询组织租户
+    findOrganTenant() {
+        const config = getApp().globalData.config;
+        const organStore = useOrganStore();
+        return mpx.xfetch.fetch({
+            url: `/v1/storage/storage_organ_info/organ_tenant/${config.tenant}/${organStore.organTenant}`,
+            method: "GET",
+        });
+    }
     // 查询列表信息店铺
     findStorageOrganInfoList(data) {
         const config = getApp().globalData.config;

package/lib/api/storage/types.d.ts

@@ -2,6 +2,10 @@ export interface StorageOrganInfoReq {
     serviceType: string;
     likeOrganName?: string;
 }
+export interface StorageOrganTenant {
+    tenant?: string;
+    organTenant?: string;
+}
 export interface StorageOrganInfoList {
     results: StorageOrganInfoModel[];
 }

package/lib/store/organ.d.ts

@@ -5,5 +5,6 @@ interface OrganState {
 }
 export declare const useOrganStore: import("@mpxjs/pinia").StoreDefinition<"organ", OrganState, {}, {
     setOrganInfo(data: StorageOrganInfoModel): void;
+    setOrganTenant(organTenant: string): Promise<boolean>;
 }>;
 export {};

package/lib/store/organ.js

@@ -1,4 +1,5 @@
 import { defineStore } from "@mpxjs/pinia";
+import { storageApi } from "../api/storage";
 import { db } from "../utils/db";
 export const useOrganStore = defineStore("organ", {
     state: () => ({
@@ -6,12 +7,27 @@ export const useOrganStore = defineStore("organ", {
         organInfo: db.getOrganInfo() || {},
     }),
     actions: {
-        //设置组织信息
+        //设置组织信息.
         setOrganInfo(data) {
             this.organInfo = data;
             this.organTenant = data.organTenant;
             db.setOrganInfo(data);
             db.setOrganTenant(data.organTenant);
         },
+        //设置组织租户和组织信息.
+        setOrganTenant(organTenant) {
+            return storageApi.findOrganTenant().then((res) => {
+                if (res.statusCode === 200) {
+                    this.organInfo = res.data;
+                    this.organTenant = organTenant;
+                    db.setOrganInfo(res.data);
+                    db.setOrganTenant(organTenant);
+                    return Promise.resolve(true);
+                }
+                else {
+                    return Promise.resolve(false);
+                }
+            });
+        },
     },
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jmash-core-mp",
-  "version": "0.1.50",
+  "version": "0.1.52",
   "private": false,
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/src/api/storage/index.ts

@@ -1,11 +1,13 @@
 import mpx from "@mpxjs/core";
 import { ResponseData } from "../../api/types";
 import { grpc } from "../../utils/grpc";
+import { useOrganStore } from "../../store/organ";
 import {
   StorageOrganInfoReq,
   StorageOrganInfoList,
   StorageOrganBrowserUpdateReq,
   StorageOrganBrowserModel,
+  StorageOrganInfoModel,
 } from "./types";
 
 class StorageApiImpl {
@@ -32,6 +34,16 @@ class StorageApiImpl {
     });
   }
 
+  // 查询组织租户
+  findOrganTenant(): Promise<ResponseData<StorageOrganInfoModel>> {
+    const config = getApp().globalData.config;
+    const organStore = useOrganStore();
+    return mpx.xfetch.fetch({
+      url: `/v1/storage/storage_organ_info/organ_tenant/${config.tenant}/${organStore.organTenant}`,
+      method: "GET",
+    });
+  }
+
   // 查询列表信息店铺
   findStorageOrganInfoList(
     data: StorageOrganInfoReq

package/src/api/storage/types.ts

@@ -5,6 +5,15 @@ export interface StorageOrganInfoReq {
   // 组织名称模糊检索
   likeOrganName?: string;
 }
+
+// 组织租户
+export interface StorageOrganTenant {
+  // 租户
+  tenant?: string;
+  // 组织租户
+  organTenant?: string;
+}
+
 // 组织列表
 export interface StorageOrganInfoList {
   // 当前内容

package/src/store/organ.ts

@@ -1,4 +1,5 @@
 import { defineStore } from "@mpxjs/pinia";
+import { storageApi } from "../api/storage";
 import { StorageOrganInfoModel } from "../api/storage/types";
 import { db } from "../utils/db";
 
@@ -15,12 +16,26 @@ export const useOrganStore = defineStore("organ", {
     organInfo: db.getOrganInfo() || {},
   }),
   actions: {
-    //设置组织信息
+    //设置组织信息.
     setOrganInfo(data: StorageOrganInfoModel) {
       this.organInfo = data;
       this.organTenant = data.organTenant;
       db.setOrganInfo(data);
       db.setOrganTenant(data.organTenant);
     },
+    //设置组织租户和组织信息.
+    setOrganTenant(organTenant: string): Promise<boolean> {
+      return storageApi.findOrganTenant().then((res) => {
+        if (res.statusCode === 200) {
+          this.organInfo = res.data;
+          this.organTenant = organTenant;
+          db.setOrganInfo(res.data);
+          db.setOrganTenant(organTenant);
+          return Promise.resolve(true);
+        } else {
+          return Promise.resolve(false);
+        }
+      });
+    },
   },
 });