sard-uniapp 1.1.6 → 1.2.0

package/README.md

@@ -38,4 +38,45 @@
 
 ## 开源协议
 
-本项目基于 <a href="https://zh.wikipedia.org/wiki/MIT%E8%A8%B1%E5%8F%AF%E8%AD%89" target="_blank">MIT</a> 协议，请自由地享受和参与开源。
+本项目基于 [MIT](https://zh.wikipedia.org/wiki/MIT%E8%A8%B1%E5%8F%AF%E8%AD%89) 协议，请自由地享受和参与开源。
+
+## 如何维护
+
+### 克隆仓库到本地
+
+```bash
+git clone https://github.com/sutras/sard-uniapp.git
+```
+
+### 全局安装 pnpm（如果未安装）
+
+```bash
+npm install -g pnpm
+```
+
+### 使用 pnpm 安装依赖
+
+```bash
+pnpm install
+```
+
+### 修改 @dcloudio 源码
+
+安装完依赖，需要修改@dcloudio 里面的一个地方，具体参考以下文档中的第一个问题（“热更新无效”）：
+
+[https://zhuanlan.zhihu.com/p/665000866](https://zhuanlan.zhihu.com/p/665000866)
+
+### 运行开发环境
+
+```bash
+pnpm run dev
+```
+
+运行上面命令后会生成四个链接：
+
+```bash
+Local:   http://localhost:5173/sard-uniapp-docs/mobile/    （演示）
+Network: http://192.168.1.121:5173/sard-uniapp-docs/mobile/ (局域网演示）
+Local:   http://localhost:7761/sard-uniapp-docs/           （文档）
+Network: http://192.168.1.121:7761/sard-uniapp-docs/       （局域网文档）
+```

package/changelog.md

@@ -1,3 +1,21 @@
+# [1.2.0](https://github.com/sutras/sard-uniapp/compare/v1.1.7...v1.2.0) (2024-07-11)
+
+
+### Features
+
+* 新增Marquee, LuckyDraw, CountTo组件 ([61db992](https://github.com/sutras/sard-uniapp/commit/61db992aea95658b714ae4182526dff10ad54491))
+
+
+
+## [1.1.7](https://github.com/sutras/sard-uniapp/compare/v1.1.6...v1.1.7) (2024-05-20)
+
+
+### Bug Fixes
+
+* 修复表单内组件的禁用和只读问题 close [#27](https://github.com/sutras/sard-uniapp/issues/27) ([eee674c](https://github.com/sutras/sard-uniapp/commit/eee674c156687b25893cd0456b7050440ea1ad4d))
+
+
+
 ## [1.1.6](https://github.com/sutras/sard-uniapp/compare/v1.1.5...v1.1.6) (2024-05-19)
 
 

package/components/_template/_template.d.ts

@@ -1,8 +1,10 @@
-import { type _TemplateSlots, type _TemplateProps } from './common';
-declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<__VLS_WithDefaults<__VLS_TypePropsToOption<_TemplateProps>, {}>, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
-    click: (...args: any[]) => void;
+import { type _TemplateProps, type _TemplateSlots } from './common';
+declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<__VLS_WithDefaults<__VLS_TypePropsToOption<_TemplateProps>, {}>, {
+    reset: () => void;
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+    click: (event: any) => void;
 }, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToOption<_TemplateProps>, {}>>> & {
-    onClick?: ((...args: any[]) => any) | undefined;
+    onClick?: ((event: any) => any) | undefined;
 }, {}, {}>, Readonly<_TemplateSlots> & _TemplateSlots>;
 export default _default;
 type __VLS_WithDefaults<P, D> = {

package/components/_template/_template.vue

@@ -22,9 +22,12 @@ export default  _defineComponent({
   },
   emits: ["click"],
   setup(__props, { expose: __expose }) {
-    __expose();
     const props = __props;
     const bem = createBem("_template");
+    __expose({
+      reset: () => {
+      }
+    });
     const _templateClass = computed(() => {
       return classNames(bem.b(), props.rootClass);
     });

package/components/_template/common.d.ts

@@ -9,3 +9,6 @@ export interface _TemplateSlots {
 export interface _TemplateEmits {
     (e: 'click', event: any): void;
 }
+export interface _TemplateExpose {
+    reset: () => void;
+}

package/components/_template/index.d.ts

@@ -1 +1 @@
-export {} from './common';
+export type { _TemplateProps, _TemplateSlots, _TemplateEmits, _TemplateExpose, } from './common';

package/components/button/button.vue

@@ -59,7 +59,7 @@ export default  _defineComponent({
     const bem = createBem("button");
     const formContext = useFormContext();
     const isDisabled = computed(() => {
-      return formContext?.disabled ?? props.disabled;
+      return formContext?.disabled || props.disabled;
     });
     const onClick = (event) => {
       emit("click", event);

package/components/checkbox/checkbox.d.ts

@@ -1,22 +1,16 @@
 import { type CheckboxProps, type CheckboxSlots } from './common';
 declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<__VLS_WithDefaults<__VLS_TypePropsToOption<CheckboxProps>, {
-    disabled: undefined;
-    readonly: undefined;
     validateEvent: boolean;
 }>, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     click: (event: any) => void;
     "update:checked": (checked: boolean) => void;
 }, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToOption<CheckboxProps>, {
-    disabled: undefined;
-    readonly: undefined;
     validateEvent: boolean;
 }>>> & {
     onClick?: ((event: any) => any) | undefined;
     "onUpdate:checked"?: ((checked: boolean) => any) | undefined;
 }, {
-    readonly: boolean;
     validateEvent: boolean;
-    disabled: boolean;
 }, {}>, Readonly<CheckboxSlots> & CheckboxSlots>;
 export default _default;
 type __VLS_WithDefaults<P, D> = {

package/components/checkbox/checkbox.vue

@@ -53,10 +53,10 @@ export default  _defineComponent({
     const formContext = useFormContext();
     const formItemContext = useFormItemContext();
     const isDisabled = computed(() => {
-      return formContext?.disabled ?? props.disabled ?? groupContext?.disabled;
+      return formContext?.disabled || groupContext?.disabled || props.disabled;
     });
     const isReadonly = computed(() => {
-      return formContext?.readonly ?? props.readonly ?? groupContext?.readonly;
+      return formContext?.readonly || groupContext?.readonly || props.readonly;
     });
     const innerChecked = ref(
       groupContext ? groupContext.value.includes(props.value) : props.checked

package/components/checkbox/common.d.ts

@@ -14,8 +14,6 @@ export interface CheckboxProps {
     validateEvent?: boolean;
 }
 export declare const checkboxPropsDefaults: {
-    disabled: undefined;
-    readonly: undefined;
     validateEvent: boolean;
 };
 export interface CheckboxSlots {

package/components/checkbox/common.js

@@ -1,9 +1,5 @@
 import { defaultConfig } from '../config';
-export const checkboxPropsDefaults = {
-    ...defaultConfig.checkbox,
-    disabled: undefined,
-    readonly: undefined,
-};
+export const checkboxPropsDefaults = defaultConfig.checkbox;
 export const checkboxGroupPropsDefaults = defaultConfig.checkboxGroup;
 export const checkboxContextSymbol = Symbol('checkbox-context');
 export const mapTypeIcon = {

package/components/config/index.d.ts

@@ -41,6 +41,12 @@ export declare const defaultConfig: {
         autoStart: boolean;
         format: string;
     };
+    countTo: {
+        value: number;
+        precision: number;
+        separatorDigit: number;
+        duration: number;
+    };
     datetimePicker: {
         type: string;
     };
@@ -78,6 +84,9 @@ export declare const defaultConfig: {
         showError: boolean;
         scrollDuration: number;
     };
+    formItem: {
+        showError: boolean;
+    };
     grid: {
         columns: number;
         direction: "vertical";
@@ -107,6 +116,11 @@ export declare const defaultConfig: {
     loading: {
         type: "circular";
     };
+    marquee: {
+        direction: "vertical";
+        delay: number;
+        speed: number;
+    };
     noticeBar: {
         delay: number;
         speed: number;
@@ -195,6 +209,7 @@ export declare const defaultConfig: {
     };
     search: {
         shape: "square";
+        focus: boolean;
     };
     shareSheet: {
         overlayClosable: boolean;
@@ -354,6 +369,12 @@ export declare function useConfigContext(): DeepPartial<{
         autoStart: boolean;
         format: string;
     };
+    countTo: {
+        value: number;
+        precision: number;
+        separatorDigit: number;
+        duration: number;
+    };
     datetimePicker: {
         type: string;
     };
@@ -391,6 +412,9 @@ export declare function useConfigContext(): DeepPartial<{
         showError: boolean;
         scrollDuration: number;
     };
+    formItem: {
+        showError: boolean;
+    };
     grid: {
         columns: number;
         direction: "vertical";
@@ -420,6 +444,11 @@ export declare function useConfigContext(): DeepPartial<{
     loading: {
         type: "circular";
     };
+    marquee: {
+        direction: "vertical";
+        delay: number;
+        speed: number;
+    };
     noticeBar: {
         delay: number;
         speed: number;
@@ -508,6 +537,7 @@ export declare function useConfigContext(): DeepPartial<{
     };
     search: {
         shape: "square";
+        focus: boolean;
     };
     shareSheet: {
         overlayClosable: boolean;

package/components/config/index.js

@@ -42,6 +42,12 @@ export const defaultConfig = {
         autoStart: true,
         format: 'HH:mm:ss',
     },
+    countTo: {
+        value: 0,
+        precision: 0,
+        separatorDigit: 3,
+        duration: 2000,
+    },
     datetimePicker: {
         type: 'yMd',
     },
@@ -79,6 +85,9 @@ export const defaultConfig = {
         showError: true,
         scrollDuration: 150,
     },
+    formItem: {
+        showError: true,
+    },
     grid: {
         columns: 4,
         direction: 'vertical',
@@ -108,6 +117,11 @@ export const defaultConfig = {
     loading: {
         type: 'circular',
     },
+    marquee: {
+        direction: 'vertical',
+        delay: 1000,
+        speed: 50,
+    },
     noticeBar: {
         delay: 1000,
         speed: 50,
@@ -196,6 +210,7 @@ export const defaultConfig = {
     },
     search: {
         shape: 'square',
+        focus: false,
     },
     shareSheet: {
         overlayClosable: true,

package/components/count-to/common.d.ts

@@ -0,0 +1,13 @@
+export interface CountToProps {
+    value?: number;
+    precision?: number;
+    separator?: string;
+    separatorDigit?: number;
+    duration?: number;
+}
+export declare const countToPropsDefaults: {
+    value: number;
+    precision: number;
+    separatorDigit: number;
+    duration: number;
+};

package/components/count-to/common.js

@@ -0,0 +1,2 @@
+import { defaultConfig } from '../config';
+export const countToPropsDefaults = defaultConfig.countTo;

package/components/count-to/count-to.d.ts

@@ -0,0 +1,35 @@
+import { type CountToProps } from './common';
+declare const _default: import("vue").DefineComponent<__VLS_WithDefaults<__VLS_TypePropsToOption<CountToProps>, {
+    value: number;
+    precision: number;
+    separatorDigit: number;
+    duration: number;
+}>, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToOption<CountToProps>, {
+    value: number;
+    precision: number;
+    separatorDigit: number;
+    duration: number;
+}>>>, {
+    value: number;
+    duration: number;
+    precision: number;
+    separatorDigit: number;
+}, {}>;
+export default _default;
+type __VLS_WithDefaults<P, D> = {
+    [K in keyof Pick<P, keyof P>]: K extends keyof D ? __VLS_Prettify<P[K] & {
+        default: D[K];
+    }> : P[K];
+};
+type __VLS_Prettify<T> = {
+    [K in keyof T]: T[K];
+} & {};
+type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;
+type __VLS_TypePropsToOption<T> = {
+    [K in keyof T]-?: {} extends Pick<T, K> ? {
+        type: import('vue').PropType<__VLS_NonUndefinedable<T[K]>>;
+    } : {
+        type: import('vue').PropType<T[K]>;
+        required: true;
+    };
+};

package/components/count-to/count-to.vue

@@ -0,0 +1,67 @@
+<template>
+  {{ renderedNumer }}
+</template>
+
+<script>
+import { mergeDefaults as _mergeDefaults, defineComponent as _defineComponent } from "vue";
+import { computed, onUnmounted, ref, watch } from "vue";
+import { addSeparator } from "../../utils";
+import { countToPropsDefaults } from "./common";
+import { createAnimation } from "lwa";
+export default  _defineComponent({
+  ...{
+    options: {
+      virtualHost: true,
+      styleIsolation: "shared"
+    }
+  },
+  __name: "count-to",
+  props:  _mergeDefaults({
+    value: { type: Number, required: false },
+    precision: { type: Number, required: false },
+    separator: { type: String, required: false },
+    separatorDigit: { type: Number, required: false },
+    duration: { type: Number, required: false }
+  }, countToPropsDefaults),
+  setup(__props, { expose: __expose }) {
+    __expose();
+    const props = __props;
+    const number = ref(0);
+    let tl;
+    const renderedNumer = computed(() => {
+      const fixedNum = number.value.toFixed(props.precision);
+      return props.separator ? addSeparator(fixedNum, props.separator, props.separatorDigit) : fixedNum;
+    });
+    watch(
+      () => props.value,
+      () => {
+        tl?.pause();
+        tl = createAnimation(
+          number,
+          {
+            value: props.value
+          },
+          {
+            duration: props.duration,
+            easing: "easeOutQuint",
+            round: Math.pow(10, props.precision)
+          }
+        );
+      },
+      {
+        flush: "post",
+        immediate: true
+      }
+    );
+    onUnmounted(() => {
+      tl?.pause();
+    });
+    const __returned__ = { props, number, get tl() {
+      return tl;
+    }, set tl(v) {
+      tl = v;
+    }, renderedNumer };
+    return __returned__;
+  }
+});
+</script>

package/components/count-to/index.d.ts

@@ -0,0 +1 @@
+export type { CountToProps } from './common';

package/components/count-to/index.js

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

package/components/form/common.d.ts

@@ -24,6 +24,7 @@ export interface FormProps {
     labelAlign?: 'start' | 'center' | 'end';
     labelValign?: 'start' | 'center' | 'end';
     starPosition?: 'left' | 'right';
+    hideStar?: boolean;
     showError?: boolean;
     scrollToFirstError?: boolean;
     scrollIntoViewOptions?: ScrollIntoViewOptions;
@@ -58,8 +59,8 @@ export interface FormItemProps {
     labelAlign?: 'start' | 'center' | 'end';
     labelValign?: 'start' | 'center' | 'end';
     starPosition?: 'left' | 'right';
-    showStar?: boolean;
     label?: string;
+    hideStar?: boolean;
     required?: boolean | undefined;
     name?: FieldName;
     rules?: Rule | Rule[];
@@ -70,8 +71,7 @@ export interface FormItemProps {
 }
 export declare const formItemPropsDefaults: {
     required: undefined;
-    showError: undefined;
-    showStar: undefined;
+    showError: boolean;
 };
 export interface FormItemSlots {
     default?(props: Record<string, never>): any;
@@ -97,6 +97,7 @@ export interface FormContext {
     labelAlign: FormProps['labelAlign'];
     labelValign: FormProps['labelValign'];
     starPosition: FormProps['starPosition'];
+    hideStar: FormProps['hideStar'];
     showError: FormProps['showError'];
     scrollIntoViewOptions: FormProps['scrollIntoViewOptions'];
     disabled: FormProps['disabled'];

package/components/form/common.js

@@ -2,9 +2,8 @@ import { inject } from 'vue';
 import { defaultConfig } from '../config';
 export const formPropsDefaults = defaultConfig.form;
 export const formItemPropsDefaults = {
+    ...defaultConfig.formItem,
     required: undefined,
-    showError: undefined,
-    showStar: undefined,
 };
 export const formContextSymbol = Symbol('form-context');
 export const formItemContextSymbol = Symbol('form-item-context');

package/components/form/form.vue

@@ -41,6 +41,7 @@ export default  _defineComponent({
     labelAlign: { type: String, required: false },
     labelValign: { type: String, required: false },
     starPosition: { type: String, required: false },
+    hideStar: { type: Boolean, required: false },
     showError: { type: Boolean, required: false },
     scrollToFirstError: { type: Boolean, required: false },
     scrollIntoViewOptions: { type: Object, required: false },
@@ -141,6 +142,7 @@ export default  _defineComponent({
         labelAlign: toRef(props, "labelAlign"),
         labelValign: toRef(props, "labelValign"),
         starPosition: toRef(props, "starPosition"),
+        hideStar: toRef(props, "hideStar"),
         showError: toRef(props, "showError"),
         scrollIntoViewOptions: toRef(props, "scrollIntoViewOptions"),
         disabled: toRef(props, "disabled"),

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

@@ -1,8 +1,7 @@
 import { type FormItemProps, type FormItemSlots, type ValidateState } from '../form/common';
 declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<__VLS_WithDefaults<__VLS_TypePropsToOption<FormItemProps>, {
     required: undefined;
-    showError: undefined;
-    showStar: undefined;
+    showError: boolean;
 }>, {
     validate: (trigger?: string | string[] | undefined) => Promise<void>;
     reset: () => Promise<void>;
@@ -12,12 +11,10 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<__
     validateState: import("vue").Ref<ValidateState>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToOption<FormItemProps>, {
     required: undefined;
-    showError: undefined;
-    showStar: undefined;
+    showError: boolean;
 }>>>, {
     showError: boolean;
     required: boolean;
-    showStar: boolean;
 }, {}>, Readonly<FormItemSlots> & FormItemSlots>;
 export default _default;
 type __VLS_WithDefaults<P, D> = {

package/components/form-item/form-item.vue

@@ -70,8 +70,8 @@ export default  _defineComponent({
     labelAlign: { type: String, required: false },
     labelValign: { type: String, required: false },
     starPosition: { type: String, required: false },
-    showStar: { type: Boolean, required: false },
     label: { type: String, required: false },
+    hideStar: { type: Boolean, required: false },
     required: { type: Boolean, required: false, skipCheck: true },
     name: { type: [String, Number, Array], required: false },
     rules: { type: [Object, Array], required: false },
@@ -114,7 +114,7 @@ export default  _defineComponent({
       }
     );
     const shouldShowError = computed(() => {
-      return (props.showError ?? formContext.showError) && validateMessage.value;
+      return props.showError && formContext.showError && validateMessage.value;
     });
     const validateState = ref("");
     const mergedValidateTrigger = computed(() => {
@@ -163,7 +163,7 @@ export default  _defineComponent({
       return mergedRules.value.some((rule) => rule.required);
     });
     const shouldShowStar = computed(() => {
-      return isNullish(props.showStar) ? isRequired.value : props.showStar;
+      return !formContext.hideStar && !props.hideStar && isRequired.value;
     });
     const validate = async (trigger) => {
       if (isResetting || !props.name) {

package/components/grid/common.d.ts

@@ -20,6 +20,8 @@ export interface GridSlots {
 export interface GridItemProps {
     rootStyle?: StyleValue;
     rootClass?: string;
+    contentStyle?: StyleValue;
+    contentClass?: string;
     text?: string;
     icon?: string;
     iconSize?: string;

package/components/grid-item/grid-item.vue

@@ -1,7 +1,11 @@
 <template>
-  <view :class="classNames(bem.e('item'), rootClass)" :style="itemStyle">
+  <view :class="itemClass" :style="itemStyle">
     <view :class="bem.e('wrapper')">
-      <view :class="bem.e('content')" @click="onClick">
+      <view
+        :class="classNames(bem.e('content'), contentClass)"
+        :style="stringifyStyle(contentStyle)"
+        @click="onClick"
+      >
         <slot>
           <view :class="bem.e('icon')">
             <slot name="icon">
@@ -41,6 +45,8 @@ export default  _defineComponent({
   props: {
     rootStyle: { type: [Boolean, null, String, Object, Array], required: false, skipCheck: true },
     rootClass: { type: String, required: false },
+    contentStyle: { type: [Boolean, null, String, Object, Array], required: false, skipCheck: true },
+    contentClass: { type: String, required: false },
     text: { type: String, required: false },
     icon: { type: String, required: false },
     iconSize: { type: String, required: false },
@@ -60,6 +66,9 @@ export default  _defineComponent({
     const onClick = (event) => {
       emit("click", event);
     };
+    const itemClass = computed(() => {
+      return classNames(bem.e("item"), props.rootClass);
+    });
     const itemStyle = computed(() => {
       const width = 1 / context.columns * 100 + "%";
       const gutter = context.gutter;
@@ -75,7 +84,9 @@ export default  _defineComponent({
         props.rootStyle
       );
     });
-    const __returned__ = { props, emit, bem, context, onClick, itemStyle, get classNames() {
+    const __returned__ = { props, emit, bem, context, onClick, itemClass, itemStyle, get stringifyStyle() {
+      return stringifyStyle;
+    }, get classNames() {
       return classNames;
     }, SarIcon };
     return __returned__;

package/components/indexes/common.d.ts

@@ -13,6 +13,7 @@ export interface IndexesEmits {
 }
 export interface IndexesExpose {
     scrollTo: (name: string | number) => void;
+    update: () => void;
 }
 export interface IndexesAnchorProps {
     rootStyle?: StyleValue;

package/components/indexes/indexes.d.ts

@@ -1,6 +1,7 @@
 import { type IndexesProps, type IndexesSlots } from './common';
 declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<__VLS_WithDefaults<__VLS_TypePropsToOption<IndexesProps>, {}>, {
     scrollTo: (name: string | number) => void;
+    update: () => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     change: (name: string | number) => void;
 }, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToOption<IndexesProps>, {}>>> & {