@tplc/business 0.4.55 → 0.4.57

package/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 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.57](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/compare/v0.4.56...v0.4.57) (2025-04-05)
+
+
+### ✨ Features | 新功能
+
+* 调整地址策略 ([9b9a258](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/9b9a2583864075e4daac9a192ec91f8b91e2ce9d))
+
+### [0.4.56](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/compare/v0.4.55...v0.4.56) (2025-04-04)
+
 ### [0.4.55](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/compare/v0.4.53...v0.4.55) (2025-04-04)
 
 

package/components/lcb-block/lcb-block.vue

@@ -18,6 +18,7 @@
       borderWidth: transformValueUnit(borderWidth),
       boxShadow:
         shadowColor && shadowSize ? `0px 0px ${blurSize}px ${shadowSize}px ${shadowColor}` : '',
+      textAlign,
       ...customStyle,
     }"
     class="box-border overflow-hidden relative"

package/components/lcb-button/lcb-button.vue

@@ -1,23 +1,39 @@
 <template>
-  <lcb-block v-bind="$props" customClass="border-solid !w-fit">
-    <lcb-action-view v-bind="action" @avatar="onAvatar">
-      <template v-if="mode === 'image'">
-        <wd-img
-          :src="innerValue || props.url"
-          :width="imageWidth"
-          :height="imageHeight"
-          mode="aspectFit"
-        />
-      </template>
-      <template v-else>{{ innerValue || props.text }}</template>
-    </lcb-action-view>
-  </lcb-block>
+  <view
+    class="w-full h-full"
+    :style="{
+      ...innerStyle,
+    }"
+  >
+    <lcb-block
+      v-bind="$props"
+      customClass="border-solid"
+      :customStyle="{
+        width: props.fillWidth ? '100%' : 'fit-content',
+        height: props.fillHeight ? '100%' : 'fit-content',
+        ...innerItemStyle,
+      }"
+    >
+      <lcb-action-view v-bind="action" @avatar="onAvatar">
+        <template v-if="mode === 'image'">
+          <wd-img
+            :src="innerValue || props.url"
+            :width="imageWidth"
+            :height="imageHeight"
+            mode="aspectFit"
+          />
+        </template>
+        <template v-else>{{ innerValue || props.text }}</template>
+      </lcb-action-view>
+    </lcb-block>
+  </view>
 </template>
 
 <script setup lang="ts">
 import { computed, inject, Ref } from 'vue'
 import { LcbButtonProps } from './types'
 import { PAGE_PROVIDE_KEY } from '../../constants'
+import { getFlexStyle } from '../../utils/transform'
 defineOptions({
   name: 'LcbButton',
   options: {
@@ -33,17 +49,34 @@ const props = withDefaults(defineProps<LcbButtonProps>(), {
 const pageInfo = inject(PAGE_PROVIDE_KEY) as Ref<Record<string, any>>
 const userStore = uni.$lcb.userStore?.()
 const innerValue = computed(() => {
+  let value = ''
   if (props.dynamicKey) {
     if (props.keyFromUser) {
-      return userStore?.userInfo?.[props.dynamicKey]
+      value = userStore?.userInfo?.[props.dynamicKey]
+    } else {
+      value = pageInfo.value?.[props.dynamicKey]
     }
-    return pageInfo.value?.[props.dynamicKey]
   }
-  return ''
+  if (props.text.includes('${')) {
+    value = props.text.replace(/\$\{([^}]+)\}/g, (_, p1) => {
+      if (props.keyFromUser) {
+        return userStore?.userInfo?.[p1] || ''
+      } else {
+        return pageInfo.value?.[p1] || ''
+      }
+    })
+  }
+  return value
 })
 const onAvatar = (headImgUrl) => {
   userStore?.updateUser({
     headImgUrl,
   })
 }
+const innerStyle = computed(() => {
+  return getFlexStyle(props.align)
+})
+const innerItemStyle = computed(() => {
+  return getFlexStyle(props.itemAlign)
+})
 </script>

package/components/lcb-button/types.ts

@@ -10,4 +10,27 @@ export interface LcbButtonProps extends LcbBlockProps {
   imageHeight?: number
   dynamicKey?: string
   keyFromUser?: boolean
+  fillWidth?: boolean
+  fillHeight?: boolean
+  align?:
+    | 'top-left'
+    | 'top-center'
+    | 'top-right'
+    | 'center-left'
+    | 'center-center'
+    | 'center-right'
+    | 'bottom-left'
+    | 'bottom-center'
+    | 'bottom-right'
+
+  itemAlign?:
+    | 'top-left'
+    | 'top-center'
+    | 'top-right'
+    | 'center-left'
+    | 'center-center'
+    | 'center-right'
+    | 'bottom-left'
+    | 'bottom-center'
+    | 'bottom-right'
 }

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

@@ -101,7 +101,12 @@ const onCancel = () => {
 }
 
 const onAddressClick = (item: LcbAddress) => {
-  modelValue.value = item as ChildHotAddress
+  modelValue.value = {
+    addressName: item.addressName,
+    cityId: item.cityId,
+    areaId: item.areaId,
+    provinceId: item.provinceId,
+  } as ChildHotAddress
   onCancel()
   show.value = false
 }
@@ -110,7 +115,6 @@ watch(
   (val) => {
     if (val && !modelValue.value) {
       modelValue.value = {
-        addressInfo: val.addressInfo,
         addressName: val.showName || val.cityName,
         cityId: val.cityId,
         areaId: val.areaId,
@@ -189,7 +193,12 @@ watch(
 
 const onSelectChange = (val: ChildHotAddress) => {
   if (JSON.stringify(val) !== JSON.stringify(modelValue.value)) {
-    modelValue.value = val
+    modelValue.value = {
+      addressName: val.addressName,
+      cityId: val.cityId,
+      areaId: val.areaId,
+      provinceId: val.provinceId,
+    } as ChildHotAddress
   }
 }
 onMounted(() => {

package/package.json

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

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

@@ -9,4 +9,26 @@ export interface LcbButtonProps extends LcbBlockProps {
   imageHeight?: number
   dynamicKey?: string
   keyFromUser?: boolean
+  fillWidth?: boolean
+  fillHeight?: boolean
+  align?:
+    | 'top-left'
+    | 'top-center'
+    | 'top-right'
+    | 'center-left'
+    | 'center-center'
+    | 'center-right'
+    | 'bottom-left'
+    | 'bottom-center'
+    | 'bottom-right'
+  itemAlign?:
+    | 'top-left'
+    | 'top-center'
+    | 'top-right'
+    | 'center-left'
+    | 'center-center'
+    | 'center-right'
+    | 'bottom-left'
+    | 'bottom-center'
+    | 'bottom-right'
 }

package/types/utils/transform.d.ts

@@ -11,3 +11,4 @@ export declare const getSliderTitle: (
   max?: number,
   min?: number,
 ) => string
+export declare const getFlexStyle: (align?: string) => Record<string, string>

package/utils/transform.ts

@@ -48,3 +48,50 @@ export const getSliderTitle = (
     return ''
   }
 }
+
+export const getFlexStyle = (align?: string) => {
+  const style: Record<string, string> = {}
+
+  if (align) {
+    style.display = 'flex'
+    switch (align) {
+      case 'top-left':
+        style.justifyContent = 'flex-start'
+        style.alignItems = 'flex-start'
+        break
+      case 'top-center':
+        style.justifyContent = 'center'
+        style.alignItems = 'flex-start'
+        break
+      case 'top-right':
+        style.justifyContent = 'flex-end'
+        style.alignItems = 'flex-start'
+        break
+      case 'center-left':
+        style.justifyContent = 'flex-start'
+        style.alignItems = 'center'
+        break
+      case 'center-center':
+        style.justifyContent = 'center'
+        style.alignItems = 'center'
+        break
+      case 'center-right':
+        style.justifyContent = 'flex-end'
+        style.alignItems = 'center'
+        break
+      case 'bottom-left':
+        style.justifyContent = 'flex-start'
+        style.alignItems = 'flex-end'
+        break
+      case 'bottom-center':
+        style.justifyContent = 'center'
+        style.alignItems = 'flex-end'
+        break
+      case 'bottom-right':
+        style.justifyContent = 'flex-end'
+        style.alignItems = 'flex-end'
+        break
+    }
+  }
+  return style
+}