@tplc/business 0.4.106 → 0.4.108

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.4.108](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/compare/v0.4.107...v0.4.108) (2025-05-10)
+
+
+### ✨ Features | 新功能
+
+* 对比修改 ([2decf5d](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/2decf5d485bd6d9c197d1d9fd2566bbcb29d9ffb))
+* 暂时提交骨架屏 ([4314836](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/43148361462a43b75f4f80806b6021d979b398d5))
+
+
+### 🐛 Bug Fixes | Bug 修复
+
+* nav 判断 ([6fd5aa6](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/6fd5aa6e27722e1a17ebd637cf4b1c29d0599eab))
+
+### [0.4.107](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/compare/v0.4.106...v0.4.107) (2025-05-09)
+
 ### [0.4.106](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/compare/v0.4.105...v0.4.106) (2025-05-09)
 
 ### [0.4.105](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/compare/v0.4.104...v0.4.105) (2025-05-09)

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

@@ -69,6 +69,7 @@ import { setHistoryCity } from '../../utils/history'
 import { cleanOutSizeKeys } from '../../utils/transform'
 import { getCurrentPage } from '../../utils/utils'
 import { FORM_KEY } from '../../constants'
+import isEqual from 'lodash-es/isEqual'
 defineOptions({
   name: 'LcbCitySelect',
   options: {
@@ -192,7 +193,7 @@ watch(
 )
 
 const onSelectChange = (val: ChildHotAddress) => {
-  if (JSON.stringify(val) !== JSON.stringify(modelValue.value)) {
+  if (!isEqual(val, modelValue.value)) {
     modelValue.value = {
       addressName: val.addressName,
       cityId: val.cityId,

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

@@ -218,7 +218,7 @@ const paddingTop = computed(() => {
 })
 
 const canBack = computed(() => {
-  return props.back || !isLastPage()
+  return props.back && !isLastPage()
 })
 
 const capsuleList = computed(() => {

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

@@ -1,12 +1,13 @@
 <script setup lang="ts">
 import { isH5 } from '@tplc/wot/components/common/util'
 import UWaterfall from 'uview-plus/components/u-waterfall/u-waterfall.vue'
-import { ref, useAttrs, watch, watchEffect } from 'vue'
+import { computed, ref, useAttrs, watch, watchEffect } from 'vue'
 import useSyncForm from '../../hooks/useSyncForm'
 import { transformValueUnit } from '../../utils/transform'
 import { calculateImageHeight } from '../../utils/utils'
 import UnconditionedLayout from '../lcb-list/components/UnconditionedLayout/index.vue'
 import { LcbProductProps } from './types'
+import isEqual from 'lodash-es/isEqual'
 
 const uWaterfallRef = ref()
 defineOptions({
@@ -31,6 +32,7 @@ const props = withDefaults(defineProps<LcbProductProps>(), {
   gap: 16,
 })
 const { form } = useSyncForm(props.dynamicScope)
+const loading = ref(false)
 const renderList = ref<Record<string, any>[]>([])
 const screenWidth = isH5 ? window.innerWidth : uni.getWindowInfo().screenWidth
 watchEffect(() => {
@@ -42,39 +44,48 @@ defineSlots<{
 }>()
 const getData = async () => {
   /** 如果是list里面嵌套就不处理 */
-  if (props.filterList) return
-  if (props.listType === 'waterfall') {
-    renderList.value = []
-    uWaterfallRef.value?.clear?.()
+  if (props.filterList) {
+    loading.value = false
+    return
   }
-  let requestParams = {}
+  loading.value = true
   try {
-    requestParams = JSON.parse(props.requestParams ?? '{}')
+    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,
+        sortType: props.sortType,
+        ...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 {
+      renderList.value = []
+      uWaterfallRef.value?.clear?.()
+    }
   } 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,
-      sortType: props.sortType,
-      ...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 {
-    renderList.value = []
-    uWaterfallRef.value?.clear?.()
-  }
+  loading.value = false
 }
 watch(
   () => form!.value,
@@ -84,7 +95,7 @@ watch(
       uWaterfallRef.value?.clear?.()
     }
     /** 如果是请求模式 */
-    if (props.sourceMode === 2 && JSON.stringify(oldValue) !== JSON.stringify(newValue)) {
+    if (props.sourceMode === 2 && !isEqual(oldValue, newValue)) {
       getData()
     }
   },
@@ -137,122 +148,59 @@ defineExpose({
     }
   },
 })
+const blockProps = computed(() => {
+  const {
+    paddingHorizontal,
+    paddingVertical,
+    paddingLeft,
+    paddingRight,
+    paddingTop,
+    paddingBottom,
+    marginHorizontal,
+    ...reset
+  } = props
+  return [
+    {
+      paddingHorizontal,
+      paddingVertical,
+      paddingLeft,
+      paddingRight,
+      paddingTop,
+      paddingBottom,
+      marginHorizontal,
+    },
+    reset,
+  ]
+})
 </script>
 
 <template>
-  <lcb-block
-    v-bind="{
-      ...$props,
-      shadowColor: blockShadowColor,
-      shadowSize: blockShadowSize,
-      blurSize: blockBlurSize,
-    }"
-    :custom-class="`${listType == 'horizontal' ? '!gap-0 h-fit overflow-x-auto whitespace-nowrap flex items-stretch w-full' : ''}`"
-  >
-    <!-- 单列 -->
-    <view
-      class="flex flex-col"
-      v-if="listType === 'list'"
-      :style="{
-        width: itemWidth ? `${itemWidth}rpx` : '100%',
-        gap: gap ? `${gap}rpx` : undefined,
-      }"
-    >
-      <block v-for="(item, index) in renderList" :key="`${item?.productId}:${index}`">
-        <UnconditionedLayout
-          v-if="item.productType === 'noProductOption'"
-          v-bind="{ ...item, ...$props, ...attrs }"
-        />
-        <lcb-action-view v-bind="item.link" render-mode="view" v-else>
-          <slot name="item" :item="item">
-            <lcb-absolute-config-layout
-              v-if="renderItemAbsoluteConfigLayout"
-              :blocks="renderItemAbsoluteConfigLayout?.blocks"
-              :canvas="renderItemAbsoluteConfigLayout?.canvas"
-              :dataset="{
-                ...(renderItemAbsoluteConfigLayout?.dataset ?? {}),
-                ...item,
-              }"
-            />
-            <lcb-product-item
-              v-else
-              v-bind="{ ...item, ...$props, ...attrs }"
-              :layoutType="layoutType"
-              :coverImgStyle="{
-                width: layoutType === 'vertical' ? '100%' : transformValueUnit(imageWidth),
-                height: layoutType === 'vertical' ? transformValueUnit(imageHeight) : undefined,
-                minHeight: layoutType !== 'vertical' ? transformValueUnit(imageHeight) : undefined,
-                borderRadius: imageRadius ? transformValueUnit(imageRadius) : undefined,
-                ...($props?.coverImgStyle ?? {}),
-              }"
-            ></lcb-product-item>
-          </slot>
-        </lcb-action-view>
-      </block>
-    </view>
-    <!-- 双列 -->
-    <view
-      class="grid grid-cols-2 box-border"
-      v-else-if="listType === 'grid'"
-      :style="{
-        width: itemWidth ? `${itemWidth}rpx` : '100%',
-        gap: gap ? `${gap}rpx` : undefined,
-      }"
-    >
-      <lcb-action-view
-        v-for="(item, index) in renderList"
-        :key="`${item?.productId}:${index}`"
-        v-bind="item.link"
-        render-mode="view"
-        custom-class="h-full rounded-md overflow-hidden"
+  <lcb-block v-bind="loading ? blockProps[0] : {}">
+    <wd-skeleton animation="gradient" theme="paragraph" :loading="loading">
+      <lcb-block
+        v-bind="{
+          ...$props,
+          shadowColor: blockShadowColor,
+          shadowSize: blockShadowSize,
+          blurSize: blockBlurSize,
+        }"
+        :custom-class="`${listType == 'horizontal' ? '!gap-0 h-fit overflow-x-auto whitespace-nowrap flex items-stretch w-full' : ''}`"
       >
-        <slot name="item" :item="item">
-          <lcb-absolute-config-layout
-            v-if="renderItemAbsoluteConfigLayout"
-            :blocks="renderItemAbsoluteConfigLayout?.blocks"
-            :canvas="renderItemAbsoluteConfigLayout?.canvas"
-            :dataset="{
-              ...(renderItemAbsoluteConfigLayout?.dataset ?? {}),
-              ...item,
-            }"
-          />
-          <lcb-product-item
-            v-else
-            v-bind="{ ...item, ...$props, ...attrs }"
-            layoutType="vertical"
-            className="h-full"
-            :coverImgStyle="{
-              width: '100%',
-              height: transformValueUnit(imageHeight),
-              borderRadius: imageRadius ? transformValueUnit(imageRadius) : undefined,
-              ...(attrs?.coverImgStyle ?? {}),
-            }"
-          ></lcb-product-item>
-        </slot>
-      </lcb-action-view>
-    </view>
-
-    <view
-      class="lcb-product-waterfall !py-1"
-      v-else-if="listType === 'waterfall'"
-      :style="{
-        width: itemWidth ? `${itemWidth}rpx` : '100%',
-      }"
-    >
-      <u-waterfall :addTime="0" :modelValue="renderList" ref="uWaterfallRef" custom-class="!gap-20">
-        <template #left="{ leftList: list }">
-          <view
-            class="flex flex-col gap-3"
-            :style="{
-              marginRight: `${gap / 2}rpx`,
-            }"
-          >
-            <lcb-action-view
-              v-for="(item, index) in list"
-              :key="`${item?.productId}:${index}`"
-              v-bind="item.link"
-              render-mode="view"
-            >
+        <!-- 单列 -->
+        <view
+          class="flex flex-col"
+          v-if="listType === 'list'"
+          :style="{
+            width: itemWidth ? `${itemWidth}rpx` : '100%',
+            gap: gap ? `${gap}rpx` : undefined,
+          }"
+        >
+          <block v-for="(item, index) in renderList" :key="`${item?.productId}:${index}`">
+            <UnconditionedLayout
+              v-if="item.productType === 'noProductOption'"
+              v-bind="{ ...item, ...$props, ...attrs }"
+            />
+            <lcb-action-view v-bind="item.link" render-mode="view" v-else>
               <slot name="item" :item="item">
                 <lcb-absolute-config-layout
                   v-if="renderItemAbsoluteConfigLayout"
@@ -263,44 +211,192 @@ defineExpose({
                     ...item,
                   }"
                 />
-
                 <lcb-product-item
-                  v-bind="{ ...item, ...$props, ...attrs }"
-                  layoutType="vertical"
                   v-else
-                >
-                  <template #coverImg="{ value }">
-                    <wd-img
-                      :src="value"
-                      width="100%"
-                      mode="aspectFill"
-                      :lazyPlaceWidth="columnWidth"
-                      :height="
-                        calculateImageHeight(
-                          screenWidth,
-                          item.coverImgProps?.[0]?.height,
-                          item.coverImgProps?.[0]?.width,
-                        )
-                      "
-                    />
-                  </template>
-                </lcb-product-item>
+                  v-bind="{ ...item, ...$props, ...attrs }"
+                  :layoutType="layoutType"
+                  :coverImgStyle="{
+                    width: layoutType === 'vertical' ? '100%' : transformValueUnit(imageWidth),
+                    height: layoutType === 'vertical' ? transformValueUnit(imageHeight) : undefined,
+                    minHeight:
+                      layoutType !== 'vertical' ? transformValueUnit(imageHeight) : undefined,
+                    borderRadius: imageRadius ? transformValueUnit(imageRadius) : undefined,
+                    ...($props?.coverImgStyle ?? {}),
+                  }"
+                ></lcb-product-item>
               </slot>
             </lcb-action-view>
-          </view>
-        </template>
-        <template #right="{ rightList: list }">
-          <view
-            class="flex flex-col gap-3"
-            :style="{
-              marginLeft: `${gap / 2}rpx`,
-            }"
+          </block>
+        </view>
+        <!-- 双列 -->
+        <view
+          class="grid grid-cols-2 box-border"
+          v-else-if="listType === 'grid'"
+          :style="{
+            width: itemWidth ? `${itemWidth}rpx` : '100%',
+            gap: gap ? `${gap}rpx` : undefined,
+          }"
+        >
+          <lcb-action-view
+            v-for="(item, index) in renderList"
+            :key="`${item?.productId}:${index}`"
+            v-bind="item.link"
+            render-mode="view"
+            custom-class="h-full rounded-md overflow-hidden"
+          >
+            <slot name="item" :item="item">
+              <lcb-absolute-config-layout
+                v-if="renderItemAbsoluteConfigLayout"
+                :blocks="renderItemAbsoluteConfigLayout?.blocks"
+                :canvas="renderItemAbsoluteConfigLayout?.canvas"
+                :dataset="{
+                  ...(renderItemAbsoluteConfigLayout?.dataset ?? {}),
+                  ...item,
+                }"
+              />
+              <lcb-product-item
+                v-else
+                v-bind="{ ...item, ...$props, ...attrs }"
+                layoutType="vertical"
+                className="h-full"
+                :coverImgStyle="{
+                  width: '100%',
+                  height: transformValueUnit(imageHeight),
+                  borderRadius: imageRadius ? transformValueUnit(imageRadius) : undefined,
+                  ...(attrs?.coverImgStyle ?? {}),
+                }"
+              ></lcb-product-item>
+            </slot>
+          </lcb-action-view>
+        </view>
+
+        <view
+          class="lcb-product-waterfall !py-1"
+          v-else-if="listType === 'waterfall'"
+          :style="{
+            width: itemWidth ? `${itemWidth}rpx` : '100%',
+          }"
+        >
+          <u-waterfall
+            :addTime="0"
+            :modelValue="renderList"
+            ref="uWaterfallRef"
+            custom-class="!gap-20"
+          >
+            <template #left="{ leftList: list }">
+              <view
+                class="flex flex-col gap-3"
+                :style="{
+                  marginRight: `${gap / 2}rpx`,
+                }"
+              >
+                <lcb-action-view
+                  v-for="(item, index) in list"
+                  :key="`${item?.productId}:${index}`"
+                  v-bind="item.link"
+                  render-mode="view"
+                >
+                  <slot name="item" :item="item">
+                    <lcb-absolute-config-layout
+                      v-if="renderItemAbsoluteConfigLayout"
+                      :blocks="renderItemAbsoluteConfigLayout?.blocks"
+                      :canvas="renderItemAbsoluteConfigLayout?.canvas"
+                      :dataset="{
+                        ...(renderItemAbsoluteConfigLayout?.dataset ?? {}),
+                        ...item,
+                      }"
+                    />
+
+                    <lcb-product-item
+                      v-bind="{ ...item, ...$props, ...attrs }"
+                      layoutType="vertical"
+                      v-else
+                    >
+                      <template #coverImg="{ value }">
+                        <wd-img
+                          :src="value"
+                          width="100%"
+                          mode="aspectFill"
+                          :lazyPlaceWidth="columnWidth"
+                          :height="
+                            calculateImageHeight(
+                              screenWidth,
+                              item.coverImgProps?.[0]?.height,
+                              item.coverImgProps?.[0]?.width,
+                            )
+                          "
+                        />
+                      </template>
+                    </lcb-product-item>
+                  </slot>
+                </lcb-action-view>
+              </view>
+            </template>
+            <template #right="{ rightList: list }">
+              <view
+                class="flex flex-col gap-3"
+                :style="{
+                  marginLeft: `${gap / 2}rpx`,
+                }"
+              >
+                <lcb-action-view
+                  v-for="(item, index) in list"
+                  :key="`${item?.productId}:${index}`"
+                  v-bind="item.link"
+                  render-mode="view"
+                >
+                  <slot name="item" :item="item">
+                    <lcb-absolute-config-layout
+                      v-if="renderItemAbsoluteConfigLayout"
+                      :blocks="renderItemAbsoluteConfigLayout?.blocks"
+                      :canvas="renderItemAbsoluteConfigLayout?.canvas"
+                      :dataset="{
+                        ...(renderItemAbsoluteConfigLayout?.dataset ?? {}),
+                        ...item,
+                      }"
+                    />
+                    <lcb-product-item
+                      v-else
+                      v-bind="{ ...item, ...$props, ...attrs }"
+                      layoutType="vertical"
+                    >
+                      <template #coverImg="{ value }">
+                        <wd-img
+                          :src="value"
+                          width="100%"
+                          :lazyPlaceWidth="columnWidth"
+                          mode="aspectFill"
+                          :height="
+                            calculateImageHeight(
+                              screenWidth,
+                              item.coverImgProps?.[0]?.height,
+                              item.coverImgProps?.[0]?.width,
+                            )
+                          "
+                        />
+                      </template>
+                    </lcb-product-item>
+                  </slot>
+                </lcb-action-view>
+              </view>
+            </template>
+          </u-waterfall>
+        </view>
+        <!-- 单列滚动 -->
+        <template v-else-if="listType == 'horizontal'">
+          <lcb-action-view
+            v-for="(item, index) in renderList"
+            :key="`${item?.productId}:${index}`"
+            custom-class="flex-shrink-0 w-fit !h-auto"
+            v-bind="item.link"
+            render-mode="view"
           >
-            <lcb-action-view
-              v-for="(item, index) in list"
-              :key="`${item?.productId}:${index}`"
-              v-bind="item.link"
-              render-mode="view"
+            <view
+              :style="{
+                width: `${itemWidth}rpx`,
+                marginLeft: index === 0 ? 0 : `${gap}rpx`,
+              }"
+              class="h-full"
             >
               <slot name="item" :item="item">
                 <lcb-absolute-config-layout
@@ -314,73 +410,23 @@ defineExpose({
                 />
                 <lcb-product-item
                   v-else
+                  className="h-full"
                   v-bind="{ ...item, ...$props, ...attrs }"
-                  layoutType="vertical"
-                >
-                  <template #coverImg="{ value }">
-                    <wd-img
-                      :src="value"
-                      width="100%"
-                      :lazyPlaceWidth="columnWidth"
-                      mode="aspectFill"
-                      :height="
-                        calculateImageHeight(
-                          screenWidth,
-                          item.coverImgProps?.[0]?.height,
-                          item.coverImgProps?.[0]?.width,
-                        )
-                      "
-                    />
-                  </template>
-                </lcb-product-item>
+                  :coverImgStyle="{
+                    width: layoutType === 'vertical' ? '100%' : transformValueUnit(imageWidth),
+                    height: layoutType === 'vertical' ? transformValueUnit(imageHeight) : undefined,
+                    minHeight:
+                      layoutType !== 'vertical' ? transformValueUnit(imageHeight) : undefined,
+                    borderRadius: imageRadius ? transformValueUnit(imageRadius) : undefined,
+                    ...(attrs?.coverImgStyle ?? {}),
+                  }"
+                ></lcb-product-item>
               </slot>
-            </lcb-action-view>
-          </view>
+            </view>
+          </lcb-action-view>
         </template>
-      </u-waterfall>
-    </view>
-    <!-- 单列滚动 -->
-    <template v-else-if="listType == 'horizontal'">
-      <lcb-action-view
-        v-for="(item, index) in renderList"
-        :key="`${item?.productId}:${index}`"
-        custom-class="flex-shrink-0 w-fit !h-auto"
-        v-bind="item.link"
-        render-mode="view"
-      >
-        <view
-          :style="{
-            width: `${itemWidth}rpx`,
-            marginLeft: index === 0 ? 0 : `${gap}rpx`,
-          }"
-          class="h-full"
-        >
-          <slot name="item" :item="item">
-            <lcb-absolute-config-layout
-              v-if="renderItemAbsoluteConfigLayout"
-              :blocks="renderItemAbsoluteConfigLayout?.blocks"
-              :canvas="renderItemAbsoluteConfigLayout?.canvas"
-              :dataset="{
-                ...(renderItemAbsoluteConfigLayout?.dataset ?? {}),
-                ...item,
-              }"
-            />
-            <lcb-product-item
-              v-else
-              className="h-full"
-              v-bind="{ ...item, ...$props, ...attrs }"
-              :coverImgStyle="{
-                width: layoutType === 'vertical' ? '100%' : transformValueUnit(imageWidth),
-                height: layoutType === 'vertical' ? transformValueUnit(imageHeight) : undefined,
-                minHeight: layoutType !== 'vertical' ? transformValueUnit(imageHeight) : undefined,
-                borderRadius: imageRadius ? transformValueUnit(imageRadius) : undefined,
-                ...(attrs?.coverImgStyle ?? {}),
-              }"
-            ></lcb-product-item>
-          </slot>
-        </view>
-      </lcb-action-view>
-    </template>
+      </lcb-block>
+    </wd-skeleton>
   </lcb-block>
 </template>
 

package/hooks/useLocation.ts

@@ -49,7 +49,6 @@ const useLocation = (onLocation?: (location: UserLocation) => void) => {
 
   const getLocation = async (force = false) => {
     // 如果不是force并且当前位置有值，则不刷新
-    console.log('currentLocation.value', currentLocation.value, force)
     if (!force && currentLocation.value) return
     if ((await checkLocationPermission()) !== false) {
       locationIng.value = true

package/package.json

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