jmash-core-mp 0.1.92 → 0.1.93

package/.gitignore

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

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;

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/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.93",
   "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/types.ts

@@ -173,6 +173,8 @@ export interface CmsInfoReq {
   modelCode?: string;
   // 是否包含信息模型
   hasModel?: boolean;
+  // 组织ID
+  organId?: string;
 }
 
 // 信息主表主键.

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>
 

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

@@ -1,7 +1,7 @@
 <template>
   <!-- 我的页面 中个人信息编辑页面 -->
   <view class="my-information">
-    <view class="main">
+    <view class="main jmash-card">
       <!-- 头像区域 -->
       <view class="main-profile" wx:if="{{ isUserAvatar }}">
         <view class="profile-left">
@@ -10,12 +10,14 @@
         </view>
         <view class="profile-right">
           <cube-button inline open-type="chooseAvatar" bind:chooseAvatar="onChooseAvatar">
-            <image class="avatar-img" src="{{ resourceUrl + '/components/gray_head2x.png' }}" mode="aspectFill"
-              wx:if="{{ !userInfo.avatar && resourceUrl }}" />
-            <image class="avatar-img" src="{{ imageUrl + userInfo.avatar }}" mode="aspectFill"
-              wx:elif="{{ resourceUrl }}" />
-            <view class="avatar-badge">
-              <text class="badge-icon">✎</text>
+            <view class="avatar-content">
+              <image class="avatar-img" src="{{ resourceUrl + '/components/gray_head2x.png' }}" mode="aspectFill"
+                wx:if="{{ !userInfo.avatar && resourceUrl }}" />
+              <image class="avatar-img" src="{{ imageUrl + userInfo.avatar }}" mode="aspectFill"
+                wx:elif="{{ resourceUrl }}" />
+              <view class="avatar-badge">
+                <text class="badge-icon">✎</text>
+              </view>
             </view>
           </cube-button>
         </view>
@@ -34,7 +36,7 @@
       <view class="main-nickname" wx:if="{{ isUserRealName }}">
         <view class="nickname-left">姓名</view>
         <view class="nickname-right">
-          <cube-input wx:model="{{ userInfo.realName }}" wx:model-prop="value" placeholder="请输入昵称" />
+          <cube-input wx:model="{{ userInfo.realName }}" wx:model-prop="value" placeholder="请输入姓名" />
         </view>
       </view>
 
@@ -43,8 +45,10 @@
         <view class="phone-left">手机号</view>
         <view class="phone-right">
           <view class="phone-number">{{ userInfo.mobilePhone || '未绑定手机号' }}</view>
-          <cube-button inline outline primary open-type@wx="getPhoneNumber" open-type@ali="getAuthorize"
-            scope="phoneNumber" wx:if="{{ isChangePhone }}" bind:getPhoneNumber="onGetPhoneNumber">更换手机号</cube-button>
+          <view class="phone-action" wx:if="{{ isChangePhone }}">
+            <cube-button inline outline primary open-type@wx="getPhoneNumber" open-type@ali="getAuthorize"
+              scope="phoneNumber" bind:getPhoneNumber="onGetPhoneNumber">更换手机号</cube-button>
+          </view>
         </view>
       </view>
     </view>
@@ -198,6 +202,7 @@ createComponent({
 </script>
 
 <style lang="scss">
+@import "../../styles/mixin.css";
 .my-information {
   box-sizing: border-box;
   width: 100%;
@@ -206,205 +211,132 @@ createComponent({
   padding-bottom: calc(40rpx + env(safe-area-inset-bottom));
   background: var(--cube-fill-bgc, #f2f2f2);
   color: var(--cube-text-color, #323233);
-
-  .page-heading {
-    padding: 0 8rpx 32rpx;
-  }
-
-  .page-title {
-    display: block;
-    font-size: var(--cube-font-size-xl, 40rpx);
-    font-weight: 600;
-    line-height: 1.4;
-  }
-
-  .page-description {
-    display: block;
-    margin-top: 12rpx;
-    color: var(--cube-text-color-hint, #999);
-    font-size: var(--cube-font-size-xs, 24rpx);
-    line-height: 1.6;
-  }
-
-  .main {
-    padding: 0 32rpx;
-    overflow: hidden;
-    background: var(--cube-color-white, #fff);
-    border: 1rpx solid var(--cube-border-color-normal, #ebebeb);
-    border-radius: 32rpx;
-  }
-
-  .main-profile,
-  .main-nickname,
-  .main-phone {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    min-height: 112rpx;
-    border-bottom: 1rpx solid var(--cube-border-color-normal, #ebebeb);
-
-    &:last-child {
-      border-bottom: 0;
-    }
-  }
-
-  .main-profile {
-    padding: 28rpx 0;
-  }
-
-  .profile-left,
-  .nickname-left,
-  .phone-left {
-    flex-shrink: 0;
-    font-size: var(--cube-font-size-sm, 28rpx);
-    font-weight: 500;
-    line-height: 1.5;
-  }
-
-  .field-title,
-  .field-hint {
-    display: block;
-  }
-
-  .field-hint {
-    margin-top: 10rpx;
-    color: var(--cube-text-color-hint, #999);
-    font-size: var(--cube-font-size-xs, 24rpx);
-    font-weight: 400;
-  }
-
-  .profile-right {
-    flex-shrink: 0;
-    margin-left: 24rpx;
-  }
-
-  .avatar-wrapper {
-    position: relative;
-    margin: 0;
-    padding: 6rpx;
-    background: transparent;
-    border: 2rpx solid var(--cube-color-primary, #ff7e33);
-    border-radius: 50%;
-    line-height: 1;
-    overflow: visible;
-  }
-
-  .avatar-img {
-    display: block;
-    width: 112rpx;
-    height: 112rpx;
-    border-radius: 50%;
-    background: var(--cube-fill-bgc, #f2f2f2);
-  }
-
-  .avatar-badge {
-    position: absolute;
-    right: -2rpx;
-    bottom: -2rpx;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: 36rpx;
-    height: 36rpx;
-    color: var(--cube-color-white, #fff);
-    background: var(--cube-color-primary, #ff7e33);
-    border: 4rpx solid var(--cube-color-white, #fff);
-    border-radius: 50%;
-  }
-
-  .badge-icon {
-    font-size: 24rpx;
-    line-height: 1;
-  }
-
-  .nickname-right,
-  .phone-right {
-    display: flex;
-    flex: 1;
-    min-width: 0;
-    align-items: center;
-    justify-content: flex-end;
-    margin-left: 24rpx;
-  }
-
-  .nickname-input {
-    flex: 1;
-    width: 100%;
-    min-width: 0;
-    height: 88rpx;
-    padding: 0;
-    color: var(--cube-text-color, #323233);
-    background: transparent;
-    border: 0;
-    font-size: var(--cube-font-size-sm, 28rpx);
-    text-align: right;
-  }
-
-  .field-placeholder {
-    color: var(--cube-text-color-hint, #999);
-    font-size: var(--cube-font-size-sm, 28rpx);
-  }
-
-  .phone-right {
-    flex-wrap: wrap;
-    padding: 20rpx 0;
-  }
-
-  .phone-number {
-    max-width: 100%;
-    padding: 8rpx 0;
-    font-size: var(--cube-font-size-sm, 28rpx);
-    line-height: 1.5;
-    overflow-wrap: break-word;
-  }
-
-  .phone-right-btn {
-    flex-shrink: 0;
-    margin: 8rpx 0 8rpx 16rpx;
-    padding: 12rpx 20rpx;
-    color: var(--cube-btn-outline-color, var(--cube-color-primary, #ff7e33));
-    background: var(--cube-btn-outline-bgc, var(--cube-color-white, #fff));
-    border: 1rpx solid var(--cube-btn-outline-border-color, var(--cube-color-primary, #ff7e33));
-    border-radius: 24rpx;
-    font-size: var(--cube-font-size-xs, 24rpx);
-    line-height: 1.5;
-  }
-
-  .main-btn {
-    padding: 40rpx 8rpx 0;
-  }
-
-  .main-btn-item {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    box-sizing: border-box;
-    width: 100%;
-    min-height: 96rpx;
-    margin: 0;
-    padding: 24rpx;
-    color: var(--cube-btn-primary-color, var(--cube-color-white, #fff));
-    background: var(--cube-btn-primary-bgc, var(--cube-color-primary, #ff7e33));
-    border: 0;
-    border-radius: var(--cube-btn-border-radius, 24rpx);
-    font-size: var(--cube-font-size-md, 32rpx);
-    font-weight: 600;
-    line-height: 1.5;
-  }
-
-  .avatar-wrapper,
-  .phone-right-btn,
-  .main-btn-item {
-    transition: opacity 0.2s;
-
-    &::after {
-      border: 0;
-    }
-  }
-
-  .control-pressed {
-    opacity: var(--cube-opacity_active, 0.6);
-  }
+}
+.my-information .main {
+  padding: 0 32rpx;
+  overflow: hidden;
+}
+.my-information .main-profile,
+.my-information .main-nickname,
+.my-information .main-phone {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  min-height: 120rpx;
+  border-bottom: 1rpx solid var(--cube-border-color-normal, #ebebeb);
+}
+.my-information .main-profile:last-child,
+.my-information .main-nickname:last-child,
+.my-information .main-phone:last-child {
+  border-bottom: 0;
+}
+.my-information .main-profile {
+  padding: 28rpx 0;
+}
+.my-information .profile-left,
+.my-information .nickname-left,
+.my-information .phone-left {
+  flex-shrink: 0;
+  font-size: 28rpx;
+  font-weight: 500;
+  line-height: 1.5;
+}
+.my-information .field-title,
+.my-information .field-hint {
+  display: block;
+}
+.my-information .field-hint {
+  margin-top: 10rpx;
+  color: var(--cube-text-color-hint, #999);
+  font-size: 24rpx;
+  font-weight: 400;
+}
+.my-information .profile-right {
+  flex-shrink: 0;
+  margin-left: 24rpx;
+  --cube-btn-bgc: transparent;
+  --cube-btn-bgc_active: transparent;
+  --cube-btn-border-radius: 16rpx;
+  --cube-btn-inline-padding-top: 0;
+  --cube-btn-inline-padding-right: 0;
+  --cube-btn-inline-padding-bottom: 0;
+  --cube-btn-inline-padding-left: 0;
+}
+.my-information .avatar-content {
+  position: relative;
+  padding: 8rpx;
+}
+.my-information .avatar-img {
+  display: block;
+  width: 112rpx;
+  height: 112rpx;
+  border: 2rpx solid var(--cube-border-color-normal, #ebebeb);
+  border-radius: 50%;
+  background: var(--cube-fill-bgc, #f2f2f2);
+}
+.my-information .avatar-badge {
+  position: absolute;
+  right: 4rpx;
+  bottom: 4rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 36rpx;
+  height: 36rpx;
+  color: var(--cube-color-white, #fff);
+  background: var(--cube-color-primary, #ff7e33);
+  border: 4rpx solid var(--cube-color-white, #fff);
+  border-radius: 50%;
+}
+.my-information .badge-icon {
+  font-size: 24rpx;
+  line-height: 1;
+}
+.my-information .nickname-right,
+.my-information .phone-right {
+  flex: 1;
+  min-width: 0;
+  margin-left: 32rpx;
+}
+.my-information .nickname-right {
+  padding: 20rpx 0;
+  --cube-input-font-size: 28rpx;
+  --cube-input-padding: 20rpx 24rpx;
+  --cube-input-border-radius: 16rpx;
+  --cube-input-bgc: var(--cube-fill-bgc, #f2f2f2);
+  --cube-input-border-color: transparent;
+}
+.my-information .phone-right {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  justify-content: flex-end;
+  padding: 24rpx 0;
+  --cube-btn-border-radius: 28rpx;
+  --cube-btn-inline-font-size: 24rpx;
+  --cube-btn-inline-padding-top: 14rpx;
+  --cube-btn-inline-padding-right: 20rpx;
+  --cube-btn-inline-padding-bottom: 14rpx;
+  --cube-btn-inline-padding-left: 20rpx;
+}
+.my-information .phone-number {
+  max-width: 100%;
+  margin: 8rpx 0;
+  font-size: 28rpx;
+  line-height: 1.5;
+  overflow-wrap: break-word;
+}
+.my-information .phone-action {
+  flex-shrink: 0;
+  margin: 8rpx 0 8rpx 20rpx;
+}
+.my-information .main-btn {
+  padding: 40rpx 8rpx 0;
+  --cube-btn-border-radius: 24rpx;
+  --cube-btn-font-size: 32rpx;
+  --cube-btn-primary-font-weight: 600;
+  --cube-btn-block-padding-top: 28rpx;
+  --cube-btn-block-padding-bottom: 28rpx;
 }
 </style>