@aplus-frontend/ui 7.10.0 → 7.10.2

package/es/src/ap-form/search-form/hooks/use-count-per-row.d.ts

@@ -1,5 +1,5 @@
-import { ApFormSearchFormProps } from '../../../ap-form/interface';
 import { Ref, ComputedRef } from 'vue';
+import { ApFormSearchFormProps } from '../../../ap-form/interface';
 declare const defaultBreakPoint: {
     readonly xs: 0;
     readonly sm: 768;

package/es/src/ap-form/search-form/hooks/use-count-per-row.mjs

@@ -1,24 +1,24 @@
-import { ref as w, computed as o, watch as P, unref as v } from "vue";
-import { useResizeObserver as R } from "@vueuse/core";
+import { useResizeObserver as w } from "@vueuse/core";
+import { ref as P, computed as o, watch as v, unref as R } from "vue";
 const h = { xs: 0, sm: 768, md: 1280, lg: 1728 };
 function z(r) {
   return Object.entries(r).sort((s, n) => n[1] - s[1]);
 }
 const p = (r, s) => {
-  const n = w(0), c = o(() => {
+  const n = P(0), c = o(() => {
     const { resize: e, resizeTarget: t } = r;
     return e?.target ? e.target === "document" ? document.documentElement : e.target === "form" ? s.value?.$el : e.target : t ?? document.documentElement;
   }), i = o(() => {
     const e = r.resize?.breakPoint ?? h;
     return z(e);
   });
-  P(
+  v(
     () => c.value,
     (e, t, m) => {
       const u = typeof e == "string" ? document.querySelector(e) : e;
       if (!u)
         return;
-      const { stop: d } = R(u, (f) => {
+      const { stop: d } = w(u, (f) => {
         const l = f[0], { width: g } = l.contentRect;
         n.value = g;
       });
@@ -30,7 +30,7 @@ const p = (r, s) => {
   );
   const a = o(() => {
     for (const [e, t] of i.value)
-      if (v(n) > t)
+      if (R(n) > t)
         return e;
     return "md";
   });

package/es/src/ap-form/search-form/index.vue.d.ts

@@ -31,6 +31,9 @@ declare function __VLS_template(): {
                 readonly onSubmit?: ((e: Event) => void) | undefined;
                 readonly layout?: string | undefined;
                 readonly disabled?: boolean | undefined;
+                readonly prefixCls?: string | undefined;
+                readonly variant?: "filled" | "outlined" | "borderless" | "underlined" | undefined;
+                readonly name?: string | undefined;
                 readonly labelCol?: (Partial< ExtractPropTypes<{
                     span: (StringConstructor | NumberConstructor)[];
                     order: (StringConstructor | NumberConstructor)[];
@@ -100,7 +103,6 @@ declare function __VLS_template(): {
                 readonly colon?: boolean | undefined;
                 readonly labelAlign?: FormLabelAlign | undefined;
                 readonly labelWrap?: boolean | undefined;
-                readonly prefixCls?: string | undefined;
                 readonly requiredMark?: "" | RequiredMark | undefined;
                 readonly hideRequiredMark?: boolean | undefined;
                 readonly rules?: {
@@ -109,13 +111,11 @@ declare function __VLS_template(): {
                 readonly validateMessages?: ValidateMessages | undefined;
                 readonly validateOnRuleChange?: boolean | undefined;
                 readonly scrollToFirstError?: boolean | Options<any> | undefined;
-                readonly name?: string | undefined;
                 readonly validateTrigger?: string | string[] | undefined;
                 readonly onFieldsChange?: ((changedFields: FieldData[], allFields: FieldData[]) => void) | undefined;
                 readonly onFinish?: ((values: any) => void) | undefined;
                 readonly onFinishFailed?: ((errorInfo: ValidateErrorEntity<any>) => void) | undefined;
                 readonly onValidate?: ((name: string | number | string[] | number[], status: boolean, errors: string[]) => void) | undefined;
-                readonly variant?: "filled" | "outlined" | "borderless" | "underlined" | undefined;
                 readonly initialValues?: Recordable | undefined;
                 readonly onValuesChange?: ((changedValues: Recordable, allValues: Recordable, fieldName: NamePath) => void) | undefined;
                 readonly syncToUrl?: boolean | ((values: Recordable, type: "get" | "set") => Recordable) | undefined;
@@ -829,7 +829,7 @@ declare function __VLS_template(): {
             validateOnRuleChange: boolean;
             validateTrigger: string | string[];
             syncToUrl: boolean | ((values: Recordable, type: "get" | "set") => Recordable);
-        }> & Omit<Readonly< ApFormProps> & Readonly<{}>, "getFieldsValue" | "setFieldsValue" | "setFieldValue" | "resetFields" | "clearValidate" | "validateFields" | "validate" | "scrollToField" | "getInternalInstance" | "validateFieldsReturnTransformed" | "getFieldsValueTransformed" | "registerWatch" | ("layout" | "colon" | "labelAlign" | "hideRequiredMark" | "validateOnRuleChange" | "validateTrigger" | "syncToUrl")> & ShallowUnwrapRef<{
+        }> & Omit<Readonly< ApFormProps> & Readonly<{}>, "validate" | "getFieldsValue" | "setFieldsValue" | "setFieldValue" | "resetFields" | "clearValidate" | "validateFields" | "scrollToField" | "getInternalInstance" | "validateFieldsReturnTransformed" | "getFieldsValueTransformed" | "registerWatch" | ("layout" | "colon" | "labelAlign" | "hideRequiredMark" | "validateOnRuleChange" | "validateTrigger" | "syncToUrl")> & ShallowUnwrapRef<{
             setFieldsValue: (fields: Partial<any>) => void;
             setFieldValue: (name: NamePath, value: any, triggerChange?: boolean, optimizeFn?: UpdateModelOptimizeFn) => void;
             resetFields: () => Promise<void>;
@@ -1019,6 +1019,9 @@ declare const __VLS_component: DefineComponent<ApFormSearchFormProps, {
             readonly onSubmit?: ((e: Event) => void) | undefined;
             readonly layout?: string | undefined;
             readonly disabled?: boolean | undefined;
+            readonly prefixCls?: string | undefined;
+            readonly variant?: "filled" | "outlined" | "borderless" | "underlined" | undefined;
+            readonly name?: string | undefined;
             readonly labelCol?: (Partial< ExtractPropTypes<{
                 span: (StringConstructor | NumberConstructor)[];
                 order: (StringConstructor | NumberConstructor)[];
@@ -1088,7 +1091,6 @@ declare const __VLS_component: DefineComponent<ApFormSearchFormProps, {
             readonly colon?: boolean | undefined;
             readonly labelAlign?: FormLabelAlign | undefined;
             readonly labelWrap?: boolean | undefined;
-            readonly prefixCls?: string | undefined;
             readonly requiredMark?: "" | RequiredMark | undefined;
             readonly hideRequiredMark?: boolean | undefined;
             readonly rules?: {
@@ -1097,13 +1099,11 @@ declare const __VLS_component: DefineComponent<ApFormSearchFormProps, {
             readonly validateMessages?: ValidateMessages | undefined;
             readonly validateOnRuleChange?: boolean | undefined;
             readonly scrollToFirstError?: boolean | Options<any> | undefined;
-            readonly name?: string | undefined;
             readonly validateTrigger?: string | string[] | undefined;
             readonly onFieldsChange?: ((changedFields: FieldData[], allFields: FieldData[]) => void) | undefined;
             readonly onFinish?: ((values: any) => void) | undefined;
             readonly onFinishFailed?: ((errorInfo: ValidateErrorEntity<any>) => void) | undefined;
             readonly onValidate?: ((name: string | number | string[] | number[], status: boolean, errors: string[]) => void) | undefined;
-            readonly variant?: "filled" | "outlined" | "borderless" | "underlined" | undefined;
             readonly initialValues?: Recordable | undefined;
             readonly onValuesChange?: ((changedValues: Recordable, allValues: Recordable, fieldName: NamePath) => void) | undefined;
             readonly syncToUrl?: boolean | ((values: Recordable, type: "get" | "set") => Recordable) | undefined;
@@ -1817,7 +1817,7 @@ declare const __VLS_component: DefineComponent<ApFormSearchFormProps, {
         validateOnRuleChange: boolean;
         validateTrigger: string | string[];
         syncToUrl: boolean | ((values: Recordable, type: "get" | "set") => Recordable);
-    }> & Omit<Readonly< ApFormProps> & Readonly<{}>, "getFieldsValue" | "setFieldsValue" | "setFieldValue" | "resetFields" | "clearValidate" | "validateFields" | "validate" | "scrollToField" | "getInternalInstance" | "validateFieldsReturnTransformed" | "getFieldsValueTransformed" | "registerWatch" | ("layout" | "colon" | "labelAlign" | "hideRequiredMark" | "validateOnRuleChange" | "validateTrigger" | "syncToUrl")> & ShallowUnwrapRef<{
+    }> & Omit<Readonly< ApFormProps> & Readonly<{}>, "validate" | "getFieldsValue" | "setFieldsValue" | "setFieldValue" | "resetFields" | "clearValidate" | "validateFields" | "scrollToField" | "getInternalInstance" | "validateFieldsReturnTransformed" | "getFieldsValueTransformed" | "registerWatch" | ("layout" | "colon" | "labelAlign" | "hideRequiredMark" | "validateOnRuleChange" | "validateTrigger" | "syncToUrl")> & ShallowUnwrapRef<{
         setFieldsValue: (fields: Partial<any>) => void;
         setFieldValue: (name: NamePath, value: any, triggerChange?: boolean, optimizeFn?: UpdateModelOptimizeFn) => void;
         resetFields: () => Promise<void>;

package/es/src/ap-form/search-form/index.vue.mjs

@@ -1,20 +1,20 @@
 import { isVNode as ie, defineComponent as ce, useSlots as ue, ref as pe, shallowRef as w, computed as R, unref as a, watch as M, createVNode as o, Fragment as _, createBlock as x, openBlock as p, mergeProps as de, withCtx as I, resolveDynamicComponent as T, createElementBlock as fe, renderList as me, normalizeStyle as he } from "vue";
 import { Col as b, Flex as k, Button as q, Row as ge } from "@aplus-frontend/antdv";
-import "../ap-form.vue.mjs";
-import "../item/index.vue2.mjs";
-import { genRealChildren as H } from "../item-group/helper.mjs";
-import "../../config-provider/index.mjs";
 import { isArray as xe, isBoolean as ye, omit as ve } from "lodash-unified";
+import { floorWith as H } from "../../utils/format.mjs";
+import { useDevWarning as Se } from "../../utils/warning.mjs";
+import "../../config-provider/index.mjs";
 import "../../utils/index.mjs";
-import { execFunc as G, diffFormItem as Se } from "./utils.mjs";
+import "../ap-form.vue.mjs";
+import "../item/index.vue2.mjs";
+import { genRealChildren as G } from "../item-group/helper.mjs";
+import Ce from "../style/search-form.mjs";
 import "./components/popover-filter.vue.mjs";
-import { useCountPerRow as Ce } from "./hooks/use-count-per-row.mjs";
 import "./components/popover-sorter/index.vue.mjs";
-import { useSorter as we } from "./hooks/use-sorter.mjs";
-import { getTargetNode as Re } from "./hooks/use-collapse-input-count.mjs";
-import { useDevWarning as _e } from "../../utils/warning.mjs";
-import be from "../style/search-form.mjs";
-import { floorWith as J } from "../../utils/format.mjs";
+import { getTargetNode as we } from "./hooks/use-collapse-input-count.mjs";
+import { useCountPerRow as Re } from "./hooks/use-count-per-row.mjs";
+import { useSorter as _e } from "./hooks/use-sorter.mjs";
+import { execFunc as J, diffFormItem as be } from "./utils.mjs";
 import { useNamespace as Fe } from "../../config-provider/hooks/use-namespace.mjs";
 import { useLocale as Ae } from "../../config-provider/hooks/use-locale.mjs";
 import { isDef as K } from "../../utils/is.mjs";
@@ -126,40 +126,40 @@ const r = 100, nt = /* @__PURE__ */ ce({
     expose: X
   }) {
     const y = ue(), t = d;
-    _e("SearchForm").deprecated(typeof t.resizeTarget < "u", "resizeTarget", "resize.target");
-    const Y = be("ap-form-search-form"), {
+    Se("SearchForm").deprecated(typeof t.resizeTarget < "u", "resizeTarget", "resize.target");
+    const Y = Ce("ap-form-search-form"), {
       b: f
     } = Fe("ap-form-search-form"), {
       t: P
-    } = Ae(), v = pe(), E = w(), Z = Ce(t, E), W = w();
+    } = Ae(), v = pe(), E = w(), Z = Re(t, E), W = w();
     function z() {
       const e = v.value?.getFieldsValueTransformed(!0);
-      G(t.onSubmit, e);
+      J(t.onSubmit, e);
     }
     function ee() {
-      t.customReset || v.value?.resetFields?.(), G(t.onReset);
+      t.customReset || v.value?.resetFields?.(), J(t.onReset);
     }
     const te = (e) => K(e) ? (xe(e) ? e : [e]).join("") : Date.now();
     let O = [];
-    const m = w(H(y.default())), c = w(y.extra?.()), L = R(() => J(r / a(Z), 4)), {
+    const m = w(G(y.default())), c = w(y.extra?.()), L = R(() => H(r / a(Z), 4)), {
       items: F,
       sorted: $,
       handleClickConfirm: A
-    } = we(m);
+    } = _e(m);
     M(() => y.default(), (e) => {
-      O = m.value, m.value = Se(O, H(e)), $.value = !1;
+      O = m.value, m.value = be(O, G(e)), $.value = !1;
     }), M(() => y.extra?.(), (e) => {
       c.value = e;
     });
     function oe(e) {
-      return J(e * (r / 24), 4);
+      return H(e * (r / 24), 4);
     }
     const n = R(() => {
       const e = m.value, u = [], l = [], g = [], s = a(L);
       let S = 0, N = 0;
       const le = r * t.maxRows - s * (a(c) && !t.extraInAction ? 2 : 1);
       e.forEach((B) => {
-        const D = Re(B);
+        const D = we(B);
         if (!D)
           return;
         const i = D.props;

package/es/src/ap-form/search-form/utils.mjs

@@ -1,5 +1,5 @@
-import { cloneVNode as l } from "vue";
 import { isArray as a, isFunction as p } from "lodash-unified";
+import { cloneVNode as l } from "vue";
 function x(n, r) {
   const t = u(n), o = u(r);
   return r.map((e) => {

package/es/src/ap-form/set/index.vue.mjs

@@ -1,7 +1,7 @@
 import { defineComponent as c, useSlots as u, cloneVNode as p, onMounted as f, createElementBlock as d, openBlock as o, Fragment as V, renderList as _, createBlock as y, resolveDynamicComponent as C } from "vue";
-import { useInjectForm as F } from "../context.mjs";
-import { isFunction as k, cloneDeep as g } from "lodash-unified";
-import { isPromise as h } from "../../utils/is.mjs";
+import { isFunction as F, cloneDeep as k } from "lodash-unified";
+import { isPromise as g } from "../../utils/is.mjs";
+import { useInjectForm as h } from "../context.mjs";
 const I = /* @__PURE__ */ c({
   name: "ApFormSet",
   __name: "index",
@@ -12,15 +12,15 @@ const I = /* @__PURE__ */ c({
     transform: {}
   },
   setup(i) {
-    const { internalInstance: l } = F(), s = u(), e = i, m = () => (s.default?.() || []).map((r, t) => {
+    const { internalInstance: l } = h(), s = u(), e = i, m = () => (s.default?.() || []).map((r, t) => {
       const a = e.as === "array" ? [e.name, t] : [e.name, r.props?.name || ""];
       return p(r, { name: a });
     });
     return f(async () => {
-      let n = k(e.initialValue) ? e.initialValue() : e.initialValue;
-      h(n) && (n = await n), l?.registerField({
+      let n = F(e.initialValue) ? e.initialValue() : e.initialValue;
+      g(n) && (n = await n), l?.registerField({
         name: e.name,
-        initialValue: g(n),
+        initialValue: k(n),
         transform: e.transform
       });
     }), (n, r) => (o(!0), d(V, null, _(m(), (t, a) => (o(), y(C(t), { key: a }))), 128));

package/es/src/ap-form/style/item-text-group.mjs

@@ -1,5 +1,5 @@
-import { genComponentStyleHook as r } from "../../utils/cssinjs/index.mjs";
-const n = (t) => ({
+import { genComponentStyleHook as n } from "../../utils/cssinjs/index.mjs";
+const o = (t) => ({
   [t.componentCls]: {
     "&-compact": {
       ".ant-select": {
@@ -27,34 +27,19 @@ const n = (t) => ({
         }
       },
       ".ant-form-item:first-child": {
-        ".ant-form-item-control-input-content > :first-child, .ant-select-selector": {
-          borderStartEndRadius: 0,
-          borderEndEndRadius: 0
-        },
-        ".ant-form-item-control-input-content > .ant-input-group > :last-child, .ant-select-selector": {
+        ".ant-select-selector,\n            .ant-form-item-control-input-content > :first-child,\n            .ant-form-item-control-input-content .ant-input-group > :last-child,\n            .ant-form-item-control-input-content .ant-input-number-group > :last-child": {
           borderStartEndRadius: 0,
           borderEndEndRadius: 0
         }
       },
       ".ant-form-item:last-child": {
-        ".ant-form-item-control-input-content > :first-child, .ant-select-selector": {
-          borderStartStartRadius: 0,
-          borderEndStartRadius: 0
-        },
-        ".ant-form-item-control-input-content > .ant-input-group > :first-child, .ant-select-selector": {
-          borderStartStartRadius: 0,
-          borderEndStartRadius: 0
-        },
-        ".ant-form-item-control-input-content .ant-input-group > :first-child, .ant-select-selector": {
+        ".ant-select-selector,\n          .ant-form-item-control-input-content > :first-child,\n          .ant-form-item-control-input-content .ant-input-group > :first-child,\n          .ant-form-item-control-input-content .ant-input-number-group > :first-child": {
           borderStartStartRadius: 0,
           borderEndStartRadius: 0
         }
       },
       ".ant-form-item:not(:first-child):not(:last-child)": {
-        ".ant-form-item-control-input-content > :first-child, .ant-select-selector": {
-          borderRadius: 0
-        },
-        ".ant-form-item-control-input-content > .ant-input-group > *, .ant-select-selector": {
+        ".ant-select-selector,\n            .ant-form-item-control-input-content > :first-child,\n            .ant-form-item-control-input-content .ant-input-group > *,\n            .ant-form-item-control-input-content .ant-input-number-group > *": {
           borderRadius: 0
         }
       },
@@ -66,8 +51,8 @@ const n = (t) => ({
   ".ant-form-vertical .ant-input-group.ant-input-group-compact > *": {
     verticalAlign: "bottom"
   }
-}), o = r("ApForm.ItemTextGroup", (t) => [n(t)]);
+}), e = n("ApForm.ItemTextGroup", (t) => [o(t)]);
 export {
-  o as default,
-  n as genFormItemTextGroupStyle
+  e as default,
+  o as genFormItemTextGroupStyle
 };

package/es/src/ap-form/style/item.mjs

@@ -1,6 +1,6 @@
-import { genComponentStyleHook as r } from "../../utils/cssinjs/index.mjs";
-const o = (n) => {
-  const { componentCls: e, namespace: a } = n, i = `${e}--disabled`, t = n.calc(n.controlHeight).sub(n.calc(n.lineWidth).mul(2)).equal();
+import { genComponentStyleHook as o } from "../../utils/cssinjs/index.mjs";
+const l = (n) => {
+  const { componentCls: e, namespace: t, antdv: i } = n, r = `${e}--disabled`, a = n.calc(n.controlHeight).sub(n.calc(n.lineWidth).mul(2)).equal();
   return {
     [e]: {
       // bordered
@@ -12,7 +12,7 @@ const o = (n) => {
         ".ant-input-affix-wrapper": {
           padding: 0
         },
-        [`&:has(.${a}-batch-input-group):has(.ant-select)`]: {
+        [`&:has(.${t}-batch-input-group):has(.ant-select)`]: {
           ".ant-input-affix-wrapper": {
             paddingInlineEnd: n.space
           }
@@ -23,7 +23,7 @@ const o = (n) => {
             paddingInlineStart: 0
           }
         },
-        [`&:has(div.${a}-batch-input-group .ant-input)`]: {
+        [`&:has(div.${t}-batch-input-group .ant-input)`]: {
           paddingInlineEnd: n.space,
           ".ant-input": {
             paddingInlineStart: 0
@@ -52,7 +52,7 @@ const o = (n) => {
           background: "unset !important"
         },
         ".ant-select-single .ant-select-selector": {
-          height: `${t} !important`
+          height: `${a} !important`
         },
         "input.ant-input-number-input": {
           paddingInlineStart: 0
@@ -72,25 +72,25 @@ const o = (n) => {
         },
         ".ant-form-item-label > label": {
           paddingRight: n.spaceLG,
-          height: t,
+          height: a,
           "&::after": {
             margin: 0
           }
         },
         ".ant-form-item-control-input": {
-          minHeight: t,
+          minHeight: a,
           ".ant-select-single": {
             height: "unset"
           }
         },
-        [`&:hover:not(${i})`]: {
+        [`&:hover:not(${r})`]: {
           borderColor: n.hoverColorBase
         },
         "&:focus": {
           borderColor: n.activeColorBase,
-          boxShadow: "0 0 0 2px rgba(5, 155, 255, 0.1)"
+          boxShadow: `0 0 0 2px ${n.calc(i.controlOutline).colorMix(10)}`
         },
-        [`.${a}-batch-input-group-popover-input__popover`]: {
+        [`.${t}-batch-input-group-popover-input__popover`]: {
           width: "calc(100% + 12px)"
         }
       },
@@ -105,7 +105,7 @@ const o = (n) => {
       // focus
       "&--focused": {
         borderColor: n.activeColorBase,
-        boxShadow: "0 0 0 2px rgba(5, 155, 255, 0.1)"
+        boxShadow: `0 0 0 2px ${n.calc(i.controlOutline).colorMix(10)}`
       },
       // other
       ".ant-form-show-help": {
@@ -132,8 +132,8 @@ const o = (n) => {
       }
     }
   };
-}, p = r("ApForm", (n) => [o(n)]);
+}, d = o("ApForm", (n) => [l(n)]);
 export {
-  p as default,
-  o as genApFormItemStyle
+  d as default,
+  l as genApFormItemStyle
 };

package/es/src/ap-form/utils/params.d.ts

@@ -1,6 +1,6 @@
+import { UrlParams } from '@vueuse/core';
 import { Recordable } from '../../type';
 import { ApFormProps } from '../interface';
-import { UrlParams } from '@vueuse/core';
 /**
  * 获取查询参数
  * @param syncToUrl

package/es/src/ap-grid/editable/form-item.vue.d.ts

@@ -1,5 +1,5 @@
-import { EditableGridFormItemExpose, EditableGridFormItemProps } from './interface';
 import { Recordable } from '../../type';
+import { EditableGridFormItemExpose, EditableGridFormItemProps } from './interface';
 import { VNodeProps, AllowedComponentProps, ComponentCustomProps, PublicProps, ShallowUnwrapRef, VNode } from 'vue';
 declare const _default: <RecordType extends Recordable = any>(__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<{} & VNodeProps & AllowedComponentProps & ComponentCustomProps, never>, never> & EditableGridFormItemProps<RecordType> & Partial<{}>> & PublicProps;

package/es/src/ap-grid/editable/form-item.vue.mjs

@@ -1,13 +1,13 @@
 import { defineComponent as z, useSlots as G, toRef as H, ref as c, unref as s, watch as K, nextTick as P, createBlock as A, openBlock as W, mergeProps as g, withCtx as h, createVNode as U, createSlots as $, renderList as q, renderSlot as J, normalizeProps as Q, guardReactiveProps as X } from "vue";
-import { ApForm as y } from "../../ap-form/index.mjs";
 import { isUndefined as Y, isNumber as d, cloneDeep as Z, isArray as M, omit as ee } from "lodash-unified";
+import { ApForm as y } from "../../ap-form/index.mjs";
+import { useInjectForm as te } from "../../ap-form/context.mjs";
+import { getModelValue as oe } from "../../ap-form/utils/get.mjs";
 import "../../config-provider/index.mjs";
 import "../../utils/index.mjs";
-import { useGetEditableColumns as te } from "../hooks/use-editable-columns.mjs";
+import { useDevWarning as ae } from "../../utils/warning.mjs";
+import { useGetEditableColumns as le } from "../hooks/use-editable-columns.mjs";
 import "../index.vue2.mjs";
-import { useInjectForm as oe } from "../../ap-form/context.mjs";
-import { getModelValue as ae } from "../../ap-form/utils/get.mjs";
-import { useDevWarning as le } from "../../utils/warning.mjs";
 import ne from "../style/editable.mjs";
 import { useNamespace as re } from "../../config-provider/hooks/use-namespace.mjs";
 import { useGlobalConfig as se } from "../../config-provider/hooks/use-global-config.mjs";
@@ -173,19 +173,19 @@ const ve = /* @__PURE__ */ z({
     expose: b
   }) {
     const x = G(), a = w;
-    le("EditableGridFormItem")(!1, "breaking", "EditableGridFormItem has been EOL, Please use EditableAgGridFormItem(https://aplus.aplnk.com/aplus-ui/components/ag-grid/editable/) instead.");
+    ae("EditableGridFormItem")(!1, "breaking", "EditableGridFormItem has been EOL, Please use EditableAgGridFormItem(https://aplus.aplnk.com/aplus-ui/components/ag-grid/editable/) instead.");
     const {
       b: R
     } = re("editable-grid"), B = ne("editable-grid"), {
       internalInstance: i,
       model: S
-    } = oe(), m = H(a.name), f = c(ae(s(S), m.value) || []), v = y.useWatch(m);
+    } = te(), m = H(a.name), f = c(oe(s(S), m.value) || []), v = y.useWatch(m);
     K(() => v.value, async (e) => {
       await P(), f.value = e, a.onChange?.(e);
     }, {
       deep: !0
     });
-    const p = c(), F = se("valueTypeMap"), I = te(a, F);
+    const p = c(), F = se("valueTypeMap"), I = le(a, F);
     function N(e, l) {
       const r = s(f)?.length || 0;
       if (C(a.maxLength) && r >= a.maxLength)

package/es/src/ap-grid/editable/index.vue.d.ts

@@ -1,5 +1,5 @@
-import { EditableGridExpose, EditableGridProps } from './interface';
 import { Recordable } from '../../type';
+import { EditableGridExpose, EditableGridProps } from './interface';
 import { VNodeProps, AllowedComponentProps, ComponentCustomProps, PublicProps, ShallowUnwrapRef, VNode } from 'vue';
 declare const _default: <RecordType extends Recordable = any>(__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<{

package/es/src/ap-grid/editable/index.vue.mjs

@@ -1,12 +1,12 @@
 import { defineComponent as W, useSlots as U, ref as y, watch as C, unref as r, createBlock as $, openBlock as q, withCtx as p, createVNode as w, mergeProps as J, createSlots as Q, renderList as X, renderSlot as Y, normalizeProps as Z, guardReactiveProps as M } from "vue";
-import { ApForm as m } from "../../ap-form/index.mjs";
-import { isEqual as ee, isArray as c, isUndefined as te, isNumber as g, cloneDeep as ae, omit as oe } from "lodash-unified";
+import { isEqual as ee, isArray as m, isUndefined as te, isNumber as c, cloneDeep as ae, omit as oe } from "lodash-unified";
+import { ApForm as g } from "../../ap-form/index.mjs";
 import "../../config-provider/index.mjs";
 import "../../hooks/index.mjs";
 import "../../utils/index.mjs";
-import { useGetEditableColumns as le } from "../hooks/use-editable-columns.mjs";
+import { useDevWarning as le } from "../../utils/warning.mjs";
+import { useGetEditableColumns as ne } from "../hooks/use-editable-columns.mjs";
 import "../index.vue2.mjs";
-import { useDevWarning as ne } from "../../utils/warning.mjs";
 import re from "../style/editable.mjs";
 import { useNamespace as se } from "../../config-provider/hooks/use-namespace.mjs";
 import { useControllableValue as ie } from "../../hooks/useControllableValue.mjs";
@@ -175,11 +175,11 @@ const Ee = /* @__PURE__ */ W({
     const B = U(), t = v, {
       b: S
     } = se("editable-grid"), F = re("editable-grid"), E = R;
-    ne("EditableGrid")(!1, "breaking", "EditableGrid has been EOL, Please use EditableAgGrid(https://aplus.aplnk.com/aplus-ui/components/ag-grid/editable/) instead.");
+    le("EditableGrid")(!1, "breaking", "EditableGrid has been EOL, Please use EditableAgGrid(https://aplus.aplnk.com/aplus-ui/components/ag-grid/editable/) instead.");
     const h = y(), {
       value: u,
       updateValue: N
-    } = ie(t, E), i = y(), V = ue("valueTypeMap"), f = m.useWatch(t.name, i);
+    } = ie(t, E), i = y(), V = ue("valueTypeMap"), f = g.useWatch(t.name, i);
     C(() => f.value, (e) => {
       N(e), t.onChange?.(e);
     }, {
@@ -190,12 +190,12 @@ const Ee = /* @__PURE__ */ W({
     }, {
       deep: !0
     });
-    const k = le(t, V);
+    const k = ne(t, V);
     function L() {
       i.value?.resetFields();
     }
     function _(e) {
-      return e ? (c(e) ? e : [e]).map((n) => c(n) ? [t.name, ...n] : [t.name, n]) : void 0;
+      return e ? (m(e) ? e : [e]).map((n) => m(n) ? [t.name, ...n] : [t.name, n]) : void 0;
     }
     async function D(e, l) {
       return (await i.value?.validateFields(_(e), l))?.[t.name];
@@ -216,10 +216,10 @@ const Ee = /* @__PURE__ */ W({
       });
     }
     function T(e, l = "suffix") {
-      const n = r(u)?.length || 0, a = g(e) ? e : e.length;
+      const n = r(u)?.length || 0, a = c(e) ? e : e.length;
       if (b(t.maxLength) && n + a > t.maxLength)
         return;
-      const o = g(e) ? new Array(e).fill(0).map(() => ({})) : ae(e);
+      const o = c(e) ? new Array(e).fill(0).map(() => ({})) : ae(e);
       i.value?.setFieldValue?.(t.name, o, !0, (s, d) => {
         if (!s[d]) {
           s[d] = [...o];
@@ -229,13 +229,13 @@ const Ee = /* @__PURE__ */ W({
       });
     }
     function j(e) {
-      const l = new Set(g(e) ? [e] : e);
+      const l = new Set(c(e) ? [e] : e);
       i.value?.setFieldValue?.(t.name, void 0, !0, (n, a) => {
         n[a] = n[a].filter((o, s) => !l.has(s));
       });
     }
     function A(e) {
-      const l = new Set(c(e) ? e : [e]);
+      const l = new Set(m(e) ? e : [e]);
       l.size !== 0 && i.value?.setFieldValue?.(t.name, void 0, !0, (n, a) => {
         n[a] = n[a].filter((o) => !l.has(o[t.rowKey]));
       });
@@ -283,7 +283,7 @@ const Ee = /* @__PURE__ */ W({
       clear: P,
       setTableData: G,
       removeByKey: A
-    }), (e, l) => (q(), $(r(m), {
+    }), (e, l) => (q(), $(r(g), {
       ref_key: "formRef",
       ref: i,
       "initial-values": {
@@ -293,7 +293,7 @@ const Ee = /* @__PURE__ */ W({
         height: "100%"
       }
     }, {
-      default: p(() => [w(r(m).FormItem, {
+      default: p(() => [w(r(g).FormItem, {
         name: e.name,
         "no-style": ""
       }, {

package/es/src/ap-grid/editable/interface.d.ts

@@ -1,11 +1,11 @@
-import { Recordable } from '../../type';
-import { ApTableValueFields, ApTableValueTypes, CommonFieldReturnType, FieldPropsType } from '../../ap-table/interface';
-import { ApGridColumnType, ApGridProps } from '../interface';
-import { VNode } from 'vue';
-import { DataIndex } from '@aplus-frontend/antdv/es/vc-table/interface';
-import { EditableTableExpose } from '../../editable-table';
 import { NamePath } from '@aplus-frontend/antdv/es/form/interface';
+import { DataIndex } from '@aplus-frontend/antdv/es/vc-table/interface';
+import { VNode } from 'vue';
 import { ApFormItemProps } from '../../ap-form';
+import { ApTableValueFields, ApTableValueTypes, CommonFieldReturnType, FieldPropsType } from '../../ap-table/interface';
+import { EditableTableExpose } from '../../editable-table';
+import { Recordable } from '../../type';
+import { ApGridColumnType, ApGridProps } from '../interface';
 export type EditableGridColumnType<RecordType = any, ExtraValueType = 'text', ValueType extends ApTableValueTypes = ApTableValueTypes, MergedValueType extends ExtraValueType | ValueType = ExtraValueType | ValueType> = MergedValueType extends ExtraValueType | ValueType ? Omit<ApGridColumnType<RecordType, ExtraValueType, ValueType, MergedValueType>, 'children' | 'customRender' | 'hideInSearch' | 'tooltip' | 'customRenderFormItem' | 'fieldProps'> & {
     children?: EditableGridColumnType<RecordType, ExtraValueType, ValueType, MergedValueType>[];
     /**

package/es/src/ap-grid/hooks/use-editable-columns.d.ts

@@ -1,6 +1,6 @@
 import { ComputedRef, Ref } from 'vue';
-import { EditableGridProps } from '../editable/interface';
-import { ValueTypeRenderConfig } from '../../config-provider';
 import { ApGridColumnType } from '../interface';
+import { ValueTypeRenderConfig } from '../../config-provider';
+import { EditableGridProps } from '../editable/interface';
 export declare const useGetEditableColumns: (props: EditableGridProps, extraValueTypes: Ref<Record<string, ValueTypeRenderConfig> | undefined>) => ComputedRef<ApGridColumnType[]>;
 export default useGetEditableColumns;