@tplc/business 0.0.37 → 0.0.38

package/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 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.0.38](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/compare/v0.1.17...v0.0.38) (2024-10-22)
+
+
+### 🚀 Chore | 构建/工程依赖/工具
+
+* husky changed ([96139b0](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/96139b0e4f3fb469a62fd433f9446cfdf6a65016))
+
+
+### ✨ Features | 新功能
+
+* city 支持mode ([9686a0e](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/9686a0e1f19c4b05d936e1b674933b4744c1b3ba))
+* gap支持safe-top ([d21834c](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/d21834cb8b67da98667fc6216624dfa1962790e5))
+* 优化 lcb-list 过滤器吸顶逻辑；增加 unocss 插件触发文件 ([ff8d6ef](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/ff8d6ef0c7703823f1a7833482d3b17bb272ae82))
+* 调整 lcb-product-item 样式与逻辑 ([22810b7](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/22810b709783b44920a778d9c038e028dcce06ad))
+
 ### [0.0.37](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/compare/v0.0.36...v0.0.37) (2024-10-21)
 
 ### [0.0.36](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/compare/v0.0.35...v0.0.36) (2024-10-21)

package/components/lcb-area-picker/api/index.ts

@@ -43,3 +43,19 @@ export const getProvinceCityArea = async () => {
     }
   })
 }
+
+export const getProvinceCity = async () => {
+  const { data } = await uni.$lcb.http.post<ProvinceCityArea[]>('/provinces/provinceCityArea')
+  return data.map(({ provinceId, provinceName, cityList }) => {
+    return {
+      label: provinceName,
+      value: provinceId,
+      children: cityList.map(({ cityId, cityName }) => {
+        return {
+          label: cityName,
+          value: cityId,
+        }
+      }),
+    }
+  })
+}

package/components/lcb-area-picker/lcb-area-picker.vue

@@ -13,7 +13,7 @@
 <script setup lang="ts">
 import { onMounted, ref, watch } from 'vue'
 import { LcbAreaPickerProps } from './types'
-import { AreaOptions, getProvinceCityArea } from './api'
+import { AreaOptions, getProvinceCity, getProvinceCityArea } from './api'
 import { ColPickerColumnChangeOption } from '@tplc/wot/types/components/wd-col-picker/types'
 defineOptions({
   name: 'LcbAreaPicker',
@@ -23,7 +23,7 @@ defineOptions({
     styleIsolation: 'shared',
   },
 })
-withDefaults(defineProps<LcbAreaPickerProps>(), {})
+const props = withDefaults(defineProps<LcbAreaPickerProps>(), { mode: 'area' })
 const emits = defineEmits<{
   (event: 'confirm', payload: AreaOptions[]): void
 }>()
@@ -40,7 +40,7 @@ const columnChange = ({ selectedItem, resolve, finish }: ColPickerColumnChangeOp
   }
 }
 onMounted(async () => {
-  const data = await getProvinceCityArea()
+  const data = props.mode === 'area' ? await getProvinceCityArea() : await getProvinceCity()
   area.value = [data]
 })
 const stopWatch = watch(
@@ -57,9 +57,15 @@ const stopWatch = watch(
         return acc
       }, [] as string[])
       const cityItem = areas[0].find((item) => item.value === value[0])
-      const areaItem = cityItem?.children?.find((item) => item.value === value[1])
-      if (cityItem?.children && areaItem?.children)
-        area.value = [areas[0], cityItem.children, areaItem.children]
+      if (cityItem?.children) {
+        if (props.mode === 'area') {
+          const areaItem = cityItem?.children?.find((item) => item.value === value[1])
+          if (areaItem?.children) area.value = [areas[0], cityItem.children, areaItem.children]
+        } else {
+          area.value = [areas[0], cityItem.children]
+        }
+      }
+
       stopWatch()
     }
   },

package/components/lcb-area-picker/types.ts

@@ -1,3 +1,3 @@
 export interface LcbAreaPickerProps {
-  // Define the component's prop types here
+  mode: 'city' | 'area'
 }

package/components/lcb-list/components/FilterList/index.vue

@@ -7,14 +7,15 @@
     @query="queryList"
     use-page-scroll
   >
-    <lcb-product v-bind="{ ...productProps }" :items="dataList" />
+    <lcb-product v-bind="{ ...productProps }" :items="normalizeDataList" />
   </z-paging>
 </template>
 
 <script setup lang="ts">
-import { ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 import useZPaging from 'z-paging/components/z-paging/js/hooks/useZPaging'
 import { LcbFilterListProps } from './type'
+import { formatJson } from '../../../../utils/utils'
 
 defineOptions({
   name: 'FilterList',
@@ -28,6 +29,24 @@ const props = defineProps<LcbFilterListProps>()
 const dataList = ref<unknown[]>([])
 const paging = ref()
 useZPaging(paging)
+
+const normalizeDataList = computed(() => {
+  const list = dataList.value?.map?.((item: any) => {
+    const imgArr = formatJson(item.coverImg, [])
+    const tags = formatJson(item.tags, [])
+    return {
+      ...item,
+      image: imgArr?.[1] ?? imgArr?.[0],
+      title: item?.productName,
+      tags,
+      price: item?.price,
+    }
+  })
+  console.log('list', list)
+
+  return list
+})
+
 watch(
   () => props.url,
   async (val) => {
@@ -67,6 +86,13 @@ const queryList = async (page: number, limit: number) => {
     paging.value.complete(false)
   }
 }
+
+watch(
+  () => dataList.value,
+  () => {
+    console.log('dataList', dataList.value)
+  },
+)
 </script>
 <style lang="scss" scoped>
 .action-view {

package/components/lcb-list/lcb-list.vue

@@ -1,6 +1,6 @@
 <template>
   <view v-if="info">
-    <wd-sticky @sticky="sticky = $event">
+    <wd-sticky @sticky="sticky = $event" :offset-top="0.0001">
       <view
         :class="{
           'lcb-filter__border-top': showPlain ? false : border,

package/components/lcb-product/lcb-product.vue

@@ -1,9 +1,11 @@
 <template>
   <lcb-block v-bind="$props">
     <template v-if="styleGroup !== 2">
-      <view v-for="(item, index) in items" :key="index">
-        <!-- <view>{{  JSON.stringify(item) }}</view> -->
-        <lcb-product-item :styleProps="styleProps" :idx="index" v-bind="item" />
+      <view class="flex flex-col gap-2 p-2">
+        <view v-for="(item, index) in items" :key="`${item?.productId}:${index}`">
+          <!-- <view>{{  JSON.stringify(item) }}</view> -->
+          <lcb-product-item v-bind="item" />
+        </view>
       </view>
     </template>
     <scroll-view v-if="styleGroup == 2" scroll-x class="w-full whitespace-nowrap">

package/components/lcb-product-item/lcb-product-item.vue

@@ -1,50 +1,9 @@
-<template>
-  <view
-    :style="{
-      paddingTop: `${transformValueUnit(15)}`,
-      paddingBottom: `${transformValueUnit(15)}`,
-      paddingLeft: styleProps?.styleGroup != 1 && idx > 0 ? transformValueUnit(15) : 0,
-      width: styleProps?.styleGroup != 1 ? transformValueUnit(picWidth) : 'auto',
-      // paddingHorizontal: styleProps?.styleGroup == 1 ? null : 15,
-    }"
-  >
-    <view :class="`${styleProps?.styleGroup == 1 ? 'flex' : ''}`">
-      <wd-img
-        :src="realImg"
-        :width="transformValueUnit(picWidth)"
-        :height="transformValueUnit(picHeight)"
-      />
-      <view
-        v-if="styleProps?.productStyle != 'image'"
-        :class="`${styleProps?.styleGroup == 1 ? 'flex-1 pl-20rpx' : 'pt-20rpx'} pb-20rpx${styleProps?.productTitle == 1 ? ' ellipsis ' : ''}`"
-      >
-        <view
-          :class="`${styleProps?.productTitle == 1 ? 'ellipsis' : styleProps?.productTitle == 2 ? 'mulEllipsis' : 'wordBreak'} text-32rpx color-#333`"
-        >
-          {{ productName }}
-        </view>
-        <lcb-tags v-if="!!styleProps?.showTags" :mode="2" :tagRadius="3" :items="tags" />
-        <view>{{ subTitle }}</view>
-        <view class="flex items-center mt-15rpx">
-          <view v-if="!!styleProps?.showPrice" class="text-30rpx color-red">¥</view>
-          <view v-if="!!styleProps?.showPrice" class="text-32rpx color-red">{{ price }}</view>
-          <view
-            v-if="!!styleProps?.showScribePrice"
-            class="line-through text-22rpx color-#999 ml-10rpx pt-5rpx"
-          >
-            ¥{{ scribePrice }}
-          </view>
-        </view>
-      </view>
-    </view>
-  </view>
-</template>
-
 <script setup lang="ts">
-import { computed } from 'vue'
+import { computed, useAttrs } from 'vue'
 import { transformValueUnit } from '../../utils/transform'
 import { LcbProductItemProps } from './types'
 import { formatJson } from '../../utils/utils'
+
 defineOptions({
   name: 'LcbProductItem',
   options: {
@@ -55,43 +14,48 @@ defineOptions({
 })
 
 const props = withDefaults(defineProps<LcbProductItemProps>(), {
-  idx: 0,
-  picWidth: 300,
-  picHeight: 200,
+  layoutType: 1,
+  priceUnit: '¥',
+  originPriceUnit: '¥',
+  lowestPriceUnit: '¥',
 })
-const realImg = computed(() => {
-  console.log('props', props.styleProps)
-  const imgArr = formatJson(props.coverImg, [])
-  return imgArr[1] || imgArr[0]
-})
-</script>
+const attrs = useAttrs()
 
-<style lang="scss" scoped>
-.ellipsis {
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-}
+// console.log('attrs', attrs)
+</script>
 
-.noEllip {
-  white-space: normal;
-  text-overflow: clip;
-}
+<template>
+  <view v-if="layoutType === 1" class="flex gap-2 px-2 py-3 bg-white">
+    <view class="w-1/3 h-220rpx bg-coolgray/90 rounded-sm overflow-hidden">
+      <image :src="image" class="w-full h-full" mode="aspectFill" />
+    </view>
+    <view class="flex flex-col flex-1 justify-between text-26rpx overflow-hidden">
+      <view class="flex flex-col gap-2 overflow-hidden">
+        <view>{{ title ?? attrs?.productName }}</view>
+        <view v-if="tags?.length > 0" class="flex gap-1 whitespace-nowrap overflow-auto">
+          <wd-tag v-for="tag in tags" :key="tag" class="!text-20rpx" plain type="primary">
+            {{ tag }}
+          </wd-tag>
+        </view>
+      </view>
+      <view class="flex gap-2">
+        <view class="flex gap-[3rpx] items-end">
+          <view class="text-red font-bold">{{ priceUnit }}</view>
+          <view class="text-red font-bold">{{ price }}</view>
+          <view v-if="!!attrs?.behindUnit" class="text-22rpx">{{ attrs?.behindUnit }}</view>
+        </view>
+      </view>
+    </view>
+  </view>
 
-.wordBreak {
-  word-wrap: break-word;
-  word-break: break-all;
-  white-space: normal;
-}
+  <!-- <view v-if="layoutType === 2" class="flex flex-col gap-2 p-2 bg-white">
+    <view class="overflow-hidden">
+      <image :src="image" class="w-full" mode="widthFix" />
+    </view>
+    <view class="flex flex-col flex-1 text-26rpx">
+      <view>{{ title ?? attrs?.productName }}</view>
+    </view>
+  </view> -->
+</template>
 
-.mulEllipsis {
-  /*! autoprefixer: off */
-  white-space: normal;
-  display: -webkit-box;
-  -webkit-box-orient: vertical;
-  text-overflow: ellipsis;
-  overflow: hidden;
-  word-break: break-all;
-  -webkit-line-clamp: 2;
-}
-</style>
+<style lang="scss" scoped></style>

package/components/lcb-product-item/readme.md

@@ -0,0 +1,22 @@
+# 产品展示组件
+
+属性说明
+
+
+layoutType
+image
+title
+subTitle
+price
+priceUnit
+originPrice
+originPriceUnit
+lowestPrice
+lowestPriceUnit
+tags
+location
+distance
+
+尝试使用 grid 进行布局
+
+

package/components/lcb-product-item/types.ts

@@ -1,14 +1,16 @@
 export interface LcbProductItemProps {
   // Define the component's prop types here
-  coverImg?: string
-  picWidth?: number
-  picHeight?: number
-  productName?: string
-  tags?: string | Record<string, any>
-  subTitle?: string
-  price?: string | number
-  priceColor?: string
-  scribePrice?: string | number
-  styleProps?: Record<string, any>
-  idx?: number
+  layoutType?: 1 | 2 // 1 横向、2 纵向
+  image?: any
+  title?: any
+  subTitle?: any
+  price?: any
+  priceUnit?: any
+  originPrice?: any
+  originPriceUnit?: any
+  lowestPrice?: any
+  lowestPriceUnit?: any
+  tags?: any
+  location?: any
+  distance?: any
 }

package/package.json

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

package/types/components/lcb-area-picker/api/index.d.ts

@@ -35,4 +35,14 @@ export declare const getProvinceCityArea: () => Promise<
     }[]
   }[]
 >
+export declare const getProvinceCity: () => Promise<
+  {
+    label: string
+    value: string
+    children: {
+      label: string
+      value: string
+    }[]
+  }[]
+>
 export {}

package/types/components/lcb-area-picker/lcb-area-picker.vue.d.ts

@@ -8,7 +8,12 @@ declare function __VLS_template(): {
   default?(_: { text: string[] | undefined }): any
 }
 declare const __VLS_component: import('vue').DefineComponent<
-  __VLS_WithDefaults<__VLS_TypePropsToOption<__VLS_PublicProps>, {}>,
+  __VLS_WithDefaults<
+    __VLS_TypePropsToOption<__VLS_PublicProps>,
+    {
+      mode: string
+    }
+  >,
   {},
   unknown,
   {},
@@ -23,13 +28,20 @@ declare const __VLS_component: import('vue').DefineComponent<
   import('vue').PublicProps,
   Readonly<
     import('vue').ExtractPropTypes<
-      __VLS_WithDefaults<__VLS_TypePropsToOption<__VLS_PublicProps>, {}>
+      __VLS_WithDefaults<
+        __VLS_TypePropsToOption<__VLS_PublicProps>,
+        {
+          mode: string
+        }
+      >
     >
   > & {
     onConfirm?: ((payload: AreaOptions[]) => any) | undefined
     'onUpdate:modelValue'?: ((modelValue: string[]) => any) | undefined
   },
-  {},
+  {
+    mode: 'city' | 'area'
+  },
   {}
 >
 declare const _default: __VLS_WithTemplateSlots<

package/types/components/lcb-area-picker/types.d.ts

@@ -1 +1,3 @@
-export interface LcbAreaPickerProps {}
+export interface LcbAreaPickerProps {
+  mode: 'city' | 'area'
+}

package/types/components/lcb-product-item/lcb-product-item.vue.d.ts

@@ -3,9 +3,10 @@ declare const _default: import('vue').DefineComponent<
   __VLS_WithDefaults<
     __VLS_TypePropsToOption<LcbProductItemProps>,
     {
-      idx: number
-      picWidth: number
-      picHeight: number
+      layoutType: number
+      priceUnit: string
+      originPriceUnit: string
+      lowestPriceUnit: string
     }
   >,
   {},
@@ -22,17 +23,19 @@ declare const _default: import('vue').DefineComponent<
       __VLS_WithDefaults<
         __VLS_TypePropsToOption<LcbProductItemProps>,
         {
-          idx: number
-          picWidth: number
-          picHeight: number
+          layoutType: number
+          priceUnit: string
+          originPriceUnit: string
+          lowestPriceUnit: string
         }
       >
     >
   >,
   {
-    idx: number
-    picWidth: number
-    picHeight: number
+    layoutType: 1 | 2
+    priceUnit: any
+    originPriceUnit: any
+    lowestPriceUnit: any
   },
   {}
 >

package/types/components/lcb-product-item/types.d.ts

@@ -1,13 +1,15 @@
 export interface LcbProductItemProps {
-  coverImg?: string
-  picWidth?: number
-  picHeight?: number
-  productName?: string
-  tags?: string | Record<string, any>
-  subTitle?: string
-  price?: string | number
-  priceColor?: string
-  scribePrice?: string | number
-  styleProps?: Record<string, any>
-  idx?: number
+  layoutType?: 1 | 2
+  image?: any
+  title?: any
+  subTitle?: any
+  price?: any
+  priceUnit?: any
+  originPrice?: any
+  originPriceUnit?: any
+  lowestPrice?: any
+  lowestPriceUnit?: any
+  tags?: any
+  location?: any
+  distance?: any
 }