@aplus-frontend/ui 7.9.0 → 7.10.0

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

@@ -1,20 +1,20 @@
-import { defineComponent as M, useSlots as O, ref as w, onMounted as P, unref as t, watch as G, createElementBlock as W, openBlock as U, Fragment as $, createVNode as d, mergeProps as y, withCtx as g, createSlots as q, renderList as J, renderSlot as Q, normalizeProps as X, guardReactiveProps as Y } from "vue";
+import { defineComponent as A, useSlots as L, ref as y, onMounted as O, watch as P, createElementBlock as G, openBlock as W, Fragment as U, createVNode as u, unref as l, withCtx as g, mergeProps as $, createSlots as q, renderList as J, renderSlot as Q, normalizeProps as X, guardReactiveProps as Y } from "vue";
 import { ApForm as h } from "../../ap-form/index.mjs";
-import { cloneDeep as Z, isEqual as ee, omit as b } from "lodash-unified";
+import { cloneDeep as m, isEqual as Z, omit as ee } from "lodash-unified";
 import "../../config-provider/index.mjs";
 import { useGetEditableColumns as oe } from "../hooks/use-editable-columns.mjs";
 import "../index.vue2.mjs";
 import { useEditableFormItemApi as ae } from "../hooks/use-editable-form-item-api.mjs";
 import { useInjectForm as te } from "../../ap-form/context.mjs";
-import { getModelValue as ne } from "../../ap-form/utils/get.mjs";
-import { getShadowName as le } from "../utils.mjs";
+import { getModelValue as le } from "../../ap-form/utils/get.mjs";
+import { getShadowName as ne } from "../utils.mjs";
 import { useWatch as re } from "../../ap-form/hooks/use-watch.mjs";
-import { arrayToObject as se } from "./utils.mjs";
+import { arrayToObject as b } from "./utils.mjs";
 import ie from "../style/editable.mjs";
-import { useNamespace as me } from "../../config-provider/hooks/use-namespace.mjs";
-import { useGlobalConfig as de } from "../../config-provider/hooks/use-global-config.mjs";
-import pe from "../index.vue.mjs";
-const Fe = /* @__PURE__ */ M({
+import { useNamespace as se } from "../../config-provider/hooks/use-namespace.mjs";
+import { useGlobalConfig as me } from "../../config-provider/hooks/use-global-config.mjs";
+import de from "../index.vue.mjs";
+const Ee = /* @__PURE__ */ A({
   name: "EditableGrid",
   __name: "form-item",
   props: {
@@ -133,95 +133,96 @@ const Fe = /* @__PURE__ */ M({
   setup(C, {
     expose: R
   }) {
-    const B = O(), o = C, {
-      b: v
-    } = me("editable-aggrid"), x = ie("editable-aggrid"), r = w(), {
-      internalInstance: s,
-      model: S
-    } = te(), i = le(o.name);
-    let p;
-    P(() => {
-      const e = o.formItem?.initialValue ?? ne(t(S), o.name);
-      p = Z(e), N(e, "suffix", !0);
+    const v = L(), o = C, {
+      b: B
+    } = se("editable-aggrid"), x = ie("editable-aggrid"), i = y(), {
+      internalInstance: n
+    } = te(), s = ne(o.name);
+    let p = [];
+    O(() => {
+      const e = o.formItem?.initialValue ?? le(n?.getInitialValues() ?? {}, o.name);
+      e && (n?.updateInitialModel(s, b(m(e), o.rowKey)), p = m(e), _(m(e), "suffix", !0));
     });
-    const l = w([]), I = re(o.name);
-    G(() => I.value, (e) => {
-      ee(e, l.value) || u(e ?? p);
+    const r = y([]), I = re(o.name);
+    P(() => I.value, (e) => {
+      Z(e, r.value) || c(e ?? m(p));
     }, {
-      deep: !0
+      deep: !0,
+      flush: "post"
     });
-    const E = de("valueTypeMap"), F = oe(o, E, i), {
-      add: T,
-      addMultiple: _,
-      __addMultiple: N,
-      remove: V,
-      removeByKey: j,
-      getRowData: D,
-      getRowsData: k,
-      setRowData: H,
-      clear: L,
-      refreshRowIds: m
-    } = ae(o, s, l, i);
-    function z() {
-      const e = r.value?._internalGridApi;
-      if (!m.value?.length || !e)
+    const S = me("valueTypeMap"), E = oe(o, S, s), {
+      add: F,
+      addMultiple: T,
+      __addMultiple: _,
+      remove: N,
+      removeByKey: V,
+      getRowData: j,
+      getRowsData: D,
+      setRowData: k,
+      clear: H,
+      refreshRowIds: d
+    } = ae(o, n, r, s);
+    function K() {
+      const e = i.value?._internalGridApi;
+      if (!d.value?.length || !e)
         return;
-      const a = m.value.map((n) => e.getRowNode(n)).filter((n) => !!n);
+      const a = d.value.map((t) => e.getRowNode(t)).filter((t) => !!t);
       e.refreshCells({
         rowNodes: a,
         force: !0
-      }), m.value = [];
+      }), d.value = [];
     }
-    function u(e) {
-      l.value = e;
-      const a = se(e, o.rowKey);
-      s?.setFieldValue(o.name, e), s?.setFieldValue(i, a);
+    function c(e) {
+      r.value = [...e];
+      const a = b(e, o.rowKey);
+      n?.setFieldValue(o.name, [...e]), n?.setFieldValue(s, a);
     }
-    function c(e, a) {
-      const n = e === "end" ? l.value.length - 1 : e;
-      r.value?.scrollToRow(n, a);
+    function f(e, a) {
+      const t = e === "end" ? r.value.length - 1 : e;
+      i.value?.scrollToRow(t, a);
     }
-    function A(e, a) {
-      r.value?.scrollToColumn(e, a);
+    function M(e, a) {
+      i.value?.scrollToColumn(e, a);
     }
     return R({
-      add: T,
-      addMultiple: _,
-      remove: V,
-      removeByKey: j,
-      getRowData: D,
-      getRowsData: k,
-      setRowData: H,
-      clear: L,
-      setTableData: u,
-      scrollTo: c,
-      scrollToRow: c,
-      scrollToColumn: A
-    }), (e, a) => (U(), W($, null, [d(t(h).FormItem, {
+      add: F,
+      addMultiple: T,
+      remove: N,
+      removeByKey: V,
+      getRowData: j,
+      getRowsData: D,
+      setRowData: k,
+      clear: H,
+      setTableData: c,
+      scrollTo: f,
+      scrollToRow: f,
+      scrollToColumn: M
+    }), (e, a) => (W(), G(U, null, [u(l(h).FormItem, {
       hidden: "",
-      name: e.name
-    }, null, 8, ["name"]), d(t(h).FormItem, y(t(b)(e.formItem, "initialValue"), {
+      name: e.name,
+      "initial-value": e.formItem?.initialValue
+    }, null, 8, ["name", "initial-value"]), u(l(h).FormItem, {
       label: e.label
-    }), {
-      default: g(() => [d(pe, y(t(b)(o, ["name", "maxLength", "onChange", "defaultValue", "formItem"]), {
+    }, {
+      default: g(() => [u(de, $(l(ee)(o, ["name", "maxLength", "onChange", "defaultValue", "formItem"]), {
         ref_key: "tableRef",
-        ref: r,
-        class: [t(v)(), t(x)],
+        ref: i,
+        class: [l(B)(), l(x)],
         size: "mini",
-        columns: t(F),
-        "data-source": l.value,
+        columns: l(E),
+        "data-source": r.value,
         "search-form": !1,
-        onUpdate: z
+        onUpdate: K
       }), q({
         _: 2
-      }, [J(B, (n, f) => ({
-        name: f,
-        fn: g((K) => [Q(e.$slots, f, X(Y(K || {})))])
+      }, [J(v, (t, w) => ({
+        name: w,
+        fn: g((z) => [Q(e.$slots, w, X(Y(z || {})))])
       }))]), 1040, ["class", "columns", "data-source"])]),
       _: 3
-    }, 16, ["label"])], 64));
+    }, 8, ["label"])], 64));
   }
 });
 export {
-  Fe as default
+  Ee as default
 };

package/es/src/ap-form/ap-form.vue2.mjs

@@ -1,17 +1,17 @@
-import { defineComponent as ee, reactive as te, shallowRef as re, ref as oe, unref as h, nextTick as ne, toRaw as R, watch as ie, onWatcherCleanup as le, computed as se, createBlock as ae, openBlock as ue, mergeProps as ce, withCtx as fe, renderSlot as de } from "vue";
-import { Form as ge } from "@aplus-frontend/antdv";
-import { useProvideForm as me } from "./context.mjs";
-import { isArray as f, cloneDeep as pe, isEqual as he, isFunction as M, isPlainObject as B, omit as Fe } from "lodash-unified";
+import { defineComponent as te, reactive as re, shallowRef as oe, ref as ne, unref as h, nextTick as ie, toRaw as M, watch as le, onWatcherCleanup as se, computed as ae, createBlock as ue, openBlock as ce, mergeProps as fe, withCtx as de, renderSlot as ge } from "vue";
+import { Form as me } from "@aplus-frontend/antdv";
+import { useProvideForm as pe } from "./context.mjs";
+import { isArray as f, cloneDeep as j, isEqual as he, isFunction as B, isPlainObject as _, omit as Fe } from "lodash-unified";
 import { useUrlSearchParams as ye } from "@vueuse/core";
-import { INTERNAL_FORM_INSTANCE_MARK as O } from "./constant.mjs";
+import { INTERNAL_FORM_INSTANCE_MARK as x } from "./constant.mjs";
 import { getRouteType as Te } from "../utils/index.mjs";
 import Ve from "./utils/set.mjs";
-import { genParams as _, setToParams as j } from "./utils/params.mjs";
+import { genParams as b, setToParams as W } from "./utils/params.mjs";
 import { useInjectFormProvider as ve } from "./provider/context.mjs";
-import { getModelValue as x } from "./utils/get.mjs";
+import { getModelValue as N } from "./utils/get.mjs";
 import { useDevWarning as Ce } from "../utils/warning.mjs";
 import { isDef as T } from "../utils/is.mjs";
-const xe = /* @__PURE__ */ ee({
+const xe = /* @__PURE__ */ te({
   name: "ApForm",
   __name: "ap-form",
   props: {
@@ -43,8 +43,8 @@ const xe = /* @__PURE__ */ ee({
     syncToUrl: { type: [Boolean, Function], default: !1 },
     syncToUrlPriority: { type: Boolean }
   },
-  setup(W, { expose: N }) {
-    const n = W;
+  setup(S, { expose: q }) {
+    const n = S;
     function V(e, t, r = !0, o) {
       if (f(e)) {
         let i = l;
@@ -60,13 +60,13 @@ const xe = /* @__PURE__ */ ee({
       }
       y();
     }
-    const s = re(), v = ye(Te()), F = ve(), S = Ce("ApForm"), C = oe(
-      n.syncToUrl ? _(n.syncToUrl, v, "get") : {}
+    const s = oe(), v = ye(Te()), F = ve(), D = Ce("ApForm"), C = ne(
+      n.syncToUrl ? b(n.syncToUrl, v, "get") : {}
     );
-    let d = pe(b()), g = {};
-    const l = te(b());
+    let d = j(w()), g = {};
+    const l = re(w());
     let m = [];
-    function b() {
+    function w() {
       const e = n.initialValues || {};
       return n.syncToUrlPriority ? {
         ...e,
@@ -76,45 +76,45 @@ const xe = /* @__PURE__ */ ee({
         ...e
       };
     }
-    function q(e) {
+    function K(e) {
       const t = p(e, g);
-      F.triggerFormFinish(n.name, e), n.syncToUrl && j(v, _(n.syncToUrl, t, "set")), n.onFinish?.(t);
+      F.triggerFormFinish(n.name, e), n.syncToUrl && W(v, b(n.syncToUrl, t, "set")), n.onFinish?.(t);
     }
-    const D = async () => {
-      s.value?.resetFields(), await ne(() => {
-        Object.keys(l).forEach((e) => delete l[e]), Object.assign(l, d), y(), n.syncToUrl && j(
+    const L = async () => {
+      s.value?.resetFields(), await ie(() => {
+        Object.keys(l).forEach((e) => delete l[e]), Object.assign(l, j(d)), y(), n.syncToUrl && W(
           v,
-          _(
+          b(
             n.syncToUrl,
             p(d, g),
             "set"
           )
         );
       });
-    }, K = (e) => {
+    }, $ = (e) => {
       s.value?.clearValidate(e);
-    }, L = (e, t) => s.value?.validateFields(e, t), $ = async (e, t) => {
+    }, k = (e, t) => s.value?.validateFields(e, t), G = async (e, t) => {
       const r = await s.value?.validateFields(
         e,
         t
       );
       return p(r, g);
-    }, I = (e) => e === !0 ? R(l) : s.value?.getFieldsValue(e), k = (e) => {
+    }, I = (e) => e === !0 ? M(l) : s.value?.getFieldsValue(e), H = (e) => {
       const t = I(e);
       return p(t, g);
-    }, G = (e, t) => s.value?.validate(e, t), H = (e, t = {}) => {
+    }, J = (e, t) => s.value?.validate(e, t), Q = (e, t = {}) => {
       s.value?.scrollToField(e, t);
-    }, J = (e) => {
+    }, X = (e) => {
       Object.assign(l, e), y();
     }, U = (e, t, r = !0, o) => {
       V(e, t, r, o), y();
     };
     function P(e) {
-      return e(R(l)), m.push(e), () => {
+      return e(M(l)), m.push(e), () => {
         m = m.filter((t) => t !== e);
       };
     }
-    function Q(e, t) {
+    function R(e, t) {
       if (f(e)) {
         let r = d;
         for (let o = 0; o < e.length - 1; o++)
@@ -123,16 +123,16 @@ const xe = /* @__PURE__ */ ee({
       } else
         d[e] = t;
     }
-    function X(e, t) {
+    function Y(e, t) {
       if (!T(e) || !T(t))
         return;
-      const r = x(d, t);
+      const r = N(d, t);
       if (he(r, e))
         return;
-      const o = x(h(C), t);
-      T(o) && n.syncToUrlPriority || (V(t, e, !1), Q(t, e));
+      const o = N(h(C), t);
+      T(o) && n.syncToUrlPriority || (V(t, e, !1), R(t, e));
     }
-    function Y(e, t) {
+    function Z(e, t) {
       t && (g = Ve(
         g,
         [e].flat(1),
@@ -140,28 +140,29 @@ const xe = /* @__PURE__ */ ee({
         !0
       ));
     }
-    function w({ initialValue: e, name: t, transform: r }) {
-      X(e, t), Y(t, r);
+    function A({ initialValue: e, name: t, transform: r }) {
+      Y(e, t), Z(t, r);
     }
-    function A() {
+    function E() {
       return d;
     }
-    function Z(e) {
-      if (S(
-        e === O,
+    function z(e) {
+      if (D(
+        e === x,
         "usage",
         "getInternalInstance should only used at internal"
-      ), e === O)
+      ), e === x)
         return {
-          registerField: w,
+          registerField: A,
           registerWatch: P,
           setFieldValue: U,
-          getInitialValues: A
+          getInitialValues: E,
+          updateInitialModel: R
         };
     }
     function y() {
       if (m.length) {
-        const e = R(l);
+        const e = M(l);
         m.forEach((t) => {
           t(e);
         });
@@ -172,14 +173,14 @@ const xe = /* @__PURE__ */ ee({
         return;
       let r = f(e) ? [] : {};
       return Object.keys(e).forEach((o) => {
-        const a = e[o], i = t?.[o], u = M(i) ? i : i?.transformer, z = M(i) ? !0 : i?.flat;
-        if (M(u)) {
+        const a = e[o], i = t?.[o], u = B(i) ? i : i?.transformer, ee = B(i) ? !0 : i?.flat;
+        if (B(u)) {
           const c = u(a, { getFieldsValue: I });
-          z ? f(c) && f(r) ? r = [...r, ...c] : B(c) && B(r) ? r = {
+          ee ? f(c) && f(r) ? r = [...r, ...c] : _(c) && _(r) ? r = {
             ...r,
             ...c
           } : r[o] = c : r[o] = c;
-        } else if (B(a) || f(a)) {
+        } else if (_(a) || f(a)) {
           const c = p(
             a,
             i
@@ -189,40 +190,41 @@ const xe = /* @__PURE__ */ ee({
           r[o] = a;
       }), r;
     }
-    const E = {
-      resetFields: D,
-      clearValidate: K,
-      validateFields: L,
+    const O = {
+      resetFields: L,
+      clearValidate: $,
+      validateFields: k,
       getFieldsValue: I,
-      validate: G,
-      scrollToField: H,
-      setFieldsValue: J,
+      validate: J,
+      scrollToField: Q,
+      setFieldsValue: X,
       setFieldValue: U,
       registerWatch: P,
-      validateFieldsReturnTransformed: $,
-      getFieldsValueTransformed: k,
-      getInternalInstance: Z
+      validateFieldsReturnTransformed: G,
+      getFieldsValueTransformed: H,
+      getInternalInstance: z
     };
-    return ie(
+    return le(
       () => n.name,
       (e) => {
-        e && (F.registerForm(e, E), le(() => {
+        e && (F.registerForm(e, O), se(() => {
           F.unregisterForm(n.name);
         }));
       },
       {
         immediate: !0
       }
-    ), me({
-      model: se(() => l),
+    ), pe({
+      model: ae(() => l),
       updateModel: V,
       internalInstance: {
         registerWatch: P,
-        registerField: w,
+        registerField: A,
         setFieldValue: U,
-        getInitialValues: A
+        getInitialValues: E,
+        updateInitialModel: R
       }
-    }), N(E), (e, t) => (ue(), ae(h(ge), ce(
+    }), q(O), (e, t) => (ce(), ue(h(me), fe(
       {
         ref_key: "formRef",
         ref: s
@@ -237,11 +239,11 @@ const xe = /* @__PURE__ */ ee({
       {
         model: l,
         "data-form-name": e.name,
-        onFinish: q
+        onFinish: K
       }
     ), {
-      default: fe(() => [
-        de(e.$slots, "default")
+      default: de(() => [
+        ge(e.$slots, "default")
       ]),
       _: 3
     }, 16, ["model", "data-form-name"]));

package/es/src/ap-form/interface.d.ts

@@ -140,6 +140,10 @@ export type ApFormInternalInstance = {
      * @returns
      */
     getInitialValues: () => Recordable;
+    /**
+     * 更新表单的初始值（仅用于某些组件内部调用的情况）
+     */
+    updateInitialModel: (name: FormItemProps['name'], val: any) => void;
 };
 export type ApFormItemExpose = FormItemExpose & {
     /**

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

@@ -1,5 +1,5 @@
-import { genComponentStyleHook as n } from "../../utils/cssinjs/index.mjs";
-const e = (t) => ({
+import { genComponentStyleHook as r } from "../../utils/cssinjs/index.mjs";
+const n = (t) => ({
   [t.componentCls]: {
     "&-compact": {
       ".ant-select": {
@@ -44,6 +44,10 @@ const e = (t) => ({
         ".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": {
+          borderStartStartRadius: 0,
+          borderEndStartRadius: 0
         }
       },
       ".ant-form-item:not(:first-child):not(:last-child)": {
@@ -62,8 +66,8 @@ const e = (t) => ({
   ".ant-form-vertical .ant-input-group.ant-input-group-compact > *": {
     verticalAlign: "bottom"
   }
-}), o = n("ApForm.ItemTextGroup", (t) => [e(t)]);
+}), o = r("ApForm.ItemTextGroup", (t) => [n(t)]);
 export {
   o as default,
-  e as genFormItemTextGroupStyle
+  n as genFormItemTextGroupStyle
 };

package/es/src/ap-list/index.vue.d.ts

@@ -13,6 +13,7 @@ declare const _default: <RecordType extends Recordable>(__VLS_props: NonNullable
             };
             submit: () => void;
             reset: () => void;
+            loading: boolean;
         }): any;
         empty?(_: {
             loading: boolean;