jmash-core-mp 0.1.86 → 0.1.87

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, FrontCollectKey, 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, 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>>;
@@ -20,7 +20,6 @@ declare class CmsApiImpl {
     findFrontCommentPage(data: FrontCommentReq): Promise<ResponseData<FrontCommentPage>>;
     createFrontComment(data: FrontCommentCreateReq): Promise<ResponseData<FrontCommentModel>>;
     createMyFrontCollect(data: FrontCollectCreateReq): Promise<ResponseData<FrontCollectModel>>;
-    deleteMyFrontCollect(data: FrontCollectKey): Promise<ResponseData<FrontCollectModel>>;
     findMyAllCollectPage(data: FrontCollectReq): Promise<ResponseData<FrontCollectPage>>;
 }
 declare const cmsApi: CmsApiImpl;

package/lib/api/cms/index.js

@@ -215,7 +215,7 @@ class CmsApiImpl {
             },
         });
     }
-    // 新增我的收藏
+    // 收藏/取消收藏
     createMyFrontCollect(data) {
         return mpx.xfetch.fetch({
             url: "/v1/front/front/my_front_collect",
@@ -226,18 +226,6 @@ class CmsApiImpl {
             },
         });
     }
-    // 取消收藏
-    deleteMyFrontCollect(data) {
-        grpc.clearEmpty(data);
-        return mpx.xfetch.fetch({
-            url: "/v1/front/front/my_front_collect/id",
-            method: "GET",
-            data,
-            header: {
-                "Grpc-Metadata-Tenant": data.tenant,
-            },
-        });
-    }
     // 查询当前库下我的全部收藏分页
     findMyAllCollectPage(data) {
         if (data) {

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

@@ -136,17 +136,6 @@ export interface CmsContentInfoModel {
     cmsInfo?: CmsInfoModel;
     infoContentResults?: Array<CmsInfoContentModel>;
 }
-export interface CmsInfoKey {
-    tenant?: string;
-    infoId?: string;
-}
-export interface CmsInfoContentReq {
-    tenant?: string;
-    infoId?: string;
-}
-export interface CmsInfoContentList {
-    results: Array<CmsInfoContentModel>;
-}
 export interface CmsInfoFileReq {
     tenant?: string;
     infoId?: string;
@@ -163,6 +152,14 @@ export interface CmsInfoFileModel {
     fileHeight?: number;
     videoTime?: number;
     intro?: string;
+    fileLocation?: string;
+    geoLongitude?: number;
+    geoLatitude?: number;
+    geoAccuracy?: number;
+    geoAltitude?: string;
+    geoAltitudeAccracy?: number;
+    createTime?: string;
+    createBy?: string;
 }
 export interface CmsInfoFileList {
     results: Array<CmsInfoFileModel>;
@@ -316,6 +313,7 @@ export interface FrontCollectCreateReq {
     appId?: string;
     linkUrl?: string;
     organId?: string;
+    action?: boolean;
 }
 export interface FrontCollectModel {
     collectId?: string;
@@ -340,11 +338,6 @@ export interface FrontCollectPage {
     subTotalDto?: FrontCollectModelTotal;
     totalDto?: FrontCollectModelTotal;
 }
-export interface FrontCollectKey {
-    tenant?: string;
-    collectId?: string;
-    organId?: string;
-}
 export interface FrontCollectReq {
     tenant: string;
     curPage?: number;

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, CmsChannelReq, CmsChannelList, CmsContentInfoReq, CmsContentInfoModel, CmsInfoModel, CmsInfoContentModel, CmsChannelModel, CmsSeatsReq, CmsSeatsList, CmsSeatsModel, CmsSeatInfoReq, CmsSeatInfoList, CmsSeatInfoModel, FrontInteractModel, FrontCommentCreateReq, FrontCommentModel, FrontCommentPage, FrontCommentReq, FrontCollectCreateReq, FrontCollectModel, FrontCollectPage, FrontCollectKey, 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, 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/package.json

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

package/src/api/cms/index.ts

@@ -28,7 +28,6 @@ import {
   FrontCollectCreateReq,
   FrontCollectModel,
   FrontCollectPage,
-  FrontCollectKey,
   FrontCollectReq,
   CmsChannelKey,
   CmsChannelModel,
@@ -295,7 +294,7 @@ class CmsApiImpl {
     });
   }
 
-  // 新增我的收藏
+  // 收藏/取消收藏
   createMyFrontCollect(
     data: FrontCollectCreateReq,
   ): Promise<ResponseData<FrontCollectModel>> {
@@ -309,21 +308,6 @@ class CmsApiImpl {
     });
   }
 
-  // 取消收藏
-  deleteMyFrontCollect(
-    data: FrontCollectKey,
-  ): Promise<ResponseData<FrontCollectModel>> {
-    grpc.clearEmpty(data);
-    return mpx.xfetch.fetch({
-      url: "/v1/front/front/my_front_collect/id",
-      method: "GET",
-      data,
-      header: {
-        "Grpc-Metadata-Tenant": data.tenant,
-      },
-    });
-  }
-
   // 查询当前库下我的全部收藏分页
   findMyAllCollectPage(
     data: FrontCollectReq,

package/src/api/cms/types.ts

@@ -267,27 +267,6 @@ export interface CmsContentInfoModel {
   infoContentResults?: Array<CmsInfoContentModel>;
 }
 
-// 信息主表主键
-export interface CmsInfoKey {
-  // 租户
-  tenant?: string;
-  // 内容ID
-  infoId?: string;
-}
-
-// 信息内容查询
-export interface CmsInfoContentReq {
-  // 租户
-  tenant?: string;
-  // 信息ID
-  infoId?: string;
-}
-// 信息内容列表
-export interface CmsInfoContentList {
-  // 当前页内容
-  results: Array<CmsInfoContentModel>;
-}
-
 // 信息附件表查询
 export interface CmsInfoFileReq {
   // 租户
@@ -303,7 +282,7 @@ export interface CmsInfoFileModel {
   infoId?: string;
   // 文件名称
   fileName?: string;
-  // 文件类型
+  // 文件类型(text/video/image/audio/zip/file)
   fileType?: string;
   // 地址
   filePath?: string;
@@ -319,6 +298,22 @@ export interface CmsInfoFileModel {
   videoTime?: number;
   // 文件介绍
   intro?: string;
+  // 信息采集地址
+  fileLocation?: string;
+  // 经度
+  geoLongitude?: number;
+  // 纬度
+  geoLatitude?: number;
+  // 精度
+  geoAccuracy?: number;
+  // 海拔高度
+  geoAltitude?: string;
+  // 海拔高度精度
+  geoAltitudeAccracy?: number;
+  // 创建时间
+  createTime?: string;
+  // 创建者
+  createBy?: string;
 }
 // 信息附件表列表
 export interface CmsInfoFileList {
@@ -610,6 +605,8 @@ export interface FrontCollectCreateReq {
   linkUrl?: string;
   // 组织ID
   organId?: string;
+  // 收藏true/取消收藏false
+  action?: boolean;
 }
 // 收藏表实体
 export interface FrontCollectModel {
@@ -654,15 +651,6 @@ export interface FrontCollectPage {
   // 合计
   totalDto?: FrontCollectModelTotal;
 }
-// 收藏表主键
-export interface FrontCollectKey {
-  // 租户
-  tenant?: string;
-  // 收藏id
-  collectId?: string;
-  // 组织ID
-  organId?: string;
-}
 // 查询我的收藏分页
 export interface FrontCollectReq {
   // 租户

package/src/components/cms/jmash-cms-article.mpx

@@ -35,7 +35,9 @@
                 </view>
             </block>
             <block wx:if="{{ item.infoType === 'text' }}">
-                <rich-text class="article-text" nodes="{{ item.infoContent }}" />
+                <view class="article-text">
+                    <rich-text style="width: 100%;" nodes="{{ item.infoContent }}" />
+                </view>
             </block>
         </block>
     </view>
@@ -220,6 +222,13 @@ createComponent({
         color: #333;
         line-height: 1.8;
         margin-bottom: 16rpx;
+
+        // 处理图片太大问题
+        .rich-img {
+            width: 100% !important;
+            height: auto !important;
+            display: block !important;
+        }
     }
 }
 </style>

package/src/components/cms/jmash-cms-location.mpx

@@ -33,7 +33,9 @@
                 </view>
             </block>
             <block wx:if="{{ item.infoType === 'text' }}">
-                <rich-text class="article-text" nodes="{{ item.infoContent }}" />
+                <view class="article-text">
+                    <rich-text style="width: 100%;" nodes="{{ item.infoContent }}" />
+                </view>
             </block>
         </block>
     </view>
@@ -146,6 +148,13 @@ createComponent({
         color: #333;
         line-height: 1.8;
         margin-bottom: 16rpx;
+
+        // 处理图片太大问题
+        .rich-img {
+            width: 100% !important;
+            height: auto !important;
+            display: block !important;
+        }
     }
 }
 

package/src/components/common/jmash-cell-group.mpx

@@ -11,7 +11,10 @@
                             src="{{ resourceUrl + item.icon }}" mode="widthFix" />
                         <view class="cell-text">{{ item.text }}</view>
                     </view>
-                    <cube-icon class="cell-arrow" type="arrow" size="28rpx" />
+                    <view class="my-cell-item-r">
+                        <text wx:if="{{ item.desc }}" class="cell-desc">{{ item.desc }}</text>
+                        <cube-icon class="cell-arrow" type="arrow" size="28rpx" />
+                    </view>
                 </button>
             </block>
         </view>
@@ -172,6 +175,18 @@ createComponent({
         color: #1f2937;
     }
 
+    .my-cell-item-r {
+        display: flex;
+        align-items: center;
+        gap: 10rpx;
+
+        .cell-desc {
+            font-size: 28rpx;
+            color: $font-color-grey-opacity;
+            line-height: 40rpx;
+        }
+    }
+
     .cell-arrow {
         color: $font-color-grey-opacity;
     }

package/src/index.ts

@@ -21,28 +21,47 @@ export type {
 } from "./api/auth/types";
 export type {
   CmsSiteList,
+  CmsSiteKey,
+  CmsSiteModel,
   CmsChannelReq,
   CmsChannelList,
-  CmsContentInfoReq,
-  CmsContentInfoModel,
+  CmsChannelModel,
+  CmsChannelKey,
+  CmsInfoPage,
+  CmsInfoModelTotal,
+  CmsInfoReq,
+  CmsInfoKey,
   CmsInfoModel,
+  CmsInfoContentReq,
   CmsInfoContentModel,
-  CmsChannelModel,
+  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,
-  FrontCollectKey,
   FrontCollectReq,
 } from "./api/cms/types";
 export type {