jmash-core-mp 0.1.9 → 0.1.10

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

@@ -1,8 +1,11 @@
-import { CmsSiteList, CmsChannelReq, CmsChannelList, CmsContentInfoReq, CmsContentInfoModel } from "./types";
+import { CmsSiteList, CmsChannelReq, CmsChannelList, CmsInfoReq, CmsInfoPage, CmsInfoKey, CmsInfoModel, CmsInfoContentReq, CmsInfoContentList, CmsContentInfoReq, CmsContentInfoModel } from "./types";
 import { ResponseData } from "../../types/core";
 declare class CmsApiImpl {
     findCmsSiteList(tenant: string): Promise<ResponseData<CmsSiteList>>;
     findCmsChannelList(data: CmsChannelReq): Promise<ResponseData<CmsChannelList>>;
+    findCmsInfoPage(data: CmsInfoReq): Promise<ResponseData<CmsInfoPage>>;
+    findCmsInfo(data: CmsInfoKey): Promise<ResponseData<CmsInfoModel>>;
+    findCmsInfoContent(data: CmsInfoContentReq): Promise<ResponseData<CmsInfoContentList>>;
     findCmsContentInfo(data: CmsContentInfoReq): Promise<ResponseData<CmsContentInfoModel>>;
 }
 declare const cmsApi: CmsApiImpl;

package/lib/api/cms/index.js

@@ -23,17 +23,42 @@ class CmsApiImpl {
             data,
         });
     }
+    // 查询翻页信息信息列表
+    findCmsInfoPage(data) {
+        if (data) {
+            data.hasStatus = data.status !== undefined;
+            data.hasIsImg = data.isImg !== undefined;
+        }
+        grpc.clearEmpty(data);
+        return mpx.xfetch.fetch({
+            url: "/v1/front/cms/cms_info/page/" + data.tenant,
+            method: "GET",
+            data,
+        });
+    }
+    // 查询信息主表
+    findCmsInfo(data) {
+        grpc.clearEmpty(data);
+        return mpx.xfetch.fetch({
+            url: "/v1/front/cms/cms_info/id/" + data.tenant + "/" + data.infoId,
+            method: "GET",
+        });
+    }
+    // 查询列表信息信息内容
+    findCmsInfoContent(data) {
+        grpc.clearEmpty(data);
+        return mpx.xfetch.fetch({
+            url: "/v1/front/cms/cms_info_content/list/" + data.tenant,
+            method: "GET",
+            data,
+        });
+    }
     // 根据栏目别名查询翻页信息信息主表-单页栏目内容
     findCmsContentInfo(data) {
         data.tenant = data.tenant || config.tenant;
         grpc.clearEmpty(data);
         return mpx.xfetch.fetch({
-            url: "/v1/front/cms/cms_info/alias/" +
-                data.tenant +
-                "/" +
-                data.siteId +
-                "/" +
-                data.channelAlias,
+            url: `/v1/front/cms/cms_info/alias/${data.tenant}/${data.siteId}/${data.channelAlias}`,
             method: "GET",
         });
     }

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

@@ -15,6 +15,9 @@ export interface CmsChannelReq {
     hasIsOpen?: boolean;
     channelId?: string;
 }
+export interface CmsChannelList {
+    results: Array<CmsChannelModel>;
+}
 export interface CmsChannelModel {
     channelId: string;
     siteId?: string;
@@ -31,17 +34,31 @@ export interface CmsChannelModel {
     url: string;
     type?: string;
 }
-export interface CmsChannelList {
-    results: Array<CmsChannelModel>;
-}
-export interface CmsContentInfoReq {
+export interface CmsInfoReq {
     tenant?: string;
+    curPage?: number;
+    pageSize?: number;
     siteId?: string;
-    channelAlias: string;
+    channelId?: string;
+    channelAlias?: string;
+    likeInfoTitle?: string;
+    deleted?: boolean;
+    hasStatus?: boolean;
+    status?: string;
+    hasIsImg?: boolean;
+    isImg?: boolean;
 }
-export interface CmsContentInfoModel {
-    cmsInfo?: CmsInfoModel;
-    infoContentResults?: Array<CmsInfoContentModel>;
+export interface CmsInfoPage {
+    results?: Array<CmsInfoModel>;
+    curPage?: number;
+    pageSize?: number;
+    totalSize?: number;
+    subTotalDto?: CmsInfoModelTotal;
+    totalDto?: CmsInfoModelTotal;
+    pageCount?: number;
+}
+export interface CmsInfoModelTotal {
+    totalSize?: number;
 }
 export interface CmsInfoModel {
     infoId?: string;
@@ -58,6 +75,17 @@ export interface CmsInfoModel {
     sourceName?: string;
     siteId: string;
 }
+export interface CmsInfoKey {
+    tenant?: string;
+    infoId: string;
+}
+export interface CmsInfoContentReq {
+    tenant?: string;
+    infoId?: string;
+}
+export interface CmsInfoContentList {
+    results: Array<CmsInfoContentModel>;
+}
 export interface CmsInfoContentModel {
     imagePath?: Array<string>;
     videoPath?: Array<string>;
@@ -70,3 +98,12 @@ export interface CmsInfoContentModel {
         path: string;
     }[];
 }
+export interface CmsContentInfoReq {
+    tenant?: string;
+    siteId?: string;
+    channelAlias: string;
+}
+export interface CmsContentInfoModel {
+    cmsInfo?: CmsInfoModel;
+    infoContentResults?: Array<CmsInfoContentModel>;
+}

package/lib/index.d.ts

@@ -1,4 +1,4 @@
-export type { AppConfig, ResponseData, ValidateData, EventBase, EventTarget, CanvasResponse } from "./types/core";
+export type { AppConfig, ResponseData, ValidateData, EventBase, EventTarget, CanvasResponse, } from "./types/core";
 export type { Entry, DictEntryModel } from "./api/dict/types";
 export { EntryDict, EnumDict } from "./api/dicts";
 export { mpxFetch } from "./utils/request";
@@ -8,6 +8,8 @@ export { db } from "./utils/db";
 export { useUserStore } from "./store/user";
 export { authApi } from "./api/auth";
 export { cmsApi } from "./api/cms";
+export type { CmsInfoModel, CmsInfoContentModel } from "./api/cms/types";
 export { dictApi } from "./api/dict";
 export { fileApi } from "./api/files";
 export { net } from "./utils/net";
+export { getHeight, formatDateTime, validateRules, validateRequired, } from "./utils/common";

package/lib/index.js

@@ -9,3 +9,4 @@ export { cmsApi } from "./api/cms";
 export { dictApi } from "./api/dict";
 export { fileApi } from "./api/files";
 export { net } from "./utils/net";
+export { getHeight, formatDateTime, validateRules, validateRequired, } from "./utils/common";

package/lib/utils/common.d.ts

@@ -0,0 +1,35 @@
+export declare const getHeight: () => {
+    navigationPaddingHeight: number;
+    topHeight: number;
+    bottomHeight: number;
+    MenuButtonRight: number;
+    MenuButtonLeft: number;
+    MenuButtonTop: number;
+    MenuButtonBottom: number;
+    MenuButtonWidth: number;
+    MenuButtonHeight: number;
+    MenuButtonBounding: number;
+    screenWidth: number;
+    screenHeight: number;
+    computeHeightFn: (height: number, stackingHeight: number) => number;
+    addition: (height: number, addHeight: number) => number;
+};
+/**
+ * 格式化日期时间字符串
+ * @param dateTimeString 日期时间字符串
+ * @returns 格式化后的日期时间字符串
+ */
+export declare const formatDateTime: (dateTimeString: string, format?: any) => string;
+/**
+ * 正则校验规则
+ * @param {string} value 需要校验的值
+ * @param {string} message 错误提示信息
+ * @param {string} rules 正则校验规则
+ */
+export declare const validateRules: (value: string, message: string, rules: any) => boolean;
+/**
+ * 校验必填项
+ * @param {string} value 需要校验的值
+ * @param {string} message 错误提示信息
+ */
+export declare const validateRequired: (value: string | number, message: string) => boolean;

package/lib/utils/common.js

@@ -0,0 +1,163 @@
+import mpx from "@mpxjs/core";
+// 获取不同手机的顶部/底部高度
+export const getHeight = () => {
+    // 手机顶部电量等信息的高度+7 状态栏的高度+7
+    let navigationPaddingHeight = 0;
+    // 顶部整体高度(包括胶囊球高度)
+    let topHeight = 0;
+    // 手机底部的安全距离
+    let bottomHeight = 0;
+    // 胶囊球右边界到手机左侧的坐标-坐标信息以屏幕左上角为原点
+    let MenuButtonRight = 0;
+    // 胶囊球左边界到手机左侧的坐标-坐标信息以屏幕左上角为原点
+    let MenuButtonLeft = 0;
+    // 胶囊球上边界到手机顶部的坐标-坐标信息以屏幕左上角为原点
+    let MenuButtonTop = 0;
+    // 胶囊球下边界到手机顶部的坐标-坐标信息以屏幕左上角为原点
+    let MenuButtonBottom = 0;
+    // 胶囊球宽度
+    let MenuButtonWidth = 0;
+    // 胶囊球高度
+    let MenuButtonHeight = 0;
+    // 状态栏的高度
+    let MenuButtonBounding = 0;
+    // 屏幕宽度
+    let screenWidth = 0;
+    // 屏幕高度
+    let screenHeight = 0;
+    try {
+        MenuButtonHeight = mpx.getMenuButtonBoundingClientRect().height
+            ? mpx.getMenuButtonBoundingClientRect().height
+            : 0;
+        navigationPaddingHeight =
+            mpx.getWindowInfo().statusBarHeight + 7
+                ? mpx.getWindowInfo().statusBarHeight + 7
+                : 0;
+        topHeight = MenuButtonHeight + navigationPaddingHeight;
+        bottomHeight =
+            mpx.getWindowInfo().screenHeight - mpx.getWindowInfo().safeArea.bottom
+                ? mpx.getWindowInfo().screenHeight - mpx.getWindowInfo().safeArea.bottom
+                : 0;
+        MenuButtonRight = mpx.getMenuButtonBoundingClientRect().right;
+        MenuButtonLeft = mpx.getMenuButtonBoundingClientRect().left;
+        MenuButtonTop = mpx.getMenuButtonBoundingClientRect().top;
+        MenuButtonBottom = mpx.getMenuButtonBoundingClientRect().bottom;
+        MenuButtonWidth = mpx.getMenuButtonBoundingClientRect().width;
+        MenuButtonBounding = mpx.getWindowInfo().statusBarHeight;
+        screenWidth = mpx.getWindowInfo().screenWidth;
+        screenHeight = mpx.getWindowInfo().screenHeight;
+    }
+    catch (error) {
+        console.log("getHeight", error);
+    }
+    /**
+     * 判断手机型号如果没有底部横线的时候,添加的默认高度
+     * @param height 本身计算的高度
+     * @param stackingHeight 需要叠加的高度
+     */
+    function computeHeightFn(height, stackingHeight) {
+        return height !== 0 ? height : height + stackingHeight;
+    }
+    /**
+     * 原有基础上添加高度
+     * @param height 本身计算的高度
+     * @param addHeight 相加的高度
+     */
+    function addition(height, addHeight) {
+        return height + addHeight;
+    }
+    return {
+        navigationPaddingHeight,
+        topHeight,
+        bottomHeight,
+        MenuButtonRight,
+        MenuButtonLeft,
+        MenuButtonTop,
+        MenuButtonBottom,
+        MenuButtonWidth,
+        MenuButtonHeight,
+        MenuButtonBounding,
+        screenWidth,
+        screenHeight,
+        computeHeightFn,
+        addition,
+    };
+};
+/**
+ * 格式化日期时间字符串
+ * @param dateTimeString 日期时间字符串
+ * @returns 格式化后的日期时间字符串
+ */
+export const formatDateTime = (dateTimeString, format) => {
+    const date = new Date(dateTimeString);
+    // 如果日期无效（即日期为Invalid Date），则返回一个空字符串或默认值
+    if (isNaN(date.getTime())) {
+        return "";
+    }
+    const year = date.getFullYear();
+    const month = ("0" + (date.getMonth() + 1)).slice(-2);
+    const day = ("0" + date.getDate()).slice(-2);
+    const hours = ("0" + date.getHours()).slice(-2);
+    const minutes = ("0" + date.getMinutes()).slice(-2);
+    const seconds = ("0" + date.getSeconds()).slice(-2);
+    if (format === "YYYY-MM-DD HH:mm:ss") {
+        return (year +
+            "-" +
+            month +
+            "-" +
+            day +
+            " " +
+            hours +
+            ":" +
+            minutes +
+            ":" +
+            seconds);
+    }
+    if (format === "YYYY-MM-DD HH:mm") {
+        return year + "-" + month + "-" + day + " " + hours + ":" + minutes;
+    }
+    if (format === "YYYY-MM-DD") {
+        return year + "-" + month + "-" + day;
+    }
+    if (format === "HH:mm:ss") {
+        return hours + ":" + minutes + ":" + seconds;
+    }
+    return "";
+};
+/**
+ * 正则校验规则
+ * @param {string} value 需要校验的值
+ * @param {string} message 错误提示信息
+ * @param {string} rules 正则校验规则
+ */
+export const validateRules = (value, message, rules) => {
+    if (value && !rules.test(value)) {
+        // 显示错误提示
+        mpx.showToast({
+            title: message,
+            icon: "none",
+            duration: 2000,
+        });
+        return false;
+    }
+    return true;
+};
+/**
+ * 校验必填项
+ * @param {string} value 需要校验的值
+ * @param {string} message 错误提示信息
+ */
+export const validateRequired = (value, message) => {
+    console.log(value, message);
+    const valueStr = typeof value === "number" ? String(value) : value;
+    if (!valueStr || valueStr.trim() === "") {
+        // 显示错误提示
+        mpx.showToast({
+            title: message,
+            icon: "none",
+            duration: 2000,
+        });
+        return false;
+    }
+    return true;
+};

package/package.json

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

package/src/api/cms/index.ts

@@ -2,6 +2,12 @@ import {
   CmsSiteList,
   CmsChannelReq,
   CmsChannelList,
+  CmsInfoReq,
+  CmsInfoPage,
+  CmsInfoKey,
+  CmsInfoModel,
+  CmsInfoContentReq,
+  CmsInfoContentList,
   CmsContentInfoReq,
   CmsContentInfoModel,
 } from "./types";
@@ -9,6 +15,7 @@ import { ResponseData } from "../../types/core";
 import { grpc } from "../../utils/grpc";
 import { config } from "../../utils/config";
 import mpx from "@mpxjs/core";
+
 // 获取网站内容信息
 class CmsApiImpl {
   // 查询企业官网、微网站列表
@@ -35,6 +42,41 @@ class CmsApiImpl {
     });
   }
 
+  // 查询翻页信息信息列表
+  findCmsInfoPage(data: CmsInfoReq): Promise<ResponseData<CmsInfoPage>> {
+    if (data) {
+      data.hasStatus = data.status !== undefined;
+      data.hasIsImg = data.isImg !== undefined;
+    }
+    grpc.clearEmpty(data);
+    return mpx.xfetch.fetch({
+      url: "/v1/front/cms/cms_info/page/" + data.tenant,
+      method: "GET",
+      data,
+    });
+  }
+
+  // 查询信息主表
+  findCmsInfo(data: CmsInfoKey): Promise<ResponseData<CmsInfoModel>> {
+    grpc.clearEmpty(data);
+    return mpx.xfetch.fetch({
+      url: "/v1/front/cms/cms_info/id/" + data.tenant + "/" + data.infoId,
+      method: "GET",
+    });
+  }
+
+  // 查询列表信息信息内容
+  findCmsInfoContent(
+    data: CmsInfoContentReq
+  ): Promise<ResponseData<CmsInfoContentList>> {
+    grpc.clearEmpty(data);
+    return mpx.xfetch.fetch({
+      url: "/v1/front/cms/cms_info_content/list/" + data.tenant,
+      method: "GET",
+      data,
+    });
+  }
+
   // 根据栏目别名查询翻页信息信息主表-单页栏目内容
   findCmsContentInfo(
     data: CmsContentInfoReq
@@ -42,13 +84,7 @@ class CmsApiImpl {
     data.tenant = data.tenant || config.tenant;
     grpc.clearEmpty(data);
     return mpx.xfetch.fetch({
-      url:
-        "/v1/front/cms/cms_info/alias/" +
-        data.tenant +
-        "/" +
-        data.siteId +
-        "/" +
-        data.channelAlias,
+      url: `/v1/front/cms/cms_info/alias/${data.tenant}/${data.siteId}/${data.channelAlias}`,
       method: "GET",
     });
   }

package/src/api/cms/types.ts

@@ -3,7 +3,6 @@ export interface CmsSiteList {
   // 当前内容
   results: Array<CmsSiteModel>;
 }
-
 // 网站站点实体
 export interface CmsSiteModel {
   // 站点ID
@@ -31,6 +30,11 @@ export interface CmsChannelReq {
   // 栏目ID
   channelId?: string;
 }
+// 网站栏目列表
+export interface CmsChannelList {
+  // 当前页内容
+  results: Array<CmsChannelModel>;
+}
 // 网站栏目实体
 export interface CmsChannelModel {
   // 栏目ID
@@ -62,30 +66,56 @@ export interface CmsChannelModel {
   // 类型
   type?: string;
 }
-// 网站栏目列表
-export interface CmsChannelList {
-  // 当前页内容
-  results: Array<CmsChannelModel>;
-}
 
-// 根据栏目别名查询翻页信息信息主表-单页栏目内容
-export interface CmsContentInfoReq {
+// 查询翻页信息信息列表
+export interface CmsInfoReq {
   // 租户
   tenant?: string;
+  // 当前页码
+  curPage?: number;
+  // 页尺寸
+  pageSize?: number;
   // 站点ID
   siteId?: string;
+  // 栏目ID
+  channelId?: string;
   // 栏目别名
-  channelAlias: string;
+  channelAlias?: string;
+  // 文章标题
+  likeInfoTitle?: string;
+  // 默认未删除数据，回收站数据
+  deleted?: boolean;
+  // 是否包含文章状态
+  hasStatus?: boolean;
+  // 文章状态
+  status?: string;
+  // 受否查询带有图片的文章
+  hasIsImg?: boolean;
+  // 是否包含新闻图片
+  isImg?: boolean;
 }
-
-// 文章详细信息
-export interface CmsContentInfoModel {
-  // cms信息
-  cmsInfo?: CmsInfoModel;
-  // 内容信息
-  infoContentResults?: Array<CmsInfoContentModel>;
+// 信息主表分页
+export interface CmsInfoPage {
+  // 当前页内容
+  results?: Array<CmsInfoModel>;
+  // 当前页码
+  curPage?: number;
+  // 页尺寸
+  pageSize?: number;
+  // 总记录数
+  totalSize?: number;
+  // 本页小计
+  subTotalDto?: CmsInfoModelTotal;
+  // 合计
+  totalDto?: CmsInfoModelTotal;
+  // 页面数
+  pageCount?: number;
+}
+// 合计
+export interface CmsInfoModelTotal {
+  // 总记录数
+  totalSize?: number;
 }
-
 // 信息主表实体
 export interface CmsInfoModel {
   // 内容ID
@@ -116,6 +146,26 @@ export interface CmsInfoModel {
   siteId: string;
 }
 
+// 信息主表主键
+export interface CmsInfoKey {
+  // 租户
+  tenant?: string;
+  // 内容ID
+  infoId: string;
+}
+
+// 信息内容查询
+export interface CmsInfoContentReq {
+  // 租户
+  tenant?: string;
+  // 信息ID
+  infoId?: string;
+}
+// 信息内容列表
+export interface CmsInfoContentList {
+  // 当前页内容
+  results: Array<CmsInfoContentModel>;
+}
 // 信息内容实体
 export interface CmsInfoContentModel {
   // 图片数组
@@ -135,3 +185,20 @@ export interface CmsInfoContentModel {
   // 信息内容数组
   infoContentList?: { path: string }[];
 }
+
+// 根据栏目别名查询翻页信息信息主表-单页栏目内容
+export interface CmsContentInfoReq {
+  // 租户
+  tenant?: string;
+  // 站点ID
+  siteId?: string;
+  // 栏目别名
+  channelAlias: string;
+}
+// 文章详细信息
+export interface CmsContentInfoModel {
+  // cms信息
+  cmsInfo?: CmsInfoModel;
+  // 内容信息
+  infoContentResults?: Array<CmsInfoContentModel>;
+}