cosey 0.4.52 → 0.5.0

package/components/components.d.ts

@@ -32,6 +32,7 @@ import { NumberFormat } from './number-format';
 import { OnlyChild } from './only-child';
 import { OptionalWrapper } from './optional-wrapper';
 import { Panel } from './panel';
+import { RemoteSelect } from './remote-select';
 import { Row } from './row';
 import { ScrollView } from './scroll-view';
 import { SnugMenu, SnugMenuItem } from './snug-menu';
@@ -85,6 +86,7 @@ declare module 'vue' {
         CoOnlyChild: typeof OnlyChild;
         CoOptionalWrapper: typeof OptionalWrapper;
         CoPanel: typeof Panel;
+        CoRemoteSelect: typeof RemoteSelect;
         CoRow: typeof Row;
         CoScrollView: typeof ScrollView;
         CoSnugMenu: typeof SnugMenu;
@@ -101,4 +103,4 @@ declare module 'vue' {
         CoVideoViewer: typeof VideoViewer;
     }
 }
-export { AudioCard, AudioViewer, Card, Close, Col, ConfigProvider, Container, ContextMenu, ContextMenuItem, ContextSubMenu, Copy, DndSort, DndSortItem, Editor, Field, FileCard, Form, FormDialog, FormDrawer, FormGroup, FormItem, FormList, FormQuery, Highlight, HorizontalTree, Icon, IconifyIcon, ImageCard, InputNumberRange, LongText, Mask, MediaCard, MediaCardGroup, MediaViewer, NumberFormat, OnlyChild, OptionalWrapper, Panel, Row, ScrollView, SnugMenu, SnugMenuItem, StackDialog, SvgIcon, Table, TableAction, Toggle, Transition, TransitionGroup, Upload, VideoCard, VideoViewer, };
+export { AudioCard, AudioViewer, Card, Close, Col, ConfigProvider, Container, ContextMenu, ContextMenuItem, ContextSubMenu, Copy, DndSort, DndSortItem, Editor, Field, FileCard, Form, FormDialog, FormDrawer, FormGroup, FormItem, FormList, FormQuery, Highlight, HorizontalTree, Icon, IconifyIcon, ImageCard, InputNumberRange, LongText, Mask, MediaCard, MediaCardGroup, MediaViewer, NumberFormat, OnlyChild, OptionalWrapper, Panel, RemoteSelect, Row, ScrollView, SnugMenu, SnugMenuItem, StackDialog, SvgIcon, Table, TableAction, Toggle, Transition, TransitionGroup, Upload, VideoCard, VideoViewer, };

package/components/components.js

@@ -32,6 +32,7 @@ export { NumberFormat } from './number-format/index.js';
 export { OnlyChild } from './only-child/index.js';
 export { OptionalWrapper } from './optional-wrapper/index.js';
 export { Panel } from './panel/index.js';
+export { RemoteSelect } from './remote-select/index.js';
 export { Row } from './row/index.js';
 export { ScrollView } from './scroll-view/index.js';
 export { SnugMenu, SnugMenuItem } from './snug-menu/index.js';

package/components/field/components/checkbox-group/checkbox-group.d.ts

@@ -1,5 +1,6 @@
 import { type CheckboxGroupValueType, type CheckboxGroupInstance, type CheckboxGroupProps, type CheckboxValueType, type CheckboxProps } from 'element-plus';
 import { type FieldComponentCommonProps } from '../common';
+import { Props } from '../../../../hooks';
 export type FieldCheckboxGroupOption = Partial<CheckboxProps> | string | number;
 export interface FieldCheckboxGroupProps extends FieldComponentCommonProps {
     componentProps?: Partial<CheckboxGroupProps> & {
@@ -8,8 +9,7 @@ export interface FieldCheckboxGroupProps extends FieldComponentCommonProps {
         [key: PropertyKey]: any;
     } & {
         options?: FieldCheckboxGroupOption[];
-        labelKey?: string;
-        valueKey?: string;
+        props?: Props;
         type?: 'button' | 'checkbox';
         checkboxWidth?: string | number;
         indeterminate?: boolean;

package/components/field/components/checkbox-group/checkbox-group.vue.js

@@ -2,6 +2,7 @@ import { ElCheckboxButton, ElCheckbox, ElCheckboxGroup } from 'element-plus';
 import { defineComponent, computed, h, mergeProps } from 'vue';
 import stdin_default$1 from './panel.vue.js';
 import { omit } from 'lodash-es';
+import { useProps } from '../../../../hooks/useProps.js';
 import { getLabelByValue } from '../../../../utils/collection.js';
 import { isNumber } from '../../../../utils/is.js';
 import { addNullablePlaceholder } from '../../../../utils/vue.js';
@@ -9,15 +10,19 @@ import { addNullablePlaceholder } from '../../../../utils/vue.js';
 var stdin_default = defineComponent(props => {
   const componentProps = computed(() => props.componentProps || {});
   const checkboxGroupProps = computed(() => {
-    return omit(componentProps.value, ["options", "labelKey", "valueKey", "type", "checkboxWidth", "maxHeight"]);
+    return omit(componentProps.value, ["options", "props", "type", "checkboxWidth", "maxHeight"]);
   });
+  const {
+    getLabel,
+    getValue
+  } = useProps(componentProps);
   const convertedOptions = computed(() => {
     return (componentProps.value.options ?? []).map(option => {
       if (typeof option === "object") {
         return {
           ...option,
-          label: option[componentProps.value.labelKey || "label"],
-          value: option[componentProps.value.valueKey || "value"]
+          label: getLabel(option),
+          value: getValue(option)
         };
       }
       return {

package/components/field/components/radio-group/radio-group.d.ts

@@ -1,5 +1,6 @@
 import { type RadioProps, type RadioGroupInstance, type RadioGroupProps } from 'element-plus';
 import { type FieldComponentCommonProps } from '../common';
+import { Props } from '../../../../hooks';
 export type FieldRadioGroupOption = Partial<RadioProps> | string | number;
 export interface FieldRadioGroupProps extends FieldComponentCommonProps {
     componentProps?: Partial<RadioGroupProps> & {
@@ -8,8 +9,7 @@ export interface FieldRadioGroupProps extends FieldComponentCommonProps {
         [key: PropertyKey]: any;
     } & {
         options?: FieldRadioGroupOption[];
-        labelKey?: string;
-        valueKey?: string;
+        props?: Props;
         type?: 'button' | 'radio';
     };
     componentSlots?: Partial<FieldRadioGroupSlots>;

package/components/field/components/radio-group/radio-group.vue.js

@@ -1,17 +1,22 @@
 import { ElRadioButton, ElRadio, ElRadioGroup } from 'element-plus';
 import { defineComponent, computed, h, mergeProps } from 'vue';
+import { useProps } from '../../../../hooks/useProps.js';
 import { addNullablePlaceholder } from '../../../../utils/vue.js';
 import { getLabelByValue } from '../../../../utils/collection.js';
 
 var stdin_default = defineComponent(props => {
   const componentProps = computed(() => props.componentProps || {});
+  const {
+    getLabel,
+    getValue
+  } = useProps(componentProps);
   const convertedOptions = computed(() => {
     return (componentProps.value.options ?? []).map(option => {
       if (typeof option === "object") {
         return {
           ...option,
-          label: option[componentProps.value.labelKey || "label"],
-          value: option[componentProps.value.valueKey || "value"]
+          label: getLabel(option),
+          value: getValue(option)
         };
       }
       return {

package/components/field/components/remote-select/remote-select.d.ts

@@ -0,0 +1,16 @@
+import { type FieldComponentCommonProps } from '../common';
+import { type RemoteSelectEmits, type RemoteSelectSlots, type RemoteSelectProps } from '../../../remote-select';
+import { type ExtractPropTypes } from 'vue';
+export interface FieldRemoteSelectProps extends FieldComponentCommonProps {
+    componentProps?: Partial<ExtractPropTypes<RemoteSelectProps>> & {
+        'onUpdate:modelValue'?: (value: any) => void;
+        onChange?: (value: any) => void;
+        [key: PropertyKey]: any;
+    };
+    componentSlots?: Partial<FieldRemoteSelectSlots>;
+}
+export interface FieldRemoteSelectSlots extends RemoteSelectSlots {
+}
+export interface FieldRemoteSelectEmits extends RemoteSelectEmits {
+}
+export type FieldRemoteSelectExpose = {};

package/components/field/components/remote-select/remote-select.js

@@ -0,0 +1 @@
+

package/components/field/components/remote-select/remote-select.vue.d.ts

@@ -0,0 +1,3 @@
+import { type FieldRemoteSelectProps, type FieldRemoteSelectSlots } from './remote-select';
+declare const _default: import("vue").DefineSetupFnComponent<FieldRemoteSelectProps, {}, FieldRemoteSelectSlots, FieldRemoteSelectProps & {}, import("vue").PublicProps>;
+export default _default;

package/components/field/components/remote-select/remote-select.vue.js

@@ -0,0 +1,32 @@
+import { defineComponent, h, mergeProps } from 'vue';
+import { RemoteSelect as _RemoteSelect } from '../../../remote-select/index.js';
+import { useLocale } from '../../../../hooks/useLocale.js';
+import { addNullablePlaceholder } from '../../../../utils/vue.js';
+
+var stdin_default = defineComponent((props, {
+  slots
+}) => {
+  const {
+    t
+  } = useLocale();
+  return () => {
+    if (props.readonly) {
+      const value = props.componentProps?.modelValue;
+      return addNullablePlaceholder(value, val => val);
+    }
+    return h(_RemoteSelect, mergeProps({
+      placeholder: t("co.common.pleaseSelect"),
+      clearable: true,
+      style: {
+        verticalAlign: "top"
+      }
+    }, props.componentProps || {}), slots);
+  };
+}, {
+  name: "FieldRemoteSelect",
+  inheritAttrs: false,
+  props: ["componentProps", "componentSlots", "readonly"],
+  slots: {}
+});
+
+export { stdin_default as default };

package/components/field/components/select/select.d.ts

@@ -1,6 +1,7 @@
 import { type SelectProps } from 'element-plus/es/components/select/src/select.mjs';
 import { type FieldComponentCommonProps } from '../common';
 import { type ExtractPropTypes } from 'vue';
+import { Props } from '../../../../hooks';
 export interface FieldSelectObjectOption {
     label?: string | number;
     value?: string | number | boolean;
@@ -29,8 +30,7 @@ export interface FieldSelectProps extends FieldComponentCommonProps {
         [key: PropertyKey]: any;
     } & {
         options?: FieldSelectOption[];
-        labelKey?: string;
-        valueKey?: string;
+        props?: Props;
         optionProps?: Record<PropertyKey, any> | ((props: FieldSelectObjectOption, index: number) => Record<PropertyKey, any>);
     };
     componentSlots?: Partial<FieldSelectSlots>;
@@ -45,7 +45,10 @@ export interface FieldSelectSlots {
     tag?: (props: Record<string, any>) => any;
     loading?: (props: Record<string, any>) => any;
     label?: (props: Record<string, any>) => any;
-    option?: (props: FieldSelectObjectOption, index: number) => any;
+    option?: (props: {
+        option: FieldSelectObjectOption;
+        index: number;
+    }) => any;
 }
 export interface FieldSelectEmits {
     (e: 'update:modelValue', value: any): void;

package/components/field/components/select/select.js

@@ -1,4 +1,4 @@
-const fieldSelectOmitKeys = ["options", "labelKey", "valueKey"];
+const fieldSelectOmitKeys = ["options", "props", "optionProps"];
 function flatGroup(options, children = "children") {
   return options.map((option) => {
     if (children in option) {

package/components/field/components/select/select.vue.js

@@ -2,9 +2,10 @@ import { ElSelect, ElOptionGroup, ElOption } from 'element-plus';
 import { defineComponent, computed, unref, h, mergeProps } from 'vue';
 import { fieldSelectOmitKeys, flatGroup } from './select.js';
 import { omit } from 'lodash-es';
-import { isFunction, isObject } from '../../../../utils/is.js';
 import { useLocale } from '../../../../hooks/useLocale.js';
+import { useProps } from '../../../../hooks/useProps.js';
 import { addNullablePlaceholder } from '../../../../utils/vue.js';
+import { isFunction } from '../../../../utils/is.js';
 import { getLabelByValue } from '../../../../utils/collection.js';
 
 var stdin_default = defineComponent((props, {
@@ -15,19 +16,26 @@ var stdin_default = defineComponent((props, {
   } = useLocale();
   const componentProps = computed(() => props.componentProps || {});
   const omittedProps = computed(() => omit(componentProps.value, fieldSelectOmitKeys));
+  const {
+    getLabel,
+    getValue,
+    getOptions,
+    getKey,
+    aliasProps
+  } = useProps(componentProps);
   function convertRecur(options) {
     return options.map(option => {
       if (typeof option === "object") {
-        if ("children" in option) {
+        if (aliasProps.value.options in option) {
           return {
             ...option,
-            children: convertRecur(option.children)
+            options: convertRecur(getOptions(option))
           };
         }
         return {
           ...option,
-          label: option[componentProps.value.labelKey || "label"],
-          value: option[componentProps.value.valueKey || "value"]
+          label: getLabel(option),
+          value: getValue(option)
         };
       }
       return {
@@ -41,11 +49,15 @@ var stdin_default = defineComponent((props, {
   });
   function renderOption(option, index) {
     const optionProps = componentProps.value.optionProps;
+    const value = getValue(option);
     return h(ElOption, {
       ...option,
-      key: isObject(option.value) && componentProps.value.valueKey ? option.value[componentProps.value.valueKey] : option.value,
+      key: getKey(value),
       ...(isFunction(optionProps) ? optionProps(option, index) : optionProps)
-    }, slots.option ? () => slots.option(option, index) : void 0);
+    }, slots.option ? () => slots.option({
+      option,
+      index
+    }) : void 0);
   }
   return () => {
     if (props.readonly) {
@@ -63,10 +75,10 @@ var stdin_default = defineComponent((props, {
       }
     }, omittedProps.value), {
       ...slots,
-      default: () => convertedOptions.value.map((item, index) => "children" in item ? h(ElOptionGroup, {
+      default: () => convertedOptions.value.map((item, index) => "options" in item ? h(ElOptionGroup, {
         label: item.label,
         disabled: item.disabled
-      }, () => item.children.map((item2, index2) => renderOption(item2, index2))) : renderOption(item, index))
+      }, () => item.options.map((item2, index2) => renderOption(item2, index2))) : renderOption(item, index))
     });
   };
 }, {

package/components/field/components/select-v2/select-v2.d.ts

@@ -11,12 +11,11 @@ export interface FieldSelectV2Props extends FieldComponentCommonProps {
         onFocus?: (event: FocusEvent) => void;
         [key: PropertyKey]: any;
     } & {
-        labelKey?: string;
-        valueKey?: string;
         optionProps?: (props: Record<PropertyKey, any>, index: number) => Record<PropertyKey, any>;
     };
     componentSlots?: Partial<FieldSelectV2Slots>;
 }
+export declare const fieldSelectOmitKeys: string[];
 export interface FieldSelectV2Slots {
     default?: (props: Record<string, any>) => any;
     header?: (props: Record<string, any>) => any;

package/components/field/components/select-v2/select-v2.js

@@ -1,3 +1,4 @@
+const fieldSelectOmitKeys = ["optionProps"];
 function flatGroup(options, children = "options") {
   return options.map((option) => {
     if (children in option) {
@@ -7,4 +8,4 @@ function flatGroup(options, children = "options") {
   }).flat();
 }
 
-export { flatGroup };
+export { fieldSelectOmitKeys, flatGroup };

package/components/field/components/select-v2/select-v2.vue.js

@@ -1,7 +1,9 @@
 import { ElSelectV2 } from 'element-plus';
 import { defineComponent, computed, unref, h, mergeProps } from 'vue';
-import { flatGroup } from './select-v2.js';
+import { fieldSelectOmitKeys, flatGroup } from './select-v2.js';
+import { omit } from 'lodash-es';
 import { useLocale } from '../../../../hooks/useLocale.js';
+import { useProps } from '../../../../hooks/useProps.js';
 import { addNullablePlaceholder } from '../../../../utils/vue.js';
 import { getLabelByValue } from '../../../../utils/collection.js';
 
@@ -12,14 +14,18 @@ var stdin_default = defineComponent((props, {
     t
   } = useLocale();
   const componentProps = computed(() => props.componentProps || {});
-  const childrenKey = computed(() => componentProps.value.props?.options || "children");
+  const omittedProps = computed(() => omit(componentProps.value, fieldSelectOmitKeys));
+  const {
+    getOptions,
+    aliasProps
+  } = useProps(componentProps);
   const optionProps = computed(() => componentProps.value.optionProps || (option => option));
   function convertRecur(options) {
     return options.map((option, index) => {
-      if (childrenKey.value in option) {
+      if (aliasProps.value.options in option) {
         return {
           ...optionProps.value(option, index),
-          [childrenKey.value]: convertRecur(option[childrenKey.value])
+          [aliasProps.value.options]: convertRecur(getOptions(option))
         };
       }
       return optionProps.value(option, index);
@@ -42,7 +48,7 @@ var stdin_default = defineComponent((props, {
       style: {
         verticalAlign: "top"
       }
-    }, componentProps.value, {
+    }, omittedProps.value, {
       options: convertedOptions.value
     }), slots);
   };

package/components/field/field.d.ts

@@ -19,6 +19,7 @@ import { type FieldNumberRangeProps } from './components/number-range/number-ran
 import { type FieldPasswordProps } from './components/password/password';
 import { type FieldRadioGroupProps } from './components/radio-group/radio-group';
 import { type FieldRateProps } from './components/rate/rate';
+import { type FieldRemoteSelectProps } from './components/remote-select/remote-select';
 import { type FieldSegmentedProps } from './components/segmented/segmented';
 import { type FieldSelectProps } from './components/select/select';
 import { type FieldSelectV2Props } from './components/select-v2/select-v2';
@@ -57,6 +58,7 @@ export interface MapFieldTypeComponentProps {
     password: FieldPasswordProps;
     radiogroup: FieldRadioGroupProps;
     rate: FieldRateProps;
+    remoteselect: FieldRemoteSelectProps;
     segmented: FieldSegmentedProps;
     select: FieldSelectProps;
     selectv2: FieldSelectV2Props;
@@ -97,6 +99,7 @@ export declare const mapFieldTypeComponent: {
     password: import("vue").DefineSetupFnComponent<FieldInputProps, {}, import("vue").SlotsType<import("./components/input/input").FieldInputSlots>, FieldInputProps & {}, import("vue").PublicProps>;
     radiogroup: import("vue").DefineSetupFnComponent<FieldRadioGroupProps, {}, import("vue").SlotsType<import("./components/radio-group/radio-group").FieldRadioGroupSlots>, FieldRadioGroupProps & {}, import("vue").PublicProps>;
     rate: import("vue").DefineSetupFnComponent<FieldRateProps, {}, import("vue").SlotsType<import("./components/rate/rate").FieldRateSlots>, FieldRateProps & {}, import("vue").PublicProps>;
+    remoteselect: import("vue").DefineSetupFnComponent<FieldRemoteSelectProps, {}, import("./components/remote-select/remote-select").FieldRemoteSelectSlots, FieldRemoteSelectProps & {}, import("vue").PublicProps>;
     segmented: import("vue").DefineSetupFnComponent<FieldSegmentedProps, {}, import("vue").SlotsType<import("./components/segmented/segmented").FieldSegmentedSlots>, FieldSegmentedProps & {}, import("vue").PublicProps>;
     select: import("vue").DefineSetupFnComponent<FieldSelectProps, {}, import("vue").SlotsType<import("./components/select/select").FieldSelectSlots>, FieldSelectProps & {}, import("vue").PublicProps>;
     selectv2: import("vue").DefineSetupFnComponent<FieldSelectV2Props, {}, import("vue").SlotsType<import("./components/select-v2/select-v2").FieldSelectV2Slots>, FieldSelectV2Props & {}, import("vue").PublicProps>;

package/components/field/field.js

@@ -1,24 +1,25 @@
-import stdin_default$A from './components/autocomplete/autocomplete.vue.js';
-import stdin_default$z from './components/cascader/cascader.vue.js';
-import stdin_default$y from './components/checkbox/checkbox.vue.js';
-import stdin_default$x from './components/checkbox-group/checkbox-group.vue.js';
-import stdin_default$w from './components/color/color.vue.js';
-import stdin_default$v from './components/date/date.vue.js';
-import stdin_default$u from './components/date-range/date-range.vue.js';
-import stdin_default$s from './components/date-time/date-time.vue.js';
-import stdin_default$r from './components/date-time-range/date-time-range.vue.js';
-import stdin_default$t from './components/dates/dates.vue.js';
-import stdin_default$q from './components/input/input.vue.js';
-import stdin_default$p from './components/input-tag/input-tag.vue.js';
-import stdin_default$o from './components/mention/mention.vue.js';
-import stdin_default$n from './components/month/month.vue.js';
-import stdin_default$m from './components/month-range/month-range.vue.js';
-import stdin_default$l from './components/months/months.vue.js';
-import stdin_default$k from './components/number/number.vue.js';
-import stdin_default$j from './components/number-range/number-range.vue.js';
-import stdin_default$i from './components/password/password.vue.js';
-import stdin_default$h from './components/radio-group/radio-group.vue.js';
-import stdin_default$g from './components/rate/rate.vue.js';
+import stdin_default$B from './components/autocomplete/autocomplete.vue.js';
+import stdin_default$A from './components/cascader/cascader.vue.js';
+import stdin_default$z from './components/checkbox/checkbox.vue.js';
+import stdin_default$y from './components/checkbox-group/checkbox-group.vue.js';
+import stdin_default$x from './components/color/color.vue.js';
+import stdin_default$w from './components/date/date.vue.js';
+import stdin_default$v from './components/date-range/date-range.vue.js';
+import stdin_default$t from './components/date-time/date-time.vue.js';
+import stdin_default$s from './components/date-time-range/date-time-range.vue.js';
+import stdin_default$u from './components/dates/dates.vue.js';
+import stdin_default$r from './components/input/input.vue.js';
+import stdin_default$q from './components/input-tag/input-tag.vue.js';
+import stdin_default$p from './components/mention/mention.vue.js';
+import stdin_default$o from './components/month/month.vue.js';
+import stdin_default$n from './components/month-range/month-range.vue.js';
+import stdin_default$m from './components/months/months.vue.js';
+import stdin_default$l from './components/number/number.vue.js';
+import stdin_default$k from './components/number-range/number-range.vue.js';
+import stdin_default$j from './components/password/password.vue.js';
+import stdin_default$i from './components/radio-group/radio-group.vue.js';
+import stdin_default$h from './components/rate/rate.vue.js';
+import stdin_default$g from './components/remote-select/remote-select.vue.js';
 import stdin_default$f from './components/segmented/segmented.vue.js';
 import stdin_default$e from './components/select/select.vue.js';
 import stdin_default$d from './components/select-v2/select-v2.vue.js';
@@ -37,27 +38,28 @@ import stdin_default$1 from './components/year-range/year-range.vue.js';
 import stdin_default from './components/years/years.vue.js';
 
 const mapFieldTypeComponent = {
-  autocomplete: stdin_default$A,
-  cascader: stdin_default$z,
-  checkbox: stdin_default$y,
-  checkboxgroup: stdin_default$x,
-  color: stdin_default$w,
-  date: stdin_default$v,
-  daterange: stdin_default$u,
-  dates: stdin_default$t,
-  datetime: stdin_default$s,
-  datetimerange: stdin_default$r,
-  input: stdin_default$q,
-  inputtag: stdin_default$p,
-  mention: stdin_default$o,
-  month: stdin_default$n,
-  monthrange: stdin_default$m,
-  months: stdin_default$l,
-  number: stdin_default$k,
-  numberrange: stdin_default$j,
-  password: stdin_default$i,
-  radiogroup: stdin_default$h,
-  rate: stdin_default$g,
+  autocomplete: stdin_default$B,
+  cascader: stdin_default$A,
+  checkbox: stdin_default$z,
+  checkboxgroup: stdin_default$y,
+  color: stdin_default$x,
+  date: stdin_default$w,
+  daterange: stdin_default$v,
+  dates: stdin_default$u,
+  datetime: stdin_default$t,
+  datetimerange: stdin_default$s,
+  input: stdin_default$r,
+  inputtag: stdin_default$q,
+  mention: stdin_default$p,
+  month: stdin_default$o,
+  monthrange: stdin_default$n,
+  months: stdin_default$m,
+  number: stdin_default$l,
+  numberrange: stdin_default$k,
+  password: stdin_default$j,
+  radiogroup: stdin_default$i,
+  rate: stdin_default$h,
+  remoteselect: stdin_default$g,
   segmented: stdin_default$f,
   select: stdin_default$e,
   selectv2: stdin_default$d,

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

@@ -12,9 +12,9 @@ import { reactiveOmit } from '@vueuse/core';
 import { useToken } from '../theme/util/useToken.js';
 import { omit } from 'lodash-es';
 import { omitUndefined } from '../../utils/object.js';
+import { createMergedExpose, defineTemplate } from '../../utils/vue.js';
 import { useComponentConfig } from '../config-provider/config-provider.js';
 import { useLocale } from '../../hooks/useLocale.js';
-import { createMergedExpose, defineTemplate } from '../../utils/vue.js';
 import { toArray } from '../../utils/array.js';
 import { isString, isNumber } from '../../utils/is.js';
 

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

@@ -1,7 +1,7 @@
 import { type SpaceProps } from 'element-plus';
-export interface FormGroupProps extends Partial<SpaceProps> {
+export interface FormGroupProps extends Partial<Omit<SpaceProps, 'class' | 'style'>> {
     title?: string;
-    borderStyle?: 'none' | 'solid' | 'dashed';
+    borderStyle?: 'none' | 'solid' | 'dashed' | 'dotted';
     position?: 'left' | 'right' | 'center';
     collapsible?: boolean;
     collapsed?: boolean;

package/components/form-group/form-group.vue.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, watch, resolveComponent, createElementBlock, openBlock, normalizeClass, unref, createCommentVNode, withDirectives, createElementVNode, normalizeStyle, createBlock, createTextVNode, toDisplayString, createVNode, mergeProps, withCtx, renderSlot, vShow } from 'vue';
+import { defineComponent, ref, computed, watch, resolveComponent, createElementBlock, openBlock, normalizeStyle, normalizeClass, unref, createCommentVNode, withDirectives, createElementVNode, createBlock, createTextVNode, toDisplayString, createVNode, mergeProps, withCtx, renderSlot, vShow } from 'vue';
 import { reactiveOmit } from '@vueuse/core';
 import stdin_default$2 from '../icon/icon.vue.js';
 import stdin_default$1 from './style/index.js';
@@ -35,14 +35,6 @@ var stdin_default = /* @__PURE__ */defineComponent({
       type: String,
       required: false
     },
-    class: {
-      type: null,
-      required: false
-    },
-    style: {
-      type: null,
-      required: false
-    },
     alignment: {
       type: null,
       required: false,
@@ -89,6 +81,7 @@ var stdin_default = /* @__PURE__ */defineComponent({
     } = stdin_default$1(prefixCls);
     const spaceProps = reactiveOmit(props, ["title", "borderStyle", "position", "collapsible", "collapsed"]);
     const innerCollapsed = ref(false);
+    const isBordered = computed(() => !!props.title);
     watch(() => props.collapsed, () => {
       innerCollapsed.value = !!props.collapsed;
     }, {
@@ -104,9 +97,12 @@ var stdin_default = /* @__PURE__ */defineComponent({
       const _component_el_space = resolveComponent("el-space");
       return openBlock(), createElementBlock("div", {
         class: normalizeClass([unref(hashId), unref(prefixCls), {
-          "is-bordered": !!_ctx.title,
+          "is-bordered": isBordered.value,
           "is-collapsed": innerCollapsed.value
-        }])
+        }]),
+        style: normalizeStyle({
+          borderStyle: isBordered.value ? props.borderStyle : void 0
+        })
       }, [_ctx.title ? (openBlock(), createElementBlock("div", {
         key: 0,
         class: normalizeClass([`${unref(prefixCls)}-title`, `is-${_ctx.position}`])
@@ -134,8 +130,8 @@ var stdin_default = /* @__PURE__ */defineComponent({
         _: 3
         /* FORWARDED */
       }, 16
-      /* FULL_PROPS */), [[vShow, !innerCollapsed.value]])], 2
-      /* CLASS */);
+      /* FULL_PROPS */), [[vShow, !innerCollapsed.value]])], 6
+      /* CLASS, STYLE */);
     };
   }
 });

package/components/form-group/style/index.js

@@ -6,10 +6,9 @@ var stdin_default = getSimpleStyleHook("FromGroup", (token) => {
     [componentCls]: {
       "&.is-bordered": {
         position: "relative",
-        marginBlockStart: token.marginSM,
+        marginBlock: token.marginLG,
+        padding: token.paddingMD,
         paddingBlockStart: token.paddingLG,
-        paddingBlockEnd: token.paddingMD,
-        paddingInline: token.paddingMD,
         border: `${token.lineWidth} ${token.lineType} ${token.colorBorder}`,
         borderRadius: token.borderRadius,
         "&.is-collapsed": {

package/components/form-query/form-query.vue.d.ts

@@ -295,6 +295,8 @@ declare const __VLS_component: import("vue").DefineComponent<import("vue").Extra
     inlineMessage: boolean;
     showMessage: boolean;
     colProps: import("..").ColProps;
+    minFields: number;
+    collapsed: boolean;
     submitText: string;
     resetText: string;
     hideSubmit: boolean;
@@ -306,8 +308,6 @@ declare const __VLS_component: import("vue").DefineComponent<import("vue").Extra
     hideRequiredAsterisk: boolean;
     scrollToError: boolean;
     scrollIntoViewOptions: boolean | Record<string, any>;
-    minFields: number;
-    collapsed: boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 declare const _default: __VLS_WithSlots<typeof __VLS_component, __VLS_Slots>;
 export default _default;