@tplc/business 0.2.40 → 0.2.41

package/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 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.2.41](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/compare/v0.2.40...v0.2.41) (2024-12-28)
+
+
+### ✨ Features | 新功能
+
+* add map list ([f22a31b](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/f22a31b5dd263d036e1c36ac979ce7a93d4f9d18))
+* map color ([59b79eb](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/59b79eb7720de13f338b5d485408d1827618bd4f))
+* map link ([f64b14f](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/f64b14f9889077f846dfedc3cc8899427f894307))
+* map 支持过滤 ([fd5c4fb](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/fd5c4fbcc0d48afa5e9947664b5fd7e0682068b8))
+
 ### [0.2.40](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/compare/v0.2.38...v0.2.40) (2024-12-27)
 
 

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

@@ -26,14 +26,9 @@
         <view class="text-#999999">{{ placeholder }}</view>
       </view>
     </view>
-    <wd-icon
-      name="dianwei"
-      class-prefix="lcb"
-      size="36rpx"
-      color="#333"
-      custom-class="ml-4"
-      @click="toMap"
-    />
+    <lcb-action-view v-bind="link" v-if="link">
+      <wd-icon :name="icon" class-prefix="lcb" size="36rpx" color="#333" custom-class="ml-4" />
+    </lcb-action-view>
   </lcb-block>
 </template>
 
@@ -84,9 +79,6 @@ watch(
   },
 )
 getLocation()
-const toMap = () => {
-  uni.$lcb.navigateTo(`/pages/map/index?form=${JSON.stringify(form?.value)}`)
-}
 </script>
 
 <style lang="scss" scoped>

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

@@ -1,6 +1,9 @@
+import { LcbActionViewProps } from '../lcb-action-view/types'
 import { LcbBlockProps } from '../lcb-block/types'
 
 export interface LcbCalendarSearchProps extends LcbBlockProps {
   // Define the component's prop types here
   placeholder?: string
+  link?: LcbActionViewProps
+  icon?: string
 }

package/components/lcb-map/lcb-map.vue

@@ -1,5 +1,6 @@
 <template>
-  <view class="flex-col flex h-180 w-full">
+  <view id="pagingTop"></view>
+  <view class="flex-col flex w-full" :style="{ height }" v-if="height">
     <view class="flex-1 h-0 relative">
       <map
         :latitude="form.mapLatitude"
@@ -14,16 +15,18 @@
       />
       <image
         src="./images/2.png"
-        class="w-36rpx h-66rpx absolute z-1 left-0 top-0 m-auto bottom-0 right-0"
+        class="w-36rpx h-66rpx absolute left-0 top-0 m-auto bottom-0 right-0"
       />
 
-      <view class="absolute bottom-0 left-0 p-3 box-border z-1 w-full h-fit" v-if="list[current]">
-        <lcb-product-item
-          v-bind="{
-            ...list[current],
-            ...attrs,
-          }"
-        />
+      <view class="absolute bottom-0 left-0 p-3 box-border w-full h-fit" v-if="list[current]">
+        <lcb-action-view v-bind="list[current].link">
+          <lcb-product-item
+            v-bind="{
+              ...list[current],
+              ...attrs,
+            }"
+          />
+        </lcb-action-view>
         <wd-icon
           class-prefix="lcb"
           size="28"
@@ -47,11 +50,12 @@
 
 <script lang="ts" setup>
 import { FORM_KEY } from '@tplc/business/constants'
-import { reactive, inject, ref, useAttrs } from 'vue'
+import { reactive, inject, ref, useAttrs, watch } from 'vue'
 import { LcbListInfo } from '../lcb-list/api'
 import { getPageOptions } from '../../utils/utils'
 import { MapItem, MapMarker } from './types'
-
+import useAutoHeight from '../../hooks/useAutoHeight'
+const height = useAutoHeight()
 defineOptions({
   name: 'LcbMap',
   options: {
@@ -82,24 +86,24 @@ const scaleRadius: Record<string, number> = {
   19: 10,
   20: 5,
 }
+const themeColor = inject('theme-color', '#3875FF')
 const callout: MapMarker['callout'] = {
   content: '腾讯总部大楼',
-  padding: 10,
+  padding: 4,
   display: 'ALWAYS',
   fontSize: 14,
   textAlign: 'center',
-  borderRadius: 2,
-  borderWidth: 2,
-  borderColor: '#3875FF',
+  borderRadius: 4,
+
+  borderWidth: 1,
+  borderColor: themeColor,
   bgColor: '#ffffff',
-  color: '#3875FF',
+  color: themeColor,
 }
 const info = reactive({
   covers: [] as MapMarker[],
 })
-const form = inject<Record<string, any>>(FORM_KEY, {
-  mapViewRadius: scaleRadius[16],
-})
+const form = inject<Record<string, any>>(FORM_KEY, {})
 const current = ref(0)
 const list = ref<MapItem[]>([])
 
@@ -116,15 +120,14 @@ const getData = async () => {
   getCurrentData(data)
 }
 const getLocation = () => {
-  getData()
   uni.getLocation({
     type: 'gcj02',
     success: (res) => {
+      form.value.mapViewRadius = scaleRadius[16]
       form.value.userLongitude = res.longitude
       form.value.userLatitude = res.latitude
       form.value.mapLatitude = res.latitude
       form.value.mapLongitude = res.longitude
-      getData()
     },
     fail: () => {
       uni.showToast({
@@ -165,15 +168,15 @@ const onCalloutTap = (e: { detail: { markerId: number } }) => {
   const old = info.covers[current.value].callout
   info.covers[e.detail.markerId].callout = {
     ...pre,
-    borderColor: '#eeeeee',
-    bgColor: '#3875FF',
+    borderColor: themeColor,
+    bgColor: themeColor,
     color: '#fff',
   }
   info.covers[current.value].callout = {
     ...old,
     borderColor: '#eeeeee',
     bgColor: '#ffffff',
-    color: '#3875FF',
+    color: themeColor,
   }
   current.value = e.detail.markerId
 }
@@ -188,19 +191,29 @@ const getCurrentData = (markers: MapItem[]) => {
       poiId: current.productId,
       latitude: current.latitude,
       longitude: current.longitude,
+      alpha: 0,
       callout: {
         ...callout,
         content: current.mapPriceTips,
-        borderColor: '#eeeeee',
-        bgColor: isCurrent ? '#3875FF' : '#ffffff',
-        color: isCurrent ? '#ffffff' : '#3875FF',
+        borderColor: isCurrent ? themeColor : '#eeeeee',
+        bgColor: isCurrent ? themeColor : '#ffffff',
+        color: isCurrent ? '#ffffff' : themeColor,
       },
     }
   })
   current.value = 0
 }
+watch(
+  () => form.value,
+  () => {
+    getData()
+  },
+  {
+    deep: true,
+  },
+)
 </script>
-<style lang="scss" scoped>
+<style lang="scss">
 .icon {
   position: absolute;
   top: 0;

package/components/lcb-map/types.ts

@@ -1,3 +1,5 @@
+import { LcbActionViewProps } from '../lcb-action-view/types'
+
 export interface MapMarker {
   id: number
   name?: string
@@ -11,6 +13,7 @@ export interface MapMarker {
     x: number
     y: number
   }
+  alpha?: number
 
   callout: {
     textAlign: string
@@ -31,4 +34,5 @@ export interface MapItem {
   latitude: number
   longitude: number
   productId: string
+  link: LcbActionViewProps
 }

package/package.json

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

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

@@ -32,6 +32,7 @@ declare const _default: import('vue').DefineComponent<
     >
   >,
   {
+    icon: string
     radius: number
     placeholder: string
     paddingHorizontal: number

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

@@ -1,4 +1,7 @@
+import { LcbActionViewProps } from '../lcb-action-view/types'
 import { LcbBlockProps } from '../lcb-block/types'
 export interface LcbCalendarSearchProps extends LcbBlockProps {
   placeholder?: string
+  link?: LcbActionViewProps
+  icon?: string
 }

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

@@ -1,3 +1,4 @@
+import { LcbActionViewProps } from '../lcb-action-view/types'
 export interface MapMarker {
   id: number
   name?: string
@@ -11,6 +12,7 @@ export interface MapMarker {
     x: number
     y: number
   }
+  alpha?: number
   callout: {
     textAlign: string
     borderWidth: number
@@ -30,4 +32,5 @@ export interface MapItem {
   latitude: number
   longitude: number
   productId: string
+  link: LcbActionViewProps
 }