@tplc/business 0.4.4 → 0.4.6

package/CHANGELOG.md

@@ -2,6 +2,45 @@
 
 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.4.6](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/compare/v0.4.5...v0.4.6) (2025-03-24)
+
+
+### ✨ Features | 新功能
+
+* 新增过滤属性 ([1550bf8](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/1550bf828d51340111c293d3e6e856397d02480f))
+
+### [0.4.5](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/compare/v0.3.94...v0.4.5) (2025-03-24)
+
+
+### 🚀 Chore | 构建/工程依赖/工具
+
+* **release:** 0.3.100 ([b2e8ec6](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/b2e8ec601f623535f7001bdd99bb03458ed14b84))
+* **release:** 0.3.101 ([c547cbb](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/c547cbb175f74dcb7f52b07ece54da3d1698bc30))
+* **release:** 0.3.95 ([f9ca9ff](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/f9ca9ff0416ef0bda24eea8dbf689b26129a78a5))
+* **release:** 0.3.96 ([5f357d3](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/5f357d3ef08c67bd3d930d90eec47d61f6aaa66e))
+* **release:** 0.3.97 ([d8e0beb](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/d8e0bebb7608cdd554156f7ab5879c711cc6c32a))
+* **release:** 0.3.98 ([1b3a356](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/1b3a3564eae8c662f8fc1feb4445799f5b56bdbb))
+* **release:** 0.3.99 ([7f9861f](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/7f9861f7a59476307b09a5f7bf0de9cf12ccf969))
+* **release:** 0.4.1 ([fa913d1](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/fa913d1a0e9cadd70aac45147e0b1e4819606ef5))
+* **release:** 0.4.2 ([cf71a5b](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/cf71a5b2e29e1fcfcd5527bb56abe7d8a920607d))
+* **release:** 0.4.3 ([21d38cb](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/21d38cb80f3c41a0a4be99b4cbb28dd32c849c6e))
+* **release:** 0.4.4 ([34e2c09](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/34e2c09c3c8d992c3cbcdaf3b1d4dc63a2d4a113))
+
+
+### ✨ Features | 新功能
+
+* form 校验 ([51cce50](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/51cce50ece8f98479fecf9e30c26d755e6188c82))
+* 修改 addresName ([bbc369d](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/bbc369dad73eb961c74b2aa1dfa6b833bb5cb572))
+* 修改ui ([ae50efe](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/ae50efe91a667d8f040479d6274853c091a791f1))
+* 修改地址 ([dba8297](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/dba82970fccf44096fed203b46316c7da2f9f9b9))
+* 修改接口 ([d3a0193](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/d3a01931b2a4f86b992d9df0e390ce3bf5870cf4))
+* 差协议弹出 ([53ecf7d](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/53ecf7dd6ee37cf94abaf3d8ffb2ad8adfcc1841))
+* 新增tag ([74b9c29](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/74b9c2971b69986c6c0428406eeca0a57d66eef4))
+* 调整全局 ([c7ef8db](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/c7ef8db507c2b199cebfed02c6051bc81fd6d6ff))
+* 调整底部数据 ([9f72871](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/9f72871c2c3b3a70c2140828182cd3ecd527a3f7))
+* 调整过滤选择 ([764ce1f](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/764ce1f68a6a851777835ea0ff5f0d588c715937))
+* 还差数据统一 ([4f87b06](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/4f87b06331726ae4bf505c4ebae62076688ee9dc))
+
 ### [0.4.4](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/compare/v0.4.3...v0.4.4) (2025-03-23)
 
 

package/components/lcb-calendar/lcb-calendar.vue

@@ -4,7 +4,7 @@
     @confirm="handleConfirm"
     type="daterange"
     use-default-slot
-    :formatter="formatter"
+    :formatter="calendarFormatter(holidayInfo, translate)"
     :min-date="minDate"
     :max-date="maxDate"
     @open="emits('open')"
@@ -20,6 +20,7 @@ import { useTranslate } from '@tplc/wot'
 import dayjs from 'dayjs/esm'
 import { ref } from 'vue'
 import { LcbHistoryResult, queryHolidayInfoList } from './api'
+import { calendarFormatter } from '../../utils/formatter'
 const { translate } = useTranslate()
 
 defineOptions({
@@ -83,46 +84,6 @@ const getDayInfo = async () => {
   )
 }
 
-const formatter = (day: any) => {
-  const date = new Date(day.date)
-  const now = new Date()
-
-  const year = date.getFullYear()
-  const month = date.getMonth()
-  const da = date.getDate()
-  const nowYear = now.getFullYear()
-  const nowMonth = now.getMonth()
-  const nowDa = now.getDate()
-
-  const info = holidayInfo.value[dayjs(day.date).format('YYYY-MM-DD')]
-  if (info?.topText) {
-    day.topInfo = info.topText
-  }
-  if (info?.bottomText) {
-    day.bottomInfo = info.bottomText
-  }
-  if (info?.centerText) {
-    day.text = info.centerText
-  }
-  if (year === nowYear && month === nowMonth && da === nowDa) {
-    day.topInfo = translate('今天')
-  }
-
-  if (day.type === 'start') {
-    day.topInfo = translate('开始')
-  }
-
-  if (day.type === 'end') {
-    day.topInfo = translate('结束')
-  }
-
-  if (day.type === 'same') {
-    day.bottomInfo = translate('开始/结束')
-  }
-  day.restFlag = info?.restFlag
-
-  return day
-}
 const handleConfirm = ({ value }: { value: number[] }) => {
   model.value = value
   emits('confirm', value)

package/components/lcb-calendar-filter/api.ts

@@ -0,0 +1,4 @@
+import { HolidayInfo } from './types'
+
+export const queryHolidayInfoList = (data: { productType: string; productSkuId?: string }) =>
+  uni.$lcb.http.post<HolidayInfo[]>('/holiday/queryHolidayInfoList', data)

package/components/lcb-calendar-filter/components/CalendarItem/index.vue

@@ -0,0 +1,43 @@
+<template>
+  <view
+    class="gap-0.25 flex flex-col p-2 justify-center border-solid border-1 border-#eeeeee rounded-1 relative"
+    @click="date?.status !== 0 ? (currentDate = date?.date) : undefined"
+    :class="{
+      'bg-[var(--theme-bg-color)] text-primary !border-[var(--wot-primary-color)]':
+        currentDate === date?.date,
+      'opacity-50': date?.status === 0,
+      [customClass]: true,
+    }"
+  >
+    <template v-if="date">
+      <text class="whitespace-nowrap">
+        {{ date.topTextOutside }} {{ dayjs(date.date).format('MM-DD') }}
+      </text>
+      <view class="text-[var(--font1-color)]">{{ date.buttomText }}</view>
+      <view v-if="date.floorText" class="text-[var(--font2-color)]">
+        {{ date.floorText }}
+      </view>
+      <view
+        v-if="date.corner"
+        class="absolute top--2 left--0.25 bg-primary text-white text-2 px-2 py-0.25 rounded-tl-2 rounded-br-1"
+      >
+        {{ date.corner }}
+      </view>
+    </template>
+    <template v-if="showAll">
+      <text class="whitespace-nowrap">全部</text>
+    </template>
+  </view>
+</template>
+<script setup lang="ts">
+import dayjs from 'dayjs/esm'
+import { HolidayInfo } from '../../types'
+
+defineProps<{
+  date?: HolidayInfo
+  showAll?: boolean
+  customClass: string
+}>()
+
+const currentDate = defineModel<string | undefined>()
+</script>

package/components/lcb-calendar-filter/lcb-calendar-filter.vue

@@ -1,9 +1,60 @@
 <template>
-  <lcb-block></lcb-block>
+  <lcb-block v-bind="$props">
+    <view class="relative flex">
+      <!-- 左侧固定的"全部"选项 -->
+      <CalendarItem showAll v-model="currentDate" custom-class="mt-3" />
+
+      <scroll-view
+        scroll-x
+        class="whitespace-nowrap overflow-x-auto overflow-y-auto flex-1 w-0 pl-2 box-border"
+        :show-scrollbar="false"
+        :scroll-into-view="`id_${currentDate}`"
+        :scroll-with-animation="true"
+      >
+        <view class="flex gap-2 inline-flex h-full">
+          <CalendarItem
+            v-for="date in datePriceList"
+            :key="date.date"
+            :id="`id_${date.date}`"
+            :date="date"
+            custom-class="mt-3 !justify-start"
+            v-model="currentDate"
+          />
+        </view>
+      </scroll-view>
+      <view
+        class="flex flex-col justify-center items-center px-2 py-1 w-8 text-primary bg-white mt-3"
+        @click="onMore"
+        v-if="showMore"
+      >
+        <text class="text-center">更多时间</text>
+        <wd-icon name="caret-right-small" size="18px" />
+      </view>
+    </view>
+
+    <wd-calendar
+      ref="calendarRef"
+      :with-cell="false"
+      v-model="calendarValue"
+      :formatter="calendarFormatter(holidayInfo, t)"
+      @confirm="handleCalendarChange"
+      :modal="false"
+      v-bind="dateRange"
+    />
+  </lcb-block>
 </template>
 
 <script setup lang="ts">
-import { LcbCalendarFilterProps } from './types'
+import { useTranslate } from '@tplc/wot'
+import { CalendarExpose } from '@tplc/wot/types/components/wd-calendar/types'
+import dayjs from 'dayjs/esm'
+import 'dayjs/esm/locale/zh-cn'
+import { onMounted, ref, watchEffect, inject, Ref } from 'vue'
+import { HolidayInfo, LcbCalendarFilterProps } from './types'
+import CalendarItem from './components/CalendarItem/index.vue'
+import { queryHolidayInfoList } from './api'
+import { FORM_KEY } from '../../constants'
+import { calendarFormatter } from '../../utils/formatter'
 defineOptions({
   name: 'LcbCalendarFilter',
   options: {
@@ -12,7 +63,63 @@ defineOptions({
     styleIsolation: 'shared',
   },
 })
-withDefaults(defineProps<LcbCalendarFilterProps>(), {})
-</script>
+const { translate: t } = useTranslate()
+const props = withDefaults(defineProps<LcbCalendarFilterProps>(), {
+  showAll: true,
+  showMore: true,
+  formKey: 'date',
+  fontSize: 24,
+})
+const dateRange = ref({
+  minDate: dayjs().valueOf(),
+  maxDate: dayjs().add(30, 'day').valueOf(),
+})
+const currentDate = ref<string>()
+const holidayInfo = ref<Record<string, HolidayInfo>>({})
+const datePriceList = ref<HolidayInfo[]>()
+const calendarRef = ref<CalendarExpose>()
+const calendarValue = ref<number | number[] | null>(null)
+const from = inject(FORM_KEY) as Ref<Record<string, any>>
+onMounted(async () => {
+  const { data } = await queryHolidayInfoList({
+    productType: 'activity',
+  })
+  holidayInfo.value = data.reduce(
+    (acc, cur) => {
+      acc[cur.date] = cur
+      return acc
+    },
+    {} as Record<string, HolidayInfo>,
+  )
+  const sortedHolidayInfo = Object.keys(holidayInfo.value).sort((a, b) => {
+    return dayjs(a).valueOf() - dayjs(b).valueOf()
+  })
+  dateRange.value.minDate = dayjs(sortedHolidayInfo[0]).valueOf()
+  dateRange.value.maxDate = dayjs(sortedHolidayInfo[sortedHolidayInfo.length - 1]).valueOf()
+  handleCalendarChange({ value: dayjs().valueOf() })
+})
+const handleCalendarChange = ({ value }: { value: number }) => {
+  const targetDate = dayjs(value)
+  // 前七天
+  const startDate = targetDate.subtract(7, 'day')
+  // 往后算15天
+  const priceList: HolidayInfo[] = []
+  for (let i = 0; i < 15; i++) {
+    const date = startDate.add(i, 'day')
+    const formattedDate = date.format('YYYY-MM-DD')
+    const holidayData = holidayInfo.value[formattedDate]
+    if (holidayData) {
+      priceList.push(holidayData)
+    }
+  }
+  datePriceList.value = priceList as HolidayInfo[]
+}
 
-<style lang="scss" scoped></style>
+watchEffect(() => {
+  calendarValue.value = currentDate.value ? dayjs(currentDate.value).valueOf() : null
+  from!.value[props.formKey] = currentDate.value
+})
+const onMore = async () => {
+  calendarRef.value?.open()
+}
+</script>

package/components/lcb-calendar-filter/types.ts

@@ -1,3 +1,32 @@
-export interface LcbCalendarFilterProps {
-  // Define the component's prop types here
+import { LcbBlockProps } from '../../components/lcb-block/types'
+
+export interface LcbCalendarFilterProps extends LcbBlockProps {
+  /**
+   * 是否显示"全部"按钮
+   * @default true
+   */
+  showAll?: boolean
+
+  /**
+   * 当前选中的日期值
+   */
+  showMore?: boolean
+
+  /**
+   * 表单key
+   */
+  formKey?: string
+}
+
+export interface HolidayInfo {
+  bottomText?: string
+  date: string
+  floorText?: string
+  topTextOutside?: string
+  buttomText?: string
+  price: number
+  topText?: string
+  status: number
+  corner?: string
+  restFlag: boolean
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tplc/business",
-  "version": "0.4.4",
+  "version": "0.4.6",
   "keywords": [
     "业务组件"
   ],

package/types/components/lcb-calendar-filter/api.d.ts

@@ -0,0 +1,5 @@
+import { HolidayInfo } from './types'
+export declare const queryHolidayInfoList: (data: {
+  productType: string
+  productSkuId?: string
+}) => Promise<import('../../action').IResData<HolidayInfo[]>>

package/types/components/lcb-calendar-filter/components/CalendarItem/index.vue.d.ts

@@ -0,0 +1,40 @@
+import { HolidayInfo } from '../../types'
+declare let __VLS_typeProps: {
+  date?: HolidayInfo
+  showAll?: boolean
+  customClass: string
+}
+type __VLS_PublicProps = {
+  modelValue?: string | undefined
+} & typeof __VLS_typeProps
+declare const _default: import('vue').DefineComponent<
+  __VLS_TypePropsToOption<__VLS_PublicProps>,
+  {},
+  unknown,
+  {},
+  {},
+  import('vue').ComponentOptionsMixin,
+  import('vue').ComponentOptionsMixin,
+  {
+    'update:modelValue': (modelValue: string | undefined) => void
+  },
+  string,
+  import('vue').PublicProps,
+  Readonly<import('vue').ExtractPropTypes<__VLS_TypePropsToOption<__VLS_PublicProps>>> & {
+    'onUpdate:modelValue'?: ((modelValue: string | undefined) => any) | undefined
+  },
+  {},
+  {}
+>
+export default _default
+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
+      }
+}

package/types/components/lcb-calendar-filter/lcb-calendar-filter.vue.d.ts

@@ -1,8 +1,14 @@
+import 'dayjs/esm/locale/zh-cn'
+import { LcbCalendarFilterProps } from './types'
 declare const _default: import('vue').DefineComponent<
-  Readonly<
-    import('vue').ComponentPropsOptions<{
-      [x: string]: unknown
-    }>
+  __VLS_WithDefaults<
+    __VLS_TypePropsToOption<LcbCalendarFilterProps>,
+    {
+      showAll: boolean
+      showMore: boolean
+      formKey: string
+      fontSize: number
+    }
   >,
   {},
   unknown,
@@ -13,20 +19,48 @@ declare const _default: import('vue').DefineComponent<
   {},
   string,
   import('vue').PublicProps,
-  | readonly string[]
-  | Readonly<
-      import('vue').ExtractPropTypes<
-        Readonly<
-          import('vue').ComponentObjectPropsOptions<{
-            [x: string]: unknown
-          }>
-        >
+  Readonly<
+    import('vue').ExtractPropTypes<
+      __VLS_WithDefaults<
+        __VLS_TypePropsToOption<LcbCalendarFilterProps>,
+        {
+          showAll: boolean
+          showMore: boolean
+          formKey: string
+          fontSize: number
+        }
       >
-    >,
-  | {
-      readonly [x: number]: string
-    }
-  | {},
+    >
+  >,
+  {
+    fontSize: number
+    showAll: boolean
+    showMore: boolean
+    formKey: string
+  },
   {}
 >
 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
+      }
+}

package/types/components/lcb-calendar-filter/types.d.ts

@@ -1 +1,28 @@
-export interface LcbCalendarFilterProps {}
+import { LcbBlockProps } from '../../components/lcb-block/types'
+export interface LcbCalendarFilterProps extends LcbBlockProps {
+  /**
+   * 是否显示"全部"按钮
+   * @default true
+   */
+  showAll?: boolean
+  /**
+   * 当前选中的日期值
+   */
+  showMore?: boolean
+  /**
+   * 表单key
+   */
+  formKey?: string
+}
+export interface HolidayInfo {
+  bottomText?: string
+  date: string
+  floorText?: string
+  topTextOutside?: string
+  buttomText?: string
+  price: number
+  topText?: string
+  status: number
+  corner?: string
+  restFlag: boolean
+}

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

@@ -179,13 +179,13 @@ declare const _default: import('vue').DefineComponent<
     modelValue: unknown[]
     width: string | number
     height: string | number
+    showScrollbar: boolean
     columnCount: string | number
     columnGap: string | number
     idKey: string
     addTime: number
     leftGap: string | number
     rightGap: string | number
-    showScrollbar: boolean
   },
   {}
 >

package/types/utils/formatter.d.ts

@@ -0,0 +1,5 @@
+import { HolidayInfo } from '../components/lcb-calendar-filter/types'
+export declare const calendarFormatter: (
+  holidayInfo: Record<string, HolidayInfo>,
+  t: (key: string) => string,
+) => (day: any) => any

package/utils/formatter.ts

@@ -0,0 +1,43 @@
+import { HolidayInfo } from '../components/lcb-calendar-filter/types'
+import dayjs from 'dayjs/esm'
+
+export const calendarFormatter =
+  (holidayInfo: Record<string, HolidayInfo>, t: (key: string) => string) => (day: any) => {
+    const date = new Date(day.date)
+    const now = new Date()
+
+    const year = date.getFullYear()
+    const month = date.getMonth()
+    const da = date.getDate()
+    const nowYear = now.getFullYear()
+    const nowMonth = now.getMonth()
+    const nowDa = now.getDate()
+    const info = holidayInfo[dayjs(day.date).format('YYYY-MM-DD')]
+    if (info?.bottomText) {
+      day.bottomInfo = info.bottomText
+    }
+    if (year === nowYear && month === nowMonth && da === nowDa) {
+      day.topInfo = t('今天')
+    }
+    if (info?.floorText) {
+      day.floorText = info.floorText
+    }
+
+    if (day.type === 'start') {
+      day.topInfo = t('开始')
+    }
+
+    if (day.type === 'end') {
+      day.topInfo = t('结束')
+    }
+
+    if (day.type === 'same') {
+      day.bottomInfo = t('开始/结束')
+    }
+    if (info?.status !== 1) {
+      day.disabled = true
+    }
+    day.restFlag = info?.restFlag
+
+    return day
+  }