@tplc/business 0.1.13 → 0.1.14

package/CHANGELOG.md

@@ -2,34 +2,14 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-### [0.1.13](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/compare/v0.1.6...v0.1.13) (2024-10-28)
+### [0.1.14](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/compare/v0.1.21...v0.1.14) (2024-10-29)
 
 
 ### 🚀 Chore | 构建/工程依赖/工具
 
-* **release:** 0.1.10 ([732f746](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/732f746ecc268186d3357b882c40e4ee0a227250))
-* **release:** 0.1.11 ([0ff8ceb](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/0ff8ceb8c63810597998d2660a87ccc8007f7196))
-* **release:** 0.1.12 ([cb45e26](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/cb45e26560dbc7de5691950e480b3f070d3dafa5))
-* **release:** 0.1.7 ([69fbf39](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/69fbf39f9e9f1c7b2daf25aa81d7e508a530fa2b))
-* **release:** 0.1.8 ([0cd2b98](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/0cd2b98488ea39de407df1badedf2554f94190f1))
-* **release:** 0.1.9 ([b1dd896](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/b1dd896c4acc76bfc370b39c7d0a24eb729182eb))
-
-
-### 🐛 Bug Fixes | Bug 修复
-
-* 修改图片尺寸 ([1d4dd25](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/1d4dd25e5065401562cd75560507bc23953967e8))
+* **release:** 0.1.13 ([d2ff093](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/d2ff0931511bb59dcde85de2cbdefa21f338a1f2))
 
-
-### ✨ Features | 新功能
-
-* lcb-list 相关 slot 适应小程序调整 ([aff0850](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/aff085079e4918761191a7a00f7c48a5fb2c599d))
-* nav 颜色调整 ([1f7bba0](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/1f7bba00c2386a85a5bfe3b3973ad160c87efd78))
-* version update ([3e0904a](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/3e0904a72675d2c262ec4efd388c08a1f4a5375a))
-* 上传图片 ([5ae5dcb](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/5ae5dcbb018ce5c9bbc53290eb0e3e082985d887))
-* 优化 lcb-product-item 插槽与属性 ([29d00e4](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/29d00e49adf8c47ea223f92b400eac74385f8ee0))
-* 新增dynamic-data ([d43b20f](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/d43b20f5f334ae6ac5b46294b5caf7903bc4a820))
-* 类型调整 ([206b930](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/206b93056631e72531cd39617a3c6e7ad5529723))
-* 调整usertop ui ([13daab3](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/13daab39ecd02d313cf9c9c61fa8ab79ba10198f))
+### [0.1.13](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/compare/v0.1.21...v0.1.13) (2024-10-29)
 
 ### [0.1.12](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/compare/v0.1.6...v0.1.12) (2024-10-28)
 

package/components/lcb-list/hooks/useSelect.ts

@@ -16,6 +16,8 @@ const useSelect = (
       } else {
         model.value = [...(model.value || []), item.value as string]
       }
+    } else if (model.value === item.value) {
+      model.value = undefined
     } else {
       model.value = item.value
     }

package/components/lcb-notice/api/index.ts

@@ -0,0 +1,21 @@
+export interface AdvertItem {
+  adContent: string
+  advertId: string
+  closeTime: number
+  closeType: string
+  createDate: string
+  jumpType: number
+  lastModifyDate: string
+  pageType: string
+  type: number
+  title?: string
+  weightSort: string
+}
+/** 获取公告 */
+export const getAdvertList = (data: {
+  pageType: string
+  /** 1: 文字 2: 图片 */
+  type: 1 | 2
+}) => {
+  return uni.$lcb.http.post<AdvertItem[]>('/advert/list', data)
+}

package/components/lcb-notice/lcb-notice.vue

@@ -1,32 +1,49 @@
 <template>
   <lcb-block v-bind="$props" custom-class="border-solid border-1">
-    <swiper
-      class="swiper"
-      circular
-      :autoplay="true"
-      :disableTouch="true"
-      :interval="interval"
-      :vertical="direction == 'up'"
-      @change="onSwiperChange"
+    <wd-notice-bar
+      :text="textArray"
+      backgroundColor="transparent"
+      :color="color"
+      :direction="direction"
+      :speed="speed"
+      @click="handleClick"
+      custom-class="!p-0 !rounded-none"
     >
-      <swiper-item v-for="(item, idx) in items" :key="item.id">
-        <Item
-          :idx="idx"
-          :current="current"
-          :lens="items?.length"
-          :iconType="iconType"
-          :item="item"
-          :textSpeed="textSpeed"
-          :textColor="textColor"
-        />
-      </swiper-item>
-    </swiper>
+      <template #prefix v-if="iconType !== -1 && icon">
+        <view class="mr-12rpx">
+          <image
+            :src="icon"
+            class="h-auto"
+            mode="widthFix"
+            v-if="iconType === 1"
+            :style="{
+              width: transformValueUnit(iconSize),
+            }"
+          />
+          <wd-icon :name="icon" :size="transformValueUnit(iconSize)" class-prefix="lcb" v-else />
+        </view>
+      </template>
+      <template #suffix v-if="rightArrow">
+        <wd-icon name="arrow-right" size="32rpx" />
+      </template>
+    </wd-notice-bar>
   </lcb-block>
+  <wd-popup v-model="popup.show" position="bottom" custom-class="!bg-transparent" closable>
+    <view class="text-#333 px-3 pb-3 box-border bg-#fff rounded-t-20rpx">
+      <view class="py-3 text-center font-500 text-4">{{ popup.item.title || '公告' }}</view>
+      <view class="min-h-30vh max-h-50vh overflow-y-auto text-28rpx">
+        {{ popup.item.adContent }}
+      </view>
+    </view>
+  </wd-popup>
 </template>
 
 <script setup lang="ts">
 import { LcbNoticeBarProps } from './types'
-import Item from './Item/index.vue'
+import { inject, watch, ref, computed } from 'vue'
+import { AdvertItem, getAdvertList } from './api'
+import { PAGE_TYPE_PROVIDE_KEY } from '../../constants'
+import { transformValueUnit } from '../../utils/transform'
 
 defineOptions({
   name: 'LcbNotice',
@@ -36,37 +53,36 @@ defineOptions({
     styleIsolation: 'shared',
   },
 })
-
+const adverts = ref<AdvertItem[]>([])
 const props = withDefaults(defineProps<LcbNoticeBarProps>(), {
-  textSpeed: 1,
+  speed: 50,
   borderColor: 'transparent',
+  direction: 'vertical',
+  backgroundColor: '#fff',
+  paddingVertical: 16,
+  rightArrow: true,
+  color: '#333',
+  iconSize: 40,
 })
-console.log(props, 'props')
-
-function getTime(text: string | undefined) {
-  const len = text?.length || 0
-  // console.log('props.textSpeed', len, props.textSpeed)
-  return len > 25 ? ((50 - len) / 10) * props.textSpeed * 1000 + 3000 : 3000
-}
-// const params = ref<number>(0)
-// const model = defineModel<number>()
-const current = defineModel({ type: Number, default: 0 })
-const interval = defineModel('interval', { type: Number, default: 3000 })
-function onSwiperChange(item: any) {
-  // console.log('current.value', current.value)
-  current.value = item?.detail?.current
-  interval.value = getTime(props.items?.[current.value]?.noticeContent)
-  // console.log('onSwiperChange item', item)
-  // console.log('interval.value', interval.value)
+const popup = ref({
+  show: false,
+  item: {} as AdvertItem,
+})
+const pageType = inject(PAGE_TYPE_PROVIDE_KEY, props.pageType) as string
+const getData = async () => {
+  const { data } = await getAdvertList({
+    type: 1,
+    pageType,
+  })
+  adverts.value = data
 }
+watch(() => pageType, getData, { immediate: true })
 
-// function onSetInterval(val: number) {
-//   interval.value = val;
-// }
-</script>
-
-<style lang="scss" scoped>
-.swiper {
-  height: 72rpx;
+const textArray = computed(() => adverts.value.map((item) => item.adContent))
+const handleClick = (data: { text: string; index: number }) => {
+  popup.value = {
+    show: true,
+    item: adverts.value[data.index],
+  }
 }
-</style>
+</script>

package/components/lcb-notice/types.ts

@@ -1,30 +1,15 @@
-import { LcbActionViewProps } from '../../components/lcb-action-view/types'
-interface NoticeItem {
-  id?: number
-  noticeContent?: string
-  icon?: string
-  link?: LcbActionViewProps
-}
+import { NoticeBarScrollDirection } from '@tplc/wot/types/components/wd-notice-bar/types'
+import { LcbBlockProps } from '../lcb-block/types'
 
-export interface LcbNoticeBarProps {
-  // Define the component's prop types here
-  items?: Partial<NoticeItem>[]
+export interface LcbNoticeBarProps extends LcbBlockProps {
   vertical?: boolean
-  iconType?: number
-  direction?: string
-  textSpeed?: number
-  textColor?: string
-  borderColor?: string
-}
-
-export interface NoticeBarItemProps {
-  idx?: number
-  current?: number
-  text?: string
-  lens?: number
-  iconType?: number
-  item?: NoticeItem
-  textSpeed?: number
+  /** -1 无  0 图标 1 自定义 */
+  iconType?: -1 | 0 | 1
+  direction?: NoticeBarScrollDirection
+  speed?: number
   textColor?: string
-  // setInterval?: Function
+  pageType?: string
+  rightArrow?: boolean
+  icon?: string
+  iconSize?: number
 }

package/constants.ts

@@ -1,3 +1,5 @@
 export const FORM_KEY = 'form'
 /** 页面信息 */
 export const PAGE_PROVIDE_KEY = 'page_provide'
+/** 页面类型 */
+export const PAGE_TYPE_PROVIDE_KEY = 'page_type_provide'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tplc/business",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "keywords": [
     "业务组件"
   ],
@@ -11,7 +11,7 @@
   },
   "peerDependencies": {
     "vue": ">=3.2.47",
-    "@tplc/wot": "0.1.20"
+    "@tplc/wot": "0.1.21"
   },
   "engines": {
     "node": ">=18",

package/types/components/lcb-notice/api/index.d.ts

@@ -0,0 +1,19 @@
+export interface AdvertItem {
+  adContent: string
+  advertId: string
+  closeTime: number
+  closeType: string
+  createDate: string
+  jumpType: number
+  lastModifyDate: string
+  pageType: string
+  type: number
+  title?: string
+  weightSort: string
+}
+/** 获取公告 */
+export declare const getAdvertList: (data: {
+  pageType: string
+  /** 1: 文字 2: 图片 */
+  type: 1 | 2
+}) => Promise<import('../../../action').IResData<AdvertItem[]>>

package/types/components/lcb-notice/lcb-notice.vue.d.ts

@@ -1,16 +1,16 @@
 import { LcbNoticeBarProps } from './types'
-declare let __VLS_typeProps: LcbNoticeBarProps
-declare const interval: import('vue').ModelRef<number, string>
-type __VLS_PublicProps = {
-  modelValue?: any
-  interval?: NonNullable<(typeof interval)['value']>
-} & typeof __VLS_typeProps
 declare const _default: import('vue').DefineComponent<
   __VLS_WithDefaults<
-    __VLS_TypePropsToOption<__VLS_PublicProps>,
+    __VLS_TypePropsToOption<LcbNoticeBarProps>,
     {
-      textSpeed: number
+      speed: number
       borderColor: string
+      direction: string
+      backgroundColor: string
+      paddingVertical: number
+      rightArrow: boolean
+      color: string
+      iconSize: number
     }
   >,
   {},
@@ -19,29 +19,35 @@ declare const _default: import('vue').DefineComponent<
   {},
   import('vue').ComponentOptionsMixin,
   import('vue').ComponentOptionsMixin,
-  {
-    'update:modelValue': (modelValue: any) => void
-    'update:interval': (interval: number) => void
-  },
+  {},
   string,
   import('vue').PublicProps,
   Readonly<
     import('vue').ExtractPropTypes<
       __VLS_WithDefaults<
-        __VLS_TypePropsToOption<__VLS_PublicProps>,
+        __VLS_TypePropsToOption<LcbNoticeBarProps>,
         {
-          textSpeed: number
+          speed: number
           borderColor: string
+          direction: string
+          backgroundColor: string
+          paddingVertical: number
+          rightArrow: boolean
+          color: string
+          iconSize: number
         }
       >
     >
-  > & {
-    'onUpdate:modelValue'?: ((modelValue: any) => any) | undefined
-    'onUpdate:interval'?: ((interval: number) => any) | undefined
-  },
+  >,
   {
+    paddingVertical: number
+    backgroundColor: string
+    color: string
     borderColor: string
-    textSpeed: number
+    direction: import('@tplc/wot/types/components/wd-notice-bar/types').NoticeBarScrollDirection
+    iconSize: number
+    speed: number
+    rightArrow: boolean
   },
   {}
 >

package/types/components/lcb-notice/types.d.ts

@@ -1,27 +1,14 @@
-import { LcbActionViewProps } from '../../components/lcb-action-view/types'
-interface NoticeItem {
-  id?: number
-  noticeContent?: string
-  icon?: string
-  link?: LcbActionViewProps
-}
-export interface LcbNoticeBarProps {
-  items?: Partial<NoticeItem>[]
+import { NoticeBarScrollDirection } from '@tplc/wot/types/components/wd-notice-bar/types'
+import { LcbBlockProps } from '../lcb-block/types'
+export interface LcbNoticeBarProps extends LcbBlockProps {
   vertical?: boolean
-  iconType?: number
-  direction?: string
-  textSpeed?: number
-  textColor?: string
-  borderColor?: string
-}
-export interface NoticeBarItemProps {
-  idx?: number
-  current?: number
-  text?: string
-  lens?: number
-  iconType?: number
-  item?: NoticeItem
-  textSpeed?: number
+  /** -1 无  0 图标 1 自定义 */
+  iconType?: -1 | 0 | 1
+  direction?: NoticeBarScrollDirection
+  speed?: number
   textColor?: string
+  pageType?: string
+  rightArrow?: boolean
+  icon?: string
+  iconSize?: number
 }
-export {}

package/types/constants.d.ts

@@ -1,3 +1,5 @@
 export declare const FORM_KEY = 'form'
 /** 页面信息 */
 export declare const PAGE_PROVIDE_KEY = 'page_provide'
+/** 页面类型 */
+export declare const PAGE_TYPE_PROVIDE_KEY = 'page_type_provide'

package/components/lcb-notice/Item/index.vue

@@ -1,112 +0,0 @@
-<template>
-  <view class="flex items-center">
-    <div
-      v-if="iconType === 1"
-      class="overflow-hidden bg-no-repeat bg-contain mr-12rpx"
-      :style="{
-        height: transformValueUnit(40),
-        width: transformValueUnit(40),
-        backgroundImage: `url('${item?.icon}')`,
-      }"
-    />
-    <view v-if="iconType === 0" class="mr-12rpx">
-      <wd-icon
-        class-prefix="lcb"
-        v-bind="{
-          name: item?.icon || '',
-          size: transformValueUnit(40),
-        }"
-      />
-    </view>
-    <view class="flex-1 noticeBar relative overflow-hidden">
-      <view
-        :class="`text-24rpx absolute left-0 top-0 noticeItem flex overflow-hidden${lens == 1 ? ' infinite' : ''}${showAni ? ' animation' : ''}`"
-        :style="{
-          animationDuration: getTime(item?.noticeContent),
-          color: textColor,
-        }"
-      >
-        {{ item?.noticeContent }}
-        <lcb-action-view v-bind="item?.link" customClass="absolute top-0 left-0 right-0 bottom-0" />
-      </view>
-    </view>
-    <wd-icon name="arrow-right" size="32rpx" :color="textColor" />
-  </view>
-</template>
-
-<script setup lang="ts">
-import { NoticeBarItemProps } from '../types'
-import { computed } from 'vue'
-import { transformValueUnit } from '../../../utils/transform'
-defineOptions({
-  name: 'NoticeBarItem',
-  options: {
-    addGlobalClass: true,
-    virtualHost: true,
-    styleIsolation: 'shared',
-  },
-})
-const props = withDefaults(defineProps<NoticeBarItemProps>(), {
-  textSpeed: 1,
-})
-// const { proxy } = getCurrentInstance() as any
-const showAni = computed(() => {
-  // const query = uni.createSelectorQuery().in(proxy)
-  // query.select('.noticeBar').boundingClientRect()
-  // query.exec((res) => {
-  //   console.log(res)
-  // })
-  const len = props.item?.noticeContent?.length || 0
-  // console.log('showAni', props.idx, len)
-  return props.current === props.idx && len > 25
-})
-
-function getTime(text: string | undefined) {
-  const len = text?.length || 0
-  // console.log('item---', props.textSpeed)
-  return `${((50 - len) / 10) * props.textSpeed + 3}s`
-}
-</script>
-<style lang="scss" scoped>
-.noticeBar {
-  height: 72rpx;
-}
-
-.noticeItem {
-  height: 72rpx;
-  line-height: 72rpx;
-  transform: translateZ(0.5px);
-  line-clamp: 1;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  word-break: break-all;
-  animation-delay: 0.5s;
-  animation-direction: normal;
-  animation-duration: 3s;
-  animation-fill-mode: forwards;
-  animation-play-state: running;
-  animation-range-end: normal;
-  animation-range-start: normal;
-  animation-timeline: auto;
-  animation-timing-function: linear;
-}
-
-.infinite {
-  animation-iteration-count: infinite;
-}
-
-.animation {
-  animation-name: change;
-  // animation-duration: 5s;
-}
-
-@keyframes change {
-  0% {
-    transform: translate(0%);
-  }
-
-  100% {
-    transform: translate(-60%);
-  }
-}
-</style>

package/types/components/lcb-notice/Item/index.vue.d.ts

@@ -1,56 +0,0 @@
-import { NoticeBarItemProps } from '../types'
-declare const _default: import('vue').DefineComponent<
-  __VLS_WithDefaults<
-    __VLS_TypePropsToOption<NoticeBarItemProps>,
-    {
-      textSpeed: number
-    }
-  >,
-  {},
-  unknown,
-  {},
-  {},
-  import('vue').ComponentOptionsMixin,
-  import('vue').ComponentOptionsMixin,
-  {},
-  string,
-  import('vue').PublicProps,
-  Readonly<
-    import('vue').ExtractPropTypes<
-      __VLS_WithDefaults<
-        __VLS_TypePropsToOption<NoticeBarItemProps>,
-        {
-          textSpeed: number
-        }
-      >
-    >
-  >,
-  {
-    textSpeed: number
-  },
-  {}
->
-export default _default
-type __VLS_WithDefaults<P, D> = {
-  [K in keyof Pick<P, keyof P>]: K extends keyof D
-    ? __VLS_Prettify<
-        P[K] & {
-          default: D[K]
-        }
-      >
-    : P[K]
-}
-type __VLS_Prettify<T> = {
-  [K in keyof T]: T[K]
-} & {}
-type __VLS_NonUndefinedable<T> = T extends undefined ? never : T
-type __VLS_TypePropsToOption<T> = {
-  [K in keyof T]-?: {} extends Pick<T, K>
-    ? {
-        type: import('vue').PropType<__VLS_NonUndefinedable<T[K]>>
-      }
-    : {
-        type: import('vue').PropType<T[K]>
-        required: true
-      }
-}