eco-vue-js 0.10.2 → 0.10.4

package/dist/components/FieldWrapper/WFieldWrapper.vue.js

@@ -1,4 +1,4 @@
-import { defineComponent, useId, ref, computed, openBlock, createElementBlock, normalizeClass, createElementVNode, unref, Fragment, renderSlot, createTextVNode, toDisplayString, createVNode, Transition, withCtx, createCommentVNode, createBlock, normalizeProps, guardReactiveProps } from 'vue';
+import { defineComponent, useId, ref, computed, createElementBlock, openBlock, normalizeClass, createElementVNode, createCommentVNode, createBlock, unref, renderSlot, Fragment, createVNode, createTextVNode, toDisplayString, Transition, withCtx, normalizeProps, guardReactiveProps } from 'vue';
 import _sfc_main$2 from '../Button/WButtonCopy.vue.js';
 import WSkeleton from '../Skeleton/WSkeleton.vue.js';
 import _sfc_main$3 from '../Tooltip/WTooltip.vue.js';
@@ -11,11 +11,13 @@ import '../../utils/supportsPassive.js';
 import '../Dropdown/utils/DropdownStyle.js';
 import 'vue-router';
 import '../../utils/Modal.js';
-import { encodeQueryParam } from '../../utils/api.js';
 import '../Input/WInputSuggest.vue.js';
+import { encodeQueryParam } from '../../utils/api.js';
+import '../HeaderBar/use/useHeaderPadding.js';
 import '../Input/WInputDate.vue.js';
 import '../Link/WLink.vue.js';
 import '@tanstack/vue-query';
+import '../List/use/useListConfig.js';
 
 const _hoisted_1 = ["for"];
 const _hoisted_2 = {

package/dist/components/FieldWrapper/components/FilterButton.vue.js

@@ -1,4 +1,4 @@
-import { defineComponent, openBlock, createElementBlock, normalizeClass, createVNode, unref } from 'vue';
+import { defineComponent, createElementBlock, openBlock, normalizeClass, createVNode, unref } from 'vue';
 import IconFilter from '../../../assets/icons/sax/IconFilter.svg.js';
 
 const _hoisted_1 = {

package/dist/components/FilePicker/WFilePicker.vue.js

@@ -1,4 +1,4 @@
-import { defineComponent, useTemplateRef, ref, onMounted, onUnmounted, openBlock, createElementBlock, Fragment, renderSlot, createTextVNode, toDisplayString, createCommentVNode, createBlock, createElementVNode, withModifiers, createVNode, withCtx, unref, renderList, Transition } from 'vue';
+import { defineComponent, useTemplateRef, ref, onMounted, onUnmounted, createElementBlock, openBlock, createCommentVNode, createElementVNode, createVNode, createBlock, Fragment, renderSlot, createTextVNode, toDisplayString, withModifiers, withCtx, unref, renderList, Transition } from 'vue';
 import _sfc_main$3 from '../Button/WButton.vue.js';
 import WSkeleton from '../Skeleton/WSkeleton.vue.js';
 import { SemanticType } from '../../utils/SemanticType.js';

package/dist/components/FilePicker/components/FilePickerItem.vue.js

@@ -1,4 +1,4 @@
-import { defineComponent, openBlock, createElementBlock, renderSlot, createVNode, unref, createElementVNode, toDisplayString, withModifiers } from 'vue';
+import { defineComponent, createElementBlock, openBlock, createElementVNode, renderSlot, createVNode, unref, toDisplayString, withModifiers } from 'vue';
 import IconCancel from '../../../assets/icons/default/IconCancel.svg.js';
 import IconCheckCircle from '../../../assets/icons/sax/IconCheckCircle.svg.js';
 import IconCloseCircle from '../../../assets/icons/sax/IconCloseCircle.svg.js';

package/dist/components/FilePicker/components/FilePickerSvg.vue.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, useTemplateRef, computed, watch, toRef, onBeforeMount, openBlock, createElementBlock, normalizeClass, createElementVNode, normalizeStyle } from 'vue';
+import { defineComponent, ref, useTemplateRef, computed, watch, toRef, onBeforeMount, createElementBlock, openBlock, normalizeClass, createElementVNode, normalizeStyle } from 'vue';
 
 const _hoisted_1 = ["width", "height"];
 const _hoisted_2 = ["x", "y", "width", "height", "rx", "ry", "stroke-width", "stroke-dasharray", "stroke-dashoffset"];

package/dist/components/FilterWrapper/WFilterWrapper.vue.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, computed, watch, onUnmounted, openBlock, createElementBlock, createElementVNode, Fragment, renderList, createBlock, resolveDynamicComponent, unref, renderSlot, createVNode, withCtx, createTextVNode } from 'vue';
+import { defineComponent, ref, computed, watch, onUnmounted, createElementBlock, openBlock, createElementVNode, Fragment, renderList, createBlock, resolveDynamicComponent, unref, renderSlot, createVNode, withCtx, createTextVNode } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import _sfc_main$1 from '../Button/WButton.vue.js';
 import IconFilterRemove from '../../assets/icons/sax/IconFilterRemove.svg.js';

package/dist/components/Form/WForm.vue.js

@@ -1,6 +1,6 @@
-import { defineComponent, toRef, computed, provide, inject, watch, onBeforeUnmount, openBlock, createBlock, resolveDynamicComponent, withCtx, renderSlot } from 'vue';
+import { defineComponent, toRef, computed, provide, inject, watch, onBeforeUnmount, createBlock, openBlock, resolveDynamicComponent, withCtx, renderSlot } from 'vue';
 import _sfc_main$1 from '../EmptyComponent/WEmptyComponent.vue.js';
-import { wFormTitleUpdater, wFormUnlistener, wFormErrorMessageUpdater, wFormHasChangesUpdater, wFormHasValueUpdater, wFormValidateUpdater, wFormInvalidateUpdater, wFormInitModelUpdater } from './models/injection.js';
+import { wFormTitleUpdater, wFormUnlistener, wFormErrorMessageUpdater, wFormHasChangesUpdater, wFormHasValueUpdater, wFormInitModelUpdater, wFormInvalidateUpdater, wFormValidateUpdater } from './models/injection.js';
 import { compileMessage } from './models/utils.js';
 import { useFormValueMap } from './use/useFormValueMap.js';
 

package/dist/components/Form/WFormValidator.vue.js

@@ -1,4 +1,4 @@
-import { defineComponent, inject, useSlots, computed, useTemplateRef, ref, watch, onBeforeMount, onBeforeUnmount, openBlock, createBlock, resolveDynamicComponent } from 'vue';
+import { defineComponent, inject, useSlots, computed, useTemplateRef, ref, watch, onBeforeMount, onBeforeUnmount, createBlock, openBlock, resolveDynamicComponent } from 'vue';
 import { useIsInsideTab } from '../Tabs/use/useIsInsideTab.js';
 import { useTabActiveListener } from '../Tabs/use/useTabActiveListener.js';
 import '../Button/WButtonAction.vue.js';
@@ -13,9 +13,11 @@ import { wFormTitleUpdater, wFormErrorMessageUpdater, wFormHasChangesUpdater, wF
 import { scrollToValidator } from './models/utils.js';
 import { validateRequired } from '../../utils/validate.js';
 import '../Input/WInputSuggest.vue.js';
+import '../HeaderBar/use/useHeaderPadding.js';
 import '../Input/WInputDate.vue.js';
 import '../Link/WLink.vue.js';
 import '@tanstack/vue-query';
+import '../List/use/useListConfig.js';
 
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "WFormValidator",

package/dist/components/Form/models/utils.js

@@ -8,9 +8,11 @@ import '../../Dropdown/utils/DropdownStyle.js';
 import 'vue-router';
 import '../../../utils/Modal.js';
 import '../../Input/WInputSuggest.vue.js';
+import '../../HeaderBar/use/useHeaderPadding.js';
 import '../../Input/WInputDate.vue.js';
 import '../../Link/WLink.vue.js';
 import '@tanstack/vue-query';
+import '../../List/use/useListConfig.js';
 
 const fieldMessageStart = " - ";
 const subformMessageStart = " ";

package/dist/components/FormAsync/WFormAsyncButtonGroup.vue.d.ts

@@ -2,7 +2,9 @@ import { FormAsyncButtonGroupProps } from './types';
 declare const _default: <Model, FieldType extends string | number | boolean | null, QueryParams, Entity extends Record<string, unknown>, ValueGetter extends {
     fn(value: Entity): FieldType;
 }["fn"] | undefined = undefined>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_expose?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
-    props: __VLS_PrettifyLocal<Pick<Partial<{}> & Omit<{} & import('vue').VNodeProps & import('vue').AllowedComponentProps & import('vue').ComponentCustomProps, never>, never> & FormAsyncButtonGroupProps<Model, FieldType, QueryParams, Entity, ValueGetter>> & import('vue').PublicProps;
+    props: __VLS_PrettifyLocal<Pick<Partial<{}> & Omit<{
+        readonly onSuccess?: ((value: Model) => any) | undefined;
+    } & import('vue').VNodeProps & import('vue').AllowedComponentProps & import('vue').ComponentCustomProps, never>, "onSuccess"> & FormAsyncButtonGroupProps<Model, FieldType, QueryParams, Entity, ValueGetter>> & import('vue').PublicProps;
     expose(exposed: import('vue').ShallowUnwrapRef<{}>): void;
     attrs: any;
     slots: {
@@ -11,7 +13,7 @@ declare const _default: <Model, FieldType extends string | number | boolean | nu
             selected: boolean;
         }): any;
     };
-    emit: {};
+    emit: (e: "success", value: Model) => void;
 }>) => import('vue').VNode<import('vue').RendererNode, import('vue').RendererElement, {
     [key: string]: any;
 }> & {

package/dist/components/FormAsync/WFormAsyncButtonGroup.vue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WFormAsyncButtonGroup.vue.d.ts","sourceRoot":"","sources":["../../../src/components/FormAsync/WFormAsyncButtonGroup.vue"],"names":[],"mappings":"AAAA,OA6FO,KAAK,EAAC,yBAAyB,EAAC,MAAM,SAAS,CAAA;yBAarC,KAAK,EAAE,SAAS,SAAS,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,EAAE,WAAW,EAAE,MAAM,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,SAAS;IAAC,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;CAAC,CAAC,IAAI,CAAC,GAAG,SAAS,2BACvL,WAAW,CAAC,OAAO,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,cAClD,mBAAmB,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,WAAW,CAAC,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC,iBAC5F,WAAW,CAAC,OAAO,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC;WAsKxD,mBAAmB,CAAC,gOAAyD,CAAC,4BAA2B;oBAChG,OAAO,KAAK,EAAE,gBAAgB,CAAC,EAAE,CAAC,GAAG,IAAI;WAClD,GAAG;;;;;YA9Be,GAAG;;UAgCtB,EAAE;;;;YAGiC,OAAO,CAAC,OAAO,WAAW,CAAC;;AAhLvE,wBAgL4E;AAC5E,KAAK,mBAAmB,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAG,GAAG,EAAE,CAAC"}
+{"version":3,"file":"WFormAsyncButtonGroup.vue.d.ts","sourceRoot":"","sources":["../../../src/components/FormAsync/WFormAsyncButtonGroup.vue"],"names":[],"mappings":"AAAA,OA2CO,KAAK,EAAC,yBAAyB,EAAC,MAAM,SAAS,CAAA;yBAQrC,KAAK,EAAE,SAAS,SAAS,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,EAAE,WAAW,EAAE,MAAM,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,SAAS;IAAC,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;CAAC,CAAC,IAAI,CAAC,GAAG,SAAS,2BACvL,WAAW,CAAC,OAAO,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,cAClD,mBAAmB,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,WAAW,CAAC,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC,iBAC5F,WAAW,CAAC,OAAO,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC;WA+HxD,mBAAmB,CAAC;;iNAAyD,CAAC,4BAA2B;oBAChG,OAAO,KAAK,EAAE,gBAAgB,CAAC,EAAE,CAAC,GAAG,IAAI;WAClD,GAAG;;;;;YAjCe,GAAG;;cAzFzB,SAAS,SAAS,KAAK,KAAG,IAAI;;;;YA+HQ,OAAO,CAAC,OAAO,WAAW,CAAC;;AAzIvE,wBAyI4E;AAC5E,KAAK,mBAAmB,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAG,GAAG,EAAE,CAAC"}

package/dist/components/FormAsync/WFormAsyncButtonGroup.vue.js

@@ -1,23 +1,14 @@
-import { defineComponent, toRef, ref, computed, onBeforeUnmount, openBlock, createBlock, mergeProps, unref, createSlots, withCtx, renderSlot } from 'vue';
+import { defineComponent, createBlock, openBlock, mergeProps, unref, createSlots, withCtx, renderSlot } from 'vue';
 import _sfc_main$1 from '../Button/WButtonGroup.vue.js';
-import { Modal } from '../../utils/Modal.js';
-import { Notify } from '../../utils/Notify.js';
-import { handleApiError } from '../../utils/api.js';
-import { get, set } from '../../utils/utils.js';
+import { useFormAsync } from './use/useFormAsync.js';
 
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "WFormAsyncButtonGroup",
   props: {
-    useQueryFn: {},
-    noParams: { type: Boolean },
-    queryParams: {},
-    queryEnabled: { type: Boolean, default: void 0 },
-    field: {},
-    apiMethod: {},
-    confimGetter: {},
     list: {},
     valueGetter: {},
     optionComponent: {},
+    loading: { type: Boolean },
     minimize: { type: Boolean },
     wrap: { type: Boolean },
     col: { type: Boolean },
@@ -41,53 +32,31 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     emptyValue: {},
     leftError: { type: Boolean },
     filterField: {},
-    filterValue: {}
+    filterValue: {},
+    useQueryFn: {},
+    noParams: { type: Boolean },
+    queryParams: {},
+    queryEnabled: { type: Boolean, default: void 0 },
+    field: {},
+    apiMethod: {},
+    confimGetter: {}
   },
-  setup(__props) {
+  emits: ["success"],
+  setup(__props, { emit: __emit }) {
     const props = __props;
-    const { data, setData, isLoadingError } = props.noParams === true ? props.useQueryFn({ enabled: toRef(props, "queryEnabled") }) : props.useQueryFn(toRef(props, "queryParams"), { enabled: toRef(props, "queryEnabled") });
-    const submittingItem = ref();
-    const modelValue = computed(() => get(data.value ?? {}, props.field) ?? null);
-    const save = (value) => {
-      if (submittingItem.value !== void 0) return;
-      submittingItem.value = value;
-      return props.apiMethod(set({}, props.field, value)).then((response) => {
-        setData(response.data);
-        Notify.success({ title: "Saved" });
-      }).catch((error) => handleApiError(error, void 0, props.field)).finally(() => {
-        submittingItem.value = void 0;
-      });
-    };
-    let closeModal = null;
-    const showModal = (value) => {
-      closeModal?.();
-      const confirmProps = props.confimGetter?.(value);
-      if (!confirmProps) {
-        save(value);
-        return;
-      }
-      closeModal = Modal.addConfirm({
-        ...confirmProps,
-        onAccept: () => {
-          return save(value);
-        }
-      }, () => closeModal = null);
-    };
-    onBeforeUnmount(() => {
-      closeModal?.();
-      closeModal = null;
-    });
+    const emit = __emit;
+    const { isLoadingError, data, modelValue, submitting, showModal } = useFormAsync(props, (value) => emit("success", value));
     return (_ctx, _cache) => {
       return openBlock(), createBlock(_sfc_main$1, mergeProps({
         ...props,
-        modelValue: modelValue.value,
+        modelValue: unref(modelValue),
         list: _ctx.list,
         optionComponent: _ctx.optionComponent,
-        loading: submittingItem.value,
+        loading: _ctx.loading || unref(submitting),
         disabled: _ctx.disabled || unref(isLoadingError),
         skeleton: _ctx.skeleton || !unref(data)
       }, {
-        "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => showModal($event))
+        "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => unref(showModal)($event))
       }), createSlots({ _: 2 }, [
         _ctx.$slots.option ? {
           name: "option",

package/dist/components/FormAsync/WFormAsyncInput.vue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WFormAsyncInput.vue.d.ts","sourceRoot":"","sources":["../../../src/components/FormAsync/WFormAsyncInput.vue"],"names":[],"mappings":"AAAA,OA0HO,KAAK,EAAC,mBAAmB,EAAC,MAAM,SAAS,CAAA;yBAa/B,KAAK,EAAE,SAAS,SAAS,MAAM,GAAG,MAAM,EAAE,WAAW,eACxD,WAAW,CAAC,OAAO,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,cAClD,mBAAmB,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,WAAW,CAAC,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC,iBAC5F,WAAW,CAAC,OAAO,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC;WAgNxD,mBAAmB,CAAC;;sLAAyD,CAAC,4BAA2B;oBAChG,OAAO,KAAK,EAAE,gBAAgB,CAAC,EAAE,CAAC,GAAG,IAAI;WAClD,GAAG;;uBApCc,GAAG;0BACA,GAAG;uBACN,GAAG;;cAvKxB,SAAS,SAAS,KAAK,KAAG,IAAI;;;;YA8MQ,OAAO,CAAC,OAAO,WAAW,CAAC;;AA1NvE,wBA0N4E;AAC5E,KAAK,mBAAmB,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAG,GAAG,EAAE,CAAC"}
+{"version":3,"file":"WFormAsyncInput.vue.d.ts","sourceRoot":"","sources":["../../../src/components/FormAsync/WFormAsyncInput.vue"],"names":[],"mappings":"AAAA,OAqEO,KAAK,EAAC,mBAAmB,EAAC,MAAM,SAAS,CAAA;yBAW/B,KAAK,EAAE,SAAS,SAAS,MAAM,GAAG,MAAM,EAAE,WAAW,eACxD,WAAW,CAAC,OAAO,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,cAClD,mBAAmB,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,WAAW,CAAC,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC,iBAC5F,WAAW,CAAC,OAAO,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC;WA6JxD,mBAAmB,CAAC;;sLAAyD,CAAC,4BAA2B;oBAChG,OAAO,KAAK,EAAE,gBAAgB,CAAC,EAAE,CAAC,GAAG,IAAI;WAClD,GAAG;;uBApCc,GAAG;0BACA,GAAG;uBACN,GAAG;;cAtHxB,SAAS,SAAS,KAAK,KAAG,IAAI;;;;YA6JQ,OAAO,CAAC,OAAO,WAAW,CAAC;;AAvKvE,wBAuK4E;AAC5E,KAAK,mBAAmB,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAG,GAAG,EAAE,CAAC"}

package/dist/components/FormAsync/WFormAsyncInput.vue.js

@@ -1,21 +1,11 @@
-import { defineComponent, toRef, ref, computed, onBeforeUnmount, openBlock, createBlock, mergeProps, unref, createSlots, withCtx, renderSlot } from 'vue';
+import { defineComponent, computed, createBlock, openBlock, mergeProps, unref, createSlots, withCtx, renderSlot } from 'vue';
 import _sfc_main$1 from '../Input/WInputAsync.vue.js';
-import { Modal } from '../../utils/Modal.js';
-import { Notify } from '../../utils/Notify.js';
-import { handleApiError } from '../../utils/api.js';
-import { get, set } from '../../utils/utils.js';
 import { validateRequired } from '../../utils/validate.js';
+import { useFormAsync } from './use/useFormAsync.js';
 
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "WFormAsyncInput",
   props: {
-    useQueryFn: {},
-    noParams: { type: Boolean },
-    queryParams: {},
-    queryEnabled: { type: Boolean, default: void 0 },
-    field: {},
-    apiMethod: {},
-    confimGetter: {},
     validate: {},
     debounce: {},
     hideButton: { type: Boolean },
@@ -57,61 +47,36 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     emptyValue: {},
     leftError: { type: Boolean },
     filterField: {},
-    filterValue: {}
+    filterValue: {},
+    useQueryFn: {},
+    noParams: { type: Boolean },
+    queryParams: {},
+    queryEnabled: { type: Boolean, default: void 0 },
+    field: {},
+    apiMethod: {},
+    confimGetter: {}
   },
   emits: ["success"],
   setup(__props, { emit: __emit }) {
     const props = __props;
     const emit = __emit;
-    const { data, setData, isLoadingError } = props.noParams === true ? props.useQueryFn({ enabled: toRef(props, "queryEnabled") }) : props.useQueryFn(toRef(props, "queryParams"), { enabled: toRef(props, "queryEnabled") });
-    const submitting = ref(false);
-    const modelValue = computed(() => get(data.value ?? {}, props.field));
+    const { isLoadingError, data, modelValue, submitting, showModal } = useFormAsync(props, (value) => emit("success", value));
     const validateFn = computed(() => {
       const result = Array.isArray(props.validate) ? props.validate.slice() : props.validate ? [props.validate] : [];
       if (props.required && !props.textSecure) result.push(validateRequired);
       return result;
     });
-    const save = (value) => {
-      if (submitting.value) return;
-      submitting.value = true;
-      return props.apiMethod(set({}, props.field, value)).then((response) => {
-        setData(response.data);
-        Notify.success({ title: "Saved" });
-        emit("success", response.data);
-      }).catch((error) => handleApiError(error, void 0, props.field)).finally(() => {
-        submitting.value = false;
-      });
-    };
-    let closeModal = null;
-    const showModal = (value) => {
-      closeModal?.();
-      const confirmProps = props.confimGetter?.(value);
-      if (!confirmProps) {
-        save(value);
-        return;
-      }
-      closeModal = Modal.addConfirm({
-        ...confirmProps,
-        onAccept: () => {
-          return save(value);
-        }
-      }, () => closeModal = null);
-    };
-    onBeforeUnmount(() => {
-      closeModal?.();
-      closeModal = null;
-    });
     return (_ctx, _cache) => {
       return openBlock(), createBlock(_sfc_main$1, mergeProps({
         ...props,
-        modelValue: _ctx.textSecure ? void 0 : modelValue.value,
+        modelValue: _ctx.textSecure ? void 0 : unref(modelValue),
         skeleton: _ctx.skeleton || !unref(data),
         disabled: _ctx.disabled || unref(isLoadingError),
-        loading: _ctx.loading || submitting.value,
+        loading: _ctx.loading || unref(submitting),
         validate: validateFn.value,
-        placeholderSecure: _ctx.textSecure ? !!modelValue.value : void 0
+        placeholderSecure: _ctx.textSecure ? !!unref(modelValue) : void 0
       }, {
-        "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => showModal($event))
+        "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => unref(showModal)($event))
       }), createSlots({ _: 2 }, [
         _ctx.$slots.title ? {
           name: "title",

package/dist/components/FormAsync/WFormAsyncSelect.vue.d.ts

@@ -1,6 +1,6 @@
 import { FormAsyncSelectProps } from './types';
 import { SelectOptionComponent } from '../Select/types';
-declare const _default: <Model, FieldType extends string | number, QueryParamsOptions, QueryParams, Data extends DefaultData, OptionComponent extends SelectOptionComponent<Data>>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_expose?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
+declare const _default: <Model, FieldType extends string[] | number[], QueryParamsOptions, QueryParams, Data extends DefaultData, OptionComponent extends SelectOptionComponent<Data>>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_expose?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
     props: __VLS_PrettifyLocal<Pick<Partial<{}> & Omit<{
         readonly onSuccess?: ((value: Model) => any) | undefined;
     } & import('vue').VNodeProps & import('vue').AllowedComponentProps & import('vue').ComponentCustomProps, never>, "onSuccess"> & FormAsyncSelectProps<Model, FieldType, QueryParamsOptions, QueryParams, Data, OptionComponent>> & import('vue').PublicProps;

package/dist/components/FormAsync/WFormAsyncSelect.vue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WFormAsyncSelect.vue.d.ts","sourceRoot":"","sources":["../../../src/components/FormAsync/WFormAsyncSelect.vue"],"names":[],"mappings":"AAAA,OAgHO,KAAK,EAAC,oBAAoB,EAAC,MAAM,SAAS,CAAA;AACjD,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,2BAA2B,CAAA;yBAYnD,KAAK,EAAE,SAAS,SAAS,MAAM,GAAG,MAAM,EAAE,kBAAkB,EAAE,WAAW,EAAE,IAAI,SAAS,WAAW,EAAE,eAAe,SAAS,qBAAqB,CAAC,IAAI,CAAC,eAC3J,WAAW,CAAC,OAAO,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,cAClD,mBAAmB,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,WAAW,CAAC,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC,iBAC5F,WAAW,CAAC,OAAO,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC;WA2MxD,mBAAmB,CAAC;;kOAAyD,CAAC,4BAA2B;oBAChG,OAAO,KAAK,EAAE,gBAAgB,CAAC,EAAE,CAAC,GAAG,IAAI;WAClD,GAAG;;uBAnCc,GAAG;0BACA,GAAG;uBACL,GAAG;;cAnKzB,SAAS,SAAS,KAAK,KAAG,IAAI;;;;YAyMQ,OAAO,CAAC,OAAO,WAAW,CAAC;;AArNvE,wBAqN4E;AAC5E,KAAK,mBAAmB,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAG,GAAG,EAAE,CAAC"}
+{"version":3,"file":"WFormAsyncSelect.vue.d.ts","sourceRoot":"","sources":["../../../src/components/FormAsync/WFormAsyncSelect.vue"],"names":[],"mappings":"AAAA,OA8DO,KAAK,EAAC,oBAAoB,EAAC,MAAM,SAAS,CAAA;AACjD,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,2BAA2B,CAAA;yBAOnD,KAAK,EAAE,SAAS,SAAS,MAAM,EAAE,GAAG,MAAM,EAAE,EAAE,kBAAkB,EAAE,WAAW,EAAE,IAAI,SAAS,WAAW,EAAE,eAAe,SAAS,qBAAqB,CAAC,IAAI,CAAC,eAC/J,WAAW,CAAC,OAAO,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,cAClD,mBAAmB,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,WAAW,CAAC,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC,iBAC5F,WAAW,CAAC,OAAO,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC;WA+JxD,mBAAmB,CAAC;;kOAAyD,CAAC,4BAA2B;oBAChG,OAAO,KAAK,EAAE,gBAAgB,CAAC,EAAE,CAAC,GAAG,IAAI;WAClD,GAAG;;uBApCc,GAAG;0BACA,GAAG;uBACL,GAAG;;cAxHzB,SAAS,SAAS,KAAK,KAAG,IAAI;;;;YA+JQ,OAAO,CAAC,OAAO,WAAW,CAAC;;AAzKvE,wBAyK4E;AAC5E,KAAK,mBAAmB,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAG,GAAG,EAAE,CAAC"}

package/dist/components/FormAsync/WFormAsyncSelect.vue.js

@@ -1,20 +1,10 @@
-import { defineComponent, toRef, ref, computed, onBeforeUnmount, openBlock, createBlock, mergeProps, unref, createSlots, withCtx, renderSlot } from 'vue';
+import { defineComponent, createBlock, openBlock, mergeProps, unref, createSlots, withCtx, renderSlot } from 'vue';
 import _sfc_main$1 from '../Select/WSelect.vue.js';
-import { Modal } from '../../utils/Modal.js';
-import { Notify } from '../../utils/Notify.js';
-import { handleApiError } from '../../utils/api.js';
-import { get, set } from '../../utils/utils.js';
+import { useFormAsync } from './use/useFormAsync.js';
 
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "WFormAsyncSelect",
   props: {
-    useQueryFn: {},
-    noParams: { type: Boolean },
-    queryParams: {},
-    queryEnabled: { type: Boolean, default: void 0 },
-    field: {},
-    apiMethod: {},
-    confimGetter: {},
     valueGetter: {},
     searchFn: {},
     useQueryFnDefault: {},
@@ -75,59 +65,37 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     optionComponentProps: {},
     useQueryFnOptions: {},
     queryParamsOptions: {},
-    options: {}
+    options: {},
+    useQueryFn: {},
+    noParams: { type: Boolean },
+    queryParams: {},
+    queryEnabled: { type: Boolean, default: void 0 },
+    field: {},
+    apiMethod: {},
+    confimGetter: {}
   },
   emits: ["success"],
   setup(__props, { emit: __emit }) {
     const props = __props;
     const emit = __emit;
-    const { data, setData, isLoadingError } = props.noParams === true ? props.useQueryFn({ enabled: toRef(props, "queryEnabled") }) : props.useQueryFn(toRef(props, "queryParams"), { enabled: toRef(props, "queryEnabled") });
-    const submitting = ref(false);
-    const modelValue = computed(() => get(data.value ?? {}, props.field) ?? []);
-    const save = (value, isSelect) => {
-      if (submitting.value) return;
-      submitting.value = true;
-      return props.apiMethod(set(
-        {},
-        props.field,
-        isSelect ? [...modelValue.value, value] : modelValue.value.filter((item) => item !== value)
-      )).then((response) => {
-        setData(response.data);
-        Notify.success({ title: "Saved" });
-        emit("success", response.data);
-      }).catch((error) => handleApiError(error, void 0, props.field)).finally(() => {
-        submitting.value = false;
-      });
-    };
-    let closeModal = null;
-    const showModal = (value, isSelect) => {
-      closeModal?.();
-      const confirmProps = props.confimGetter?.(value, isSelect);
-      if (!confirmProps) {
-        save(value, isSelect);
-        return;
-      }
-      closeModal = Modal.addConfirm({
-        ...confirmProps,
-        onAccept: () => {
-          return save(value, isSelect);
-        }
-      }, () => closeModal = null);
+    const { isLoadingError, data, modelValue, submitting, showModal } = useFormAsync(props, (value) => emit("success", value));
+    const getNewValue = (value) => {
+      const newValue = modelValue.value?.slice() ?? [];
+      const index = newValue.indexOf(value);
+      if (index === -1) newValue.push(value);
+      else newValue.splice(index, 1);
+      return newValue;
     };
-    onBeforeUnmount(() => {
-      closeModal?.();
-      closeModal = null;
-    });
     return (_ctx, _cache) => {
       return openBlock(), createBlock(_sfc_main$1, mergeProps({
         ...props,
-        modelValue: modelValue.value,
+        modelValue: unref(modelValue) ?? [],
         skeleton: _ctx.skeleton || !unref(data),
         disabled: _ctx.disabled || unref(isLoadingError),
-        loading: _ctx.loading || submitting.value
+        loading: _ctx.loading || unref(submitting)
       }, {
-        onSelect: _cache[0] || (_cache[0] = ($event) => showModal($event, true)),
-        onUnselect: _cache[1] || (_cache[1] = ($event) => showModal($event, false))
+        onSelect: _cache[0] || (_cache[0] = ($event) => unref(showModal)(getNewValue($event))),
+        onUnselect: _cache[1] || (_cache[1] = ($event) => unref(showModal)(getNewValue($event)))
       }), createSlots({ _: 2 }, [
         _ctx.$slots.title ? {
           name: "title",

package/dist/components/FormAsync/WFormAsyncSelectInfiniteSingle.vue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WFormAsyncSelectInfiniteSingle.vue.d.ts","sourceRoot":"","sources":["../../../src/components/FormAsync/WFormAsyncSelectInfiniteSingle.vue"],"names":[],"mappings":"AAAA,OA2GO,KAAK,EAAC,kCAAkC,EAAC,MAAM,SAAS,CAAA;AAC/D,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,2BAA2B,CAAA;yBAYnD,KAAK,EAAE,SAAS,SAAS,MAAM,GAAG,MAAM,EAAE,kBAAkB,EAAE,WAAW,EAAE,IAAI,SAAS,WAAW,EAAE,eAAe,SAAS,qBAAqB,CAAC,IAAI,CAAC,EAAE,UAAU,SAAS,OAAO,uBACvL,WAAW,CAAC,OAAO,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,cAClD,mBAAmB,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,WAAW,CAAC,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC,iBAC5F,WAAW,CAAC,OAAO,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC;WA+LxD,mBAAmB,CAAC;;4PAAyD,CAAC,4BAA2B;oBAChG,OAAO,KAAK,EAAE,gBAAgB,CAAC,EAAE,CAAC,GAAG,IAAI;WAClD,GAAG;;uBAnCc,GAAG;0BACA,GAAG;uBACN,GAAG;;cAvJxB,SAAS,SAAS,KAAK,KAAG,IAAI;;;;YA6LQ,OAAO,CAAC,OAAO,WAAW,CAAC;;AAzMvE,wBAyM4E;AAC5E,KAAK,mBAAmB,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAG,GAAG,EAAE,CAAC"}
+{"version":3,"file":"WFormAsyncSelectInfiniteSingle.vue.d.ts","sourceRoot":"","sources":["../../../src/components/FormAsync/WFormAsyncSelectInfiniteSingle.vue"],"names":[],"mappings":"AAAA,OAmDO,KAAK,EAAC,kCAAkC,EAAC,MAAM,SAAS,CAAA;AAC/D,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,2BAA2B,CAAA;yBAOnD,KAAK,EAAE,SAAS,SAAS,MAAM,GAAG,MAAM,EAAE,kBAAkB,EAAE,WAAW,EAAE,IAAI,SAAS,WAAW,EAAE,eAAe,SAAS,qBAAqB,CAAC,IAAI,CAAC,EAAE,UAAU,SAAS,OAAO,uBACvL,WAAW,CAAC,OAAO,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,cAClD,mBAAmB,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,WAAW,CAAC,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC,iBAC5F,WAAW,CAAC,OAAO,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC;WA4IxD,mBAAmB,CAAC;;4PAAyD,CAAC,4BAA2B;oBAChG,OAAO,KAAK,EAAE,gBAAgB,CAAC,EAAE,CAAC,GAAG,IAAI;WAClD,GAAG;;uBAnCc,GAAG;0BACA,GAAG;uBACN,GAAG;;cAtGxB,SAAS,SAAS,KAAK,KAAG,IAAI;;;;YA4IQ,OAAO,CAAC,OAAO,WAAW,CAAC;;AAtJvE,wBAsJ4E;AAC5E,KAAK,mBAAmB,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAG,GAAG,EAAE,CAAC"}

package/dist/components/FormAsync/WFormAsyncSelectInfiniteSingle.vue.js

@@ -1,20 +1,10 @@
-import { defineComponent, toRef, ref, computed, onBeforeUnmount, openBlock, createBlock, mergeProps, unref, createSlots, withCtx, renderSlot } from 'vue';
+import { defineComponent, createBlock, openBlock, mergeProps, unref, createSlots, withCtx, renderSlot } from 'vue';
 import _sfc_main$1 from '../Select/WSelectAsyncSingle.vue.js';
-import { Modal } from '../../utils/Modal.js';
-import { Notify } from '../../utils/Notify.js';
-import { handleApiError } from '../../utils/api.js';
-import { get, set } from '../../utils/utils.js';
+import { useFormAsync } from './use/useFormAsync.js';
 
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "WFormAsyncSelectInfiniteSingle",
   props: {
-    useQueryFn: {},
-    noParams: { type: Boolean },
-    queryParams: {},
-    queryEnabled: { type: Boolean, default: void 0 },
-    field: {},
-    apiMethod: {},
-    confimGetter: {},
     allowClear: { type: Boolean },
     searchModel: { type: Boolean },
     previewData: {},
@@ -77,54 +67,29 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     maxWidth: {},
     horizontalAlign: {},
     optionComponent: {},
-    optionComponentProps: {}
+    optionComponentProps: {},
+    useQueryFn: {},
+    noParams: { type: Boolean },
+    queryParams: {},
+    queryEnabled: { type: Boolean, default: void 0 },
+    field: {},
+    apiMethod: {},
+    confimGetter: {}
   },
   emits: ["success"],
   setup(__props, { emit: __emit }) {
     const props = __props;
     const emit = __emit;
-    const { data, setData, isLoadingError } = props.noParams === true ? props.useQueryFn({ enabled: toRef(props, "queryEnabled") }) : props.useQueryFn(toRef(props, "queryParams"), { enabled: toRef(props, "queryEnabled") });
-    const submitting = ref(false);
-    const modelValue = computed(() => get(data.value ?? {}, props.field) ?? null);
-    const save = (value) => {
-      if (submitting.value) return;
-      submitting.value = true;
-      return props.apiMethod(set({}, props.field, value)).then((response) => {
-        setData(response.data);
-        Notify.success({ title: "Saved" });
-        emit("success", response.data);
-      }).catch((error) => handleApiError(error, void 0, props.field)).finally(() => {
-        submitting.value = false;
-      });
-    };
-    let closeModal = null;
-    const showModal = (value) => {
-      closeModal?.();
-      const confirmProps = props.confimGetter?.(value);
-      if (!confirmProps) {
-        save(value);
-        return;
-      }
-      closeModal = Modal.addConfirm({
-        ...confirmProps,
-        onAccept: () => {
-          return save(value);
-        }
-      }, () => closeModal = null);
-    };
-    onBeforeUnmount(() => {
-      closeModal?.();
-      closeModal = null;
-    });
+    const { isLoadingError, data, modelValue, submitting, showModal } = useFormAsync(props, (value) => emit("success", value));
     return (_ctx, _cache) => {
       return openBlock(), createBlock(_sfc_main$1, mergeProps({
         ...props,
-        modelValue: modelValue.value,
+        modelValue: unref(modelValue),
         skeleton: _ctx.skeleton || !unref(data),
         disabled: _ctx.disabled || unref(isLoadingError),
-        loading: _ctx.loading || submitting.value
+        loading: _ctx.loading || unref(submitting)
       }, {
-        "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => showModal($event ?? null))
+        "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => unref(showModal)($event ?? null))
       }), createSlots({ _: 2 }, [
         _ctx.$slots.title ? {
           name: "title",

package/dist/components/FormAsync/WFormAsyncSelectSingle.vue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WFormAsyncSelectSingle.vue.d.ts","sourceRoot":"","sources":["../../../src/components/FormAsync/WFormAsyncSelectSingle.vue"],"names":[],"mappings":"AAAA,OA2GO,KAAK,EAAC,0BAA0B,EAAC,MAAM,SAAS,CAAA;AACvD,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,2BAA2B,CAAA;yBAYnD,KAAK,EAAE,SAAS,SAAS,MAAM,GAAG,MAAM,EAAE,kBAAkB,EAAE,WAAW,EAAE,IAAI,SAAS,WAAW,EAAE,eAAe,SAAS,qBAAqB,CAAC,IAAI,CAAC,EAAE,UAAU,SAAS,OAAO,uBACvL,WAAW,CAAC,OAAO,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,cAClD,mBAAmB,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,WAAW,CAAC,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC,iBAC5F,WAAW,CAAC,OAAO,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC;WA+LxD,mBAAmB,CAAC;;oPAAyD,CAAC,4BAA2B;oBAChG,OAAO,KAAK,EAAE,gBAAgB,CAAC,EAAE,CAAC,GAAG,IAAI;WAClD,GAAG;;uBAnCc,GAAG;0BACA,GAAG;uBACN,GAAG;;cAvJxB,SAAS,SAAS,KAAK,KAAG,IAAI;;;;YA6LQ,OAAO,CAAC,OAAO,WAAW,CAAC;;AAzMvE,wBAyM4E;AAC5E,KAAK,mBAAmB,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAG,GAAG,EAAE,CAAC"}
+{"version":3,"file":"WFormAsyncSelectSingle.vue.d.ts","sourceRoot":"","sources":["../../../src/components/FormAsync/WFormAsyncSelectSingle.vue"],"names":[],"mappings":"AAAA,OAmDO,KAAK,EAAC,0BAA0B,EAAC,MAAM,SAAS,CAAA;AACvD,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,2BAA2B,CAAA;yBAOnD,KAAK,EAAE,SAAS,SAAS,MAAM,GAAG,MAAM,EAAE,kBAAkB,EAAE,WAAW,EAAE,IAAI,SAAS,WAAW,EAAE,eAAe,SAAS,qBAAqB,CAAC,IAAI,CAAC,EAAE,UAAU,SAAS,OAAO,uBACvL,WAAW,CAAC,OAAO,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,cAClD,mBAAmB,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,WAAW,CAAC,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC,iBAC5F,WAAW,CAAC,OAAO,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC;WA4IxD,mBAAmB,CAAC;;oPAAyD,CAAC,4BAA2B;oBAChG,OAAO,KAAK,EAAE,gBAAgB,CAAC,EAAE,CAAC,GAAG,IAAI;WAClD,GAAG;;uBAnCc,GAAG;0BACA,GAAG;uBACN,GAAG;;cAtGxB,SAAS,SAAS,KAAK,KAAG,IAAI;;;;YA4IQ,OAAO,CAAC,OAAO,WAAW,CAAC;;AAtJvE,wBAsJ4E;AAC5E,KAAK,mBAAmB,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAG,GAAG,EAAE,CAAC"}