@tplc/business 0.3.99 → 0.3.101

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.3.101](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/compare/v0.3.100...v0.3.101) (2025-03-22)
+
+
+### ✨ Features | 新功能
+
+* 还差数据统一 ([4f87b06](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/4f87b06331726ae4bf505c4ebae62076688ee9dc))
+
+### [0.3.100](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/compare/v0.3.99...v0.3.100) (2025-03-22)
+
 ### [0.3.99](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/compare/v0.3.98...v0.3.99) (2025-03-22)
 
 

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

@@ -49,7 +49,6 @@ watchEffect(() => {
 watch(
   () => [props.url, props.baseParam, form?.value],
   async () => {
-    console.log('props.url', props)
     paging.value?.reload()
   },
   {

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

@@ -34,9 +34,11 @@
           <TreeSelect
             v-else-if="item.component === 'treeSelect'"
             v-bind="item.componentProps"
-            v-model="filter[item.valueName]"
-            v-model:title="titleObj[item.valueName]"
-            @submit="onSubmit(index)"
+            :value="filter[item.valueName]"
+            :value-name="item.valueName"
+            v-model:count="titleCount[item.valueName]"
+            :filter-value="filter"
+            @submit="onSubmit(index, $event)"
           />
           <ComponentGroup
             v-else-if="item.component === 'componentGroup'"

package/components/lcb-list/components/FilterView/type.ts

@@ -4,5 +4,6 @@ import { LcbListProps } from '../../types'
 export interface FilterViewProps extends LcbListProps {
   info: LcbFilterResult
   titleObj: Record<string, any>
+  titleCount: Record<string, number>
   sticky: boolean
 }

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

@@ -16,12 +16,18 @@
         <view
           v-for="item in options[currentCategory].children"
           :key="item.label"
-          @click="onItemClick(item)"
+          @click="onItemClick(item, options[currentCategory].valueName)"
           class="filter-select flex justify-between items-center !px-36rpx !py-30rpx"
-          :class="getChecked(item) ? 'filter-select__choose' : ''"
+          :class="
+            getChecked(item, options[currentCategory].valueName) ? 'filter-select__choose' : ''
+          "
         >
           {{ item.label }}
-          <wd-icon name="check" custom-class="choose_icon" v-if="innerValue === item.value" />
+          <wd-icon
+            name="check"
+            custom-class="choose_icon"
+            v-if="getChecked(item, options[currentCategory].valueName)"
+          />
         </view>
       </view>
       <scroll-view
@@ -42,23 +48,19 @@
               v-for="child in item.children"
               :key="child.label"
               :title="child.label"
-              :checked="getChecked(child)"
-              @click="onItemClick(child)"
+              :checked="getChecked(child, item.valueName)"
+              @click="onItemClick(child, item.valueName)"
             />
           </view>
         </view>
       </scroll-view>
     </view>
-    <ActionView
-      :disabled="!Boolean(innerValue)"
-      @cancel="innerValue = undefined"
-      @submit="onSubmit"
-    />
+    <ActionView :disabled="!Boolean(innerValue)" @cancel="onCancel" @submit="onSubmit" />
   </view>
 </template>
 
 <script setup lang="ts">
-import { computed, getCurrentInstance, nextTick, watch, ref, watchEffect } from 'vue'
+import { getCurrentInstance, nextTick, watch, ref } from 'vue'
 import { TreeSelectProps } from './type'
 import useSelect from '../../hooks/useSelect'
 import SelectTagView from '../SelectTagView/index.vue'
@@ -72,36 +74,44 @@ defineOptions({
   },
 })
 const props = defineProps<TreeSelectProps>()
-const model = defineModel<string | string[]>()
-const modelTitle = defineModel<string>('title')
-const innerValue = ref(model.value)
+const modelCount = defineModel<number>('count')
+const innerValue = ref(props.value)
 const toView = ref('')
+const extraModel = ref({
+  ...props.filterValue,
+})
 const itemTopPositions = ref<{ top: number; bottom: number }[]>([])
 const emits = defineEmits(['submit'])
-const { onItemClick, options, getChecked } = useSelect(props, { model: innerValue })
-const currentCategory = ref(0)
-const treeObj = computed(() => {
-  return options.value.reduce(
-    (prev, next) => {
-      next?.children?.forEach((item) => {
-        prev[item.value as string] = item.label
-      })
-      return prev
-    },
-    {} as Record<string, string>,
-  )
+const onOpen = () => {
+  innerValue.value = props.value
+  extraModel.value = {
+    ...props.filterValue,
+  }
+}
+const { onItemClick, options, getChecked } = useSelect(props, {
+  model: innerValue,
+  extraModel,
+  onOpen,
 })
+const currentCategory = ref(0)
 const onSubmit = () => {
-  model.value = innerValue.value
-  nextTick(() => {
-    emits('submit')
+  let count = 0
+  options.value.forEach((item) => {
+    if (item.valueName) {
+      count += extraModel.value[item.valueName]
+        ? props.mode !== 'multiple'
+          ? 1
+          : extraModel.value[item.valueName].length
+        : 0
+    }
+  })
+  count += innerValue.value ? (props.mode !== 'multiple' ? 1 : innerValue.value.length) : 0
+  modelCount.value = count
+  emits('submit', {
+    ...extraModel.value,
+    [props.valueName]: innerValue.value,
   })
 }
-watchEffect(() => {
-  if (props.mode !== 'multiple') {
-    modelTitle.value = treeObj.value[innerValue.value as string]
-  }
-})
 const onCategoryClick = (index: number) => {
   currentCategory.value = index
   toView.value = `grid_${index}`
@@ -134,6 +144,10 @@ const onGridScroll = (e) => {
     }
   })
 }
+const onCancel = () => {
+  innerValue.value = undefined
+  extraModel.value = {}
+}
 </script>
 <style lang="scss" scoped>
 @import '@tplc/wot/components/common/abstracts/variable';

package/components/lcb-list/components/TreeSelect/type.ts

@@ -1,3 +1,7 @@
 import { FilterItemProps } from '../../types'
 
-export interface TreeSelectProps extends FilterItemProps {}
+export interface TreeSelectProps extends FilterItemProps {
+  filterValue?: Record<string, any>
+  value?: string | string[]
+  valueName: string
+}

package/components/lcb-list/hooks/useSelect.ts

@@ -1,25 +1,36 @@
-import { onMounted, ref, Ref } from 'vue'
+import { onMounted, onUnmounted, ref, Ref } from 'vue'
 import { FilterItemProps, Option } from '../types'
 const useSelect = (
   props: FilterItemProps,
   {
     model,
+    extraModel,
+    onOpen,
   }: {
     model: Ref<string | string[] | undefined>
+    extraModel?: Ref<Record<string, any>>
+    onOpen?: () => void
   },
 ) => {
   const options = ref<Option[]>(props.options || [])
-  const onItemClick = (item: Option) => {
+  const onItemClick = (item: Option, valueName?: string) => {
+    let val: string[] | string | undefined
+    const currentValue = valueName ? extraModel?.value[valueName] : model.value
     if (props.mode === 'multiple') {
-      if (typeof model.value === 'object' && model.value.includes(item.value as string)) {
-        model.value = model.value.filter((v) => v !== item.value)
+      if (typeof currentValue === 'object' && currentValue.includes(item.value as string)) {
+        val = currentValue.filter((v) => v !== item.value)
       } else {
-        model.value = [...(model.value || []), item.value as string]
+        val = [...(currentValue || []), item.value as string]
       }
-    } else if (model.value === item.value) {
-      model.value = undefined
+    } else if (currentValue === item.value) {
+      val = undefined
     } else {
-      model.value = item.value
+      val = item.value
+    }
+    if (valueName && extraModel) {
+      extraModel.value[valueName] = val
+    } else {
+      model.value = val
     }
   }
 
@@ -29,12 +40,17 @@ const useSelect = (
       const { data } = await uni.$lcb.http.post<Option[]>(props.apiPath, props.apiParams || {})
       options.value = data
     }
+    if (onOpen) uni.$on('drop-opened', onOpen)
+  })
+  onUnmounted(() => {
+    if (onOpen) uni.$off('drop-opened', onOpen)
   })
-  const getChecked = (item: Option) => {
-    if (Array.isArray(model.value)) {
-      return model.value.includes(`${item.value}`)
+  const getChecked = (item: Option, valueName?: string) => {
+    const currentValue = valueName ? extraModel?.value[valueName] : model.value
+    if (Array.isArray(currentValue)) {
+      return currentValue.includes(`${item.value}`)
     } else {
-      return Boolean(model.value && model.value === item.value)
+      return Boolean(currentValue && currentValue === item.value)
     }
   }
   return {

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

@@ -11,6 +11,7 @@
           :info="info"
           v-model="form"
           :titleObj="titleObj"
+          :titleCount="titleCount"
           :sticky="sticky"
         />
       </wd-sticky>
@@ -20,6 +21,7 @@
         :info="info"
         v-model="form"
         :titleObj="titleObj"
+        :titleCount="titleCount"
         :sticky="sticky"
       />
     </template>
@@ -79,6 +81,7 @@ defineOptions({
   },
 })
 const titleObj = ref<Record<string, any>>({})
+const titleCount = ref<Record<string, number>>({})
 const form = inject<Ref<Record<string, any>>>(FORM_KEY)
 const props = withDefaults(defineProps<LcbListProps>(), {
   borderRadius: 12,

package/components/lcb-list/types.ts

@@ -26,6 +26,7 @@ export interface Option {
   min?: number
   children?: Option[]
   unit?: string
+  valueName?: string
 }
 
 export interface FilterItemProps {

package/components/lcb-operation-actions/BtnViews.vue

@@ -126,7 +126,6 @@ async function link({ item }: { item: IPageBtn }) {
     const { data: logisticInfo } = await uni.$lcb.http.post<any>(item.requestUrl, {
       ...item.requestParam,
     })
-    console.log(logisticInfo)
     logistic.data = logisticInfo
     logistic.show = true
   } else {

package/package.json

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

package/types/components/lcb-list/components/FilterView/type.d.ts

@@ -3,5 +3,6 @@ import { LcbListProps } from '../../types'
 export interface FilterViewProps extends LcbListProps {
   info: LcbFilterResult
   titleObj: Record<string, any>
+  titleCount: Record<string, number>
   sticky: boolean
 }

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

@@ -1,8 +1,7 @@
 import { TreeSelectProps } from './type'
 declare let __VLS_typeProps: TreeSelectProps
 type __VLS_PublicProps = {
-  modelValue?: string | string[]
-  title?: string
+  count?: number
 } & typeof __VLS_typeProps
 declare const _default: import('vue').DefineComponent<
   __VLS_TypePropsToOption<__VLS_PublicProps>,
@@ -13,16 +12,14 @@ declare const _default: import('vue').DefineComponent<
   import('vue').ComponentOptionsMixin,
   import('vue').ComponentOptionsMixin,
   {
-    'update:modelValue': (modelValue: string | string[]) => void
-    'update:title': (title: string) => void
+    'update:count': (count: number) => void
     submit: (...args: any[]) => void
   },
   string,
   import('vue').PublicProps,
   Readonly<import('vue').ExtractPropTypes<__VLS_TypePropsToOption<__VLS_PublicProps>>> & {
-    'onUpdate:modelValue'?: ((modelValue: string | string[]) => any) | undefined
     onSubmit?: ((...args: any[]) => any) | undefined
-    'onUpdate:title'?: ((title: string) => any) | undefined
+    'onUpdate:count'?: ((count: number) => any) | undefined
   },
   {},
   {}

package/types/components/lcb-list/components/TreeSelect/type.d.ts

@@ -1,2 +1,6 @@
 import { FilterItemProps } from '../../types'
-export interface TreeSelectProps extends FilterItemProps {}
+export interface TreeSelectProps extends FilterItemProps {
+  filterValue?: Record<string, any>
+  value?: string | string[]
+  valueName: string
+}

package/types/components/lcb-list/hooks/useSelect.d.ts

@@ -4,8 +4,12 @@ declare const useSelect: (
   props: FilterItemProps,
   {
     model,
+    extraModel,
+    onOpen,
   }: {
     model: Ref<string | string[] | undefined>
+    extraModel?: Ref<Record<string, any>>
+    onOpen?: () => void
   },
 ) => {
   options: Ref<
@@ -17,9 +21,10 @@ declare const useSelect: (
       min?: number | undefined
       children?: any[] | undefined
       unit?: string | undefined
+      valueName?: string | undefined
     }[]
   >
-  getChecked: (item: Option) => boolean
-  onItemClick: (item: Option) => void
+  getChecked: (item: Option, valueName?: string) => boolean
+  onItemClick: (item: Option, valueName?: string) => void
 }
 export default useSelect

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

@@ -25,6 +25,7 @@ export interface Option {
   min?: number
   children?: Option[]
   unit?: string
+  valueName?: string
 }
 export interface FilterItemProps {
   mode?: 'multiple' | 'single'