@tplc/business 0.2.56 → 0.2.58

package/CHANGELOG.md

@@ -2,6 +2,27 @@
 
 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.58](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/compare/v0.2.57...v0.2.58) (2025-01-03)
+
+
+### ✨ Features | 新功能
+
+* 调整地图搜索 ([d8fe5fd](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/d8fe5fd3bd08e68cf39f76ca19e2419c6d747608))
+
+### [0.2.57](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/compare/v0.2.55...v0.2.57) (2025-01-03)
+
+
+### 🚀 Chore | 构建/工程依赖/工具
+
+* **release:** 0.2.56 ([5a16720](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/5a16720b5e8f56f3f79a99d97d61af22f8fc6c65))
+
+
+### ✨ Features | 新功能
+
+* nav 如果页面俩层以上支持home ([0d9607a](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/0d9607aab7406ec0baeefd00b6434ba53d2ff11d))
+* 修改city选择字段 ([f07078f](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/f07078fe0ad2bd0f7406202ab784a2714838ac02))
+* 城市回显 ([2ae514e](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/2ae514e8ba68fdceacf4ef3f2db66fe733ed97fc))
+
 ### [0.2.56](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/compare/v0.2.53...v0.2.56) (2025-01-03)
 
 

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

@@ -71,7 +71,12 @@ const { getLocation, userLocation } = useLocation()
 watch(
   () => addressCity.value,
   (val) => {
-    if (val) form.value.cityId = val?.cityId
+    if (val) {
+      form.value.cityId = val?.cityId
+      if (val.keywords) {
+        form.value.keywords = val.keywords
+      }
+    }
   },
 )
 watch(

package/components/lcb-city-select/api/index.ts

@@ -7,18 +7,19 @@ export interface HotAddress {
 
 export interface ChildHotAddress {
   addr: string
-  addrFlag: boolean
-  area: string
-  categoryName: string
+  addrFlag?: boolean
+  area?: string
+  categoryName?: string
   createDate?: string
-  hotAddressId: string
+  hotAddressId?: string
   icon?: string
   lastModifyDate?: string
   latitude?: string
+  keywords?: string
   className?: string
   cityId: string
   longitude?: string
-  weightSort: string
+  weightSort?: string
   addressInfo?: string
 }
 export const getHotAddress = () => uni.$lcb.http.post<HotAddress[]>('/hotAddress/categoryList', {})
@@ -26,6 +27,7 @@ export interface LcbAddress {
   addr: string
   addrFlag: boolean
   categoryName: string
+  keywords?: string
   cityId: string
   hotAddressId: string
   provinceCityName: string

package/components/lcb-city-select/components/lcb-city-letter/index.vue

@@ -26,7 +26,9 @@
           <view
             class="flex justify-center items-center address-tag"
             :class="{
-              'current-address': modelValue && modelValue.cityId === city.cityId,
+              'current-address':
+                modelValue &&
+                `${modelValue.addr},${modelValue.keywords}` === `${city.addr},${city.keywords}`,
               [city.className || '']: true,
             }"
             v-for="city in item.childHotAddress"
@@ -37,7 +39,7 @@
           >
             <view class="tag-view">
               <wd-icon v-if="city.icon" :name="city.icon" class="mr-0.5" />
-              {{ city.addr }}
+              {{ city.keywords ? `${city.keywords},` : '' }} {{ city.addr }}
             </view>
           </view>
         </view>
@@ -55,8 +57,8 @@
 
 <script setup lang="ts">
 import { LcbCitySelectProps } from '../../../lcb-city-select/types'
-import { ChildHotAddress, getHotAddress, HotAddress } from '../../api'
-import { computed, onMounted, ref, watch } from 'vue'
+import { ChildHotAddress, getHotAddress, HotAddress, LcbAddress } from '../../api'
+import { computed, inject, onMounted, Ref, ref } from 'vue'
 
 defineOptions({
   name: 'LcbCityLetter',
@@ -70,7 +72,7 @@ const props = withDefaults(defineProps<LcbCitySelectProps>(), {})
 const indexBarRef = ref<{ scrollToIndex: (index: string) => void }>()
 const addressRef = ref<HotAddress[]>([])
 const letterList = ref<string[]>([])
-const historyAddress = ref<ChildHotAddress[]>([])
+const historyList = inject('lcb-city-history') as Ref<LcbAddress[]>
 const modelValue = defineModel<ChildHotAddress>()
 onMounted(async () => {
   const { data } = await getHotAddress()
@@ -78,7 +80,6 @@ onMounted(async () => {
     .filter((v) => !v.categoryName.includes('热门'))
     .map((item) => item.categoryName)
   addressRef.value = data
-  historyAddress.value = JSON.parse(uni.getStorageSync('historyAddress') || '[]')
 })
 const locationAddress = computed<HotAddress[]>(() => {
   return props.location
@@ -104,25 +105,18 @@ const locationAddress = computed<HotAddress[]>(() => {
     : []
 })
 
-const historyList = computed<HotAddress[]>(() => {
-  return historyAddress.value.length
+const historyLetter = computed<HotAddress[]>(() => {
+  return historyList.value.length
     ? [
         {
           categoryName: '历史',
           hint: '历史选择',
-          childHotAddress: historyAddress.value,
+          childHotAddress: historyList.value,
         },
       ]
     : []
 })
-watch(
-  () => historyAddress.value,
-  (val) => {
-    if (val.length) {
-      uni.setStorageSync('historyAddress', JSON.stringify(val))
-    }
-  },
-)
+
 const onAddrClick = (city: ChildHotAddress, letter = false) => {
   if (letter) {
     indexBarRef.value?.scrollToIndex(city.addr)
@@ -133,11 +127,14 @@ const onAddrClick = (city: ChildHotAddress, letter = false) => {
     className: '',
   }
   modelValue.value = currentCity
-  historyAddress.value = historyAddress.value.filter((item) => item.cityId !== city.cityId)
-  if (historyAddress.value.length === 8) {
-    historyAddress.value = [currentCity, ...historyAddress.value.slice(0, 7)]
+  historyList.value = historyList.value.filter(
+    (historyItem) =>
+      `${historyItem.keywords},${historyItem.addr}` !== `${city.keywords},${city.addr}`,
+  )
+  if (historyList.value.length === 8) {
+    historyList.value = [currentCity as unknown as LcbAddress, ...historyList.value.slice(0, 7)]
   } else {
-    historyAddress.value = [currentCity, ...historyAddress.value]
+    historyList.value = [currentCity as unknown as LcbAddress, ...historyList.value]
   }
 }
 const indexBars = computed<HotAddress[]>(() => {
@@ -154,7 +151,7 @@ const indexBars = computed<HotAddress[]>(() => {
         },
       ] as HotAddress[])
     : ([] as HotAddress[])
-  return [...locationAddress.value, ...historyList.value, ...letters, ...addressRef.value]
+  return [...locationAddress.value, ...historyLetter.value, ...letters, ...addressRef.value]
 })
 </script>
 <style lang="scss" scoped>
@@ -162,7 +159,7 @@ const indexBars = computed<HotAddress[]>(() => {
 
 .address-tag {
   background: #f7f7f7;
-  height: 62rpx;
+  height: 70rpx;
   padding: 0rpx 16rpx;
   box-sizing: border-box;
   border-radius: 10rpx;

package/components/lcb-city-select/components/lcb-city-list/index.vue

@@ -1,15 +1,15 @@
 <template>
-  <view class="p-3 box-border h-full overflow-y-auto">
+  <view class="p-3 box-border h-full overflow-y-auto pt-0">
     <view v-for="item in list" :key="item.cityId" @click="onItemClick(item)">
-      <view class="flex">
+      <view class="flex mt-3">
         <view class="tag">{{ item.categoryName }}</view>
         <view class="content">
-          <rich-text :nodes="getText(item.addr)" />
+          <rich-text :nodes="getText(item.keywords || '-')" />
           <view>{{ item.provinceCityName || item.area }}</view>
         </view>
       </view>
     </view>
-    <view v-if="!list.length">
+    <view v-if="!list.length" class="mt-3">
       <view v-if="historyList.length">
         <view class="flex justify-between items-center">
           <view class="text-28rpx text-#333 font-500x">历史搜索</view>
@@ -22,8 +22,8 @@
             @click="emits('click', item)"
             class="history-tag"
           >
-            {{ item.addr }},
-            {{ item.area || item.provinceCityName }}
+            {{ item.keywords ? `${item.keywords},` : '' }}
+            {{ item.addr }}
           </view>
         </view>
       </view>
@@ -38,9 +38,9 @@
 </template>
 
 <script setup lang="ts">
+import { inject, Ref, ref } from 'vue'
 import { LcbAddress } from '../../api'
 import { LcbCityListProps } from './types'
-import { ref } from 'vue'
 
 defineOptions({
   name: 'LcbCityList',
@@ -51,25 +51,23 @@ defineOptions({
   },
 })
 const emits = defineEmits(['click'])
-const historyList = ref<LcbAddress[]>(uni.getStorageSync('lcb_city_select_history') || [])
+const historyList = inject('lcb-city-history') as Ref<LcbAddress[]>
 const props = withDefaults(defineProps<LcbCityListProps>(), {})
 const getText = (text: string) => {
-  const str = text.replace(props.keyword, `<div class="text-light">${props.keyword}</div>`)
+  const str = text.replace(props.keyword, `<div class="text-primary">${props.keyword}</div>`)
   return `<div class="flex">${str}</div>`
 }
 const onItemClick = (item: LcbAddress) => {
-  if (historyList.value.some((historyItem) => historyItem.cityId === item.cityId)) {
-    historyList.value = historyList.value.filter(
-      (historyItem) => historyItem.cityId !== item.cityId,
-    )
-  }
+  const addr = `${item.keywords},${item.addr}`
+  historyList.value = historyList.value.filter(
+    (historyItem) => `${historyItem.keywords},${historyItem.addr}` !== addr,
+  )
   historyList.value.unshift(item)
-  uni.setStorageSync('lcb_city_select_history', historyList.value)
   emits('click', item)
 }
 const onClear = () => {
   historyList.value = []
-  uni.removeStorageSync('lcb_city_select_history')
+  uni.removeStorageSync('historyAddress')
 }
 </script>
 <style lang="scss" scoped>

package/components/lcb-city-select/lcb-city-select.vue

@@ -57,7 +57,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, watch } from 'vue'
+import { ref, watch, provide } from 'vue'
 import { ChildHotAddress, getAddressList, LcbAddress } from './api'
 import LcbCityLetter from './components/lcb-city-letter/index.vue'
 import LcbCityList from './components/lcb-city-list/index.vue'
@@ -75,6 +75,8 @@ defineOptions({
 const props = withDefaults(defineProps<LcbCitySelectProps>(), {
   placeholder: '搜索城市/区域/景点',
 })
+const historyList = ref<LcbAddress[]>(uni.getStorageSync('historyAddress') || [])
+provide('lcb-city-history', historyList)
 const modelValue = defineModel<ChildHotAddress>()
 const isOver = ref(false)
 const searchValue = ref('')
@@ -93,13 +95,13 @@ const onCancel = () => {
 }
 
 const onAddressClick = (item: LcbAddress) => {
-  if (item.addrFlag) {
-    modelValue.value = item as ChildHotAddress
-  } else {
-    uni.navigateTo({
-      url: `/pages/residentialHotel/index?${qs.stringify(item)}`,
-    })
-  }
+  // if (item.addrFlag) {
+  modelValue.value = item as ChildHotAddress
+  // } else {
+  //   uni.navigateTo({
+  //     url: `/pages/residentialHotel/index?${qs.stringify(item)}`,
+  //   })
+  // }
   onCancel()
   show.value = false
 }
@@ -150,6 +152,16 @@ const search = debounce(async () => {
   const { data } = await getAddressList(searchValue.value)
   lcbAddress.value = data
 }, 200)
+
+watch(
+  () => historyList.value,
+  (val) => {
+    uni.setStorageSync('historyAddress', val)
+  },
+  {
+    deep: true,
+  },
+)
 </script>
 
 <style lang="scss" scoped>

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

@@ -176,6 +176,9 @@ watchEffect(() => {
   if (addressCity.value) {
     form.cityId = addressCity.value.cityId
     form.addr = addressCity.value.addr
+    if (addressCity.value.keywords) {
+      form.keywords = addressCity.value.keywords
+    }
   }
 })
 </script>

package/package.json

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

package/types/components/lcb-city-select/api/index.d.ts

@@ -6,18 +6,19 @@ export interface HotAddress {
 }
 export interface ChildHotAddress {
   addr: string
-  addrFlag: boolean
-  area: string
-  categoryName: string
+  addrFlag?: boolean
+  area?: string
+  categoryName?: string
   createDate?: string
-  hotAddressId: string
+  hotAddressId?: string
   icon?: string
   lastModifyDate?: string
   latitude?: string
+  keywords?: string
   className?: string
   cityId: string
   longitude?: string
-  weightSort: string
+  weightSort?: string
   addressInfo?: string
 }
 export declare const getHotAddress: () => Promise<import('../../../action').IResData<HotAddress[]>>
@@ -25,6 +26,7 @@ export interface LcbAddress {
   addr: string
   addrFlag: boolean
   categoryName: string
+  keywords?: string
   cityId: string
   hotAddressId: string
   provinceCityName: string