jmash-diy-mp 0.1.1 → 0.1.3

package/lib/components/basic/basic-image-view.mpx.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/components/basic/basic-text-view.mpx.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/components/basic/basic-video-view.mpx.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/components/custom/custom-view.mpx.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/components/organ/organ-contact-view.mpx.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/node_modules/.pnpm/jmash-core-mp@0.1.14_typescript@4.9.5/node_modules/jmash-core-mp/src/api/auth/index.d.ts

@@ -0,0 +1,21 @@
+import { ResponseData } from "../../api/types";
+import type { LoginReq, LoginRes, RolesPerms, WebLoginReq, TokenModel, PhoneRegisterReq, PhoneReplaceReq, UpdateUserReq, UserInfoReq, UserInfo } from "./types";
+declare class AuthApi {
+    mpLogin(data: LoginReq): Promise<ResponseData<LoginRes>>;
+    mpPhoneRegister(data: PhoneRegisterReq): Promise<ResponseData<LoginRes>>;
+    replaceBindphone(data: PhoneReplaceReq): Promise<ResponseData<string>>;
+    webLogin(data: WebLoginReq): Promise<ResponseData<TokenModel>>;
+    refreshToken(): Promise<ResponseData<TokenModel>>;
+    userInfo(): Promise<ResponseData<UserInfo>>;
+    userRolesPerms(): Promise<ResponseData<RolesPerms>>;
+    allowRunAsUser(): Promise<ResponseData<any[]>>;
+    runAsUser(userId: string): Promise<ResponseData<any>>;
+    updateUser(data: any): Promise<ResponseData<any>>;
+    updatePwd(encodeOldPwd: string, encodeNewPwd: string): Promise<ResponseData<any>>;
+    deptTree(deptId?: string, tenant?: string): Promise<ResponseData<any[]>>;
+    jobTree(jobId?: string, tenant?: string): Promise<ResponseData<any[]>>;
+    updateUserInfo(data: UpdateUserReq): Promise<ResponseData<UserInfo>>;
+    findUserInfo(data: UserInfoReq): Promise<ResponseData<UserInfo>>;
+}
+export declare const authApi: AuthApi;
+export {};

package/lib/node_modules/.pnpm/jmash-core-mp@0.1.14_typescript@4.9.5/node_modules/jmash-core-mp/src/api/auth/types.d.ts

@@ -0,0 +1,86 @@
+export interface TokenModel {
+    accessToken: string;
+    expiresIn: number;
+    refreshToken: string;
+    tokenType: string;
+}
+export declare enum OpensType {
+    wechat = 0,
+    ali_pay = 1,
+    union_pay = 2
+}
+export interface LoginReq {
+    appId: string;
+    loginCode: string;
+    componentAppid?: string;
+    opensType?: OpensType;
+}
+/**
+ * 登录请求参数
+ */
+export interface WebLoginReq {
+    tenant?: string;
+    directoryId?: string;
+    scope?: string;
+    userName: string;
+    encodePwd: string;
+    captchaId?: string;
+    captchaCode?: string;
+    clientId?: string;
+}
+export interface LoginRes {
+    cacheKey?: string;
+    token: TokenModel;
+    status: boolean;
+    message: string;
+}
+export interface PhoneRegisterReq {
+    tenant?: string;
+    appId: string;
+    loginCode?: string;
+    phoneCode: string;
+    nickName?: string;
+    avatar?: string;
+    componentAppid?: string;
+    opensType?: OpensType;
+}
+export interface PhoneReplaceReq {
+    tenant?: string;
+    appId: string;
+    phoneCode: string;
+    componentAppid?: string;
+    opensType?: OpensType;
+}
+export interface RefreshTokenReq {
+    tenant: string;
+    refreshToken: string;
+    clientId: string;
+}
+export interface UserInfo {
+    userId: string;
+    loginName: string;
+    nickName: string;
+    realName: string;
+    avatar: string;
+    mobilePhone: string;
+    mobilePhoneIns: string;
+    storage: string;
+    unifiedId: string;
+}
+export interface RolesPerms {
+    roleCodes: string[];
+    permCodes: string[];
+}
+export interface UpdateUserReq {
+    tenant?: string;
+    requestId?: string;
+    updateMask?: string;
+    nickName?: string;
+    avatar?: string;
+    realName?: string;
+    gender?: string;
+    birthDate?: string;
+}
+export interface UserInfoReq {
+    tenant?: string;
+}

package/lib/node_modules/.pnpm/jmash-core-mp@0.1.14_typescript@4.9.5/node_modules/jmash-core-mp/src/api/cms/index.d.ts

@@ -0,0 +1,20 @@
+import { CmsSiteKey, CmsSiteList, CmsSiteModel, CmsChannelReq, CmsChannelList, CmsInfoReq, CmsInfoPage, CmsInfoKey, CmsInfoModel, CmsInfoContentReq, CmsInfoContentList, CmsContentInfoReq, CmsContentInfoModel, CmsInfoFileReq, CmsInfoFileList, FrontInteractKey, FrontInteractModel, FrontLikeKey, FrontLikeModel, FrontLikeCreateReq, FrontBrowseRecordCreateReq, FrontBrowseRecordModel, CmsChannelKey, CmsChannelModel } from "./types";
+import { ResponseData } from "../../api/types";
+declare class CmsApiImpl {
+    findCmsSiteList(tenant: string): Promise<ResponseData<CmsSiteList>>;
+    findCmsSite(data: CmsSiteKey): Promise<ResponseData<CmsSiteModel>>;
+    findCmsChannelList(data: CmsChannelReq): Promise<ResponseData<CmsChannelList>>;
+    findCmsChannelById(data: CmsChannelKey): Promise<ResponseData<CmsChannelModel>>;
+    findCmsContentInfo(data: CmsContentInfoReq): Promise<ResponseData<CmsContentInfoModel>>;
+    findCmsSingleInfo(data: CmsChannelKey): Promise<ResponseData<CmsInfoModel>>;
+    findCmsInfoPage(data: CmsInfoReq): Promise<ResponseData<CmsInfoPage>>;
+    findCmsInfoById(data: CmsInfoKey): Promise<ResponseData<CmsInfoModel>>;
+    findCmsInfoContent(data: CmsInfoContentReq): Promise<ResponseData<CmsInfoContentList>>;
+    cmsInfoFile(data: CmsInfoFileReq): Promise<ResponseData<CmsInfoFileList>>;
+    cmsInfoInteractId(data: FrontInteractKey): Promise<ResponseData<FrontInteractModel>>;
+    isLike(data: FrontLikeKey): Promise<ResponseData<string>>;
+    frontLike(data: FrontLikeCreateReq): Promise<ResponseData<FrontLikeModel>>;
+    createfrontBrowseRecord(data: FrontBrowseRecordCreateReq): Promise<ResponseData<FrontBrowseRecordModel>>;
+}
+declare const cmsApi: CmsApiImpl;
+export { cmsApi };

package/lib/node_modules/.pnpm/jmash-core-mp@0.1.14_typescript@4.9.5/node_modules/jmash-core-mp/src/api/cms/types.d.ts

@@ -0,0 +1,200 @@
+export interface CmsSiteList {
+    results: Array<CmsSiteModel>;
+}
+export interface CmsSiteKey {
+    tenant?: string;
+    organTenant?: string;
+    siteId: string;
+}
+export interface CmsSiteModel {
+    siteId?: string;
+    siteName?: string;
+    siteLogo?: string;
+    keyword?: string;
+    description?: string;
+    contactPerson?: string;
+    contactPhone?: string;
+    dueTime?: string;
+    status?: string;
+    siteType?: string;
+    isComment?: boolean;
+    isCommentReview?: boolean;
+    mobileProductPath?: string;
+    pcProductPath?: string;
+    channelList?: Array<CmsChannelModel>;
+    address?: string;
+    geoLongitude: number;
+    geoLatitude: number;
+    email: string;
+}
+export interface CmsChannelReq {
+    tenant?: string;
+    siteId?: string;
+    alias?: string;
+    status?: boolean;
+    hasStatus?: boolean;
+    isOpen?: boolean;
+    hasIsOpen?: boolean;
+    channelId?: string;
+}
+export interface CmsChannelList {
+    results: Array<CmsChannelModel>;
+}
+export interface CmsChannelModel {
+    channelId: string;
+    siteId?: string;
+    modelCode?: string;
+    channelName: string;
+    alias?: string;
+    parentId?: string;
+    seoTitle?: string;
+    seoDescription?: string;
+    status?: boolean;
+    children?: Array<CmsChannelModel>;
+    isOpen?: boolean;
+    isSelect?: boolean;
+    url: string;
+    type?: string;
+}
+export interface CmsChannelKey {
+    tenant?: string;
+    channelId: string;
+}
+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 CmsInfoReq {
+    tenant?: string;
+    curPage?: number;
+    pageSize?: number;
+    siteId?: string;
+    channelId?: string;
+    channelAlias?: string;
+    likeInfoTitle?: string;
+    deleted?: boolean;
+    hasStatus?: boolean;
+    status?: string;
+    hasIsImg?: boolean;
+    isImg?: boolean;
+}
+export interface CmsInfoKey {
+    tenant?: string;
+    infoId?: string;
+}
+export interface CmsInfoModel {
+    infoId?: string;
+    modelCode?: string;
+    infoTitle: string;
+    subTitle?: string;
+    imgUrl?: string;
+    author?: string;
+    intro?: string;
+    top?: number;
+    status?: string;
+    publishDate?: string;
+    dueTime?: string;
+    channelId: Array<string>;
+    sourceName?: string;
+    siteId: string;
+    address?: string;
+}
+export interface CmsInfoContentReq {
+    tenant?: string;
+    infoId?: string;
+}
+export interface CmsInfoContentModel {
+    imagePath?: Array<string>;
+    videoPath?: Array<string>;
+    contentId?: string;
+    infoId?: string;
+    infoContent?: string;
+    infoType?: string;
+    orderBy?: number;
+    infoContentList?: {
+        path: string;
+    }[];
+}
+export interface CmsInfoContentList {
+    results: Array<CmsInfoContentModel>;
+}
+export interface CmsContentInfoReq {
+    tenant?: string;
+    siteId?: string;
+    channelAlias: string;
+}
+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;
+}
+export interface CmsInfoFileModel {
+    fileId?: string;
+    infoId?: string;
+    fileName?: string;
+    fileType?: string;
+    filePath?: string;
+    fileSize?: string;
+    fileExt?: string;
+    fileWidth?: number;
+    fileHeight?: number;
+    videoTime?: number;
+    intro?: string;
+}
+export interface CmsInfoFileList {
+    results: Array<CmsInfoFileModel>;
+}
+export interface FrontInteractKey {
+    tenant?: string;
+    interactId?: string;
+}
+export interface FrontInteractModel {
+    interactId?: string;
+    likeCount: number;
+    browseCount: number;
+}
+export interface FrontLikeKey {
+    tenant: string;
+    relationId: string;
+}
+export interface FrontLikeCreateReq {
+    tenant: string;
+    requestId?: string;
+    likeType?: string;
+    relationId?: string;
+    action?: boolean;
+}
+export interface FrontLikeModel {
+    likeId?: string;
+}
+export interface FrontBrowseRecordCreateReq {
+    tenant?: string;
+    requestId?: string;
+    type?: string;
+    relationId?: string;
+}
+export interface FrontBrowseRecordModel {
+    browseId?: string;
+}

package/lib/node_modules/.pnpm/jmash-core-mp@0.1.14_typescript@4.9.5/node_modules/jmash-core-mp/src/api/files/index.d.ts

@@ -0,0 +1,25 @@
+import { FileInfo, FileBase64Req, FileDownInfo, FileWebReq } from "./types";
+import { ResponseData } from "../../api/types";
+declare class FileApi {
+    baseApiUrl(): string;
+    uploadUrl(): string;
+    /**
+     * url 获取图片Full路径
+     * @param type resize	等比例缩放,white	补白,trans	补透明,clip	裁剪
+     */
+    imageUrl(imageUrl: string, width?: number, height?: number, type?: string): string;
+    /**
+     * Id 获取图片Full路径
+     * @param type resize	等比例缩放,white	补白,trans	补透明,clip	裁剪
+     */
+    imageIdUrl(imageId: string, width?: number, height?: number, type?: string): string;
+    fileUrl(fileUrl?: string): string;
+    fileIdUrl(fileId?: string): string;
+    uploadBase64File(base64: FileBase64Req): Promise<ResponseData<FileInfo>>;
+    uploadFile(file: string): Promise<FileInfo>;
+    downloadFile(url: string): Promise<FileDownInfo>;
+    uploadWebFile(data: FileWebReq): Promise<ResponseData<FileInfo>>;
+    deleteFile(filePath?: string): Promise<ResponseData<FileInfo>>;
+}
+declare const fileApi: FileApi;
+export { fileApi };

package/lib/node_modules/.pnpm/jmash-core-mp@0.1.14_typescript@4.9.5/node_modules/jmash-core-mp/src/api/types.d.ts

@@ -0,0 +1,41 @@
+/// <reference types="miniprogram-api-typings" />
+/// <reference types="miniprogram-api-typings" />
+export type ResponseData<T extends string | WechatMiniprogram.IAnyObject | ArrayBuffer = string | WechatMiniprogram.IAnyObject | ArrayBuffer> = WechatMiniprogram.RequestSuccessCallbackResult<T>;
+export interface AppConfig {
+    tenant: string;
+    name: string;
+    baseUrl: string;
+    resourceUrl: string;
+    appId: string;
+    componentAppid: string;
+    wechatComponentAppId: string;
+    wechatAppId: string;
+    wechatBiz: string;
+    siteId: string;
+    dev: boolean;
+    testNewUser: boolean;
+}
+export interface ValidateData {
+    validate: boolean;
+    message: string;
+}
+export interface EventBase {
+    changedTouches?: any;
+    currentTarget: EventTarget;
+    target?: EventTarget;
+    type?: string;
+    detail?: any;
+    touches: any;
+}
+export interface EventTarget {
+    dataset: any;
+    id: string | number;
+    offsetLeft?: number;
+    offsetTop?: number;
+}
+export interface CanvasResponse {
+    width?: number;
+    height?: number;
+    nodeCanvasType?: string;
+    node: any;
+}

package/lib/node_modules/.pnpm/jmash-core-mp@0.1.14_typescript@4.9.5/node_modules/jmash-core-mp/src/components/auth-user/jmash-update-user.mpx.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/node_modules/.pnpm/jmash-core-mp@0.1.14_typescript@4.9.5/node_modules/jmash-core-mp/src/components/cms/jmash-cms-article.mpx.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/node_modules/.pnpm/jmash-core-mp@0.1.14_typescript@4.9.5/node_modules/jmash-core-mp/src/components/core/jmash-login.mpx.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/node_modules/.pnpm/jmash-core-mp@0.1.14_typescript@4.9.5/node_modules/jmash-core-mp/src/packages/pages/cms/cms-article-list.mpx.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/node_modules/.pnpm/jmash-core-mp@0.1.14_typescript@4.9.5/node_modules/jmash-core-mp/src/store/user.d.ts

@@ -0,0 +1,31 @@
+import { LoginRes, RolesPerms, TokenModel, UserInfo } from "../api/auth/types";
+import { ResponseData } from "../api/types";
+interface UserState {
+    userInfo: UserInfo;
+    roleCodes: string[];
+    permCodes: string[];
+    accessToken: string;
+    expiresDate: number;
+}
+export declare const useUserStore: import("@mpxjs/pinia").StoreDefinition<"user", UserState, {}, {
+    /** 登录检查 */
+    loginOnlyAC(): Promise<boolean>;
+    /** 登录检查并跳转登录 */
+    loginAC(backurl: string, tabbar: boolean, loginurl?: string): Promise<boolean>;
+    /** 静默登录 */
+    silentLogin(): Promise<LoginRes>;
+    mpRegister(phoneCode: string, nickName?: string, avatar?: string): Promise<LoginRes>;
+    webLogin(userName: string, pwd: string): Promise<LoginRes>;
+    loginProcess(resp: ResponseData<LoginRes>): LoginRes;
+    loginSuccess(token: TokenModel): TokenModel;
+    logout(): void;
+    /** 检查登录是否有效？ */
+    checkLogin(): boolean;
+    isTokenExpires(): boolean;
+    checkRole(role: string): boolean;
+    getUserInfo(cache?: boolean): Promise<UserInfo>;
+    setUserInfo(userInfo: UserInfo): void;
+    getRolePerm(cache?: boolean): Promise<RolesPerms>;
+    refreshToken(): Promise<boolean>;
+}>;
+export {};

package/lib/node_modules/.pnpm/jmash-core-mp@0.1.14_typescript@4.9.5/node_modules/jmash-core-mp/src/utils/config.d.ts

@@ -0,0 +1,3 @@
+import { AppConfig } from "../api/types";
+declare const config: AppConfig;
+export { config };

package/lib/node_modules/.pnpm/jmash-core-mp@0.1.14_typescript@4.9.5/node_modules/jmash-core-mp/src/utils/db.d.ts

@@ -0,0 +1,21 @@
+import type { TokenModel, UserInfo } from "../api/auth/types";
+declare class LocalStorage {
+    getToken(): string;
+    getUserTenant(): string;
+    getOrganTenant(tenant: string): string;
+    isTokenExpires(): boolean;
+    getRefreshToken(): string;
+    removeRefreshToken(): void;
+    getTokenExpiresDate(): number;
+    setToken(data: TokenModel): void;
+    clearStorage(): void;
+    getBearerToken(): string;
+    getUserInfo(): any;
+    setUserInfo(data: UserInfo): void;
+    getRoleCodes(): any;
+    setRoleCodes(codes: string[]): void;
+    getPermCodes(): any;
+    setPermCodes(codes: string[]): void;
+}
+declare const db: LocalStorage;
+export { db };

package/lib/node_modules/.pnpm/jmash-core-mp@0.1.14_typescript@4.9.5/node_modules/jmash-core-mp/src/utils/grpc.d.ts

@@ -0,0 +1,5 @@
+declare class GrpcUtil {
+    clearEmpty(params: any): void;
+}
+declare const grpc: GrpcUtil;
+export { grpc };

package/lib/node_modules/.pnpm/jmash-core-mp@0.1.14_typescript@4.9.5/node_modules/jmash-core-mp/src/utils/net.d.ts

@@ -0,0 +1,7 @@
+declare class NetUtil {
+    private publicKey;
+    encrypt(data: string): string;
+    decrypt(data: string): string;
+}
+declare const net: NetUtil;
+export { net };

package/package.json

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

package/src/components/basic/basic-image-view.mpx

@@ -1,4 +1,9 @@
 <template>
+    <!-- title组件 -->
+    <basic-title-view wx:if="{{ compModel.compData.showTitle }}" title="{{ compModel.compName }}"
+        pageModel="{{ pageModel }}" compModel="{{ compModel }}" busiDataModel="{{ busiDataModel }}" />
+
+    <!-- 图片组件 -->
     <view class="vcard-album-grid" wx:if="{{ imageUrlArr.length > 0 }}">
         <view wx:if="{{ isGrid }}" class="main-grid-custom">
             <view class="grid-item" wx:for="{{ imageUrlArr }}" wx:for-item="item" wx:for-index="index" wx:key="index">
@@ -23,7 +28,7 @@
                 mode="widthFix" wx:for="{{ imageUrlArr }}" wx:for-item="item" wx:key="index" />
         </view>
     </view>
-    <basic-none-data wx:else></basic-none-data>
+    <basic-none-data wx:else />
 </template>
 
 <script lang="ts">
@@ -33,14 +38,17 @@ import { config, EventBase } from "jmash-core-mp";
 
 createComponent({
     properties: {
+        // 页面数据
         pageModel: {
             type: Object,
             value: {} as PageModel
         },
+        // 组件数据
         compModel: {
             type: Object,
             value: {} as CompModel
         },
+        // 业务数据
         busiDataModel: {
             type: Object,
             value: {} as BusiDataModel
@@ -150,6 +158,7 @@ createComponent({
 {
     "component": true,
     "usingComponents": {
+        "basic-title-view": "./basic-title-view",
         "basic-none-data": "./basic-none-data"
     }
 }

package/src/components/basic/basic-text-view.mpx

@@ -1,11 +1,16 @@
 <template>
+    <!-- title组件 -->
+    <basic-title-view wx:if="{{ compModel.compData.showTitle }}" title="{{ compModel.compName }}"
+        pageModel="{{ pageModel }}" compModel="{{ compModel }}" busiDataModel="{{ busiDataModel }}" />
+
+    <!-- 文本组件 -->
     <view class="text-main" wx:if="{{ compModel.compData.text != '<p><br></p>' }}">
         <!-- TODO后期优化 <view wx:if="{{ compModel.compData.title !== '' }}" class="text-title">{{ compModel.compData.title }}</view>-->
         <view class="text-content">
             <rich-text nodes="{{ compModel.compData.text }}"></rich-text>
         </view>
     </view>
-    <basic-none-data wx:else></basic-none-data>
+    <basic-none-data wx:else />
 </template>
 
 <script lang="ts">
@@ -14,17 +19,17 @@ import { BusiDataModel, CompModel, PageModel } from "../../api/diy/types";
 
 createComponent({
     properties: {
-        //页面数据
+        // 页面数据
         pageModel: {
             type: Object,
             value: {} as PageModel
         },
-        //组件数据
+        // 组件数据
         compModel: {
             type: Object,
             value: {} as CompModel
         },
-        //业务数据
+        // 业务数据
         busiDataModel: {
             type: Object,
             value: {} as BusiDataModel
@@ -56,6 +61,7 @@ createComponent({
 {
     "component": true,
     "usingComponents": {
+        "basic-title-view": "./basic-title-view",
         "basic-none-data": "./basic-none-data"
     }
 }

package/src/components/basic/basic-title-view.mpx

@@ -9,8 +9,11 @@
             {{ title }}
         </view>
         <!-- 查看更多 -->
-        <view class="main-right" wx:if="{{ showMore }}" bind:tap="handleClickMore">{{ moreText }}</view>
-        <slot name="rightIcon"></slot>
+        <view class="main-right" wx:if="{{ showMore }}" bind:tap="handleClickMore">
+            <view>查看更多</view>
+            <view wx:if="{{ !rightIcon }}">></view>
+            <slot wx:else name="rightIcon"></slot>
+        </view>
     </view>
 </template>
 
@@ -20,17 +23,11 @@ import { config } from "jmash-core-mp";
 import { BusiDataModel, CompModel, PageModel, CompEventModel } from "../../api/diy/types";
 
 createComponent({
+    options: {
+        styleIsolation: "apply-shared",
+        multipleSlots: true,
+    },
     properties: {
-        // 是否自定义左侧图标
-        leftIcon: {
-            type: Boolean,
-            default: false
-        },
-        // 标题
-        title: {
-            type: String,
-            default: ""
-        },
         // 页面数据
         pageModel: {
             type: Object,
@@ -46,15 +43,25 @@ createComponent({
             type: Object,
             value: {} as BusiDataModel
         },
+        // 标题
+        title: {
+            type: String,
+            default: ""
+        },
         // 是否显示查看更多
         showMore: {
             type: Boolean,
             value: false
         },
-        // 查看更多文本
-        moreText: {
-            type: String,
-            value: "查看更多"
+        // 是否自定义左侧图标
+        leftIcon: {
+            type: Boolean,
+            default: false
+        },
+        // 是否自定义右侧图标
+        rightIcon: {
+            type: Boolean,
+            default: false
         },
     },
     setup(props) {
@@ -82,9 +89,9 @@ createComponent({
                 compModel: this.compModel,
                 busiDataModel: this.busiDataModel
             } as CompEventModel;
-            console.log("点击查看更多(DiyClickMore):", eventData);
-            this.triggerEvent("DiyClickMore", eventData);
-        }
+            console.log("点击查看更多(clickMore):", eventData);
+            this.triggerEvent("clickMore", eventData);
+        },
     },
 })
 </script>
@@ -102,7 +109,7 @@ createComponent({
         flex: 1;
         display: flex;
         align-items: center;
-        justify-content: flex-start;
+        gap: 16rpx;
         color: #333333;
         font-size: 30rpx;
         font-weight: 600;
@@ -110,11 +117,13 @@ createComponent({
         .main-left-image {
             width: 8rpx;
             height: 30rpx;
-            margin-right: 16rpx;
         }
     }
 
     .main-right {
+        display: flex;
+        align-items: center;
+        gap: 10rpx;
         height: 80rpx;
         color: #999999;
         font-size: 24rpx;

package/src/components/basic/basic-video-view.mpx

@@ -1,4 +1,8 @@
 <template>
+    <!-- title组件 -->
+    <basic-title-view wx:if="{{ compModel.compData.showTitle }}" title="{{ compModel.compName }}"
+        pageModel="{{ pageModel }}" compModel="{{ compModel }}" busiDataModel="{{ busiDataModel }}" />
+
     <!-- 卡片 视频介绍 查看 -->
     <view class="basic-video" style="height: {{ height }}px;" wx:if="{{ compData.videoUrl }}">
         <view class="main-video">
@@ -6,7 +10,7 @@
                 src="{{ videoUrl }}"></video>
         </view>
     </view>
-    <basic-none-data wx:else></basic-none-data>
+    <basic-none-data wx:else />
 </template>
 
 <script lang="ts">
@@ -16,17 +20,17 @@ import { config } from "jmash-core-mp";
 
 createComponent({
     properties: {
-        //页面数据
+        // 页面数据
         pageModel: {
             type: Object,
             value: {} as PageModel
         },
-        //组件数据
+        // 组件数据
         compModel: {
             type: Object,
             value: {} as CompModel
         },
-        //业务数据
+        // 业务数据
         busiDataModel: {
             type: Object,
             value: {} as BusiDataModel
@@ -110,6 +114,7 @@ createComponent({
 {
     "component": true,
     "usingComponents": {
+        "basic-title-view": "./basic-title-view",
         "basic-none-data": "./basic-none-data"
     }
 }

package/src/components/custom/basic-custom-view.mpx

@@ -1,8 +1,4 @@
 <template>
-  <!-- title组件 -->
-  <basic-title-view wx:if="{{ compModel.compData.showTitle }}" title="{{ compModel.compName }}"
-    pageModel="{{ pageModel }}" compModel="{{ compModel }}" busiDataModel="{{ busiDataModel }}"
-    bind:pagesMore="onMoreEvent" showMore="{{ compModel.compData.showMore }}" />
 
   <!-- 文本组件 -->
   <basic-text-view wx:if="{{ compModel.compCode === 'text' }}" pageModel="{{ pageModel }}" compModel="{{ compModel }}"
@@ -26,16 +22,22 @@ import { createComponent } from '@mpxjs/core';
 import { PageModel, CompModel, BusiDataModel } from "../../api/diy/types";
 
 createComponent({
+  options: {
+    styleIsolation: "apply-shared",
+    multipleSlots: true,
+  },
   properties: {
-    compModel: {
-      type: Object,
-      value: {} as CompModel
-    },
+    // 页面数据 
     pageModel: {
       type: Object,
       value: {} as PageModel
     },
-    //业务数据
+    // 组件数据
+    compModel: {
+      type: Object,
+      value: {} as CompModel
+    },
+    // 业务数据
     busiDataModel: {
       type: Object,
       value: {} as BusiDataModel
@@ -47,12 +49,10 @@ createComponent({
 })
 </script>
 
-
 <script type="application/json">
   {
     "component": true,
     "usingComponents": {
-      "basic-title-view": "../basic/basic-title-view",
       "basic-text-view": "../basic/basic-text-view",
       "basic-image-view": "../basic/basic-image-view",
       "basic-video-view": "../basic/basic-video-view",

package/src/components/custom/custom-view.mpx

@@ -1,11 +1,11 @@
 <template>
 
   <!-- 基础组件 -->
-  <basic-custom-view wx:if="{{ compModel.compType == 'BASIC' }}" pageModel="{{ pageModel }}" compModel="{{ compModel }}"
-    busiDataModel="{{ busiDataModel }}" />
+  <basic-custom-view wx:if="{{ compModel.compType === 'BASIC' }}" pageModel="{{ pageModel }}"
+    compModel="{{ compModel }}" busiDataModel="{{ busiDataModel }}" />
   <!-- 组织组件 -->
-  <organ-custom-view wx:if="{{ compModel.compType == 'ORGAN' }}" pageModel="{{ pageModel }}" compModel="{{ compModel }}"
-    busiDataModel="{{ busiDataModel }}" />
+  <organ-custom-view wx:if="{{ compModel.compType === 'ORGAN' }}" pageModel="{{ pageModel }}"
+    compModel="{{ compModel }}" busiDataModel="{{ busiDataModel }}" />
 
 </template>
 
@@ -15,10 +15,12 @@ import { PageModel, CompModel, BusiDataModel } from "../../api/diy/types";
 
 createComponent({
   properties: {
+    // 页面数据
     pageModel: {
       type: Object,
       value: {} as PageModel
     },
+    // 组件数据
     compModel: {
       type: Object,
       value: {} as CompModel

package/src/components/custom/organ-custom-view.mpx

@@ -1,8 +1,4 @@
 <template>
-  <!-- title组件 -->
-  <basic-title-view wx:if="{{ compModel.compData.showTitle }}" title="{{ compModel.compName }}"
-    pageModel="{{ pageModel }}" compModel="{{ compModel }}" busiDataModel="{{ busiDataModel }}"
-    bind:pagesMore="onMoreEvent" showMore="{{ compModel.compData.showMore }}" />
 
   <!-- 通知组件 -->
   <organ-notice-view wx:if="{{ compModel.compCode === 'notice' }}" pageModel="{{ pageModel }}"
@@ -26,34 +22,38 @@ import { createComponent } from '@mpxjs/core';
 import { PageModel, CompModel, OrganDataModel } from "../../api/diy/types";
 
 createComponent({
+  options: {
+    styleIsolation: "apply-shared",
+    multipleSlots: true,
+  },
   properties: {
-    compModel: {
-      type: Object,
-      value: {} as CompModel
-    },
+    // 页面数据
     pageModel: {
       type: Object,
       value: {} as PageModel
     },
-    //业务数据
+    // 组件数据
+    compModel: {
+      type: Object,
+      value: {} as CompModel
+    },
+    // 业务数据
     busiDataModel: {
       type: Object,
       value: {} as OrganDataModel
     },
   },
   setup(props) {
-    console.log("props ==>", props);
-    return {}
+    console.log("Organ-props ==>", props.compModel.compCode, props.compModel.compName, props);
+    return { props }
   }
 })
 </script>
 
-
 <script type="application/json">
   {
     "component": true,
     "usingComponents": {
-      "basic-title-view": "../basic/basic-title-view",
       "organ-map-view": "../organ/organ-map-view",
       "organ-contact-view": "../organ/organ-contact-view",
       "organ-notice-view": "../organ/organ-notice-view",

package/src/components/organ/organ-contact-view.mpx

@@ -1,4 +1,8 @@
 <template>
+    <!-- title组件 -->
+    <basic-title-view wx:if="{{ compModel.compData.showTitle }}" title="{{ compModel.compName }}"
+        pageModel="{{ pageModel }}" compModel="{{ compModel }}" busiDataModel="{{ busiDataModel }}" />
+
     <!-- 合作招商预览组件-手机号 -->
     <view class="vcard-map">
         <view class="item" data-mobilePhone="{{ compData.mobilePhone }}" bind:tap="oncall">
@@ -14,17 +18,17 @@ import { CompModel, PageModel, OrganDataModel } from "../../api/diy/types";
 
 createComponent({
     properties: {
-        //页面数据
+        // 页面数据
         pageModel: {
             type: Object,
             value: {} as PageModel
         },
-        //组件数据
+        // 组件数据
         compModel: {
             type: Object,
             value: {} as CompModel
         },
-        //业务数据
+        // 业务数据
         busiDataModel: {
             type: Object,
             value: {} as OrganDataModel
@@ -70,6 +74,7 @@ createComponent({
 {
     "component": true,
     "usingComponents": {
+        "basic-title-view": "../basic/basic-title-view",
         "cube-icon": "@mpxjs/mpx-cube-ui/lib/components/icon/index"
     }
 }

package/src/components/organ/organ-map-view.mpx

@@ -1,4 +1,9 @@
 <template>
+    <!-- title组件 -->
+    <basic-title-view wx:if="{{ compModel.compData.showTitle }}" title="{{ compModel.compName }}"
+        pageModel="{{ pageModel }}" compModel="{{ compModel }}" busiDataModel="{{ busiDataModel }}" />
+
+    <!-- 地图组件-地址、电话 -->
     <view class="vcard-map">
         <view class="item" data-latitude="{{ busiDataModel.latitude }}" data-longitude="{{ busiDataModel.longitude }}"
             bind:tap="onlocation">
@@ -101,6 +106,7 @@ createComponent({
 {
     "component": true,
     "usingComponents": {
+        "basic-title-view": "../basic/basic-title-view",
         "cube-icon": "@mpxjs/mpx-cube-ui/lib/components/icon/index"
     }
 }

package/src/components/organ/organ-notice-view.mpx

@@ -1,4 +1,8 @@
 <template>
+    <!-- title组件 -->
+    <basic-title-view wx:if="{{ compModel.compData.showTitle }}" title="{{ compModel.compName }}"
+        pageModel="{{ pageModel }}" compModel="{{ compModel }}" busiDataModel="{{ busiDataModel }}" />
+
     <!-- 通知栏组件 -->
     <view class="notify-view">
         <view class="notice-bar">
@@ -186,6 +190,8 @@ createComponent({
 <script type="application/json">
 {
     "component": true,
-    "usingComponents": {}
+    "usingComponents": {
+        "basic-title-view": "../basic/basic-title-view",
+    }
 }
 </script>