sard-uniapp 1.24.6 → 1.25.0

package/components/waterfall/common.d.ts

@@ -8,9 +8,41 @@ export interface WaterfallProps {
     rowGap?: number;
 }
 export declare const defaultWaterfallProps: {
-    columns: number;
-    columnGap: number;
-    rowGap: number;
+    rootStyle?: (string | false | ((props: {
+        rootStyle: StyleValue;
+        rootClass: string;
+        columns: number;
+        columnGap: number;
+        rowGap: number;
+    }) => string | false | import("vue").CSSProperties | StyleValue[]) | null) | undefined;
+    rootClass?: (string | ((props: {
+        rootStyle: StyleValue;
+        rootClass: string;
+        columns: number;
+        columnGap: number;
+        rowGap: number;
+    }) => string)) | undefined;
+    columns?: (number | ((props: {
+        rootStyle: StyleValue;
+        rootClass: string;
+        columns: number;
+        columnGap: number;
+        rowGap: number;
+    }) => number)) | undefined;
+    columnGap?: (number | ((props: {
+        rootStyle: StyleValue;
+        rootClass: string;
+        columns: number;
+        columnGap: number;
+        rowGap: number;
+    }) => number)) | undefined;
+    rowGap?: (number | ((props: {
+        rootStyle: StyleValue;
+        rootClass: string;
+        columns: number;
+        columnGap: number;
+        rowGap: number;
+    }) => number)) | undefined;
 };
 export interface WaterfallSlots {
     default?(props: Record<string, never>): any;

package/components/waterfall/waterfall.d.ts

@@ -10,6 +10,8 @@ declare const __VLS_component: import("vue").DefineComponent<WaterfallProps, {
     onLoad?: (() => any) | undefined;
     onLoadstart?: (() => any) | undefined;
 }>, {
+    rootStyle: string | false | import("vue").CSSProperties | import("vue").StyleValue[] | null;
+    rootClass: string;
     columns: number;
     columnGap: number;
     rowGap: number;

package/components/watermark/common.d.ts

@@ -21,11 +21,149 @@ export interface WatermarkProps {
     offset?: [number, number];
 }
 export declare const defaultWatermarkProps: {
-    width: number;
-    height: number;
-    rotate: number;
-    zIndex: number;
-    gap: () => NonNullable<WatermarkProps["gap"]>;
+    rootStyle?: (string | false | ((props: {
+        rootStyle: StyleValue;
+        rootClass: string;
+        width: number;
+        height: number;
+        rotate: number;
+        zIndex: number;
+        image: string;
+        content: string | string[];
+        font: WatermarkFont;
+        gap: [number, number];
+        offset: [number, number];
+    }) => string | false | import("vue").CSSProperties | StyleValue[]) | null) | undefined;
+    rootClass?: (string | ((props: {
+        rootStyle: StyleValue;
+        rootClass: string;
+        width: number;
+        height: number;
+        rotate: number;
+        zIndex: number;
+        image: string;
+        content: string | string[];
+        font: WatermarkFont;
+        gap: [number, number];
+        offset: [number, number];
+    }) => string)) | undefined;
+    width?: (number | ((props: {
+        rootStyle: StyleValue;
+        rootClass: string;
+        width: number;
+        height: number;
+        rotate: number;
+        zIndex: number;
+        image: string;
+        content: string | string[];
+        font: WatermarkFont;
+        gap: [number, number];
+        offset: [number, number];
+    }) => number)) | undefined;
+    height?: (number | ((props: {
+        rootStyle: StyleValue;
+        rootClass: string;
+        width: number;
+        height: number;
+        rotate: number;
+        zIndex: number;
+        image: string;
+        content: string | string[];
+        font: WatermarkFont;
+        gap: [number, number];
+        offset: [number, number];
+    }) => number)) | undefined;
+    rotate?: (number | ((props: {
+        rootStyle: StyleValue;
+        rootClass: string;
+        width: number;
+        height: number;
+        rotate: number;
+        zIndex: number;
+        image: string;
+        content: string | string[];
+        font: WatermarkFont;
+        gap: [number, number];
+        offset: [number, number];
+    }) => number)) | undefined;
+    zIndex?: (number | ((props: {
+        rootStyle: StyleValue;
+        rootClass: string;
+        width: number;
+        height: number;
+        rotate: number;
+        zIndex: number;
+        image: string;
+        content: string | string[];
+        font: WatermarkFont;
+        gap: [number, number];
+        offset: [number, number];
+    }) => number)) | undefined;
+    image?: (string | ((props: {
+        rootStyle: StyleValue;
+        rootClass: string;
+        width: number;
+        height: number;
+        rotate: number;
+        zIndex: number;
+        image: string;
+        content: string | string[];
+        font: WatermarkFont;
+        gap: [number, number];
+        offset: [number, number];
+    }) => string)) | undefined;
+    content?: (string | ((props: {
+        rootStyle: StyleValue;
+        rootClass: string;
+        width: number;
+        height: number;
+        rotate: number;
+        zIndex: number;
+        image: string;
+        content: string | string[];
+        font: WatermarkFont;
+        gap: [number, number];
+        offset: [number, number];
+    }) => string | string[])) | undefined;
+    font?: ((props: {
+        rootStyle: StyleValue;
+        rootClass: string;
+        width: number;
+        height: number;
+        rotate: number;
+        zIndex: number;
+        image: string;
+        content: string | string[];
+        font: WatermarkFont;
+        gap: [number, number];
+        offset: [number, number];
+    }) => WatermarkFont) | undefined;
+    gap?: ((props: {
+        rootStyle: StyleValue;
+        rootClass: string;
+        width: number;
+        height: number;
+        rotate: number;
+        zIndex: number;
+        image: string;
+        content: string | string[];
+        font: WatermarkFont;
+        gap: [number, number];
+        offset: [number, number];
+    }) => [number, number]) | undefined;
+    offset?: ((props: {
+        rootStyle: StyleValue;
+        rootClass: string;
+        width: number;
+        height: number;
+        rotate: number;
+        zIndex: number;
+        image: string;
+        content: string | string[];
+        font: WatermarkFont;
+        gap: [number, number];
+        offset: [number, number];
+    }) => [number, number]) | undefined;
 };
 export declare const defaultWatermarkFont: Required<WatermarkFont>;
 export interface WatermarkSlots {

package/components/watermark/watermark.d.ts

@@ -1,11 +1,17 @@
 import { type WatermarkProps, type WatermarkSlots } from './common';
 declare function __VLS_template(): Readonly<WatermarkSlots> & WatermarkSlots;
 declare const __VLS_component: import("vue").DefineComponent<WatermarkProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<WatermarkProps> & Readonly<{}>, {
+    offset: [number, number];
+    image: string;
+    rootStyle: string | false | import("vue").CSSProperties | import("vue").StyleValue[] | null;
+    rootClass: string;
     height: number;
+    content: string | string[];
     gap: [number, number];
     width: number;
     zIndex: number;
     rotate: number;
+    font: import("./common").WatermarkFont;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, ReturnType<typeof __VLS_template>>;
 export default _default;

package/global.d.ts

@@ -53,6 +53,7 @@ declare module 'vue' {
     SarGrid: typeof import('./components/grid/grid').default
     SarGridItem: typeof import('./components/grid-item/grid-item').default
     SarIcon: typeof import('./components/icon/icon').default
+    SarImage: typeof import('./components/image/image').default
     SarIndexes: typeof import('./components/indexes/indexes').default
     SarIndexesAnchor: typeof import('./components/indexes-anchor/indexes-anchor').default
     SarInput: typeof import('./components/input/input').default

package/index.d.ts

@@ -45,6 +45,7 @@ export * from './components/form';
 export * from './components/form-plain';
 export * from './components/grid';
 export * from './components/icon';
+export * from './components/image';
 export * from './components/indexes';
 export * from './components/input';
 export * from './components/keyboard';

package/index.js

@@ -45,6 +45,7 @@ export * from './components/form';
 export * from './components/form-plain';
 export * from './components/grid';
 export * from './components/icon';
+export * from './components/image';
 export * from './components/indexes';
 export * from './components/input';
 export * from './components/keyboard';

package/index.scss

@@ -26,6 +26,7 @@
 @use './components/form/variables.scss' as *;
 @use './components/grid/variables.scss' as *;
 @use './components/icon/variables.scss' as *;
+@use './components/image/variables.scss' as *;
 @use './components/indexes/variables.scss' as *;
 @use './components/input/variables.scss' as *;
 @use './components/keyboard/variables.scss' as *;

package/package.json

@@ -2,7 +2,7 @@
   "id": "sard-uniapp",
   "name": "sard-uniapp",
   "displayName": "sard-uniapp",
-  "version": "1.24.6",
+  "version": "1.25.0",
   "description": "sard-uniapp 是一套基于 Uniapp + Vue3 框架开发的兼容多端的 UI 组件库",
   "main": "index.js",
   "scripts": {

package/use/useScrollSpy.js

@@ -42,7 +42,11 @@ export function useScrollSpy(options) {
             const item = anchorRectList.value.find((item) => item[0] === name);
             if (item) {
                 const offset = item[1].top;
-                scrollTop.value = offset - startOffset.value;
+                const nextScrollTop = offset - startOffset.value;
+                scrollTop.value =
+                    nextScrollTop === scrollTop.value
+                        ? nextScrollTop + 0.1
+                        : nextScrollTop;
                 lockScroll = true;
                 unLockScrollLater();
             }

package/utils/array.js

@@ -44,7 +44,7 @@ export function spreadEach(array, callback, startIndex = 0, direction = -1) {
  * 判断两数组是否相等，浅比较，元素个数和位置都要相等才为真。
  */
 export function arrayEqual(arr1, arr2) {
-    return arr1.length === arr1.length && arr1.every((el, i) => el === arr2[i]);
+    return arr1.length === arr2.length && arr1.every((el, i) => el === arr2[i]);
 }
 /**
  * 打乱并返回数组，会修改原数组。