@tplc/business 0.3.61 → 0.3.62

package/CHANGELOG.md

@@ -2,6 +2,19 @@
 
 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.3.62](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/compare/v0.1.62...v0.3.62) (2025-02-27)
+
+
+### ✨ Features | 新功能
+
+* calendar 支持 withCell ([c8c21ad](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/c8c21adaf5c1bb402f34c99a04b7a2ee39b12563))
+* product 支持 request ([3e708e0](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/3e708e02e9ce504b699357a4e04852be9140f515))
+* product 支持刷新 ([39bfec8](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/39bfec829996bee60c12ae8e9c6d58c076b7123a))
+* 支持grid ([ee2b8fb](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/ee2b8fbff8bbaabd6120d1b91b7c54545c7ae552))
+* 新增tabs ([dcf9d11](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/dcf9d1152525a3f4a000725029e4fb90ab5be43f))
+* 暂时提交block ([27f9e53](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/27f9e5304a7a47187109b2c860d82a81f3434d58))
+* 还差数据跳转 ([70b6f24](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/70b6f248e7b74fdaae87480112e19a4c1eb13f46))
+
 ### [0.3.61](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/compare/v0.3.60...v0.3.61) (2025-02-22)
 
 

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

@@ -0,0 +1,78 @@
+<template>
+  <view
+    class="grid"
+    :style="{
+      'grid-template-columns': `repeat(${cols}, minmax(0, 1fr))`,
+      'grid-gap': transformValueUnit(gap),
+      gap: transformValueUnit(gap),
+      margin: `0 ${transformValueUnit(marginHorizontal)}`,
+    }"
+  >
+    <view
+      v-for="(item, index) in items"
+      :key="index"
+      class="flex justify-center items-center overflow-hidden box-border overflow-hidden w-full transition"
+      @click="handleClick(index)"
+      :style="{
+        borderRadius: transformValueUnit(radius),
+        padding: `${transformValueUnit(textPV)} ${transformValueUnit(textPH)}`,
+        backgroundColor: current === index ? themeColor : textBgColor,
+        boxShadow:
+          shadowColor && shadowSize
+            ? `${shadowColor} 0px  ${shadowSize}rpx ${blurSize}rpx 0px `
+            : '',
+        border: borderColor && current !== index ? `1px solid ${borderColor}` : '',
+        backgroundImage: `url(${item.url})`,
+        backgroundSize: 'cover',
+        backgroundRepeat: 'no-repeat',
+        height: transformValueUnit(height),
+        'border-radius': transformValueUnit(radius),
+        textAlign,
+        color: current === index ? '#fff' : color,
+        fontSize: transformValueUnit(fontSize),
+      }"
+    >
+      {{ item.title }}
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+import { LcbFilterGridProps } from './types'
+import { transformValueUnit } from '../../utils/transform'
+import { inject, Ref, ref } from 'vue'
+import { FORM_KEY } from '../../constants'
+defineOptions({
+  name: 'LcbFilterGrid',
+  options: {
+    addGlobalClass: true,
+    virtualHost: true,
+    styleIsolation: 'shared',
+  },
+})
+const themeColor = inject('theme-color', '#3875FF')
+const form = inject<Ref<Record<string, any>>>(FORM_KEY)
+const props = withDefaults(defineProps<LcbFilterGridProps>(), {
+  marginHorizontal: 24,
+  height: 100,
+  cols: 2,
+  gap: 16,
+  textAlign: 'center',
+  imgRadius: 8,
+  fontSize: 28,
+})
+const current = ref(-1)
+const handleClick = (index: number) => {
+  current.value = index === current.value ? -1 : index
+  try {
+    const params = JSON.parse(props.items?.[index]?.name)
+    form!.value = {
+      ...form!.value,
+      ...params,
+    }
+  } catch (error) {
+    console.error(error)
+  }
+}
+</script>
+<style lang="scss" scoped></style>

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

@@ -0,0 +1,17 @@
+import { LcbBlockProps } from '../lcb-block/types'
+import { ActionView } from 'action'
+export interface LcbFilterGridProps extends LcbBlockProps {
+  items: {
+    name: string
+    title: string
+    url?: string
+  }[]
+  height?: number
+  cols?: number
+  gap?: number
+  textAlign?: 'left' | 'center' | 'right'
+  textBgColor?: string
+  textPH?: number
+  textPV?: number
+  borderColor?: string
+}

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

@@ -34,7 +34,7 @@
       <slot name="list" :items="items" v-if="$slots.list" />
       <template v-else>
         <lcb-product
-          v-bind="{ ...$props, ...attrs, form }"
+          v-bind="{ ...$props, ...attrs }"
           :items="items"
           filterList
           ref="productRef"
@@ -45,7 +45,7 @@
           </template>
         </lcb-product>
         <lcb-product
-          v-bind="{ ...$props, ...attrs, form }"
+          v-bind="{ ...$props, ...attrs }"
           filterList
           :items="items"
           ref="productRef"

package/components/lcb-nav/Title/index.vue

@@ -1,12 +1,18 @@
 <template>
-  <view class="titleContainer" v-if="titleMode === 'text'">
-    <view class="images mr-2" v-if="logoImg">
-      <img :src="logoImg" />
+  <view
+    :style="{
+      opacity,
+    }"
+  >
+    <view class="titleContainer" v-if="titleMode === 'text'">
+      <view class="images mr-2" v-if="logoImg">
+        <img :src="logoImg" />
+      </view>
+      <view class="title">{{ title }}</view>
+    </view>
+    <view class="images" v-else>
+      <img :src="typographyTextBackground" />
     </view>
-    <view class="title">{{ title }}</view>
-  </view>
-  <view class="images" v-else>
-    <img :src="typographyTextBackground" />
   </view>
 </template>
 

package/components/lcb-nav/lcb-nav.vue

@@ -67,7 +67,7 @@
             left
             v-if="styleGroup === 2 && titleLocation === 'left'"
           />
-          <Title v-bind="titleProps" v-else-if="topStyle !== 2" />
+          <Title v-bind="titleProps" v-else-if="topStyle !== 2" :opacity="navbarBgOpacity" />
         </view>
       </view>
       <!-- 中间布局 -->
@@ -77,7 +77,11 @@
           :back="canBack"
           :link="searchLink"
         />
-        <Title v-bind="titleProps" v-else-if="styleGroup === 2 || titleLocation === 'center'" />
+        <Title
+          v-bind="titleProps"
+          v-else-if="styleGroup === 2 || titleLocation === 'center'"
+          :opacity="navbarBgOpacity"
+        />
       </view>
       <view
         class="navbar-right gap-3"

package/components/lcb-nav/types.ts

@@ -15,6 +15,8 @@ export interface NavTitleProps {
   typographyTextBackground?: string
   /** 方位 */
   titleLocation?: 'left' | 'center'
+  /** 是否沉浸式 */
+  opacity?: number
 }
 export interface NavProps extends NavTitleProps {
   /** 是否固定 */

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

@@ -1,10 +1,11 @@
 <script setup lang="ts">
-import { ref, useAttrs, watch, watchEffect } from 'vue'
+import { inject, Ref, ref, useAttrs, watch, watchEffect } from 'vue'
 import UWaterfall from 'uview-plus/components/u-waterfall/u-waterfall.vue'
 import { LcbProductProps } from './types'
 import { transformValueUnit } from '../../utils/transform'
 import { calculateImageHeight } from '../../utils/utils'
 import { isH5 } from '@tplc/wot/components/common/util'
+import { FORM_KEY } from '../../constants'
 
 const uWaterfallRef = ref()
 defineOptions({
@@ -25,8 +26,10 @@ const props = withDefaults(defineProps<LcbProductProps>(), {
   column: 2,
   paddingHorizontal: 24,
   paddingVertical: 24,
+  sourceMode: 1,
 })
 const renderList = ref<Record<string, any>[]>([])
+const form = inject<Ref<Record<string, any>>>(FORM_KEY)
 const screenWidth = isH5 ? window.innerWidth : uni.getWindowInfo().screenWidth
 watchEffect(() => {
   if (!props.filterList) return
@@ -35,27 +38,34 @@ watchEffect(() => {
 defineSlots<{
   item(props: { item: any }): any
 }>()
-watch(
-  () => props.form,
-  () => {
-    if (props.listType === 'waterfall') {
-      renderList.value = []
-      uWaterfallRef.value?.clear?.()
-    }
-  },
-  { deep: true },
-)
 const getData = async () => {
+  /** 如果是list里面嵌套就不处理 */
   if (props.filterList) return
-  if (props.items?.length) {
-    if (props.listType === 'waterfall') {
-      renderList.value = []
-      uWaterfallRef.value?.clear?.()
-    }
+  if (props.listType === 'waterfall') {
+    renderList.value = []
+    uWaterfallRef.value?.clear?.()
+  }
+  let requestParams = {}
+  try {
+    requestParams = JSON.parse(props.requestParams ?? '{}')
+  } catch (error) {
+    console.error(error)
+  }
+  /** 如果是列表模式 */
+  if (props.items?.length && props.sourceMode === 1) {
     const { data } = await uni.$lcb.http.post('/productInfo/filteredPage', {
       productIdList: props.items.map((item) => item.productId),
       productType: props.items[0].productType,
       listType: props.listType,
+      ...requestParams,
+    })
+    renderList.value = data as Record<string, any>[]
+    /** 如果是请求模式 */
+  } else if (props.requestUrl && props.sourceMode === 2) {
+    const { data } = await uni.$lcb.http.post(props.requestUrl, {
+      listType: props.listType,
+      ...requestParams,
+      ...form!.value,
     })
     renderList.value = data as Record<string, any>[]
   } else {
@@ -63,10 +73,43 @@ const getData = async () => {
     uWaterfallRef.value?.clear?.()
   }
 }
+watch(
+  () => form!.value,
+  () => {
+    if (props.listType === 'waterfall') {
+      renderList.value = []
+      uWaterfallRef.value?.clear?.()
+    }
+    /** 如果是请求模式 */
+    if (props.sourceMode === 2) {
+      getData()
+    }
+  },
+  { deep: true },
+)
+watch(
+  () => props.requestUrl,
+  () => {
+    /** 如果是请求模式 */
+    if (props.sourceMode === 2) {
+      getData()
+    }
+  },
+  {
+    immediate: true,
+  },
+)
+watch(
+  () => props.requestParams,
+  () => {
+    getData()
+  },
+)
 
 watch(
   () => props.items,
   (newValue, oldValue) => {
+    if (props.sourceMode === 2) return
     if (
       newValue?.map((item) => item.productId).join(',') !==
       oldValue?.map((item) => item.productId).join(',')

package/components/lcb-product/types.ts

@@ -16,7 +16,9 @@ export interface LcbProductProps extends LcbBlockProps {
     productId: string
     [key: string]: any
   }[]
-  form?: Record<string, any>
+  sourceMode?: 1 | 2 // 数据源模式 1 列表 2 请求
+  requestUrl?: string
+  requestParams?: string
   layoutType?: 'vertical' | 'horizontal' // 布局方式
   titleLineClamp?: number
   coverImgStyle?: Record<string, any>

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

@@ -167,7 +167,7 @@ const value = computed(() => {
 
     <slot :value="value" v-if="prop === 'scoreAvg'" name="scoreAvg">
       <view :class="`px-1.5 rounded bg-primary text-3 text-white ${className}`" :style="style">
-        {{ value }}
+        {{ value.toFixed(1) }}
       </view>
     </slot>
 

package/components/lcb-tabs/components/Tabs/index.vue

@@ -0,0 +1,38 @@
+<template>
+  <view class="w-100vw">
+    <lcb-block v-bind="$props">
+      <wd-tabs custom-class="!bg-transparent" @change="handleChange">
+        <wd-tab v-for="tab in items" :key="tab.name" :title="tab.title" :name="tab.name" />
+      </wd-tabs>
+    </lcb-block>
+  </view>
+</template>
+
+<script setup lang="ts">
+import { FORM_KEY } from '../../../../constants'
+import { inject, Ref, watch } from 'vue'
+import { LcbTabsProps } from '../../types'
+defineOptions({
+  name: 'LcbTabsItem',
+  options: {
+    addGlobalClass: true,
+    virtualHost: true,
+    styleIsolation: 'shared',
+  },
+})
+const form = inject<Ref<Record<string, any>>>(FORM_KEY)
+withDefaults(defineProps<LcbTabsProps>(), {})
+const handleChange = (e: { name: string }) => {
+  try {
+    const params = JSON.parse(e.name)
+    form!.value = {
+      ...form!.value,
+      ...params,
+    }
+  } catch (error) {
+    console.error(error)
+  }
+}
+</script>
+
+<style lang="scss" scoped></style>

package/components/lcb-tabs/lcb-tabs.vue

@@ -0,0 +1,22 @@
+<template>
+  <wd-sticky v-if="sticky">
+    <Tabs v-bind="$props" />
+  </wd-sticky>
+  <Tabs v-else v-bind="$props" />
+</template>
+
+<script setup lang="ts">
+import { LcbTabsProps } from './types'
+import Tabs from './components/Tabs/index.vue'
+defineOptions({
+  name: 'LcbTabs',
+  options: {
+    addGlobalClass: true,
+    virtualHost: true,
+    styleIsolation: 'shared',
+  },
+})
+withDefaults(defineProps<LcbTabsProps>(), {})
+</script>
+
+<style lang="scss" scoped></style>

package/components/lcb-tabs/types.ts

@@ -0,0 +1,10 @@
+import { LcbBlockProps } from '../../components/lcb-block/types'
+
+export interface LcbTabsProps extends LcbBlockProps {
+  /** 是否吸顶 */
+  sticky?: boolean
+  items: {
+    title: string
+    name: string
+  }[]
+}

package/global.d.ts

@@ -14,6 +14,7 @@ declare module 'vue' {
     'lcb-city-select': (typeof import('@tplc/business/components/lcb-city-select/lcb-city-select.vue'))['default']
     'lcb-dynamic-data': (typeof import('@tplc/business/components/lcb-dynamic-data/lcb-dynamic-data.vue'))['default']
     'lcb-fab': (typeof import('@tplc/business/components/lcb-fab/lcb-fab.vue'))['default']
+    'lcb-filter-grid': (typeof import('@tplc/business/components/lcb-filter-grid/lcb-filter-grid.vue'))['default']
     'lcb-gap': (typeof import('@tplc/business/components/lcb-gap/lcb-gap.vue'))['default']
     'lcb-grid': (typeof import('@tplc/business/components/lcb-grid/lcb-grid.vue'))['default']
     'lcb-home-search': (typeof import('@tplc/business/components/lcb-home-search/lcb-home-search.vue'))['default']
@@ -29,6 +30,7 @@ declare module 'vue' {
     'lcb-product-item': (typeof import('@tplc/business/components/lcb-product-item/lcb-product-item.vue'))['default']
     'lcb-rich-text': (typeof import('@tplc/business/components/lcb-rich-text/lcb-rich-text.vue'))['default']
     'lcb-swiper': (typeof import('@tplc/business/components/lcb-swiper/lcb-swiper.vue'))['default']
+    'lcb-tabs': (typeof import('@tplc/business/components/lcb-tabs/lcb-tabs.vue'))['default']
     'lcb-tags': (typeof import('@tplc/business/components/lcb-tags/lcb-tags.vue'))['default']
     'lcb-text': (typeof import('@tplc/business/components/lcb-text/lcb-text.vue'))['default']
     'lcb-title': (typeof import('@tplc/business/components/lcb-title/lcb-title.vue'))['default']

package/package.json

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

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

@@ -0,0 +1,73 @@
+import { LcbFilterGridProps } from './types'
+declare const _default: import('vue').DefineComponent<
+  __VLS_WithDefaults<
+    __VLS_TypePropsToOption<LcbFilterGridProps>,
+    {
+      marginHorizontal: number
+      height: number
+      cols: number
+      gap: number
+      textAlign: string
+      imgRadius: number
+      fontSize: number
+    }
+  >,
+  {},
+  unknown,
+  {},
+  {},
+  import('vue').ComponentOptionsMixin,
+  import('vue').ComponentOptionsMixin,
+  {},
+  string,
+  import('vue').PublicProps,
+  Readonly<
+    import('vue').ExtractPropTypes<
+      __VLS_WithDefaults<
+        __VLS_TypePropsToOption<LcbFilterGridProps>,
+        {
+          marginHorizontal: number
+          height: number
+          cols: number
+          gap: number
+          textAlign: string
+          imgRadius: number
+          fontSize: number
+        }
+      >
+    >
+  >,
+  {
+    height: number
+    marginHorizontal: number
+    fontSize: number
+    textAlign: 'left' | 'center' | 'right'
+    cols: number
+    gap: 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
+      }
+}

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

@@ -0,0 +1,16 @@
+import { LcbBlockProps } from '../lcb-block/types'
+export interface LcbFilterGridProps extends LcbBlockProps {
+  items: {
+    name: string
+    title: string
+    url?: string
+  }[]
+  height?: number
+  cols?: number
+  gap?: number
+  textAlign?: 'left' | 'center' | 'right'
+  textBgColor?: string
+  textPH?: number
+  textPV?: number
+  borderColor?: string
+}

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

@@ -48,12 +48,12 @@ declare const __VLS_component: import('vue').DefineComponent<
     textAlign: 'left' | 'center' | 'right'
     imageWidth: number
     borderRadius: number
+    border: boolean
     imageHeight: number
     listType: 'list' | 'horizontal' | 'grid' | 'waterfall'
     pageFilterType: string
     pageListProps: import('./components/FilterList/type').PageListProps
     styleMode: 'default' | 'plain'
-    border: boolean
     titleLineClamp: number
     isSticky: boolean
     layoutType: 'vertical' | 'horizontal'

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

@@ -13,6 +13,8 @@ export interface NavTitleProps {
   typographyTextBackground?: string
   /** 方位 */
   titleLocation?: 'left' | 'center'
+  /** 是否沉浸式 */
+  opacity?: number
 }
 export interface NavProps extends NavTitleProps {
   /** 是否固定 */

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

@@ -15,6 +15,7 @@ declare const __VLS_component: import('vue').DefineComponent<
       column: number
       paddingHorizontal: number
       paddingVertical: number
+      sourceMode: number
     }
   >,
   {
@@ -40,6 +41,7 @@ declare const __VLS_component: import('vue').DefineComponent<
           column: number
           paddingHorizontal: number
           paddingVertical: number
+          sourceMode: number
         }
       >
     >
@@ -52,6 +54,7 @@ declare const __VLS_component: import('vue').DefineComponent<
     column: number
     listType: 'list' | 'horizontal' | 'grid' | 'waterfall'
     titleLineClamp: number
+    sourceMode: 1 | 2
   },
   {}
 >

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

@@ -14,7 +14,9 @@ export interface LcbProductProps extends LcbBlockProps {
     productId: string
     [key: string]: any
   }[]
-  form?: Record<string, any>
+  sourceMode?: 1 | 2
+  requestUrl?: string
+  requestParams?: string
   layoutType?: 'vertical' | 'horizontal'
   titleLineClamp?: number
   coverImgStyle?: Record<string, any>

package/types/components/lcb-tabs/components/Tabs/index.vue.d.ts

@@ -0,0 +1,42 @@
+import { LcbTabsProps } from '../../types'
+declare const _default: import('vue').DefineComponent<
+  __VLS_WithDefaults<__VLS_TypePropsToOption<LcbTabsProps>, {}>,
+  {},
+  unknown,
+  {},
+  {},
+  import('vue').ComponentOptionsMixin,
+  import('vue').ComponentOptionsMixin,
+  {},
+  string,
+  import('vue').PublicProps,
+  Readonly<
+    import('vue').ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToOption<LcbTabsProps>, {}>>
+  >,
+  {},
+  {}
+>
+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-tabs/lcb-tabs.vue.d.ts

@@ -0,0 +1,42 @@
+import { LcbTabsProps } from './types'
+declare const _default: import('vue').DefineComponent<
+  __VLS_WithDefaults<__VLS_TypePropsToOption<LcbTabsProps>, {}>,
+  {},
+  unknown,
+  {},
+  {},
+  import('vue').ComponentOptionsMixin,
+  import('vue').ComponentOptionsMixin,
+  {},
+  string,
+  import('vue').PublicProps,
+  Readonly<
+    import('vue').ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToOption<LcbTabsProps>, {}>>
+  >,
+  {},
+  {}
+>
+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-tabs/types.d.ts

@@ -0,0 +1,9 @@
+import { LcbBlockProps } from '../../components/lcb-block/types'
+export interface LcbTabsProps extends LcbBlockProps {
+  /** 是否吸顶 */
+  sticky?: boolean
+  items: {
+    title: string
+    name: string
+  }[]
+}