@unicom-cloud/ui 0.8.126 → 0.8.128

package/form/store.js

@@ -1,14 +1,16 @@
-/* 2025-11-27 15:08:04 */
-import c from "lodash/get";
-import E from "lodash/has";
-import v from "lodash/merge";
-import k from "lodash/omit";
+/* 2025-12-17 18:27:10 */
+import u from "lodash/get";
+import W from "lodash/has";
+import k from "lodash/merge";
+import v from "lodash/omit";
 import I from "lodash/setWith";
-import { isPlainObject as V, isArray as l, isExist as S, isFunction as y } from "@unicom-cloud/ui-common/utils/is";
+import { NOOP as R } from "@unicom-cloud/ui-common/utils/constant";
+import "@unicom-cloud/ui-common/utils/pick";
+import { isPlainObject as S, isArray as c, isExist as y, isFunction as p, isPromise as j } from "@unicom-cloud/ui-common/utils/is";
 import { SubmitStatus as g } from "./interface.js";
-import R from "./promisify.js";
-import { iterativelyGetKeys as b, cloneDeep as F, set as n } from "./utils.js";
-class z {
+import T from "./promisify.js";
+import { iterativelyGetKeys as b, cloneDeep as m, set as o, ValidateError as _ } from "./utils.js";
+class M {
   constructor() {
     this.submitStatus = g.init, this.registerFields = [], this.registerWatchers = [], this.registerStateWatchers = [], this.registerFormWatchers = [], this.touchedFields = {}, this.store = {}, this.initialValues = {}, this.callbacks = {}, this.innerCollectFormState = () => {
       this.notifyStateWatchers();
@@ -38,15 +40,15 @@ class z {
         });
       });
     }, this.innerSetInitialValues = (t) => {
-      t && (this.initialValues = v(this.initialValues, F(t)), Object.keys(t).forEach((e) => {
-        n(this.store, e, t[e]);
+      t && (this.initialValues = k(this.initialValues, m(t)), Object.keys(t).forEach((e) => {
+        o(this.store, e, t[e]);
       }));
     }, this.innerSetInitialValue = (t, e) => {
-      t && (this.initialValues[t] = e, this._inTouchFields(t) || n(this.store, t, c(this.initialValues, t)));
+      t && (this.initialValues[t] = e, this._inTouchFields(t) || o(this.store, t, u(this.initialValues, t)));
     }, this.innerSetFieldValue = (t, e, i) => {
       if (!t) return;
       const s = this.getFields();
-      n(this.store, t, e), this.triggerValuesChange({
+      o(this.store, t, e), this.triggerValuesChange({
         [t]: e
       }), this.triggerTouchChange({ [t]: e }), this.notify("innerSetValue", {
         prev: s,
@@ -56,12 +58,12 @@ class z {
       });
     }, this.innerGetStore = () => this.store, this.innerGetStoreStatus = () => ({
       submitStatus: this.submitStatus
-    }), this.innerGetFieldValue = (t) => c(this.store, t), this.getTouchedFields = () => this.getRegisteredFields(!0).filter((t) => t.isTouched()).map((t) => t.props.field), this.setFieldValue = (t, e) => {
+    }), this.innerGetFieldValue = (t) => u(this.store, t), this.getTouchedFields = () => this.getRegisteredFields(!0).filter((t) => t.isTouched()).map((t) => t.props.field), this.setFieldValue = (t, e) => {
       t && this.setFields({
         [t]: { value: e }
       });
     }, this.setFieldsValue = (t) => {
-      if (V(t)) {
+      if (S(t)) {
         const e = Object.keys(t), i = {};
         e.forEach((s) => {
           i[s] = {
@@ -75,7 +77,7 @@ class z {
         const r = t[s], h = this.getFields();
         if (r) {
           const a = {};
-          "error" in r && (a.errors = r.error), "warning" in r && (a.warnings = r.warning), "touched" in r && (a.touched = r.touched), "value" in r && (n(this.store, s, r.value), i[s] = r.value), this.notify("setFieldValue", {
+          "error" in r && (a.errors = r.error), "warning" in r && (a.warnings = r.warning), "touched" in r && (a.touched = r.touched), "value" in r && (o(this.store, s, r.value), i[s] = r.value), this.notify("setFieldValue", {
             data: a,
             prev: h,
             field: s,
@@ -83,12 +85,12 @@ class z {
           });
         }
       }), this.triggerValuesChange(i);
-    }, this.getFieldValue = (t) => F(c(this.store, t)), this.getFieldError = (t) => {
+    }, this.getFieldValue = (t) => m(u(this.store, t)), this.getFieldError = (t) => {
       const e = this.getRegisteredField(t);
       return e ? e.getErrors() : null;
     }, this.getFieldsError = (t) => {
       const e = {};
-      return l(t) ? t.map((i) => {
+      return c(t) ? t.map((i) => {
         const s = this.getFieldError(i);
         s && (e[i] = s);
       }) : this.getRegisteredFields(!0, { containFormList: !0 }).forEach(
@@ -96,36 +98,36 @@ class z {
           i.getErrors() && (e[i.props.field] = i.getErrors());
         }
       ), e;
-    }, this.getFields = () => F(this.store), this.getFieldsValue = (t) => {
+    }, this.getFields = () => m(this.store), this.getFieldsValue = (t) => {
       const e = {};
-      return l(t) ? (t.forEach((i) => {
-        n(e, i, this.getFieldValue(i));
+      return c(t) ? (t.forEach((i) => {
+        o(e, i, this.getFieldValue(i));
       }), e) : (this.getRegisteredFields(!0).forEach(({ props: { field: i } }) => {
-        const s = c(this.store, i);
-        n(e, i, s);
+        const s = u(this.store, i);
+        o(e, i, s);
       }), e);
     }, this.getInitialValues = () => this.initialValues, this.setInitialValues = (t) => {
       this.innerSetInitialValues(t), this.setFieldsValue(t);
     }, this.setInitialValue = (t, e) => {
       this.innerSetInitialValue(t, e), this.setFieldValue(t, e);
     }, this.resetFields = (t) => {
-      const e = this.getFields(), i = S(t) && !l(t) ? [t] : t;
+      const e = this.getFields(), i = y(t) && !c(t) ? [t] : t;
       let s = {};
-      if (i && l(i))
+      if (i && c(i))
         i.forEach((h) => {
-          n(
+          o(
             this.store,
             h,
             this.initialValues[h]
-          ), s[h] = c(this.store, h);
+          ), s[h] = u(this.store, h);
         }), this.triggerValuesChange(s), this.notify("reset", { prev: e, field: i }), this._popTouchField(i);
       else {
         const h = {};
         s = this.getFields(), Object.keys(this.initialValues).forEach((a) => {
-          n(h, a, this.initialValues[a]);
+          o(h, a, this.initialValues[a]);
         }), this.store = h, this.getRegisteredFields(!0).forEach((a) => {
-          const m = a.props.field;
-          n(s, m, c(this.store, m));
+          const f = a.props.field;
+          o(s, f, u(this.store, f));
         }), this.triggerValuesChange(s), this._popTouchField(), this.notify("reset", {
           prev: e,
           field: Object.keys(s)
@@ -133,38 +135,32 @@ class z {
       }
       const { onReset: r } = this.callbacks;
       r?.(s);
-    }, this.validate = R(
-      (t, e, i) => {
-        const s = this.getRegisteredFields(!0, {
-          containFormList: !0
-        }), r = l(t) && t.length ? s.filter(
-          (o) => t.indexOf(o.props.field) > -1
-        ) : s, h = V(t) ? t : V(e) ? e : {}, a = y(t) ? t : y(e) ? e : i || (() => {
-        }), m = r.map(
-          (o) => h?.validateOnly ? o.validateFieldOnly() : o.validateField()
-        ), W = (o) => {
-          if (!h?.validateOnly) {
-            const { onValidateFail: u } = this.callbacks;
-            u?.(o);
-          }
-        };
-        return Promise.all(m).then((o) => {
-          let u = {};
-          const p = {};
-          o.map((d) => {
-            d.error && (u = { ...u, ...d.error }), this.getRegisteredField(d.field)?.props?.isFormList || n(p, d.field, d.value);
-          });
-          let f;
-          return Object.keys(u).length ? (W?.(u), f = a?.(u, F(p))) : f = a?.(null, F(p)), f;
-        }).catch((o) => o).finally(() => {
+    }, this.validate_fn = (t, e, i) => {
+      const s = this.getRegisteredFields(!0, {
+        containFormList: !0
+      }), r = c(t) && t.length ? s.filter((n, l, d) => [].concat(t).includes(n.props.field)) : s, h = S(t) ? t : S(e) ? e : {}, a = p(t) ? t : p(e) ? e : i || R, f = r.map((n, l, d) => h?.validateOnly ? n.validateFieldOnly() : n.validateField()), E = (n) => {
+        if (!h?.validateOnly) {
+          const { onValidateFail: l } = this.callbacks;
+          l?.(n);
+        }
+      };
+      return Promise.all(f).then((n) => {
+        let l = {};
+        const d = {};
+        n.forEach((F, P, L) => {
+          F.error && (l = { ...l, ...F.error }), this.getRegisteredField(F.field)?.props?.isFormList || o(d, F.field, F.value);
         });
-      }
-    ), this.submit = () => {
+        let V;
+        return Object.keys(l).length ? (E?.(l), V = a?.(l, m(d))) : V = a?.(null, m(d)), V;
+      }).catch((n) => Promise.reject(n)).finally(() => {
+      });
+    }, this.validate = T(this.validate_fn), this.submit = () => {
       this.toggleSubmitStatus(g.submitting);
       const t = (e, i) => {
         let s;
         const { onSubmit: r, onSubmitFailed: h } = this.callbacks;
-        return !e && r && (s = r(i)), e && h && (s = h(e)), s && s.then ? s.then((a) => (this.toggleSubmitStatus(g.success), a)).catch((a) => (this.toggleSubmitStatus(g.error), Promise.reject(a))) : this.toggleSubmitStatus(
+        return e ? (p(h) && (s = h(e)), s || (s = Promise.reject(new _(e)))) : p(r) && (s = r(i)), j(s) ? s.then((a) => (this.toggleSubmitStatus(g.success), a)).catch((a) => (this.toggleSubmitStatus(g.error), a)).finally(() => {
+        }) : this.toggleSubmitStatus(
           e ? g.error : g.success
         ), s;
       };
@@ -185,17 +181,17 @@ class z {
           value: this.getFieldValue(s.props.field)
         };
       };
-      return l(t) ? (t.forEach((s) => {
+      return c(t) ? (t.forEach((s) => {
         e[s] = i(this.getRegisteredField(s));
       }), e) : (this.getRegisteredFields(!0).forEach((s) => {
         e[s.props.field] = i(s);
       }), e);
     }, this.clearFields = (t) => {
-      const e = this.getFields(), i = S(t) && !l(t) ? [t] : t;
-      if (i && l(i)) {
+      const e = this.getFields(), i = y(t) && !c(t) ? [t] : t;
+      if (i && c(i)) {
         const s = {};
         i.forEach((r) => {
-          n(this.store, r, void 0), s[r] = c(this.store, r);
+          o(this.store, r, void 0), s[r] = u(this.store, r);
         }), this.triggerValuesChange(s), this.notify("setFieldValue", {
           prev: e,
           field: i,
@@ -208,7 +204,7 @@ class z {
         const s = {};
         this.store = {}, this.getRegisteredFields(!0).forEach((r) => {
           const h = r.props.field;
-          n(s, h, void 0);
+          o(s, h, void 0);
         }), this.triggerValuesChange(s), this.notify("setFieldValue", {
           prev: e,
           field: Object.keys(s),
@@ -252,16 +248,16 @@ class z {
   _getIterativelyKeysByField(t) {
     if (!t)
       return [];
-    const i = [].concat(t).map((s) => b(n({}, s, void 0))).reduce((s, r) => s.concat(r), []);
+    const i = [].concat(t).map((s) => b(o({}, s, void 0))).reduce((s, r) => s.concat(r), []);
     return [t, ...i];
   }
   _inTouchFields(t) {
-    return this._getIterativelyKeysByField(t).some((i) => E(this.touchedFields, i));
+    return this._getIterativelyKeysByField(t).some((i) => W(this.touchedFields, i));
   }
   _popTouchField(t) {
     t === void 0 && (this.touchedFields = {});
     const e = this._getIterativelyKeysByField(t);
-    this.touchedFields = k(this.touchedFields, e);
+    this.touchedFields = v(this.touchedFields, e);
   }
   _pushTouchField(t) {
     [].concat(t).forEach((e) => {
@@ -270,5 +266,5 @@ class z {
   }
 }
 export {
-  z as default
+  M as default
 };

package/form/utils.js

@@ -1,37 +1,37 @@
-/* 2025-11-27 15:08:04 */
-import y from "lodash/cloneDeepWith";
+/* 2025-12-17 18:27:10 */
+import d from "lodash/cloneDeepWith";
 import g from "lodash/flatten";
 import v from "lodash/has";
-import S from "lodash/merge";
-import E from "lodash/set";
+import E from "lodash/merge";
+import S from "lodash/set";
 import w from "lodash/setWith";
 import O from "react";
-import { isPlainObject as d, isArray as l, isFunction as F } from "@unicom-cloud/ui-common/utils/is";
-import { Schema as _ } from "@unicom-cloud/ui-common/utils/validate";
-function D(t) {
-  return y(t, (n) => {
-    if (!d(n) && !l(n))
-      return n;
+import { isPlainObject as l, isArray as y, isFunction as V } from "@unicom-cloud/ui-common/utils/is";
+import { ValidatorSchema as F } from "@unicom-cloud/utils/validate";
+function _(t) {
+  return d(t, (r) => {
+    if (!l(r) && !y(r))
+      return r;
   });
 }
-const G = (t, n) => y(t, (r) => {
-  if (F(r))
-    return (s) => r(s, n);
+const G = (t, r) => d(t, (n) => {
+  if (V(n))
+    return (s) => n(s, r);
 });
-function L(t, n, r) {
-  return E(t, n, D(r)), t;
+function L(t, r, n) {
+  return S(t, r, _(n)), t;
 }
-function N(t, n = "") {
-  const r = /* @__PURE__ */ new Set(), s = (i, o = "") => i ? r.has(i) ? [] : (r.add(i), g(
-    Object.keys(i).map((e) => (d(i[e]) || l(i[e])) && Object.keys(i[e]).length && !O.isValidElement(i[e]) ? s(i[e], `${o + e}.`) : o + e)
+function N(t, r = "") {
+  const n = /* @__PURE__ */ new Set(), s = (i, o = "") => i ? n.has(i) ? [] : (n.add(i), g(
+    Object.keys(i).map((e) => (l(i[e]) || y(i[e])) && Object.keys(i[e]).length && !O.isValidElement(i[e]) ? s(i[e], `${o + e}.`) : o + e)
   )) : [];
-  return s(t, n);
+  return s(t, r);
 }
 function R(t) {
   return t?.constructor?.name === "SyntheticEvent" || t?.nativeEvent instanceof Event;
 }
-async function T(t, n, r, s, i) {
-  const o = [...r || []];
+async function T(t, r, n, s, i) {
+  const o = [...n || []];
   let e = 0;
   return new Promise((f) => {
     const a = [], p = async (u) => {
@@ -39,9 +39,9 @@ async function T(t, n, r, s, i) {
       if (!u)
         return h();
       const c = { ...u };
-      !c.type && !c.validator && (c.type = "string"), new _(
+      !c.type && !c.validator && (c.type = "string"), new F(
         { [t]: [c] },
-        S(
+        E(
           {
             ignoreEmptyString: !0,
             // trim: true, // 潘启宝添加
@@ -49,7 +49,7 @@ async function T(t, n, r, s, i) {
           },
           i
         )
-      ).validate({ [t]: n }, (m) => {
+      ).validate({ [t]: r }, (m) => {
         if (m)
           if (u.validateLevel === "warning")
             a.push(m[t].message);
@@ -64,14 +64,20 @@ async function T(t, n, r, s, i) {
     p(o[e]);
   });
 }
-function X(t, n) {
-  const r = w({}, t, void 0, Object);
-  return n.some((s) => v(r, s));
+function X(t, r) {
+  const n = w({}, t, void 0, Object);
+  return r.some((s) => v(n, s));
 }
 const $ = "_input";
+class q extends Error {
+  constructor(r) {
+    super("表单验证错误，请通过 error.errors 获取错误详情"), this.errors = {}, this.errors = r;
+  }
+}
 export {
   $ as ID_INPUT_SUFFIX,
-  D as cloneDeep,
+  q as ValidateError,
+  _ as cloneDeep,
   G as formatValidateMsg,
   X as isFieldMatch,
   R as isSyntheticEvent,

package/grid/Grid.js

@@ -1,82 +1,86 @@
-/* 2025-11-27 15:08:04 */
-import { jsx as G } from "react/jsx-runtime";
-import { forwardRef as O, useContext as _, useRef as A, useImperativeHandle as H } from "react";
+/* 2025-12-17 18:27:10 */
+import { jsx as x } from "react/jsx-runtime";
+import { GAP_SIZE_MAP as j, processGap as A } from "@unicom-cloud/ui-common/flex/utils";
+import { forwardRef as I, useContext as M, useRef as O, useImperativeHandle as T } from "react";
 import "../config-provider/ConfigProvider.js";
 import { COLS as g } from "../constant/index.js";
-import I from "@unicom-cloud/ui-common/hooks/use-merge-props";
-import { useResponsiveState as f } from "../hooks/use-responsive-state/index.js";
+import H from "@unicom-cloud/ui-common/hooks/use-merge-props";
+import { useResponsiveState as n } from "../hooks/use-responsive-state/index.js";
 import L from "@unicom-cloud/ui-common/utils/className";
-import { isNil as c, isArray as M, isString as k, isNumber as u, isPlainObject as q } from "@unicom-cloud/ui-common/utils/is";
-import { GridContext as z } from "./context.js";
-import B from "../config-provider/context.js";
-const D = {
+import { isNil as a, isString as Z, isNumber as G, isPlainObject as k } from "@unicom-cloud/ui-common/utils/is";
+import { GridContext as q } from "./context.js";
+import z from "../config-provider/context.js";
+const B = {
   cols: g,
-  gap: 0
+  gap: j.small
 };
-function F(C, N) {
+function D(C, P) {
   const {
-    prefixCls: K,
-    getPrefixCls: P,
-    componentConfig: y,
-    rtl: $
-  } = _(B), d = P?.("grid"), w = I(
+    prefixCls: J,
+    getPrefixCls: N,
+    componentConfig: $,
+    rtl: w
+  } = M(z), l = N?.("grid"), y = H(
     C,
-    D,
-    y?.Grid
+    B,
+    $?.Grid
   ), {
     style: R,
-    className: v,
-    children: S,
-    cols: b,
-    gap: o,
-    colGap: p,
-    rowGap: n
-  } = w;
-  let t = n, s = p;
-  const T = c(o), h = c(n), j = c(p);
-  T || (M(o) ? (t = o[0], s = o[1] ?? o[0]) : t = s = o), h || (t = n), j || (s = p);
-  const e = f(b, g), a = f(t, 0), m = f(s, 0), r = {};
-  if (a && (r.rowGap = a), m && (r.columnGap = m), k(e))
-    r.gridTemplateColumns = e;
-  else if (u(e))
-    r.gridTemplateColumns = `repeat(${e}, minmax(0px, 1fr))`;
-  else if (q(e) && "type" in e) {
-    const E = e.type;
-    let i = e.max ?? "1fr";
-    u(i) && (i = `${i}px`);
-    let l = e.min ?? "0px";
-    u(l) && (l = `${l}px`), r.gridTemplateColumns = `repeat(${E}, minmax(${l}, ${i}))`;
+    className: S,
+    children: b,
+    cols: v,
+    gap: m,
+    colGap: c,
+    rowGap: f
+  } = y;
+  a(m), a(f), a(c);
+  const u = A(m, f, c), s = n(u.rowGap, 0), p = n(u.columnGap, 0), o = n(v, g), e = {};
+  s && (e.rowGap = s), p && (e.columnGap = p);
+  {
+    let r;
+    if (Z(o))
+      r = o;
+    else if (G(o))
+      r = `repeat(${o}, 1fr)`;
+    else if (k(o)) {
+      const t = o, E = t.count ?? t.type ?? "auto-fit", [_, h] = [t.min ?? "0px", t.max ?? "1fr"].map(
+        (i, K, Q) => G(i) ? `${i}px` : i
+      );
+      r = `repeat(${E}, minmax(${_}, ${h}))`;
+    } else
+      r = "repeat(auto-fit, minmax(0px, 1fr))";
+    r && (e.gridTemplateColumns = r);
   }
-  const x = A(null);
-  return H(N, () => ({
+  const d = O(null);
+  return T(P, () => ({
     getRootElement() {
-      return x.current;
+      return d.current;
     }
-  })), /* @__PURE__ */ G(
+  })), /* @__PURE__ */ x(
     "div",
     {
-      ref: x,
-      className: L(d, $ && `${d}-rtl`, v),
+      ref: d,
       style: {
-        ...r,
+        ...e,
         ...R
       },
-      children: /* @__PURE__ */ G(
-        z.Provider,
+      className: L(l, w && `${l}-rtl`, S),
+      children: /* @__PURE__ */ x(
+        q.Provider,
         {
           value: {
-            cols: e,
-            rowGap: a,
-            colGap: m
+            cols: o,
+            rowGap: s,
+            colGap: p
           },
-          children: S
+          children: b
         }
       )
     }
   );
 }
-const J = O(F);
-J.displayName = "Grid";
+const F = I(D);
+F.displayName = "Grid";
 export {
-  J as default
+  F as default
 };

package/grid/Item.js

@@ -1,6 +1,6 @@
-/* 2025-11-27 15:08:04 */
+/* 2025-12-17 18:27:10 */
 import { jsx as S } from "react/jsx-runtime";
-import { forwardRef as v, useContext as p } from "react";
+import { forwardRef as v, useContext as f } from "react";
 import "../config-provider/ConfigProvider.js";
 import b from "@unicom-cloud/ui-common/hooks/use-merge-props";
 import { useResponsiveState as a } from "../hooks/use-responsive-state/index.js";
@@ -11,11 +11,11 @@ import { resolveItemData as j } from "./utils.js";
 import w from "../config-provider/context.js";
 function D(l, c) {
   const {
-    prefixCls: L,
+    prefixCls: M,
     getPrefixCls: d,
     componentConfig: C,
     rtl: u
-  } = p(w), n = d?.("grid-item"), x = b(
+  } = f(w), n = d?.("grid-item"), x = b(
     l,
     {
       offset: 0,
@@ -27,18 +27,18 @@ function D(l, c) {
     className: $,
     children: P,
     offset: N,
-    span: f,
+    span: i,
     order: m
-  } = x, { colGap: e, cols: i } = p(h), G = a(N, 0), y = a(f, 1), { span: s, offset: r } = t(i) ? j(i, {
-    span: y,
-    offset: G
+  } = x, { colGap: e, cols: p } = f(h), y = a(N, 0), G = a(i, 1), { span: s, offset: r } = t(p) ? j(p, {
+    span: G,
+    offset: y
   }) : {}, o = {};
   if (t(m) && (o.order = m), t(s)) {
     if (o.gridColumnStart = `span ${s}`, t(e) && t(r) && r > 0) {
       const I = `(100% - ${e * (s - 1)}px) / ${s}`;
-      o.marginLeft = `calc(${I} * ${r} + ${e * r}px)`;
+      o.marginInlineStart = `calc(${I} * ${r} + ${e * r}px)`;
     }
-    o.gridColumnEnd = `span ${f}`;
+    o.gridColumnEnd = `span ${i}`;
   }
   return /* @__PURE__ */ S(
     "div",

package/grid/context.js

@@ -1,4 +1,4 @@
-/* 2025-11-27 15:08:04 */
+/* 2025-12-17 18:27:10 */
 import { createContext as t } from "react";
 const e = t({});
 export {

package/grid/index.js

@@ -1,4 +1,4 @@
-/* 2025-11-27 15:08:04 */
+/* 2025-12-17 18:27:10 */
 import r from "../row-col/index.js";
 import m from "./Grid.js";
 import i from "./Item.js";

package/grid/utils.js

@@ -1,4 +1,4 @@
-/* 2025-11-27 15:08:04 */
+/* 2025-12-17 18:27:10 */
 function f(n, { span: a, offset: e }) {
   const t = a ?? 1, i = e ?? 0, o = Math.min(i, n);
   return {