@das-fed/upf-ui 6.4.0-dev.214 → 6.4.0-dev.216

package/packages/components/error-overlay-model/index.js

@@ -1,7 +1,7 @@
 import { withInstall as D } from "@das-fed/upf-utils/with-install/index";
-import { defineComponent as L, ref as d, computed as y, onMounted as V, nextTick as I, openBlock as O, createBlock as R, Teleport as T, createElementVNode as M, normalizeStyle as H, toDisplayString as $ } from "vue";
-import { getVarValue as W } from "@das-fed/upf-web/packages/theme/index";
-const j = /* @__PURE__ */ L({
+import { defineComponent as L, ref as a, computed as H, onMounted as T, nextTick as V, openBlock as I, createBlock as O, Teleport as P, createElementVNode as W, normalizeStyle as E, toDisplayString as R } from "vue";
+import { getVarValue as k } from "@das-fed/upf-web/packages/theme/index";
+const $ = /* @__PURE__ */ L({
   __name: "index",
   props: {
     getEl: {},
@@ -9,67 +9,69 @@ const j = /* @__PURE__ */ L({
     errorModelZIndex: { default: 2e3 },
     errorWidth: { default: void 0 }
   },
-  setup(k) {
-    const r = k, E = d(null), l = d(), n = d({
+  setup(w) {
+    const r = w, C = a(null), l = a(), n = a({
       x: 0,
       y: 0
-    }), x = y(() => ({
+    }), v = H(() => ({
       "box-sizing": "border-box",
       "font-size": "12px",
-      "background-color": W("--das-ui-color-overlay-error").value,
+      "background-color": k("--das-ui-color-overlay-error").value,
       "box-shadow": "0px 4px 10px 0px rgba(0, 0, 0, 0.2)",
       "border-radius": "1px",
       padding: "2px 8px",
       "z-index": r.errorModelZIndex
-    })), w = y(() => ({
-      ...x.value,
+    })), _ = H(() => ({
+      ...v.value,
       width: l.value + (/px$/.test(l.value) ? "" : "px"),
       position: "fixed",
       visibility: "visible",
       top: n.value.y + "px",
       left: n.value.x + "px"
-    })), s = d({
+    })), u = a({
       // display: 'block',
-      color: W("--das-ui-input-error-color").value,
+      color: k("--das-ui-input-error-color").value,
       "white-space": "break-spaces"
-    }), C = () => {
-      const c = (i = 0) => {
-        const t = document.createElement("div");
-        for (let [p, h] of Object.entries({
-          ...x.value,
-          ...s.value,
-          width: i + "px"
+    }), S = () => {
+      const h = (c = 0) => {
+        const o = document.createElement("div");
+        for (let [x, m] of Object.entries({
+          ...v.value,
+          ...u.value,
+          width: c + "px"
         }))
-          t.style[p] = h;
-        const o = document.createElement("span");
-        for (let [p, h] of Object.entries(s.value))
-          o.style[p] = h;
-        o.textContent = r.errorLabel, t.appendChild(o), document.body.appendChild(t);
-        const b = t.offsetHeight, B = o.offsetWidth;
-        return document.body.removeChild(t), { height: b, textWidth: B };
-      }, m = () => {
-        const i = document.documentElement.clientHeight, o = document.documentElement.scrollHeight - i;
-        return i - o;
-      }, e = r.getEl(), a = (e == null ? void 0 : e.clientWidth) ?? 0, v = c(a), g = v.textWidth;
-      r.errorWidth ? l.value = r.errorWidth : g > a ? l.value = g + 2 + 8 + "px" : l.value = a + "px";
-      const { left: _ = 0, bottom: u = 0, height: S = 0 } = (e == null ? void 0 : e.getBoundingClientRect()) ?? {}, z = m(), f = v.height;
-      n.value.y = Math.ceil(u + f) >= z ? u - S - f : u, n.value.x = _;
+          o.style[x] = m;
+        const t = document.createElement("span");
+        for (let [x, m] of Object.entries(u.value))
+          t.style[x] = m;
+        t.textContent = r.errorLabel, o.appendChild(t), document.body.appendChild(o);
+        const d = o.offsetHeight, B = t.offsetWidth;
+        return document.body.removeChild(o), { height: d, textWidth: B };
+      }, f = () => {
+        const c = document.documentElement.clientHeight, t = document.documentElement.scrollHeight - c, d = c - t;
+        return console.log("可视区域高度（不包括滚动条）：" + d), d;
+      }, e = r.getEl(), i = (e == null ? void 0 : e.clientWidth) ?? 0, b = h(i), p = b.textWidth;
+      console.log("inputTextWidth========" + p), console.log("inputElWidth========" + i), r.errorWidth ? l.value = r.errorWidth : p > i ? l.value = p + 2 + 8 + "px" : l.value = i + "px";
+      const { left: y = 0, bottom: s = 0, height: M = 0 } = (e == null ? void 0 : e.getBoundingClientRect()) ?? {};
+      console.log("left====", y), console.log("bottom====", s), console.log("height====", M);
+      const z = f(), g = b.height;
+      console.log("errorModelHeight====", g), n.value.y = Math.ceil(s + g) >= z ? s - M - g : s, n.value.x = y, console.log("errorModelPosition====", n.value);
     };
-    return V(async () => {
-      await I(), C();
-    }), (c, m) => (O(), R(T, { to: "body" }, [
-      M("div", {
+    return T(async () => {
+      await V(), S();
+    }), (h, f) => (I(), O(P, { to: "body" }, [
+      W("div", {
         ref_key: "$errorModel",
-        ref: E,
-        style: H(w.value)
+        ref: C,
+        style: E(_.value)
       }, [
-        M("span", {
-          style: H(s.value)
-        }, $(c.errorLabel), 5)
+        W("span", {
+          style: E(u.value)
+        }, R(h.errorLabel), 5)
       ], 4)
     ]));
   }
-}), N = D(j);
+}), N = D($);
 export {
   N as DasErrorOverlayModel
 };

package/packages/components/form-item/index.js

@@ -1,7 +1,7 @@
 import '@das-fed/upf-ui/packages/components/form-item/style.css';
 import { withInstall as pr } from "@das-fed/upf-utils/with-install/index";
 import { getVarValue as st, getVar as cr, setThemeRule as gr } from "@das-fed/upf-web/packages/theme/index";
-import { useAttrs as Nt, inject as yr, computed as q, ref as J, watch as lt, reactive as hr, onMounted as mr, onUnmounted as br, defineComponent as vr, useCssVars as wr, unref as s, openBlock as C, createElementBlock as de, normalizeClass as pe, normalizeStyle as Ae, createElementVNode as Fe, withDirectives as ut, toDisplayString as ft, createCommentVNode as ce, createBlock as x, mergeProps as R, createSlots as dt, withCtx as re, createVNode as $r, renderSlot as ne, isRef as L, Fragment as Tr, createTextVNode as Vr } from "vue";
+import { useAttrs as Nt, inject as yr, computed as q, ref as J, watch as lt, reactive as hr, onMounted as mr, onUnmounted as br, defineComponent as vr, useCssVars as wr, unref as s, openBlock as C, createElementBlock as de, normalizeClass as pe, normalizeStyle as Ae, createElementVNode as Fe, withDirectives as ut, toDisplayString as ft, createCommentVNode as ce, createBlock as z, mergeProps as R, createSlots as dt, withCtx as re, createVNode as $r, renderSlot as ne, isRef as L, Fragment as Tr, createTextVNode as Vr } from "vue";
 import { DasTreeSelectRef as jr, DasTreeSelect as Sr } from "@das-fed/upf-ui/packages/components/tree-select/index";
 import { DasSelectInput as Or } from "@das-fed/upf-ui/packages/components/select-input/index";
 import { DasInputDialogSelect as Ar } from "@das-fed/upf-ui/packages/components/input-dialog-select/index";
@@ -11,7 +11,7 @@ import { DasCheckbox as Er } from "@das-fed/upf-ui/packages/components/checkbox/
 import { DasSwitch as Cr } from "@das-fed/upf-ui/packages/components/switch/index";
 import { DasSelect as Mr } from "@das-fed/upf-ui/packages/components/select/index";
 import { DasTooltip as Ir } from "@das-fed/upf-ui/packages/components/tooltip/index";
-import { DasDatePicker as qr, DasRangePicker as zr, DasTimePicker as xr, DasTimeRangePicker as Dr } from "@das-fed/upf-ui/packages/components/date-picker/index";
+import { DasDatePicker as qr, DasRangePicker as xr, DasTimePicker as zr, DasTimeRangePicker as Dr } from "@das-fed/upf-ui/packages/components/date-picker/index";
 import { DasCascaderRef as Rr, DasCascader as Lr } from "@das-fed/upf-ui/packages/components/cascader/index";
 import { DasColorPicker as Nr } from "@das-fed/upf-ui/packages/components/color-picker/index";
 import { DasInputNumber as _r } from "@das-fed/upf-ui/packages/components/input-number/index";
@@ -93,7 +93,7 @@ var Gr = /%[sdj%]/g, _t = function() {
 typeof process < "u" && process.env && process.env.NODE_ENV !== "production" && typeof window < "u" && typeof document < "u" && (_t = function(t, r) {
   typeof console < "u" && console.warn && typeof ASYNC_VALIDATOR_NO_WARNING > "u" && r.every(function(n) {
     return typeof n == "string";
-  });
+  }) && console.warn(t, r);
 });
 function Be(e) {
   if (!e || !e.length) return null;
@@ -138,7 +138,7 @@ function B(e) {
 function Zr(e) {
   return e === "string" || e === "url" || e === "hex" || e === "email" || e === "date" || e === "pattern";
 }
-function z(e, t) {
+function x(e, t) {
   return !!(e == null || t === "array" && Array.isArray(e) && !e.length || Zr(t) && typeof e == "string" && !e);
 }
 function Jr(e, t, r) {
@@ -234,7 +234,7 @@ function ht(e, t) {
   return e;
 }
 var Ut = function(t, r, n, i, a, o) {
-  t.required && (!n.hasOwnProperty(t.field) || z(r, o || t.type)) && i.push(B(a.messages.required, t.fullField));
+  t.required && (!n.hasOwnProperty(t.field) || x(r, o || t.type)) && i.push(B(a.messages.required, t.fullField));
 }, tn = function(t, r, n, i, a) {
   (/^\s+$/.test(r) || r === "") && i.push(B(a.messages.whitespace, t.fullField));
 }, Pe, rn = function() {
@@ -344,15 +344,15 @@ var Ut = function(t, r, n, i, a, o) {
 }, ln = function(t, r, n, i, a) {
   var o = [], u = t.required || !t.required && i.hasOwnProperty(t.field);
   if (u) {
-    if (z(r, "string") && !t.required)
+    if (x(r, "string") && !t.required)
       return n();
-    $.required(t, r, i, o, a, "string"), z(r, "string") || ($.type(t, r, i, o, a), $.range(t, r, i, o, a), $.pattern(t, r, i, o, a), t.whitespace === !0 && $.whitespace(t, r, i, o, a));
+    $.required(t, r, i, o, a, "string"), x(r, "string") || ($.type(t, r, i, o, a), $.range(t, r, i, o, a), $.pattern(t, r, i, o, a), t.whitespace === !0 && $.whitespace(t, r, i, o, a));
   }
   n(o);
 }, un = function(t, r, n, i, a) {
   var o = [], u = t.required || !t.required && i.hasOwnProperty(t.field);
   if (u) {
-    if (z(r) && !t.required)
+    if (x(r) && !t.required)
       return n();
     $.required(t, r, i, o, a), r !== void 0 && $.type(t, r, i, o, a);
   }
@@ -360,7 +360,7 @@ var Ut = function(t, r, n, i, a, o) {
 }, fn = function(t, r, n, i, a) {
   var o = [], u = t.required || !t.required && i.hasOwnProperty(t.field);
   if (u) {
-    if (r === "" && (r = void 0), z(r) && !t.required)
+    if (r === "" && (r = void 0), x(r) && !t.required)
       return n();
     $.required(t, r, i, o, a), r !== void 0 && ($.type(t, r, i, o, a), $.range(t, r, i, o, a));
   }
@@ -368,7 +368,7 @@ var Ut = function(t, r, n, i, a, o) {
 }, dn = function(t, r, n, i, a) {
   var o = [], u = t.required || !t.required && i.hasOwnProperty(t.field);
   if (u) {
-    if (z(r) && !t.required)
+    if (x(r) && !t.required)
       return n();
     $.required(t, r, i, o, a), r !== void 0 && $.type(t, r, i, o, a);
   }
@@ -376,15 +376,15 @@ var Ut = function(t, r, n, i, a, o) {
 }, pn = function(t, r, n, i, a) {
   var o = [], u = t.required || !t.required && i.hasOwnProperty(t.field);
   if (u) {
-    if (z(r) && !t.required)
+    if (x(r) && !t.required)
       return n();
-    $.required(t, r, i, o, a), z(r) || $.type(t, r, i, o, a);
+    $.required(t, r, i, o, a), x(r) || $.type(t, r, i, o, a);
   }
   n(o);
 }, cn = function(t, r, n, i, a) {
   var o = [], u = t.required || !t.required && i.hasOwnProperty(t.field);
   if (u) {
-    if (z(r) && !t.required)
+    if (x(r) && !t.required)
       return n();
     $.required(t, r, i, o, a), r !== void 0 && ($.type(t, r, i, o, a), $.range(t, r, i, o, a));
   }
@@ -392,7 +392,7 @@ var Ut = function(t, r, n, i, a, o) {
 }, gn = function(t, r, n, i, a) {
   var o = [], u = t.required || !t.required && i.hasOwnProperty(t.field);
   if (u) {
-    if (z(r) && !t.required)
+    if (x(r) && !t.required)
       return n();
     $.required(t, r, i, o, a), r !== void 0 && ($.type(t, r, i, o, a), $.range(t, r, i, o, a));
   }
@@ -408,7 +408,7 @@ var Ut = function(t, r, n, i, a, o) {
 }, hn = function(t, r, n, i, a) {
   var o = [], u = t.required || !t.required && i.hasOwnProperty(t.field);
   if (u) {
-    if (z(r) && !t.required)
+    if (x(r) && !t.required)
       return n();
     $.required(t, r, i, o, a), r !== void 0 && $.type(t, r, i, o, a);
   }
@@ -416,7 +416,7 @@ var Ut = function(t, r, n, i, a, o) {
 }, mn = "enum", bn = function(t, r, n, i, a) {
   var o = [], u = t.required || !t.required && i.hasOwnProperty(t.field);
   if (u) {
-    if (z(r) && !t.required)
+    if (x(r) && !t.required)
       return n();
     $.required(t, r, i, o, a), r !== void 0 && $[mn](t, r, i, o, a);
   }
@@ -424,17 +424,17 @@ var Ut = function(t, r, n, i, a, o) {
 }, vn = function(t, r, n, i, a) {
   var o = [], u = t.required || !t.required && i.hasOwnProperty(t.field);
   if (u) {
-    if (z(r, "string") && !t.required)
+    if (x(r, "string") && !t.required)
       return n();
-    $.required(t, r, i, o, a), z(r, "string") || $.pattern(t, r, i, o, a);
+    $.required(t, r, i, o, a), x(r, "string") || $.pattern(t, r, i, o, a);
   }
   n(o);
 }, wn = function(t, r, n, i, a) {
   var o = [], u = t.required || !t.required && i.hasOwnProperty(t.field);
   if (u) {
-    if (z(r, "date") && !t.required)
+    if (x(r, "date") && !t.required)
       return n();
-    if ($.required(t, r, i, o, a), !z(r, "date")) {
+    if ($.required(t, r, i, o, a), !x(r, "date")) {
       var f;
       r instanceof Date ? f = r : f = new Date(r), $.type(t, f, i, o, a), f && $.range(t, f.getTime(), i, o, a);
     }
@@ -446,15 +446,15 @@ var Ut = function(t, r, n, i, a, o) {
 }, Re = function(t, r, n, i, a) {
   var o = t.type, u = [], f = t.required || !t.required && i.hasOwnProperty(t.field);
   if (f) {
-    if (z(r, o) && !t.required)
+    if (x(r, o) && !t.required)
       return n();
-    $.required(t, r, i, u, a, o), z(r, o) || $.type(t, r, i, u, a);
+    $.required(t, r, i, u, a, o), x(r, o) || $.type(t, r, i, u, a);
   }
   n(u);
 }, Tn = function(t, r, n, i, a) {
   var o = [], u = t.required || !t.required && i.hasOwnProperty(t.field);
   if (u) {
-    if (z(r) && !t.required)
+    if (x(r) && !t.required)
       return n();
     $.required(t, r, i, o, a);
   }
@@ -633,7 +633,7 @@ var We = Ke(), $e = /* @__PURE__ */ function() {
         try {
           E = p.validator(p, c.value, S, c.source, f);
         } catch (F) {
-          console.error == null, f.suppressValidatorError || setTimeout(function() {
+          console.error == null || console.error(F), f.suppressValidatorError || setTimeout(function() {
             throw F;
           }, 0), S(F.message);
         }
@@ -722,15 +722,15 @@ function Mn(e) {
 function In(e) {
   return this.__data__.has(e);
 }
-var Kt = typeof global == "object" && global && global.Object === Object && global, qn = typeof self == "object" && self && self.Object === Object && self, k = Kt || qn || Function("return this")(), ae = k.Symbol, Wt = Object.prototype, zn = Wt.hasOwnProperty, xn = Wt.toString, ge = ae ? ae.toStringTag : void 0;
+var Kt = typeof global == "object" && global && global.Object === Object && global, qn = typeof self == "object" && self && self.Object === Object && self, k = Kt || qn || Function("return this")(), ae = k.Symbol, Wt = Object.prototype, xn = Wt.hasOwnProperty, zn = Wt.toString, ge = ae ? ae.toStringTag : void 0;
 function Dn(e) {
-  var t = zn.call(e, ge), r = e[ge];
+  var t = xn.call(e, ge), r = e[ge];
   try {
     e[ge] = void 0;
     var n = !0;
   } catch {
   }
-  var i = xn.call(e);
+  var i = zn.call(e);
   return n && (t ? e[ge] = r : delete e[ge]), i;
 }
 var Rn = Object.prototype, Ln = Rn.toString;
@@ -943,10 +943,10 @@ var Zt = Object.prototype, Pi = Zt.hasOwnProperty, Ei = Zt.propertyIsEnumerable,
 function Mi() {
   return !1;
 }
-var Jt = typeof exports == "object" && exports && !exports.nodeType && exports, Tt = Jt && typeof module == "object" && module && !module.nodeType && module, Ii = Tt && Tt.exports === Jt, Vt = Ii ? k.Buffer : void 0, qi = Vt ? Vt.isBuffer : void 0, Yt = qi || Mi, zi = 9007199254740991, xi = /^(?:0|[1-9]\d*)$/;
+var Jt = typeof exports == "object" && exports && !exports.nodeType && exports, Tt = Jt && typeof module == "object" && module && !module.nodeType && module, Ii = Tt && Tt.exports === Jt, Vt = Ii ? k.Buffer : void 0, qi = Vt ? Vt.isBuffer : void 0, Yt = qi || Mi, xi = 9007199254740991, zi = /^(?:0|[1-9]\d*)$/;
 function Di(e, t) {
   var r = typeof e;
-  return t = t ?? zi, !!t && (r == "number" || r != "symbol" && xi.test(e)) && e > -1 && e % 1 == 0 && e < t;
+  return t = t ?? xi, !!t && (r == "number" || r != "symbol" && zi.test(e)) && e > -1 && e % 1 == 0 && e < t;
 }
 var Ri = 9007199254740991;
 function Xt(e) {
@@ -1081,12 +1081,12 @@ function lr(e, t, r) {
 function qa(e) {
   return lr(e, Qe, tt);
 }
-function za(e) {
+function xa(e) {
   return lr(e, et, sr);
 }
-var ke = ee(k, "DataView"), He = ee(k, "Promise"), Ge = ee(k, "Set"), Ze = ee(k, "WeakMap"), Pt = "[object Map]", xa = "[object Object]", Et = "[object Promise]", Ct = "[object Set]", Mt = "[object WeakMap]", It = "[object DataView]", Da = Q(ke), Ra = Q(ve), La = Q(He), Na = Q(Ge), _a = Q(Ze), H = Te;
+var ke = ee(k, "DataView"), He = ee(k, "Promise"), Ge = ee(k, "Set"), Ze = ee(k, "WeakMap"), Pt = "[object Map]", za = "[object Object]", Et = "[object Promise]", Ct = "[object Set]", Mt = "[object WeakMap]", It = "[object DataView]", Da = Q(ke), Ra = Q(ve), La = Q(He), Na = Q(Ge), _a = Q(Ze), H = Te;
 (ke && H(new ke(new ArrayBuffer(1))) != It || ve && H(new ve()) != Pt || He && H(He.resolve()) != Et || Ge && H(new Ge()) != Ct || Ze && H(new Ze()) != Mt) && (H = function(e) {
-  var t = Te(e), r = t == xa ? e.constructor : void 0, n = r ? Q(r) : "";
+  var t = Te(e), r = t == za ? e.constructor : void 0, n = r ? Q(r) : "";
   if (n)
     switch (n) {
       case Da:
@@ -1121,9 +1121,9 @@ function Ha(e) {
   var t = new e.constructor(e.source, ka.exec(e));
   return t.lastIndex = e.lastIndex, t;
 }
-var zt = ae ? ae.prototype : void 0, xt = zt ? zt.valueOf : void 0;
+var xt = ae ? ae.prototype : void 0, zt = xt ? xt.valueOf : void 0;
 function Ga(e) {
-  return xt ? Object(xt.call(e)) : {};
+  return zt ? Object(zt.call(e)) : {};
 }
 function Za(e, t) {
   var r = t ? rt(e.buffer) : e.buffer;
@@ -1187,8 +1187,8 @@ var Rt = oe && oe.isMap, $o = Rt ? Ye(Rt) : wo, To = "[object Set]";
 function Vo(e) {
   return je(e) && H(e) == To;
 }
-var Lt = oe && oe.isSet, jo = Lt ? Ye(Lt) : Vo, So = 1, Oo = 2, Ao = 4, ur = "[object Arguments]", Fo = "[object Array]", Po = "[object Boolean]", Eo = "[object Date]", Co = "[object Error]", fr = "[object Function]", Mo = "[object GeneratorFunction]", Io = "[object Map]", qo = "[object Number]", dr = "[object Object]", zo = "[object RegExp]", xo = "[object Set]", Do = "[object String]", Ro = "[object Symbol]", Lo = "[object WeakMap]", No = "[object ArrayBuffer]", _o = "[object DataView]", Uo = "[object Float32Array]", Bo = "[object Float64Array]", Ko = "[object Int8Array]", Wo = "[object Int16Array]", ko = "[object Int32Array]", Ho = "[object Uint8Array]", Go = "[object Uint8ClampedArray]", Zo = "[object Uint16Array]", Jo = "[object Uint32Array]", O = {};
-O[ur] = O[Fo] = O[No] = O[_o] = O[Po] = O[Eo] = O[Uo] = O[Bo] = O[Ko] = O[Wo] = O[ko] = O[Io] = O[qo] = O[dr] = O[zo] = O[xo] = O[Do] = O[Ro] = O[Ho] = O[Go] = O[Zo] = O[Jo] = !0;
+var Lt = oe && oe.isSet, jo = Lt ? Ye(Lt) : Vo, So = 1, Oo = 2, Ao = 4, ur = "[object Arguments]", Fo = "[object Array]", Po = "[object Boolean]", Eo = "[object Date]", Co = "[object Error]", fr = "[object Function]", Mo = "[object GeneratorFunction]", Io = "[object Map]", qo = "[object Number]", dr = "[object Object]", xo = "[object RegExp]", zo = "[object Set]", Do = "[object String]", Ro = "[object Symbol]", Lo = "[object WeakMap]", No = "[object ArrayBuffer]", _o = "[object DataView]", Uo = "[object Float32Array]", Bo = "[object Float64Array]", Ko = "[object Int8Array]", Wo = "[object Int16Array]", ko = "[object Int32Array]", Ho = "[object Uint8Array]", Go = "[object Uint8ClampedArray]", Zo = "[object Uint16Array]", Jo = "[object Uint32Array]", O = {};
+O[ur] = O[Fo] = O[No] = O[_o] = O[Po] = O[Eo] = O[Uo] = O[Bo] = O[Ko] = O[Wo] = O[ko] = O[Io] = O[qo] = O[dr] = O[xo] = O[zo] = O[Do] = O[Ro] = O[Ho] = O[Go] = O[Zo] = O[Jo] = !0;
 O[Co] = O[fr] = O[Lo] = !1;
 function Ce(e, t, r, n, i, a) {
   var o, u = t & So, f = t & Oo, g = t & Ao;
@@ -1222,7 +1222,7 @@ function Ce(e, t, r, n, i, a) {
   }) : $o(e) && e.forEach(function(b, p) {
     o.set(p, Ce(b, t, r, p, e, a));
   });
-  var d = g ? f ? za : qa : f ? et : Qe, c = j ? void 0 : d(e);
+  var d = g ? f ? xa : qa : f ? et : Qe, c = j ? void 0 : d(e);
   return ji(c || e, function(b, p) {
     c && (p = b, b = e[p]), Gt(o, p, Ce(b, t, r, p, e, a));
   }), o;
@@ -1235,7 +1235,9 @@ const es = (e, t, r) => {
   let n = [];
   return e.length > 0 ? n = e : t && (n = r[t] || []), n;
 }, ts = (e, t, r) => {
-  const n = Nt(), i = yr("DasForm"), a = i.props, o = n.class, u = n.prop, f = (h, P) => e[h] || a[h] || P, g = q(() => a.size || "default");
+  const n = Nt(), i = yr("DasForm"), a = i.props;
+  console.log("useForm", n, i, a), console.log("formProps: ", a.labelWidth);
+  const o = n.class, u = n.prop, f = (h, P) => e[h] || a[h] || P, g = q(() => a.size || "default");
   let j = J("none");
   const w = De(e, "modelValue"), m = De(e, "error"), M = De(e, "optionValue"), d = q(() => es(e.rules, u, a.rules)), c = q(() => e.errorMode || a.errorMode), b = "8px", p = q(() => a.alignType === "horizontal" && !a.cols ? b : e.labelMarginRight || a.labelMarginRight), U = q(() => m.value !== ""), y = q(() => {
     const h = f("alignType"), P = f("labelPosition"), D = h === "vertical", l = P === "top";
@@ -1259,7 +1261,9 @@ const es = (e, t, r) => {
       return `${h}px`;
     if (!(h && ["auto", "100%"].includes(h)))
       return h;
-  }), N = "7px", K = "16px", I = q(() => {
+  }), N = "7px", K = "16px";
+  console.log("formContext", i);
+  const I = q(() => {
     var D, l;
     const h = {
       small: 12,
@@ -1295,7 +1299,7 @@ const es = (e, t, r) => {
   });
   const Z = () => {
     m.value = "", t("update:error", "");
-  }, Se = J(void 0), ze = (h, P) => {
+  }, Se = J(void 0), xe = (h, P) => {
     if (ue(), r("inputNumber")) {
       if (JSON.stringify(h) === JSON.stringify(Se.value)) return;
       Se.value = Qo(h);
@@ -1303,7 +1307,7 @@ const es = (e, t, r) => {
     t("update:modelValue", h), t("change", h, P);
   }, Oe = (h) => {
     t("update:modelValue", h), t("input", h);
-  }, xe = (h) => {
+  }, ze = (h) => {
     t("update:optionValue", h), t("select-change", h);
   }, ue = async () => {
     if (u && d.value.length > 0) {
@@ -1350,8 +1354,8 @@ const es = (e, t, r) => {
     formProps: a,
     className: o,
     inputHandler: Oe,
-    changeHandler: ze,
-    selectChangeHandler: xe,
+    changeHandler: xe,
+    selectChangeHandler: ze,
     size: g,
     layoutType: y,
     formItemContainerWidth: _,
@@ -1464,8 +1468,8 @@ const es = (e, t, r) => {
       layoutType: _,
       formItemContainerWidth: Z,
       paddingSpace: Se,
-      paddingDirection: ze
-    } = ts(n, i, g), { $dasFormItem: Oe, isHoverInInput: xe, errorModalInputMouseEnter: ue, errorModallInputMouseLeave: fe } = rs(n), h = q(() => ({
+      paddingDirection: xe
+    } = ts(n, i, g), { $dasFormItem: Oe, isHoverInInput: ze, errorModalInputMouseEnter: ue, errorModallInputMouseLeave: fe } = rs(n), h = q(() => ({
       marginRight: F.value,
       marginBottom: W.value,
       alignItems: n.alignItems,
@@ -1473,7 +1477,7 @@ const es = (e, t, r) => {
       width: Z.value
     })), P = q(() => ({
       width: b.value ?? c.value,
-      [ze.value]: b.value ? 0 : Se.value,
+      [xe.value]: b.value ? 0 : Se.value,
       marginRight: U.value
     })), D = q(() => ({
       flex: E.labelPosition === "top" ? void 0 : y.value ? `0 0 ${y.value}` : "1",
@@ -1502,7 +1506,7 @@ const es = (e, t, r) => {
               [s(pt)]
             ]),
             l.showColon ? (C(), de("span", as, "：")) : ce("", !0),
-            l.helpMessage || l.$slots.helpContent ? (C(), x(s(Ir), R({
+            l.helpMessage || l.$slots.helpContent ? (C(), z(s(Ir), R({
               key: 1,
               effect: "light",
               placement: "top-start",
@@ -1537,7 +1541,7 @@ const es = (e, t, r) => {
           onMouseleave: v[17] || (v[17] = //@ts-ignore
           (...T) => s(fe) && s(fe)(...T))
         }, [
-          s(g)("input", "textarea", "password") ? (C(), x(s(Fr), R({
+          s(g)("input", "textarea", "password") ? (C(), z(s(Fr), R({
             key: 0,
             modelValue: s(d),
             "onUpdate:modelValue": v[0] || (v[0] = (T) => L(d) ? d.value = T : null),
@@ -1579,7 +1583,7 @@ const es = (e, t, r) => {
               ]),
               key: "3"
             } : void 0
-          ]), 1040, ["modelValue", "isView", "disabled", "type", "error", "onInput", "onChange", "size"])) : s(g)("radio") ? (C(), x(s(Pr), R({
+          ]), 1040, ["modelValue", "isView", "disabled", "type", "error", "onInput", "onChange", "size"])) : s(g)("radio") ? (C(), z(s(Pr), R({
             key: 1,
             modelValue: s(d),
             "onUpdate:modelValue": v[1] || (v[1] = (T) => L(d) ? d.value = T : null),
@@ -1593,7 +1597,7 @@ const es = (e, t, r) => {
             },
             formSize: s(V),
             onChange: s(I)
-          }, l.$attrs), null, 16, ["modelValue", "isView", "disabled", "options", "defaultProps", "formSize", "onChange"])) : s(g)("checkbox") ? (C(), x(s(Er), R({
+          }, l.$attrs), null, 16, ["modelValue", "isView", "disabled", "options", "defaultProps", "formSize", "onChange"])) : s(g)("checkbox") ? (C(), z(s(Er), R({
             key: 2,
             modelValue: s(d),
             "onUpdate:modelValue": v[2] || (v[2] = (T) => L(d) ? d.value = T : null),
@@ -1607,14 +1611,14 @@ const es = (e, t, r) => {
             },
             formSize: s(V),
             onChange: s(I)
-          }, l.$attrs), null, 16, ["modelValue", "isView", "disabled", "options", "defaultProps", "formSize", "onChange"])) : s(g)("switch") ? (C(), x(s(Cr), R({
+          }, l.$attrs), null, 16, ["modelValue", "isView", "disabled", "options", "defaultProps", "formSize", "onChange"])) : s(g)("switch") ? (C(), z(s(Cr), R({
             key: 3,
             modelValue: s(d),
             "onUpdate:modelValue": v[3] || (v[3] = (T) => L(d) ? d.value = T : null),
             disabled: l.disabled,
             onChange: s(I),
             formSize: s(V)
-          }, l.$attrs), null, 16, ["modelValue", "disabled", "onChange", "formSize"])) : s(g)("select") ? (C(), x(s(Mr), R({
+          }, l.$attrs), null, 16, ["modelValue", "disabled", "onChange", "formSize"])) : s(g)("select") ? (C(), z(s(Mr), R({
             key: 4,
             modelValue: s(d),
             "onUpdate:modelValue": v[4] || (v[4] = (T) => L(d) ? d.value = T : null),
@@ -1630,7 +1634,7 @@ const es = (e, t, r) => {
             },
             onChange: s(I),
             formSize: s(V)
-          }, l.$attrs), null, 16, ["modelValue", "isView", "disabled", "error", "size", "options", "fieldNames", "onChange", "formSize"])) : s(g)("cascader") ? (C(), x(s(Lr), R({
+          }, l.$attrs), null, 16, ["modelValue", "isView", "disabled", "error", "size", "options", "fieldNames", "onChange", "formSize"])) : s(g)("cascader") ? (C(), z(s(Lr), R({
             key: 5,
             ref_key: "$cascader",
             ref: f,
@@ -1644,7 +1648,7 @@ const es = (e, t, r) => {
             width: "100%",
             formSize: s(V),
             onChange: s(I)
-          }, l.$attrs), null, 16, ["modelValue", "isView", "disabled", "error", "options", "formSize", "onChange"])) : s(g)("treeSelect") ? (C(), x(s(Sr), R({
+          }, l.$attrs), null, 16, ["modelValue", "isView", "disabled", "error", "options", "formSize", "onChange"])) : s(g)("treeSelect") ? (C(), z(s(Sr), R({
             key: 6,
             ref_key: "$treeSelect",
             ref: u,
@@ -1657,7 +1661,7 @@ const es = (e, t, r) => {
             disabled: l.disabled,
             error: s(m),
             onChange: s(I)
-          }, l.$attrs), null, 16, ["modelValue", "data", "size", "width", "isView", "disabled", "error", "onChange"])) : s(g)("colorPicker") ? (C(), x(s(Nr), R({
+          }, l.$attrs), null, 16, ["modelValue", "data", "size", "width", "isView", "disabled", "error", "onChange"])) : s(g)("colorPicker") ? (C(), z(s(Nr), R({
             key: 7,
             modelValue: s(d),
             "onUpdate:modelValue": v[7] || (v[7] = (T) => L(d) ? d.value = T : null),
@@ -1668,7 +1672,7 @@ const es = (e, t, r) => {
             error: s(m),
             isView: !!l.isView,
             formSize: s(V)
-          }, l.$attrs), null, 16, ["modelValue", "options", "onChange", "disabled", "error", "isView", "formSize"])) : s(g)("inputNumber") ? (C(), x(s(_r), R({
+          }, l.$attrs), null, 16, ["modelValue", "options", "onChange", "disabled", "error", "isView", "formSize"])) : s(g)("inputNumber") ? (C(), z(s(_r), R({
             key: 8,
             modelValue: s(d),
             "onUpdate:modelValue": v[8] || (v[8] = (T) => L(d) ? d.value = T : null),
@@ -1679,7 +1683,7 @@ const es = (e, t, r) => {
             error: s(m),
             isView: l.isView,
             formSize: s(V)
-          }, l.$attrs), null, 16, ["modelValue", "onInput", "onChange", "disabled", "error", "isView", "formSize"])) : s(g)("selectInput") ? (C(), x(s(Or), R({
+          }, l.$attrs), null, 16, ["modelValue", "onInput", "onChange", "disabled", "error", "isView", "formSize"])) : s(g)("selectInput") ? (C(), z(s(Or), R({
             key: 9,
             width: "100%",
             modelValue: s(d),
@@ -1696,7 +1700,7 @@ const es = (e, t, r) => {
             onDasInput: s(K),
             onSelectChange: s(te),
             formSize: s(V)
-          }, l.$attrs), null, 16, ["modelValue", "isView", "error", "disabled", "optionValue", "options", "optionsLabelKey", "optionsValueKey", "onInputChange", "onDasInput", "onSelectChange", "formSize"])) : s(g)("inputDialogSelect") ? (C(), x(s(Ar), R({
+          }, l.$attrs), null, 16, ["modelValue", "isView", "error", "disabled", "optionValue", "options", "optionsLabelKey", "optionsValueKey", "onInputChange", "onDasInput", "onSelectChange", "formSize"])) : s(g)("inputDialogSelect") ? (C(), z(s(Ar), R({
             key: 10,
             style: { width: "100px", flex: "1" },
             isView: l.isView,
@@ -1710,7 +1714,7 @@ const es = (e, t, r) => {
             optionsLabelKey: l.optionsLabelKey,
             optionsValueKey: l.optionsValueKey,
             onChange: s(I)
-          }), null, 16, ["isView", "disabled", "error", "selected-options", "modelValue", "formSize", "optionsLabelKey", "optionsValueKey", "onChange"])) : s(g)("date", "dateTime", "week", "month", "quarter", "year") ? (C(), x(s(qr), R({
+          }), null, 16, ["isView", "disabled", "error", "selected-options", "modelValue", "formSize", "optionsLabelKey", "optionsValueKey", "onChange"])) : s(g)("date", "dateTime", "week", "month", "quarter", "year") ? (C(), z(s(qr), R({
             key: 11,
             "show-time": l.type === "dateTime",
             picker: l.type !== "dateTime" ? l.type : "date",
@@ -1723,7 +1727,7 @@ const es = (e, t, r) => {
             error: s(m),
             onChange: s(I),
             formSize: s(V)
-          }, l.$attrs), null, 16, ["show-time", "picker", "modelValue", "disabled", "isView", "error", "onChange", "formSize"])) : s(g)("dateRange", "dateTimeRange", "weekRange", "monthRange", "yearRange") ? (C(), x(s(zr), R({
+          }, l.$attrs), null, 16, ["show-time", "picker", "modelValue", "disabled", "isView", "error", "onChange", "formSize"])) : s(g)("dateRange", "dateTimeRange", "weekRange", "monthRange", "yearRange") ? (C(), z(s(xr), R({
             key: 12,
             "show-time": l.type === "dateTimeRange",
             picker: l.type && l.type !== "dateTimeRange" ? l.type.slice(0, -5) : "date",
@@ -1736,7 +1740,7 @@ const es = (e, t, r) => {
             error: s(m),
             onChange: s(I),
             formSize: s(V)
-          }, l.$attrs), null, 16, ["show-time", "picker", "modelValue", "disabled", "isView", "error", "onChange", "formSize"])) : s(g)("time") ? (C(), x(s(xr), R({
+          }, l.$attrs), null, 16, ["show-time", "picker", "modelValue", "disabled", "isView", "error", "onChange", "formSize"])) : s(g)("time") ? (C(), z(s(zr), R({
             key: 13,
             modelValue: s(d),
             "onUpdate:modelValue": v[14] || (v[14] = (T) => L(d) ? d.value = T : null),
@@ -1746,7 +1750,7 @@ const es = (e, t, r) => {
             isView: l.isView,
             onChange: s(I),
             formSize: s(V)
-          }, l.$attrs), null, 16, ["modelValue", "disabled", "isView", "onChange", "formSize"])) : s(g)("timeRange") ? (C(), x(s(Dr), R({
+          }, l.$attrs), null, 16, ["modelValue", "disabled", "isView", "onChange", "formSize"])) : s(g)("timeRange") ? (C(), z(s(Dr), R({
             key: 14,
             modelValue: s(d),
             "onUpdate:modelValue": v[15] || (v[15] = (T) => L(d) ? d.value = T : null),
@@ -1767,7 +1771,7 @@ const es = (e, t, r) => {
               Vr(ft(s(j)), 1)
             ], 4)), [
               [s(pt)]
-            ]) : s(xe) ? (C(), x(s(Br), {
+            ]) : s(ze) ? (C(), z(s(Br), {
               key: 1,
               errorLabel: s(j),
               getEl: () => s(Oe),