jmash-core-mp 0.1.21 → 0.1.23

package/src/packages/pages/cms/cms-location-list.mpx

@@ -0,0 +1,95 @@
+<template>
+    <!-- 搜索框 -->
+    <view class="search-box">
+        <jmash-search placeholder="搜索" bind:handleSearch="handleInput" />
+    </view>
+    <!-- 栏目列表 -->
+
+    <jmash-cms-location-page isInfo="false" style="1" organTenant="{{ queryParams.tenant }}"
+        siteId="{{ queryParams.siteId }}" likeInfoTitle="{{ queryParams.likeInfoTitle }}"
+        channelAlias="{{ queryParams.channelAlias }}" pageSize="10" refreshKey="{{ refreshKey }}" />
+
+</template>
+
+<script lang="ts">
+import mpx, { createPage, ref } from "@mpxjs/core";
+import { CmsChannelModel } from '../../../api/cms/types'
+import { EventBase } from "../../../api/types";
+
+createPage({
+    setup() {
+        let config = getApp().globalData.config;
+        // 搜索参数
+        let queryParams = ref({
+            tenant: mpx.getStorageSync("tenant"),
+            siteId: config.siteId,
+            channelAlias: "gmlj",
+            likeInfoTitle: "",
+            status: true,
+            isOpen: true,
+        });
+        // 栏目列表
+        let channelList = ref([] as CmsChannelModel[]);
+
+        let refreshKey = ref(0);
+
+        return {
+            queryParams,
+            channelList,
+            refreshKey,
+        }
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     * @param options 页面跳转参数{title: string, tenant: string, siteId: string, alias: string}
+     */
+    onLoad(options) {
+        console.log("cms文章列表页面参数 ==>", options);
+        let config = getApp().globalData.config;
+        mpx.setNavigationBarTitle({ title: options.title || "列表" });
+        this.queryParams.tenant = options.tenant || mpx.getStorageSync("tenant") || config.tenant;
+        this.queryParams.siteId = options.siteId as string || config.siteId;
+        this.queryParams.channelAlias = options.channelAlias as string || "gmlj";
+        this.refreshKey = this.refreshKey + 1;
+    },
+
+    // 搜索
+    handleInput(e: EventBase) {
+        console.log("搜索 ==>", e.detail);
+        this.queryParams.likeInfoTitle = e.detail;
+        this.refreshKey = this.refreshKey + 1;
+    },
+
+})
+</script>
+
+<style lang="scss">
+@use "../../../styles/index.scss" as *;
+
+page {
+    display: flex;
+    flex-direction: column;
+    height: 70vh;
+    margin: 0 0;
+}
+
+.search-box {
+    padding: 15rpx 30rpx;
+}
+
+.article-list {
+    max-height: calc(100vh - 90rpx - env(safe-area-inset-bottom));
+    box-sizing: border-box;
+}
+</style>
+
+<script type="application/json">
+{
+    "navigationBarTitleText": "列表",
+    "usingComponents": {
+        "jmash-search": "../../../components/common/jmash-search",
+        "jmash-cms-location-page": "../../../components/cms/jmash-cms-location-page.mpx"
+    }
+}
+</script>

package/src/packages/pages/cms/cms-location.mpx

@@ -0,0 +1,33 @@
+<template>
+    <cms-location siteId="{{ siteId }}" tenant="{{ tenant }}" infoId="{{ infoId }}"></cms-location>
+</template>
+
+<script>
+import { createPage, ref, onLoad } from '@mpxjs/core'
+
+createPage({
+    setup(props) {
+        //console.log("123", props);
+        let config = getApp().globalData.config;
+        let siteId = ref(config.siteId);
+        let tenant = ref(config.tenant);
+        let infoId = ref('');
+        onLoad((options) => {
+            console.log(options);
+            siteId.value = options.siteId || config.siteId;
+            infoId.value = options.infoId || '';
+        })
+        return { siteId, tenant, infoId };
+    },
+})
+</script>
+
+<style lang="scss"></style>
+
+<script type="application/json">
+{
+    "usingComponents": {
+        "cms-location": "../../../components/cms/jmash-cms-location.mpx"
+    }
+}
+</script>

package/src/pages/home.mpx

@@ -1,7 +1,6 @@
 <template>
   <view class="home-page">
     <text>主页（全屏登录）</text>
-    <cms-acticle-list organTenant="xyvcard" siteId="{{ siteId }}" channelAlias="{{ channelAlias }}"></cms-acticle-list>
     <cms-article-view title="企业动态" isInfo="{{ true }}" organTenant="xyvcard" siteId="{{ siteId }}"
       channelAlias="{{ channelAlias }}" style="1"></cms-article-view>
   </view>
@@ -46,7 +45,6 @@ createPage({
 <script type="application/json">
 {
   "usingComponents": {
-    "cms-acticle-list": "../components/cms/jmash-cms-acticle-list",
     "cms-article-view": "../components/cms/jmash-cms-article-view"
   }
 }

package/src/pages/home2.mpx

@@ -1,7 +1,6 @@
 <template>
   <view class="home-page">
     <text>主页（全屏登录）</text>
-    <cms-acticle-list organTenant="xyvcard" siteId="{{ siteId }}" channelAlias="{{ channelAlias }}"></cms-acticle-list>
     <cms-article-view title="企业动态" isInfo="{{ true }}" organTenant="xyvcard" siteId="{{ siteId }}"
       channelAlias="{{ channelAlias }}" style="1"></cms-article-view>
   </view>
@@ -41,7 +40,6 @@ createPage({
 <script type="application/json">
 {
   "usingComponents": {
-    "cms-acticle-list": "../components/cms/jmash-cms-acticle-list",
     "cms-article-view": "../components/cms/jmash-cms-article-view"
   }
 }

package/src/pages/tabbar/home.mpx

@@ -1,10 +1,9 @@
 <template>
   <view class="page-body">
-    <button type="default" bind:tap="toHomePage">主页（全屏登录检查）</button>
-    <button type="default" bind:tap="toHome2Page">主页（全屏登录）</button>
-    <button type="default" bind:tap="toHalfHomePage">主页（半屏登录）</button>
-    <button type="default" bind:tap="toCompTestPage">组件演示</button>
-    <button type="default" bind:tap="loginOut">退出</button>
+    <jmash-menu menuGroups="{{ menuGroups }}" bind:itemClick="handleMenuClick"></jmash-menu>
+    <view class="logout-section">
+      <button type="warn" bind:tap="loginOut">退出登录</button>
+    </view>
   </view>
 </template>
 
@@ -15,6 +14,26 @@ import { useUserStore } from '../../store/user';
 createPage({
   data: {
     userStore: null,
+    menuGroups: [
+      {
+        id: 1,
+        items: [
+          { key: 'home', title: '主页（全屏登录检查）', icon: '🏠', iconBg: '#409eff', path: '/pages/home' },
+          { key: 'home2', title: '主页（全屏登录）', icon: '🏠', iconBg: '#67c23a', path: '/pages/home2' },
+          { key: 'half-home', title: '主页（半屏登录）', icon: '🏠', iconBg: '#e6a23c', path: '/pages/half-home' },
+          { key: 'comp-test', title: '组件演示', icon: '🧩', iconBg: '#f56c6c', path: '/pages/basic-component' },
+          {
+            key: 'cms-location-list', title: '内容列表', icon: '📝', iconBg: '#409eff', path: '/jmash/pages/cms/cms-location-list'
+          },
+          {
+            key: 'cms-activity-list', title: '活动列表', icon: '📝', iconBg: '#409eff', path: '/jmash/pages/cms/cms-activity-list'
+          },
+          {
+            key: 'cms-article-list', title: '文章列表', icon: '📝', iconBg: '#409eff', path: '/jmash/pages/cms/cms-article-list'
+          },
+        ]
+      }
+    ]
   },
   onShow() {
     this.userStore = useUserStore();
@@ -24,25 +43,11 @@ createPage({
     }
   },
   methods: {
-    toHomePage() {
-      mpx.navigateTo({
-        url: '/pages/home'
-      })
-    },
-    toHome2Page() {
-      mpx.navigateTo({
-        url: '/pages/home2'
-      })
-    },
-    toHalfHomePage() {
-      mpx.navigateTo({
-        url: '/pages/half-home'
-      })
-    },
-    toCompTestPage() {
-      mpx.navigateTo({
-        url: '/pages/basic-component'
-      })
+    handleMenuClick(e) {
+      const { item } = e.detail
+      if (item.path) {
+        mpx.navigateTo({ url: item.path })
+      }
     },
     loginOut() {
       this.userStore.logout();
@@ -57,22 +62,28 @@ createPage({
 
 <style lang="scss">
 .page-body {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  padding: 40rpx;
-  gap: 30rpx;
+  min-height: 100vh;
+  background-color: #f5f5f5;
+
+  .logout-section {
+    display: flex;
+    justify-content: center;
+    padding: 40rpx 16rpx;
 
-  button {
-    width: 80%;
-    height: 80rpx;
-    font-size: 32rpx;
+    button {
+      width: 80%;
+      height: 88rpx;
+      font-size: 30rpx;
+      border-radius: 44rpx;
+    }
   }
 }
 </style>
 
 <script type="application/json">
 {
-  "usingComponents": {}
+  "usingComponents": {
+    "jmash-menu": "../../components/common/jmash-menu.mpx"
+  }
 }
 </script>

package/src/components/cms/jmash-cms-acticle-list.mpx

@@ -1,183 +0,0 @@
-/**
-* 文章列表
-* @param style 样式 String （box:盒子列表效果 page:页面列表效果） 默认page
-* @param organTenant 租户 String
-* @param siteId 站点ID String
-* @param channelId 栏目ID String
-* @param channelAlias 栏目别名 String
-* @param pageSize 数量 String 默认值为5
-* @event info 文章详情点击事件,参数为点击的项对象 item
-*/
-<template>
-    <!-- 文章列表 -->
-    <view class="{{ 'article-list-' + style }}" wx:if="{{ articleList.length > 0 }}">
-        <view class="{{ 'article-item-' + style }}" wx:for="{{ articleList }}" wx:key="index" bind:tap="handleInfo"
-            data-item="{{ item }}">
-            <view class="article-title">{{ item.infoTitle }}</view>
-            <view class="article-text">
-                <image class="text-image" src="{{ resourceUrl + 'icon-address.png' }}" mode="widthFix" />
-                {{ item.address || item.subTitle }}
-            </view>
-            <view class="article-text">
-                <image class="text-image" src="{{ resourceUrl + 'icon-time.png' }}" mode="widthFix" />
-                {{ item.publishDate }}
-            </view>
-        </view>
-    </view>
-</template>
-
-<script lang="ts">
-import mpx, { createComponent, ref, onMounted } from "@mpxjs/core";
-import { EventBase } from "../../api/types";
-import { cmsApi } from '../../api/cms';
-import { CmsInfoModel } from '../../api/cms/types';
-
-createComponent({
-    properties: {
-        // 样式
-        style: {
-            type: String,
-            value: "page",
-        },
-        // 组织租户
-        organTenant: {
-            type: String,
-            value: ""
-        },
-        // 站点ID
-        siteId: {
-            type: String,
-            value: ""
-        },
-        // 栏目ID
-        channelId: {
-            type: String,
-            value: ""
-        },
-        // 栏目别名
-        channelAlias: {
-            type: String,
-            value: ""
-        },
-        // 数量
-        pageSize: {
-            type: Number,
-            value: 5
-        },
-    },
-    setup(props) {
-        let config = getApp().globalData.config;
-        // 资源路径
-        let resourceUrl = config.resourceUrl + '/images/';
-        // 文章列表
-        let articleList = ref([] as CmsInfoModel[]);
-        console.log("cms", props);
-        onMounted(() => {
-            cmsApi.findCmsInfoPage({
-                tenant: props.organTenant || config.tenant,
-                siteId: props.siteId,
-                channelId: props.channelId,
-                channelAlias: props.channelAlias,
-                curPage: 1,
-                pageSize: props.pageSize,
-            }).then(res => {
-                if (res.statusCode === 200) {
-                    articleList.value = res.data.results;
-                }
-            });
-        });
-        return { resourceUrl, articleList }
-    },
-    methods: {
-        // 点击详情事件
-        handleInfo(e: EventBase) {
-            let item = e.currentTarget.dataset.item;
-            mpx.navigateTo({
-                url: '/jmash/pages/cms/cms-article?siteId=' + this.siteId + '&infoId=' + item.infoId,
-            });
-            this.triggerEvent("info", item);
-        }
-    }
-})
-</script>
-
-<style lang="scss">
-@use "../../styles/index.scss" as *;
-
-// 组件列表样式
-.article-list-box {
-    margin: 20rpx 0;
-    padding: 20rpx;
-    background: $background-white-color;
-    border-radius: $border-mini-radius;
-}
-
-.article-item-box {
-    display: flex;
-    flex-direction: column;
-    gap: 10rpx;
-    padding: 20rpx 0;
-    box-sizing: border-box;
-    border-bottom: 2rpx solid $border-line;
-    background: $background-white-color;
-
-    &:first-child {
-        padding-top: 0;
-    }
-
-    &:last-child {
-        border-bottom: none;
-        padding-bottom: 0;
-    }
-}
-
-// 页面列表样式
-.article-list-page {
-    padding: 0 30rpx;
-    display: flex;
-    flex-direction: column;
-    gap: 20rpx;
-}
-
-.article-item-page {
-    display: flex;
-    flex-direction: column;
-    gap: 10rpx;
-    padding: 30rpx;
-    box-sizing: border-box;
-    background: $background-white-color;
-}
-
-.article-title {
-    font-weight: 600;
-    font-size: 26rpx;
-    color: $font-color;
-    line-height: 37rpx;
-    margin-bottom: 4rpx;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-}
-
-.article-text {
-    display: flex;
-    align-items: center;
-    gap: 20rpx;
-    font-weight: 400;
-    font-size: $font-size-mini;
-    color: $font-color-grey;
-    line-height: 33rpx;
-
-    .text-image {
-        width: 20rpx;
-        height: 20rpx;
-    }
-}
-</style>
-
-<script type="application/json">
-{
-    "component": true,
-    "usingComponents": {}
-}
-</script>

package/src/packages/pages/cms/cms-article-list.mpx

@@ -1,165 +0,0 @@
-<template>
-    <view class="article-main">
-        <!-- 默认图片在右侧的样式  枚举值为0  -->
-        <block wx:for="{{ articleList }}" wx:key="index">
-            <view class="{{ isInfo ? 'article-info' : 'article-border' }}" bind:tap="handleInfo" data-item="{{ item }}">
-                <!-- 内容 -->
-                <view class="cms-info">
-                    <view class="cms-left">
-                        <!-- 标题 -->
-                        <view class="cms-left-title">{{ item.infoTitle }}</view>
-                        <!-- 内容 -->
-                        <view class="cms-left-info">{{ item.intro }}</view>
-                    </view>
-                    <view bind:tap="handlePreview" data-url="{{ item.imgUrl }}">
-                        <image class="cms-right-image" src="{{ imageUrl + item.imgUrl }}" mode="widthFix" />
-                    </view>
-                </view>
-            </view>
-        </block>
-    </view>
-</template>
-
-<script lang="ts">
-import mpx, { createPage, ref, onLoad, onPullDownRefresh } from '@mpxjs/core'
-import { EventBase } from '../../../api/types';
-import { cmsApi } from '../../../api/cms';
-import { CmsInfoModel } from '../../../api/cms/types';
-
-createPage({
-    setup(props) {
-        let config = getApp().globalData.config;
-        let organTenant = ref(config.tenant);
-        let siteId = ref(config.siteId);
-        let channelId = ref('');
-        let channelAlias = ref('');
-        let curPage = ref(1);
-        let articleList = ref([] as CmsInfoModel[]);
-        let imageUrl = config.baseUrl + "/v1/file/image/clip/300/300/";
-        let queryCmsInfo = function () {
-            cmsApi.findCmsInfoPage({
-                tenant: organTenant.value || config.tenant,
-                siteId: siteId.value,
-                channelId: channelId.value,
-                channelAlias: channelAlias.value,
-                curPage: curPage.value,
-                pageSize: 10,
-            }).then(res => {
-                if (res.statusCode === 200) {
-                    console.log("article-list-add", res.data.results);
-                    articleList.value.push(...res.data.results);
-                    curPage.value++;
-                }
-            });
-        }
-        onLoad((options) => {
-            console.log("article-list", options);
-            siteId.value = options.siteId || config.siteId;
-            channelId.value = options.channelId || '';
-            channelAlias.value = options.channelAlias || '';
-            curPage.value = 1;
-            queryCmsInfo();
-        })
-        onPullDownRefresh(() => {
-            queryCmsInfo();
-        })
-        return { organTenant, siteId, channelId, channelAlias, curPage, articleList, imageUrl, queryCmsInfo };
-    },
-    methods: {
-        // 点击详情事件
-        handleInfo(e: EventBase) {
-            let config = getApp().globalData.config;
-            let item = e.currentTarget.dataset.item;
-            mpx.navigateTo({
-                url: '/jmash/pages/cms/cms-article?siteId=' + this.siteId + '&infoId=' + item.infoId,
-            });
-            // 浏览
-            this.handelBrowse(this.organTenant || config.tenant, item.infoId);
-        },
-    }
-})
-</script>
-
-<style lang="scss">
-@use "../../../styles/index.scss" as *;
-
-.article-main {
-    padding: 0 30rpx;
-    border-radius: 20rpx;
-    background-color: #fff;
-}
-
-// 有分割线列表
-.article-border {
-    padding: 30rpx 0;
-    border-bottom: 1rpx solid $border-line;
-
-    // 分割线最后一条内容无分割线
-    &:last-child {
-        border: none;
-    }
-}
-
-// 无分割线列表
-.article-info {
-    padding: 30rpx;
-    background-color: #fff;
-    border-radius: 20rpx;
-    margin-bottom: 20rpx;
-}
-
-.cms-info {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    gap: 30rpx;
-    margin-bottom: 30rpx;
-
-    // 文章左侧内容
-    .cms-left {
-        width: 450rpx;
-        display: flex;
-        flex-direction: column;
-
-        .cms-left-title {
-            color: #333;
-            font-size: 28rpx;
-            font-weight: 600;
-            margin-bottom: 20rpx;
-            overflow: hidden;
-            /* 隐藏超出部分 */
-            white-space: nowrap;
-            /* 强制文本不换行 */
-            text-overflow: ellipsis;
-            /* 超出部分以省略号显示 */
-        }
-
-        .cms-left-info {
-            color: #666;
-            font-size: 26rpx;
-            line-height: 37rpx;
-            overflow: hidden;
-            /* 隐藏超出部分 */
-            display: -webkit-box;
-            -webkit-box-orient: vertical;
-            -webkit-line-clamp: 2;
-            /* 文本只显示两行 */
-            text-overflow: ellipsis;
-            /* 超出部分以省略号显示 */
-        }
-    }
-
-    // 文章右侧图片
-    .cms-right-image {
-        width: 150rpx;
-        height: 150rpx;
-        border-radius: 10rpx;
-    }
-}
-</style>
-
-<script type="application/json">
-{
-    "usingComponents": {}
-}
-</script>