jmash-core-mp 0.1.92 → 0.1.94

package/.gitignore

@@ -6,3 +6,4 @@ deploy/
 output/
 dist/
 .vscode/
+.pnpm-store/

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

@@ -1,4 +1,4 @@
-import { CmsSiteKey, CmsSiteList, CmsSiteModel, CmsChannelReq, CmsChannelList, CmsInfoReq, CmsInfoPage, CmsInfoKey, CmsInfoModel, CmsInfoContentReq, CmsInfoContentList, CmsContentInfoReq, CmsContentInfoModel, CmsInfoFileReq, CmsInfoFileList, FrontInteractKey, FrontInteractModel, FrontLikeKey, FrontLikeModel, FrontLikeCreateReq, FrontBrowseRecordCreateReq, FrontBrowseRecordModel, FrontCommentCreateReq, FrontCommentModel, FrontCommentPage, FrontCommentReq, FrontCollectCreateReq, FrontCollectModel, FrontCollectPage, FrontCollectReq, CmsChannelKey, CmsChannelModel, CmsSeatsReq, CmsSeatsList, CmsSeatInfoReq, CmsSeatInfoList } from "./types";
+import { CmsSiteKey, CmsSiteList, CmsSiteModel, CmsChannelReq, CmsChannelList, CmsInfoReq, CmsInfoPage, CmsInfoKey, CmsInfoModel, CmsInfoContentReq, CmsInfoContentList, CmsContentInfoReq, CmsContentInfoModel, CmsInfoFileReq, CmsInfoFileList, FrontInteractKey, FrontInteractModel, FrontLikeKey, FrontLikeModel, FrontLikeCreateReq, FrontBrowseRecordCreateReq, FrontBrowseRecordModel, FrontRelayRecordCreateReq, FrontRelayRecordModel, FrontCommentCreateReq, FrontCommentModel, FrontCommentPage, FrontCommentReq, FrontCollectCreateReq, FrontCollectModel, FrontCollectPage, FrontCollectReq, CmsChannelKey, CmsChannelModel, CmsSeatsReq, CmsSeatsList, CmsSeatInfoReq, CmsSeatInfoList } from "./types";
 import { ResponseData } from "../../api/types";
 declare class CmsApiImpl {
     findCmsSiteList(tenant: string): Promise<ResponseData<CmsSiteList>>;
@@ -18,6 +18,7 @@ declare class CmsApiImpl {
     isLike(data: FrontLikeKey): Promise<ResponseData<any>>;
     frontLike(data: FrontLikeCreateReq): Promise<ResponseData<FrontLikeModel>>;
     createfrontBrowseRecord(data: FrontBrowseRecordCreateReq): Promise<ResponseData<FrontBrowseRecordModel>>;
+    createFrontRelayRecord(data: FrontRelayRecordCreateReq): Promise<ResponseData<FrontRelayRecordModel>>;
     findFrontCommentPage(data: FrontCommentReq): Promise<ResponseData<FrontCommentPage>>;
     createFrontComment(data: FrontCommentCreateReq): Promise<ResponseData<FrontCommentModel>>;
     createMyFrontCollect(data: FrontCollectCreateReq): Promise<ResponseData<FrontCollectModel>>;

package/lib/api/cms/index.js

@@ -202,6 +202,17 @@ class CmsApiImpl {
             },
         });
     }
+    // 转发
+    createFrontRelayRecord(data) {
+        return mpx.xfetch.fetch({
+            url: "/v1/front/front/front_relay_record",
+            method: "POST",
+            data,
+            header: {
+                "Grpc-Metadata-Tenant": data.tenant,
+            },
+        });
+    }
     // 查询翻页信息评论表
     findFrontCommentPage(data) {
         if (data) {

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

@@ -87,6 +87,7 @@ export interface CmsInfoReq {
     isImg?: boolean;
     modelCode?: string;
     hasModel?: boolean;
+    organId?: string;
 }
 export interface CmsInfoKey {
     tenant?: string;
@@ -274,6 +275,22 @@ export interface FrontBrowseRecordCreateReq {
 export interface FrontBrowseRecordModel {
     browseId?: string;
 }
+export interface FrontRelayRecordCreateReq {
+    tenant: string;
+    requestId?: string;
+    validateOnly?: boolean;
+    type?: string;
+    relationId?: string;
+    organId?: string;
+}
+export interface FrontRelayRecordModel {
+    relayId?: string;
+    type?: string;
+    relationId?: string;
+    realIp?: string;
+    createTime?: string;
+    createBy?: string;
+}
 export interface FrontCommentCreateReq {
     tenant: string;
     requestId?: string;

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

@@ -16,6 +16,8 @@ declare class FileApi {
     fileUrl(fileUrl?: string): string;
     fileIdUrl(fileId?: string): string;
     uploadBase64File(base64: FileBase64Req): Promise<ResponseData<FileInfo>>;
+    /** 上传文件 */
+    uploadFileWeb(file: File): Promise<ResponseData<FileInfo>>;
     uploadFile(file: string): Promise<FileInfo>;
     downloadFile(url: string): Promise<FileDownInfo>;
     uploadWebFile(data: FileWebReq): Promise<ResponseData<FileInfo>>;

package/lib/api/files/index.js

@@ -65,6 +65,20 @@ class FileApi {
             data: base64,
         });
     }
+    /** 上传文件 */
+    uploadFileWeb(file) {
+        const formData = new FormData();
+        formData.append("file", file);
+        return mpx.xfetch.fetch({
+            url: "/api/v1/files",
+            method: "POST",
+            data: formData,
+            header: {
+                "Content-Type": "multipart/form-data",
+                Authorization: db.getBearerToken(),
+            },
+        });
+    }
     // 上传文件
     uploadFile(file) {
         const p = mpx.uploadFile({

package/lib/index.d.ts

@@ -1,6 +1,6 @@
 export type { AppConfig, ResponseData, ValidateData, EventBase, EventTarget, CanvasResponse, } from "./api/types";
 export type { LoginReq, LoginRes, RolesPerms, WebLoginReq, TokenModel, PhoneRegisterReq, PhoneReplaceReq, UpdateUserReq, UserInfoReq, UserInfo, GzhSubscribeCheckReq, } from "./api/auth/types";
-export type { CmsSiteList, CmsSiteKey, CmsSiteModel, CmsChannelReq, CmsChannelList, CmsChannelModel, CmsChannelKey, CmsInfoPage, CmsInfoModelTotal, CmsInfoReq, CmsInfoKey, CmsInfoModel, CmsInfoContentReq, CmsInfoContentModel, CmsInfoContentList, CmsContentInfoReq, CmsContentInfoModel, CmsInfoFileReq, CmsInfoFileModel, CmsInfoFileList, CmsSeatsReq, CmsSeatsList, CmsSeatsModel, CmsSeatInfoReq, CmsSeatInfoList, CmsSeatInfoModel, FrontInteractKey, FrontInteractModel, FrontLikeKey, FrontLikeCreateReq, FrontLikeModel, FrontBrowseRecordCreateReq, FrontBrowseRecordModel, FrontCommentCreateReq, FrontCommentModel, FrontCommentModelTotal, FrontCommentPage, FrontCommentReq, FrontCollectCreateReq, FrontCollectModel, FrontCollectModelTotal, FrontCollectPage, FrontCollectReq, } from "./api/cms/types";
+export type { CmsSiteList, CmsSiteKey, CmsSiteModel, CmsChannelReq, CmsChannelList, CmsChannelModel, CmsChannelKey, CmsInfoPage, CmsInfoModelTotal, CmsInfoReq, CmsInfoKey, CmsInfoModel, CmsInfoContentReq, CmsInfoContentModel, CmsInfoContentList, CmsContentInfoReq, CmsContentInfoModel, CmsInfoFileReq, CmsInfoFileModel, CmsInfoFileList, CmsSeatsReq, CmsSeatsList, CmsSeatsModel, CmsSeatInfoReq, CmsSeatInfoList, CmsSeatInfoModel, FrontInteractKey, FrontInteractModel, FrontLikeKey, FrontLikeCreateReq, FrontLikeModel, FrontBrowseRecordCreateReq, FrontBrowseRecordModel, FrontRelayRecordCreateReq, FrontRelayRecordModel, FrontCommentCreateReq, FrontCommentModel, FrontCommentModelTotal, FrontCommentPage, FrontCommentReq, FrontCollectCreateReq, FrontCollectModel, FrontCollectModelTotal, FrontCollectPage, FrontCollectReq, } from "./api/cms/types";
 export type { Entry, DictEntryModel, DictEntryLayModel, } from "./api/dict/types";
 export { EntryDict, EnumDict, EntryLayDict, CustomBizDict } from "./api/dicts";
 export type { FileInfo, FileBase64Req, FileDownInfo, FileWebReq, } from "./api/files/types";

package/lib/store/user.js

@@ -2,7 +2,7 @@ import { defineStore } from "@mpxjs/pinia";
 import { authApi } from "../api/auth/index";
 import { db } from "../utils/db";
 import { net } from "../utils/net";
-import mpx from "@mpxjs/core";
+import mpx, { unref } from "@mpxjs/core";
 export const useUserStore = defineStore("user", {
     state: () => ({
         userInfo: db.getUserInfo() || {},
@@ -161,17 +161,23 @@ export const useUserStore = defineStore("user", {
         },
         /** 检查登录是否有效？ */
         checkLogin() {
-            if (this.accessToken && !this.isTokenExpires()) {
+            const accessToken = unref(this.accessToken);
+            if (accessToken && accessToken !== "" && !this.isTokenExpires()) {
                 return true;
             }
             return false;
         },
         //是否Token过期.
         isTokenExpires() {
-            const expiresDate = this.expiresDate;
-            //无token/无过期时间直接视为过期
-            if (!this.accessToken || !expiresDate)
+            const accessToken = unref(this.accessToken);
+            const expiresDate = Number(unref(this.expiresDate));
+            // 部分运行环境可能保留 Ref 包装；先取实际值，再判断有效期。
+            if (!accessToken ||
+                accessToken === "" ||
+                !Number.isFinite(expiresDate) ||
+                expiresDate <= 0) {
                 return true;
+            }
             const now = new Date().getTime();
             return now + 30000 > expiresDate;
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jmash-core-mp",
-  "version": "0.1.92",
+  "version": "0.1.94",
   "private": false,
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -13,7 +13,7 @@
     "@mpxjs/store": "^2.11.0",
     "@mpxjs/utils": "^2.11.0",
     "dayjs": "^1.11.23",
-    "pinia": "^2.0.14",
+    "pinia": "~2.0.36",
     "vue": "^2.7.0",
     "sm-crypto": "0.4.0",
     "vue-demi": "^0.14.10",

package/src/api/cms/index.ts

@@ -21,6 +21,8 @@ import {
   FrontLikeCreateReq,
   FrontBrowseRecordCreateReq,
   FrontBrowseRecordModel,
+  FrontRelayRecordCreateReq,
+  FrontRelayRecordModel,
   FrontCommentCreateReq,
   FrontCommentModel,
   FrontCommentPage,
@@ -278,6 +280,20 @@ class CmsApiImpl {
     });
   }
 
+  // 转发
+  createFrontRelayRecord(
+    data: FrontRelayRecordCreateReq,
+  ): Promise<ResponseData<FrontRelayRecordModel>> {
+    return mpx.xfetch.fetch({
+      url: "/v1/front/front/front_relay_record",
+      method: "POST",
+      data,
+      header: {
+        "Grpc-Metadata-Tenant": data.tenant,
+      },
+    });
+  }
+
   // 查询翻页信息评论表
   findFrontCommentPage(
     data: FrontCommentReq,

package/src/api/cms/types.ts

@@ -173,6 +173,8 @@ export interface CmsInfoReq {
   modelCode?: string;
   // 是否包含信息模型
   hasModel?: boolean;
+  // 组织ID
+  organId?: string;
 }
 
 // 信息主表主键.
@@ -531,6 +533,37 @@ export interface FrontBrowseRecordModel {
   browseId?: string;
 }
 
+// 转发记录表新增
+export interface FrontRelayRecordCreateReq {
+  // 租户
+  tenant: string;
+  // 用于检测重复请求的唯一字符串ID
+  requestId?: string;
+  // 如果为true，则表示给定的请求仅需要被检验，而不是被执行
+  validateOnly?: boolean;
+  // 类型(cms_info: 信息, cms_product: 产品, vcard_share: 递名片, vcard_forward: 转发名片)
+  type?: string;
+  // 关系
+  relationId?: string;
+  // 组织ID
+  organId?: string;
+}
+// 转发记录表实体
+export interface FrontRelayRecordModel {
+  // 转发id
+  relayId?: string;
+  // 类型
+  type?: string;
+  // 关系
+  relationId?: string;
+  // 用户IP地址
+  realIp?: string;
+  // 创建时间
+  createTime?: string;
+  // 创建者
+  createBy?: string;
+}
+
 // 评论表新增
 export interface FrontCommentCreateReq {
   // 租户

package/src/api/files/index.ts

@@ -89,6 +89,20 @@ class FileApi {
       data: base64,
     });
   }
+  /** 上传文件 */
+  uploadFileWeb(file: File): Promise<ResponseData<FileInfo>> {
+    const formData = new FormData();
+    formData.append("file", file);
+    return mpx.xfetch.fetch({
+      url: "/api/v1/files",
+      method: "POST",
+      data: formData,
+      header: {
+        "Content-Type": "multipart/form-data",
+        Authorization: db.getBearerToken(),
+      },
+    });
+  }
 
   // 上传文件
   uploadFile(file: string): Promise<FileInfo> {

package/src/app.mpx

@@ -28,11 +28,18 @@ createApp({
 
 <style lang="scss">
 @use './styles/theme-default' as theme;
+@import './styles/mixin.css';
 
-// 更换主题
 page,
 #app {
   @include theme.variables;
+  box-sizing: border-box;
+  min-height: 100%;
+  background: var(--cube-fill-bgc, #f2f2f2);
+  color: var(--cube-text-color, #323233);
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "PingFang SC", "Microsoft YaHei", sans-serif;
+  font-size: var(--cube-font-size-sm, 28rpx);
+  line-height: 1.6;
 }
 </style>
 

package/src/components/auth-user/jmash-logout.mpx

@@ -1,13 +1,14 @@
 <template>
   <view class="logout-section">
     <!-- 登录状态才显示退出按钮 -->
-    <cube-button primary class="jmash-btn btn-width-50" bind:tap="handleLogout" wx:if="{{ isLogin }}">退出登录</cube-button>
+    <cube-button primary class="jmash-btn btn-width-50" bind:tap="handleLogout"
+      wx:if="{{ userStore.checkLogin() }}">退出登录</cube-button>
     <text class="version-text">当前版本 V{{ version }}</text>
   </view>
 </template>
 
 <script>
-import mpx, { createComponent, computed } from '@mpxjs/core'
+import mpx, { createComponent } from '@mpxjs/core'
 import { useUserStore } from '../../store/user'
 
 createComponent({
@@ -20,9 +21,8 @@ createComponent({
   },
   setup() {
     let userStore = useUserStore();
-    const isLogin = computed(() => userStore.accessToken !== '');
     return {
-      isLogin, userStore
+      userStore
     };
   },
   methods: {
@@ -31,14 +31,13 @@ createComponent({
       mpx.showModal({
         title: '提示',
         content: '确定要退出登录吗？',
-        success: (res) => {
-          if (res.confirm) {
-            // 调用退出接口
-            this.userStore.logout()
-            mpx.showToast({ title: '已退出登录', icon: 'success' })
-            // 通知父组件退出成功
-            this.triggerEvent('logoutSuccess');
-          }
+      }).then((res) => {
+        if (res.confirm) {
+          // 调用退出接口
+          this.userStore.logout()
+          mpx.showToast({ title: '已退出登录', icon: 'success' })
+          // 通知父组件退出成功
+          this.triggerEvent('logoutSuccess');
         }
       })
     }
@@ -49,19 +48,25 @@ createComponent({
 <style lang="scss">
 @import "../../styles/mixin.css";
 
-.btn-width-50 {
-  width: 50%;
-}
-
 .logout-section {
   display: flex;
   flex-direction: column;
   align-items: center;
+  gap: 24rpx;
+  padding: 32rpx 24rpx;
+  --cube-btn-font-size: 28rpx;
+  --cube-btn-border-radius: 20rpx;
+}
 
-  .version-text {
-    font-size: var(--cube-font-size-sm);
-    color: var(--cube-text-color-hint);
-  }
+.btn-width-50 {
+  width: 100%;
+  max-width: 560px;
+}
+
+.version-text {
+  color: var(--cube-text-color-hint, #999);
+  font-size: 24rpx;
+  line-height: 1.6;
 }
 </style>