sard-uniapp 1.1.6 → 1.1.7

package/changelog.md

@@ -1,3 +1,12 @@
+## [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/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

@@ -78,6 +78,9 @@ export declare const defaultConfig: {
         showError: boolean;
         scrollDuration: number;
     };
+    formItem: {
+        showError: boolean;
+    };
     grid: {
         columns: number;
         direction: "vertical";
@@ -391,6 +394,9 @@ export declare function useConfigContext(): DeepPartial<{
         showError: boolean;
         scrollDuration: number;
     };
+    formItem: {
+        showError: boolean;
+    };
     grid: {
         columns: number;
         direction: "vertical";

package/components/config/index.js

@@ -79,6 +79,9 @@ export const defaultConfig = {
         showError: true,
         scrollDuration: 150,
     },
+    formItem: {
+        showError: true,
+    },
     grid: {
         columns: 4,
         direction: 'vertical',

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/input/input.vue

@@ -172,10 +172,10 @@ export default  _defineComponent({
     const formContext = useFormContext();
     const formItemContext = useFormItemContext();
     const isDisabled = computed(() => {
-      return formContext?.disabled ?? props.disabled;
+      return formContext?.disabled || props.disabled;
     });
     const isReadonly = computed(() => {
-      return formContext?.readonly ?? props.readonly;
+      return formContext?.readonly || props.readonly;
     });
     const innerValue = ref(String(props.modelValue ?? ""));
     const setInnerValue = (value) => {

package/components/password-input/password-input.vue

@@ -71,10 +71,10 @@ export default  _defineComponent({
     const formContext = useFormContext();
     const formItemContext = useFormItemContext();
     const isDisabled = computed(() => {
-      return formContext?.disabled ?? props.disabled;
+      return formContext?.disabled || props.disabled;
     });
     const isReadonly = computed(() => {
-      return formContext?.readonly ?? props.readonly;
+      return formContext?.readonly || props.readonly;
     });
     const innerValue = ref(props.modelValue ?? "");
     watch(

package/components/popout-input/popout-input.vue

@@ -69,10 +69,10 @@ export default  _defineComponent({
     const bem = createBem("popout-input");
     const formContext = useFormContext();
     const isDisabled = computed(() => {
-      return formContext?.disabled ?? props.disabled;
+      return formContext?.disabled || props.disabled;
     });
     const isReadonly = computed(() => {
-      return formContext?.readonly ?? props.readonly;
+      return formContext?.readonly || props.readonly;
     });
     const innerValue = ref(props.modelValue);
     const setInnerValue = (value) => {

package/components/radio/common.d.ts

@@ -11,10 +11,6 @@ export interface RadioProps {
     type?: IconType;
     checkedColor?: string;
 }
-export declare const radioPropsDefaults: {
-    disabled: undefined;
-    readonly: undefined;
-};
 export interface RadioSlots {
     default?(props: Record<string, never>): any;
     icon?(props: {

package/components/radio/common.js

@@ -1,8 +1,4 @@
 import { defaultConfig } from '../config';
-export const radioPropsDefaults = {
-    disabled: undefined,
-    readonly: undefined,
-};
 export const radioGroupPropsDefaults = defaultConfig.radioGroup;
 export const radioContextSymbol = Symbol('radio-context');
 export const mapTypeIcon = {

package/components/radio/radio.d.ts

@@ -1,18 +1,9 @@
 import { type RadioProps, type RadioSlots } from './common';
-declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<__VLS_WithDefaults<__VLS_TypePropsToOption<RadioProps>, {
-    disabled: undefined;
-    readonly: undefined;
-}>, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<__VLS_WithDefaults<__VLS_TypePropsToOption<RadioProps>, {}>, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     click: (event: any) => void;
-}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToOption<RadioProps>, {
-    disabled: undefined;
-    readonly: undefined;
-}>>> & {
+}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToOption<RadioProps>, {}>>> & {
     onClick?: ((event: any) => any) | undefined;
-}, {
-    readonly: boolean;
-    disabled: boolean;
-}, {}>, Readonly<RadioSlots> & RadioSlots>;
+}, {}, {}>, Readonly<RadioSlots> & RadioSlots>;
 export default _default;
 type __VLS_WithDefaults<P, D> = {
     [K in keyof Pick<P, keyof P>]: K extends keyof D ? __VLS_Prettify<P[K] & {

package/components/radio/radio.vue

@@ -12,13 +12,12 @@
 </template>
 
 <script>
-import { mergeDefaults as _mergeDefaults, defineComponent as _defineComponent } from "vue";
+import { defineComponent as _defineComponent } from "vue";
 import { computed, provide, inject } from "vue";
 import { classNames, createBem, stringifyStyle } from "../../utils";
 import {
   radioContextSymbol,
-  mapTypeIcon,
-  radioPropsDefaults
+  mapTypeIcon
 } from "./common";
 import SarIcon from "../icon/icon.vue";
 import { useFormContext } from "../form/common";
@@ -30,7 +29,7 @@ export default  _defineComponent({
     }
   },
   __name: "radio",
-  props:  _mergeDefaults({
+  props: {
     rootStyle: { type: [Boolean, null, String, Object, Array], required: false, skipCheck: true },
     rootClass: { type: String, required: false },
     value: { type: null, required: false },
@@ -40,7 +39,7 @@ export default  _defineComponent({
     size: { type: String, required: false },
     type: { type: String, required: false },
     checkedColor: { type: String, required: false }
-  }, radioPropsDefaults),
+  },
   emits: ["click"],
   setup(__props, { expose: __expose, emit: __emit }) {
     __expose();
@@ -53,10 +52,10 @@ export default  _defineComponent({
       return !!groupContext && groupContext.value === props.value;
     });
     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 onClick = (event) => {
       if (!isDisabled.value && !isReadonly.value) {

package/components/rate/rate.vue

@@ -103,10 +103,10 @@ export default  _defineComponent({
     const formContext = useFormContext();
     const formItemContext = useFormItemContext();
     const isDisabled = computed(() => {
-      return formContext?.disabled ?? props.disabled;
+      return formContext?.disabled || props.disabled;
     });
     const isReadonly = computed(() => {
-      return formContext?.readonly ?? props.readonly;
+      return formContext?.readonly || props.readonly;
     });
     const innerValue = ref(props.modelValue ?? 0);
     watch(

package/components/slider/slider.vue

@@ -139,10 +139,10 @@ export default  _defineComponent({
     const formContext = useFormContext();
     const formItemContext = useFormItemContext();
     const isDisabled = computed(() => {
-      return formContext?.disabled ?? props.disabled;
+      return formContext?.disabled || props.disabled;
     });
     const isReadonly = computed(() => {
-      return formContext?.readonly ?? props.readonly;
+      return formContext?.readonly || props.readonly;
     });
     const innerValue = ref(
       props.modelValue ?? (props.range ? [props.min, props.min] : props.min)

package/components/stepper/stepper.vue

@@ -101,10 +101,10 @@ export default  _defineComponent({
     const formContext = useFormContext();
     const formItemContext = useFormItemContext();
     const isDisabled = computed(() => {
-      return formContext?.disabled ?? props.disabled;
+      return formContext?.disabled || props.disabled;
     });
     const isReadonly = computed(() => {
-      return formContext?.readonly ?? props.readonly;
+      return formContext?.readonly || props.readonly;
     });
     const innerValue = ref(props.modelValue);
     const inputValue = ref(props.modelValue);

package/components/switch/switch.vue

@@ -47,10 +47,10 @@ export default  _defineComponent({
     const formContext = useFormContext();
     const formItemContext = useFormItemContext();
     const isDisabled = computed(() => {
-      return formContext?.disabled ?? props.disabled;
+      return formContext?.disabled || props.disabled;
     });
     const isReadonly = computed(() => {
-      return formContext?.readonly ?? props.readonly;
+      return formContext?.readonly || props.readonly;
     });
     const innerValue = ref(props.modelValue);
     watch(

package/components/upload/upload.vue

@@ -91,10 +91,10 @@ export default  _defineComponent({
     const formContext = useFormContext();
     const formItemContext = useFormItemContext();
     const isDisabled = computed(() => {
-      return formContext?.disabled ?? props.disabled;
+      return formContext?.disabled || props.disabled;
     });
     const isReadonly = computed(() => {
-      return formContext?.readonly ?? props.readonly;
+      return formContext?.readonly || props.readonly;
     });
     const innerValue = ref(props.modelValue || []);
     watch(

package/package.json

@@ -2,7 +2,7 @@
   "id": "sard-uniapp",
   "name": "sard-uniapp",
   "displayName": "sard-uniapp",
-  "version": "1.1.6",
+  "version": "1.1.7",
   "type": "module",
   "description": "sard-uniapp 是一套基于 Uniapp + Vue3 框架开发的兼容多端的 UI 组件库",
   "keywords": [