sard-uniapp 1.16.0 → 1.17.0

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+# [1.17.0](https://github.com/sutras/sard-uniapp/compare/v1.16.0...v1.17.0) (2025-05-29)
+
+
+### Bug Fixes
+
+* 修复popup在h5弹出状态跳转页面仍显示的问题 ([1187368](https://github.com/sutras/sard-uniapp/commit/11873685cc8017ec42b4ad02c4d74754d5d3fc6c))
+
+
+### Features
+
+* picker 组件新增 custom 插槽 ([218d384](https://github.com/sutras/sard-uniapp/commit/218d3841459d65dec29d6cf35fd6fea7c713cca5))
+* tree 组件新增单选功能 ([a1fb8a2](https://github.com/sutras/sard-uniapp/commit/a1fb8a2c54ac7fc32e3dab2a416636553893bc2f))
+
+
+
 # [1.16.0](https://github.com/sutras/sard-uniapp/compare/v1.15.4...v1.16.0) (2025-05-28)
 
 

package/components/count-down/count-down.vue

@@ -1,7 +1,9 @@
 <template>
-  <slot :time="currentTime">
-    {{ formatTime(format, currentTime) }}
-  </slot>
+  <text>
+    <slot :time="currentTime">
+      {{ formatTime(format, currentTime) }}
+    </slot>
+  </text>
 </template>
 
 <script>

package/components/datetime-picker/common.d.ts

@@ -1,4 +1,5 @@
 import { type StyleValue } from 'vue';
+import { type PickerSlots } from '../picker/common';
 export interface DatetimePickerProps {
     rootStyle?: StyleValue;
     rootClass?: string;
@@ -13,6 +14,8 @@ export interface DatetimePickerProps {
 export declare const defaultDatetimePickerProps: {
     type: string;
 };
+export interface DatetimePickerSlots extends PickerSlots {
+}
 export interface DatetimePickerEmits {
     (e: 'update:model-value', date: Date | string): void;
     (e: 'change', date: Date | string): void;

package/components/datetime-picker/datetime-picker.d.ts

@@ -1,5 +1,6 @@
-import { type DatetimePickerProps } from './common';
-declare const _default: import("vue").DefineComponent<DatetimePickerProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {} & {
+import { type DatetimePickerProps, type DatetimePickerSlots } from './common';
+declare function __VLS_template(): Readonly<DatetimePickerSlots> & DatetimePickerSlots;
+declare const __VLS_component: import("vue").DefineComponent<DatetimePickerProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {} & {
     "update:model-value": (date: string | Date) => any;
     change: (date: string | Date) => any;
 }, string, import("vue").PublicProps, Readonly<DatetimePickerProps> & Readonly<{
@@ -8,4 +9,10 @@ declare const _default: import("vue").DefineComponent<DatetimePickerProps, {}, {
 }>, {
     type: string;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
+declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, ReturnType<typeof __VLS_template>>;
 export default _default;
+type __VLS_WithTemplateSlots<T, S> = T & {
+    new (): {
+        $slots: S;
+    };
+};

package/components/datetime-picker-input/common.d.ts

@@ -1,5 +1,5 @@
 import { type PopoutInputProps } from '../popout-input/common';
-import { type DatetimePickerPopoutProps, type DatetimePickerPopoutEmits } from '../datetime-picker-popout/common';
+import { type DatetimePickerPopoutProps, type DatetimePickerPopoutEmits, type DatetimePickerPopoutSlots } from '../datetime-picker-popout/common';
 export interface DatetimePickerInputProps extends DatetimePickerPopoutProps, Omit<PopoutInputProps, 'modelValue' | 'loading'> {
     outletFormat?: string;
 }
@@ -7,6 +7,8 @@ export declare const defaultDatetimePickerInputProps: () => {
     validateEvent: boolean;
     type: string;
 };
+export interface DatetimePickerInputSlots extends DatetimePickerPopoutSlots {
+}
 export interface DatetimePickerInputEmits extends DatetimePickerPopoutEmits {
 }
 export declare const mapTypeFormat: {

package/components/datetime-picker-input/datetime-picker-input.d.ts

@@ -1,5 +1,6 @@
-import { type DatetimePickerInputProps } from './common';
-declare const _default: import("vue").DefineComponent<DatetimePickerInputProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {} & {
+import { type DatetimePickerInputProps, type DatetimePickerInputSlots } from './common';
+declare function __VLS_template(): Readonly<DatetimePickerInputSlots> & DatetimePickerInputSlots;
+declare const __VLS_component: import("vue").DefineComponent<DatetimePickerInputProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {} & {
     "update:model-value": (date: string | Date | undefined) => any;
     change: (date: string | Date | undefined) => any;
     "update:visible": (visible: boolean) => any;
@@ -11,4 +12,10 @@ declare const _default: import("vue").DefineComponent<DatetimePickerInputProps,
     type: string;
     validateEvent: boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
+declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, ReturnType<typeof __VLS_template>>;
 export default _default;
+type __VLS_WithTemplateSlots<T, S> = T & {
+    new (): {
+        $slots: S;
+    };
+};

package/components/datetime-picker-popout/common.d.ts

@@ -1,5 +1,5 @@
 import { type StyleValue } from 'vue';
-import { type DatetimePickerProps } from '../datetime-picker/common';
+import { type DatetimePickerProps, type DatetimePickerSlots } from '../datetime-picker/common';
 export interface DatetimePickerPopoutProps extends DatetimePickerProps {
     visible?: boolean;
     title?: string;
@@ -11,8 +11,7 @@ export declare const defaultDatetimePickerPopoutProps: () => {
     validateEvent: boolean;
     type: string;
 };
-export interface DatetimePickerPopoutSlots {
-    default?(props: Record<string, never>): any;
+export interface DatetimePickerPopoutSlots extends DatetimePickerSlots {
 }
 export interface DatetimePickerPopoutEmits {
     (e: 'update:visible', visible: boolean): void;

package/components/datetime-range-picker/common.d.ts

@@ -1,4 +1,4 @@
-import { type DatetimePickerProps } from '../datetime-picker/common';
+import { type DatetimePickerSlots, type DatetimePickerProps } from '../datetime-picker/common';
 export interface DatetimeRangePickerProps extends Omit<DatetimePickerProps, 'modelValue'> {
     modelValue?: (Date | string)[];
     tabs?: string[];
@@ -6,8 +6,7 @@ export interface DatetimeRangePickerProps extends Omit<DatetimePickerProps, 'mod
 export declare const defaultDatetimeRangePickerProps: {
     type: string;
 };
-export interface DatetimeRangePickerSlots {
-    default?(props: Record<string, never>): any;
+export interface DatetimeRangePickerSlots extends DatetimePickerSlots {
 }
 export interface DatetimeRangePickerEmits {
     (e: 'update:model-value', date: (Date | string)[]): void;

package/components/datetime-range-picker-input/common.d.ts

@@ -1,4 +1,4 @@
-import { type DatetimeRangePickerPopoutProps, type DatetimeRangePickerPopoutEmits } from '../datetime-range-picker-popout/common';
+import { type DatetimeRangePickerPopoutProps, type DatetimeRangePickerPopoutSlots, type DatetimeRangePickerPopoutEmits } from '../datetime-range-picker-popout/common';
 import { type PopoutInputProps } from '../popout-input/common';
 export interface DatetimeRangePickerInputProps extends DatetimeRangePickerPopoutProps, Omit<PopoutInputProps, 'modelValue' | 'loading'> {
     outletFormat?: string;
@@ -7,5 +7,7 @@ export declare const defaultDatetimeRangePickerInputProps: () => {
     validateEvent: boolean;
     type: string;
 };
+export interface DatetimeRangePickerInputSlots extends DatetimeRangePickerPopoutSlots {
+}
 export interface DatetimeRangePickerInputEmits extends DatetimeRangePickerPopoutEmits {
 }

package/components/datetime-range-picker-input/datetime-range-picker-input.d.ts

@@ -1,5 +1,6 @@
-import { type DatetimeRangePickerInputProps } from './common';
-declare const _default: import("vue").DefineComponent<DatetimeRangePickerInputProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {} & {
+import { type DatetimeRangePickerInputProps, type DatetimeRangePickerInputSlots } from './common';
+declare function __VLS_template(): Readonly<DatetimeRangePickerInputSlots> & DatetimeRangePickerInputSlots;
+declare const __VLS_component: import("vue").DefineComponent<DatetimeRangePickerInputProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {} & {
     "update:model-value": (date: (string | Date)[] | undefined) => any;
     change: (date: (string | Date)[] | undefined) => any;
     "update:visible": (visible: boolean) => any;
@@ -11,4 +12,10 @@ declare const _default: import("vue").DefineComponent<DatetimeRangePickerInputPr
     type: string;
     validateEvent: boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
+declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, ReturnType<typeof __VLS_template>>;
 export default _default;
+type __VLS_WithTemplateSlots<T, S> = T & {
+    new (): {
+        $slots: S;
+    };
+};

package/components/datetime-range-picker-popout/common.d.ts

@@ -1,5 +1,5 @@
 import { type StyleValue } from 'vue';
-import { type DatetimeRangePickerProps } from '../datetime-range-picker/common';
+import { type DatetimeRangePickerProps, type DatetimeRangePickerSlots } from '../datetime-range-picker/common';
 export interface DatetimeRangePickerPopoutProps extends DatetimeRangePickerProps {
     visible?: boolean;
     title?: string;
@@ -11,8 +11,7 @@ export declare const defaultDatetimeRangePickerInputProps: () => {
     validateEvent: boolean;
     type: string;
 };
-export interface DatetimeRangePickerPopoutSlots {
-    default?(props: Record<string, never>): any;
+export interface DatetimeRangePickerPopoutSlots extends DatetimeRangePickerSlots {
 }
 export interface DatetimeRangePickerPopoutEmits {
     (e: 'update:visible', visible: boolean): void;

package/components/picker/common.d.ts

@@ -15,11 +15,22 @@ export interface PickerProps {
     optionKeys?: PickerOptionKeys;
     modelValue?: any;
     immediateChange?: boolean;
+    internalCustom?: number;
 }
 export declare const defaultPickerProps: () => {
     columns: () => never[];
     immediateChange: boolean;
 };
+export interface PickerSlots {
+    custom?(props: {
+        columns: any[][];
+        value: number[];
+        pickerViewClass: string;
+        maskClass: string;
+        indicatorClass: string;
+        onChange: (event: any) => void;
+    }): any;
+}
 export interface PickerEmits {
     (e: 'update:model-value', value: any, selectedOptions: PickerOption[], indexes: number[]): void;
     (e: 'change', value: any, selectedOptions: PickerOption[], indexes: number[]): void;

package/components/picker/index.scss

@@ -5,17 +5,4 @@
     @include universal;
     height: var(--sar-picker-height);
   }
-
-  @include e(picker-view) {
-    height: 100%;
-  }
-
-  @include e(item) {
-    height: var(--sar-picker-item-height);
-    line-height: var(--sar-picker-item-height);
-    font-size: var(--sar-picker-item-font-size);
-    text-align: center;
-    color: var(--sar-picker-item-color);
-    @include ellipsis;
-  }
 }

package/components/picker/picker.d.ts

@@ -1,5 +1,6 @@
-import { type PickerProps, type PickerOption } from './common';
-declare const _default: import("vue").DefineComponent<PickerProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {} & {
+import { type PickerProps, type PickerSlots, type PickerOption } from './common';
+declare function __VLS_template(): Readonly<PickerSlots> & PickerSlots;
+declare const __VLS_component: import("vue").DefineComponent<PickerProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {} & {
     "update:model-value": (value: any, selectedOptions: PickerOption[], indexes: number[]) => any;
     change: (value: any, selectedOptions: PickerOption[], indexes: number[]) => any;
 }, string, import("vue").PublicProps, Readonly<PickerProps> & Readonly<{
@@ -9,4 +10,10 @@ declare const _default: import("vue").DefineComponent<PickerProps, {}, {}, {}, {
     columns: PickerOption[] | PickerOption[][];
     immediateChange: boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
+declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, ReturnType<typeof __VLS_template>>;
 export default _default;
+type __VLS_WithTemplateSlots<T, S> = T & {
+    new (): {
+        $slots: S;
+    };
+};

package/components/picker/picker.vue

@@ -1,17 +1,28 @@
 <template>
   <view :class="pickerClass" :style="pickerStyle">
-    <picker-view
-      :class="bem.e('picker-view')"
-      :indicator-class="bem.e('indicator')"
-      :mask-class="bem.e('mask')"
+    <slot
+      v-if="isNumber(internalCustom) ? internalCustom : $slots.custom"
+      name="custom"
+      :columns="renderedColumns"
+      :picker-view-class="pickerViewClass"
+      :mask-class="maskClass"
+      :indicator-class="indicatorClass"
       :value="columnIndexes"
+      :on-change="onChange"
+    ></slot>
+    <picker-view
+      v-else
+      :class="pickerViewClass"
       :immediate-change="immediateChange"
+      :indicator-class="indicatorClass"
+      :mask-class="maskClass"
+      :value="columnIndexes"
       @change="onChange"
     >
       <picker-view-column v-for="(column, i) in renderedColumns" :key="i">
-        <view v-for="(option, j) in column" :key="j" :class="bem.e('item')">
+        <sar-picker-item v-for="(option, j) in column" :key="j">
           {{ getLabelByOption(option) }}
-        </view>
+        </sar-picker-item>
       </picker-view-column>
     </picker-view>
   </view>
@@ -27,7 +38,8 @@ import {
   nestedToMulti,
   toArray,
   arrayEqual,
-  isNullish
+  isNullish,
+  isNumber
 } from "../../utils";
 import {
   defaultOptionKeys,
@@ -39,7 +51,11 @@ import {
   getValueOrLabelByOption,
   defaultPickerProps
 } from "./common";
+import SarPickerItem from "../picker-item/picker-item.vue";
 export default  _defineComponent({
+  components: {
+    SarPickerItem,
+  },
   ...{
     options: {
       virtualHost: true,
@@ -53,7 +69,8 @@ export default  _defineComponent({
     columns: { type: Array, required: false },
     optionKeys: { type: Object, required: false },
     modelValue: { type: null, required: false },
-    immediateChange: { type: Boolean, required: false }
+    immediateChange: { type: Boolean, required: false },
+    internalCustom: { type: Number, required: false }
   }, defaultPickerProps()),
   emits: ["update:model-value", "change"],
   setup(__props, { expose: __expose, emit: __emit }) {
@@ -173,7 +190,12 @@ export default  _defineComponent({
     const pickerStyle = computed(() => {
       return stringifyStyle(props.rootStyle);
     });
-    const __returned__ = { props, emit, bem, fieldKeys, columnsType, innerValue, columnIndexes, onChange, getRenderedColumns, renderedColumns, getLabelByOption, pickerClass, pickerStyle };
+    const pickerViewClass = bem.e("picker-view");
+    const indicatorClass = bem.e("indicator");
+    const maskClass = bem.e("mask");
+    const __returned__ = { props, emit, bem, fieldKeys, columnsType, innerValue, columnIndexes, onChange, getRenderedColumns, renderedColumns, getLabelByOption, pickerClass, pickerStyle, pickerViewClass, indicatorClass, maskClass, get isNumber() {
+      return isNumber;
+    }, SarPickerItem };
     return __returned__;
   }
 });

package/components/picker/variables.scss

@@ -11,7 +11,8 @@ page,
 
   --sar-picker-indicator-border-color: var(--sar-border-color);
 
-  --sar-picker-mask-bg-image: linear-gradient(
+  --sar-picker-mask-bg-image:
+    linear-gradient(
       to bottom,
       rgba(var(--sar-emphasis-bg-rgb), 0.95),
       rgba(var(--sar-emphasis-bg-rgb), 0.6)
@@ -27,6 +28,8 @@ page,
 // 放到全局，兼容app
 @include bem(picker) {
   @include e(picker-view) {
+    height: var(--sar-picker-height);
+
     @include e(indicator) {
       height: var(--sar-picker-item-height);
       &::before {

package/components/picker-input/common.d.ts

@@ -1,5 +1,5 @@
 import { type PopoutInputProps } from '../popout-input/common';
-import { type PickerPopoutEmits, type PickerPopoutProps } from '../picker-popout/common';
+import { type PickerPopoutSlots, type PickerPopoutEmits, type PickerPopoutProps } from '../picker-popout/common';
 export interface PickerInputProps extends PickerPopoutProps, Omit<PopoutInputProps, 'modelValue'> {
 }
 export declare const defaultPickerInputProps: () => {
@@ -7,5 +7,7 @@ export declare const defaultPickerInputProps: () => {
     columns: () => never[];
     immediateChange: boolean;
 };
+export interface PickerInputSlots extends PickerPopoutSlots {
+}
 export interface PickerInputEmits extends PickerPopoutEmits {
 }

package/components/picker-input/picker-input.d.ts

@@ -1,6 +1,7 @@
 import { type PickerOption } from '../picker/common';
-import { type PickerInputProps } from './common';
-declare const _default: import("vue").DefineComponent<PickerInputProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {} & {
+import { type PickerInputProps, type PickerInputSlots } from './common';
+declare function __VLS_template(): Readonly<PickerInputSlots> & PickerInputSlots;
+declare const __VLS_component: import("vue").DefineComponent<PickerInputProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {} & {
     "update:model-value": (value: any) => any;
     change: (value: any) => any;
     "update:visible": (visible: boolean) => any;
@@ -13,4 +14,10 @@ declare const _default: import("vue").DefineComponent<PickerInputProps, {}, {},
     validateEvent: boolean;
     immediateChange: boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
+declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, ReturnType<typeof __VLS_template>>;
 export default _default;
+type __VLS_WithTemplateSlots<T, S> = T & {
+    new (): {
+        $slots: S;
+    };
+};

package/components/picker-input/picker-input.vue

@@ -21,8 +21,31 @@
       :option-keys="optionKeys"
       :immediate-change="immediateChange"
       :validate-event="validateEvent"
+      :internal-custom="$slots.custom ? 1 : 0"
       @change="onChange"
-    />
+    >
+      <template
+        v-if="$slots.custom"
+        #custom="{
+          columns,
+          maskClass,
+          pickerViewClass,
+          indicatorClass,
+          value,
+          onChange,
+        }"
+      >
+        <slot
+          name="custom"
+          :columns="columns"
+          :picker-view-class="pickerViewClass"
+          :mask-class="maskClass"
+          :indicator-class="indicatorClass"
+          :value="value"
+          :on-change="onChange"
+        ></slot>
+      </template>
+    </sar-picker-popout>
   </sar-popout-input>
 </template>
 
@@ -66,6 +89,7 @@ export default  _defineComponent({
     optionKeys: { type: Object, required: false },
     modelValue: { type: null, required: false },
     immediateChange: { type: Boolean, required: false },
+    internalCustom: { type: Number, required: false },
     placeholder: { type: String, required: false },
     readonly: { type: Boolean, required: false },
     disabled: { type: Boolean, required: false },

package/components/picker-item/common.d.ts

@@ -0,0 +1,12 @@
+import { type StyleValue } from 'vue';
+export interface PickerItemProps {
+    rootStyle?: StyleValue;
+    rootClass?: string;
+}
+export interface PickerItemSlots {
+    default?(props: Record<string, never>): any;
+}
+export interface PickerItemEmits {
+}
+export interface PickerItemExpose {
+}

package/components/picker-item/common.js

@@ -0,0 +1 @@
+export {};

package/components/picker-item/index.d.ts

@@ -0,0 +1 @@
+export type { PickerItemProps, PickerItemSlots, PickerItemEmits, PickerItemExpose, } from './common';

package/components/picker-item/index.js

@@ -0,0 +1 @@
+export {};

package/components/picker-item/index.scss

@@ -0,0 +1,12 @@
+@use '../style/base' as *;
+
+@include bem(picker) {
+  @include e(item) {
+    height: var(--sar-picker-item-height);
+    line-height: var(--sar-picker-item-height);
+    font-size: var(--sar-picker-item-font-size);
+    text-align: center;
+    color: var(--sar-picker-item-color);
+    @include ellipsis;
+  }
+}

package/components/picker-item/picker-item.d.ts

@@ -0,0 +1,10 @@
+import { type PickerItemProps, type PickerItemSlots } from './common';
+declare function __VLS_template(): Readonly<PickerItemSlots> & PickerItemSlots;
+declare const __VLS_component: import("vue").DefineComponent<PickerItemProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<PickerItemProps> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
+declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, ReturnType<typeof __VLS_template>>;
+export default _default;
+type __VLS_WithTemplateSlots<T, S> = T & {
+    new (): {
+        $slots: S;
+    };
+};

package/components/picker-item/picker-item.vue

@@ -0,0 +1,41 @@
+<template>
+  <view :class="pickerItemClass" :style="pickerItemStyle">
+    <slot></slot>
+  </view>
+</template>
+
+<script>
+import { defineComponent as _defineComponent } from "vue";
+import { computed } from "vue";
+import { classNames, stringifyStyle, createBem } from "../../utils";
+export default  _defineComponent({
+  ...{
+    options: {
+      virtualHost: true,
+      styleIsolation: "shared"
+    }
+  },
+  __name: "picker-item",
+  props: {
+    rootStyle: { type: [Boolean, null, String, Object, Array], required: false, skipCheck: true },
+    rootClass: { type: String, required: false }
+  },
+  setup(__props, { expose: __expose }) {
+    const props = __props;
+    const bem = createBem("picker");
+    __expose({});
+    const pickerItemClass = computed(() => {
+      return classNames(bem.e("item"), props.rootClass);
+    });
+    const pickerItemStyle = computed(() => {
+      return stringifyStyle(props.rootStyle);
+    });
+    const __returned__ = { props, bem, pickerItemClass, pickerItemStyle };
+    return __returned__;
+  }
+});
+</script>
+
+<style lang="scss">
+@import './index.scss';
+</style>

package/components/picker-popout/common.d.ts

@@ -1,5 +1,5 @@
 import { type StyleValue } from 'vue';
-import { type PickerProps } from '../picker/common';
+import { type PickerSlots, type PickerProps } from '../picker/common';
 export interface PickerPopoutProps extends PickerProps {
     visible?: boolean;
     title?: string;
@@ -12,8 +12,7 @@ export declare const defaultPickerPopoutProps: () => {
     columns: () => never[];
     immediateChange: boolean;
 };
-export interface PickerPopoutSlots {
-    default?(props: Record<string, never>): any;
+export interface PickerPopoutSlots extends PickerSlots {
 }
 export interface PickerPopoutEmits {
     (e: 'update:visible', visible: boolean): void;

package/components/picker-popout/common.js

@@ -1,4 +1,4 @@
-import { defaultPickerProps } from '../picker/common';
+import { defaultPickerProps, } from '../picker/common';
 import { defaultConfig } from '../config';
 export const defaultPickerPopoutProps = () => ({
     ...defaultPickerProps(),

package/components/picker-popout/picker-popout.vue

@@ -15,8 +15,33 @@
         :columns="columns"
         :option-keys="optionKeys"
         :immediate-change="immediateChange"
+        :internal-custom="
+          isNumber(internalCustom) ? internalCustom : $slots.custom ? 1 : 0
+        "
         @change="onChange"
-      />
+      >
+        <template
+          v-if="$slots.custom"
+          #custom="{
+            columns,
+            maskClass,
+            pickerViewClass,
+            indicatorClass,
+            value,
+            onChange,
+          }"
+        >
+          <slot
+            name="custom"
+            :columns="columns"
+            :picker-view-class="pickerViewClass"
+            :mask-class="maskClass"
+            :indicator-class="indicatorClass"
+            :value="value"
+            :on-change="onChange"
+          ></slot>
+        </template>
+      </sar-picker>
     </template>
   </sar-popout>
 </template>
@@ -28,7 +53,7 @@ import SarPicker from "../picker/picker.vue";
 import {
   defaultPickerPopoutProps
 } from "./common";
-import { isNullish } from "../../utils";
+import { isNullish, isNumber } from "../../utils";
 import { defaultOptionKeys, getInitialValue } from "../picker/common";
 import { computed } from "vue";
 import { useFormPopout } from "../../use";
@@ -55,7 +80,8 @@ export default  _defineComponent({
     columns: { type: Array, required: false },
     optionKeys: { type: Object, required: false },
     modelValue: { type: null, required: false },
-    immediateChange: { type: Boolean, required: false }
+    immediateChange: { type: Boolean, required: false },
+    internalCustom: { type: Number, required: false }
   }, defaultPickerPopoutProps()),
   emits: ["update:visible", "update:model-value", "change"],
   setup(__props, { expose: __expose, emit: __emit }) {
@@ -77,7 +103,9 @@ export default  _defineComponent({
         popoutValue.value = innerValue.value;
       }
     };
-    const __returned__ = { props, emit, innerVisible, innerValue, popoutValue, onChange, onConfirm, fieldKeys, onEnter, SarPopout, SarPicker };
+    const __returned__ = { props, emit, innerVisible, innerValue, popoutValue, onChange, onConfirm, fieldKeys, onEnter, SarPopout, SarPicker, get isNumber() {
+      return isNumber;
+    } };
     return __returned__;
   }
 });

package/components/popup/popup.vue

@@ -5,7 +5,7 @@
     <!-- #ifdef MP -->
     <root-portal>
       <!-- #endif -->
-      <view class="sar-portal">
+      <view v-show="pageVisible" class="sar-portal">
         <sar-overlay
           v-if="overlay"
           :visible="visible"
@@ -36,7 +36,8 @@
 <script>
 import { mergeDefaults as _mergeDefaults, defineComponent as _defineComponent } from "vue";
 import { computed, reactive, ref, toRef } from "vue";
-import { classNames, stringifyStyle, createBem } from "../../utils";
+import { onHide, onShow } from "@dcloudio/uni-app";
+import { classNames, stringifyStyle, createBem, isWeb } from "../../utils";
 import { useTransition, useZIndex } from "../../use";
 import SarOverlay from "../overlay/overlay.vue";
 import {
@@ -100,6 +101,17 @@ export default  _defineComponent({
     const onOverlayClick = (event) => {
       emit("overlay-click", event);
     };
+    const pageVisible = ref(true);
+    onShow(() => {
+      if (isWeb) {
+        pageVisible.value = true;
+      }
+    });
+    onHide(() => {
+      if (isWeb) {
+        pageVisible.value = false;
+      }
+    });
     const popupClass = computed(() => {
       return classNames(
         bem.b(),
@@ -116,7 +128,7 @@ export default  _defineComponent({
         transitionDuration: props.duration + "ms"
       });
     });
-    const __returned__ = { props, emit, bem, zIndex, increaseZIndex, callVisibleHook, keepRenderClass, onVisibleHook, realVisible, transitionClass, onTransitionEnd, onOverlayClick, popupClass, popupStyle, SarOverlay };
+    const __returned__ = { props, emit, bem, zIndex, increaseZIndex, callVisibleHook, keepRenderClass, onVisibleHook, realVisible, transitionClass, onTransitionEnd, onOverlayClick, pageVisible, popupClass, popupStyle, SarOverlay };
     return __returned__;
   }
 });

package/components/tree/common.d.ts

@@ -45,6 +45,9 @@ export interface TreeProps {
     accordion?: boolean;
     selectable?: boolean;
     checkStrictly?: boolean;
+    singleSelectable?: boolean;
+    leafOnly?: boolean;
+    current?: string | number;
     defaultCheckedKeys?: (string | number)[];
     draggable?: boolean;
     editable?: boolean;
@@ -57,6 +60,10 @@ export declare const defaultTreeProps: () => {
     filterMode: TreeProps["filterMode"];
     accordion: boolean;
 };
+export interface TreeEmits {
+    (e: 'update:current', key: string | number, node: TreeStateNode): void;
+    (e: 'select', key: string | number, node: TreeStateNode): void;
+}
 export interface TreeExpose {
     setExpanded: (key: string | number, expanded: boolean) => void;
     toggleExpanded: (key: string | number) => void;
@@ -81,6 +88,8 @@ export interface TreeContext {
     selectable: TreeProps['selectable'];
     draggable: TreeProps['draggable'];
     editable: TreeProps['editable'];
+    singleSelectable: TreeProps['singleSelectable'];
+    leafOnly: TreeProps['leafOnly'];
     treeData: TreeStateNode[];
     setExpandedByNode: (node: TreeStateNode, expanded: boolean) => void;
     toggleExpandedByNode: (node: TreeStateNode) => void;
@@ -89,5 +98,7 @@ export interface TreeContext {
     leveldown: (node: TreeStateNode) => void;
     edit: (node: TreeStateNode, getEditRect: () => Promise<NodeRect>) => void;
     drop: (dropOriginNode: TreeStateNode, dropTargetNode: TreeStateNode, position: number) => void;
+    currentKey: string | number | undefined;
+    singleSelect: (node: TreeStateNode) => void;
 }
 export declare const treeContextSymbol: unique symbol;

package/components/tree/index.d.ts

@@ -1 +1 @@
-export type { TreeProps, TreeExpose } from './common';
+export type { TreeProps, TreeEmits, TreeExpose, TreeNode, TreeStateNode, } from './common';

package/components/tree/tree.d.ts

@@ -1,4 +1,4 @@
-import { type TreeProps, type TreeNode, type TreeCleanNode } from './common';
+import { type TreeProps, type TreeNode, type TreeStateNode, type TreeCleanNode } from './common';
 declare const _default: import("vue").DefineComponent<TreeProps, {
     setExpanded: (key: string | number, expanded: boolean) => void;
     toggleExpanded: (key: string | number) => void;
@@ -11,7 +11,13 @@ declare const _default: import("vue").DefineComponent<TreeProps, {
     addRootNode: () => void;
     getCleanTreeData: () => TreeCleanNode[];
     filter: (searchString: string) => void;
-}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<TreeProps> & Readonly<{}>, {
+}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {} & {
+    select: (key: string | number, node: TreeStateNode) => any;
+    "update:current": (key: string | number, node: TreeStateNode) => any;
+}, string, import("vue").PublicProps, Readonly<TreeProps> & Readonly<{
+    onSelect?: ((key: string | number, node: TreeStateNode) => any) | undefined;
+    "onUpdate:current"?: ((key: string | number, node: TreeStateNode) => any) | undefined;
+}>, {
     accordion: boolean;
     data: TreeNode[];
     filterMode: "lenient" | "strict";

package/components/tree/tree.vue

@@ -35,7 +35,7 @@
 
 <script>
 import { mergeDefaults as _mergeDefaults, defineComponent as _defineComponent } from "vue";
-import { computed, provide, reactive, ref, toRef, watch } from "vue";
+import { computed, provide, reactive, ref, shallowRef, toRef, watch } from "vue";
 import {
   classNames,
   stringifyStyle,
@@ -80,14 +80,19 @@ export default  _defineComponent({
     accordion: { type: Boolean, required: false },
     selectable: { type: Boolean, required: false },
     checkStrictly: { type: Boolean, required: false },
+    singleSelectable: { type: Boolean, required: false },
+    leafOnly: { type: Boolean, required: false },
+    current: { type: [String, Number], required: false },
     defaultCheckedKeys: { type: Array, required: false },
     draggable: { type: Boolean, required: false },
     editable: { type: Boolean, required: false },
     filterMode: { type: String, required: false },
     filterMethod: { type: Function, required: false }
   }, defaultTreeProps()),
-  setup(__props, { expose: __expose }) {
+  emits: ["update:current", "select"],
+  setup(__props, { expose: __expose, emit: __emit }) {
     const props = __props;
+    const emit = __emit;
     const bem = createBem("tree");
     const { t } = useTranslate("tree");
     const fieldKeys = computed(() => {
@@ -506,12 +511,28 @@ export default  _defineComponent({
       recur(treeData.value);
       setRenderPosition();
     }
+    const currentKey = shallowRef(props.current);
+    watch(
+      () => props.current,
+      () => {
+        currentKey.value = props.current;
+      }
+    );
+    const singleSelect = (node) => {
+      if (currentKey.value !== node.key) {
+        currentKey.value = node.key;
+        emit("update:current", node.key, node);
+        emit("select", node.key, node);
+      }
+    };
     provide(
       treeContextSymbol,
       reactive({
         selectable: toRef(() => props.selectable),
         draggable: toRef(() => props.draggable),
         editable: toRef(() => props.editable),
+        singleSelectable: toRef(() => props.singleSelectable),
+        leafOnly: toRef(() => props.leafOnly),
         treeData: toRef(() => treeData.value),
         setExpandedByNode,
         toggleExpandedByNode,
@@ -519,7 +540,9 @@ export default  _defineComponent({
         levelup,
         leveldown,
         drop,
-        edit
+        edit,
+        currentKey,
+        singleSelect
       })
     );
     __expose({
@@ -546,7 +569,7 @@ export default  _defineComponent({
         props.rootStyle
       );
     });
-    const __returned__ = { props, bem, t, fieldKeys, treeData, get treeMap() {
+    const __returned__ = { props, emit, bem, t, fieldKeys, treeData, get treeMap() {
       return treeMap;
     }, set treeMap(v) {
       treeMap = v;
@@ -554,7 +577,7 @@ export default  _defineComponent({
       return currentEditNode;
     }, set currentEditNode(v) {
       currentEditNode = v;
-    }, currentEditType, currentEditValue, mapEditTypeTitle, currentEditTitle, dialogVisible, toastVisible, onPopoverSelect, beforeClose, edit, focused, onVisibleHook, defaultFilterMethod, filter, treeClass, treeStyle, SarTreeNode, SarPopover, SarInput, SarDialog, SarToast };
+    }, currentEditType, currentEditValue, mapEditTypeTitle, currentEditTitle, dialogVisible, toastVisible, onPopoverSelect, beforeClose, edit, focused, onVisibleHook, defaultFilterMethod, filter, currentKey, singleSelect, treeClass, treeStyle, SarTreeNode, SarPopover, SarInput, SarDialog, SarToast };
     return __returned__;
   }
 });

package/components/tree/variables.scss

@@ -11,8 +11,8 @@ page,
   --sar-tree-node-bg: var(--sar-emphasis-bg);
   --sar-tree-node-active-bg: var(--sar-active-bg);
   --sar-tree-node-dragging-bg: var(--sar-mask-white-legible);
-  --sar-tree-node-dragging-shadow: 0 0 1px 1px rgb(0 0 0 / 0.2),
-    0 1px 10px rgb(0 0 0 / 0.2);
+  --sar-tree-node-dragging-shadow:
+    0 0 1px 1px rgb(0 0 0 / 0.2), 0 1px 10px rgb(0 0 0 / 0.2);
 
   --sar-tree-toolbar-margin-right: -24rpx;
 

package/components/tree-node/index.scss

@@ -8,7 +8,8 @@
     left: 0;
     width: 100%;
     height: var(--sar-tree-node-height);
-    transition: transform var(--sar-tree-duration),
+    transition:
+      transform var(--sar-tree-duration),
       opacity var(--sar-tree-duration);
 
     flex-direction: row;

package/components/tree-node/tree-node.vue

@@ -13,7 +13,7 @@
       <sar-icon family="sari" name="right" />
     </view>
     <view
-      v-if="treeContext.selectable"
+      v-if="treeContext.selectable || canSingleSelectable"
       :class="selectionClass"
       @touchstart.stop="onSelectionTouchStart"
       @touchend.stop="onSelectionTouchEnd"
@@ -22,11 +22,18 @@
       @click.stop
     >
       <sar-checkbox
+        v-if="treeContext.selectable"
         readonly
         :checked="node.checked"
         :indeterminate="node.indeterminate"
         :disabled="node.disabled"
       />
+      <sar-radio
+        v-if="canSingleSelectable"
+        readonly
+        :checked="isSingleChecked"
+        :disabled="node.disabled"
+      />
     </view>
     <view :class="bem.e('title')">
       {{ node.title }}
@@ -103,6 +110,7 @@ import {
 import { useMouseDown, useSimulatedClick, useSimulatedPress } from "../../use";
 import SarIcon from "../icon/icon.vue";
 import SarCheckbox from "../checkbox/checkbox.vue";
+import SarRadio from "../radio/radio.vue";
 import SarPopover from "../popover/popover.vue";
 import { usePopover } from "../popover";
 import { getNodeLevel, recurDescendant } from "../tree/utils";
@@ -110,6 +118,7 @@ export default  _defineComponent({
   components: {
     SarIcon,
     SarCheckbox,
+    SarRadio,
     SarPopover,
   },
   ...{
@@ -263,10 +272,13 @@ export default  _defineComponent({
       if (!isLeaf.value) {
         treeContext.toggleExpandedByNode(props.node);
       }
+      if (canSingleSelectable.value && treeContext.leafOnly) {
+        treeContext.singleSelect(props.node);
+      }
     };
     const nodeActive = ref(false);
     const onNodeTouchStart = () => {
-      if (!isLeaf.value) {
+      if (!isLeaf.value || canSingleSelectable.value && treeContext.leafOnly) {
         nodeActive.value = true;
       }
     };
@@ -278,11 +290,20 @@ export default  _defineComponent({
       void 0,
       onNodeTouchEnd
     );
+    const canSingleSelectable = computed(() => {
+      return treeContext.singleSelectable && (!treeContext.leafOnly || isLeaf.value);
+    });
+    const isSingleChecked = computed(
+      () => props.node.key === treeContext.currentKey
+    );
     const [onSelectionTouchStart, onSelectionTouchEnd] = useSimulatedClick(() => {
       if (!props.node.disabled) {
         if (treeContext.selectable) {
           treeContext.setCheckedByNode(props.node, !props.node.checked);
         }
+        if (canSingleSelectable.value) {
+          treeContext.singleSelect(props.node);
+        }
       }
     });
     const onSelectionMouseDown = useMouseDown(
@@ -308,6 +329,7 @@ export default  _defineComponent({
         bem.em("node", "dragging", dragging.value),
         bem.em("node", "selectable", treeContext.selectable),
         bem.em("node", "active", nodeActive.value),
+        bem.em("node", "current", isSingleChecked.value),
         nodeId
       );
     });
@@ -355,7 +377,7 @@ export default  _defineComponent({
       return obviousNodes;
     }, set obviousNodes(v) {
       obviousNodes = v;
-    }, onDragStart, onDragMove, onDragEnd, onDragSimulatedClickTouchStart, onDragSimulatedClickTouchEnd, onDragSimulatedPressTouchStart, onDragSimulatedPressTouchMove, onDragSimulatedPressTouchEnd, onDragTouchStart, onDragTouchMove, onDragTouchEnd, onDragMouseDown, dragId, popover, isLastNode, popoverOptions, onPopoverSelect, isLeaf, onNodeClick, nodeActive, onNodeTouchStart, onNodeTouchEnd, onNodeMouseDown, onSelectionTouchStart, onSelectionTouchEnd, onSelectionMouseDown, editId, getEditRect, onEditTouchStart, onEditTouchEnd, onEditMouseDown, nodeClass, nodeStyle, editClass, indentStyle, arrowClass, selectionClass, SarIcon, SarCheckbox, SarPopover };
+    }, onDragStart, onDragMove, onDragEnd, onDragSimulatedClickTouchStart, onDragSimulatedClickTouchEnd, onDragSimulatedPressTouchStart, onDragSimulatedPressTouchMove, onDragSimulatedPressTouchEnd, onDragTouchStart, onDragTouchMove, onDragTouchEnd, onDragMouseDown, dragId, popover, isLastNode, popoverOptions, onPopoverSelect, isLeaf, onNodeClick, nodeActive, onNodeTouchStart, onNodeTouchEnd, onNodeMouseDown, canSingleSelectable, isSingleChecked, onSelectionTouchStart, onSelectionTouchEnd, onSelectionMouseDown, editId, getEditRect, onEditTouchStart, onEditTouchEnd, onEditMouseDown, nodeClass, nodeStyle, editClass, indentStyle, arrowClass, selectionClass, SarIcon, SarCheckbox, SarRadio, SarPopover };
     return __returned__;
   }
 });

package/global.d.ts

@@ -66,6 +66,7 @@ declare module 'vue' {
     SarPasswordInput: typeof import('./components/password-input/password-input').default
     SarPicker: typeof import('./components/picker/picker').default
     SarPickerInput: typeof import('./components/picker-input/picker-input').default
+    SarPickerItem: typeof import('./components/picker-item/picker-item').default
     SarPickerPopout: typeof import('./components/picker-popout/picker-popout').default
     SarPopout: typeof import('./components/popout/popout').default
     SarPopoutInput: typeof import('./components/popout-input/popout-input').default

package/index.d.ts

@@ -58,6 +58,7 @@ export * from './components/pagination';
 export * from './components/password-input';
 export * from './components/picker';
 export * from './components/picker-input';
+export * from './components/picker-item';
 export * from './components/picker-popout';
 export * from './components/popout';
 export * from './components/popout-input';

package/index.js

@@ -58,6 +58,7 @@ export * from './components/pagination';
 export * from './components/password-input';
 export * from './components/picker';
 export * from './components/picker-input';
+export * from './components/picker-item';
 export * from './components/picker-popout';
 export * from './components/popout';
 export * from './components/popout-input';

package/package.json

@@ -2,7 +2,7 @@
   "id": "sard-uniapp",
   "name": "sard-uniapp",
   "displayName": "sard-uniapp",
-  "version": "1.16.0",
+  "version": "1.17.0",
   "description": "sard-uniapp 是一套基于 Uniapp + Vue3 框架开发的兼容多端的 UI 组件库",
   "main": "index.js",
   "scripts": {
@@ -96,7 +96,7 @@
     "@dcloudio/uni-quickapp-webview": "3.0.0-4060420250429001",
     "@dcloudio/uni-stacktracey": "3.0.0-4060420250429001",
     "@dcloudio/vite-plugin-uni": "3.0.0-4060420250429001",
-    "@esbuild/darwin-x64": "0.20.2",
+    "@esbuild/darwin-x64": "0.25.4",
     "@gunny/perf-test": "^0.1.3",
     "@rollup/rollup-darwin-x64": "^4.24.0",
     "@types/inquirer": "^9.0.7",