jmash-core-mp 0.1.29 → 0.1.31

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

@@ -1,5 +1,5 @@
 import { ResponseData } from "../../api/types";
-import { EnumRes, DictEntryReq, DictEntryList } from "./types";
+import { EnumRes, DictEntryReq, DictEntryList, DictEntryLayList } from "./types";
 declare class DictApiImpl {
     /**
      * 枚举
@@ -13,6 +13,12 @@ declare class DictApiImpl {
      * @returns 返回Promise<Entry[]>的对象
      */
     dictEntryApi(data: DictEntryReq): Promise<ResponseData<DictEntryList>>;
+    /**
+     * 带子集字典
+     * @param data 查询条件
+     * @returns 返回Promise<DictEntryLayList>的对象
+     */
+    dictLayEntryApi(data: DictEntryReq): Promise<ResponseData<DictEntryLayList>>;
 }
 declare const dictApi: DictApiImpl;
 export { dictApi };

package/lib/api/dict/index.js

@@ -29,6 +29,22 @@ class DictApiImpl {
             data,
         });
     }
+    /**
+     * 带子集字典
+     * @param data 查询条件
+     * @returns 返回Promise<DictEntryLayList>的对象
+     */
+    dictLayEntryApi(data) {
+        if (data) {
+            data.hasEnable = data.enable !== undefined;
+        }
+        const config = getApp().globalData.config;
+        return mpx.xfetch.fetch({
+            url: "/v1/dict/dict_lay_entry/list/" + config.tenant,
+            method: "GET",
+            data,
+        });
+    }
 }
 const dictApi = new DictApiImpl();
 export { dictApi };

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

@@ -26,3 +26,15 @@ export interface DictEntryReq {
     hasEnable?: boolean;
     enable?: boolean;
 }
+export interface DictEntryLayModel {
+    typeCode?: string;
+    dictCode?: string;
+    dictName?: string;
+    listOrder?: number;
+    enable?: boolean;
+    description?: string;
+    children?: Array<DictEntryLayModel>;
+}
+export interface DictEntryLayList {
+    results: Array<DictEntryLayModel>;
+}

package/lib/api/dicts.d.ts

@@ -1,4 +1,4 @@
-import { Entry, DictEntryModel } from "./dict/types";
+import { Entry, DictEntryModel, DictEntryLayModel } from "./dict/types";
 export declare class EnumDict {
     module: string;
     enumClass: string;
@@ -16,3 +16,11 @@ export declare class EntryDict {
     useDictValues(): Promise<DictEntryModel[]>;
     getDictValue(key: string): string;
 }
+export declare class EntryLayDict {
+    typeCode: string;
+    enable?: boolean;
+    values: DictEntryLayModel[];
+    constructor(typeCode: string, enable?: boolean);
+    useDictValues(): Promise<DictEntryLayModel[]>;
+    getDictValue(key: string): string;
+}

package/lib/api/dicts.js

@@ -65,3 +65,34 @@ export class EntryDict {
         return entry?.dictName ? entry.dictName : "";
     }
 }
+// 带子集字典类
+export class EntryLayDict {
+    typeCode;
+    enable;
+    values = [];
+    constructor(typeCode, enable = true) {
+        // 字典类型编码
+        this.typeCode = typeCode;
+        // 是否启用
+        this.enable = enable;
+    }
+    // 加载数据字典
+    useDictValues() {
+        return new Promise((resolve) => {
+            const req = {
+                typeCode: this.typeCode,
+                enable: this.enable,
+            };
+            dictApi.dictLayEntryApi(req).then(({ data }) => {
+                this.values.length = 0;
+                this.values.push(...data.results);
+                resolve(this.values);
+            });
+        });
+    }
+    //获取字典值
+    getDictValue(key) {
+        const entry = this.values.find((entrys) => entrys.dictCode === key);
+        return entry?.dictName ? entry.dictName : "";
+    }
+}

package/lib/api/files/index.js

@@ -114,7 +114,6 @@ class FileApi {
     }
     // 上传文件
     uploadWebFile(data) {
-        // data.tenant = data.tenant ? config.tenant;
         grpc.clearEmpty(data);
         return mpx.xfetch.fetch({
             url: "/v1/file/webupload",

package/lib/index.d.ts

@@ -1,8 +1,8 @@
 export type { AppConfig, ResponseData, ValidateData, EventBase, EventTarget, CanvasResponse, } from "./api/types";
 export type { LoginReq, LoginRes, RolesPerms, WebLoginReq, TokenModel, PhoneRegisterReq, PhoneReplaceReq, UpdateUserReq, UserInfoReq, UserInfo, } from "./api/auth/types";
 export type { CmsSiteList, CmsChannelReq, CmsChannelList, CmsContentInfoReq, CmsContentInfoModel, CmsInfoModel, CmsInfoContentModel, CmsChannelModel, } from "./api/cms/types";
-export type { Entry, DictEntryModel } from "./api/dict/types";
-export { EntryDict, EnumDict } from "./api/dicts";
+export type { Entry, DictEntryModel, DictEntryLayModel } from "./api/dict/types";
+export { EntryDict, EnumDict, EntryLayDict } from "./api/dicts";
 export type { FileInfo, FileBase64Req, FileDownInfo, FileWebReq, } from "./api/files/types";
 export type { DictRegionList, DictRegionReq, DictRegionModel, } from "./api/region/types";
 export type { StorageOrganInfoReq, StorageOrganInfoList, StorageOrganInfoModel, ShopBrowserUserList, ShopBrowserUserModel, StorageOrganBrowserUpdateReq, StorageOrganBrowserModel, } from "./api/storage/types";

package/lib/index.js

@@ -1,4 +1,4 @@
-export { EntryDict, EnumDict } from "./api/dicts";
+export { EntryDict, EnumDict, EntryLayDict } from "./api/dicts";
 export { mpxFetch } from "./utils/request";
 export { config, initConfig, setConfig } from "./utils/config";
 export { grpc } from "./utils/grpc";

package/package.json

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

package/src/api/dict/index.ts

@@ -1,5 +1,5 @@
 import { ResponseData, AppConfig } from "../../api/types";
-import { EnumEntryReq, EnumRes, DictEntryReq, DictEntryList } from "./types";
+import { EnumEntryReq, EnumRes, DictEntryReq, DictEntryList, DictEntryLayList } from "./types";
 import mpx from "@mpxjs/core";
 
 class DictApiImpl {
@@ -37,6 +37,23 @@ class DictApiImpl {
       data,
     });
   }
+
+  /**
+   * 带子集字典
+   * @param data 查询条件
+   * @returns 返回Promise<DictEntryLayList>的对象
+   */
+  dictLayEntryApi(data: DictEntryReq): Promise<ResponseData<DictEntryLayList>> {
+    if (data) {
+      data.hasEnable = data.enable !== undefined;
+    }
+    const config = getApp().globalData.config;
+    return mpx.xfetch.fetch({
+      url: "/v1/dict/dict_lay_entry/list/" + config.tenant,
+      method: "GET",
+      data,
+    });
+  }
 }
 
 const dictApi = new DictApiImpl();

package/src/api/dict/types.ts

@@ -47,4 +47,28 @@ export interface DictEntryReq {
   hasEnable?: boolean;
   // 是否启用
   enable?: boolean;
+}
+
+// 带子集字典实体
+export interface DictEntryLayModel {
+  // 字典类型编码
+  typeCode?: string;
+  // 字典编码
+  dictCode?: string;
+  // 字典名称
+  dictName?: string;
+  // 排序
+  listOrder?: number;
+  // 是否启用
+  enable?: boolean;
+  // 描述
+  description?: string;
+  // 子集
+  children?: Array<DictEntryLayModel>;
+}
+
+// 带子集字典列表
+export interface DictEntryLayList {
+  // 内容
+  results: Array<DictEntryLayModel>;
 }

package/src/api/dicts.ts

@@ -1,4 +1,4 @@
-import { Entry, DictEntryModel, DictEntryReq } from "./dict/types";
+import { Entry, DictEntryModel, DictEntryReq, DictEntryLayModel } from "./dict/types";
 import { dictApi } from "./dict/index";
 //枚举字典类.
 export class EnumDict {
@@ -70,3 +70,36 @@ export class EntryDict {
     return entry?.dictName ? entry.dictName : "";
   }
 }
+
+// 带子集字典类
+export class EntryLayDict {
+  typeCode: string;
+  enable?: boolean;
+  values: DictEntryLayModel[] = [];
+  constructor(typeCode: string, enable: boolean = true) {
+    // 字典类型编码
+    this.typeCode = typeCode;
+    // 是否启用
+    this.enable = enable;
+  }
+  // 加载数据字典
+  useDictValues(): Promise<DictEntryLayModel[]> {
+    return new Promise((resolve) => {
+      const req = {
+        typeCode: this.typeCode,
+        enable: this.enable,
+      } as DictEntryReq;
+      dictApi.dictLayEntryApi(req).then(({ data }) => {
+        this.values.length = 0;
+        this.values.push(...data.results);
+        resolve(this.values);
+      });
+    });
+  }
+
+  //获取字典值
+  getDictValue(key: string): string {
+    const entry = this.values.find((entrys) => entrys.dictCode === key);
+    return entry?.dictName ? entry.dictName : "";
+  }
+}

package/src/api/files/index.ts

@@ -139,7 +139,6 @@ class FileApi {
 
   // 上传文件
   uploadWebFile(data: FileWebReq): Promise<ResponseData<FileInfo>> {
-    // data.tenant = data.tenant ? config.tenant;
     grpc.clearEmpty(data);
     return mpx.xfetch.fetch({
       url: "/v1/file/webupload",

package/src/components/common/jmash-cascader-region.mpx

@@ -57,6 +57,8 @@ createComponent({
     handleConfirm(e: EventBase) {
       const selectedOptions = e.detail;
       this.triggerEvent("cascaderValue", selectedOptions.selectedText);
+      const lastCode = selectedOptions.selectedVal?.[selectedOptions.selectedVal.length - 1] || "";
+      this.triggerEvent("cascaderCode", lastCode);
       // 关闭弹框
       this.handleRegionClose();
     },
@@ -91,7 +93,7 @@ createComponent({
         if (!regionId) {
           this.regionOption = [...this.regionOption, ...regionData];
         }
-        console.log("级联地区数组==>", this.regionOption);
+        // console.log("级联地区数组==>", this.regionOption);           
         return regionData;
       } catch (error) {
         return [];

package/src/components/common/jmash-none-data.mpx

@@ -30,6 +30,11 @@ createComponent({
       type: String,
       value: "暂无数据"
     },
+    // 文本颜色
+    contentColor: {
+      type: String,
+      value: "#b6b6b6"
+    },
     // 图片的宽
     imgWidth: {
       type: String,
@@ -45,10 +50,6 @@ createComponent({
       type: String,
       value: "/components/contacts_nomore2x.png"
     },
-    contentColor: {
-      type: String,
-      value: "#b6b6b6"
-    }
   },
   setup() {
     let config = getApp().globalData.config;

package/src/components/common/jmash-popup.mpx

@@ -1,8 +1,9 @@
 <template>
-    <cube-popup wx:if="{{ show }}" wx:ref="popup" zIndex="999999" position="bottom" transition="move-up"
-        maskClosable="{{ true }}" styleConfig="{{ popupStyle }}" bind:maskClick="closePopup">
+    <cube-popup wx:if="{{ show }}" wx:ref="popup" zIndex="999999" position="{{ position }}"
+        transition="{{ transition }}" maskClosable="{{ true }}" styleConfig="{{ popupStyle }}"
+        bind:maskClick="closePopup">
         <view class="auth-mask-popup"
-            style="height: {{ height }}; background-color: {{ backColor }};border-top-left-radius: {{ borderRadius }};border-top-right-radius: {{ borderRadius }};width: 100%;">
+            style="width: {{ width }}; height: {{ height }}; background-color: {{ backColor }};border-top-left-radius: {{ borderRadius }};border-top-right-radius: {{ borderRadius }};">
             <view class="popup-title" wx:if="{{ titleShow }}">
                 {{ title }}
                 <image class="close-icon" src="{{ resourceUrl + 'close_circle2x.png' }}" mode="aspectFit"
@@ -39,7 +40,12 @@ createComponent({
             type: Boolean,
             value: true
         },
-        // 高
+        // 宽度
+        width: {
+            type: String,
+            value: "92%"
+        },
+        // 高度
         height: {
             type: String,
             value: ""
@@ -54,6 +60,16 @@ createComponent({
             type: String,
             value: "50rpx"
         },
+        // 位置
+        position: {
+            type: String,
+            value: "bottom"
+        },
+        // 过渡动画
+        transition: {
+            type: String,
+            value: "move-up"
+        },
         // 层级
         zIndex: {
             type: Number,
@@ -111,7 +127,6 @@ createComponent({
     position: fixed;
     bottom: 0;
     left: 0;
-    width: 92%;
     padding: 0 30rpx env(safe-area-inset-bottom);
     box-sizing: border-box;
     z-index: $z-index;

package/src/components/common/jmash-top-navigation.mpx

@@ -4,13 +4,13 @@
         <view class="nav-bar-content"
             style="color: {{ currentTitleColor }}; height: {{ style.height }}px;padding-top: {{ style.paddingTop }}px;">
             <!-- 左侧区域 -->
-            <view class="nav-bar-left" slot="left">
+            <view class="nav-bar-left">
                 <view class="left-icon" wx:if="{{ leftIcon }}"
                     bind:tap="{{ leftIcon === 'home' ? 'handleIndex' : 'handleReturn' }}">
                     <cube-icon type="{{ leftIcon === 'home' ? 'home' : 'back' }}" size="30rpx"
                         color="{{ currentTitleColor }}" />
                 </view>
-                <slot />
+                <slot name="left" />
             </view>
 
             <!-- 标题区域 -->

package/src/index.ts

@@ -28,8 +28,8 @@ export type {
   CmsInfoContentModel,
   CmsChannelModel,
 } from "./api/cms/types";
-export type { Entry, DictEntryModel } from "./api/dict/types";
-export { EntryDict, EnumDict } from "./api/dicts";
+export type { Entry, DictEntryModel, DictEntryLayModel } from "./api/dict/types";
+export { EntryDict, EnumDict, EntryLayDict } from "./api/dicts";
 export type {
   FileInfo,
   FileBase64Req,