fix: by comments

altai-ui · May 20, 2022 · 4dca612 · 4dca612
1 parent 645de30
commit 4dca612
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/src/qComponents/QFormItem/index.ts b/src/qComponents/QFormItem/index.ts
@@ -6,7 +6,14 @@ export const QFormItem = withInstall(FormItem);
 
 export type {
   QFormItemProps,
+  QFormItemPropFor,
+  QFormItemPropProp,
+  QFormItemPropLabel,
+  QFormItemPropSublabel,
+  QFormItemPropError,
   QFormItemPropRules,
+  QFormItemPropShowErrorMessage,
+  QFormItemPropLabelSize,
   QFormItemContext,
   QFormItemProvider,
   QFormItemInstance

diff --git a/src/qComponents/QFormItem/src/QFormItem.vue b/src/qComponents/QFormItem/src/QFormItem.vue
@@ -61,7 +61,7 @@ import type { PropType } from 'vue';
 import { validateArray } from '@/qComponents/helpers';
 import type { QFormProvider } from '@/qComponents/QForm';
 
-import type { Nullable, Optional, ClassValue } from '#/helpers';
+import type { Nullable, ClassValue } from '#/helpers';
 
 import type {
   QFormItemProps,
@@ -155,10 +155,7 @@ export default defineComponent({
       )
     );
 
-    const labelFor = computed<Optional<string>>(() => {
-      if (!props.for || !props.prop) return undefined;
-      return props.for ?? props.prop;
-    });
+    const labelFor = computed<string>(() => props.for ?? props.prop ?? '');
 
     const propRules = computed<FilteredRuleItem[]>(() => {
       const rules =

diff --git a/src/qComponents/QFormItem/src/types.ts b/src/qComponents/QFormItem/src/types.ts
@@ -5,7 +5,7 @@ import type {
 } from 'async-validator';
 import type { Ref, ComputedRef } from 'vue';
 
-import type { Nullable, Optional, Enumerable, ClassValue } from '#/helpers';
+import type { Nullable, Enumerable, ClassValue } from '#/helpers';
 
 export interface FilteredRuleItem extends RuleItem {
   trigger?: Nullable<string>;
@@ -45,7 +45,7 @@ export interface QFormItemContext {
   isErrorSlotShown: ComputedRef<boolean>;
   isHeaderShown: ComputedRef<boolean>;
   isRequired: ComputedRef<boolean>;
-  labelFor: ComputedRef<Optional<string>>;
+  labelFor: ComputedRef<string>;
   resetField: () => void;
   rootClasses: ComputedRef<ClassValue>;
   rules: Nullable<FilteredRuleItem | FilteredRuleItem[]>;
@@ -69,7 +69,7 @@ export interface QFormItemProvider {
 export interface QFormItemInstance {
   errorMessage: Ref<Nullable<string>>;
   isErrorSlotShown: ComputedRef<boolean>;
-  labelFor: ComputedRef<Optional<string>>;
+  labelFor: ComputedRef<string>;
   isRequired: ComputedRef<boolean>;
   isHeaderShown: ComputedRef<boolean>;
   rootClasses: ComputedRef<ClassValue>;