sard-uniapp 1.24.5 → 1.24.7

package/components/pagination/common.d.ts

@@ -13,12 +13,149 @@ export interface PaginationProps {
     multiCount?: number;
 }
 export declare const defaultPaginationProps: {
-    total: number;
-    pageSize: number;
-    current: number;
-    pageButtonCount: number;
-    type: PaginationProps["type"];
-    multiCount: number;
+    rootStyle?: (string | false | ((props: {
+        rootStyle: StyleValue;
+        rootClass: string;
+        total: number;
+        pageSize: number;
+        current: number;
+        pageCount: number;
+        pageButtonCount: number;
+        hideOnSinglePage: boolean;
+        type: "simple" | "multi";
+        ellipsis: boolean;
+        multiCount: number;
+    }) => string | false | import("vue").CSSProperties | StyleValue[]) | null) | undefined;
+    rootClass?: (string | ((props: {
+        rootStyle: StyleValue;
+        rootClass: string;
+        total: number;
+        pageSize: number;
+        current: number;
+        pageCount: number;
+        pageButtonCount: number;
+        hideOnSinglePage: boolean;
+        type: "simple" | "multi";
+        ellipsis: boolean;
+        multiCount: number;
+    }) => string)) | undefined;
+    total?: (number | ((props: {
+        rootStyle: StyleValue;
+        rootClass: string;
+        total: number;
+        pageSize: number;
+        current: number;
+        pageCount: number;
+        pageButtonCount: number;
+        hideOnSinglePage: boolean;
+        type: "simple" | "multi";
+        ellipsis: boolean;
+        multiCount: number;
+    }) => number)) | undefined;
+    pageSize?: (number | ((props: {
+        rootStyle: StyleValue;
+        rootClass: string;
+        total: number;
+        pageSize: number;
+        current: number;
+        pageCount: number;
+        pageButtonCount: number;
+        hideOnSinglePage: boolean;
+        type: "simple" | "multi";
+        ellipsis: boolean;
+        multiCount: number;
+    }) => number)) | undefined;
+    current?: (number | ((props: {
+        rootStyle: StyleValue;
+        rootClass: string;
+        total: number;
+        pageSize: number;
+        current: number;
+        pageCount: number;
+        pageButtonCount: number;
+        hideOnSinglePage: boolean;
+        type: "simple" | "multi";
+        ellipsis: boolean;
+        multiCount: number;
+    }) => number)) | undefined;
+    pageCount?: (number | ((props: {
+        rootStyle: StyleValue;
+        rootClass: string;
+        total: number;
+        pageSize: number;
+        current: number;
+        pageCount: number;
+        pageButtonCount: number;
+        hideOnSinglePage: boolean;
+        type: "simple" | "multi";
+        ellipsis: boolean;
+        multiCount: number;
+    }) => number)) | undefined;
+    pageButtonCount?: (number | ((props: {
+        rootStyle: StyleValue;
+        rootClass: string;
+        total: number;
+        pageSize: number;
+        current: number;
+        pageCount: number;
+        pageButtonCount: number;
+        hideOnSinglePage: boolean;
+        type: "simple" | "multi";
+        ellipsis: boolean;
+        multiCount: number;
+    }) => number)) | undefined;
+    hideOnSinglePage?: (boolean | ((props: {
+        rootStyle: StyleValue;
+        rootClass: string;
+        total: number;
+        pageSize: number;
+        current: number;
+        pageCount: number;
+        pageButtonCount: number;
+        hideOnSinglePage: boolean;
+        type: "simple" | "multi";
+        ellipsis: boolean;
+        multiCount: number;
+    }) => boolean)) | undefined;
+    type?: ("multi" | "simple" | ((props: {
+        rootStyle: StyleValue;
+        rootClass: string;
+        total: number;
+        pageSize: number;
+        current: number;
+        pageCount: number;
+        pageButtonCount: number;
+        hideOnSinglePage: boolean;
+        type: "simple" | "multi";
+        ellipsis: boolean;
+        multiCount: number;
+    }) => "multi" | "simple")) | undefined;
+    ellipsis?: (boolean | ((props: {
+        rootStyle: StyleValue;
+        rootClass: string;
+        total: number;
+        pageSize: number;
+        current: number;
+        pageCount: number;
+        pageButtonCount: number;
+        hideOnSinglePage: boolean;
+        type: "simple" | "multi";
+        ellipsis: boolean;
+        multiCount: number;
+    }) => boolean)) | undefined;
+    multiCount?: (number | ((props: {
+        rootStyle: StyleValue;
+        rootClass: string;
+        total: number;
+        pageSize: number;
+        current: number;
+        pageCount: number;
+        pageButtonCount: number;
+        hideOnSinglePage: boolean;
+        type: "simple" | "multi";
+        ellipsis: boolean;
+        multiCount: number;
+    }) => number)) | undefined;
 };
 export interface PaginationSlots {
     prev?(props: Record<string, never>): any;

package/components/pagination/index.scss

@@ -28,7 +28,7 @@
     @include m(current) {
       z-index: 3;
       color: var(--sar-pagination-item-current-color);
-      background-color: var(--sar-pagination-item-current-bg);
+      background: var(--sar-pagination-item-current-bg);
       border-color: var(--sar-pagination-item-current-border-color);
     }
 
@@ -38,7 +38,7 @@
 
     @include m-not(disabled, current) {
       &:active {
-        background-color: var(--sar-pagination-item-active-bg);
+        background: var(--sar-pagination-item-active-bg);
       }
     }
   }

package/components/pagination/pagination.d.ts

@@ -7,11 +7,16 @@ declare const __VLS_component: import("vue").DefineComponent<PaginationProps, {}
     onChange?: ((page: number) => any) | undefined;
     "onUpdate:current"?: ((page: number) => any) | undefined;
 }>, {
+    rootStyle: string | false | import("vue").CSSProperties | import("vue").StyleValue[] | null;
+    rootClass: string;
     type: "simple" | "multi";
     total: number;
-    current: number;
     pageSize: number;
+    current: number;
+    pageCount: number;
     pageButtonCount: number;
+    hideOnSinglePage: boolean;
+    ellipsis: boolean;
     multiCount: number;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, ReturnType<typeof __VLS_template>>;

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

@@ -14,9 +14,174 @@ export interface PasswordInputProps {
     validateEvent?: boolean;
 }
 export declare const defaultPasswordInputProps: {
-    length: number;
-    type: PasswordInputProps["type"];
-    validateEvent: boolean;
+    rootStyle?: (string | false | ((props: {
+        rootStyle: StyleValue;
+        rootClass: string;
+        modelValue: string;
+        length: number;
+        type: "border" | "underline";
+        gap: number | string;
+        plainText: boolean;
+        focused: boolean;
+        customKeyboard: boolean;
+        disabled: boolean;
+        readonly: boolean;
+        validateEvent: boolean;
+    }) => string | false | import("vue").CSSProperties | StyleValue[]) | null) | undefined;
+    rootClass?: (string | ((props: {
+        rootStyle: StyleValue;
+        rootClass: string;
+        modelValue: string;
+        length: number;
+        type: "border" | "underline";
+        gap: number | string;
+        plainText: boolean;
+        focused: boolean;
+        customKeyboard: boolean;
+        disabled: boolean;
+        readonly: boolean;
+        validateEvent: boolean;
+    }) => string)) | undefined;
+    modelValue?: (string | ((props: {
+        rootStyle: StyleValue;
+        rootClass: string;
+        modelValue: string;
+        length: number;
+        type: "border" | "underline";
+        gap: number | string;
+        plainText: boolean;
+        focused: boolean;
+        customKeyboard: boolean;
+        disabled: boolean;
+        readonly: boolean;
+        validateEvent: boolean;
+    }) => string)) | undefined;
+    length?: (number | ((props: {
+        rootStyle: StyleValue;
+        rootClass: string;
+        modelValue: string;
+        length: number;
+        type: "border" | "underline";
+        gap: number | string;
+        plainText: boolean;
+        focused: boolean;
+        customKeyboard: boolean;
+        disabled: boolean;
+        readonly: boolean;
+        validateEvent: boolean;
+    }) => number)) | undefined;
+    type?: ("border" | "underline" | ((props: {
+        rootStyle: StyleValue;
+        rootClass: string;
+        modelValue: string;
+        length: number;
+        type: "border" | "underline";
+        gap: number | string;
+        plainText: boolean;
+        focused: boolean;
+        customKeyboard: boolean;
+        disabled: boolean;
+        readonly: boolean;
+        validateEvent: boolean;
+    }) => "border" | "underline")) | undefined;
+    gap?: (string | number | ((props: {
+        rootStyle: StyleValue;
+        rootClass: string;
+        modelValue: string;
+        length: number;
+        type: "border" | "underline";
+        gap: number | string;
+        plainText: boolean;
+        focused: boolean;
+        customKeyboard: boolean;
+        disabled: boolean;
+        readonly: boolean;
+        validateEvent: boolean;
+    }) => string | number)) | undefined;
+    plainText?: (boolean | ((props: {
+        rootStyle: StyleValue;
+        rootClass: string;
+        modelValue: string;
+        length: number;
+        type: "border" | "underline";
+        gap: number | string;
+        plainText: boolean;
+        focused: boolean;
+        customKeyboard: boolean;
+        disabled: boolean;
+        readonly: boolean;
+        validateEvent: boolean;
+    }) => boolean)) | undefined;
+    focused?: (boolean | ((props: {
+        rootStyle: StyleValue;
+        rootClass: string;
+        modelValue: string;
+        length: number;
+        type: "border" | "underline";
+        gap: number | string;
+        plainText: boolean;
+        focused: boolean;
+        customKeyboard: boolean;
+        disabled: boolean;
+        readonly: boolean;
+        validateEvent: boolean;
+    }) => boolean)) | undefined;
+    customKeyboard?: (boolean | ((props: {
+        rootStyle: StyleValue;
+        rootClass: string;
+        modelValue: string;
+        length: number;
+        type: "border" | "underline";
+        gap: number | string;
+        plainText: boolean;
+        focused: boolean;
+        customKeyboard: boolean;
+        disabled: boolean;
+        readonly: boolean;
+        validateEvent: boolean;
+    }) => boolean)) | undefined;
+    disabled?: (boolean | ((props: {
+        rootStyle: StyleValue;
+        rootClass: string;
+        modelValue: string;
+        length: number;
+        type: "border" | "underline";
+        gap: number | string;
+        plainText: boolean;
+        focused: boolean;
+        customKeyboard: boolean;
+        disabled: boolean;
+        readonly: boolean;
+        validateEvent: boolean;
+    }) => boolean)) | undefined;
+    readonly?: (boolean | ((props: {
+        rootStyle: StyleValue;
+        rootClass: string;
+        modelValue: string;
+        length: number;
+        type: "border" | "underline";
+        gap: number | string;
+        plainText: boolean;
+        focused: boolean;
+        customKeyboard: boolean;
+        disabled: boolean;
+        readonly: boolean;
+        validateEvent: boolean;
+    }) => boolean)) | undefined;
+    validateEvent?: (boolean | ((props: {
+        rootStyle: StyleValue;
+        rootClass: string;
+        modelValue: string;
+        length: number;
+        type: "border" | "underline";
+        gap: number | string;
+        plainText: boolean;
+        focused: boolean;
+        customKeyboard: boolean;
+        disabled: boolean;
+        readonly: boolean;
+        validateEvent: boolean;
+    }) => boolean)) | undefined;
 };
 export interface PasswordInputEmits {
     (e: 'update:model-value', value: string): void;

package/components/password-input/index.scss

@@ -28,17 +28,16 @@
     width: var(--sar-password-input-ciphertext-size);
     height: var(--sar-password-input-ciphertext-size);
     border-radius: var(--sar-rounded-full);
-    background-color: var(--sar-password-input-ciphertext-bg);
+    background: var(--sar-password-input-ciphertext-bg);
   }
 
   @include e(cursor) {
     @include universal;
     width: var(--sar-password-input-cursor-width);
     height: var(--sar-password-input-cursor-height);
-    background-color: var(--sar-password-input-cursor-color);
-    animation: var(--sar-password-input-cursor-animation-duration) #{bem-ns(
-        password-input-cursor-flicker
-      )} infinite;
+    background: var(--sar-password-input-cursor-color);
+    animation: var(--sar-password-input-cursor-animation-duration)
+      #{bem-ns(password-input-cursor-flicker)} infinite;
   }
 
   @keyframes #{bem-ns(password-input-cursor-flicker)} {
@@ -128,11 +127,11 @@
     color: var(--sar-disabled-color);
 
     @include e(item) {
-      background-color: var(--sar-disabled-shallow-bg);
+      background: var(--sar-disabled-shallow-bg);
     }
 
     @include e(ciphertext) {
-      background-color: var(--sar-disabled-color);
+      background: var(--sar-disabled-color);
     }
   }
 }

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

@@ -9,7 +9,16 @@ declare const _default: import("vue").DefineComponent<PasswordInputProps, {}, {}
     "onUpdat:focused"?: ((focused: boolean) => any) | undefined;
 }>, {
     length: number;
+    rootStyle: string | false | import("vue").CSSProperties | import("vue").StyleValue[] | null;
+    rootClass: string;
+    modelValue: string;
     type: "border" | "underline";
+    disabled: boolean;
+    readonly: boolean;
     validateEvent: boolean;
+    focused: boolean;
+    gap: number | string;
+    plainText: boolean;
+    customKeyboard: boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 export default _default;

package/components/picker/common.d.ts

@@ -19,7 +19,52 @@ export interface PickerProps {
 }
 export declare const defaultPickerProps: () => {
     columns: () => never[];
-    immediateChange: boolean;
+    rootStyle?: (string | false | ((props: {
+        rootStyle: StyleValue;
+        rootClass: string;
+        columns: PickerOption[] | PickerOption[][];
+        optionKeys: PickerOptionKeys;
+        modelValue: any;
+        immediateChange: boolean;
+        internalCustom: number;
+    }) => string | false | import("vue").CSSProperties | StyleValue[]) | null) | undefined;
+    rootClass?: (string | ((props: {
+        rootStyle: StyleValue;
+        rootClass: string;
+        columns: PickerOption[] | PickerOption[][];
+        optionKeys: PickerOptionKeys;
+        modelValue: any;
+        immediateChange: boolean;
+        internalCustom: number;
+    }) => string)) | undefined;
+    optionKeys?: ((props: {
+        rootStyle: StyleValue;
+        rootClass: string;
+        columns: PickerOption[] | PickerOption[][];
+        optionKeys: PickerOptionKeys;
+        modelValue: any;
+        immediateChange: boolean;
+        internalCustom: number;
+    }) => PickerOptionKeys) | undefined;
+    modelValue?: any;
+    immediateChange?: (boolean | ((props: {
+        rootStyle: StyleValue;
+        rootClass: string;
+        columns: PickerOption[] | PickerOption[][];
+        optionKeys: PickerOptionKeys;
+        modelValue: any;
+        immediateChange: boolean;
+        internalCustom: number;
+    }) => boolean)) | undefined;
+    internalCustom?: (number | ((props: {
+        rootStyle: StyleValue;
+        rootClass: string;
+        columns: PickerOption[] | PickerOption[][];
+        optionKeys: PickerOptionKeys;
+        modelValue: any;
+        immediateChange: boolean;
+        internalCustom: number;
+    }) => number)) | undefined;
 };
 export interface PickerSlots {
     custom?(props: {

package/components/picker/common.js

@@ -113,8 +113,9 @@ export function getInitialValue(columns, optionKeys) {
             ];
         case 'cascader': {
             const options = [];
+            recurse(columns, options);
             return [
-                getValueOrLabelByOption(recurse(columns, options), optionKeys.value),
+                options.map((option) => getValueOrLabelByOption(option, optionKeys.value)),
                 options,
             ];
         }

package/components/picker/picker.d.ts

@@ -7,8 +7,13 @@ declare const __VLS_component: import("vue").DefineComponent<PickerProps, {}, {}
     "onUpdate:model-value"?: ((value: any, selectedOptions: PickerOption[], indexes: number[]) => any) | undefined;
     onChange?: ((value: any, selectedOptions: PickerOption[], indexes: number[]) => any) | undefined;
 }>, {
+    rootStyle: string | false | import("vue").CSSProperties | import("vue").StyleValue[] | null;
+    rootClass: string;
+    modelValue: any;
     columns: PickerOption[] | PickerOption[][];
+    optionKeys: import("./common").PickerOptionKeys;
     immediateChange: boolean;
+    internalCustom: number;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, ReturnType<typeof __VLS_template>>;
 export default _default;

package/components/picker/picker.vue

@@ -39,7 +39,8 @@ import {
   toArray,
   arrayEqual,
   isNumber,
-  isEmptyBinding
+  isEmptyBinding,
+  isEmptyArray
 } from "../../utils";
 import {
   defaultOptionKeys,
@@ -112,17 +113,12 @@ export default  _defineComponent({
         columnIndexes.value = indexes;
       }
     };
-    watch(
-      [innerValue, () => props.columns, fieldKeys],
-      () => {
-        if (!isEmptyBinding(innerValue.value)) {
-          updateColumnIndexes();
-        }
-      },
-      {
-        immediate: true
+    updateColumnIndexes();
+    watch([innerValue, () => props.columns, fieldKeys], () => {
+      if (!isEmptyBinding(innerValue.value) && !isEmptyArray(innerValue.value)) {
+        updateColumnIndexes();
       }
-    );
+    });
     const onChange = (event) => {
       if (!props.columns || props.columns.length === 0) {
         return;
@@ -130,10 +126,11 @@ export default  _defineComponent({
       let indexes = event.detail.value;
       if (indexes.some((index) => index === Infinity)) {
         nextTick(() => {
-          columnIndexes.value = isEmptyBinding(innerValue.value) ? columnIndexes.value.map(() => 0) : [...columnIndexes.value];
+          columnIndexes.value = isEmptyBinding(innerValue.value) || isEmptyArray(innerValue.value) ? columnIndexes.value.map(() => 0) : [...columnIndexes.value];
         });
         return;
       }
+      indexes = renderedColumns.value.map((_, index) => indexes[index] || 0);
       if (columnsType.value === "cascader") {
         let startIndex = -1;
         const nextIndexes = [];
@@ -195,7 +192,7 @@ export default  _defineComponent({
     watch(
       [() => props.columns, innerValue],
       ([newColumns, newValue], [oldColumns, oldValue]) => {
-        if (newColumns !== oldColumns || newValue !== oldValue && columnsType.value === "cascader" && !isEmptyBinding(newValue) && (!Array.isArray(newValue) || newValue.length > 0)) {
+        if (newColumns !== oldColumns || newValue !== oldValue && columnsType.value === "cascader" && !isEmptyBinding(newValue) && !isEmptyArray(newValue)) {
           updateRenderedColumns();
         }
       }
@@ -203,7 +200,7 @@ export default  _defineComponent({
     watch(
       () => props.modelValue,
       () => {
-        if (isEmptyBinding(props.modelValue)) {
+        if (isEmptyBinding(props.modelValue) || isEmptyArray(props.modelValue)) {
           updateColumnIndexes();
           updateRenderedColumns();
         }

package/components/picker-input/README.md

@@ -25,6 +25,10 @@ import PickerInput from 'sard-uniapp/components/picker-input/picker-input.vue'
 
 @code('${DEMO_PATH}/picker-input/demo/Basic.vue')
 
+### 级联选择
+
+@code('${DEMO_PATH}/picker-input/demo/Cascaded.vue')
+
 ## API
 
 ### PickerInputProps